gentoo resync : 12.01.2019

6964 files changed, 87437 insertions, 71001 deletions

diff --git a/Manifest b/Manifest
index 9f0c9e0811c1..9e393b4641a5 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28796 BLAKE2B 4fbb33b911a3bb2270f86225289b27f0687009abf2fcfc5f6a1fe795ad4f6bccf01626dbb0ba6c015fd3a020aa14b4b7b41f19ccbd0a9937086622e8329ce886 SHA512 6cc51f678e6360ad1c952426af6558f55ec22afe9829feff6963528e2bfde27bbf0c18851bb5ac5210e1225c1f314f9d2035285019b108eccc29c29e3138e914
-TIMESTAMP 2018-12-31T12:38:40Z
+MANIFEST Manifest.files.gz 28798 BLAKE2B 7170daff733a9081a814c70d932e74d6aedf9776f019b909b49cf906763ff51ca469f5a0b6672e23d3a396d4ad3d28757e762637b57ff663858fdf9defeda935 SHA512 cce261e200b078ebf0174615e4736b2e1966c01020f2a7b8c253b4d0a3789f4413462fe4a140fbc4b9d7e187450d81daced39b4f3a341bcf256263303eb5a8e9
+TIMESTAMP 2019-01-12T15:38:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwqDdBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw6CgVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD2SQ/7BrVsoKxyKF1+Sbhk8Gqjlubq1DM0Zjtw6K3LJH7tRy6nOgtJA6TEeveF
-ZdoVMllTgO557Zpghri+Hg2zEYPzNKBEiffvpc08TkEqEFSPBaposBBE2HiLjPoR
-LHiFk/jpSdd+d5FGs1JMgzSXosw/HvWnCCnBXXNd0KQZMcOWplG892nk2RAL4s77
-UUQcIl2QVzM7YJl04bZq+Ani1Jo/Y2wPBXTdym+nQXUmUpK+bygwjdpI2/upgE1q
-4lSAnfYeHPrAfpPdQbJ6uE0vWzA4tQl7xOdTdBVVli3GnOovYKw6kpiGywSTGZAG
-qVTTY/zhjSWK7YJ7vdA5zhW2K7SkbEygno/4OR3C/vSz13rWibrTj9ID5TYClCi9
-vpEx93396PL14okY0eTCUsOWQODbCYW39KNp/Sa85vaUJCC57rqM8yss028BgBJO
-3zeEU6BW3gAc9SHxiaCGHkOKUWZEpvUP8GoHnF4BJvqS9+NNcQhQmmpLQsrje7Eq
-GKgpOj27qZgJnLquk1M3CZrHNCujl1l0fuCh3b3c7sU+aP9NfzU73tD4q90Xqgo0
-OHi3Y5aQoeIPnWGrdmI6X7zDpM8AKXy69+Q/JCeSzrz3Q/uTbEY8f3TAEYstQg9f
-aNCUtpP0/mblLOiQ6mgWvyRbNAr8zUPomT5A7XB/i/7dwoa77oY=
-=xfTU
+klDfgQ//RhAzZ+S6sHp2DqsrOKwZWRNQGQeTalLoLPk0IZN1hZdQXaKSmn5fFlw/
+0G0aKz/9B+NieJOv4SgxXlM3UpBTnLS5ZsynEJE+TZvKHs6Fk7yDFVZFQ8obt1G0
+/RXmouChwPgXp1sPzOePzr6zrbMNj9xJ8lLuFDc2Jzt/Jlw1aD+6QHilFtAB0rPn
+dUJolu+iBLbTfzrDiim8/fvaumukRnHIMSuUlm3340sP71yf0ZWOy192QD2+XJl8
+58sinCeZJMSny81idQeUocyq37UzrjmPz8Il+qycz19dFHpnbFLAkTI0fP9Tl/+W
+rQCo4oKPj9eMzEflVJolj+i55P6cm2D6WDlaU9aCkjcDF7mVn5dpniie5j9+y63G
+i4jI/y3ONVOllXINauAYwxbkvVP3l+A8f1+tMaycymgWYoSXq9mSKTEw/A3z1zxK
+WlrIUZW9ufxa9mS5pXvqtQ8OGhnTXjeC2NdKOU579Y7gaxBp7FEqUbmEnbv0u4Ly
+Z5L+ShlVMW6IMLKQcYfm3yCz691wruX8HCqKFQB1H6jNvbv+bx+6wRpEnhDattDJ
+af56AZiu62bSEurgWYnYbgFavX3ubvGWw3GnwzW1iQek/VeEvKt22Hw2kQGKtUEl
+vcdQarAzQMWgD/TB+Le5wwlgiQnrmyXtoxfV7GgYl3KSvO9KXsQ=
+=MIxn
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2856ed78695d..feb8b67bf671 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index fd847feb20ce..a9fba389da96 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 0aae1332c9bd..dfd9f4ac56e1 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -10,4 +10,4 @@ EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e4
 EBUILD apache-tools-2.4.34.ebuild 2576 BLAKE2B b1b1333404e015984c46451a024c53eb0e0b33e02391fa31f7fe04d925cf1093c5283e991cfc309cdef3eed5a1054d20a713f66b6c917149e9151698a91361eb SHA512 c46a40ccb2188261c45940d184329a08b5308a2a79f4fd78f1501ed87ea887edbcef1e2f38b5b620aed2f8d411f5b03cd903c786a53270bc1e4aaf8e0d2602d0
 EBUILD apache-tools-2.4.35.ebuild 2581 BLAKE2B 5fb10ae690a88c04a6286642aee7c6b78333eccbce6630c5af5c5271fc3d988323858f216bef07a22162146c6806fa734c5a74e2f4efdcdcd6bed693eaca6100 SHA512 3a5753b45d618229450391754d044112372b0378b67501cc42e9fd42a6e87bee5a5f577ad21604dd2a9dc1bb1c5ba8ba5c681dae40ad9dfc843dd3e5258c0162
 EBUILD apache-tools-2.4.37.ebuild 2581 BLAKE2B 5fb10ae690a88c04a6286642aee7c6b78333eccbce6630c5af5c5271fc3d988323858f216bef07a22162146c6806fa734c5a74e2f4efdcdcd6bed693eaca6100 SHA512 3a5753b45d618229450391754d044112372b0378b67501cc42e9fd42a6e87bee5a5f577ad21604dd2a9dc1bb1c5ba8ba5c681dae40ad9dfc843dd3e5258c0162
-MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
+MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index b9cdf53e2d0c..f041a5858c19 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -5,6 +5,10 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>apache-bugs@gentoo.org</email>
+		<name>Apache project</name>
+	</maintainer>
 	<longdescription lang="en">
 		app-admin/apache-tools contains tools that might be useful without
 		having apache itself installed (like htdigest/htpasswd, but also ab -
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index d235e4d1645f..ce411fcf95ba 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -6,7 +6,9 @@ AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca
 DIST fluentd-1.2.6.gem 434176 BLAKE2B 05fb0a29def48b673f458a19eb2662b0e447d949284af3a2aa28694e0cef8177c5a584d9f475ff71a548d7acdde504e8843a312ed0dc85e892b0f2dd59cdf8ef SHA512 9faeef818195d0014f9fffc29222d031a819ef8af323700b26290d5b394bec6815e86699ab89ba4e8d428321e10d3463c297d6c9046dbb46fdc061777206f8ae
 DIST fluentd-1.3.1.gem 437760 BLAKE2B 59afdadc2d67e30d35df2f33c169e9f2cbfd44ac6b7497b025fd9229921f91ac37ce8b6f80f37df26a03e5062ce2f5187156a70302ca11f9a7d9db9cfccebf9c SHA512 84351148809332c9a703243416004f18d0470cafc04cf63de7c52d9b6da18f1c6f2de0682ff1d5283f28013707fcfe24cbcf67aebc3be91090c4d5cca80ec2cc
 DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c07c254ec5ed1012f8ebd98323cfbd671d5e9f940025d049c67b6dedd4f0feb9a079291e83f465e107e105d3 SHA512 8357ae88ed028778f6c7ae3dca051b32840bcf8cd344292e1fd3d203dae85e32d8263dea72d657010d803bb36d78d27a8441a8a7edf49439609041acac39f967
+DIST fluentd-1.3.3.gem 438784 BLAKE2B 186aa4af59707c6a68a6f82b94b233e3f52eb11745ff4ce7f942a4fb1f8516cc966e14f541a23dfdfda72ddea058e19d1b8184d0c40bf92ce4cd48e5735946a9 SHA512 b3348939d72b07d424a8d98f0d817e72d55918be9ac4ef5f456a3c44ac1ca28944b63c943bf2bb230b58793a33c1ca12304cebed15827a3f6e32f2ae3b68f0dd
 EBUILD fluentd-1.2.6-r1.ebuild 1353 BLAKE2B da8e47f5f09abf639374137691b7329767e3bc0febbdb58299811456f168e9d6b3a8ab00758a2a1dd8654d0a60bb97b47842e249728d99ef1c9886a87759d7da SHA512 bc101637c4a80853b7b7403debb7d25069508020e75d1e3ca597f327e615bf60fe0793ebd8a437c3bc3734fe2556756589525959a40625fb979dc698ba3bc320
 EBUILD fluentd-1.3.1.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
 EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
+EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/fluentd-1.3.3.ebuild b/app-admin/fluentd/fluentd-1.3.3.ebuild
new file mode 100644
index 000000000000..9bb8568d1ebc
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 6b47cdfe0ece..84ba70b1b5a1 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,4 +1,3 @@
-AUX gkrellm-2.3.5-cifs.patch 496 BLAKE2B 5a60994bc651e76467fb3cf75e20e4802ac4371f8e5eac52fd6a74dd362220e67019ea67a5a15e6b890faac6e9a1c2ea675809117390cd0dabd25f0f3d27cdc2 SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5
 AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
 AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
 AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
@@ -7,5 +6,5 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
-EBUILD gkrellm-2.3.10-r1.ebuild 3341 BLAKE2B eca313f344bec7dba570d12cbe78b019c5683f6761de4f1b9eb3fe22e9deedddfca8dd6efeb7b0429a043bad10b7e64feaaa0d2b2041e19db439a14156d02426 SHA512 d7ab6f431cefcff47c709a4d3c4fba9dddb89df343b1931699484c511d5a152a91d23c66876908be57ee777c3e65dce87a1be40833a04f05572cdda7c37c010f
+EBUILD gkrellm-2.3.10-r2.ebuild 3274 BLAKE2B 87e88f2b23166800ba87bf8e2f760bd8f037a6579bde37e3a4ea710f0767d079b8544e69f7c16a8b31e77eceea0947a7c8270cccbe5a2f3f06227e551425f3a9 SHA512 aaea525edd7b50d23e8dad67ba3f0388ac174dc0505a888d770577ef5741e5a05673ec74167178e588280bf5d7cdddc53ac6397c90fc88784504f2d749ee6ef6
 MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
deleted file mode 100644
index fa35ef672798..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.3.5-cifs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gkrellm-2.3.5.old/server/monitor.c	2010-10-06 03:46:59.000000000 +1100
-+++ gkrellm-2.3.5/server/monitor.c	2011-11-24 02:01:30.871402778 +1100
-@@ -1329,7 +1329,8 @@
- static gchar *remote_fs_types[] =
- 	{
- 	"nfs",
--	"smbfs"
-+	"smbfs",
-+	"cifs"
- 	};
- 
- void
---- gkrellm-2.3.5.old/src/fs.c	2010-09-15 02:25:51.000000000 +1000
-+++ gkrellm-2.3.5/src/fs.c	2011-11-24 02:00:17.347088370 +1100
-@@ -163,7 +163,8 @@
- static gchar *remote_fs_types[]	=
- 	{
- 	"nfs",
--	"smbfs"
-+	"smbfs",
-+	"cifs"
- 	};
- 
- 
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
deleted file mode 100644
index b921679f6f1b..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.10-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-# Upstream named their xz compressed tarball tar.bz2 (*sigh*)
-SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm_sensors? ( sys-apps/lm_sensors )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-cifs.patch
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
new file mode 100644
index 000000000000..472c7e81c4b3
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-config.patch
+	"${FILESDIR}"/${PN}-2.3.5-width.patch
+	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+		ewarn "No ssl backend will be built!"
+	fi
+}
+
+pkg_setup() {
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	default
+}
+
+src_compile() {
+	if use X ; then
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 12c361aa9343..3bf84bb9a750 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,5 +1,7 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.40-Source.zip 5136918 BLAKE2B 7b5071cbe3bc5f20450a094a4b8969e2e25f6bba27d88ee5c2c25f2706ed3cf18e721ba53ff54c78db6ea1e167cef1108611fc8253a9d6e19eb3f9d1f3317c73 SHA512 222f7e7ef65be8b0d75baa0a6e871d5edad1b570b64f261405b843d7387ec1faeb4138afb8b31934d70eebe0add297681028cb4f3acfcbe4f518c763fe6c0145
+DIST KeePass-2.41-Source.zip 5141195 BLAKE2B 7f61efa6d73fbfd5de283567a1673f5757619ebb81f3daa3fba82c887874f2cdb15f74221bf389013fe4cf19c83f00f87de2c596d22a22f5f38b5236dab01e44 SHA512 0d9398f529e004df6a4d3e0b8e34a1324b1806bf44987e9cb2d7535eaf02192662e72c89f1e41b7da01d23b0d686fbbca7a956ef7873fd8b1948847fbf5d27a5
 EBUILD keepass-2.40-r1.ebuild 3116 BLAKE2B 4b5d2f9c97fb4bc3c557759d4aed6420e1b8f4b3a2679e5d47f15f7789cebc955d02826a3dc4f9375a9a1b44e57457bc40e97d6793bbbf2dd5daad5881f7c958 SHA512 3eb65f4678388266fd162ffd98cb08820e778001e9efb91c4ec5d446a729157bfceaca69dc4fbbfaf36cc4a280c8cb60912c407f10d4acd75b38045180a3a207
+EBUILD keepass-2.41.ebuild 3118 BLAKE2B 664ed7bf32f87f04295defa3249241f51d259d5c63239f3d4a2ff41fe7d487257e397dd909898827c7328951895b5a6aca474d90ac498192fc97f430c2e0635c SHA512 9384d81ce0cbee3f5acbff9f706ccb5fb48133fdf1d201231036b139705e5ab1cd1361aeed52cfbc14999992c8ff5bad0e1b3b279eb319d0971b4d4b7102ac1a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.41.ebuild b/app-admin/keepass/keepass-2.41.ebuild
new file mode 100644
index 000000000000..1dc244ea08cf
--- /dev/null
+++ b/app-admin/keepass/keepass-2.41.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 5a0dc76e159e..5cef4fd110ff 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -25,9 +25,11 @@ DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0
 DIST kube-bench-0.0.19.tar.gz 197836 BLAKE2B 86fd5d43d45fb2fa98e542a2a2385fecf2ec2a024bede34d5d9a9e33e04967b7dadab34651734361bb5f273eb8da824ca6d73fe46e8944b14ae0ba4c4e64341a SHA512 dfe82bcce482c88effffad772b17874bc2c80423d47f2dc7c02b5c9425b915ec2405d9f97b88b4aff2a54d33b7bfafd3f89c43ee4c32956d27cef4f11833a178
 DIST kube-bench-0.0.20.tar.gz 197875 BLAKE2B 8bca6040b62226d01d86edd020166538ee6072cf6ec1ec72d0db38b024ade39ba2378e9bd866b8b7e3878e11dd5ca9ce62ad3c3a36d7d99e124c664acf7961a9 SHA512 1a07d1b7b5a073915e8c161fedc901974889791a939fd58daae267dccbf80dc09bafe133f783c2eb02335535d27d143cfd7b657652ea5b517064b3cded31430d
 DIST kube-bench-0.0.22.tar.gz 205683 BLAKE2B d405bc0b7af4f588e363f5a4f240d1b8662118e64e92356f841a86501b76bec8ee51ae5fb832819cee3d99f0aefa232676e6602029ab103f3760c5127fe8a845 SHA512 e64aaae83a9469763ac5a044df8cc5e53c7b0dd1bffc27c5fbc48fa0e3e27c8a3be45ebe6d82483757eb4da290c34b003d0db5c9fee25b95fbe44d0ff3e273ad
+DIST kube-bench-0.0.23.tar.gz 205894 BLAKE2B 7c10f4f8c6b153d7e3e63cdc4cadb1b403c599e55e56f7f47be91e6c49b68215eb9c67898c6d897b7c7f038cbd404d2af158ca9629bc2d3a4e40dddb9fcdc32e SHA512 946bf313e6762ab11a59c02c03e150686254669c0ec32c36c7b9f6d224d6d011f73d7a6f56b771dbf8857b24aaf5138248b506bb180df6c3375e6c0ad68ffee3
 EBUILD kube-bench-0.0.16.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.17.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.19.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.20.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.22.ebuild 2379 BLAKE2B 58ed3d56338253b0be202240f2d8821d31809a1bf4e94578ff008edae3b63090a99fc7318df63dc27a6ca35be05eece0ac396d2e95040f6483a624b1577c8a89 SHA512 2b6503d413063be3ff0c8ef996a36c5ce2490948667ec7aea2bcd29dd90644845cc523274c148eceaf16610f77dcc3c3460b93a201cd03b284ca15e098817255
+EBUILD kube-bench-0.0.23.ebuild 2379 BLAKE2B 13c334651f415c1b45d77cea83a84bfd2db0b42b39b327d2f949d161e1ccbe5e8c82e2864af7033aeb4d284e7835a3c9507dd1a6749e31e10e35bc46b9347e6e SHA512 b75469ec2e6300fa2b294f2e4fc3887e228607c90511d9639bdc758c1cd76ada09609bc4e1a369e2e1805963c971bb9f6e8f0cdf413b892cf94afbf5cb0f1f26
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.23.ebuild b/app-admin/kube-bench/kube-bench-0.0.23.ebuild
new file mode 100644
index 000000000000..456872daf1dd
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.23.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
+	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
+	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
+	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
+	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
+	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
+	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
+	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
+	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
+	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
+	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
+	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
+	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index 85ed01f73a9a..69e80b8d7f86 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,9 +1,7 @@
 AUX perl-cleaner-2.20-prefix.patch 4874 BLAKE2B cf598a2e1aa03959ac1f1a799daaf33ceb640e99652da386e4a15e58fd02a06d4462251a347431ca943dad2cd3945942d4a9d3e95bb9cd607bda61c1843018cc SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f
-DIST perl-cleaner-2.20.tar.bz2 6704 BLAKE2B f5a5e431382300d2fff474f15744d992da1cc55536168d476fe73837443d97a331c1c40d92e706559bc6bdbc69fff9ebbf0cf532a0b5533e4f11c5c0db660cba SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
-DIST perl-cleaner-2.26.tar.bz2 7462 BLAKE2B 3e651503da847275b452d7eedcecc820b9572890d7ef1b3c421ac170a1daf8ae712a9b62f6c9fd4705d973566b59190638f980962f145741f5ae47eefed836f9 SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821
-EBUILD perl-cleaner-2.20.ebuild 1186 BLAKE2B 1a7b893bd93e0e277d1ae43e2a011a5cfdd9432e6e8061849d46eef445203071a4ff7f5f2f6bbf46f6d1b372f108c90cb03a9b343f570d66446e977401f56c87 SHA512 5d2577f74a842cfcba8a3edb60050f5a6ee9098c3e21a695457422967afda04d599c5b7c0b2bdf26408c49e618e5bc046cb161face449f12215cae2b66c31501
+DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
-EBUILD perl-cleaner-2.26-r1.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
+EBUILD perl-cleaner-2.27.ebuild 1086 BLAKE2B 62aa010bae53becdb21d94dc60ad4b3f15639678b2762f204a5928e75fc2de57413df86dfc99644bbf335eb1761fa41491d4fd9f62e53dd9db6453a27061e983 SHA512 5e01fadc4f7887ffb30a04cc1b04605da40dea3ae7755a375aee2fa2eb1d1aeb3a18bdc4c97f6b42e80bd816b352e30cf7ad3ec1b5f77767dac44a5887c557bf
 EBUILD perl-cleaner-9999.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
deleted file mode 100644
index 6c9de1d4f035..000000000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
-
-RDEPEND="app-shells/bash
-	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		sys-apps/pkgcore
-	)
-"
-
-src_prepare() {
-	if use prefix ; then
-		# I don't dare to throw non Prefix users for the bus, but this
-		# patch should be safe for them
-		epatch "${FILESDIR}"/${P}-prefix.patch
-		eprefixify ${PN}
-	fi
-}
-
-src_install() {
-	dosbin perl-cleaner
-	doman perl-cleaner.1
-}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
deleted file mode 100644
index d2a96ef087a2..000000000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.26-r1.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 prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
-
-RDEPEND="app-shells/bash
-	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		( sys-apps/portage-mgorny app-portage/portage-utils )
-		sys-apps/pkgcore
-	)
-"
-
-src_prepare() {
-	default
-	eprefixify ${PN}
-}
-
-src_install() {
-	dosbin perl-cleaner
-	doman perl-cleaner.1
-}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
new file mode 100644
index 000000000000..66ce92577dbc
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		( sys-apps/portage-mgorny app-portage/portage-utils )
+		sys-apps/pkgcore
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index ecf5bea9de4c..8324fa6261db 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,5 +15,5 @@ DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd1
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
 EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
-EBUILD rsyslog-8.40.0-r1.ebuild 12408 BLAKE2B 07cf16b09fb73674ef04cbb223a8dd0afb85efa1a45af7f690fad2ffca4792ab03dd4cf333e4e16291405b6e2bcad1faa2f07ac99078b58042de443a0a1ff1c3 SHA512 db27530a5f24f75926bc1582029889f4b343fa0930b5188c36b5a9fef3f20581208d1b20bab5406e2abe77a861f483b7ed65232cf059a648d8fa5596ed776d72
+EBUILD rsyslog-8.40.0-r1.ebuild 12407 BLAKE2B fb4b459cd731ccdce9ac784cb11a618c19a0bba94711d079e1ec9d846f459949603b2c93d74dd316a72a10e00ffea64dd5ceee216ed29c2f826d30e02909e9dc SHA512 22b89e3194f4bc2419f9aafbdaf1aea548747c80790b33feddcde09f06721538e41aaa3bf7c9b190841ebe780d82b48783dad467b40b05edf56d4d05675492aa
 MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index fe2cba9b115c..93fad0de32f8 100644
--- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 2ce5699d5550..e8acb9337aee 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -21,7 +21,7 @@ AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4
 DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28
 DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
 DIST salt-2018.3.3.tar.gz 13953724 BLAKE2B 353f4ee23747f02200116157823b038fc8d361fb88f5f531a147d6c81497ba3f6cebf5a5abf4ac7f81199439bbf8a9cc46e03cdd76bfbb3c39f2b31a6158ca5c SHA512 f00ed83d5ec9d4767d7215fae8569ec560db61a0c8ded17469026e682e367c19811d33c6c53590a275ee24ad897a0eac09d8fde8ae9320d8706d6459ff3cc6da
-EBUILD salt-2016.11.10.ebuild 4810 BLAKE2B 988791356df3888838548cf8c5c8e76214bd7e985e32b1472877f60f74e907d7c5e4809c9178ff4e2bf0e71a29559acd84b54e7c0cb18b391147275138d90f7a SHA512 17468f174cb6dafd9841b6ecdc34278f586b28e3d4c41b6d5c12fbe3ab4c4e7695f00f6b62bfbddd980271059fac46030eecf7e7d6c44bd24e040034fa33fdb3
-EBUILD salt-2017.7.8.ebuild 4618 BLAKE2B 93d385676d3ae8c059c3d5391e0bee4624478b3e1946b08eb35e366e5fc4f86f7930fbcf27462edfaf09e4a3885fdab49bf729a7dbdb318d4df1155e3c26640f SHA512 1caa2092a3b8f9a8b2c85971ccde4047e0a6496f2d919980570f618496abb5f164414a2214a27c422e649fbf6edaba32cc94ea4bf1c08af8e19367801b15e7c6
-EBUILD salt-2018.3.3.ebuild 4909 BLAKE2B 0b7c998de374ff0dbff7b645652227b7dd8e392f868430b9746b1c891aa2c94f3afb528d1117b43d107b6404843508308ebe1e743aca8de3209a710fddae6ff7 SHA512 4a98eed9ab8791b32a048d83b15a8ce667cef21c472cbc03b79c57317cbf95ef192565c99f1d61f62afcd1a7f737d71b8493647a5c89ca0f16ceaa304964888b
+EBUILD salt-2016.11.10.ebuild 4811 BLAKE2B e071af864101dc59120ba09589001c33c0cac902121246d88c3b5a4d40df58dd2609cfc3f83a8de7b0db0262f9e7b9c51427bf9936fc4941f27286047dd7fc63 SHA512 9a42a05a861868f06b4e19a7c12e7320701286f4a45b7e8cf5fad18b408f8fa5cb7d956610411eced09475307d065e673bd4ccdb33c09d570875816dc225c265
+EBUILD salt-2017.7.8.ebuild 4619 BLAKE2B c7e7a0554211653869b06fe4df441b05261c2e50d5fcd3f749f55726ba0fe16d6b9b4278c8f85f83ec8d08320b7978ebeb4e2e96e759d8da5d8a4cad1c906c63 SHA512 11a6595cfb0b5216cd5a86f993779ecb595afc5378fe36ed8810f0ff1147165ec8e0e9dd9b82b1e7bc1f7560d93e32727813234c6bca6b1c6c9156616286335e
+EBUILD salt-2018.3.3.ebuild 4910 BLAKE2B af4ce229deb42386d7d4e2a608b0bbefa19e21d1856937aa3261727329e4d74c25deaf7ee998de81628c624d948f1c9d584a2f3cd938a3501e7b21cbf3d43d90 SHA512 3542d507a74d73fd383e1bebb9ad2b1ab471229e60d651c7b40334c8cf1fda6759cffafef9c1ff30e83c937aa8bdf3fb394f0a427ba75c3b141975dcffe057d2
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/salt-2016.11.10.ebuild b/app-admin/salt/salt-2016.11.10.ebuild
index bf91e90ffefa..446e43fb8014 100644
--- a/app-admin/salt/salt-2016.11.10.ebuild
+++ b/app-admin/salt/salt-2016.11.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ RDEPEND="sys-apps/pciutils
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
 	openssl? (
-		dev-libs/openssl:*[-bindist]
+		dev-libs/openssl:0=[-bindist]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-2017.7.8.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
index af04cbe98e20..4e8d5d440e92 100644
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ RDEPEND="sys-apps/pciutils
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
 	openssl? (
-		dev-libs/openssl:*[-bindist]
+		dev-libs/openssl:0=[-bindist]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/salt/salt-2018.3.3.ebuild b/app-admin/salt/salt-2018.3.3.ebuild
index c66e94d5e7aa..deb62df7a934 100644
--- a/app-admin/salt/salt-2018.3.3.ebuild
+++ b/app-admin/salt/salt-2018.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ RDEPEND="sys-apps/pciutils
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
 	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
 	openssl? (
-		dev-libs/openssl:*[-bindist]
+		dev-libs/openssl:0=[-bindist]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 	)
 	raet? (
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 1eab94668d46..40bef42ce410 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -5,8 +5,11 @@ AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f4
 DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
 DIST sshguard-2.2.0.tar.gz 737612 BLAKE2B 8c51a265d5bddc6d4da75e2c6aa84de4c84fd85466f1cb06000c01cf8552d3d3e291532e2a1bce5c6367a93044a63839b9aa584f65dd02838c4959d86220b386 SHA512 4f7bfcd0fe7237609cd393bd6ca235882de252eced03014d9fe713c7cf66a2ecb365c35c24ab62d034abad970fb3e9a07bc854e7e5d194f6c374fac74cdc7e2f
 DIST sshguard-2.3.0.tar.gz 755702 BLAKE2B 3b2e9bea3cf65c4e9a3ab82b6f5013c167033310d6f9ffe27d1d7dc9380be2214fdfdab4892ab9f6dfaa51b1131698d729257695ddef9debbc0ad06a9f49acfd SHA512 b3df479a752e0263fc444c582dd6c89dfdd4154ab011d23d0973f16f3b3e60f21f01b53e6ed0c4b138f134cd7e3dea5e67b44901f812f3da0d1aac760eeee279
+DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
 EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
 EBUILD sshguard-2.1.0-r2.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
 EBUILD sshguard-2.2.0.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
 EBUILD sshguard-2.3.0.ebuild 758 BLAKE2B dfd1fa524cd39050914e515e324540a78b90e2cd430af7df36c272b0a600410cabb763572d766857b3271f7812697f8f16b1f16b00cb5af4ce5ecff7b164e1d3 SHA512 6009a78a97a2252ed3ba06f276e10b70c9fe99e3acf343081aef63bbd021a9406c2dba6961178f05889f8dc72767bc09eb9c499b59959b15a0f40239bca3fbf4
+EBUILD sshguard-2.3.1.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
+EBUILD sshguard-99999.ebuild 799 BLAKE2B c163d68663958a738d828b1c0da1c931036673dd2da7884312fa9152005e4349ef4004f2b272503ce9e27abdbd6de09b251e9fc4ea130d341ebc0db252af41ad SHA512 272c3c1cffa45a8b0ac24f303ccd69629f26c42de3ac3c064174ae5307bd33d72c775d0f8512a8de47eff59d1f4c0cdb46c60634f2a40ea2fb5875787bc9d114
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.3.1.ebuild b/app-admin/sshguard/sshguard-2.3.1.ebuild
new file mode 100644
index 000000000000..3fac136a82f9
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="https://www.sshguard.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
new file mode 100644
index 000000000000..407363556f81
--- /dev/null
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="https://www.sshguard.net/"
+EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 7db9a53475f1..108875fb914e 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -32,7 +32,7 @@ DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.17.2.ebuild 4912 BLAKE2B 0b0c7f94e90c62e6109b9015bc49b63e9b1819935f01d0be709163289261c037b6082344c86a0b4043b5a9141d348107241724def91b3cd158a2169003ecde02 SHA512 c1cffac81d810cd5e2b56bb96a1e0031994bda99fdf67e053a2fd178f01db92116deea62a06c583fac3770f04535468f3b29f1a57f157f806d52cdb2157f4d00
+EBUILD syslog-ng-3.17.2.ebuild 4911 BLAKE2B d8e99d8068d8fe923af328f49c53fcbf9b861945f40e79df6de40201e38c9b3feecbb33385f3e7523ee51a996a0531b27f12b6a94c77005dd4e7aee8873507f0 SHA512 56f758b355e364f6efecca4c54ce8e02676d0e6fc56d4800b363eca92309ef0dcb4cb4678d0c87b0d1302f9e35b5d53b3b4c4a9b182391564dd022ec57bba139
 EBUILD syslog-ng-3.18.1.ebuild 4888 BLAKE2B 7c5354362dace4443e1a7137765cdce2a4c15891319370d4b0ee7edadda3a5438b546addedd85dfdd78255333b4231fde2beadbc6a1c60e588089b098e884eca SHA512 515d7bc671aa54c71da0910a75600d5c9a2f1a422699c86bc48a77c34172f55b39b7937879b88cf5faaf57459d5c68083276983ad8674432ac5605ece6dc9850
 EBUILD syslog-ng-3.19.1.ebuild 4905 BLAKE2B a09fd525ed80acd69e4a4ae6cbc4dc73d0588eaa18a2602c6ee7c0f75846cfa4db77356772cca43fa0782c5e1486e0f0f4459f7d1a99097750aad5f04422dc51 SHA512 153e9cf0044a6ddabf92aa58ed3d3a7a2f7746b6232cd85de6555056c21d7989d6a235847835ccf1d0324a2239646d6e3c018f8ace1b6469536f485a798dec26
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
index a8095fba3df8..61895ed44e57 100644
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
new file mode 100644
index 000000000000..7fca6e639c1a
--- /dev/null
+++ b/app-admin/terraform/Manifest
@@ -0,0 +1,3 @@
+DIST terraform-0.11.11.tar.gz 10938952 BLAKE2B 76062c2c95c95751f7a1a28fc7047ebd2255504dece99efa08ea8deede5e774a838571a2e0ab81fa90e2580823958d8e1781d154ecbed9c1d839a0cb2998487c SHA512 7c0cf4b0b70eab7dc88133d50ac4b586b72ac53e01c21c00766d03d10c753cfd404b146add21e378be8f1d305c5e92703cbaeac9e4c4b55bfc8b2532f74f63ee
+EBUILD terraform-0.11.11.ebuild 632 BLAKE2B 9933f6ef97ed0c629567e2dfa111b7c52315a591ac453608e11232f7ccf7d4ad41f7da60356efdf80105f2209b489e87107d62aa984cf01a7e0609a5c8002ab6 SHA512 df9a3601a1149dd4f09a65618c421b2714c74af1fea0c3fab4249576c2b4320532f8d51c9ae8583cbfd936cb12fa8d4b961d4b61d995faa3bc651a60eddb71ef
+MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/metadata.xml b/app-admin/terraform/metadata.xml
new file mode 100644
index 000000000000..6cdb29b9fbee
--- /dev/null
+++ b/app-admin/terraform/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Terraform is a tool for building, changing, and versioning infrastructure
+		safely and efficiently. Terraform can manage existing and popular service
+		providers as well as custom in-house solutions.
+
+		Terraform files describe the components needed to run a single application
+		or your entire datacenter. Terraform generates an execution plan describing
+		what it will do to reach the desired state, and then executes it to build
+		the described infrastructure. As the configuration changes, Terraform is
+		able to determine what changed and create incremental execution plans which
+		can be applied.
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/hashicorp/terraform/blob/master/CHANGELOG.md</changelog>
+		<remote-id type="github">hashicorp/terraform</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/terraform/terraform-0.11.11.ebuild b/app-admin/terraform/terraform-0.11.11.ebuild
new file mode 100644
index 000000000000..15c8b080b179
--- /dev/null
+++ b/app-admin/terraform/terraform-0.11.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+		-v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+	dobin terraform
+}
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 3a6e52f8a3ff..0a9b4ae50497 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -1,5 +1,7 @@
 AUX tmpreaper-1.6.13-fix-protect.patch 1204 BLAKE2B 8c1b66d939ac8e997272265744873a22a5e5306d8fbec6e56ace78cf4162387c2cb2c2d7372ec62f0e7c99fa954d7e321482d0dbaa75ba6e3ff48a8785277e3c SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0
 AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74664f8abb2c58957dec7fcb17bee7c1b5b790f4e7283af9f82fb1f7eac2a76f73c5ec26804c6bd799643d553fb56be17 SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9
 DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 BLAKE2B ad2895e0444e3c1a1ceabf71c34b560a817e7cc274482bde63a07499fac799ef127f5b64c953d43cd11a279819972b63b7e21a683f6250a77eeadc299a491a78 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f
+DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
 EBUILD tmpreaper-1.6.13-r1.ebuild 1113 BLAKE2B 34be61752588526b7e06cf50b816f049604af02125ac7b3e8b74c12d76afe5282d3f940e75f760b1f50e5be0ae9b4105f408529675957458fd7cc3ba546edc8f SHA512 1c40a66f0fdc5b6cf9406af6b985c8bb32eec4f3f2a21839fd1e87ff57eaff4a85151a1cfd21a5b0e1f61e67fae079b4c37c85b45129c58477fe1f2f2f187be3
+EBUILD tmpreaper-1.6.14.ebuild 1136 BLAKE2B 9298b9c9a0f4db5cf696cf0a3fd68091bfd139731eb433d6edd95c2f50b4b0589a97779314473266048274e829c4b7cffaf24aadac9b4264ca0cd02a828b0d26 SHA512 957282bb12a806694529a11d9954fbea7bc247240e78f423bbeddaeefd1fe9c180032caea1f272337bb9f4bc727843d1414ff453f644dd2b13f69bd46407fdfe
 MISC metadata.xml 1167 BLAKE2B 7c6f25158d5a4e3e4586ef1824ccfa233ab52f6695324951ae6de2fbe4247ffd780f2806254066f34029b661c1313b01f0bb2f67ef5f335e95be97f6a9fc805e SHA512 64813b5adc37817c87f5eaa4bed0e725a3b24b2e3edadd27c92c811d13f30c09d6334b0ab18a37b4f028a335b75a5ac43be19073731ce58e35f8528335c6176a
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
new file mode 100644
index 000000000000..7f8b09f6daca
--- /dev/null
+++ b/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A utility for removing files based on when they were last accessed"
+HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/util-linux
+	sys-fs/e2fsprogs"
+
+RDEPEND=""
+
+# fix protect patch from debian bug 636459
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.13-fix-protect.patch
+	"${FILESDIR}"/${PN}-1.6.13-gentoo.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /etc
+	doins debian/tmpreaper.conf
+
+	exeinto /etc/cron.daily
+	newexe debian/cron.daily tmpreaper
+	doman debian/tmpreaper.conf.5
+	dodoc README ChangeLog debian/README*
+}
+
+pkg_postinst() {
+	elog "This package installs a cron script under /etc/cron.daily"
+	elog "You can configure it using /etc/tmpreaper.conf"
+	elog "Consult tmpreaper.conf man page for more information"
+	elog "Read /usr/share/doc/${P}/README.security and"
+	elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
+}
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 6f8826913fb4..38a5b494853b 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -2,5 +2,5 @@ AUX tripwire 466 BLAKE2B 1fca6945b6b8ce959b7c617eef9454690662676020ce7451396f8cd
 AUX tripwire.txt 11492 BLAKE2B f157c47e1461095a51e9868127d25df6769c3ea6441fe34925c29ef3e93541e66516ba59b1c04120979a4edc1f31bf166ac72998f2adba571d64ffa7c7008fd3 SHA512 ec53b2f71fb33f227628e1160a72fecf4a1aca7ee58b750945e7c0d0ce756a37666a02fe9e8ec235055fe6d28e1d20e77a449ae229f5d5d2349eaffe07827d47
 AUX twcfg.txt 604 BLAKE2B 78c0e1457e5ea37031c8f9cf5a340ee600775973ea2475daadb07f3cb59f117667506438628ced1b4b1fa738855748df7d4b2e6695d65de9ed832f335943797a SHA512 c8a568638d5a18bb9508ee6f70aea815b8bfdb9efbf7823cdad59890a617bbe941454f6f4622e38e4ac4622e1d611c9fc085d73aec5a23b5c13ae7f1d783b388
 DIST tripwire-2.4.3.7.tar.gz 1002257 BLAKE2B fb0c847087e8b27d2a111b4a4122b3c4d5b187efe6f80995c6d06c7592a22fec2c537bbebba9c21a7761a8047535de4a96a6b94246da586faad4e9fc92137196 SHA512 541138f4a4c3a4227f31de6607503d305f0d893bdd5d24928d619d3a25bb8fe7061a45c041992ace957b976b834b5f4212b5c727eee1cbc76ddb2e2c52aeafbd
-EBUILD tripwire-2.4.3.7.ebuild 2411 BLAKE2B 9646cb96ee17a4e2a31d7c4ac065a72b363aa89c809a41ac94bc2d414b4679053378c6697a758e515691eaebb094ee2bdc65c38240f0a18c903f3c4e061e3b0d SHA512 09e8911547b7a629e5bc546005b9a17aae84057d93dd956a6fe687819f1fe5e09720d48caa72844a8736e2cfa23bb6b4387a19e31e1b8e587e6da792836a5838
+EBUILD tripwire-2.4.3.7.ebuild 2352 BLAKE2B 8f5af9db16c1d2bc652d1f26da4fede5931263265cd5a55fdddedfe90dfa076a854c26a01f90a5816f9e6acc5171e1365ef3f8d3f7e7d799089778a80bf5726c SHA512 97ca9b2dc6cce1fe4de2b1d710c48bc51bd07a90f6fc72db0d1def23f95e7936cd3327259d14f15ff76dc7ceaf222a7ad9836ae2cc1e57a9300f284765f5ef80
 MISC metadata.xml 1616 BLAKE2B bd19945c4dfb57c6e1102e5d2460f5784fbc4eb54c53a04052a08f45c4131edf8117e834d1b964a350512618e875aab3323f986ea71a893fee19ec08b54a0da2 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2
diff --git a/app-admin/tripwire/tripwire-2.4.3.7.ebuild b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
index 4339d2ac489c..106459556912 100644
--- a/app-admin/tripwire/tripwire-2.4.3.7.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,23 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="libressl selinux ssl static +tools"
 
-DEPEND="sys-devel/automake
-	sys-devel/autoconf
+DEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="virtual/cron
+	)
+"
+RDEPEND="${DEPEND}
+	virtual/cron
 	virtual/mta
 	selinux? ( sec-policy/selinux-tripwire )
-	ssl? ( dev-libs/openssl )"
+"
 PDEPEND="tools? ( app-admin/mktwpol )"
 
 S="${WORKDIR}/tripwire-open-source-${PV}"
 
 src_prepare() {
+	default
 	eautoreconf
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index fde1f737acc1..dd8acfd5f40f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,14 +3,10 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.10.3.tar.gz 15902247 BLAKE2B f69ddbe1309800cfae756f8ca1dd0da3e92ce49a1ec70539dc30785344afb7fe39472dcb2fb5ee4f410c7b52b13b00996b08d89624ef8523adcf4f809601ad5c SHA512 baacf549f9b73d306154dad6cd6efb3fb0eca3280c885cd772dada524cd436c1d5f1f705118274aa7cea6002cd8e0b86f1dfb02c4f5787d08dc535112cb62096
-DIST vault-0.10.4.tar.gz 19207588 BLAKE2B 035e83c1d119b266817490afd4506fee5e5ceeff8a7c59188c59e28067f06e78f57e06d200026b288908f49a19ed22ebfd67e08c3c70026c7da22d05e33ec343 SHA512 7331e49c2bebbbbcebc74cfc1ce7d6984590fdd39b47f0bbf1b610cfe37b900a86b8ea63bc5d5e28ba34b68433944486979177aee6c10bf188095f5a50a4b61a
-DIST vault-0.11.0.tar.gz 24430984 BLAKE2B 0c1d40ed9f8dbc19ae7bce38308f7a55e12e8a907798022ce6b5783f2be9b9d7a9a1842683b8df411b3b754c716fd7366a0261d890e2153c64a70df6a3c6b844 SHA512 33e1e76a0e16803a8d0d6ed8ec0b6d1f8876d54ecf35a70bc4969404bd7991ef0cc5986eae958885d288bb316396e0594a5571b7a11f8b052b22b445388f03c7
 DIST vault-0.11.4.tar.gz 25456828 BLAKE2B 35ed79e8474c4fffb046b5163bfd7115ca4ffe3c3560732d9f73349a1187417a288c30985d7ac450b86f682aa7a1d5318634c1be60e5bffce04137e32f2ad13d SHA512 99e592d679d65d75d62812e2d0ae9a652342a97f4934a2ca00a9ac044cdc92b35e7108296cf1a700ed36818a504fcaf155f8f61d7b10d84933932bdab00a9f7e
 DIST vault-0.11.5.tar.gz 25459691 BLAKE2B 9f77e90b71629e1ed341d03830a0376b6731d85189dde0205148c7c8002556521538144cbf1b7bc425253cc55de6ab3d48cbcc1d270165e5804f7f632d06523b SHA512 b290523ee94199d241bbd2477ca686076f645804953181996aefe2a425bc5114db3d375fd5c832d1fa257a790947544406f50777317e854ccf2d4d4477ab6ffd
-EBUILD vault-0.10.3.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.10.4.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.11.0.ebuild 1623 BLAKE2B b20a2fb723fd052978e8a332e7393933c37afccc8e9cad3e63a184c46bc576c62bf31cd0ed8088d3ad3c5bf96e72f1acc7e0d69d99521f26bb1ff4b8cc0e65ff SHA512 adbc520dee1262a0b991adb67feb53d065593d1fedfb13968dc13565dc1b62ab509abcdd8c669e40d18539a4459374b727572c61099a35050b979704d08b0ebe
+DIST vault-1.0.1.tar.gz 25817507 BLAKE2B c4882341fbcea2051c8685dfff85739f11898d0406d12611cdda36f19d7badae69e88060d593ba03c333b151d4402b7bfc520f34c0663fe00a77998aa662f161 SHA512 b644e419faa8dc1f8a347f7b522ccafbdea9f849de9ad1ca085214d21e50bd2ec6eb868b4eb0abff65537abc4fba93c3e4ffd424afa90ca049068e6eccc99999
 EBUILD vault-0.11.4.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
+EBUILD vault-1.0.1.ebuild 1620 BLAKE2B 4cfe3ee73464ce3f1c53c9f1afc42022e8feef5312e678630b4e52abe2298baae67824f63b058341680c953713e94c715f9caa773312563588e2ec712eb7bef1 SHA512 9a1ff9ac7f1b15acda152467f7d9f041681f570eda71848c05c62643dc155c7fcacccd8dd3aac4bafe51ace6a9522cf847d5a47ce8fdef7677d8ff24cf605b82
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.10.3.ebuild b/app-admin/vault/vault-0.10.3.ebuild
deleted file mode 100644
index 2e6d92497501..000000000000
--- a/app-admin/vault/vault-0.10.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.10:=
-	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-admin/vault/vault-0.10.4.ebuild b/app-admin/vault/vault-0.10.4.ebuild
deleted file mode 100644
index 2e6d92497501..000000000000
--- a/app-admin/vault/vault-0.10.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.10:=
-	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-admin/vault/vault-0.11.0.ebuild b/app-admin/vault/vault-0.11.0.ebuild
deleted file mode 100644
index ef100d79cc30..000000000000
--- a/app-admin/vault/vault-0.11.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.10:=
-	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
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	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-admin/vault/vault-1.0.1.ebuild b/app-admin/vault/vault-1.0.1.ebuild
new file mode 100644
index 000000000000..50b0e07331fb
--- /dev/null
+++ b/app-admin/vault/vault-1.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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.10:=
+	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
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	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-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index d76d302454d0..5948bd72cbf1 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -3,5 +3,5 @@ AUX whowatch-1.8.4-tinfo.patch 627 BLAKE2B 2b7a5623188bda62a038a07ad6796e66821f8
 DIST whowatch-1.8.5.tar.gz 133845 BLAKE2B f0f5b80d7adc488030877936ab8d12687f8b5617e445efa604971ae6e0b2de403b6f77a119f9ab1311811900003af85235ad546c425296facece165034b82cad SHA512 9a534dcc859101e3f6636fcfc191be3c0a66b843225dbace0d851f8cca7bbf1374929f604414556c651167c24a223525304fe2963a92b97ba97a8f57179ec738
 DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf71f1802cc8055332f4614b9ca9f6c17dea10b07bbd20f834623f9e10456b19c6393996f6c66819e7e921ffb6240 SHA512 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0
 EBUILD whowatch-1.8.5.ebuild 694 BLAKE2B 493fb8d1b96c927eca5059ca1bafa7073f85ec8a5e334dc4341cbdf35cda3e5572128dd03adc2442c08843902f55d75f6e5d985e3fdacf7b0ce8261cb94833ca SHA512 2c3ceebdbbec7055dd7bcea688a3cea207b4545672f05eb8a2996a181b96dd87cdbb6f53cb3b479f1e9a15954bfd2b5d580926ed3bc3b95072d1cb9ec5185a83
-EBUILD whowatch-1.8.6.ebuild 707 BLAKE2B 668d7a1f8c8aa70f3b450732c0d3213089d2edd006e054a2fca89a9cd2d8e652a1f5951351f3ff4b5a33ff7debc3c4d5102f30766d47d72ba375aa0fa3e796eb SHA512 b50c34ee41b33ce227cbb77869c7a8d39da6c8bfeef94746ddfd16247ccf451740cb2131e9ff066894ddd24c0952c7d636285c6c8baa537643643d2048173543
+EBUILD whowatch-1.8.6.ebuild 701 BLAKE2B 2d29e4bdf883c54ef2ea612a9b671c52e408d2dda55785381b5a415e88e78bd6d94d43144b0426663f9c86372c293223eea7b5efa31907d9d85312e53e451596 SHA512 db468c93d217b0d65035f049206b7856946fe90947f5589c084529d1905e86a5eef1f531945b2241b261ad95879d2a19598bd19e92fd8d6714b896a9b9ca3bdb
 MISC metadata.xml 388 BLAKE2B d26eb0308267a387313561d328a2663f0345fce18d558e42b3e1b787bdef2e09a352558285621882b1def719b358b98d3314c6f8371049faf152dd565653df6b SHA512 6f9e4b4105915444690434f721d6fcfdc78fff506927a854c13a67d06d81293361f44f19c55fb78e32daa9b70a07410f844924f94a251cbd0aa71adefd9de5f3
diff --git a/app-admin/whowatch/whowatch-1.8.6.ebuild b/app-admin/whowatch/whowatch-1.8.6.ebuild
index b29bc3afdbcd..ba5febb05efb 100644
--- a/app-admin/whowatch/whowatch-1.8.6.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mtsuszycki/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8d905c49bfa3..92140da04f41 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index cb3a4ac3ef9c..529a3c5dc4fe 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -10,7 +10,7 @@ EBUILD brotli-1.0.3-r1.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005cc
 EBUILD brotli-1.0.3.ebuild 1398 BLAKE2B 7cce4fc14efb56d134eea51714e12c1dde687a5d57daa2d27a94d39358a26633dfb0a380872bc9a32e32c4d772fa8602eacd5f857c85f4dd5e096c4783b63e93 SHA512 8210643e246c6172946577112adb0bd721f2a4810461db192ec2b2e2bb7ca917b5dde061ce760aedfc7d908a5944ec4dc89ace253adf79b0337b0bb2b0f2cbef
 EBUILD brotli-1.0.4.ebuild 1421 BLAKE2B 51ff6f7042873b1ae54672c1727f5558005ccf84ab385c24bd3c036b4533d181dd0adbe59e8d2d0aeb37bced3cda7399ed447cbce8fe2f1370347a153c48095d SHA512 65d064cb8c1c99874ae66de10a2204d5506a5545c7af26839105d6dbbf6767b52630745d087ba46c9c12168ec329f79b2f8425fc165e8e2c4c41a0d1a9d8a86c
 EBUILD brotli-1.0.5.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
-EBUILD brotli-1.0.6-r1.ebuild 1681 BLAKE2B 538d5a4646c76801cc70b4ba508050936d8f16376471ffe3d6d560946b9e7ff0e3dd9694a1f81e28fa99e2e7fb0e1e7b37fa05b4aad2b2c9d2f7a6b274401743 SHA512 688006d1cdf25a31c8d39b3b338224c91ec141903172dbfa1b38cb691744682ba18e974c469f1da7e8e1c31783ea9c61ee2b1ffe1acda5d4526a7293caacbd60
+EBUILD brotli-1.0.6-r1.ebuild 1686 BLAKE2B d7e5aa75690e1b99cffc83eed6fc1452aba1ce028ebe8bf19581f5676436b86848f4f3c9b5fd6e1fce09a7c34c9b752ff4bf982579389bac7945a7f13f99d778 SHA512 8682e48d9240a3770842cfab439a8a3f3bbed0468ccf5780a47b32b3c7080d3583ada34f6892e4278cf241ac8c7dab4168550dae57a3ae16d32e727b05700879
 EBUILD brotli-1.0.6.ebuild 1458 BLAKE2B 6f6ac8909b67f8aad7e25d99601bb1fc20b2e4878d7332f844ca85c93c8e0c0cb896becc9385832536e476302451b19c2ec8494004ccdcce6592ebf1e12ef668 SHA512 1e5263245c4db7d16c208258dae98aa648845845fb409e39784207782c8d5978a7a23549d36d7ac60ec704cbfc356257b73825839a26ae79eb9bc89684197f35
 EBUILD brotli-1.0.7.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
 EBUILD brotli-9999.ebuild 1691 BLAKE2B ac938a509d769927e26940b3609920e677b7ee28666c432a5c6bba3136c0d5079dd6851cf69ebb40706ec62a2999584b5640bd7796adf8a828ec1f1c294bcbd1 SHA512 7fbd54a327c2d8cbde9816f3dbd9f7545d5ff1bab76df2bb5f3c43cf1382e17f4b7bcae71384bb164d8ddea7e0272e062a7df8745a4e3eee3b9be7c2c1c06749
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
index ef4b40cda6e5..03be7312efa3 100644
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/freeze/Manifest b/app-arch/freeze/Manifest
index 6817bacbaad1..16d6ca494712 100644
--- a/app-arch/freeze/Manifest
+++ b/app-arch/freeze/Manifest
@@ -1,4 +1,4 @@
 AUX freeze-2.5.0-gentoo.patch 1541 BLAKE2B eba0b527a2eb4ab7d1d163d98668dd50270e9edee9d5f2dc0cb0d618bbdb908161a9e07fa294b517049731226c4915344e7bffbc224e5c1851d18d69b202546c SHA512 be93f27959405bb7ca0f7407e32e93d9b1bf5f202ad6100e7a8aa18fb8b978402fe5293714a116c6eb7599c84c2186eaf518025c1dd8cc8f6184d346ca54eeac
 DIST freeze-2.5.0.tar.gz 36010 BLAKE2B 33327c8b879df348ddfd360917525ebc399e8493c5db6f51be1d8a23544b5ac3939570d1b9b002d177d6db736011af1e462c0e037123665041f9931fdd40d5ed SHA512 2e0965e1bb772a829763b99c623b3dfa062a624ed2bd5f658c9df0e4040a9c914aec5a85602340fe994634b82d2fac3250030b35ad3d5f5054b0a6f4059469e7
 EBUILD freeze-2.5.0-r1.ebuild 929 BLAKE2B 852f15218155642c32431dfdfc53293cc59164fadecc00253a9083a41e91d1ce08853552f03a3f912f16da5a36ebb74c50e2c19cc7ed4f1f651fd63a01990443 SHA512 7e49c0c0487795b89d454ae4feb8043ba99d98a1c89600dade03b914bb74db73f03164bc574ff1852a6709819cea5c6fd4b5b4efb90478626a4dce78a3fcc159
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 473 BLAKE2B a3fbc14f53743357d670987cf9795fb0a2b100ad7a862abcb6ae7d346b76f4606ad51e6e5772abb43e3b45520b3d378307af5e9c88890d6c4fa001d1e9382e00 SHA512 921722e0cc447f32d3385de5d8625bc2462dcc64be286b89d88b781bc3df215ed4bb6c7fb7a7363efdf324aced1296b2d45489acfdfdda13df9819f10e209691
diff --git a/app-arch/freeze/metadata.xml b/app-arch/freeze/metadata.xml
index 6f49eba8f496..dd4fcd15ad54 100644
--- a/app-arch/freeze/metadata.xml
+++ b/app-arch/freeze/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>net-mail@gentoo.org</email>
+		<name>Net-Mail</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>antivirus@gentoo.org</email>
+		<name>Gentoo Antivirus Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index e4342c3d52f9..4ed38a323131 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1,5 +1,5 @@
 DIST gcab-0.7.tar.xz 332248 BLAKE2B ef9c03b86c0e73b94286ff30dcc41c031a91dad0b124b601adda3ccaf5ae5924c4ea4408dcc52960b641e799e1c31e8ae882a205a3707c7a5dfa796036a00dbf SHA512 db8c0b4ee2bc75b8bb540b4fe0e9304782b9848b3ab0ba3077638d13cdec652f6178206ec6474af036fba90e952ef0052dd9d19be9eb72bae97d98f8f18a0c02
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 EBUILD gcab-0.7.ebuild 941 BLAKE2B c84ecf6ad2a57bf19225046f239d0c185b80325476f6f55e68182bad2bd2b5f07c59ce0df83d959ff569da40fd5850b0d09375d6f082a88760794f79c4e6bb76 SHA512 e7cd50ae66c96e9d671ea9fe72074c7b0d0031efaa2819ec6629079de12abde02e12e13117f22d728cf642e653a5a4be974173fdff599c3aa7eb75442c32e729
-EBUILD gcab-0.8.ebuild 920 BLAKE2B 9b7e2a2d57a3e1dd4a19e618df5160d57a9e0e157e0b58a51c135efba67974bd9bd634b34031a852173c29d7abe13370576feb3b05207cf055b50e26c5ec8768 SHA512 2eece540718d0b2ec76e68e698525b34078a7567ec870f4e26e65c2d9656634f40fb849b0dd8a86f06088fda5ca8aa948ed039af01f0640a408943347acf9f73
+EBUILD gcab-0.8.ebuild 925 BLAKE2B c75fd9d6e4983af3fceefda6b58e9b67f51836cc5794ba7dbbccaed9bf7b9e87193357ce22f59bf8020c10b80c6d126c9ec538d5445e5589f3d0aceb5f9e7d54 SHA512 b5e6a123fa608b3c70ff45c1538cb0912cf82e1c69a26cdc23482de99fc5d68945bd04745e7aebd2db6205d8089758d7d194e5928036497975d07ed47b4a1d7d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index 87e5cb3da473..c39c71ed870d 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 79572500af42..dd6efd923690 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -6,5 +6,5 @@ DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4f
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
 EBUILD gzip-1.10.ebuild 1138 BLAKE2B c7ec9fd93959f31566e67e700d33aea7f59d8da16bda6a9a123a2bf2ab9249b5c87655b9dd224d74451c21e6cb54f7799da58618ac9df2345f7485a8b3085b72 SHA512 b5430a9d464209f68e350628ea1146d90adebb65708d66bbcb67e6069900f329459b983d9d5101bbf91d1700fe73d44c6a9ccb07675478ed5f7817124b514306
 EBUILD gzip-1.8.ebuild 1177 BLAKE2B aaf2b99cec28e67f048a05c88d3a958140a322cc7f232242c06cd800443e8cb5f5e05d19bb60e6662aa01dea521a0ccb79cddc2bc8160880eaf3ea501da10a32 SHA512 f64ac3b923a2dfcb881f90cadfe64cabde16cbde83fef903b35bae5ce23f5422f281cc04e37c3a043978d59d08cc506a06b489d02b4a347a15b7aee1b43b4a4c
-EBUILD gzip-1.9.ebuild 1186 BLAKE2B bbdcf36e93d76e4dc0e92b07168f8552f15662a9f114a2ddafd4f316acbf9065d809e1cd69a29ea9051da9c7783f50f0d6de9235d6875c4e32c14bba0bbb58d6 SHA512 d61eee73af92deeeeb9750b120d3a3f8bb413daf6b34fd02abb14ffd6c4db76bde32c8f1e3116008297a911c2dbef075c842be403903e2efb7597da3fb01b328
+EBUILD gzip-1.9.ebuild 1178 BLAKE2B 257dc58f30973c8437c44c29a4017b8a1ce24fc71e990cbc3ee692c16bc855b4defe087124084548b35e2dfda4fea6a62167e51048b30b6155f861b2764cdd12 SHA512 ace6ec1ffdad0a577c7481bdaac5cfbce3bd4cec3e9639d1811b274ef1e744c21253d575883bdb9c5dbb31b93f74ab41b91d8633dc0e249a5750621e450dc6d0
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 1987bdf71292..7bbe82f990c4 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 PATCHES=(
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index cf9b7253b5b2..e47686ac35ae 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,5 +1,3 @@
-DIST innoextract-1.6.tar.gz 183380 BLAKE2B 581c0e28ececbabc8785f50472f312bc39c62d9174c1902645a961f06877c3e702ce0386aa611fe954c412997a1a69355e441cc33e243abd1828ff5e9d2ff8a2 SHA512 4c1b50a050d45e1a56d7236150a801cb85d15de8c80f5f1fd94750f3dd2392bdfb3f0e98c214e9504fe6132c7dce3a0dfbe0815ede438aa0f76a88380ceeef62
 DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
-EBUILD innoextract-1.6.ebuild 749 BLAKE2B 4b959791b3ed667c0d017f209fd7b0e65d088ab7ca880e9aedc802a3e9cbe44a7b232823578578d540eb23a937a8f2c19465c1036154800d5fb5ac97db5328b2 SHA512 991a70217b350cd81ca3b026425ede051213c804f4032b4ea1b0fe3ad05e9273d705f7d55b3154fe856de2ff56f529e148ce7931215b80fac8299976aa7e37bb
 EBUILD innoextract-1.7.ebuild 731 BLAKE2B 2372ce7018c12a5317232d6ac6294297e017034059afbe49b934c017367cef9ff343b7d74f754b5409e212a907ea933d6e381c60a808534a7a667ae3f9cd1c72 SHA512 4f9f49dc8b2c5679bca97058401b5b071d879e192de1b6b2eeb5e43d0a2d41702fb100e7c45a22d3eca8020785e41c992e62e346432332ba684cf03e5dd3eded
 MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260
diff --git a/app-arch/innoextract/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild
deleted file mode 100644
index 509f67a4b24c..000000000000
--- a/app-arch/innoextract/innoextract-1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A tool to unpack installers created by Inno Setup"
-HOMEPAGE="http://constexpr.org/innoextract/"
-SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +iconv +lzma"
-
-RDEPEND="
-	dev-libs/boost:=
-	iconv? ( virtual/libiconv )
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md CHANGELOG )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use lzma LZMA)
-		$(cmake-utils_use debug DEBUG)
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		-DWITH_CONV=$(usex iconv iconv builtin)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-arch/ncompress/Manifest b/app-arch/ncompress/Manifest
index 17310580ba63..f9c0528cc501 100644
--- a/app-arch/ncompress/Manifest
+++ b/app-arch/ncompress/Manifest
@@ -1,3 +1,5 @@
 DIST ncompress-4.2.4.4.tar.gz 32571 BLAKE2B 6b404b350e46635856f7329a1e5eefcf38ce1f16137c35ca2226ab8add12ff4d94a289642b0a3f2ff59cc584c2f54bc330756df63f41fd34c958eb173b8eccba SHA512 abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be
+DIST ncompress-4.2.4.5.tar.gz 35562 BLAKE2B a09661659a72cf4be40e143d8cff53779de7423c0337d8c92863509390d8adc355d660da98db9de431bb4c990f8d10955e19a97188b100450ff9ea2caf19ae8d SHA512 487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3
 EBUILD ncompress-4.2.4.4.ebuild 717 BLAKE2B e7674f1828c2887ebbd0e19df0511055f318eda353a379d7d5e695c9e54b88024cd1e7a1edc20dcfa5d6f3473622d446fde1680901e732d27b799d2e72a8de13 SHA512 b7190ac40d5e63ee28697cc49f9678195e189efc1f23fefe088230b82b314bfba274dea7fe2149b84f87fedf7f04e38676f1f9293690e358682fbc002227201d
+EBUILD ncompress-4.2.4.5.ebuild 728 BLAKE2B 1cd715e2a37980993a84030ca72b9ccd7f11b639442f2c8dd4730e3bfdd941f7d9fcaa27227ae36d6a907237ca9e121ba7c388aeb2a31876d4440cd2cc099d32 SHA512 8ffad1e1e1a6a36a60bea6a269cb26fe1fae6abf3c0ac8f50b87b78991ec49e32196cf3c6a0b5e2ca7e8f5c1658e88122f6da7eef72d719253a4f5a14968a297
 MISC metadata.xml 392 BLAKE2B 1e59934b640d08d7728f15bd88534fb4e72e0c8cc6c39cf4fa5f5a188c4443bfaacf081a8284d2c508806b7c11553d1ea5c18cc477db48fa733875d2d4535cd8 SHA512 7f91577b6e22f6bbb9b28a59a5a4391a52e81fd6f654348602e3b7908a70972df4b34729c42e029a5e1e2354a973c60578a6cd0408f0bcce0200e3d0fba8bc13
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
new file mode 100644
index 000000000000..4c9bae62a6c5
--- /dev/null
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files"
+HOMEPAGE="https://github.com/vapier/ncompress"
+SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin compress
+	dosym compress /usr/bin/uncompress
+	doman compress.1 uncompress.1
+	dodoc Acknowleds Changes LZW.INFO README.md
+}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 051b76b4540b..47d2d159caf9 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -1,6 +1,11 @@
 AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
+AUX tar-1.30-CVE-2018-20482.patch 5083 BLAKE2B 7076e270d559e354d78112762d4032abbc8b79e77ae7b66756180287b0c88fbd2cfd6df6ac0ad930d97fcd93e2990432b7689430499b6cc4d941c403b0961409 SHA512 18dcc31c12feca519004791d9226e1bee112cec5d7b5576abd4dd83124b991df370ad08de7df2e413b8f4687db9a85853ae3748283f6ae37941de5dfd0b566c7
 AUX tar-1.30-fix-test-117-and-118.patch 3109 BLAKE2B d547dfb115d6cdbdf565c93dcdc70c9d2d0cde70228f58763e74d4cf5df7d621a5fccea375c3e103f8dcc04a19b3318b227384db2dc983cec5876eed8861cece SHA512 d104bbd88dafc0c3bb0308fbfb1dfb39b6c26fed14a316c30c2355d57ebe16172c0dde8ed6c91696b90f37622a43b5b1d70f397f7de521b9bd1552a5af78bb14
 AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb693532e2c3bb2073a8d55631aed142ab9c3adfa64d6461eb1aa9221a1aca6ec5086f15b3b9154effdb8e7128a8601 SHA512 aa1c80edbf1c846e23aa34ed343ffebad969b26fed9d4ccdc779f3df5bc384bb44d6c78044c385dbb7c01e68462568b941e8ec1060eb97bf36606d7beb790c1c
+AUX tar-1.31-remove-erroneous-abort-call.patch 989 BLAKE2B 67646a590097860d692e158b41c960c6bf4372c2018d47b9f71da7972bd25afb631cd851178d0bd8eb19c26d54bfaa8f1ed42da97033d262ccfa0c0099a03daa SHA512 c4d317b9968c0638287e6dff77a7660d36e8ad4af56039146992d519d05a0f73b6a459cc88de7a4afd9909efd1bdbd3567d8b3aa67b48d89867600c1023400aa
 DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
+DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6
+EBUILD tar-1.30-r1.ebuild 2256 BLAKE2B 14041fd4a3c198894c8d470869d52eb94c332cc227fc6f7786145b569f299bc50021c9736dcc4c0b17d7b634b98c2f3318010e53ef6a7e8fa42b2719eee44e67 SHA512 bc06e1350a7df2b30c05d14a78e3de305382206de857b83ec98cd0e376fc832af37d3a2ce0c9ced072da45a6cb981e0438e36d610d63475db1c65cc7c71dd778
 EBUILD tar-1.30.ebuild 2187 BLAKE2B cb952591e27678df72ad53da254bb901d355bf9af7dbe0e22b59a92d3b49fc90c20a9f170154a3ff77bc5aa3cbb2962930cf9258feb5f0f11de3b4dbe2d76f7c SHA512 89fa12ce7849917a85402d98e6532205b294a1793f8f563af952736f282a13ac52f982c0ed87d55a65c7e04f2d150ce5a348bd178ff10512eab822401cee81b2
+EBUILD tar-1.31-r1.ebuild 2271 BLAKE2B 28073c3dbcff5078f3a51fcf507226443107f6201f03706174062cab92ba8dcbbb5c274481dfc5b06198c341158f1d5a67ff52b1de02084b2ea54f87c7a3e497 SHA512 78e18ad6cae982cf8f981ea34cf98380fb4b4fdb0a5637f427a5c326737a4b0cc877a72c378248ac7cab53110801974f3e94def51c45b471aaf020823b1b51b8
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch b/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch
new file mode 100644
index 000000000000..8abab5df6c02
--- /dev/null
+++ b/app-arch/tar/files/tar-1.30-CVE-2018-20482.patch
@@ -0,0 +1,146 @@
+From c15c42ccd1e2377945fd0414eca1a49294bff454 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Thu, 27 Dec 2018 17:48:57 +0200
+Subject: Fix CVE-2018-20482
+
+* src/sparse.c (sparse_dump_region): Handle short read condition.
+(sparse_extract_region,check_data_region): Fix dumped_size calculation.
+Handle short read condition.
+(pax_decode_header): Fix dumped_size calculation.
+
+diff --git a/src/sparse.c b/src/sparse.c
+index d41c0ea..f611200 100644
+--- a/src/sparse.c
++++ b/src/sparse.c
+@@ -1,6 +1,6 @@
+ /* Functions for dealing with sparse files
+ 
+-   Copyright 2003-2007, 2010, 2013-2017 Free Software Foundation, Inc.
++   Copyright 2003-2007, 2010, 2013-2018 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+@@ -427,6 +427,30 @@ sparse_dump_region (struct tar_sparse_file *file, size_t i)
+ 			     bufsize);
+ 	  return false;
+ 	}
++      else if (bytes_read == 0)
++	{
++	  char buf[UINTMAX_STRSIZE_BOUND];
++	  struct stat st;
++	  size_t n;
++	  if (fstat (file->fd, &st) == 0)
++	    n = file->stat_info->stat.st_size - st.st_size;
++	  else
++	    n = file->stat_info->stat.st_size
++	      - (file->stat_info->sparse_map[i].offset
++		 + file->stat_info->sparse_map[i].numbytes
++		 - bytes_left);
++	  
++	  WARNOPT (WARN_FILE_SHRANK,
++		   (0, 0,
++		    ngettext ("%s: File shrank by %s byte; padding with zeros",
++			      "%s: File shrank by %s bytes; padding with zeros",
++			      n),
++		    quotearg_colon (file->stat_info->orig_file_name),
++		    STRINGIFY_BIGINT (n, buf)));
++	  if (! ignore_failed_read_option)
++	    set_exit_status (TAREXIT_DIFFERS);
++	  return false;
++	}
+ 
+       memset (blk->buffer + bytes_read, 0, BLOCKSIZE - bytes_read);
+       bytes_left -= bytes_read;
+@@ -464,9 +488,9 @@ sparse_extract_region (struct tar_sparse_file *file, size_t i)
+ 	  return false;
+ 	}
+       set_next_block_after (blk);
++      file->dumped_size += BLOCKSIZE;
+       count = blocking_write (file->fd, blk->buffer, wrbytes);
+       write_size -= count;
+-      file->dumped_size += count;
+       mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
+       file->offset += count;
+       if (count != wrbytes)
+@@ -598,6 +622,12 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
+ 			     rdsize);
+ 	  return false;
+ 	}
++      else if (bytes_read == 0)
++	{
++	  report_difference (file->stat_info, _("Size differs"));
++	  return false;
++	}
++      
+       if (!zero_block_p (diff_buffer, bytes_read))
+ 	{
+ 	  char begbuf[INT_BUFSIZE_BOUND (off_t)];
+@@ -609,6 +639,7 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
+ 
+       beg += bytes_read;
+     }
++
+   return true;
+ }
+ 
+@@ -635,6 +666,7 @@ check_data_region (struct tar_sparse_file *file, size_t i)
+ 	  return false;
+ 	}
+       set_next_block_after (blk);
++      file->dumped_size += BLOCKSIZE;      
+       bytes_read = safe_read (file->fd, diff_buffer, rdsize);
+       if (bytes_read == SAFE_READ_ERROR)
+ 	{
+@@ -645,7 +677,11 @@ check_data_region (struct tar_sparse_file *file, size_t i)
+ 			     rdsize);
+ 	  return false;
+ 	}
+-      file->dumped_size += bytes_read;
++      else if (bytes_read == 0)
++	{
++	  report_difference (&current_stat_info, _("Size differs"));
++	  return false;
++	}
+       size_left -= bytes_read;
+       mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
+       if (memcmp (blk->buffer, diff_buffer, rdsize))
+@@ -1213,7 +1249,8 @@ pax_decode_header (struct tar_sparse_file *file)
+       union block *blk;
+       char *p;
+       size_t i;
+-
++      off_t start;
++      
+ #define COPY_BUF(b,buf,src) do                                     \
+  {                                                                 \
+    char *endp = b->buffer + BLOCKSIZE;                             \
+@@ -1229,7 +1266,6 @@ pax_decode_header (struct tar_sparse_file *file)
+        if (src == endp)                                            \
+ 	 {                                                         \
+ 	   set_next_block_after (b);                               \
+-           file->dumped_size += BLOCKSIZE;                         \
+            b = find_next_block ();                                 \
+            src = b->buffer;                                        \
+ 	   endp = b->buffer + BLOCKSIZE;                           \
+@@ -1240,8 +1276,8 @@ pax_decode_header (struct tar_sparse_file *file)
+    dst[-1] = 0;                                                    \
+  } while (0)
+ 
++      start = current_block_ordinal ();
+       set_next_block_after (current_header);
+-      file->dumped_size += BLOCKSIZE;
+       blk = find_next_block ();
+       p = blk->buffer;
+       COPY_BUF (blk,nbuf,p);
+@@ -1278,6 +1314,8 @@ pax_decode_header (struct tar_sparse_file *file)
+ 	  sparse_add_map (file->stat_info, &sp);
+ 	}
+       set_next_block_after (blk);
++
++      file->dumped_size += BLOCKSIZE * (current_block_ordinal () - start);
+     }
+ 
+   return true;
+-- 
+cgit v1.0-41-gc330
+
diff --git a/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch b/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch
new file mode 100644
index 000000000000..9e255df57602
--- /dev/null
+++ b/app-arch/tar/files/tar-1.31-remove-erroneous-abort-call.patch
@@ -0,0 +1,33 @@
+From 85c005ee1345c342f707f3c55317daf6cb050603 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Thu, 10 Jan 2019 18:18:49 +0200
+Subject: Remove erroneous abort() call
+
+The call was introduced by commit ccef8581. It caused tar to abort
+on perfectly normal operations, like untarring archives containing
+./ with the -U option,
+
+See http://lists.gnu.org/archive/html/bug-tar/2019-01/msg00019.html
+for details.
+
+* src/extract.c (maybe_recoverable): Remove misplaced call to abort().
+---
+ src/extract.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/extract.c b/src/extract.c
+index 090b866..8276f8f 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -787,7 +787,7 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made)
+ 	case UNLINK_FIRST_OLD_FILES:
+ 	  break;
+ 	}
+-      abort (); /* notreached */
++      FALLTHROUGH;
+ 
+     case ENOENT:
+       /* Attempt creating missing intermediate directories.  */
+-- 
+cgit v1.0-41-gc330
+
diff --git a/app-arch/tar/tar-1.30-r1.ebuild b/app-arch/tar/tar-1.30-r1.ebuild
new file mode 100644
index 000000000000..731db2be72c3
--- /dev/null
+++ b/app-arch/tar/tar-1.30-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-test-92.patch
+	"${FILESDIR}"/${P}-fix-test-117-and-118.patch
+	"${FILESDIR}"/${P}-CVE-2018-20482.patch #674210
+)
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--bindir="${EPREFIX%/}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX%/}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild
new file mode 100644
index 000000000000..6a36e7eb01ee
--- /dev/null
+++ b/app-arch/tar/tar-1.31-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="https://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	static? ( ${LIB_DEPEND} )
+	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
+
+PATCHES=( "${FILESDIR}"/${P}-remove-erroneous-abort-call.patch )
+
+src_prepare() {
+	default
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--bindir="${EPREFIX%/}"/bin
+		--enable-backup-scripts
+		--libexecdir="${EPREFIX%/}"/usr/sbin
+		$(usex userland_GNU "" "--program-prefix=g")
+		$(use_with acl posix-acls)
+		$(use_enable nls)
+		$(use_with selinux)
+		$(use_with xattr xattrs)
+	)
+	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index 755e2f17180d..c466e0258119 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,4 +1,6 @@
 AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
 DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
+DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
 EBUILD wimlib-1.12.0.ebuild 1454 BLAKE2B 67e5bc2760f9a0aaae9de8d761ab2eb5eac2888cd5d84c1bb65c0725d3e19e28a1b547e2fb9daacfdce740a8a8bc5028c9c4f7e5f45b208518a86d0ccf18a7e8 SHA512 1c4d848b98c34678efe2479efa1deec3365fc210b3c7c53dbfbdc43a52aeb21cb9de38104e0b47accd999a61fd886c3dc41c704fdfa3cb22809c60da608d456c
+EBUILD wimlib-1.13.0.ebuild 1454 BLAKE2B 60a51c4acbaefd3a2e626ed17c0c1b8808ef8eedd28c14e25a48d2ed7bfd6e7f54121fac41415843f7c34a99f2d35e22fc2dc05a9fea968ca18852342a40c4e7 SHA512 1bec01f388af7f97506572f1df2007c50e420ad37d745ca896015c43bb27850a65a5201c82864a9f29cd5bf2f7aec77f5a75c971ecb8cb14c16839708fc130e1
 MISC metadata.xml 684 BLAKE2B bc45d2b67f015842912d4fa5043bf31f2eb2ae59b29a9104987c6041282730491470fefd065be7ab49de230ea26dc10f64d4fd85591a1df6aec5a6ab408752dd SHA512 999d8b7bd11c22193d1e87e73b70fd750404e92c26b7916a4405c0bdd930a103ef8b809259e0c3ddfb73281f2622b284bd20ea73dff409cc8063406cf41a7724
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
new file mode 100644
index 000000000000..9db9ef57d01a
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pax-utils
+if [[ -z ${PV%%*9999} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://wimlib.net/${PN}"
+else
+	inherit vcs-snapshot
+	MY_PV="${PV/_/-}"
+	MY_PV="${MY_PV^^}"
+	SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="The open source Windows Imaging (WIM) library"
+HOMEPAGE="https://wimlib.net/"
+
+LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
+SLOT="0"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
+
+PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+
+RDEPEND="
+	dev-libs/libxml2:2
+	ntfs? ( sys-fs/ntfs3g )
+	fuse? ( sys-fs/fuse:0 )
+	openssl? ( dev-libs/openssl:0 )
+	iso? (
+		app-arch/cabextract
+		app-cdr/cdrtools
+	)
+"
+DEPEND="
+	${RDEPEND}
+	cpu_flags_x86_ssse3? (
+		yasm? ( dev-lang/yasm )
+		!yasm? ( dev-lang/nasm )
+	)
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ntfs ntfs-3g)
+		$(use_with fuse)
+		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
+		$(use_with openssl libcrypto)
+		$(use_enable threads multithreaded-compression)
+	)
+	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
+	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
+		econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	pax-mark m "${S}"/.libs/wimlib-imagex
+}
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 879bb0b774c4..f579a98f51d7 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,6 +1,8 @@
 AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9a9f27b51a61b12cfad5e30d51c69df312ccf82fdb036541117c377347e5956cb7d3c6a3ae2756feacccce SHA512 fd04b8552c85b0a4c40283b691746ef2a40aef17aa30ed697b8e1f83e10caa2e21b4c000197192e98a1ddcffd745a37ab592193eaa5120a7048b861ed1036c89
 AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377
+AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 EBUILD xar-1.8-r1.ebuild 1205 BLAKE2B 296674ef4169aa92ff3eb40203ddce1463fa495196e9ddd1048fa2f5859acbb8ee724a50ebcc398668a723b15dfe1af8aa27199019502d4023d17205c9c3c78b SHA512 68c48ec7b162b4cbd3ac1147e500ccf84b54b80cfc27e50063fc0d0030c8f05fb02868ee8d71a463fc23c2c71eca306ce88ea44eb0bbcd923cd66b7c08aa3b64
+EBUILD xar-1.8-r2.ebuild 1465 BLAKE2B 1aeeda746b6c7a3830fac3f2df548dd034a894442167301eea2b77513685c58373d68a01e0e5e669e6657007c545686ecee8d9f24485c69b2ff584b90e1095bd SHA512 682c965cb54d9e5f6b09580be8648340db3eec37f8a11e612d2d99532ce495e6c9047b748d24d593745e54cdc8ef8f0d78f1a838183b82b26659acfd10120d50
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/files/xar-1.8-openssl-1.1.patch b/app-arch/xar/files/xar-1.8-openssl-1.1.patch
new file mode 100644
index 000000000000..f811d99d07e5
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8-openssl-1.1.patch
@@ -0,0 +1,45 @@
+lib/hash.c: fix compilation with OpenSSL-1.1+
+
+EVP_MD_CTX has become an anonymous struct now, so can't allocate size
+for it anymore.
+
+--- a/lib/hash.c	2015-06-09 03:22:07.000000000 +0000
++++ b/lib/hash.c	2019-01-01 14:37:01.487775958 +0000
+@@ -102,7 +102,7 @@
+ #ifdef __APPLE__
+ 	CCDigestRef digest;
+ #else
+-	EVP_MD_CTX digest;
++	EVP_MD_CTX *digest;
+ 	const EVP_MD *type;
+ #endif
+ 	unsigned int length;
+@@ -123,7 +123,8 @@
+ #else
+ 	OpenSSL_add_all_digests();
+ 	HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
+-	EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
++	HASH_CTX(hash)->digest = EVP_MD_CTX_create();
++	EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
+ #endif
+ 	
+ 	HASH_CTX(hash)->digest_name = strdup(digest_name);
+@@ -143,7 +143,7 @@
+ #ifdef __APPLE__
+ 	CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #else
+-	EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte);
++	EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
+ #endif
+ }
+ 
+@@ -160,7 +160,8 @@
+ 	CCDigestFinal(HASH_CTX(hash)->digest, buffer);
+ 	CCDigestDestroy(HASH_CTX(hash)->digest);
+ #else
+-	EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
++	EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
++	EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
+ #endif
+ 	
+ 	*nbyte = HASH_CTX(hash)->length;
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
new file mode 100644
index 000000000000..b8acc75f2315
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib-minimal ltprune
+
+APPLE_PV=400
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl kernel_Darwin"
+
+DEPEND="
+	!kernel_Darwin? (
+		!kernel_SunOS? ( virtual/acl )
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+multilib_src_configure() {
+	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 538faad3173e..cc0d49547cfb 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,5 @@
 DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
+DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
 EBUILD xarchiver-0.5.4.13.ebuild 1449 BLAKE2B 6987905ac1c6f92380978e4ca884f9a0f6b8238b5f14ef39cc2a1b586a10a0125d7b1ff3b3514c0b31f08fbb76df547dec706fcbb914e899b134abfed6ac2851 SHA512 0c5bdacea1aeba2d187932a61a3eff4c1b93aebfaa098cfdba75968c37a64764cc20235c739b991507806958bf4d57ae1c8b5f2d0d3d6d0b66b403f920823d67
+EBUILD xarchiver-0.5.4.14.ebuild 1455 BLAKE2B 63c2192535c53c0150934aaf3c5c81cdef713887782082bfdef11ed6ebf8251792d0966a90e44ae21be803c0c3c62c9ebd1c3bed77f8253aca5eed9336b651fe SHA512 d356929f099d9831c2d0b60040051ccf17c87a75473b403d231bc45f5be4ad0d59477684b70d20da6f73fb8b36245d4bff5148684c9e71ae2b627b7663b7dbe2
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
new file mode 100644
index 000000000000..12127f58d602
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.14.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+# older pigz versions have incompatible command-line processing
+# https://bugs.gentoo.org/661464
+RDEPEND=">=dev-libs/glib-2:=
+	x11-libs/gtk+:3=
+	!!<app-arch/pigz-2.4[symlink]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)"
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable doc)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 9e5ea30c61a0..b13a1d801d4d 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -5,13 +5,13 @@ DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d
 DIST zstd-1.3.6.tar.gz 1823482 BLAKE2B 24f3ace8b16364abcc010d26827d482fac30ebaa48ada9e3e72c25bfc3447691d4caeb40cad60fb8f2a4a6bd3512736e74c0d2e26efc94f3f6a24c9a38d339b1 SHA512 2a0144cab77954f00a8e876747be9c8b9773cde7c22ad9bfea4e44e290beabee9b530a7961ef79d0f21893d48311217369a268d4c4920fa5f840c70a852fe01f
 DIST zstd-1.3.7.tar.gz 1825458 BLAKE2B 2a689289ec70fd510575aecebf88ad763bd150e578d70d9fbb1678cba314c90a60339697232a5515990505e3c889aac92c3c2c4c3fc48e0d434b4dfd6cac9df1 SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738
 DIST zstd-1.3.8.tar.gz 1875233 BLAKE2B c9775b0e33e61d2c064df60a266246f6b9b65b70ba2cc529633cf700b5dcac795e13ec0e20bd51bdd02ee5fddbc7f2fc030902ee37a5a433c2d7828c285b3c23 SHA512 834f7b6477c1e7d70f71105ea52be15c33866b48b93b7a3c6dff4f10c761e5ad35f3903899516317690a4b768051f6eedf7c030292f57cea5613d4017fab9466
-EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
-EBUILD zstd-1.3.2.ebuild 1265 BLAKE2B f714674c9fec5168e389afd1733421bd91408f58ad7765bbdc5a461fe1ae3b584b452333d768031354d6f5b64f4fd7ed75df259c305cdad439f8f912083d4bde SHA512 4527e9019464671a27df4d76f77371e770a14d2e0420a433e63f77688146e5d2647cd95bbc38a5b0c05316c759f016eabef2a8b6338b406d83ee637b4497eea6
-EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
-EBUILD zstd-1.3.4-r1.ebuild 1323 BLAKE2B db59b9f636146df056e7b51d21210f6960ece56a62537c06146a79ccb3fd4ec1972c40c75134fc38f089d3bc5d68909a8789b73ac83c272432c354bcd3b981b3 SHA512 c4b5109d7131ad4b465d91be68d18eab83cef664020ec79c9c814bef4dcc4b6cd380164c952412be3834e9a86921a2a7e24693f0a8c2af96c0f21d18d494ca43
-EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
-EBUILD zstd-1.3.6.ebuild 1331 BLAKE2B 615f69529c47cdced198d2e406d02fadd3b58da3e065196f236e4f414d665a78af4100c080327ec9f554af7a4affeb75c45e44b4e4cd46094a06d2c0cb9b2136 SHA512 61e7cf83bfd201b525032b7de744cd08d3ee6179dffb30c4b67b03fd8cedeb40dd5d41dfa95d74c201a873c294c43f121fb38c2197513a6517c52a37dd570779
-EBUILD zstd-1.3.7-r1.ebuild 1799 BLAKE2B 75e1a10d15228776aa1bb42d960ed23178ba43084cec006cf07810b0f7ee8cf9ac487e7be6db9ce42d2d5630899446ff2a716ee486c5e7a9ba2b970e08318d3e SHA512 6b2671f038ec974f04151c4dba45740c84b5a1e0f2ed20567f96b36a3ed8b5838d6dc4ea101cf3608a332166980450bde0b33c941f8cb258960c5cd9655063b9
-EBUILD zstd-1.3.7.ebuild 1331 BLAKE2B 615f69529c47cdced198d2e406d02fadd3b58da3e065196f236e4f414d665a78af4100c080327ec9f554af7a4affeb75c45e44b4e4cd46094a06d2c0cb9b2136 SHA512 61e7cf83bfd201b525032b7de744cd08d3ee6179dffb30c4b67b03fd8cedeb40dd5d41dfa95d74c201a873c294c43f121fb38c2197513a6517c52a37dd570779
-EBUILD zstd-1.3.8.ebuild 1799 BLAKE2B 75e1a10d15228776aa1bb42d960ed23178ba43084cec006cf07810b0f7ee8cf9ac487e7be6db9ce42d2d5630899446ff2a716ee486c5e7a9ba2b970e08318d3e SHA512 6b2671f038ec974f04151c4dba45740c84b5a1e0f2ed20567f96b36a3ed8b5838d6dc4ea101cf3608a332166980450bde0b33c941f8cb258960c5cd9655063b9
+EBUILD zstd-1.1.3.ebuild 902 BLAKE2B 3b5c5979aee9a7f29f1d515e605e99f4934ab0669a2b5c55055861396f1c002fcc7ac55a871b74feab38c4d48cf4f268e0d36df1b5210ddcec886a2b07ff021b SHA512 639420bd40f0f308413ea00f5803bd57db06d5a25ebab55e7a61dfbb26de721381c4cc8ecc71b22f3756be7149f27928ecbc8061f3443b2d51ad97c8a9bd5e46
+EBUILD zstd-1.3.2.ebuild 1268 BLAKE2B bdc068621d43a79578f4129079aecd0b455e8df940913a508216731120311664a1ce0aa878df03e5a4580b08fc7cd2539736e666b2380bb536e413a081a49c81 SHA512 4dbfe7194d11172ae8a6bd9ea1973ac122cff4c0ca5924f95f758857552bebfb69f57d7243be75f8c7931cf809eab2171ae792d6efecaf9d5833fa2fcf04c38e
+EBUILD zstd-1.3.3.ebuild 1275 BLAKE2B eda6bb4eef626eabe52756afcbc2fdd2bd9bc98f17cd014dfb2bfd539348c24e962ece86fe3e046ec94446830030abae40a4684d9f72da6b19ed13283c29032e SHA512 06a63556480f4eeea9befc6dcf355ebea7e98f116208d00a7cb51f88947bafb46351c06394ff6d0a4d8692ae7cc92b50be07cab70771287f98143c175e8cd228
+EBUILD zstd-1.3.4-r1.ebuild 1328 BLAKE2B cb6df01593f2bf6f52d0f54759aaa03fa610bd4a63b0c23f3626f7907af26fbfa038842ecb7a1b98b664f9b072e85b5318fc56f059a6b73b0c2e677aae17121b SHA512 8fd02dbc9f09143c81d90e2931812cc42877a0955960232947ba8e50dddbc55f9cbe2e2f60e4f4f53b1ed7122f43bd4976741e4a24243e0360e8e6fbc82ffe5b
+EBUILD zstd-1.3.4.ebuild 1275 BLAKE2B eda6bb4eef626eabe52756afcbc2fdd2bd9bc98f17cd014dfb2bfd539348c24e962ece86fe3e046ec94446830030abae40a4684d9f72da6b19ed13283c29032e SHA512 06a63556480f4eeea9befc6dcf355ebea7e98f116208d00a7cb51f88947bafb46351c06394ff6d0a4d8692ae7cc92b50be07cab70771287f98143c175e8cd228
+EBUILD zstd-1.3.6.ebuild 1337 BLAKE2B 261fe4408750ddd70adbad7403bad6e190faa1b1e6b0f7115bbf73471cec8642092c303e158bf728b4eef823f746687e28d0a27ca63830c3e31914c6ce18a090 SHA512 5a803fcfbec86c454af205706f9e416fe5863c7ee675b3c6a8191c315f80e38e1ab5d3203c82b47a85a189a30f801fc4301683aaede06bdddae3758f98948a24
+EBUILD zstd-1.3.7-r1.ebuild 1805 BLAKE2B 183fa31c25a9c70f45c3894b1b5ac5e0a854566d0880daa08aae1d39ee1b6f86e6e5be9595b533588b14f0c40b8745ce381dacf31f935c034d9bdc7cf26bbab0 SHA512 5c3fc22d3428c85c275b54048eaab998b0a9496ecca9ac5e7d48183e40a33b0c352111524df0961bf5c7a0c0e07c5eeaabe389d89edbf0f524b5430db94fb154
+EBUILD zstd-1.3.7.ebuild 1337 BLAKE2B 261fe4408750ddd70adbad7403bad6e190faa1b1e6b0f7115bbf73471cec8642092c303e158bf728b4eef823f746687e28d0a27ca63830c3e31914c6ce18a090 SHA512 5a803fcfbec86c454af205706f9e416fe5863c7ee675b3c6a8191c315f80e38e1ab5d3203c82b47a85a189a30f801fc4301683aaede06bdddae3758f98948a24
+EBUILD zstd-1.3.8.ebuild 1805 BLAKE2B 183fa31c25a9c70f45c3894b1b5ac5e0a854566d0880daa08aae1d39ee1b6f86e6e5be9595b533588b14f0c40b8745ce381dacf31f935c034d9bdc7cf26bbab0 SHA512 5c3fc22d3428c85c275b54048eaab998b0a9496ecca9ac5e7d48183e40a33b0c352111524df0961bf5c7a0c0e07c5eeaabe389d89edbf0f524b5430db94fb154
 MISC metadata.xml 457 BLAKE2B d8251ae19e395d977bd88e72fc3c666e6d6a462a7a65db0f62fe3ba9831189f0f48e9457e04028b03dadbd4d099d0b051b313b626a3aaaeb1845cee636558b8a SHA512 801938d4394220ffe8df4d8198308b0d5651ebc198711a4af48d1e6dd9aaffdd7da030a8075bcbc7c3182403aea86e56a9ddc999dcfb2556496679d835a16058
diff --git a/app-arch/zstd/zstd-1.1.3.ebuild b/app-arch/zstd/zstd-1.1.3.ebuild
index 09f6b558a73c..c87529fee201 100644
--- a/app-arch/zstd/zstd-1.1.3.ebuild
+++ b/app-arch/zstd/zstd-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs"
 
 src_compile() {
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
index 6231db5a2860..c74aec770997 100644
--- a/app-arch/zstd/zstd-1.3.2.ebuild
+++ b/app-arch/zstd/zstd-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/zstd/zstd-1.3.3.ebuild b/app-arch/zstd/zstd-1.3.3.ebuild
index 63e5ab864115..00ba354373b2 100644
--- a/app-arch/zstd/zstd-1.3.3.ebuild
+++ b/app-arch/zstd/zstd-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
index 8cb0fdbfd797..1ae35e5b72b7 100644
--- a/app-arch/zstd/zstd-1.3.4-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.3.4.ebuild b/app-arch/zstd/zstd-1.3.4.ebuild
index 63e5ab864115..00ba354373b2 100644
--- a/app-arch/zstd/zstd-1.3.4.ebuild
+++ b/app-arch/zstd/zstd-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/zstd/zstd-1.3.6.ebuild b/app-arch/zstd/zstd-1.3.6.ebuild
index 1b444a99f6d2..22ed4d9c53e1 100644
--- a/app-arch/zstd/zstd-1.3.6.ebuild
+++ b/app-arch/zstd/zstd-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.3.7-r1.ebuild b/app-arch/zstd/zstd-1.3.7-r1.ebuild
index cf9d338ce59b..51e41cc42c04 100644
--- a/app-arch/zstd/zstd-1.3.7-r1.ebuild
+++ b/app-arch/zstd/zstd-1.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.3.7.ebuild b/app-arch/zstd/zstd-1.3.7.ebuild
index 1b444a99f6d2..22ed4d9c53e1 100644
--- a/app-arch/zstd/zstd-1.3.7.ebuild
+++ b/app-arch/zstd/zstd-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.3.8.ebuild b/app-arch/zstd/zstd-1.3.8.ebuild
index cf9d338ce59b..51e41cc42c04 100644
--- a/app-arch/zstd/zstd-1.3.8.ebuild
+++ b/app-arch/zstd/zstd-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 36f9a703cf6d..d9aea27c3f24 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 9712854e2991..027d8e3f767f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -18,6 +18,7 @@ AUX 9.0.6/bacula-9.0.6-libressl27.patch 429 BLAKE2B 0342617198722981b1efa335bdd8
 AUX 9.0.8/bacula-9.0.8-fix-static.patch 3705 BLAKE2B 5aef2b819608538d6fd360577b873cb1d7da459417fa03c05c007abe322e848429eb1b1d620d194f430233e3a9b72bd909f7ee6288b6f0c45dc0297c6b00f85f SHA512 4453a491c2b5a19e8f1e19e6e44e22032e0e626003bc871417d4e189abc29c0617d5079fd7a40b1ea6e94fd65d99e44098fef69543e036cb426cf87276fd0510
 AUX 9.4.0/bacula-9.4.0-libressl26.patch 1354 BLAKE2B b5d22a50e702a239aedd803c6f390572892124370c916887b166e263f1f3aae32fede777ba580e0a32401a58dc5ce10f6d5942e8764b5bf5d3abe1b9ae7c287c SHA512 3ae42c7c4e58e8e04cb444cb07399648f6962100b9f17146385c807fd5a5890f5f5b873bb790c5918be6a97bdfb7baa980798fe04f6adffbb1648fd4fa63c1fc
 AUX 9.4.0/bacula-9.4.0-libressl27.patch 414 BLAKE2B 29c2720cd05bd5d4ddc57db61e2729744efa4ac03985995b552b2570144dbb968d7e2f91c9a8ae01fe2286483555b72b72eea5110ab364fdf6203141ee9aadd3 SHA512 8f2ea8c552c0080eb56c2e39de78779567156c8198adc2ec775fa3282b01749b8c2b113123265fee88ade2c21c5819a0d8e4c0bda6a409ee5fee2d7352e2e3d6
+AUX 9.4.1/bacula-9.4.1_sql.patch 641 BLAKE2B 6abc90634e57c12d3a4377f7e356857e78bb00ff0f72f34a6551529ae7d9f498589545dc58df423ed6a5ad03186512bdb92c0ffddaa036a155f95bc58ff2f872 SHA512 407665e3bf41c64a064435ce05d6cae5f35d51cc41714600acc8e7f28cb9c239168bdfe0e797b6f3676d1dc08acb903c17226199dca2ea1d347d8c8289a0e44e
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
@@ -41,5 +42,6 @@ EBUILD bacula-9.0.8-r1.ebuild 12628 BLAKE2B 92cc9de59903df745fc1215366d9fae6ef07
 EBUILD bacula-9.2.1.ebuild 12703 BLAKE2B 093ee271467ba45a663ebcd0d684bc89cc2c8f2d5654eaf2e027c97fb963c577b0b03fb31a9c063a75462ec2fa09af636e290a9dcf4f059cd9a3ac64ddb1dfa2 SHA512 88b3915f96a26bce945483347442e63cccdef7a16e895e627284dbfd2fdc97474f4c7d5e7520c626f9580782d2ddcaba1d1574aceaa360a4fcd085ce90f3e4b7
 EBUILD bacula-9.2.2-r1.ebuild 12613 BLAKE2B 73a95b0add3c2154cdf2fa2c680e01b325cece13ea473f058d4e71e48e3e02344f45dc5ebbda43ebd8f5b09c8095d2799ba0985095f2006aadef712c45479a98 SHA512 eb6e3265ff5c9ab63f614b1a9219605e7db282364967bd6b08e708620ad016a53e95d2d7e53892ecd48678e0d77ca707fcff915777519a3282b0c087886b3878
 EBUILD bacula-9.2.2.ebuild 12706 BLAKE2B 45820bbe4312c2bd27d63cbb353e35e9e2248c5469b84c4453edb47f97c71e23306b1753ae2df02e86ffb02da21c6f94c9a3a0fb1d70a811ff7a548e63679b4b SHA512 7646a09bf6353023d6bf8d37701fa45c7a01deb5239cf2901f84f1720602df2e81d41adb0f93aa182dcf74ccd844b741ae32ea1736afcf02f5e668a2c14f82a3
+EBUILD bacula-9.4.1-r1.ebuild 12731 BLAKE2B 3eba23d53d9a42bf4ae129b4b5ddd34f674d8b55bbbcb39897d6e90db725e1f2300e99b384dfbce92575c12da2083ab87cecb89a3300c756a6ea185b79963d2a SHA512 62c9492cf92335bff829db11df3a2e1d4bb0d07a9b5acce3e60bbb3a914fa445974acffb38a20f8f5d4c98a84c48fa6e8c6af2e6f37f3d8a69cbfb1262e3c172
 EBUILD bacula-9.4.1.ebuild 12608 BLAKE2B 7529068f572bb3518e532d0b45c59f48a4a98933954bd795f68044e118ac165752cac760ee8be7c9b25aa49a6a45e398ab313a95488ca5dd44ea082ff89a741b SHA512 16f015f37e0e168a37cdb61e21fa47a732478d401ba96a20ff4d3300977465e349f291ff534c8303a8f76807a2c7967d546d291f5226ddd96ceefbd69ffe483f
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.4.1-r1.ebuild b/app-backup/bacula/bacula-9.4.1-r1.ebuild
new file mode 100644
index 000000000000..e777f2a550f2
--- /dev/null
+++ b/app-backup/bacula/bacula-9.4.1-r1.ebuild
@@ -0,0 +1,438 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop libtool qmake-utils systemd user
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Fix an integer overflow (Thanks Ph. Stracchino)
+	eapply -p1 "${FILESDIR}"/9.4.1/${PN}-9.4.1_sql.patch
+
+	# Don't let program install man pages directly
+	rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in"
+	eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch"
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# Install all man pages
+	doman "${S}"/manpages/*
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch b/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
new file mode 100644
index 000000000000..b2b7c4863d2a
--- /dev/null
+++ b/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch
@@ -0,0 +1,11 @@
+--- bacula-9.4.1.orig/src/cats/sql_update.c  2018-12-16 05:30:25.000000000 -0500
++++ bacula-9.4.1/src/cats/sql_update.c  2018-12-31 12:58:09.107874630 -0500
+@@ -375,7 +375,7 @@
+         "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s,"
+         "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s,"
+         "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d,"
+-        "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d"
++        "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u"
+         " WHERE VolumeName='%s'",
+         mr->VolJobs, mr->VolFiles, mr->VolBlocks,
+         edit_uint64(mr->VolBytes, ed1),
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 6e91a76a205f..645153b38369 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -3,7 +3,7 @@ AUX snapper-0.5.0-gcc6.patch 482 BLAKE2B e7291ba147c9118eeaa8aafe6e7e0b3c821530d
 AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
 DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 DIST snapper-0.8.1.tar.bz2 591061 BLAKE2B 5f9ae50469f43e930de4c4479428c94b24441832bd713847c6792ff583fb79badfa341b53cc63abfedb787367b22b715de9f83f9172dec945f7b3071c06137ba SHA512 9fa20311f346de54c4f5d1cabb42dce5c677eaac03b3fac2a6049f408553911f5a968b1920fd014f3318ebb6911f2e6bce06463e976b468927e250e16fe783a0
-EBUILD snapper-0.5.6-r1.ebuild 1722 BLAKE2B f23130ea7f81232f27d4fadbf43982168798f7453032bd067c79d0fe426c0d9fb7c4da2b2e51f65030de958f41397031d9a2099fd124786de40286751b74c15c SHA512 c7ad7cd8a9e44b4776b3bb564b6bdc988cb8662bc09cd2d485b4cd25547ee975960afdd729e75f4a00981056ba4e1da2ed9ca591e4c4afc2b025dda4c9c64e13
+EBUILD snapper-0.5.6-r1.ebuild 1721 BLAKE2B e07c82876eff553165f8a0b6ccd8bad072540e0d9dd8e5be9e8407341c7d95744d7012a84e624dd91a464ad96317778ffd7da1c1712df693d6e2d60535ad322b SHA512 10532bd3e96e7dbaefff000bc47a2e6b5c88bb54a9a9260b5442d0578db8a97ceef3c29c415e84202647b1bf051ad052c682a192b9475a29e69fb031f6ce1e19
 EBUILD snapper-0.5.6.ebuild 1689 BLAKE2B 1cec6466a39993a32bfcfd2935f10243c3b6cf3a4fa4cb6768b4fada52fd1fff0e08d51559675d9d03a3fc4978d5b93e8bea458dfc5b2b2e65af7e437988bdef SHA512 049e53c5dacf41bad8c7da90a7734f42125965f3f50c841e1810ee682d2e3dfc1586a5c8bb2ed6b45c3a6d06b9b2f96039966687e56cf650168a7f8251c36c16
 EBUILD snapper-0.8.1.ebuild 1729 BLAKE2B 5dc6a58a46466120a8afa0ce116559a61eee4545e5039da5ee9361a1e06ff8ae532d630e085567f77fdffe87ee43047eae653c6a819945c2b643581f6275deed SHA512 6894a8117da291b2c3c9ea0fbc4c45febe0daf7ab9b92ceac13f9c7efd0d44b529945d57cb9b3f5de685f4ffbbdb5a7681a8213c3b2e4fe64f3e47afeeff6f87
 MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild
index 27233b7377ee..872cd15f2470 100644
--- a/app-backup/snapper/snapper-0.5.6-r1.ebuild
+++ b/app-backup/snapper/snapper-0.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="lvm pam xattr"
 
 RDEPEND="dev-libs/boost:=[threads]
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0e330849f377..618b02d08527 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3b6e9a69e71b..799691314d3a 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-EBUILD acme-0.27.1.ebuild 1256 BLAKE2B 1101a641f6d41ae084d7fe938fc8c6b91ebb54240baf55db0c31ae3520e8e4de648499c0ba647db773fa6b7c45ab3fc98144f62ebe0abf9566e81f2f9d3aa5f0 SHA512 87d7f1770277cf994c779964c76cf636d41281b6c2614c06d40771bab54b3edac737249a45d7f0624b58014c7447cce3adc92fb68f1c4b23db2bd9301b2ed0a2
+DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 EBUILD acme-0.28.0.ebuild 1256 BLAKE2B 1101a641f6d41ae084d7fe938fc8c6b91ebb54240baf55db0c31ae3520e8e4de648499c0ba647db773fa6b7c45ab3fc98144f62ebe0abf9566e81f2f9d3aa5f0 SHA512 87d7f1770277cf994c779964c76cf636d41281b6c2614c06d40771bab54b3edac737249a45d7f0624b58014c7447cce3adc92fb68f1c4b23db2bd9301b2ed0a2
-EBUILD acme-0.29.1.ebuild 1258 BLAKE2B 399efddce8e440da7c89b6862a622076bd791a2e07ebd163f1c801d682729325148d0a19fcf30201247cb3759e015a81cabf8184a3a234497e6f91d619a30cd0 SHA512 9323a20e3da2cf6eb2e316abf0cd776446605ae056e922b5979057aa8da804cd34d1ae4d919323a485dc99c93922e83d11f89a5b0835780526426f8bcb674ecc
+EBUILD acme-0.29.1.ebuild 1256 BLAKE2B 4559bab05c5cea2a85872dd81986733c47f1b347639b403339b4b1038d7db9e03064c54ff6ba6cc48bd71247dbd7cdff05f1b67314c908b6acea5916fec6f6ef SHA512 aa0a41d1204daeb1d7ebc0d2882b19fb106a255bdf6f1c70fbe30f5c806ee2a7dd33af96dff0add1e380fcfb1134b87fbd1e8a97e30a1fb31a5790ff932bfd4e
+EBUILD acme-0.30.0.ebuild 1258 BLAKE2B 6b3a286bf2bb308c891549341dcce442160b2f43b7d121e827fd24ca3daeef6f694ee79789f5035e839361735ee31f9aac0e84f5d4265a556418854a2c360ce4 SHA512 2995c3fa6cbb586e7e2d40833513524922dffc4fd68c14fd937f76a1465df6695fe3b9eb4497850c26d268310e62d9fdd484423bd49a1154d1b7934ad3d6e7b1
 EBUILD acme-9999.ebuild 1261 BLAKE2B fd84623bd4510a088e0d27017f4e30a9b5214d1983298905163a4d944fb63bb1240b650a0ae1079398ccdd3c232fa58672b80f260deff64da0d62ef72c9d6a6f SHA512 0da048ccbf900d3dbde6b3d175a435e1337316d29bb900127c0429c434585a0f864aea1ba8af8262c1878ce77203d52d032614ca9722c063d7bf73607ea41cc0
 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb
diff --git a/app-crypt/acme/acme-0.27.1.ebuild b/app-crypt/acme/acme-0.27.1.ebuild
deleted file mode 100644
index 2691a8a8d0d8..000000000000
--- a/app-crypt/acme/acme-0.27.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests -w ${PN} || die
-}
diff --git a/app-crypt/acme/acme-0.29.1.ebuild b/app-crypt/acme/acme-0.29.1.ebuild
index 7f36c02c7764..78a008d62240 100644
--- a/app-crypt/acme/acme-0.29.1.ebuild
+++ b/app-crypt/acme/acme-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-0.30.0.ebuild b/app-crypt/acme/acme-0.30.0.ebuild
new file mode 100644
index 000000000000..b79fcc1ee54b
--- /dev/null
+++ b/app-crypt/acme/acme-0.30.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.0.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	nosetests -w ${PN} || die
+}
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 5f5097820757..2a82762ca94c 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -2,5 +2,5 @@ AUX argon2-20161029-makefile-soname-symlinks.patch 807 BLAKE2B 128d7f8db6bc85839
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 EBUILD argon2-20161029-r1.ebuild 1059 BLAKE2B 5af6cfcc657b155477979103e641b1449c3c95430aed7594d5a7678b6c1622672e4b8581b6465721a8645065dd3bbf8c9be9bcd6d58f8f44c8844c9a4de09992 SHA512 bf74945ccbea5cd3017a91502a4ce67c5b39b02df1882b175c9d3c857b70914f3f91d41b10c7c46fc82ee4ab8e03b4b0b291e9f16a3a41f8f54f28216533ffec
-EBUILD argon2-20171227.ebuild 926 BLAKE2B e50d4cfbe160b97a1390dd08e8128136f87204e13c8d1ba52b4f6207426a2fd917276f30f7165f89b76673a833499f46d18c8bb0d799c97f4ea9d859d8b3448f SHA512 bf2c52c70eb60c3c64525156f32b83179afcb7f1154ad47390d96968b13cc7b950b573cdc73b747390ad3ee912c3aa13295ae6425609a119cf2e961db6056cfe
+EBUILD argon2-20171227.ebuild 932 BLAKE2B d4d35467d79c15fe30fdd120261f0452ff20e2433cfb59734d98dfca35bd587114bd49cb7e6186100ba57dd14b12371703eb7465298a8ee585286838e207f8c6 SHA512 88b54c07cc75e2011ebeb5c43636deafbc248d013b52e97a876aad02a1019477087d9c2652dcf21d4939f871c84a2255e826e5126cae1be8e9111e6b3055c498
 MISC metadata.xml 660 BLAKE2B 1843f019c2cf7e8438209df6d90a20a9bcc88f5346aa02c953a28d84d712983fe3880b39b4b1766819bb88c670245447c37dc0c1da3b02b3f800a3d9706c4287 SHA512 76c1048a35a75b60d9e5fd56da50ba4bfe9537457e2021c226671d72e0456d2533f05361cad607cc86b8e01fd00a137a4cbc26a6d70c122918fe4e0f2ae3bee5
diff --git a/app-crypt/argon2/argon2-20171227.ebuild b/app-crypt/argon2/argon2-20171227.ebuild
index 5d0c464e8ac6..5127fecce9e0 100644
--- a/app-crypt/argon2/argon2-20171227.ebuild
+++ b/app-crypt/argon2/argon2-20171227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 22ac2897bf95..b151620100b4 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-EBUILD certbot-apache-0.27.1.ebuild 1071 BLAKE2B 51fdb08a0f779a60f736026c00a219dfbf45724003865a9cf3649a02733a5483d9a2d57fd62a13fe197de011bd0937c73def29c4ff8b9d759a601b8c0257f75b SHA512 30ae244f7ddbc9e31de784b2bd9054e4c3f4fabef20f1af4aed6ab99f13c5e40432e98411980e08e1a8adf99a1de833025f6b44cefd5bf1e607efad4bb7ea5bc
+DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 EBUILD certbot-apache-0.28.0.ebuild 1071 BLAKE2B 51fdb08a0f779a60f736026c00a219dfbf45724003865a9cf3649a02733a5483d9a2d57fd62a13fe197de011bd0937c73def29c4ff8b9d759a601b8c0257f75b SHA512 30ae244f7ddbc9e31de784b2bd9054e4c3f4fabef20f1af4aed6ab99f13c5e40432e98411980e08e1a8adf99a1de833025f6b44cefd5bf1e607efad4bb7ea5bc
-EBUILD certbot-apache-0.29.1.ebuild 1073 BLAKE2B dccaefbe676529354ac64bbfa1dc6c42286d8b0f205540b018ce4dcf72ddb111f69cecbda99d222db2256994ecdfb7232168a6bd6536b8291df7fec4a841db71 SHA512 043b93fc16484111d86bc16450ef10406a7dc8b98bd0708b6d831155f1537366105acd3d549e7b1d6b11923a529e8f519c221b06a94a233d40aede4635887f9f
+EBUILD certbot-apache-0.29.1.ebuild 1071 BLAKE2B afa71fa200f912a28e6cb90a0c62298f7f60d2c2de31a0b32995ef0b4d5726a4ea31748de8b914161c97586aed2a8bceec551a39e992bc876485cd2ecd08d238 SHA512 21f2538729f22b4ad166e4e8fe04e7a001d8e8a3cc42bc6025be0e3c807c3c1b9c70013a0d9bf6d742311bd149a752c77006c10a87739afed8b3962dcd6ebcd8
+EBUILD certbot-apache-0.30.0.ebuild 1073 BLAKE2B 75e4c40d462555cf08b8b73ead4bbe507da671c8e098a9cbf02da0341c76541f9adaeab42e6e9f14af7023d84761892c9d6d5727c1948ee811e89aa5a4dbf6b5 SHA512 3b491c732323caa509820593f7259f55ac7b6dd98da762a11a58c50b76745609e4feab86db70f85548f04df700968fc31e00dce532d0fbedc9d8fead848e69aa
 EBUILD certbot-apache-9999.ebuild 1076 BLAKE2B f5d78faa967a989ae85d7ab072dc7e4faff4825c4cf35d5f00af2817fdbc1a9c22d215043d673692634c51dc60e2a5cfcf73b5c286a4d35abb8e5e4e89268e5b SHA512 1ff731a1ab08da68b5932b527403f7c1cdc5372020211ba4b44fa5b9eb74db19bacdad424a1e841dc664519b9c383155e8eac60a3e6597f3280b5518deba6d3e
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild
deleted file mode 100644
index 5f448098501b..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.27.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
index 449a733b2a7f..3460838eff46 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild
new file mode 100644
index 000000000000..9a6423344f6a
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.30.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 67c677824c3c..32cd8dfc1847 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-EBUILD certbot-nginx-0.27.1.ebuild 1005 BLAKE2B 82a0537c5eab496eeda03c07b9f4e2e99c0eafb1cdae975df1ab565bda9167ba26715c22bfe525497fbfec39b788d0d627aa9cbfed7c75d4a4316cb9c2f225e9 SHA512 4080e09c6671e16d71143306311d6fcfcc59e348e18b8e86aa2ce2fe84965898f170067f09ad417a4751d459e205fa385d0748b13e9dd6ade15be458064c596d
+DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 EBUILD certbot-nginx-0.28.0.ebuild 1005 BLAKE2B 55e7500f529acdb8b4b3c295ac43f2ee12678e6cbb14b8f47513998f69cb1de9e4f0c7ae6dd0aa5830c40cc1fbdb67eb022f782d7dde58ba2f622e2c6e32e54c SHA512 fc7acbea6c8861a8c990ba111affd9c1f691a05cabe8efbc3b0c47c5df014cde1d7d88542530cb4cfacb662c99e6c673615d2cb63c0fc776ce2c1ea7ce311a1d
-EBUILD certbot-nginx-0.29.1.ebuild 1007 BLAKE2B 110322858d0488b879819c7f39e46508a247c7e4e3f08ec31b57c966b4bd2a60f042cced7205bce027e788f2d6076d61f465226d26ab3d22855e7b41667d7734 SHA512 362ae77ad464c4406a1944c49c46516c81baeaf062e8308bca596e3d209f1b2403cccd5979d424aaa639090db5ad30d51b7c367cd383d0a8140399ceb06deac5
+EBUILD certbot-nginx-0.29.1.ebuild 1005 BLAKE2B a9e9f85396a9fc18084a74caa949cf7693a5b3e4b731045bec2c5c1726ef09d32e4e3e64720ecdc52079a1520b880010f48896c52add34c715cb98da2e48ecf6 SHA512 7aa953233fb0f5e04e8802ab72cbedb871d16f009e10afbe248979bb7b1ad96b3378139ae89359de65f39f24008fcd07676beb677f2b98add3d42cf8cd76cccb
+EBUILD certbot-nginx-0.30.0.ebuild 1007 BLAKE2B 2b99b5fbc275b3a54a0f9c41c51575a0552f21b425571bcc07da81ccb882b1b10ebea1a752f2df12e29044eb3c5f6c7953cb7293284f3e3acc7af35aaa02397c SHA512 6681aa87e4f95b474fd2a4b653bca7a28c5a90eb7ad4cfc83b475f7552a4ba6044c9b3d3e3261679b5cfab1005eda89ed68fc118b1a7099db01183a10df98042
 EBUILD certbot-nginx-9999.ebuild 1007 BLAKE2B 110322858d0488b879819c7f39e46508a247c7e4e3f08ec31b57c966b4bd2a60f042cced7205bce027e788f2d6076d61f465226d26ab3d22855e7b41667d7734 SHA512 362ae77ad464c4406a1944c49c46516c81baeaf062e8308bca596e3d209f1b2403cccd5979d424aaa639090db5ad30d51b7c367cd383d0a8140399ceb06deac5
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild
deleted file mode 100644
index f880e805e63b..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.27.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/certbot-0.26.0[${PYTHON_USEDEP}]
-	>=app-crypt/acme-0.25.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
index 760abf28a407..9c1a8e9d9fab 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
new file mode 100644
index 000000000000..09f9842d8186
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.30.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/certbot-0.22.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 2348da0f1f31..4ae87f9bd8ff 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.27.1.tar.gz 1240538 BLAKE2B 3d03acc8465c5d44de99ffbee67bd75fbd7d6e5d1cb1d1a6551d14c64dd699bbd91deaf3398ea3a7c2eeb8c353650e6a06cf64c88533f4270f05d1f3381843cf SHA512 ce4edd1088e9abba89f026953e42f782c6e3ef41b11123d7faf8f1e4c230b2be5107ad70b7c6d515b6ce3d06a65ae132a37d4e41fd35f728a17ba94bb09ebb00
 DIST certbot-0.28.0.tar.gz 1253582 BLAKE2B f97a195afacd279b1dfc2d62ea45ae43dfd2d160f148200dd0756eda1c75561a6b1326a346f84c666c8409d339bc4341106ed4cfc684a7d868b6e1e10707ef78 SHA512 07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54
 DIST certbot-0.29.1.tar.gz 1265252 BLAKE2B dcb63862f427851655ae8282a3d479adc4aa2f553f510f3769d59748728505cb052291f728f1a01ad4efffa25d9aee6be881a9a7178fb0c025725780150ade45 SHA512 c9b976bec51c83412816726b709b79af0b464efa02f67c4ce7e754a2e6fa11e6811ca5db66616bd7b9e7920d6613665d3e58998c891bdb1452a5159a91971c56
-EBUILD certbot-0.27.1.ebuild 1255 BLAKE2B 1eb7b0ba190095afae66c34ce1e8003b452a1a070488108958ce8f7cd1bf9b3bd8e4c1ea26db52f485967e44c0c5db53c8ea5b7708c97990d122bd08e8dc09b3 SHA512 01f0fd02eddddf7ce34706c9a6750595b990b6a2a646717f9c59cacab2dd8a75fd3f6677435088f165ba2b2026232f4621acadca0e93ecc939b703ac1a9e6bd2
+DIST certbot-0.30.0.tar.gz 1266974 BLAKE2B f6c0c6864297ba0f6fc3232e0655d79e0b045923c22015d34f706e392ef83ca95c19b36d47120500bf4a0561a277aced13f7fb49d7bdcdc8359113c617dca37c SHA512 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
 EBUILD certbot-0.28.0.ebuild 1255 BLAKE2B 1eb7b0ba190095afae66c34ce1e8003b452a1a070488108958ce8f7cd1bf9b3bd8e4c1ea26db52f485967e44c0c5db53c8ea5b7708c97990d122bd08e8dc09b3 SHA512 01f0fd02eddddf7ce34706c9a6750595b990b6a2a646717f9c59cacab2dd8a75fd3f6677435088f165ba2b2026232f4621acadca0e93ecc939b703ac1a9e6bd2
-EBUILD certbot-0.29.1.ebuild 1257 BLAKE2B 8add106f4a4e6da2bb3a87e98affeff1efc45544966a181e61c4c157525475d6aef3c525c7d90d04832efcefdac2e2b26f4acb646d1c6618e6f33beeead88094 SHA512 0c85b363614afad4c2edaf1c00d459d41019ef36674c45ded820910f420c851b95b99e9879c2df80687746a4c959fd9f80619d14c1d15530fe73107b8a90cb83
+EBUILD certbot-0.29.1.ebuild 1255 BLAKE2B 0483b70b580cb40b8dc79022d598b6b1c09582914bf8a7094b3e37eac2087316881f6a634124907642fe2b0bbd133cba65c972e31e674a904eff80270d39233f SHA512 210060e1a0bb3cd401e10b30ec939707c832de8189f08639e6c3748d7d099c726c31ab44ca721960ac6a103f9e9d83a0e99dd91216c524c998a1e491acc9ec4c
+EBUILD certbot-0.30.0.ebuild 1257 BLAKE2B 39b357315cc059538366cb9078f353426db4f090a39fe5aeaf982f3c7658e6385a08880e5f1479f2e1c2bd28140016866ab2d337c763836fffd5ca599d343e6b SHA512 02e074359ff23d4098d5e64de44524a21ab9b8e137e3d3c929b2a487191e98ae58df814fefd1f290145911ba0bbdb47b7a1dd8c5d33de82c5305ac40274b7038
 EBUILD certbot-9999.ebuild 1257 BLAKE2B 08b62efdd4741ce9ed78c81e48182afb05fe104c892da56df8282e7c08bd35daa5eafcddda84514c67f056e3f6820c8897e81e459ebd3d225b136d61887995a6 SHA512 bc955fb2479aec38207b64beca8c586c870b11ab84b2a737b4da5c392036f6543f64bc6e0b94caa89d52722a6f188b42de6e8b0e05ebc512535ce66f783d5aa7
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.27.1.ebuild b/app-crypt/certbot/certbot-0.27.1.ebuild
deleted file mode 100644
index 997ec14b98c9..000000000000
--- a/app-crypt/certbot/certbot-0.27.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 x86"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
-	dev-python/josepy[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-0.29.1.ebuild b/app-crypt/certbot/certbot-0.29.1.ebuild
index 6c6f5fa23a61..2740075dda10 100644
--- a/app-crypt/certbot/certbot-0.29.1.ebuild
+++ b/app-crypt/certbot/certbot-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 inherit distutils-r1
diff --git a/app-crypt/certbot/certbot-0.30.0.ebuild b/app-crypt/certbot/certbot-0.30.0.ebuild
new file mode 100644
index 000000000000..eb64b7bed99f
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.30.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.26.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+	dev-python/josepy[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 422e354f5068..ce40df596773 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -5,6 +5,6 @@ DIST dehydrated-0.6.1.tar.gz 76693 BLAKE2B 5ecca2942aedc024e87e7b5aac05d836adbbc
 DIST dehydrated-0.6.2.tar.gz 77819 BLAKE2B 5a1cc097b42d5c4d9513b5a13c86f0b101b3442fb6cfbe54563357095619764724a2158e050a8e8b13a60a9effe83a5339ec647ef5a93622c8d63f1fcdb72be8 SHA512 97cce8f4936482d6b3a7d4227d8735b1c91f3b6cb7c728669a4a5139605932a88171c7e5d715d269782f260454d06ee95a0f6cd2735521e22c4f69bdc3e38f86
 EBUILD dehydrated-0.4.0-r3.ebuild 1554 BLAKE2B 3fbd4b2d0eda6858f085d2644709897faefbfab26855e37682b7f45a4d262bf80c8a72f8d757df94179f72b7b9a94e7b163cdfcde7d8a72f5e5cf655e05b2e4d SHA512 619e37279c8f7070d2e74f15033d7b6d098479b1837d73cdc9789b6a810160643b2561f268a63acc712abad365ee645150c76bd8c6f5c35e75d734dd3ec280c4
 EBUILD dehydrated-0.6.1.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
-EBUILD dehydrated-0.6.2-r1.ebuild 1630 BLAKE2B 637aebbef3fa97dae78a182ed9cc2e6feeb09c6e15ef6588b485ca16b86f530f8c210086d3df53adcb756845532d2d8c76ce164b61a88495a09336dde8efd381 SHA512 3ee7b5cc1303b797cd574f24030a7eb8413c8c39e039ebf18141fb7711390b6f56195d8140ea957b37abc10bd51be6a48911425910eb7776f74d7ec96af99bf1
+EBUILD dehydrated-0.6.2-r1.ebuild 1639 BLAKE2B f9cca3f93e60645ebd6bc1e3edf167ddd26aa87098a0a777a4efd204f66ccb14eb9820de587f5d0feff8316b0add52a4e613a39f291cb10681c8a5206e97bfb2 SHA512 03bb4eb275bed3ad1d43bfdeda4de82fe2de19716500cb289fa01443996dac217696b5a0326b8b28288b41e6d62460a0d64222c5c8b0c10a1d2c2c4d2a7ba177
 EBUILD dehydrated-0.6.2.ebuild 1569 BLAKE2B 543ed28a4ff57bc5306f939e4ce0131af9434a437b867fee4e28ca4b0fec39478a370d97d0e3eec02b169c72e405170ad9d89a8f733a7a6f7936d9a49ae7b4a9 SHA512 9d5f30868d67e3e8bc8968142e5f27cb39aa5ff71897c993c15af598d5caf33329ae85947befda40a956ad7c10f78853d3269cc54f908885466cea47680eabec
 MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
index 328af1a4cfb7..c277dcec96d4 100644
--- a/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+cron"
 
 DEPEND="cron? ( virtual/cron )"
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 20b0888db8c8..1747e034240f 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,5 +1,7 @@
 AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
 AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
 DIST gnupg-pkcs11-scd-0.9.1.tar.bz2 145814 BLAKE2B 53f0c11d401071dc9beef10630c07f2da6c9a70a0cb020c4430613c1c2f6ba7447bd95c490098ec688e5c73260c42a0285ed045a54d8397018611f00d5406b27 SHA512 66ac4b2d4ed2106bb0bfe40bac00cdffc36f7f10ace15a232ba475d1a152439fca2bde3f7a6eaaae8b9f17fb3e6371207f2e689d3d9557817ef54984858a3489
+DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
 EBUILD gnupg-pkcs11-scd-0.9.1.ebuild 1105 BLAKE2B f699d9c3a20f4ea91e56f53bbb20d0d253d78e103d5d22a6856f29c3401345b2975eec1614fcf8c5dcc07690e2ab626a19c3dfe206215ec76e30a644575a949a SHA512 22f55098ea560c8c5afd7b6e1e134746111ec5662f31c1ac356733e9e88beff1d086ec9a9331d9ea3501d04c704b664a3f805de80e21a6d7aeae08b7d8095f05
+EBUILD gnupg-pkcs11-scd-0.9.2.ebuild 1102 BLAKE2B c7f17b024300a005205d45ef191127789b668b57583c3d07a6879d5bb76e7b859e0953de030720936812737dba72100945d0d0512481b74c31950ae27d109543 SHA512 6d66aa3080e6fb8bcbd337c690dedea8623f6cb2e8c4906519a38ed9520461be6ab13bf9126f4fc1468152f5fc4ba5646b31b39608f1effcf160e9d3e1fd15a8
 MISC metadata.xml 563 BLAKE2B 67baabaaddb15da69e52484964c335ace26f38e96cf539f7f959a9d34de52f52dd6a12890ca2ad2d181c61e4a958cefb97b8abda27d3b75c930bd1a01c0dd014 SHA512 6ba21eb5bd095961e91f699864f08d07ef78207d656ea6f89a3b7c49d0b2a6aedfe1b912315b9730c3f2615428ec4bedb0f03599c5a76739b8bfd51735ab8c20
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
new file mode 100644
index 000000000000..114c9a5db876
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
+SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl proxy"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libassuan:=
+	>=dev-libs/libgcrypt-1.2.2:=
+	>=dev-libs/libgpg-error-1.3:=
+	>=dev-libs/pkcs11-helper-1.02:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use proxy; then
+		enewgroup gnupg-pkcs11
+		enewgroup gnupg-pkcs11-scd-proxy
+		enewuser gnupg-pkcs11-scd-proxy -1 -1 / gnupg-pkcs11-scd-proxy,gnupg-pkcs11
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable proxy) \
+		--with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
+}
+
+src_install() {
+	default
+	if use proxy; then
+		newinitd "${FILESDIR}/gnupg-pkcs11-scd-proxy.initd" gnupg-pkcs11-scd-proxy
+		newconfd "${FILESDIR}/gnupg-pkcs11-scd-proxy.confd" gnupg-pkcs11-scd-proxy
+	fi
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 193535ba61b2..b6846d9c51cc 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,5 +1,5 @@
 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
 DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
-EBUILD gpgme-1.11.1.ebuild 2876 BLAKE2B 4ebc8efd4405dbb3aeb68591f4736879785baf3429a871bc3a4206be1e1efc871a1a9076d2c930d4a1552cfff123cf0a56c426c0f9e2f0753280a6f6be7e8f4a SHA512 9c77decd7a6635eb4299cc98b4100969aa941d063687b2181ba808e5ef6002a4e1ccf53e6cd13deff7e14b38ae30b5473f753171fcf7711ee372661b2a10018c
+EBUILD gpgme-1.11.1.ebuild 2872 BLAKE2B cb6c595f8424e43cd318f65b213ed768a7d055554b7b4b7af65d7dc84af4d1216f5f777ad3d53541838fefd99e2db38151ede5d79dbfd3becb588599c33f657e SHA512 c7218db05ea51baa786bb7e800eb95ad367c21470505f9ea14bcffe38e61c13ce6c46bbfd80e3a9b70fde757bdf761fc9a01b43fa5c34ff8c69c714df1c961d7
 EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B 6e171e8cbfd00804f334dfebe888d13759c7da8ef6478ead0725c8b51cb2f8da6dc6edf911aede93f92666e974a8d2a57057d311d27ba2dab69e1edbebf81a92 SHA512 6b052e328ed378263b29e148bba84791d533fac820defd17812428821ef129b6864b662691da0db4895839393bcfc34f8881f08d04a862efd6203d74a6e37967
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/app-crypt/gpgme/gpgme-1.11.1.ebuild b/app-crypt/gpgme/gpgme-1.11.1.ebuild
index 423fb4af7e91..3da3c77fb124 100644
--- a/app-crypt/gpgme/gpgme-1.11.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index c8751ea85448..6ee2d7f4f101 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -2,9 +2,11 @@ DIST hashcat-4.1.0.tar.gz 3956136 BLAKE2B f9d6f9322e4c50ee1e156c283da1257a24f0e2
 DIST hashcat-4.2.0.tar.gz 3965021 BLAKE2B ad208f2debe1e4ece893e4a277b199962aa98aab57a2e78aef1d4177dcf7fc03bf262657dfe0f51c2ae845c8ed92232de7131f909d63bdc91e9f14e0b9602bb6 SHA512 686975db24737a718b484dd84b66807dfbe9694f1832da648b3c3b9fc8b859cd5c4c4d0aebf04ae862de38656d92c989e4e9515a07bec19b3779d74350beb0bd
 DIST hashcat-4.2.1.tar.gz 3966264 BLAKE2B 2034fff6aa8724cded0c8576cb4593d90f94eaea8f932e511ed82f2576ded2ffd6f686dac484e52a9ebb3029e90845469418ac414f2edf03e3fdc3350df8766f SHA512 a2cfc7e19e82b237892bacc79ca1a62a3b2ea598e4e5f60d4e275a0c128d865945595d8f918e3bb93bf62376f11f448ff53257faa12fd051dfc64973fbb6ed1e
 DIST hashcat-5.0.0.tar.gz 4019964 BLAKE2B 5d33bb2b0d82018d8ea6a906bee48375376879a47e5ca8f880d6fad6c6763d1ef90d44b228257021603e560acadf3d8fbfcbafdbd41dbad3733141d3c3957762 SHA512 090f07a011961a2c9a9bdf31e8a5efae4b443b6b205e964a6cd74bed6efe8fae2377f22ce7728ad7e732e9f943cf30da88066fe0990d085547f1e2ba000a3d95
+DIST hashcat-5.1.0.tar.gz 4266878 BLAKE2B 677554fc5d6c5a93d0f4955c2e3cb6a40913ca2f7d00a89cf0c00bb48cadcaca94d3fdf55b853208f9fda4ce1bcc13fed865c5128a7c429223bcf8b4b825a15b SHA512 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece
 EBUILD hashcat-4.1.0.ebuild 1286 BLAKE2B 7389102e6de56b262f34a0a0605872ac61d97b062c343d7fbb92ecbc859f43dfa2251f91b2d30294c4e0fabc575328102fd69410aed9e389b04c9c5075fa6836 SHA512 05b38f2388ef2a71cc2fb5ff33ac0cebd534e43681c11a4a06707b05686d7e2a9731783090f9e1da858f78ab327b3a22ea406342a4afe6ee439f4a8c85d386a0
 EBUILD hashcat-4.2.0.ebuild 1331 BLAKE2B 77912c87e618afd7fb5af50e3ab3ce1baf440264917748374959ee78b5d6de3357df9e10bc86f15d2ad82051ba7b3e01f0856590412276c763ffebca3ad75c83 SHA512 73864af8522408362ac12e501407ea9245a2987c540b707dddcc3bd4c60c7ebdc30f4fab7a4902d7044396e990a7ca544120a891f06662fa017cb15d81b99498
 EBUILD hashcat-4.2.1.ebuild 1374 BLAKE2B 44dfa345b726341aca0a38eb19e6667d2824c7cd263ed2b7569b01912293172658cb33970ee037492be3ba1fbc13934f576184db2a916ed0fd1ed3c643e02b46 SHA512 c3329356ba1510391ce737f96654d4f22b7fb327da7b32e4701a446afcbae9e4c099d692b4f94bfcdefcaf8c32bd4930a4d5f7ff21ce5a402c43fc6991c0751a
 EBUILD hashcat-5.0.0.ebuild 1630 BLAKE2B 89726240ae3d2f0d08ba486ed68ede1e81ea7d843eb07a3386b2e29bc10a5367229ab782a949f3627ce16afed9a92e521b6528e18fe3ac67b30247327cc50fd3 SHA512 601e6741312cab658a22f425c79ef26105b70d8ea87e33f96061fb9bfead9e545a74f1c36b2477b97b87ce07942c50416c4491976cd089fc26121f25b74a3783
+EBUILD hashcat-5.1.0.ebuild 2219 BLAKE2B 040da29686e347a9add4f240cf51d8374c7264f5f9629b4949875f6c9f55bace4c2b203b659eef33f57ef5c3aac684480c10e96f9305dded18d814f76dca9769 SHA512 6e1a913fcc764fbd22c4d6cc2c8f47f914fe878761eb835992de5ce29b62d6831f9830b43e4373a2903a933ab52273fa3d1e33ba045cf5a7dcb962226148092a
 EBUILD hashcat-9999.ebuild 2219 BLAKE2B 6c64507eeca761a75359c2e8bdfe98e378d249dc6363e42d82f9dcc756b19e5148a43804f27def5a75e2eaff1c338c9e7105b3e3513a8e0a757226686e74abdc SHA512 f2290e2f8371d0c0210aad0fc8b56218efd622c2f9f8e1a62cfd65c92d32aaf1ab93f3257419d58d17bd955d43fc978a9305bfbcd5d197b3aa32cab77e188a13
 MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
diff --git a/app-crypt/hashcat/hashcat-5.1.0.ebuild b/app-crypt/hashcat/hashcat-5.1.0.ebuild
new file mode 100644
index 000000000000..2b0f93496c24
--- /dev/null
+++ b/app-crypt/hashcat/hashcat-5.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pax-utils multilib
+
+DESCRIPTION="World's fastest and most advanced password recovery utility"
+HOMEPAGE="https://github.com/hashcat/hashcat"
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hashcat/hashcat.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/hashcat/hashcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+IUSE="brain video_cards_nvidia"
+DEPEND="virtual/opencl
+	app-arch/lzma
+	brain? ( dev-libs/xxhash )
+	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#remove bundled stuff
+	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
+	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
+	#rm -r deps || die "Failed to remove bundled deps"
+	#do not strip
+	sed -i "/LFLAGS                  += -s/d" src/Makefile
+	#do not add random CFLAGS
+	sed -i "s/-O2//" src/Makefile || die
+	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	export PREFIX=/usr
+	export LIBRARY_FOLDER="/usr/$(get_libdir)"
+	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
+	eapply_user
+}
+
+src_compile() {
+	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
+	pax-mark -mr hashcat
+}
+
+src_test() {
+	if use video_cards_nvidia; then
+		addwrite /dev/nvidia0
+		addwrite /dev/nvidiactl
+		addwrite /dev/nvidia-uvm
+		if [ ! -w /dev/nvidia0 ]; then
+			einfo "To run these tests, portage likely must be in the video group."
+			einfo "Please run \"gpasswd -a portage video\" if the tests will fail"
+		fi
+	#elif use vidia_cards_fglrx; then
+	#	addwrite /dev/ati
+	fi
+	#this always exits with 255 despite success
+	#./hashcat -b -m 2500 || die "Test failed"
+	LD_PRELOAD=./libhashcat.so.${PV} ./hashcat -a 3 -m 1500 nQCk49SiErOgk || die "Test failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" install
+}
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c0e6b1a26a62..a11039787848 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -10,5 +10,5 @@ AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
-EBUILD heimdal-7.5.0.ebuild 4261 BLAKE2B b258fa43c7cca2155233ee8d96e218e753a88ae0c6d484a11ea6d4d719de7f401db37d6148d259810193fcf7497415c04b650a80f3d18a2faea259ec9b7c9033 SHA512 e6df1f61693759c8be21bc4e01e231eef04591a2828ec430ba13c7f6951a8136600cfd765ede73f74562a28c8abaf41851d3c3e33d9a6d61bb98f421bc9004c4
+EBUILD heimdal-7.5.0.ebuild 4336 BLAKE2B 1700c9d750256878731b4235bf1c406fbd0d284fb380e86ed4f548de49f51d21a38c780053c66278cf50c8046d5ca0bd7c5266c59218ab2376d9a1bf0a030f4b SHA512 d74f45da083bab07c7b475a1b1fe31b33a9a07886ef86a90e1aab937c8d21006201ff25a5e5414e6c02aba9a94989bc52887979bc477839b94fec3744454cde5
 MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index e8a121962b7d..17a6aa13e74d 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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_COMPAT=( python{2_7,3_{4,5,6}} )
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
 
 MY_P="${P}"
 DESCRIPTION="Kerberos 5 implementation from KTH"
@@ -19,11 +19,11 @@ IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-lib
 
 CDEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
+	!berkdb? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
 	caps? ( sys-libs/libcap-ng )
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
@@ -66,8 +66,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
 	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
 	eapply_user
+	eautoreconf
 }
 
 src_configure() {
@@ -78,39 +78,38 @@ src_configure() {
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local myeconfargs=(
+		--enable-kcm
+		--disable-osfc2
+		--enable-shared
+		--with-libintl="${EPREFIX}"/usr
+		--with-readline="${EPREFIX}"/usr
+		--with-sqlite3="${EPREFIX}"/usr
+		--libexecdir="${EPREFIX}"/usr/sbin
+		--enable-pthread-support
+		$(use_enable afs afs-support)
+		$(use_enable otp)
+		$(use_enable pkinit kx509)
+		$(use_enable pkinit pk-init)
+		$(use_enable static-libs static)
+		$(multilib_native_use_with caps capng)
+		$(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
+		$(use_with ipv6)
+		$(use_with ssl openssl "${EPREFIX}"/usr)
+		$(multilib_native_use_with X x)
+	)
 	if use berkdb; then
-		myconf+=(
+		myeconfargs+=(
 			--with-berkeley-db
 			--with-berkeley-db-include="$(db_includedir)"
 		)
 	else
-		myconf+=(
+		myeconfargs+=(
 			--without-berkeley-db
 		)
 	fi
 
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		--enable-pthread-support \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with caps capng) \
-		$(multilib_native_use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -145,8 +144,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
+	mv "${ED%/}"/usr/share/man/man1/{,k}su.1
+	mv "${ED%/}"/usr/bin/{,k}su
 
 	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
 	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
@@ -166,7 +165,7 @@ multilib_src_install_all() {
 		doins "${S}/lib/hdb/hdb.schema"
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 
 	# default database dir
 	keepdir /var/heimdal
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
new file mode 100644
index 000000000000..c4379291ef8a
--- /dev/null
+++ b/app-crypt/nitrocli/Manifest
@@ -0,0 +1,35 @@
+DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST hid-0.4.1.crate 4121 BLAKE2B 8af6af754c129f3eeaaa35e3b03361fd2a658cdee017701573e79ed40e86900e137ae6a10c844f90ce8c29ecb577d892a8a9b065520eb360734c9bf52bcae6ce SHA512 5529be48d9c0cfb7bdafee029a45fe471cd8996cabe7d584615ccbfea244700a1cf7d78cdaaf8f36ac3d6ddca466d36569fb12e1c1eaaa45091899e57a1d21ce
+DIST hidapi-sys-0.1.4.crate 2391 BLAKE2B 5d8309bad190bdba91aee84239bb0965fdc0093a16a835b99ddfc13633dff6568c66f13c917d9e20cd4e1e453b3dd46ff071f729aba3ea1d99de8388997b193e SHA512 4e2c0a7ee48cb7c7c8bdaaf7c3fd22f58f8995ea2b14caab0cb03efef64711fbe35b435c9f4132e35fb02ea27ee77788be11b3c459f5a290e7297f4d0f9426ac
+DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
+DIST nitrocli-0.1.3.crate 23497 BLAKE2B a61cbf26ae5503a77c534efcfffadcd56a1ea15dc34fcfff50765fcee1c22b64f54b76d9cf23ce9ec58d37132be13e313e643379f1330e9d43b2e7492fa627db SHA512 43880b6cb9bb152a1179d02b4290ff6c4dbbdae3c5cb46c0c5cdc382d2a5d8322de97d94b1842b6e93bba97bc3d451bc8946da6d6c0b66fb7d9ed8936df2c263
+DIST nitrocli-0.2.0.crate 43024 BLAKE2B d3dea35dc88fe71b5b87666f1c79c41a56a7dc3a45c7252b342e937f69de4d4e29e217f0ffad5dc2fe2e0fca1841e6ce84ce7544b16c847bf4aacd17e45d6215 SHA512 aca356201c29ed670595d2d637edc2ce15df0a59a6843c68632b702fc92dd8df85cf6e17eed6d5d95e8dd2e83e1f15c3691f2e9bd1aeb0fc908c2217af7e74ae
+DIST nitrocli-0.2.1.crate 45957 BLAKE2B 0908dc34ee3ed65ea6221a0fd7ff7231c8a2cb64c5643a8ad0fa4b785d6d974c0528f81448412ae93f7d05f9f66fec794e71e686576b4b3f7298e96fd852087d SHA512 a13e8cf8bd471e1c9b71ec1714ae591ffc07df3588b3902250eef1e15ae53ff97b3ef965c8cd56ee63e5d82c5cefdb4c143181eb33329e3cab01bf71f1ece8d7
+DIST nitrokey-0.2.1.crate 20573 BLAKE2B db7a20121a36d198f1b84e24ea79bdbb18dcb428ec9a84b7180f2157fa14b8ad78a3adcf2162da5bfcd8e112d71b2b05031c694a830e9c6c327c7518360f2f2f SHA512 5f2d87f628028f4ffedc07dd056287744ef558de9e9fc21ba0e7e1a87c138acb7bbc9b0fb9b2b086845f13ffde131b0ff22dfb0b5b32713279a260a7a8ce3829
+DIST nitrokey-0.2.3.crate 21180 BLAKE2B ece6df9f4d755d9aa3d8f332ba6505e3a0c3b2d0136d376987aaa8beb5b39197a0d9b28341af53a08b9996c612af9b6957fd55ccbab156439920fbd7e97ec505 SHA512 b267526a0a81612d9671d53927b2478c2817d9347a2ce8cce7cfde4e0983434083d748c065b995047c19ebec72a26b1ee1b7e9351ae6d34f3ada91fbb3a316d9
+DIST nitrokey-sys-3.4.1.crate 61726 BLAKE2B 98a1cfa696434372d980ff5f645de77479e2e7977334df805d67d970df262e19c11c5880343c5bfc1a1b2abe7d29a34762bd90ad926c7cf7ba486e0b513c84fa SHA512 cc9cfbbebbad8a5c5846c60ad4125c87a64624ee90302327b03a94b1494d2329e45bbb09d58a3a00d465b23915faff3d3d787f64c0edcce6c63f25ab7830af13
+DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
+DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
+DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
+DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD nitrocli-0.1.3.ebuild 948 BLAKE2B 86abae2029cee3e94851333b46dfdead6f9a6999dda733f8a133110049778a9e3fa6c245fe0859461b133e3686442cdea885e16df597a5e6f74ce0bad01579db SHA512 1203513b9633a1e84cf907d0877cfb1507ea0bea674b1751aceda583b8970f999b09938234a0efc0f8087dfe731d1338464fdb7467204fe1b26f9787fce9a8e3
+EBUILD nitrocli-0.2.0.ebuild 1152 BLAKE2B 3fbcd7ad0bfa1d92fbb7c6d74d38aca5ddda18cad7b46035c1fca1c34f1d541e64d1be27bd6f7a696f3037a6bb4634ed431b28924d2e872de72cfd0b33a8ba1f SHA512 e6b3832f794f6d5311d31c30c3bf0546956a089702b54d2b28bf1ab5dcbc528dea60fe01ee89718980357457e1e571864fd7c278829052f0addf5d10429bb643
+EBUILD nitrocli-0.2.1.ebuild 1075 BLAKE2B e6a76c66202678c8d652a35220a9f71b6cdd95648535ccaf5dd270ee8885157aecf02d8d7ca9430adecc040a81c4aa83bb13c92cb98268858dfc743bb285d33f SHA512 393aa066d0508bdfe7c979198f269946e9f2ad506c85061131fac6b102317d6a4a6147e105d7795c8977712bd8e3a1b307746fb85d20a0a9ccf257d1f88a83a0
+MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/metadata.xml b/app-crypt/nitrocli/metadata.xml
new file mode 100644
index 000000000000..d84c39390b85
--- /dev/null
+++ b/app-crypt/nitrocli/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>deso@posteo.net</email>
+		<name>Daniel Müller</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	nitrocli is a command line application that interacts with Nitrokey
+	Pro and Storage devices (see https://www.nitrokey.com/).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">d-e-s-o/nitrocli</remote-id>
+		<bugs-to>https://github.com/d-e-s-o/nitrocli/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/nitrocli/nitrocli-0.1.3.ebuild b/app-crypt/nitrocli/nitrocli-0.1.3.ebuild
new file mode 100644
index 000000000000..1424608aca74
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+cc-1.0.25
+hid-0.4.1
+hidapi-sys-0.1.4
+libc-0.2.45
+nitrocli-0.1.3
+pkg-config-0.3.14
+"
+
+inherit cargo
+
+DESCRIPTION="A command line tool for interacting with the Nitrokey Storage"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	>=dev-lang/rust-1.31.0
+"
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Requires a Nitrokey in pristine configuration.
+RESTRICT="test"
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \
+		|| die "cargo install failed"
+	rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml"
+
+	einstalldocs
+	doman "${S}/doc/nitrocli.1"
+}
diff --git a/app-crypt/nitrocli/nitrocli-0.2.0.ebuild b/app-crypt/nitrocli/nitrocli-0.2.0.ebuild
new file mode 100644
index 000000000000..193d981b9610
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+argparse-0.2.2
+bitflags-1.0.4
+cc-1.0.25
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+libc-0.2.45
+nitrocli-0.2.0
+nitrokey-0.2.1
+nitrokey-sys-3.4.1
+rand-0.4.3
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A command line application for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND="
+	>=dev-lang/rust-1.31.0
+"
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \
+		|| die "cargo install failed"
+	rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml"
+
+	einstalldocs
+	doman "${S}/doc/nitrocli.1"
+}
+
+src_test() {
+	cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "cargo test failed"
+}
diff --git a/app-crypt/nitrocli/nitrocli-0.2.1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.1.ebuild
new file mode 100644
index 000000000000..79fae8b75f55
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.2.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+argparse-0.2.2
+bitflags-1.0.4
+cc-1.0.28
+cloudabi-0.0.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+libc-0.2.45
+nitrocli-0.2.1
+nitrokey-0.2.3
+nitrokey-sys-3.4.1
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+rustc_version-0.2.3
+rustc_version-0.2.3
+semver-0.9.0
+semver-parser-0.7.0
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A command line application for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND="
+	>=dev-lang/rust-1.31.0
+"
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install --path=.
+
+	einstalldocs
+	doman "${S}/doc/nitrocli.1"
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 0c39a76d4835..f92fd75170db 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
 DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
+DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
 EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
+EBUILD openpgp-keys-gentoo-release-20190102.ebuild 1145 BLAKE2B 02ca7151e5e751d7faa255f8ee136780f0be8034662bb3002d0538d64d035d18d92408377cefce36b7e91d7878e0582a3a8f2ecc01d024211fad659a5da9b3b6 SHA512 00925cec194574662a545d8e7753605055c48206850b2431eb51bcd48a1b9916d249d41e60e7cea0e2e19b7e2469e642775256211d0b39e6bca5f241da816ea8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
new file mode 100644
index 000000000000..b9a927fd8e1e
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+src_test() {
+	local old_umask=$(umask)
+	umask 077
+
+	local -x GNUPGHOME=${T}/.gnupg
+	mkdir "${GNUPGHOME}" || die
+	einfo "Importing keys ..."
+	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+	local f
+	for f in gentoo-release-test-sigs*/*.asc; do
+		einfo "Testing ${f##*/} ..."
+		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+	done
+
+	umask "${old_umask}"
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 84313eb718af..57160afcd6f0 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
-EBUILD p11-kit-0.23.12.ebuild 1994 BLAKE2B 6522f5f8d67d5f07b7dd87f9e30a823ae8d9b0125bdfe90d8477c59b2aa472b5a221ac8b45b68853d3e429eff39c402791ca0d249b9cc069cacf25304939e983 SHA512 52e91a683361b48e1ef792ed70e9cc67068558f1778ee1635718c6618b31f720cdcb64dd6532cfbbf46433c8b8f93ef895c4c47c4fcdb61abad3216a8d640458
+EBUILD p11-kit-0.23.12.ebuild 1993 BLAKE2B 0087888a61487bf5d9bc57a4ed413cc462d6216564f1b83b553f88ad556b9b971731ad8eccdf697607c446ba93aa70c79dde438427a06724daac9f8eb7b35885 SHA512 efa79a2a2424277a1db11946a8434a7c5d0e52b02b4a627209abbdd6d7fc1f1a044e12617e6eef41f7ad0c70f1cca6ee718248437a7ee1f8e14f8a45b7b0eb1a
 MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
index 72ccbebd9287..e26190e0dcd9 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 50e2f3498f27..f64369fb256a 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -3,5 +3,5 @@ AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-EBUILD rhash-1.3.6-r1.ebuild 1906 BLAKE2B 06a46c3f2aded1f81cb91fa91ded54b57ad570a55b946a3c5de6956d87749b666a8f9b575680102c8f53e9823209b5155278cbf666a2e5ad347b888af2003d74 SHA512 3f66e8e237e0de33708833fb3c2b1bcd1f07f26126fac7e487943843467f93cf1f2e3fa35c451e4418c94f6080dc26b33c4e8f0410401d4d90508fefd7395dee
+EBUILD rhash-1.3.6-r1.ebuild 1917 BLAKE2B 4276bd7da9604398f8e150a6cc8585fba3b7b90011e4dd60ff2f133996ffdb80b9e85659239669fc1faeb0e5856dec1b6cae1966d1d21952b947740d4dc5b656 SHA512 efad5669c2917a07bc709d433bbda42d4d8ab7b1a88740a495f9329c79b48dde44c60f2dec5b0dbf04ca6797f7ad9423c82b73700797dd8a613dddcad1d0c64c
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index bf08f69614ab..bc4994b4b6ee 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
new file mode 100644
index 000000000000..c377f779261a
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -0,0 +1,6 @@
+AUX tpm2-abrmd-2.0.3-build.patch 1219 BLAKE2B 3fdaf5018e2dca93c146be69505d48c3caf4a5cc07f1d658628c0297bbff2e2c2b22ecc0118bfb868409a84befa6f261c798387bd380038af11ddddcd4361eea SHA512 a4337ad1543e1580f5db8421a01c4031c6689bc0988e0c1ec4024ff003aa03c53bec68e5b27b25321d2828fa920129596fc3100c226bd91301eda6059af02248
+AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
+AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
+DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
+EBUILD tpm2-abrmd-2.0.3.ebuild 1188 BLAKE2B 51842982c3644e7007cc827211bc342c0366110d81c10735d096fec3f4ee7332aeb5307f1ca9ecded8015bf2b6ab494e2fe0a4b80aab9ff8e9ff5fd99625f0cd SHA512 2861c1d3b622bbc33b676dd928c481763fab431735a944cf9ad2265656acf97fe1d2cf33fc4854de43d916aafd377e18cf96873f2719e2e1bccf048f93c18636
+MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
new file mode 100644
index 000000000000..72e823405e91
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.ac b/configure.ac
+index ecbc3bb..5973ff5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ #   these macros are defined in m4/flags.m4
+ AX_ADD_COMPILER_FLAG([-Wall])
+ AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Werror])
+ AX_ADD_COMPILER_FLAG([-std=gnu99])
+ AX_ADD_COMPILER_FLAG([-Wformat])
+ AX_ADD_COMPILER_FLAG([-Wformat-security])
+@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+ # work around for Glib usage of function pointers type casting
+ #   https://bugzilla.gnome.org/show_bug.cgi?id=793272
+ AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
+-AX_ADD_COMPILER_FLAG([-fdata-sections])
+-AX_ADD_COMPILER_FLAG([-ffunction-sections])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+ AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
+ AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+ AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
+-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
+-AX_ADD_LINK_FLAG([-Wl,-z,now])
+-AX_ADD_LINK_FLAG([-Wl,-z,relro])
+ 
+ AC_SUBST([PATH])
+ 
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd
new file mode 100644
index 000000000000..619e3dfde776
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd
@@ -0,0 +1 @@
+TPM2_ABRMD_ARGS=
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd
new file mode 100644
index 000000000000..0272921dcbd7
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="TPM2 Access Broker & Resource Manager"
+command="/usr/sbin/tpm2-abrmd"
+command_args="${TPM2_ABRMD_ARGS} --logger=syslog"
+command_background=1
+command_user="tss:tss"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+
+depend() {
+	use logger
+	after coldplug
+}
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
new file mode 100644
index 000000000000..81a49e4dc591
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/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>crypto@gentoo.org</email>
+		<name>Crypto</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-abrmd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
new file mode 100644
index 000000000000..8a2bb55ac659
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd user
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RDEPEND="sys-apps/dbus:=
+	dev-libs/glib:=
+	app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	dev-util/gdbus-codegen"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+	enewgroup tss
+	enewuser tss -1 -1 / tss
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+		--with-systemdpresetdisable \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 4bd9b9b41eab..e6d0efbdfab8 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,3 +1,4 @@
+AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
 DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec SHA512 37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc
-EBUILD tpm2-tools-3.1.3.ebuild 634 BLAKE2B 7a79635d19aee0774d05675b1cd793b08696948405c04de215e9778ea3706be681d9d968a16d2c6e07e3e487f08afbd301e86083633415e4a7c96a661bbd4a81 SHA512 f7d0d985ffcb2d66c1eae57673028643941270660a5aa05864626ca503a37365c4fa0dedb41a206184211c45b5a961813c974dcea2c86c9f4b5f41d461cf8311
+EBUILD tpm2-tools-3.1.3.ebuild 682 BLAKE2B e8cdeba71654b6c0cd36f1362a1846eb5c7c0fc0b1a0bbfc0b9d7a524b9be1e5d1f7c2bc86a473ecd7e1f74baf811598ca6bda19657cffc8f581581a9f7a390b SHA512 85af6624609561725be46ca88a8d277cd578c840b3820d6ba23a9ed38c05bd70918e956c3742e09aed866fae721604bff839b876f7f3ebf941eaeabcabf8440b
 MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
new file mode 100644
index 000000000000..7c26d6e14f8c
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-3.1.3-libressl.patch
@@ -0,0 +1,81 @@
+From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 4 Jan 2019 10:33:15 +0200
+Subject: [PATCH] build: fixup libressl support and add libressl-2.7
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+Backport: 5d4cc4ee
+---
+ lib/conversion.c |  6 +++++-
+ lib/tpm_kdfa.c   | 10 +++++++---
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/lib/conversion.c b/lib/conversion.c
+index ce0f5b3..f55af6f 100644
+--- a/lib/conversion.c
++++ b/lib/conversion.c
+@@ -45,6 +45,10 @@
+ #include "tpm2_alg_util.h"
+ #include "tpm2_util.h"
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
++#endif
++
+ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, const char *path);
+ 
+ pubkey_format tpm2_parse_pubkey_format(const char *label) {
+@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c
+         goto error;
+     }
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+     ssl_rsa_key->e = e;
+     ssl_rsa_key->n = n;
+ #else
+diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
+index 3d1ed50..fc03af8 100644
+--- a/lib/tpm_kdfa.c
++++ b/lib/tpm_kdfa.c
+@@ -34,6 +34,10 @@
+ #include "log.h"
+ #include "tpm2_util.h"
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
++#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
++#endif
++
+ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
+ 
+     switch(algorithm) {
+@@ -54,7 +58,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
+ static HMAC_CTX *hmac_alloc()
+ {
+     HMAC_CTX *ctx;
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+     ctx = malloc(sizeof(*ctx));
+ #else
+     ctx = HMAC_CTX_new();
+@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc()
+     if (!ctx)
+         return NULL;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+     HMAC_CTX_init(ctx);
+ #endif
+ 
+@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc()
+ 
+ static void hmac_del(HMAC_CTX *ctx)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
+     HMAC_CTX_cleanup(ctx);
+     free(ctx);
+ #else
+-- 
+2.19.2
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
index a23c0b4d9a6a..df27445aa2b5 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch"
+)
+
 src_configure() {
 	econf \
 		--disable-hardening \
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 6304a91c7243..24daf8c1cc03 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,5 @@
-AUX tpm2-tss-2.1.0-build.patch 1717 BLAKE2B 28a2ea02df0d0414176062e93c57d798c50d0f5c36ce7b162ea928cc5b5a93db71f8447bdabfd3c899941000b71927784c0d1705b0afb5f1fb3500999ebf4138 SHA512 587323ff5ec3638658d57bbfe587171dd61c9622d45c9cf08ab8d2de1a73eb9ec8c7e962c99d7e4b555ffa364d9e3831634fb8f628c5d2c36a9a163ce708644e
+AUX tpm2-tss-2.1.0-build.patch 3044 BLAKE2B 4d166306c401e0a178626ab9c49f22ee8c69114051c753631870a65f6ae5c80a6ca710092f2ce66b0c2f5b937ec7f05f288a79cfbbaaf59b62bbe61b77e23f6b SHA512 9a3b4fce5e2403f0c9dc2ac3726efd3fd6e0e3f0b62109cce22b25e55f950aa3c2e32894460d016913eb4635fe99580bb7a14afae1677464af1c9f6b927e7f73
 AUX tpm2-tss-2.1.0-tests.patch 1066 BLAKE2B 2ec86af0165f3e50089e238760445046e073e7c9e1f69c0c739078518f83751512889f24f333fac7738539fd3c2057e42a52380003b6483400c78b68c335a75f SHA512 12b1df925a1bbc25ff00a57dbc614c2a01779c0f1849ef22f0172e343e6cc431cdc8daffa0eed271761ba17d035124532796a5072ed8fba19555e214e8b7a804
 DIST tpm2-tss-2.1.0.tar.gz 922814 BLAKE2B 06baa6b817b99c0955a5190b0f90f8a0c55987eb06feb827cb950b69992ec1623367db488617722712ce9932ad8310c1b743af038ac77508106fb8f6f4409b1c SHA512 2aea80a4cb2be59a87de6eda74a2907a2832aa76c3c208f610172f4c5bd29133b24b0876286c40855a742d6068b8f843e32f6d995b0e51c2d1e0a752b92fff7c
-EBUILD tpm2-tss-2.1.0.ebuild 1337 BLAKE2B 37d5f7e16cda8724d3e6aaf49b62c770b76de52db1158f3c206b432c33e5ebc44d3be6c96e625150fb3dae41a4394563ee603036292d49e5cc3ebd2f8b9e6ee3 SHA512 9d44925a91546aca53c9bb78da240421f446bd3fe2f19cb7d9fecb392b121dafdb1d27e739d7347a849164d0a2512709928032217a478cda3b4277d3dfda17ec
+EBUILD tpm2-tss-2.1.0.ebuild 1399 BLAKE2B 007296b2f01c92cd395c357b68a3b7666848b9867ebb6e077c43f1fa4015d4620aa4cd268fb4e77cc43b2022bb263ecc175f5fc8070ed47eacb9b714fe35df1d SHA512 3094d1a812a15b59b2d725c0bad668516805970f3a92e6840be7345cd5a1ce820b9775b97f8f5dc2808b8943af04edcd61a45ae570257e0def482c4ec103a70f
 MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
index 930c173239ed..85f84c38e1f1 100644
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-2.1.0-build.patch
@@ -47,3 +47,42 @@ index c42b487f..f9118642 100644
  dnl ---------  Physical TPM device -----------------------
  
  AC_ARG_WITH([ptpm],
+From 74037d3c15b9f9d98f9b50ca4f1c1a99d239d751 Mon Sep 17 00:00:00 2001
+From: Philip Tricca <flihp@twobit.org>
+Date: Sun, 4 Nov 2018 16:17:19 -0800
+Subject: [PATCH] build: Fix breakage in generated configure script when CFLAGS
+ is set.
+
+This fixes a bug introduced in 3980bad87fe18ad9d32914e9d21dba145eba973f.
+That patch references the documentation for AC_PROG_CC but it misread
+the recommended workaround. The leading colon (aka `:`) in the
+documentation is significant.
+
+The `:` is a shell 'builtin' command that is equivalent to invoking the
+'true' command. By placing the conditional substitution of the CFLAGS
+after this, the result of the substitution will be ignored and the
+script won't fail. Without this the contents of the CFLAGS variable set
+in the environment will be interpreted as a command and since they're
+not commands the configure script will abort.
+
+Signed-off-by: Philip Tricca <flihp@twobit.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4e4592e..f88fe38b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ AC_INIT([tpm2-tss],
+         [],
+         [https://github.com/tpm2-software/tpm2-tss])
+ AC_CONFIG_MACRO_DIR([m4])
+-${CFLAGS=""}
++: ${CFLAGS=""}
+ AC_PROG_CC
+ LT_INIT()
+ AM_INIT_AUTOMAKE([foreign
+-- 
+2.19.2
+
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
index dea061ef89ae..07b4fb47e677 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD-2"
 SLOT="0/0"	# sublot is libtss2-sys number
 KEYWORDS="~amd64"
-IUSE="doc +gcrypt libressl openssl static-libs test"
+IUSE="doc +gcrypt openssl static-libs test"
 
 REQUIRED_USE="
 	gcrypt? ( !openssl )
@@ -20,11 +20,11 @@ REQUIRED_USE="
 	|| ( gcrypt openssl )"
 
 RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	openssl? ( dev-libs/openssl:0= )"
 DEPEND="${DEPEND}
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
+	~sys-devel/autoconf-archive-2018.03.13
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
@@ -55,3 +55,8 @@ src_configure() {
 		--with-udevrulesdir="$(get_udevdir)/rules.d" \
 		--with-udevrulesprefix=60-
 }
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 5c69713bd134..7aa726e731b9 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index 1fbec64cdd01..5741d5947bb0 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -5,5 +5,5 @@ DIST dict-de_at-frami_2015-12-28.oxt 8110628 BLAKE2B 13652ee81381d766c151ed53889
 DIST dict-de_ch-frami_2015-12-28.oxt 8101312 BLAKE2B fd2da123f768b1ac1d66524272570fee0c237028d736100a5fb742418173120c54b8d3ee9e138b07699dc72372661e671bd8cf27eca7cefb0f39c84e49f286db SHA512 b62ad082fbef3785b5cd29bb530a4f5367771af6237d10a9ee922f0deaff0ccdd7c0a9cd93a9218444b07bf278efdb18f497660513af4b8862998ab3bb434f5a
 DIST dict-de_de-frami_2015-12-28.oxt 8110832 BLAKE2B 5bf8014e4c21f3d35296a13a9413caa0f2535cf7de39a774b4a16eef4ddb543b7d80e8fc5ac871f46442304e13cf7472b2d9188d2cc7173cca3b6dde582730ee SHA512 242cfa3f9f8046badbd56560d05cc47a2b0bc89b263f9141443b3401981e91a1124d1c2f76ae77ea017b02a34567cf4c160c31e2250f90d095a74b92dd3d636a
 EBUILD myspell-de-2015.12.28.ebuild 1394 BLAKE2B 5757368238631bfe9b4489cfd557c6e5a1d9f6b3056c93369852ce568f4852d87e6e9faebec68362fdabd993a850252d728d013ce5044dac3bfc005b036a626e SHA512 c32532ca35a03f2debb9dd05e5911651648827e65e47f1cefd1b8e94096613f9e1d1f390761d613c6c07b078bd1dda399de95bf2d86bfc6486ae7f446346d322
-EBUILD myspell-de-2017.01.12.ebuild 1468 BLAKE2B 2457bdb261b2993d68dce45ad9430367bdc37b61d74d1d65db03cdafaed1a492694fcedde6cf38304996e898292624558ae0ed7da9b3476a7a9642a62a44c13a SHA512 364ae2d3d129f926c5f6c987e12d38eae2c0131e3ba112fb95fc2bf8d5925b3d542e2da63eae8cb1b3817ab6afca23d14136c1eefcc9cef5401d35c99a39c45b
+EBUILD myspell-de-2017.01.12.ebuild 1459 BLAKE2B b4b6907cdc6f2d3adb8ca73bfc0a5c70402ebe844c1f9dff48f13059c9219e902e993cdc4d6e1143fcdd64d5900f71f77a828ff74d20d9e435d6131717b1221e SHA512 5fa3f448fd037069df0e640b34f61ef39b954c6992cdce8c756ae12ba24b3153e5638e13742c6c24198c280c6ae620ddeec0ce0068b96a2cedf21fe367387d85
 MISC metadata.xml 733 BLAKE2B 3fb6dae837e40035e2c2db3b49772a7ae7d4d48acf91feef11cb099d7af5900e081e72264709394d0371715755c3944867c43fdca080a7a54f87f38b83bbd2df SHA512 946f116da1ba091533fdc8837586692566f522d5d12e778aa149619b71003c754338bbf8b4e4e126c625e240339823272be96f2270082820d07786ff5ab35024
diff --git a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
index 2c8b8196168f..cbdd72f3bba2 100644
--- a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -45,7 +45,7 @@ SRC_URI="
 
 LICENSE="GPL-3 GPL-2 LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 src_prepare() {
 	# fixing file names
diff --git a/app-dicts/myspell-de_1901/Manifest b/app-dicts/myspell-de_1901/Manifest
index ce96f8dc2058..b68e313f12bb 100644
--- a/app-dicts/myspell-de_1901/Manifest
+++ b/app-dicts/myspell-de_1901/Manifest
@@ -1,5 +1,3 @@
-DIST dict-de_de-1901_oldspell_2012-09-29.oxt 4807281 BLAKE2B 39998a25f9361be7ac1b6374178efd213b349fc5965f81a532d833d4f5a32e7fdf4b1c89d6e927a87cb5b93e165491545e8b859ae8ff85e1d261d077d780b0ea SHA512 15afe6157c6a1fbd723610440f98e823217d91fd0accf54975797ca20b3f47d6beb14c2ce118a44d17815c05e6dab923ea1ec3759237c6c4758344d805776cde
 DIST dict-de_de-1901_oldspell_2016-04-03.oxt 8197279 BLAKE2B 5f930ee3d727ad7e6ce37ca1062a200b09d3a922a446dde201c192842c898e5754b7405cf92dd58f9981bb4445d7223131f30f336a39d1c84001f8a61cd08eca SHA512 af6a353e52505895e4084378d91578956452d7db402a14073e6b2387d7b5377bcf652414bf90e113d976f24e082adf138ba138d54fa321c55bcb2c4d93c83cdc
-EBUILD myspell-de_1901-20120929.ebuild 1161 BLAKE2B 07a035879471bb288a2bebddf28cf3b6a55fc78e73bca95b0750280c9b5fb9e8781de32fc59ec98055fe3b22c6d4db34b3dc5901f63bfa838fd9b7930fa5003b SHA512 bf40ac2ebdbd2a4ce2dfafafdb4ed20e161e6c664c1feb386673a556f3a4ecc4372e2bd8d76b91964a0f30b22fdec29e9d8ae00b0f5d65b08607842d9f93e9fb
-EBUILD myspell-de_1901-20160403.ebuild 1307 BLAKE2B 746a563de13eadb4309fc6a355612f2660180f718655c377ebab30cac1257e3a2f6d0a474dabc772903d0a8af8f47a0bdef7fd954a8fa23ee0cc371dfd924309 SHA512 5098110d03c5c58ca23515a1d724bdeb9035e33a85258ede9ad3bdf27b7de33ab77d84a9c852310cb6fa1a69f74722c18c813780dfa38cc41c7f59758a69cbb3
+EBUILD myspell-de_1901-20160403.ebuild 1297 BLAKE2B f1c9c78750f4e46717402aba444116db1c04624bfef5ccd32e4cbf06b2e2b77ef319401c0dfc4f62904045a7ca6b962f5b584d6432bd93eaa02917348ddf3ebd SHA512 53db5946120fd3fde944492f95d879c21007b21f9bf0ab62ef640c9734d78ae77d14b87090f2e7f167bd64e872ccf9651c7e66d5dabcb5407b980180e006ba40
 MISC metadata.xml 306 BLAKE2B 8640f4712e7722fe1f5bbc3438553f6edb19f0902777ab739303e54f0563fdbd44b6370e06bf065f4dbadb96638fb013fb87851305983a6f19d88af6222b9b7a SHA512 48f580db3509626b7c45b9025b9f80405e6585d29dfb63c8dc9035c1ca8e55aa5fd55ee70ba4e675ed8bd1e5a15369bb9ed0236accbdad618c7b9df33c2d642f
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild
deleted file mode 100644
index 680905fdf432..000000000000
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20120929.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MYSPELL_DICT=(
-	"de_DE_1901.aff"
-	"de_DE_1901.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_de_DE_1901.dic"
-)
-
-MYSPELL_THES=(
-)
-
-inherit myspell-r2
-
-DESCRIPTION="German (traditional orthography) dictionaries for myspell/hunspell"
-HOMEPAGE="http://www.j3e.de/myspell/
-	http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries"
-SRC_URI="http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/${PV:0:4}.${PV:4:2}.${PV:6:2}/dict-de_de-1901_oldspell_${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-src_prepare() {
-	# Nicely rename; http://www.iana.org/assignments/language-subtag-registry
-	mv de_DE_OLDSPELL.aff de_DE_1901.aff || die
-	mv de_DE_OLDSPELL.dic de_DE_1901.dic || die
-	mv hyph_de_DE_OLDSPELL.dic hyph_de_DE_1901.dic || die
-	# Remove thesaurus for new spelling to avoid installing its readme file
-	rm th_de_DE_v2* || die
-}
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
index 21d8c13f5031..2a7d110699ac 100644
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
+++ b/app-dicts/myspell-de_1901/myspell-de_1901-20160403.ebuild
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_olds
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 src_prepare() {
 	default
diff --git a/app-dicts/myspell-es/Manifest b/app-dicts/myspell-es/Manifest
index 876eee1bc58c..96101d73830a 100644
--- a/app-dicts/myspell-es/Manifest
+++ b/app-dicts/myspell-es/Manifest
@@ -43,5 +43,5 @@ DIST es_UY-2.3.oxt 1411016 BLAKE2B 51dc5d52b13ea15432669c7bc518ecea0e9c26df02454
 DIST es_VE-0.7.oxt 1435033 BLAKE2B 4b0c3bf2d0b4aed3db2d2cd2a895692a9e3ffec16d0f91795f2f8f462f22783bd4240359670ce0f0e35383d0b0ff1f78c3be130134604de6c9b3515f63b599ca SHA512 e70ab6b64931dd0f572625564295844d471e68d0e6d38dba5e2c27646d5caf416a412f179e31ac647ace9fcc673a40727abd1375c1edd69d80246b4888380969
 DIST es_VE-2.3.oxt 1411856 BLAKE2B d746113298bce3db8c8c4d4ee8caf369f809ef73971612fc207470ba1ebfc67521235e855fa6243d2b6850184f273723c7d83a0b8d22293c3abd9fb550826ff2 SHA512 4d10b818e4d00f60f07f9f64d519b02f549298cfb1da6a344504cd8953fb54793607c662ff2f0505dfa9924e1d1ba45c1ef6d2d6bc4cf2d37d3d1bef99078569
 EBUILD myspell-es-0.7.ebuild 1237 BLAKE2B 8a567e251f9bda7d627937e7658e583a08f43f6a6c227fd04411b33d2ead5c9bd55ce59dc45bb1f562129041c3ac184e4345541cc9c664f4121e4a70436e38af SHA512 86867d2ed2f2d94db05b12ee42c7432f73f43371068fca4654845ee197fbdc2dabfb8b51479e3a6e1e2f6f4a44be05b37eeaa21fa2566876cf85c778e0bc4b83
-EBUILD myspell-es-2.3.ebuild 990 BLAKE2B d2b47ee6ebb36232ffc8b23c4cb4bba9c7fb73409dee3363b1de83d1660bb8df50718a11d3a37a6820bfdb04dc8512783622174f06e4209bebc766fc47f433c6 SHA512 33c29c593bf02119062ee03ecb6b787f09efb177a2474316c676fe2e2605aa1bcbcec788e12c47e1cfe174655e28a70d75a4482834ae915565c33d9003b6a171
+EBUILD myspell-es-2.3.ebuild 977 BLAKE2B 8594ad7efadf4658f3cd0419e83090a0aeed6c27d9a28247bfb6d143a175c737f321388dd786f08853ef2cf43fdea82625e77b7e0cf084459591eb61d8b80e21 SHA512 01255e69248195b87db84af72bba978fa7e51b7e13944e20ca3281a2dbd2a05f4162dd21f716d5d82f235a23a8215b9888311ec85f2aa35521e27c311f84c109
 MISC metadata.xml 365 BLAKE2B 36efea9be90b8f961b59106b4b60a02fa787ed84f639c68101d093a825d10dfb7ec0e46a14bc47cf6d7b271e039f7c3d7103dcc2bafa60a4a69e185e8f9c8908 SHA512 728f0f7cc5ff04ddf7724efdabc86b7e767dfe5e4383a266547360f712a583664355ee5e528366d42300c2837fb5134cb4708c80dec10014bb9fb69929418e51
diff --git a/app-dicts/myspell-es/myspell-es-2.3.ebuild b/app-dicts/myspell-es/myspell-es-2.3.ebuild
index 93987efe68b5..b1661aa974a0 100644
--- a/app-dicts/myspell-es/myspell-es-2.3.ebuild
+++ b/app-dicts/myspell-es/myspell-es-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ DESCRIPTION="Spanish dictionaries for myspell/hunspell"
 HOMEPAGE="https://github.com/sbosio/rla-es"
 LICENSE="GPL-3 LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index a28ad5ad06b5..00dd7271bc6a 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index aec156539ca4..0724fb0901f5 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,5 +1,7 @@
 DIST gnucash-docs-3.2.tar.gz 92387447 BLAKE2B dac502975f885b777c1e91a7ea574789947e1dddfd3239c05973ce57fec41a6d78e605ef37aaf721db4aa4d2bc8f2dda7ed76cc4dc97dd49e30618414e262f15 SHA512 a58a583a457377f529223ced083fb64460b3b0c75a423db08c7f9542711be98fd59bd776bf77309ff91d1c46f22a5ae882d8c0a8ec3fc834d7a8028a95028aad
 DIST gnucash-docs-3.3.tar.gz 92417386 BLAKE2B 200f9b8d3006589eac5f0d66300d658f69f5c55078371c5b416e34784835350de9bd40fc5d85e59116022874294f74e259a034d6ebcaf315b1ea9942b8350c7b SHA512 5887171cbe95f545eb6e647aee2d04a26ab9102643acd8d3e5754000613a7fb08e4470777f7dfbfd0d1ed7609de7a6241cd82f5c7d62f632b2e3751b005bc01e
+DIST gnucash-docs-3.4.tar.gz 92762652 BLAKE2B 1aad3f1e7fe5b6ec11b38dc778e8994544d50f9549450b4632e5fcbd370332f05c7c68f9f6bf0e274b654dee6304924d17089b61318e0e4356bf01133ad47508 SHA512 0a64c8fcc88988a08d5b2f7c472356c580dff17b1a2a37b66a6bed790fba9d7bb437955050656656a0be399b2ce1635902f4548f44b62233c1fcd1d75fbb38ec
 EBUILD gnucash-docs-3.2-r1.ebuild 1665 BLAKE2B 16ad7acf14b9e37dafded93957de6c3246be6902ccea2198832b6dc5409f93ae06bcaf52e091f88d6df6b8327a77198140b67671b0f7a242a0e2bdccfb510222 SHA512 e95eab369275cfac0b5944ae8a0659e5743f44e76c650b78c055246d66c0b953ff8398070b87c3e1f341722b7d51ceaa6896b27b2dc8e424bc9a5e5ae40c3406
 EBUILD gnucash-docs-3.3.ebuild 1666 BLAKE2B 83ab7ebba3c17425df70be4e85f9c26032faf67bd88d16f42dc65cee0486ede8bf50b8bd8eecfbbb5a2d7e2d552cea6ec48370edf8b8c3ed0505abad0cb9e544 SHA512 38f8145072110b0611563ad592113d5f60a96a43986c8ec819ad3a66f6064406f5e929e37090e9bfcd3dae4ffe387ac6fb7dbf2e4610bde6b80a7bc14f6d4e8c
+EBUILD gnucash-docs-3.4.ebuild 1667 BLAKE2B c232b46024f80a9ff86833431ff983722a72d3f9953dff610cc5e86e8a9c22174d168a5d5ae32d5ff942bc2b7c8f1424c04f3012e83765af02446a2fe3266194 SHA512 026d7aae62cb09b435de0c50e4e3b1decf32a863fee0c11791a098e5847795b4467a63cfd80fa2bf52c1659bcf63d3426b1e4f3e160d7e13bdb54c7c4adb7ab0
 MISC metadata.xml 496 BLAKE2B a668cda0f44d550b086c539edbd5eeb93092fee992621cbd655b5c30e3bfd658fcd0a65d4140f2f9ba4d368438c224bac887e86e6d36b730afd4a24c195fc448 SHA512 19e5631659fe0153e6f2de3bcc8dc5eb1615dc3e6a3493d71ea0d5e18df48fe64fef31819883add93cd1da425ebea0aa82f62b0052bdc328773b8a3c0bfca26a
diff --git a/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
new file mode 100644
index 000000000000..2fd86099fbde
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-3.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="C de it ja pt ru"
+PLOCALE_BACKUP="C"
+
+inherit autotools gnome2 l10n
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+for my_locale in ${PLOCALES}; do
+	IUSE+=" l10n_${my_locale}"
+done
+
+DEPEND="
+	app-text/docbook-xml-dtd
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+my_l10n_get_locales() {
+	local l locales
+	for l in ${PLOCALES[@]}; do
+		use "l10n_${l}" && locales+=( $l )
+	done
+	if [[ ${#locales[@]} -gt 0 ]]; then
+		echo ${locales[@]}
+	else
+		echo $PLOCALE_BACKUP
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in $(my_l10n_get_locales); do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						my_lang=C
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			cd "${S}/${doc_type}/${my_lang}" || die
+			emake DESTDIR="${D}" install
+		done
+	done
+
+	cd "${S}" || die
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index d449d7a78426..9ca3a6a845e0 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,6 +1,8 @@
 DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
 DIST kicad-doc-5.0.0.tar.gz 68834628 BLAKE2B af6cf42fbabbf3dcd1a00b1bf94633d1cc09a5c6457bd20631f4049a0c7051b74e33cb62911e3df7cc8cfa6c50738276c17ba834923295538d88d9898cf24f73 SHA512 0fb266ada47303af41f3f5438894d66800644252bee898467522a7e6e86c372c7701768c34ac2260f0e6d76af669bf4bab33c41598037d6005ecc4ed6d31b419
+DIST kicad-doc-5.0.1.tar.gz 68998124 BLAKE2B 89c89f76ea17fd95dc8657b415675f5665a4d4bcb8c29eb5bf43f3216c59f38f38904d2d30242ebf3c4bb02197d6e04557af6b7b03b17c13ed9d051c7ed0c134 SHA512 f500be02417bbe3105ece434ca594c7a8cfe3d937a9a835b49b238569f40a8e8cc360d3970d38262b1ae0b702203de942feeae8c48cd2068aec90bf81e3e5a88
 EBUILD kicad-doc-4.0.7-r1.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
 EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
 EBUILD kicad-doc-5.0.0.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
+EBUILD kicad-doc-5.0.1.ebuild 1328 BLAKE2B e56c2322b73ee6b26061e101c4c2009e5b1dc77b6c5f932d29ffa8ad38640190ef3090c349b9f79b23d9bf3f4eb68c3e4df313ace2a5d6ff80d6e75685f1da7e SHA512 1e2f70d80663fabf9e7129205658d5eb36dc3e928a3dcb23bf07394d9e3003509f64a8af945bcb3b9fe781069c7b7ffca396e9f0799bc00ceca028620b5cc836
 MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
diff --git a/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild b/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild
new file mode 100644
index 000000000000..1924e8c1b4a5
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-5.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="http://www.kicad-pcb.org/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="html +pdf"
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+DEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="/usr/share/doc/${P}/help"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 43eea0696836..961d5c6ad421 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 1d72d4c98cab..6d0546fe5ac7 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,6 +1,8 @@
 DIST emacs-26.1.90.tar.xz 43892340 BLAKE2B 8ee12a6f8d6dd1a8084864d53818cd9127a95b7da632db14c831d2f9d4848aa11bb8a9d92bf8bf0348ea4e2fa75de45408d284680255e5a2b9845ada1acbc7fc SHA512 b2e7e9c1015c221e8665426528703bfe336734b7830d731d5f3a7c50ce423b2a8bdada7f934e5f31dbe81b4f06623bddafe48e9da4727cb728564d569ff0b188
+DIST emacs-26.1.91.tar.xz 43892592 BLAKE2B dba455ddacdda6faef66bf3869e21da9f94eef81e0987a280634e5186e8c441ac841ad917059ad8d0b36722d308f166d24c5770505b71219cd6979547f8cea10 SHA512 2c09b8ae0e035d20c8dcebda8ca56167a374c465f7ad8e55f97fc10355cffe709b196efa38474580c5b3584263b676fa5b8d9fa1434d4fc77d7d9cc941260a4b
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
 EBUILD emacs-vcs-26.1.90.ebuild 13001 BLAKE2B d433baf07357bbd5db2f0704e7effa3c62f4306f5ad95a801949da3fe7d5de15ec6d276324118ffece09fc51c279dacec5fc7943d9d912f2eba2591d0070e5ee SHA512 39634f8ad92db5115a360bf43bbafa230b3e94462d51a311b5a1ef49bf2f762b05fb9c35e36cd378c427d095aba18b446b2fcef668f903972b4ce72bda6acd44
+EBUILD emacs-vcs-26.1.91.ebuild 13001 BLAKE2B 173d3f2f54cd20a02668b4ca4326e1bdd832ff0997990caf9ea03295c3f40312b630390e95c4e35a2995d565868d8399820653acacf9f2c9121f3a0366c8bd11 SHA512 9886de945cd9eb305a0521664e3eb978713abaea7043304b84e4e2774c7f48ff1ed37117c13585eadaca25aa035fdc4cd53187d4c1e162e4023b246832f618d8
 EBUILD emacs-vcs-26.1.9999.ebuild 13017 BLAKE2B e7e174b5712fffdb63dd0861ed290c9217305122e54ae307a42ba9c01daf71273585bdb289ad1719e9fad5342386de0e7941b409ee7b1d2a525a7e589ebd86ce SHA512 edf01baf808072452b9544d569276c9fd49018458a1b57368c5477147dc597854bf327c81216905d798ad616fac57c4f0b6a7ad2fc415abc0c308b449d9767c7
 EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13050 BLAKE2B 9c43fc10140cf72d7bf9909775d3b81ecc346e9d8d02e7c4548748f5f808375adc22078ec85d2647d61a9c1dc02c4e34d29b26be739b315c87f5f4d751f24bfd SHA512 f7aee0a0e3d5c5071df9e1da1c8bf15dd94ab2fc7dbf802bbe44b6bc8cd3770fcc27c1b2139f015d9d2952f66906fbf4eb40fb1d366045c81d638c299d4370ad
 EBUILD emacs-vcs-27.0.9999.ebuild 13105 BLAKE2B 6dc87a2e7add4e493b8d8eae49855b548a29d94ce3e61747bc91cfd13317e6876fdf2d328c9b527d476ebe06a472df06dd717d18e0d818a77f542c1dd993a5a3 SHA512 c7bbff98a510320683f7f7b0be14c93a6e5c85379b96aa51fe45ea3311245a06ca7fddaad4a26b703a1c04fc1bc78b145168f0102e43fafd8e16bf099a45e5ac
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.91.ebuild
new file mode 100644
index 000000000000..dcb56a930093
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.91.ebuild
@@ -0,0 +1,412 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-26"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	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"
+	# 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}"
+	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="26"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets 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?]
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	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=
+			<media-gfx/imagemagick-7: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? (
+			gtk2? ( x11-libs/gtk+:2 )
+			!gtk2? (
+				x11-libs/gtk+:3
+				xwidgets? (
+					net-libs/webkit-gtk:4=
+					x11-libs/libXcomposite
+				)
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				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}
+	X? ( x11-base/xorg-proto )"
+
+BDEPEND="virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
+
+if [[ ${PV##*.} = 9999 ]]; then
+	DEPEND="${DEPEND}
+	sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	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
+}
+
+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 gtk2; then
+				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
+				use xwidgets && ewarn \
+					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
+			else
+				myconf+=" --with-x-toolkit=gtk3 $(use_with 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
+		if ! use gtk; then
+			use gtk2 && ewarn \
+				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
+			use xwidgets && ewarn \
+				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+		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
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gpm) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
+}
+
+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}/usr/$(get_libdir)"
+	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 || die
+	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/kile/Manifest b/app-editors/kile/Manifest
index 47a5cf147ba0..207176eeb4cf 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -5,6 +5,6 @@ AUX kile-2.9.92-no-empty-filename.patch 964 BLAKE2B c540d8cb219590bc5b9083e713fa
 AUX kile-2.9.92-nodocfiles.patch 769 BLAKE2B 7eb69764dddea17ef0fbcd989dcc3d2631f0bb95e462ac6729027c2a07630a40d6648525833dd3bde7ab1981ac4bbcd4018efffaf528920816a2ef3a007f8e9f SHA512 4823047cd7bc820c9366275ef76faef72e223fc2f86e3e3e145c3c8e926b00d7778b4a4b147e587bbeb96ef6a55c4a5282aef486cfba1b752e5809fb93def21b
 AUX kile-2.9.92-viewtab-crash.patch 3460 BLAKE2B fe9af35f51633644709e70b5b09abf094ce8515909b62a81575931c40ba7dd09f84f618416e640839cfcdf46003c55c1e672f541309b0a3f08433438a618152b SHA512 e8a64a7820749c18cc75a9002ccdc539b22e5e0fa3ebf18ca3edd011508ba887db58c38e3d8823baf32887da0435938606c40e9b2e7bfd9d6c1164a926b1dcbd
 DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
-EBUILD kile-2.9.92-r1.ebuild 1738 BLAKE2B b59c0ef0e699210e0e2b15ab848846ce540335be3b8d64c2dd187c02f7ff0f6b7f6e73c1c60c52c7385c875b23e5eedb9099926401345c9304be70081ae74245 SHA512 97c8577dedf65fcc1038f0155e1c01748bab4c81629231fa330267fa3f20600ca05f68919f99e83fccbab9e835069b7669ff833353b9fa1fe12b22e622dccb47
+EBUILD kile-2.9.92-r1.ebuild 1737 BLAKE2B 161d0db06635a2368cebdd4e27c2dc8c0edb8523aed2d5496330b0e65fd463162509ec2cb20552ba07cefef3434f8f1424c6ca119bbaed874f04ad87402fdb17 SHA512 729562668506ff534327ca71b2d97189760003f5812bf6a74e1b6867fd1d9d44cb55a405adf7c1f682dd15142c7d0289b1bd53f5de4c0382bf13bf06a9bf1e22
 EBUILD kile-2.9.92.ebuild 1641 BLAKE2B 0befdeaff3e43df7ce23a97d8fc6b4f0ead7792fd9c3df8b370d6264edc4856ab52307bbfcaabb95d69f8ee69242431d6cb296a04520fe5081de43359e372fe0 SHA512 65994d27678afa75af8d66acc8ffac5e1a1fa887839fff251f5dfc70634a432a785125b45058f610bc8f4bf78f5e6f9d2903dd6da39f90bdabc90ad3019d33e0
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
index 98f5a152873c..9a53d47e9c72 100644
--- a/app-editors/kile/kile-2.9.92-r1.ebuild
+++ b/app-editors/kile/kile-2.9.92-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://kile.sourceforge.io/"
 [[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="FDL-1.2 GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+pdf +png"
 
 DEPEND="
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 7e6fcb800f53..9e79622faa75 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,6 +1,6 @@
 AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b63123d2b0288ec0f0980df3bb9cc654e5cfcabcaeee69714aec7e3e99974bab4a8fbc36105c071b2a988 SHA512 8fa0661bce445d585aa37d845a4b41a0d1ed08aeab4117f6f1c6bdac346d7d774dfe38253dc11f0be7bd68c136eaac5aa889e174e0556f036fbdaf2e8b06373f
-DIST moe-1.6.tar.lz 75108 BLAKE2B 0d675ceecea6670fe24e860d030ef43905add64334d0769d24a57fb3b0cc421e7065c6d36df7e2c154db66936ab8849f9bf42288767810aec34db4261fef23f6 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b
+DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748
 DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
-EBUILD moe-1.6.ebuild 704 BLAKE2B df78a79db97d09095063227346f7377faaf250c7846fadc680765627f6d9214ae670b9083befd78e190c07baaeda416e0eaeb4f8e8c6cb11bda40248d6c5b708 SHA512 9136ed57d5fe7a7991588f2194ce04969d4be94dac8c5ccd0258264bda052c1cd7d1d34dad1cdd29cb7aabc08547be354d014e1781f2216715cb12ddff22c86b
+EBUILD moe-1.10.ebuild 702 BLAKE2B bc4973d8d9ada4dafce1980c59f1c6ab4e3a941339e3624a4129d0a18a936dcc80e6ca1738165d77144b4570c45bc48ef7dd85a225bf63d31791f02b0a61bfc2 SHA512 6d337ecda8493522f1aed0c1581e8e5024893eba31115e0b4ec82211110f5b0acaa6c81da2869e7394b37b7f93987b200f72120e6c4fad1a68f62867669eeef3
 EBUILD moe-1.9.ebuild 702 BLAKE2B f8afc91d99ae88a4bf8c5b02393d10124466cddb6179eaf9c12300076d791a28ac0f3ad6dca5162cf58cfc5157cad7ede7af7c37cd201d216922d8fe44740aa8 SHA512 9e0153471f02bb31d039e6ec986352bb20bb0386296b5c1fd610c9b6140d32fe996765a5e85b362d310f64ebc7827f069519d6fee73a69f11df4c01d5cb5d10d
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-editors/moe/moe-1.10.ebuild b/app-editors/moe/moe-1.10.ebuild
new file mode 100644
index 000000000000..f530b53537f9
--- /dev/null
+++ b/app-editors/moe/moe-1.10.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs unpacker
+
+DESCRIPTION="A powerful and user-friendly console text editor"
+HOMEPAGE="https://www.gnu.org/software/moe/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	$(unpacker_src_uri_depends)
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	tc-export CXX PKG_CONFIG
+	sed -i \
+		-e "/^CXXFLAGS=/d" \
+		-e "/^LDFLAGS=/d" \
+		-e  "/^CXX=/d" \
+		configure || die "sed on configure failed"
+
+	eapply_user
+
+	eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
+}
diff --git a/app-editors/moe/moe-1.6.ebuild b/app-editors/moe/moe-1.6.ebuild
deleted file mode 100644
index 85f0a9065dcf..000000000000
--- a/app-editors/moe/moe-1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs unpacker
-
-DESCRIPTION="A powerful and user-friendly console text editor"
-HOMEPAGE="https://www.gnu.org/software/moe/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	$(unpacker_src_uri_depends)
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	tc-export CXX PKG_CONFIG
-	sed -i \
-		-e "/^CXXFLAGS=/d" \
-		-e "/^LDFLAGS=/d" \
-		-e  "/^CXX=/d" \
-		configure || die "sed on configure failed"
-
-	epatch_user
-
-	epatch "${FILESDIR}/${P}-tinfo.patch"
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 0d8411b9235f..bf2e394b781b 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,10 +3,12 @@ DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e10
 DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
 DIST neovim-0.3.0.tar.gz 8903630 BLAKE2B 44936f0042be1771725a42168865d65f9afe048c116ed0d5f1542dffd8206a21dc4cbab1e08e97fdc27083251655c43df0451c5808ed6c6ad99eb2d582c55b9b SHA512 8944be5562a69d5da5bce3a6673cc0b1930eb5592eb15c40139a1991f89f63435141449e7b4371ee28ff426575fcad475396e3d982004e17a902bda1d8ae6a95
 DIST neovim-0.3.1.tar.gz 8937900 BLAKE2B 05de31d194a69b9cecd34210ecfe7460968f4255c850b9bb93b8ab8f5721463c434dd9249a43153c6e65584192bbe0a2720a474c5d8b3b73776148179d18943b SHA512 42c541608509dc0335203ee1c008045f0eaeebce8e18dffc554ab22a029da700bba9b8c721bd9d68337ddb4a56f8cf034fad2a3eb88d36baf8295e6648fce506
+DIST neovim-0.3.2.tar.gz 9230960 BLAKE2B c9d0ee2f679f411c3ece2aa186e31d0143479f6ec19d4d54c34cd4be519a92e9f213fc821b347a0e3af6817b6ce745cdff523af41d5b558940b76d9df726253b SHA512 1192d9330da3ab543dcb39bdff517637c7a52be558ad07a60de27bbf051432064edc230b46ddd9cdcae006ba1340550128e4d4ced7105f1aab57b13c2c4479ae
 EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5
 EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20
 EBUILD neovim-0.3.0.ebuild 2001 BLAKE2B cfd33059aafd48996a178d0955f0311b0cc85e4e902de22866b8e3e0bded37f0b33ceb7a52db869267d4f9cb8117b80474fe088f2e5a425eed847b0687b3890e SHA512 4096e62bfebfc2e23a89d569e4c841039515aeb451ba3620e8bc860befb710c061b31b2f3ae2be69ee8db404e08ca2a2959604eb806c57c9a609cef2ba29ea25
 EBUILD neovim-0.3.1-r1.ebuild 2007 BLAKE2B d6262beec656c799ce6e4b8288d1eace55300f039a3985ad3db60b3fe3e4dfab45673dafb78ad71f73beedd42504028b42f4d9646ca729208c07d92f95ae6c87 SHA512 d5356d986f204cd21aff004fd6df855cb350e0721b15536fea4f04175f41694b33249c4b660ee02769502767bb921a5af5170cd88e446a1a3dff7be80f40ea09
 EBUILD neovim-0.3.1.ebuild 1972 BLAKE2B 8510f3a3fc8bda84eae188e6b1e8286ccd646703a1f1a85dd7e3ccecd5d0203c35e24221b94cbfebfc4bcbf8eb069a7d22bd581f94b3f179c9952fd54198fbac SHA512 9315a6c2d61b554f8638bbbe5ddc4e4307123965b8b18d3c7de1da07d5cc1baf32855f68bd85db9ce30253da7ee4584dbbe12a1cd3aa4cfd5175548ef27ed169
+EBUILD neovim-0.3.2.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8
 EBUILD neovim-9999.ebuild 2007 BLAKE2B 898fcb3b613bbc6400bcb9be79917e025fb12154c97bd18e98a5f2415e959adf907818109cab9ba9945dfb3e722eb57ee38ae3961a6a16cfe01c90be2d56244a SHA512 1ed5c330f2fedf24ba35a03b3070167a208a812c4b6fb9f74f41132a6c01feee0b14d34cae1ab64686dc508cca2529c889daaf36fdbff5db1e2936a7081618aa
 MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/neovim-0.3.2.ebuild b/app-editors/neovim/neovim-0.3.2.ebuild
new file mode 100644
index 000000000000..f2102ef474a1
--- /dev/null
+++ b/app-editors/neovim/neovim-0.3.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
+
+CDEPEND=">=dev-libs/libuv-1.2.0:0=
+	>=dev-libs/msgpack-1.0.0:0=
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? (
+		dev-lang/lua:=
+		dev-lua/LuaBitOp
+	)
+	tui? (
+		>=dev-libs/libtermkey-0.19
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+	dev-libs/libvterm
+	dev-lua/lpeg[luajit=]
+	dev-lua/mpack[luajit=]
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl"
+
+RDEPEND="
+	${CDEPEND}
+	python? ( dev-python/neovim-python-client )
+	ruby? ( dev-ruby/neovim-ruby-client )
+	remote? ( dev-python/neovim-remote )
+	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/globals.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFEAT_TUI=$(usex tui)
+		-DENABLE_JEMALLOC=$(usex jemalloc)
+		-DPREFER_LUA=$(usex luajit no yes)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index f61f093a010b..0fc75bb4bdec 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.25.4.tar.xz 950344 BLAKE2B 3a3daf5cdb9e349e145a22afe836c78e18972e1f984472267cd182630b8f8132e10efb49cbc9fac40768aef4dadbb678afa26eb965642f07f407030f15b71dbd SHA512 d9887a90efbad3bb2caa0d3bb12af27708b77d54a90cd0da82eace7ea6dfc2efbcea3d7dc720bf4a088a823a8ed9edf75ab1c3680aa6d99c640d5c9e4c385e16
+DIST okteta-0.25.5.tar.xz 953492 BLAKE2B ca8c40df7cf3fe40a4be6f6e2b9d1f787baa658910c3c14ced73f3f3d95c942c00ccfe559562b2e0330726723ffba8e4c7c526369453517e1fd45d3d5ce0336e SHA512 dfe45a2bc3b3fbbce8342e6282981a63a342aee47d0d90cf07449f6974ebdbac53adc7fa9f0b37a7d003370994233f002df277ecebdb6f4c03995ce50d1dbd71
 EBUILD okteta-0.25.4.ebuild 1600 BLAKE2B 4a63d9f28a852ee3263a76b4498d0a08e7bba942b003d0c8d426b09940360eef677f4f9785190b3424400734a3b802b485b3fe573d9ae0df8fac5c59b96b6662 SHA512 4e5fde23df3ce32108e04afa9bf47905452d45b8996e13c37b4cf0e3606f45ad6fc7cffca361a2b03796d08881f13608150ecbe9e6aa00849ae1f20efeece1c9
+EBUILD okteta-0.25.5.ebuild 1603 BLAKE2B 1b24383746830cc4e73278d3f3cb7da2bcb515c577172232673d29ed50c01b480011a0ac783e210168f44bfb1b8f873591d41bca4862a7435bd81994aad1cd43 SHA512 c8c52ad55464a35caf22b2ab521cfb7f920e051261d7e39862f61a09a8364ac284139add9b6b2e8e8be21e3d7c75607f2ab34f4b065446d9a176959d31325446
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.5.ebuild b/app-editors/okteta/okteta-0.25.5.ebuild
new file mode 100644
index 000000000000..1956e22af1c8
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta/"
+IUSE="crypt designer"
+
+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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c21f2bf3eb91..4ebfcd56ec46 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/auto-complete/Manifest b/app-emacs/auto-complete/Manifest
index bc21f35eaf34..88cc93078864 100644
--- a/app-emacs/auto-complete/Manifest
+++ b/app-emacs/auto-complete/Manifest
@@ -1,6 +1,4 @@
 AUX 50auto-complete-gentoo.el 157 BLAKE2B abf93b1a7c9bb3d2ebabacf66c40e3177fc611330f902ef446ae31ed7f140c8fbbc68f35b40b84e83a002fe83e998d393ea4c38ed5e251f6edae08dc0adacb27 SHA512 40d03bf5dbd718aeab5d5f1ad0a15b24bebc86f641570611facf79f58f4a370da2ef1a5ca6edbbcec35d2530bdf5bf097c19c7f56c0c8f81eefa0df1a8dc01b0
-DIST auto-complete-1.3.1.tar.bz2 155081 BLAKE2B 7ceedcececcd80b7d8207cb2ff88f2bbfeee892d56a96f44c6929323ca974206b6d977830a8593ba9f7c87ba86914bf9a0771f5e11a284d7bb42fdd9e9985b48 SHA512 5b82120f8faf1ee4ff139f4fbacb894fa0bf617b9a0aaebb5a0d672a6f90cb01bc35f0c99cebe2bef55cb7a6af6ce03936a7226c89e3c79248aacf4ae554fb7b
 DIST auto-complete-1.5.1.tar.gz 196709 BLAKE2B 1593a6c0b60d9cb25a9597b7283d741042f79d0227c3865386a5d74e03d216a7e96ba7304e23148ac6bd18deb30f36777b88c4b3227b7482f28a224fd027b7b9 SHA512 e01a99d5e393d1d2309d6c616b4af34e8f3f2c585eaefad602ba5b6cf1890a18e851fd58804c4a6669c8131e9e7a5470c7aa650583a0bc1a2298875f7181614e
-EBUILD auto-complete-1.3.1.ebuild 697 BLAKE2B e715d59eb08903bcee5f92b8c3ae3bb8bbc2da2a8d4327ee401465338c46945e43defcf6149a6c16ab64b0e159a99f48a29c12dd4ba7158b98fa1e491431480e SHA512 f2820f4509f6af12c131c2cfacf7306a9eb377105c5f911b2c13ca86a4de84c65df0853ec9f2391f93d75be1122e1d53e2cc26b35488b2c633735cafaaf78305
 EBUILD auto-complete-1.5.1-r1.ebuild 813 BLAKE2B 8dcaf20e92a0fca366129c4e00aa66bb40fb8a32767ab9c37718007d9495ccb61adcf7d03d0e4db0ac79a0654113db62ba8af73264f1e25c8316518757852566 SHA512 bdf3c57889f167b71674b09af43dd96721b8a656ac68a19b558540dc48f05bdd309cb3cc0fa327ddeb3077897141f3cef97223a7801f562c7cfd22b0e65698e8
 MISC metadata.xml 620 BLAKE2B 7e888b365f8abe19d9218e8b3436b2867f601ab7296792212aaa4992b1ef123deb9c21ead67f8905424fc046b764c9b41423755af476cebaa4a1637e5d8641b6 SHA512 2e190f4c92b250fd0d675f38747b682b041212a5359a00d605df015dc02102a750d2284448668033182783826ebdd2722fcddc149ea0d9092e8c6a3438c71898
diff --git a/app-emacs/auto-complete/auto-complete-1.3.1.ebuild b/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
deleted file mode 100644
index ffc316f47988..000000000000
--- a/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Auto-complete package"
-HOMEPAGE="http://cx4a.org/software/auto-complete/
-	https://github.com/m2ym/auto-complete/"
-SRC_URI="http://cx4a.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_ja"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-
-	# install dictionaries
-	insinto "${SITEETC}/${PN}"
-	doins -r dict
-
-	dodoc README.txt TODO.txt etc/test.txt
-	cd doc
-	dodoc index.txt manual.txt demo.txt changes.txt *.png
-	if use l10n_ja; then
-		dodoc index.ja.txt manual.ja.txt changes.ja.txt
-	fi
-}
diff --git a/app-emacs/popup/Manifest b/app-emacs/popup/Manifest
index 60df50db8430..3a914ae8d3e7 100644
--- a/app-emacs/popup/Manifest
+++ b/app-emacs/popup/Manifest
@@ -1,3 +1,3 @@
 DIST popup-el-0.5.3.tar.gz 25785 BLAKE2B e0104a382730203a86c9ce4e1957c652c0e4b0ee84dfa465a94eddf942a249ccf83493bc04f8503e483f14cfeff3649f5264475531c10fe1a9cb1a08376b4499 SHA512 ad67e5d1e4d969151359a54759ae74b2f1107b25b56e7bcedf15995ff6bc0188916fcf5af64ee6ee2b5046e831ebb49c521724e224d7ddb473d3229f3094f5d5
-EBUILD popup-0.5.3.ebuild 441 BLAKE2B 842298f572127117e2ddd91ea583a5dfbe19d542406bee97be739cedb1ef43f895d32f8ec8af2b618592d538a08e21938b4b14aea0231626020a469f41bd44ab SHA512 1d59c074858b5dec3a48376839a998d9039972acbee47c40c2012888bf6c37832bb812352402f259d7b84363b44c27c5c923397c5064b370b3436aa2f7f1b987
+EBUILD popup-0.5.3.ebuild 457 BLAKE2B 21474f8747da43f0cb3730234bdc2e392cf3bd6dd2000f9a19fddf6e58cc0d54873ae7b27c23ea0c0ac7862267eb503c7b7fd48c22c093ee874783dbd65aa398 SHA512 32b85f1c7d3a47eb00affbac38c94add1b44a89f038fcc720cda95def2eee575dd5ab4f3e597348d340c2203f05efd17bfdf2b2aff17e2e9edc41c71ecd676d1
 MISC metadata.xml 559 BLAKE2B d04a46959d81e73e756ca89a9f80744f1a8bd77320e4beabc0de499baf3391f069bf7f169b98db298fd2dae41bb836f1ee72f0e6388c1d358831b7bd216893c0 SHA512 25554d6793f2e071e80870ad8b3e92b7cefaa4ab83767e76e526bb47a60d7737c0b39be9080f3d93755fec117fc2fdfa457116f101925923b189772fc3de09ec
diff --git a/app-emacs/popup/popup-0.5.3.ebuild b/app-emacs/popup/popup-0.5.3.ebuild
index 5d7bcb2cb6ff..2c80655c662d 100644
--- a/app-emacs/popup/popup-0.5.3.ebuild
+++ b/app-emacs/popup/popup-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,7 @@ SRC_URI="https://github.com/auto-complete/popup-el/archive/v${PV}.tar.gz -> ${MY
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 DOCS="README.md"
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 2eb443cf617e..30982a5c0e61 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -5,8 +5,12 @@ DIST ruby-2.3.0.tar.xz 11294412 BLAKE2B 2c1324154aadd287952cc6430891048ea69922c0
 DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373ac4f53ecda328686ec2c13204a38c66bb1bf9504d18e1762e7e6ae277bab3b16bb53b8e628962df715769f3b SHA512 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4
+DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
+DIST ruby-mode-2.6.0.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 EBUILD ruby-mode-2.3.0.ebuild 494 BLAKE2B 31c71bd89eff5c173571f09ceff570f16c8f9ca01ded4541f8f021c96212f8c0112b49ba58f409ecd1caf9016706d8f254d938575cb3a324b6890ed6f2a3bb14 SHA512 0df916f8b8a5d7a3d2a7fa0613e74e3306398cb5f1a1c59f2bde940c9dba060f5675580cf5091333a243227b5c23bb4e176f86f9151e0311c95799c82a181efa
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.1.ebuild 504 BLAKE2B 9572a046e742b45c05294bf4ff41b31c28f58ab56ec221903bb75a6bdbdf76ac6fc5a82fb6b0885445a5a9bed70e352206c954dcaf391cdd6cb1a3fce9607da9 SHA512 f268e47220d02c6dc37365dd87c66fd50bf8bb27d55c5d6b5293b9d0805a287b32744c648ffaad47d47859e95fd06876545647bbf8cc0969fc92ba71313221f4
+EBUILD ruby-mode-2.5.3.ebuild 501 BLAKE2B 4e4a9e17a0ae378519d6fd3ead5b7e37836f655fe5cb010642fca8d10a8a7e4f8c4b249b5f3828563754bf11a51a15c93516d25ca380741a8656adec535baf35 SHA512 c5dee21b206de6bbddefe2d32da92fd2bcd61518aa159c43939cf072c8a0ba2493ef5b633c51a712e284a78a464ef177aa3f17105254b7805ae624b55b596249
+EBUILD ruby-mode-2.6.0.ebuild 588 BLAKE2B 506d4ec4569aa599398fd72fc47f98937aae0ae1a2f011c57cd2ba2834fa1d67babefb86dbaa983fe6df4f75553d0fbfbe2417675ce56894523fb56c5e5a2163 SHA512 f5bff7542b228fc193c73a6d3368df682e7803c4754c3498f89312abb652ba548535996c4135610c6248c9811d2c5c78b55cea6b2a928bceb49ef6c781707ea0
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
new file mode 100644
index 000000000000..84718e43d4b4
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${PV}/misc"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
new file mode 100644
index 000000000000..856461074295
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+COMMIT=75bccbb384e6907df47ab69acdccb4536806c890
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/elisp-${COMMIT}"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f04b2b2e2a54..5bf57819d978 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index df9542ed6b00..542503f254a0 100644
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,4 +1,4 @@
 AUX aqemu-0.9.2-qtbindir.patch 514 BLAKE2B 9d6245d1745248db021cf9883bf9f8a00223ba781a2ba9bbc6561e4fb7239aa6c2baab7a1324edbbf157d68a829116ecc07b24bb13d714321ce145de447b9bb6 SHA512 f85e6c2487dfef86470773949f6796af9efdf066d9871ac4cdfddd064c85fbf893574e602ab2c6cd1198dc9eb76f0722b5a85ec046b2dca2275a24799418c996
 DIST aqemu-0.9.2.tar.gz 1373465 BLAKE2B 8b2b3ed311f8dd723a0d06ab74659514c6ccda67643c747af832f1677ab86ffcecde3607ead0b3410a310c38a2fe360a5ff187ef86b5953e4f5a5054a862c26c SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba
-EBUILD aqemu-0.9.2.ebuild 826 BLAKE2B cdf38f0c298d255da19df3772e81a88a89ec454b63d90e3167184d5d5ca9ff7e378c96cf090cddf964c6ab95f4cfa13c9e200253ad399c347b070682bb8e5ee9 SHA512 6ece404babd92516e984463e8a174e6a91b3a980880995b22e5527264905e33463942665d42edb8c9ff1d5f98ed3da8d8f011771e33c909a8322e1005005e97e
+EBUILD aqemu-0.9.2.ebuild 825 BLAKE2B e74c07dd06388432cc2014547f56263381e21ae853e9b5c862e2691c03831957565b930e2cdc802db1289920fd4c1b6ae538a798e4a963ab5a8b02add2dd92dc SHA512 8d81caceac8d2ad3beca4455b88ead6efc6b444aa957b4fbbc0d76a0f0baf069acf840bb0418b9a5895fa792856f534279b99a6e70e196962c73ef9eb6b6310c
 MISC metadata.xml 351 BLAKE2B e6758d327e2734981aee78e626bdbc3a7d50e859d3cf47c0edd21abf4387f5e2b0dbb45ee969eadcfa1351c271572e06507e80b3b34e54d627c983f2a6fe9019 SHA512 5ae376092dc313336a0231391db4950b5d6f92f00d1172fc58ea86508ee76103274a392a3cf139b8e6c97b594a2a9630b558cf530e1a7542f726ab326b672345
diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
index dc50e71ce8f6..85102613981e 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.9.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -14,16 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="vnc"
 
-DEPEND="${RDEPEND}"
 RDEPEND="app-emulation/qemu
-	vnc? ( net-libs/libvncserver )
 	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
 	dev-qt/qttest:5
-	dev-qt/qtprintsupport:5"
+	dev-qt/qtwidgets:5
+	vnc? ( net-libs/libvncserver )"
+DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS CHANGELOG README TODO"
+DOCS=( AUTHORS CHANGELOG README TODO )
 PATCHES=( "${FILESDIR}/${PN}-0.9.2-qtbindir.patch" )
 
 src_configure() {
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 69724bb2fe62..913a11b1aae6 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -6,6 +6,7 @@ DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e9
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.0.tar.gz 4605096 BLAKE2B 5bcfb252933d4f8d5ab6c7e91505cfec34137545121440cd6935e05cd3c62a4969fff8b90b628634c01cc9a4dc3901c307604ab30f45a03dd20112653da9437d SHA512 f7e1ede8db253c666dc9d68642951a427722945da60acf8631312377c84aab14c7a8b14e81f9a63ab8f909d25eb55911c0f2eef68f11380c66cd77bada8577bd
 DIST containerd-1.2.1.tar.gz 4605947 BLAKE2B 340daac847eaa653d15894fd65c190702807400dfb8293b5a2507b9a13a86752c00357cf6aeb3735c57878c34f79c35076d7087a905ee7efe7971746c792a212 SHA512 0949299afe17e269a6c551e865e500afeeaba700cf78bb12fef4af8e6d48a2f699976e81dad44d797bb13079361f5d5e05e9abe903a3b158af93f2aaa95712e5
+DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
 EBUILD containerd-1.0.3.ebuild 1238 BLAKE2B 57722c15880f5484d32e4ab7247210ff96588b1f66537c10cac26e08da553eb636995e0db4959847795542c8354ee1d6a32dfc074bb97ae6496f53aad72cca07 SHA512 55a5317e985b95878e31b2b28907bff8a10b35ae90cc3c83e24534f1d0f33aeccdf321b1bdf34ecc0450853218476015a546b6191817d7747567d573a80aa2cc
 EBUILD containerd-1.1.1.ebuild 1296 BLAKE2B 19ac8685f774a4ccafbe0433a11b15a2b31c270af9b199a6f543789f93403f1715ac021d24f68e2a7278fab25065900ba02c3efca92e18aa44589d54667d6571 SHA512 f37c5cacabd3f6713af25a9343cb532ba6f73ec842d5d7cbe600bed510a4e11e3c7b27541666af6542dda2be658129c144929c4d2e7a0d8824e308983b4a0a66
 EBUILD containerd-1.1.2.ebuild 1446 BLAKE2B 73aa0c89b0899a9c6e241aa2fd811b6028aa715fe227209f7dcd1f2da481cf16d2fe955c1cce35f43a6ff9b85f89d6ab23ff1a1abd734786fc2eaffc1a908b71 SHA512 ca80fe6078f715afd01ebda4d99bc1d00f168908850d1e03830fa6df266dd1203ffdbcd5f17f729470df8333f64fa0fb6d00b94d8c8b92645dbd82a8d75a73a3
@@ -13,5 +14,6 @@ EBUILD containerd-1.1.4.ebuild 1447 BLAKE2B 41f551cb2d004dd3b22014b88549729849b8
 EBUILD containerd-1.2.0-r1.ebuild 1470 BLAKE2B 08fc579fcb7ce245aa6f2b855fb690100efbe2f5f7ee6745daa80e8661cbeb96593d83c4a00945a5a5981042908b23ca47de0b7a1a0b939e73f7da84ddbb67a6 SHA512 1a0c08342c1737710be44c24630a39b67c41d5592f3cf7d5f08a3e237acd4000bc603cc8675b1f89349a7bcd1fbb9fd9777eecf82402ea1c86e5137cdcb10a76
 EBUILD containerd-1.2.0.ebuild 1447 BLAKE2B 51c626c9a8255accf1aaffa70db0e5eda300a042f5cd500a82d8dc025e10d845bfd43de7c449297edc93173fa770c42596c53456dce06c1a9b63fc39c48f57a8 SHA512 327bc4d0276821ad4f535f39a3ff3f056ccfef84ffeafbc5fb329ea2c82f2ed3abf072029358d42892c21caf378ed52b8340307356205cf27d8a83aca0a5e6ef
 EBUILD containerd-1.2.1.ebuild 1470 BLAKE2B 5aa1c618327ae0b37ac7c429afc1f77c1d80201397c437dbe99770adc5bafe62910232fedc3607baf74cae5bc1be84471a0c2a352d37c6f428eb8383665f543a SHA512 81cd413485049545a340ed9d1d8b08d30c016ea7bd90c92accf8f3c85e3a00517a010217e862f95eb41e91491f84ec5a28e6bc4011bc3832227ff56305303995
+EBUILD containerd-1.2.2.ebuild 1472 BLAKE2B 79c964f1508ae9a5df6f2ee9fb028fb6186362982c19442532ff1eb00d29f3e408cc94e7ff95aae9db3642323f58143e74fffa54288dc0a19cfbd6e9d7d70ca1 SHA512 e23251459744ae8b3bec35fe3a0261ffb99bab0e433ce9cdc48ed39579d73e061df9674bc12372004f4050e72bb68c0f4d6d1d6d5cea985ee2173a16f5fb258c
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
 MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
diff --git a/app-emulation/containerd/containerd-1.2.2.ebuild b/app-emulation/containerd/containerd-1.2.2.ebuild
new file mode 100644
index 000000000000..8ccee3fc69ac
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="9754871865f7fe2f4e74d43e2fc7ccd237edcbce"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc5
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+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") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index a1d48442e8cc..49964e7106fd 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -2,6 +2,8 @@ AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1
 AUX crio.initd 838 BLAKE2B 8e27bb563e897d28f29e2c61501aee92a0d271b1352e382e9003c9a95dc8752d2d3b35aaab5fc523c659628e8eaa33853d187d865975c47b9ff4d5bea3b8ef5c SHA512 d21a7af17b1a2e763d3ad847089b9596866e23db29a78df0aea4c326ab83a95045e1892bdda802f421396a245cbaa5da841ee3bd280b139f199fbf0c8715773c
 DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b SHA512 dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
+DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a SHA512 52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283
 EBUILD cri-o-1.10.1.ebuild 2849 BLAKE2B 63e902a0a6aac1225b0c2f3554aa8f10694f679ca30a45594033e9e559cf4ec96da65c2a92de12904e2d86a2b5b1fb8a5b561deb6ac2653ed3325b8b68e2fabe SHA512 2f0f0b218e2e8fcbeeda327af2a371cc70710a507d521b9ca836db3d9c42d4ea6700c10aa2eb3e531b8e8ef7ba5660a9b868dc4270768fe6162a50cab169434b
 EBUILD cri-o-1.10.6.ebuild 2846 BLAKE2B b1fa0c38269516681532dfe7f46b1bb4012a4aa9ecbd10e70e6d521ebc3682e0864965a779f39c2bba075540134f94f52be8fed443bae8dc7bfaebb5ccb16804 SHA512 3ba5f539962066b084cffa331dbd661a4990bf71d108daffc008cb9d75992d2ea33d7f07e320c4c676dc1e9aef98e9eca3869e59592bb24c8af6588463876db5
-MISC metadata.xml 1010 BLAKE2B 1866fa273d85787041dbe44053fa0482d89b069f11399a0b3a044f91213dea2c2349bb7c935132cb5dc06f99bd74b9f857d17e5922a5287ca900397cbe9669d8 SHA512 df0a358c7623058d3484c4313a29c4fd1ae78ebda96f882cdf4c6108cddb41be10e19068172776dc9b23ed1c3aa5173c285b5aeb267a82e64ce1524eb580bb13
+EBUILD cri-o-1.13.0.ebuild 2836 BLAKE2B f3241db9554d61e265bff56d6813a402c2acd152f2032669967b0654feb479e1e6fdcc89a278dcf4b75624814930a8a1ca95c95ca80aaf946804ca11600979db SHA512 2b3d769d7c3e2b945bb15b031c9b2e981abcbbdfe1c9b50cee1ecf2e6d5f7e05b2de676501288b82dfec18600aac60cdea173cc4016178a8e3b80e26a980ffcf
+MISC metadata.xml 1005 BLAKE2B 2135f0344ae8ddad14851716be3816eca09e8fd44179cb1853ce35ab96ea77187e0028b2d53ab6802fc40df72d9dac568cc2dd2665e85d9ade71bce0ebddd995 SHA512 db455ac2997f0487aab95c753b8b19a89e863b2d1bb97b5d340d5cea511650cc2abde6f67c2e113517b01a2445f276cff5b5615cd6a6b69c7f590550192b5ac6
diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild b/app-emulation/cri-o/cri-o-1.13.0.ebuild
new file mode 100644
index 000000000000..32f4f4374306
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="http://cri-o.io/"
+SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	ostree? ( dev-util/ostree )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		hack/ostree_tag.sh || die; }
+
+	[[ -f hack/seccomp_tag.sh ]] || die
+	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
+		hack/seccomp_tag.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake binaries docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+	keepdir /etc/crio
+	insinto /etc/crio
+	use seccomp && doins seccomp.json
+
+	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
+	doins   "${T}/crio.conf.example"
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+
+	systemd_dounit contrib/systemd/*
+}
diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml
index a18ec9b7d291..e48b961a7b5a 100644
--- a/app-emulation/cri-o/metadata.xml
+++ b/app-emulation/cri-o/metadata.xml
@@ -26,6 +26,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">kubernetes-incubator/cri-o</remote-id>
+		<remote-id type="github">kubernetes-sigs/cri-o</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 1f4ad4828e94..d11494acad7e 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,5 +1,5 @@
-DIST diskimage-builder-2.17.0.tar.gz 362965 BLAKE2B 27668c38e480aa14354a7efcb7f3f64b9cfe9f7a61507d2e08809a757aba95f3d51754b35985089c39bc3bca1204e9e2325e19e0d4f77996e22b479e6d804ae2 SHA512 02505823ba48da235127f9bd686bbad3dec32feb2252e5c5b69723a53f6d0926a384c6be5a4055bebf9e0ded82cd9945dab6f26fa7db280722f45d27fef25bc9
 DIST diskimage-builder-2.18.0.tar.gz 357151 BLAKE2B 0516a7028f3ad3d544f575ba61bf04a79d5227008471e6ce5637b762798d3947cb111312ddfd5ca73d39e6b7e01a98ff34925bb30857581e3c135f3da17a4ecd SHA512 64b329ba9494041cd432fa9ff42e15c4b409ed57edbb3c91b791ff2b0d0fce860c32d2d020c36c23c97d9cd100aa287abd98d5e537a02c38d81cd0f9a2578e02
-EBUILD diskimage-builder-2.17.0.ebuild 1133 BLAKE2B 5b75b35be656e3276e28a69fbd761fb9e2762df181662de835013f9b0b6f681f8e83b2a60b74b2940ea731b7c97f78fb67def6f7ca918f7c0de82a4fb73267c3 SHA512 1b4af19d24054146b0d157e9cadb441b1ea3d7b2b9e4e721fddfefad13f647029f8f077ac9bad66712714eb5ed98bb515107bfc21024cafd2b75e93635fc4cd2
+DIST diskimage-builder-2.19.0.tar.gz 359520 BLAKE2B 2ddbee82cc45267faa45e7fa8b80012096676ca792eed6aee766d24fd3a5297f7f21af94c84259308fd0a48b9c913ba94575333d792b7dcd67c09d6493ff3f2b SHA512 57da6f0507a96f873bc034862dd58649d8d9ff65c7ad83f8245658fed5919b47ac29c5f8d1bb9ff2d544304955c48fa1ff3a183d90ba47bcc8d1f88c09e4014c
 EBUILD diskimage-builder-2.18.0.ebuild 1133 BLAKE2B 5b75b35be656e3276e28a69fbd761fb9e2762df181662de835013f9b0b6f681f8e83b2a60b74b2940ea731b7c97f78fb67def6f7ca918f7c0de82a4fb73267c3 SHA512 1b4af19d24054146b0d157e9cadb441b1ea3d7b2b9e4e721fddfefad13f647029f8f077ac9bad66712714eb5ed98bb515107bfc21024cafd2b75e93635fc4cd2
+EBUILD diskimage-builder-2.19.0.ebuild 1135 BLAKE2B 273dbfee86983dc3500ff8cf9bec625dbffcca6979a1ac661a5fbc92f1bcb87b969208dd691f43998bd47c6c965eda0673f30b04f468d4a33afe4e364d54eb15 SHA512 82ada16450a46b08ebc333345900071c1d296350e7bff73a8b4361b250517eb4902f225031416adbd5e5ef62bb1d73cb1333f30673eefeae874dd80a27c628f1
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild
deleted file mode 100644
index d47518157313..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.17.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
new file mode 100644
index 000000000000..4c5588077dbd
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 5e10a930ef0a..cbaf6070cf54 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,8 +1,10 @@
 DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299 SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600
 DIST docker-proxy-0.8.0_p20180626.tar.gz 2718698 BLAKE2B 6214ba714ba8b01214168171f465dfaee4d8ff791db7a219a3fb92fade3e4207d36d90090790c0a3059e6fb209f3cd8bb0082ca75496108ebffb7c9b0c5092a4 SHA512 21d3d1bd8aafeab51a3e0a14ada4d559b5b113a48d315e91f7d70e4fa839f5c92d4068b38c28bf6929da9c11cfc61703bafc7148f64b784208d61fa14ee4545d
 DIST docker-proxy-0.8.0_p20180907.tar.gz 2711336 BLAKE2B ad1fc76347058610e2cd1659fb89f9990cc704c3a31006b976e44f31a30e754ac86e7b4823c48461cdcba948bb8d320ae25eac1e13b26f1fde072343251a61e0 SHA512 603ad154d0987a021dae69d542fa82a53b8d25ad9b44cf16f0ef551e0b81e0174dcc73b3a8e9ba89ca1d209f0022e767d44a8350b00b9b4e252cfab698b1d5bd
+DIST docker-proxy-0.8.0_p20181207.tar.gz 2703206 BLAKE2B 46b71a4d6ac9eb0659a45c1956eb967a73b2b73c446d55de3a5b4014149f911daa03c6a914e8d79da53e01892c6592adf0df769b6b5ed3b41f3c4a3c9f979da3 SHA512 9256eedc6ed530506e4e61673a9f45397274093dd61105097d5c650796f0afebc8ad7c550d2dc3cacf94426e3872a2b764906bca46fc907a21b865314c8927d4
 EBUILD docker-proxy-0.8.0_p20180411.ebuild 828 BLAKE2B 40c072624b54c218816132f4d3b71f29e2c4d1afbb20d6be0fc518cd729b3453ea12839143d3ee32e3ce810b8650316fe718ded9c5a950b0ee9ef372f4c2ec20 SHA512 4a018ca6462c3aa371d7e02717f805d1ea5424629892d9e69c7843fb4572da68f2d23eef0bc094487ccb3212a34799541b805c00a0cf941c114140ca44ab8cc3
 EBUILD docker-proxy-0.8.0_p20180626.ebuild 825 BLAKE2B 256ce2df79ece0668908db8d64ddfdb6737ce6d1ba7ef6e7a8a4b8c16af057d7ae81b75b3b3e9a6b93adb2f874f7563839f6bd343c00c88ac0ea4ff0bc5e5bbc SHA512 e211a3ac5576960377b5de1b164b5238243a215a50a76358aae240d221c160d013f85304909cdaec1db9719ab92bfce03b1afa71aeb9fae2930fc844438ffc46
 EBUILD docker-proxy-0.8.0_p20180907.ebuild 826 BLAKE2B 19c2f5cc5094a1f47b2bb97df327902c3173f161f71e55540be7a2b60574567bed7e1739913f0331c120b4e6e66c791f8e79dea7e020a9523dad5882cac85134 SHA512 226a6faa9ac793eb9144741bb4853ec14d0f86df61c56a3610df7439b9f693ae3024c4b5f749378ce24b79789f0efeb181726057ed86f1206f7b0085e469260b
+EBUILD docker-proxy-0.8.0_p20181207.ebuild 826 BLAKE2B 33b5944afce1a5ae36b6ed96b0e17768dab5916e9db658f5663b021587d1fcb450321dfbebabdcca1c3f5698e084b4a93e8c2824f249083ad26104d0ac93cc01 SHA512 8cd01cb01d5339d64ce0e3b52e4268f48fa8c4496eb6ee70179289a3b425faf0e0a6c2ed4da9ca740981847ddd27128ef255d3d7a8d32c2a0324e8dfbd5756ff
 EBUILD docker-proxy-9999.ebuild 782 BLAKE2B 9d12852020716c9fda7e8da2dac1efd32f929b4d1afdfedf186e80e8f2d1351a626833a24e01e81d0c30a9099b286051099e5065e4b0dd55f5a0b5037dbd2d36 SHA512 3b972b6ef5af055046171a6ea8c8aa8f6ec51576d0b871ccff3080d9b99a5e8762c25d3226cb24fd3db66a8f0140a38506fcc6691f0c75ddf8b2646c785d83e6
 MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
new file mode 100644
index 000000000000..6e64beaea41f
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20181207.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="2cfbf9b1f98162a55829a21cc603c76072a75382"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!<app-emulation/docker-1.13.0_rc1"
+
+RESTRICT="test" # needs dockerd
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc ROADMAP.md README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 6ec9c54b36a5..b9b9ea04bac8 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -3,9 +3,11 @@ AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e042643
 DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.1.tar.gz 13672693 BLAKE2B 7aed2f409914471b3e0eec4f3d024bf59e6505060c1da9c4bb68f0d6efdb5286a8e9e5ee0de19b3f0165c965db27d409f72fceb3f792fc91b9b8dddc8a2b01f0 SHA512 7375452669bf6576e1f8d193cd7f421cf39a26d575351f2b4e433c7fc89384f441547417dbe8c12a12a0937c9fea3800b5c541f0ba8b58ceffe7445183ceeef1
 DIST docker-18.09.0.tar.gz 15196102 BLAKE2B 99b791da6351268ccd54424f1ec1d0b1246d7283e5bf8f41f604f0437202a0c494f7017d68c58f01782eea8539fcc189c290f494125878eb3ca368f3d8cdd57d SHA512 a6173d9e2dde33c6059b3464720207a3bc0f4d6d79af65ad10cd30b4b437134ad45fc2039cebcaa41b2dfb68a21963010d63a4051ade6a6d25fcd93c8d560c67
+DIST docker-18.09.1.tar.gz 15247155 BLAKE2B 5c9a6c0d6e383da2b99341812b0cc1d1498e46decc3b3aaa418607d5f4d725a6842a4462c06357685a32312b90978b0349aaceb69907324761589e68cfae7bca SHA512 9813d3bd41eff63a089495a976226b93d5d43544530aea0ebce78b96e6b4b38389fe3ad1117f1ca95c38727047a24211ad2c2b44217935c26ffb5496cf90407e
 EBUILD docker-18.03.1-r1.ebuild 8338 BLAKE2B e9984640c084a99c1ba99173905b9d58f14559b0b122bb6759b16689bf40fc313d0b9a3fac45ceaf509fe28b7006c87b555c3db49c32f04360e700cca4cbb839 SHA512 1d11e2d4f67d8e16714901e56ce251d590ea2be3a786869895600a3bee4becc0f66dc88b6253df1c277455e595851ac34e608b70f46bbe88e0a33f3e17eaf4ac
 EBUILD docker-18.03.1.ebuild 8337 BLAKE2B f0b13adc75d2a334eaf91938b2774a5216fa4ef7905032f59e313d87367c7de07a6868e443f65db881bbeaabc8aeaf008aec8836827513b546ddd3bfeab599d7 SHA512 09645b50f569e37e94c7f8e36503ce949fe709ff22d579b9e2e2183a573196ae3bdf0a991c71af56a37e2e8fa7e3341289154dee4e1a336ea1b212cd63079bc9
 EBUILD docker-18.06.1-r1.ebuild 8444 BLAKE2B efd1564a829daf4811783d163be2f72ecfa3731b9594dfa4f6c2a44c227a2e1033ff32023d118b722fefdae949257faec41ea39145a8e84ca1e87c1ef6546ae5 SHA512 82bb833841c33e009c2b0f33ffc92509dca4ee9192419c92189b37a7a1dc1942931f036d8c8cc254bbad5a3c2fb7f962707c5a3ff1ab5c1fac757c742e990b17
 EBUILD docker-18.09.0.ebuild 8370 BLAKE2B 53cc4f700ea0e83bf7b5bbcf47480b748e07be387f5a40bd1cfdc91b354885df1f6f10320f7f22eb14ca0a378ea89365a02f27a3966eb70cecf530c841c238cc SHA512 43f8566891ae72d50534c61f240fde9fd345d644061e0a1475b0fdb9f06d32bc3c727055eac1c7b4f7f7091727ce0121137941f935dc1bdaf7a7bab72d35ce14
+EBUILD docker-18.09.1.ebuild 8296 BLAKE2B b528aaa7d43867856e503d875e5f03d71291abe46fc706860126819cb2683a9ff8d8e2772b51e266ca17a839e29ddbc6aa0cf3eb9058de7a570a19a7dc7f5e6d SHA512 9def7412189f6d783b6284aa58461837bb2d9b94e9835047aaa4ea7b20407d56c99df46c435602c72da6c8761e2e163127a55e51d030356af36e4c33f4ea4782
 EBUILD docker-9999.ebuild 8168 BLAKE2B d1111f0132aa330f95f8f9dcd5c49aee0c8a0eaa5ee3cbd567be89f0d2f4b8c230c80d817fe14272d7c2765f1877ad070ebe98107575ec0f43d10e2f6f6b089b SHA512 e629feee1e546a0ea4570692446697899199248334fc00337963eda8857fadde618fc42ad23288f4239cb7f6f71ad52a61a2d275e54a7694fd79fa1fc1610df3
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-18.09.1.ebuild b/app-emulation/docker/docker-18.09.1.ebuild
new file mode 100644
index 000000000000..e6637e5dca26
--- /dev/null
+++ b/app-emulation/docker/docker-18.09.1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT="4c52b90"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.2.2
+	~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20181207
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
new file mode 100644
index 000000000000..d843432f8871
--- /dev/null
+++ b/app-emulation/libpod/Manifest
@@ -0,0 +1,5 @@
+AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
+AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
+DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
+EBUILD libpod-0.12.1.2.ebuild 2661 BLAKE2B 8f020dea55baab9ee9af48f94c75b2e76de6fdc5ad8a60fbaf77ea432b77c3364a2183e97adf9e734d6df7d99845aa9308c0280e3187b32fe8671b75f47dce29 SHA512 d7e801c59fd1446fc319ac8c12b0fd5fad8dda0ab045d422606406b974076b838b8511b071051204b6fbd082ded69e0ba1d9bc7b059f98a1e27dc3a42be295e4
+MISC metadata.xml 878 BLAKE2B 2ec570f0e618c69c7e119a48e3dbb19bc9fc0baafa71e2ce09283ffa9a0a4d658e4f3c9ab7dbe6e618812d40cbed5d12d3a4d56227397611dac648cffb15ae20 SHA512 bc790e0f0287dc93a1dd0c5794c65064ccc03baeb3e6cd962d18b1cf071e01a4d25356c172f97dfe338423065b4a11434276c84c000daed87bb378f7d78d06ca
diff --git a/app-emulation/libpod/files/podman.initd b/app-emulation/libpod/files/podman.initd
new file mode 100644
index 000000000000..b590be16a1ba
--- /dev/null
+++ b/app-emulation/libpod/files/podman.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2015-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Podman Remote API Service"
+LOG_PATH="/var/log/${RC_SVCNAME}"
+RUN_PATH="/run/${RC_SVCNAME}"
+pidfile="${RUN_PATH}/${RC_SVCNAME}.pid"
+command="/usr/bin/podman"
+command_args="--log-level debug varlink -t 0 unix:/run/podman/io.podman"
+command_background="true"
+start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr ${LOG_PATH}/${RC_SVCNAME}.log"
+
+start() {
+	checkpath -d "${RUN_PATH}" "${LOG_PATH}"
+	default_start
+}
diff --git a/app-emulation/libpod/files/podman.logrotated b/app-emulation/libpod/files/podman.logrotated
new file mode 100644
index 000000000000..b9d723451b0a
--- /dev/null
+++ b/app-emulation/libpod/files/podman.logrotated
@@ -0,0 +1,7 @@
+/var/log/podman/podman.log {
+	missingok
+	size 5M
+	rotate 3
+	compress
+	copytruncate
+}
diff --git a/app-emulation/libpod/libpod-0.12.1.2.ebuild b/app-emulation/libpod/libpod-0.12.1.2.ebuild
new file mode 100644
index 000000000000..80dbb5f4f191
--- /dev/null
+++ b/app-emulation/libpod/libpod-0.12.1.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="9551f6bb379d4af56dfb63ddf0f3682e40a6694e"
+EGO_PN="github.com/containers/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree selinux"
+REQUIRED_USE="!selinux? ( !ostree )"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/cri-o-1.13.0
+	app-emulation/runc
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	ostree? (
+		dev-libs/glib:=
+		dev-util/ostree:=
+	)
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/ostree_tag.sh ]] || die
+	if use ostree; then
+		echo -e "#!/bin/sh\necho ostree" > hack/ostree_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho containers_image_ostree_stub" > hack/ostree_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	env -u LDFLAGS GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/libpod/metadata.xml
new file mode 100644
index 000000000000..1c5655b32d7b
--- /dev/null
+++ b/app-emulation/libpod/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<longdescription lang="en">
+		libpod provides a library for applications looking to use the
+		Container Pod concept popularized by Kubernetes. libpod also
+		contains a tool called podman for managing Pods, Containers,
+		and Container Images.
+	</longdescription>
+	<use>
+		<flag name="apparmor">
+			Enable AppArmor support.
+		</flag>
+		<flag name="btrfs">
+			Enables dependencies for the "btrfs" graph driver, including
+			necessary kernel flags.
+		</flag>
+		<flag name="ostree">
+			Enables dependencies for handling of OSTree images.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">containers/libpod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index e6851ab52073..9f021f4e5b84 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -2,5 +2,5 @@ DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04
 DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
 EBUILD libvirt-glib-1.0.0-r1.ebuild 1014 BLAKE2B 7e26b59844df689ae0cf1c791ebc61d046eb45afdc014708ae3283a771a537bfc2aa0025cb2379d5bdaa20e4147385cda057a93d7423d7b26a11973878e1d4cb SHA512 fbb757c3e5fe6dc894be136fde13e177704c7fbc1bc5f46dd5a5f64708966fb0919e187ca501335fb3a736e37df26936a22b286a9176f8d6368a44ab6a55b6c7
 EBUILD libvirt-glib-1.0.0.ebuild 1234 BLAKE2B b6429e7d6151f44ac3af8db66a43984be934dc01de02cdaf45fce08721a12f63bbd84177bf1a2b847e22ea4c4c5ab800cc308d481dd09a97c68b05365bea4148 SHA512 71973f3d5429257a7434977aece98e2041f0bdada1466324c08c1453a597d0df72249f070e90aeaf987e56a5a18c2f7f3c62cd05a0d19c60602213882f10ed49
-EBUILD libvirt-glib-2.0.0.ebuild 1012 BLAKE2B cf177b1d292bd293417b31db5f34ab752e6a1dc7d647de99ea9ff2e0279658d219c13e9d1a71597d511530ae01e65dffd961af408a552214131e16ad9b36a2c2 SHA512 2e665f25ce1d935c4cfe217cd108fcb07a0d3d7566c0353b92bcc67c3881f1ef0a2454c1a47d9aa0a99dfdc1b9fef067e760d22d1db472707e4cd4c464af0592
+EBUILD libvirt-glib-2.0.0.ebuild 1011 BLAKE2B 46753d7e8dde1c708edeb7f84bfb4b3c2994baedce161cd8915c8dc92c370f8625281cd88f573640e16f4fb522b55f552278a4934d43027df965facfdea1ce56 SHA512 2b5af1e0b5034b7865b829609a2e40d39d6f613a55aaa2687aa79f27ea32a605c5185a9337476bc922a66c8205b77b317ef43fba4f53f0b166049df142c565b0
 MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
index 8c47ef3bf8df..c0dbda3904fc 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection nls +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index b771c93edc58..8a57d14184ff 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -18,6 +18,6 @@ DIST libvirt-4.5.0.tar.xz 14743956 BLAKE2B 930852765104b1b22744df0ec4f1c74d89bc0
 DIST libvirt-4.9.0.tar.xz 14744184 BLAKE2B 03ddefc8f505c8688ad506b81ea9b37ee085e4c9c429834c6b6f338981bfc3c6034a5455a79feca604fb36e658de766ee6104aeed690c682ae596d10eb5632a9 SHA512 3cfada940f9de6cc4b0504e089f41aa03d9986f0163344dd3b3ab8e6c4eb556a56996dc8f24bca913b036862c75b256628ea9ab7674ef0a57b87f47c58689e90
 EBUILD libvirt-4.10.0.ebuild 9664 BLAKE2B 917ab8653ce95ed8321c30aa0ba55db9a1b35eea19fef22f3720d978549328c66ebe706188ab76535a93fbee28374c159670d1e21759af7ef68e1e2119b74231 SHA512 2197606640c27deaa98a5eed7436a18cdf0969b96455d3a5104fbbe3b31c0740878efb33d3f882d2fcc6f046d50536b2fe788c516308d71e2ff72d5388ec7321
 EBUILD libvirt-4.5.0-r1.ebuild 9654 BLAKE2B 68f875b79a4e7af8674b87fd47dc7081b31c0d617444bfca5d0ebe1b0b10fa4ddfef1305110f3689591a6a5ef32ace833a28e854126369ea2896b3d894b9d230 SHA512 05ba73308bdcabcf8a3c179814519331bc3ac2e557ec383ce9beaa3f8657436a9358461d5e03271811d56ef570e80eaf8a781d54b9b583381a418429934053c5
-EBUILD libvirt-4.9.0.ebuild 9600 BLAKE2B e26074068e69f108ea18dc6053fccb52ed0a541c09cc2d79ee33ca2a1f443c79b7734bd4a6dc76ef880a949439c53d09b0f3dce6f6f2abdb9242238a0d9bfc11 SHA512 00f8083e929ba16afb6626c62c779a0e91cd6fa11177b68f78de9c46e01a22be078a52e63307c934f968d3e9f4ab7eddf31fa48ebefd5fac771acab5273a27a2
-EBUILD libvirt-9999.ebuild 9553 BLAKE2B 55124688e59d3ef79f15e68c8acad6e44044e8500e4cbd29c8511307245e42ae071c421f058511f09f4e7b4ee3de94fa78d073f4c9467331bc4390642b1a334f SHA512 ac815c90d698438878bebb091343e2cca19756e4dc2b6de8a79f37f2cbccf5136fe4c153192ceb9633228b3c8264d24ee60ad0dc1a732a5ae0153a3a384eb2aa
+EBUILD libvirt-4.9.0.ebuild 9605 BLAKE2B c191450fab9fdf673dc15bc308e4d7a1d8adfc7b90f3e6bd1683d35424c4755a56d75a18105f406724e062b9df98d39ccef4fbd64f05a80791b2f73006662b2e SHA512 151f0930d2500205e25753465910a4f5806fc102f536a6624b9d6de02806dfa592c2b4bc37a1f11481a50bb4b30c30955f21976d74a0a95b3ebbc424c057b3fe
+EBUILD libvirt-9999.ebuild 9645 BLAKE2B 14276803066bc4d35132028332f8ccf68600950e46d5f4ce8a779808294335f22b1c45af09dd6c3276090677eda56bcdf90ce3238103225f257eed980f64e168 SHA512 e30e357f8c7586358bf13883e52fc4a3135885c99044bdf4f0bf7847ea55847e639931ec5ccd907bd30f037525d36c2bec2e7207a5e9e57149189edd6f4e086e
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index 1a8756f5974d..fb60857d3dca 100644
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
 	SRC_URI=""
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
 	# Versions with 4 numbers are stable updates:
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://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 6ecf1140a71f..c8b391fe4389 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -218,6 +218,8 @@ src_prepare() {
 	default
 
 	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
 		# git checkouts require bootstrapping to create the configure script.
 		# Additionally the submodules must be cloned to the right locations
 		# bug #377279
diff --git a/app-emulation/lxc-templates/Manifest b/app-emulation/lxc-templates/Manifest
index adf981c63726..745a46eb3712 100644
--- a/app-emulation/lxc-templates/Manifest
+++ b/app-emulation/lxc-templates/Manifest
@@ -1,8 +1,6 @@
 AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
 DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe SHA512 cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
-DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34 SHA512 1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f
 DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
 EBUILD lxc-templates-3.0.1.ebuild 513 BLAKE2B 15749a19b3c24df787d3d4eb8d7f6ebf902cff1c22fe0ee4bed0eafb8b5eb53860b5ff20d54e9775ef659f4ad46e160fccbd95bc2331a3f8b167c6332585aed0 SHA512 428a61af6aba82737427a699275522f992f6aba3eb870719e298f1b7b4a24842a21a33af2b7dfbd2a0e05f78b8316224f907ddaedfa2984d0117a67f0e064025
-EBUILD lxc-templates-3.0.2.ebuild 518 BLAKE2B 8e652807a3046688671a7ae6564bd8f0a50ebf1ac28a38eec49e7ac3485572dd3ca48acb1a49a36edf8ff05d05d1f01ea38e660be7a8430596daa83d25ff81a1 SHA512 96dc903516a5efb4ad3169e0e3f3c92ddb70c085994857e6cc2d339e84dc83392f4cadb1088e20ca215eee944faa8c6ca5b94b05f60f99124b98275d0083e04d
-EBUILD lxc-templates-3.0.3.ebuild 520 BLAKE2B 68d70ab9a40c33d6776da2765225d49e07f1b672d71d90062efd8415adb3965e84065d33977af67261932ef80dd295ef7dc207477e1c3bbf691ae2bd484ea3bc SHA512 90796dd4d82507cb4f0c0ee6d8749bec6d0df076d6cec37d15c29a1f3eccc2b651a0b0a02b9b8b4dd280708efaf37cf8152bae16ae1850661d2bbef681babc7b
+EBUILD lxc-templates-3.0.3.ebuild 518 BLAKE2B aa309cd9e6a8dc4670c193e63eff1b2b981132ce9d68bc11fe0ed176425a9a20b245bc58d3fe2489cc66143a006dffd47b2f61d0b90a2ad21df8a927f541d12e SHA512 ba87e581293aadf136e071ed32571219134aabce9612f1c4d44772d702a95a3e5bbcfe75a291b6e351682c3a8058e5a311aa8c41305e44881f3e875f46edaf77
 MISC metadata.xml 446 BLAKE2B d0b14eed14b0882b35ddb982ba432f6a5a3b63fdf8bb1c926c9d0db7b9cf7757c78cccca1244cd039d0db7e52c360e99c3fc0a2e915653543d5416054fec62af SHA512 473e0a28d72d39643f91e17910481331b1732b07e4cd74bac024c8a5a933e40a838948d5a8b0bef808332eac751422f7f88ec91501f63b779763606b71696acc
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
deleted file mode 100644
index 92e3e2aa239a..000000000000
--- a/app-emulation/lxc-templates/lxc-templates-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Old style template scripts for LXC"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
-DOCS=()
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
index 4a4dcd5d0e2a..c52d602d5218 100644
--- a/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
+++ b/app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Old style template scripts for LXC"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 40a6a0a2aa1f..cdda5013f143 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -7,11 +7,9 @@ AUX lxc-3.0.0-bash-completion.patch 915 BLAKE2B 8bb879e391cec349d211b47d321c64ea
 AUX lxc.initd.7 3468 BLAKE2B 37b0d044594f1c66631f991315e49c4ceea4640bf6c459e6bba713fb76ef9a8ee1fcbc49da68bd0f1e2929cf9904e0113a3b321166f7c3d360fcebeab6665e5a SHA512 c5841cff7d8b58d4283a26719e8a5db1be2c4add0f31065393b863b6626460180d91632106bc50cde4d3e74ae46a57d581fa1f01140dfa95522aba12277f9eaa
 AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd30208355d2f4a70a4cb46392473eccddd736988f1b72954948876601aaf99977d8e6014a7c774a416160f SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3
 DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69 SHA512 2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4
-DIST lxc-3.0.2.tar.gz 1236975 BLAKE2B 68047f6374b9081fb308586726797ed94fa66b5e94eb3fc12ad1a0aedc15ac1ee518ca5a341db79a715015e34ad38659200ad6aaf21f74639ebb55e7e1360645 SHA512 d7f5e3f91e5c8800e3e092ab209158a4d3e3c2816623249aeaaf2e0950428484ac5d1432d71298787721e1419cd962c0798ba14979e62161299fa15a299efde8
 DIST lxc-3.0.3.tar.gz 1263371 BLAKE2B 77d0f593119654f570ae748d305e86c27117fd4e9ec7bdab1110f5356afb4a00d81c105ae9757d9da5827f6883a4a5d8ddc43b5b6e56a2927ed990e757f7c7b6 SHA512 cdc411364153d7ed494bab604260f5cbdfd5bd7734a59af970b3198c7b3cb340b6736856a2189d5989e169945a817ac8b531bc3ab62217a4285dd63a851f9c8a
 DIST lxc-3.1.0.tar.gz 1277877 BLAKE2B e114855659c8199378d14bc23f667ce1927bb32c55d336fa9c222a60198da51e7ded6aeb6d1c89cbeb1e9edc101e424a847be1e4a2330d2a0bceda52d0df5e30 SHA512 706cee9bc8ac57300574b59d728437e41baa4eb16c68f8548142e53b4e13679ef6698df30a4fbf8617e4f07338f898464e9f818e80d32648fe9717370dcbbb20
 EBUILD lxc-2.1.1-r1.ebuild 6818 BLAKE2B e885b3a11de8a131433bec83b1d47b8c2277fd575d2d8bbf475bbb6ad5b1b520fbe204f61034816a96eef2734b5986d1bdaf9f39c2c61f4d1e47597c49eaf90c SHA512 15d46b88c5163ed35d25e404696350d0ef4906c4b264f5c1e9987a2f98a24b68c8187222a39a041a7de622621ae3dc5a9e6b58ab24754e57a70e2e1374f8c840
-EBUILD lxc-3.0.2.ebuild 5028 BLAKE2B f51ca223fc632d7475e1353b6309b96ec8a97e40508c3f7aeb6bf3a9f0727981bd7217adea2b881be3c191494e56a33b44e19b07d7f2b1772697fbf466774baa SHA512 f6cd8a534453b85a4bc12c187dbef844722bf7f94150693683e486bf3daaeaf12a968d20c9c93261eaadb1b27511b083b4ab5bde13e4bd7b3624ab6a9826f765
-EBUILD lxc-3.0.3.ebuild 5049 BLAKE2B a19e60819a5bef447462e5d7f3b31d2cb5eaaa625f6043bc5c213609f78cc9d1e268d6e20412dd9b906a4a8188a8c8767dfe1dddc6a305d2b50b154800bb2e03 SHA512 46b059ef834a6cb142ce290350261f97ab702fbf6d317f5cb0da3e444d90db517c6e9903c757cfe73c394e621b3ebd5342e4da553bcf576d063ee29cabe04c7e
+EBUILD lxc-3.0.3.ebuild 5047 BLAKE2B 10b4695efc433d386ec09d39114c4c09f586c711e9ba274d97ae7a9cb977ba9cb89bc000e84fa281d2809337687d3b495073f55578dc92d7a7b4245fc9a5bc65 SHA512 bc5ffafc3a13e900ca8c09aa7126bbec70fad173351128c736b633cb4b0a540f1bd4ea41c703ab13005f463e029674486296e1954355914bbd8d95b8b32eec4d
 EBUILD lxc-3.1.0.ebuild 4926 BLAKE2B 90ab77bacd0c95e4146c05712c60579f660c5a6d3a25a16a3341f4bd2877171a97ab1a21b528e66581d98951ac0a81476ef1d6d12285414f2abd49a9867007be SHA512 a111b0ebe7368c4a6cb12d38f20ab19b352068328e4e15a398c0b72596bbb3461621005e2db1e4822646ebcde3497d4663810b0af2903b0dcd530922a0da5e1d
 MISC metadata.xml 727 BLAKE2B f1f8eedf4986f221535eacc12429dadb73c25d07e67962d6676ca8f5303d971828df6bf781628fc0089ba29766136c73d164208f057bd59ca3789fab73ab7d47 SHA512 025b93960856b23bb9817b38fadb6ef9d6dfd2ab98f813de840634396fed8e577b8ff52c2d4698d21e0a18d3196d3233da0bf400bee4775cc1fa12b1014ec9f4
diff --git a/app-emulation/lxc/lxc-3.0.2.ebuild b/app-emulation/lxc/lxc-3.0.2.ebuild
deleted file mode 100644
index 9d075f8a2a63..000000000000
--- a/app-emulation/lxc/lxc-3.0.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor examples pam python seccomp selinux +templates"
-
-RDEPEND="
-	net-libs/gnutls
-	sys-libs/libcap
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	>=app-text/docbook-sgml-utils-0.6.14-r2
-	>=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
-	sys-apps/util-linux
-	app-misc/pax-utils
-	virtual/awk"
-
-PDEPEND="templates? ( app-emulation/lxc-templates )
-	python? ( dev-python/python3-lxc )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
-	~CPUSETS ~CGROUP_CPUACCT
-	~CGROUP_SCHED
-
-	~NAMESPACES
-	~IPC_NS ~USER_NS ~PID_NS
-
-	~CGROUP_FREEZER
-	~UTS_NS ~NET_NS
-	~VETH ~MACVLAN
-
-	~POSIX_MQUEUE
-	~!NETPRIO_CGROUP
-
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-	~!GRKERNSEC_PROC
-	~!GRKERNSEC_SYSFS_RESTRICT
-	~!GRKERNSEC_CHROOT_FINDTASK
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-pkg_setup() {
-	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
-	linux-info_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
-	"${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# --enable-doc is for manpages which is why we don't link it to a "doc"
-	# USE flag. We always want man pages.
-	local myeconfargs=(
-		--localstatedir=/var
-		--bindir=/usr/bin
-		--sbindir=/usr/bin
-		--with-config-path=/var/lib/lxc
-		--with-rootfs-path=/var/lib/lxc/rootfs
-		--with-distro=gentoo
-		--with-runtime-path=/run
-		--disable-apparmor
-		--disable-werror
-		--enable-doc
-		$(use_enable apparmor)
-		$(use_enable examples)
-		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
-		$(use_enable seccomp)
-		$(use_enable selinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
-	bashcomp_alias ${PN}-start \
-		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
-	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-	rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
-	find "${D}" -name '*.la' -delete
-
-	# Gentoo-specific additions!
-	newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
-
-	# Remember to compare our systemd unit file with the upstream one
-	# config/init/systemd/lxc.service.in
-	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-
-	DOC_CONTENTS="
-	For openrc, there is an init script provided with the package.
-	You _should_ only need to symlink /etc/init.d/lxc to
-	/etc/init.d/lxc.configname to start the container defined in
-	/etc/lxc/configname.conf.
-
-	Correspondingly, for systemd a service file lxc@.service is installed.
-	Enable and start lxc@configname in order to start the container defined
-	in /etc/lxc/configname.conf.
-
-	If you want checkpoint/restore functionality, please install criu
-	(sys-process/criu)."
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/lxc/lxc-3.0.3.ebuild b/app-emulation/lxc/lxc-3.0.3.ebuild
index 5cb34ceb5043..7b8927d98fb6 100644
--- a/app-emulation/lxc/lxc-3.0.3.ebuild
+++ b/app-emulation/lxc/lxc-3.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 3bf384d537d4..0515006fa4c6 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -7,5 +7,5 @@ AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d4
 DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 EBUILD qemu-guest-agent-2.12.0-r1.ebuild 1726 BLAKE2B ecf84ebaf79fb62a7d39cd971fe5669211f1915cc7f1bd71d3bcc272684ae61dea705ee6d7b3a3b47d6320db87b3666601bfed7f75204ee6ffec9e76c4c99d88 SHA512 bc380e7dd9773921b48669400fceff34d9b5a3ddba47814cdeafba99aac640650710501780f0e254d831748a6ea24f634463d8176d20545475a6fdf4d2244b8c
-EBUILD qemu-guest-agent-3.1.0.ebuild 1727 BLAKE2B 941c2612f48585a09a47a62e2e4943842972f2ac123213448f4268ee4b39d4730fe02587a75cef09565892c627fa6b78e382d826cc31378934f65f516a1db172 SHA512 c2db1806048e0f4d82a5c26d95c7252741e8197d41c7e8d626eb7f782cec931673acd0366d02b97e437a094056234331bd00d41da32d40f961ea5fd6f0476aa6
+EBUILD qemu-guest-agent-3.1.0.ebuild 1725 BLAKE2B 8497f71abb01bf8bee6922ac42757db471a1b4d09c83c35bbe8df62b70ffbae1ed8fc0ad93b660fc1da928d2b0f88c9cfea0431f21b7b32bfbbaafd171176d42 SHA512 4a0f7932d05810df1852988ee445bf498d88872315d309403ced9d5a96d5250a9b58ca030febd0fa21be118760473640b973e5c0436c820560d0ed3274e87660
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index dfc5b9c8e13b..f46f82dc4b43 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
 
 SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+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"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 38358470eb11..8859cc4d75aa 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,7 +9,7 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
 DIST qemu-2.12.1-patches-r1.tar.xz 3648 BLAKE2B 07908004d0b56e60274cb59d4163770290d8fa6e31646e7d96db08427a219638ac53bdd988c9557471b95321a72982d740a29778d843652274a126737a0a6c00 SHA512 1c7768c14a8e168053f0322554214ba59932a9fa23c982b06dbb1b8fdcfc280ae1d97b20244600f357485bfbcb9ad8bd7968787550c8a4e5e243ac8502eff05e
 DIST qemu-2.12.1.tar.bz2 41192583 BLAKE2B ff903a5850e406ab542ad1a84300852599fa9c199e0f3290e4d6ddad5284192577351278a18dd5706463b08e817b49340989a35987a04672f7cede2097d1d18d SHA512 4c85e6180bf7ec61c0bdddb20e104a7c93fe6b1de27f6aa50d75633eb78491cb844798a9e3f536245eff7b4ebe9a6227f5f66b418ced44095b8e59c5cb33d4cd
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
-EBUILD qemu-2.12.1.ebuild 24048 BLAKE2B b820aac5d165b1fc474d182909b9fc0e865791439914cfc216ea5aaff99d0077968b4709049f154dc77ba831fefee33c0ee803b7f6903267cad07c8ee290e6d5 SHA512 3ae064edb8998a080941852400971d6a26f70e21ee8c7664ff5b1833cb58f598f2018a491f22d601992083247a199121083536ca1370b726eac51fb4606ac6cd
-EBUILD qemu-3.1.0.ebuild 23787 BLAKE2B 902054fb146802b497e70c80d60d713f60e41be59366d5338c6b532eacd21600cace729739cbb3ed47630cdc26fd80f7b78d87276638b030cb19abd57ede927d SHA512 059cd89df8150c965fc93449f04b4c7520551b34cb88af82f2e84a44d15cf52d89c19c2f26a5a83c3a29681345195153bd01a8bd2b854d8f9fc13d19cde12db8
-EBUILD qemu-9999.ebuild 23578 BLAKE2B d1ef631a6d51721b2ce528f3f6a4a58200ffbeaa7a277cd14fd942a8ade581541bee3514760e1b8b04093ad8e49ba31535fe5fd618c2db495cefa6b29320b472 SHA512 0e94523e40ea50664a7ab9dd1451811b03feb26e67a35f2271aa060d58f1e04e50750f61580a6612fcc12d440b77b458a466ff70049bd514aacecbeaeb28686d
+EBUILD qemu-2.12.1.ebuild 24027 BLAKE2B f4e1bf430fec2697b1342a9396477f6a5cca96873d523a45a7f039d163cec756e63b6f3b20f5698333060cd28c9f16e60ba15709d8b6bc4f150a11a3d91bcc17 SHA512 283808f805122536242bcaccfa4921a4ade19258cae7367c7a3edfb4445e7c82ba72ddac3bbc331ee8b276f89ceb17f9f4cd8ccbf55af4de952cfa5548c5e10b
+EBUILD qemu-3.1.0.ebuild 23753 BLAKE2B 50d710788c9ed85e648ca15e1773a9d3f711a7e9436eb42872a2182bbd33032a4b17d60c36bea37759aa27c461b64fa26da60b72dddbfde2028b22dc6b7bcca0 SHA512 bfcd5972472a97d6269ffd03e8c2f20007515e38714f8bfa3fbb5a8ac4e3d345b30d3bde14b7d2982b27f7345db8dd58a8d8d6ecb5c0b925aa98c41c488033d2
+EBUILD qemu-9999.ebuild 23546 BLAKE2B 2b927a47edb2b6f162722d31c03b71cc5e8b90aa85c69f8f15cb1e3b7df8b4c204641b5a24aa6eb1f0b05a036d52bb985819cede8477449654e14d47deddd805 SHA512 7db8e030f29994fe2c5768d1c0b92dbcf41d014c82a789b669b8fc45a3c1fc602e39fe89a700ea0ec54ad35088fbb47c732118893ff109d36d52655a9963dc72
 MISC metadata.xml 4014 BLAKE2B e3ef3f3da149b756119932e7796ba2daf3327a841776dc64476730f33345e6a10abd45d8a52a45f1881f052d43902c0a6de0f3df02219ab9f8b5ce1fec12b635 SHA512 fd582b65e3eecacef5447b787fb465565fceb84a7fda9cd7079e5ae5b2ef4183ff7cd3187a5e751900bea6877fdda8e8357c792eef5431e76c4d672eb631481b
diff --git a/app-emulation/qemu/qemu-2.12.1.ebuild b/app-emulation/qemu/qemu-2.12.1.ebuild
index 55529b0483c4..2059fa0d44f6 100644
--- a/app-emulation/qemu/qemu-2.12.1.ebuild
+++ b/app-emulation/qemu/qemu-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -196,7 +196,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
diff --git a/app-emulation/qemu/qemu-3.1.0.ebuild b/app-emulation/qemu/qemu-3.1.0.ebuild
index 0e8b2a654e2a..328afccf3466 100644
--- a/app-emulation/qemu/qemu-3.1.0.ebuild
+++ b/app-emulation/qemu/qemu-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
 
 	# Gentoo specific patchsets:
 	#SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r1.tar.xz"
@@ -185,7 +185,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
@@ -757,7 +756,7 @@ src_install() {
 firmware_abi_change() {
 	local pv
 	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
 			return 0
 		fi
 	done
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 00f5573703e1..1c99bc24161a 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -182,7 +182,6 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/perl
-	=dev-lang/python-2*
 	sys-apps/texinfo
 	virtual/pkgconfig
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
@@ -749,7 +748,7 @@ src_install() {
 firmware_abi_change() {
 	local pv
 	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${FIRMWARE_ABI_VERSION} ${pv}; then
+		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
 			return 0
 		fi
 	done
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 0dd2b4d524b5..ae566c7280b3 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,8 +1,10 @@
 DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 DIST runc-1.0.0_rc5_p20180509.tar.gz 1185576 BLAKE2B b56f9c185c061f51a1fd81c19d378b06c71d06c6eddcbc1c946b234814eb469ea4af37bf42ef3889e4d37bc430e69d0a563281b13055f855f1bc15935531fe28 SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3
 DIST runc-1.0.0_rc6.tar.gz 1202212 BLAKE2B 2795b6e88a9587fac61a50bfea52a9df8524eb87aae66129d7ea83e8c3ca586efc60a46d24af857f7ba50f8e4d7021cbd2845d322a8c0ad08be3e0f19d80ba3b SHA512 2f7ed5e835f000d9810a116a27300336f424ac2c370dd1c7d158e26a4997d1e8398612387be27cc22cc25fdd52cc4cff7963ef88ce9c41d337321b75d9be2334
+DIST runc-1.0.0_rc6_p20181203.tar.gz 1202869 BLAKE2B 5b5808fc65f3725e5cc22794c5ff6c5eba6016110358b0f60dd3378df2e5b64afb5631e5652f45e9721838dd02745b8c5a88abfcd244de202196ac16bfccd5a7 SHA512 ec3d3fec773f2f9df714b0813efb110e21e328634e0b4ae77f323a892d0327aea5d4b6f9ae2a549aa06fda5b27431f4514fd663c7033dc170ca1a03627931f9d
 EBUILD runc-1.0.0_rc5-r1.ebuild 1296 BLAKE2B 837b2acae2f5b76fea1e49c4a49b8149e9f6fe5ac06555f1ec23720ab947d5586f00d333165a2fc200a22caa7a3616976f856bf45db6769db4b991c7d27ec0f5 SHA512 746a2751e39deebac58542a5a4687fd53523046e2b12f5f543a7ef7d891adc145bd4deaaf2e42535651eb608d2b58e5ee2f9c7db64c8c32bd5805934cc8c4c39
 EBUILD runc-1.0.0_rc5_p20180509.ebuild 1293 BLAKE2B fb959be90dcd20df0504a031ee478235cc3b7da2b2638441af00fd25036472ac9724682d54e6b1e7c66adf92dd40ea341c586cebc00a81860cf5be19b001c3f4 SHA512 f779767205e310998bd58f456c6a31670b6ac36fa859fda489c11f9053995890dca5473a27dbf229ad9c21776cde75a749cb9d787d8476e7207a33b2e601fcf8
 EBUILD runc-1.0.0_rc6.ebuild 1468 BLAKE2B 555c76381e17abcdb4c24d95602817a54bd5cdacb867de12b100842da272e1c076d85db961b2394c9781d05528d59863544a69a000598c928bc0871b0b94096e SHA512 867a0495da8d9c5ec78d9480b9ee053d26d5edd15eb57cf2777812040aa86fd41b3c471e2cd6acf61c1f5fd1c97ae2227995549121773a3b0d7c2ee319a0a410
+EBUILD runc-1.0.0_rc6_p20181203.ebuild 1468 BLAKE2B 28e60cfb54e02204e13eb28af02e7bce670bd6213c7d9a45b90980639391fbbe2b1b96de74ff806d4a19e464641e02317b1cec0330b3775b4251dd56cd2ea6d5 SHA512 2c58e0a87a84de3a524b0abf863f3398f1193fcbbf1da7ea2f6d85f26776055cb39deebbb9b21a7a54ca358b12d5d50f98d4f5cad8b75729079045c1fef33b04
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
 MISC metadata.xml 870 BLAKE2B e7fdbbe8bd178b4781f9a1345cb3473b9b2371db7f824ec3351a117d8c07c4dfa208eb1d1ef946576a6aa972bb055eba03c934f2388538998bee0e742e31151f SHA512 090b4cdf0cf933ad782e9b68df78aec48265222083a17c5f8e387943b9b535fe3d3ba751629f5c3978987572a2f1e821514e54a7f5327164f0ee8f5ce48efcdd
diff --git a/app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild b/app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild
new file mode 100644
index 000000000000..c422609ace86
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	RUNC_COMMIT="96ec2177ae841256168fcf76954f7177af9446eb" # Change this when you update the ebuild
+	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +kmem +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_prepare() {
+	default
+	sed -i -e "/^GIT_BRANCH/d"\
+		-e "/^GIT_BRANCH_CLEAN/d"\
+		-e "/^COMMIT_NO/d"\
+		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
+		src/${EGO_PN}/Makefile || die
+}
+
+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)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient' '')
+		$(usex apparmor 'apparmor' '')
+		$(usex seccomp 'seccomp' '')
+		$(usex kmem '' 'nokmem')
+	)
+
+	GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin runc
+	dodoc README.md PRINCIPLES.md
+	popd || die
+}
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 656156c23f14..444469ba7ecf 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -3,8 +3,10 @@ DIST skopeo-0.1.22.tar.gz 1921286 BLAKE2B 141f78d14cb47494af9e55541eeaa973c9e206
 DIST skopeo-0.1.30.tar.gz 2700275 BLAKE2B d80125e1be32f3b490f5d66caa5b1bd482dc2203d0c37824bd40d06e240c347468f9635623344e6f9badd9dbbeed59383d5ec8ad81a9b8e01284bc48114470f6 SHA512 05ea7c54f1de7ab9676903a973c8039520fa023f295c705e600d01520c0f300d255268e41b9c716dc4a1f01e951d9b73acf24d5a1bc891f694798a3eb085f061
 DIST skopeo-0.1.31.tar.gz 2886364 BLAKE2B 9ef9eb4fdd722216f15e14de6702aa0dfe3331b83acb803221b8f76a36428749b6bc302cb3ea2772dd42aefc336a80ad823cfcda9fc054a01f672cf7464592a1 SHA512 660856d962310f0274f3c2507a9a5cbfd8ceb205a3d2fdf30ebde856602151917492082356f6031e5d041ce02e53e562e83cba58259cdc456363f7af56b2507b
 DIST skopeo-0.1.32.tar.gz 4366298 BLAKE2B b358cb197475d693fa47cdfda738a78f70c9f59c5e3e61e55f3be21ea137640de2e9c61eb6437faca9a8f0e8dd6dda673e1cd645922a23533e6101eb326ef789 SHA512 c52eeee85aa01448c9742d4e415e3ce6f2e0ef4e26a55758202baecb573ad8e3efb94c762d4c303fb21b896998b32e19f919a7382dfd6b17df2a96d66d07267b
+DIST skopeo-0.1.34.tar.gz 2859957 BLAKE2B f36062374b2afa7363a02d6410bd35bbf5ccd0599eea7eb6d68b769e9fbf492dc7843dbd184fccc742250fcd3e573e33bd5454971730bcec2151a52a32b81680 SHA512 3ba99fcbff9f46fa1a4226bfc54961cf640150e0e0ac6b3457e862ef94991fa05a7bd609cbf8c87a0424df6942653fb5492a3893fa5282242c4df6913c4312a2
 EBUILD skopeo-0.1.22.ebuild 1341 BLAKE2B 7ad0f306ac63766a536809f9b895bd8a2a677c152f9806b593355cef618efd6aef8b1e2c8f70f979eeb1f99a8ba365b440dc9252f80cbbf0d4e882cef1840fba SHA512 84e7d05d76f896ef62021a80c093df74a575ccf2c79cab2f80e47b01e4d9ee4f60ee4713738d887579eb617a5e95d68a017c026d899c0a4d2d40b9ee5752a0e4
 EBUILD skopeo-0.1.30.ebuild 1292 BLAKE2B 554710ddbd65d0b3930ac4a0e23ce8cd2336cbc640a04e73afd885bfab1e5c84004b3e27e45ba86b19c40907cc4e28f37806cf6cef5c0e863d47da5a849cc3ea SHA512 708996e9c9bd91b474e6b443874d34c5c5752a64835ec7b279ae0c442ccbe28820bb003a1ab90fae8e23a9b8c534250c7f77f8574eef910dd8a64f5fe2449dec
 EBUILD skopeo-0.1.31.ebuild 1292 BLAKE2B 29f2228680d49b433e5376d230fe55e751d680ec24b9fd5755ba71cf635b2e8e416aef85ef0541e5e691f3ccdde5576bb43e9b7c8835aff8d2ffebc3298d83bb SHA512 11782377ce6d4263dc678e141f4b8ab96e0702e0f6b893ce41ad46f09fbcf837a20066622bd51e6640df3c5a72dd226f7879dacaf660b47d1e4d45771dde27e6
 EBUILD skopeo-0.1.32.ebuild 1280 BLAKE2B 7280ea0f0f7a3040fd2cf42563f7dd8a47d508bdb462c99fff6a41a6f7c7690d1c962a39a6c7dc6f8ad035fea52d6b72b7ca3af9e2be9460d76b40f50835802c SHA512 2a8209228700fc09c416d59e66c8f45b7a1e0b88cfd486b7009bb44419de8e11303ab6ea0bf0022e4e135c9b70f748b5e503ccdece578f1bbbff514081fd98b7
+EBUILD skopeo-0.1.34.ebuild 1335 BLAKE2B c18ebeb72018d0b37f6c1923c4867b528b05465d521e60b23531ba17b233ff17f26e0e7c0d57f9b912655d9bf13be46f875386e523c1b212b11edfcee95e5ed3 SHA512 4da6b6e6288e8f33b321670a363efe482199bc3c953410cfd0c82f386256ce60d9e3e90b5bea570036a257fbc4789e8a8975b1cb438ea31a43e175071bb3d356
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.34.ebuild b/app-emulation/skopeo/skopeo-0.1.34.ebuild
new file mode 100644
index 000000000000..2b442d046534
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.34.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/containers/skopeo
+COMMIT=e96a9b0
+inherit golang-vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145"
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- env GOPATH="${WORKDIR}/${P}" \
+		go build -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index 65427adf638f..b5bcb78a4849 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,6 +1,8 @@
 AUX vagrant.in 1872 BLAKE2B a129780601946f3c53b1cb84dfce33d6cc912069dd784cb49e971990aad3a0c89dfcb26a83e8841fc5bd6353bb1b7d525e0e6794d3192f34bef273360abad450 SHA512 983d479aafd7954ed5b3a7a7158b9b84925ff6d3d52251be52c86caa97b0f319c8d79902357d4c16822852a3bbc6db113ecf1c907a49de40c480871d906fd1d5
 DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
 DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
+DIST vagrant-2.2.3.tar.gz 1236158 BLAKE2B 083b153bc723b94aa543e02b275d1864dba5b2d7408266f8fe3813ba19302725aabc25e20e5b4df004055ea1ffa937f16f27307626cec137a253a6dab2b8f972 SHA512 ff3d95968a51a37a397342c013ebcc3bbfe7ff5b76fb35fead92e9a3b770c85f2f4720514aa68878b0b6e4fbd92629832dc1ddf925691529adf0c84c8f44d84c
 EBUILD vagrant-2.1.5.ebuild 2278 BLAKE2B 0f9a9e8cbab0928c7ee1042577dc83efc00d4ec50114bdf93185483e21da24f99fe575da0b2e5844a7e5a343fe99ef3c43886ad0256221feecf60a8c49ba6878 SHA512 79b2752ec86feae5c21453a021ffe90c3734a1bcb4e313512a2fc89161d85e60d7b629818468df270c0cba43049b202535c6b4a9eed45659d64ab94d31a3203c
 EBUILD vagrant-2.2.2-r2.ebuild 2453 BLAKE2B ced3f18626e649bf56e91b3deff46acc8d5cda0aeaefb5bd89357e688aae7fe5d7d339233a7e04e76c6d6e8a569741162d7b2b0bf6cf9bd266e397e39fb15b3e SHA512 8bbf87b8ddefffb6035caafa174e72942cc93277a4a57e42ee618914cebf1b1a1160bc9631057e3af28c14c0839f8d6ba57150f472d0196f5b04518dec828617
+EBUILD vagrant-2.2.3.ebuild 2453 BLAKE2B 432cac82d18a0e3b402d838fa4a9b38a66198ef027a88c4c4c5e0e1349da31f6cab1061681fde57210d5c312149b3b2ab91e42fb2d4ebbb8da16332266af1350 SHA512 2bb822310bd82cb95772c35b916f1c95aee50b4de9f0a75b0b323890f302d8bb0067c802212a00193fb2d2c5e1a2d4e279db1c7ec7cdc6e9aaf0215633bea501
 MISC metadata.xml 413 BLAKE2B 1b57ae29cf2bcdf4bd7d97071e081818e114104bd5a22438e0fe47bd4bce9b2fc1b831c544579cc8b652860c9637caa9134e6f1a4abcb21216e39e62fa058862 SHA512 417deb9af12420ac037b15b526d77ea3fdad12d047c4ea9ede5465ea9ea772fe96ee1625714e74e6dbad6ee224916e9b9304c38293aec4c5e2a52555e1c9f4e8
diff --git a/app-emulation/vagrant/vagrant-2.2.3.ebuild b/app-emulation/vagrant/vagrant-2.2.3.ebuild
new file mode 100644
index 000000000000..a55cc3486a28
--- /dev/null
+++ b/app-emulation/vagrant/vagrant-2.2.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+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="https://vagrantup.com/"
+SRC_URI="https://github.com/hashicorp/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/bcrypt_pbkdf-1.0.0
+	>=dev-ruby/childprocess-0.6.0
+	>=dev-ruby/ed25519-1.2.4
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/hashicorp-checkpoint-0.1.5
+	>=dev-ruby/i18n-1.1.1:1
+	>=dev-ruby/listen-3.1.5
+	<dev-ruby/log4r-1.1.11
+	<dev-ruby/mime-types-3:*
+	>=dev-ruby/net-ssh-5.1.0:*
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.2.0
+	dev-ruby/rest-client:2
+	>=dev-ruby/rubyzip-1.2.2
+	>=dev-ruby/vagrant_cloud-2.0.2
+"
+
+# upstream specifies rake>=12 but it apparently doesn't need something this
+# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
+# is tricky, we specify a lower dependency requirement here. This way, we'll be
+# able to stabilize vagrant sooner.
+ruby_add_bdepend "
+	>=dev-ruby/rake-10.5.0
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|i18n\|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" > "${PN}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newbashcomp contrib/bash/completion.sh ${PN}
+
+	# provide executable similar to upstream:
+	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	dobin "${PN}"
+
+	# directory for plugins.json
+	keepdir /var/lib/vagrant
+
+	insinto /usr/share/vim/vimfiles/syntax/
+	doins contrib/vim/vagrantfile.vim
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 01bfe32dead3..ee2e579a984b 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -3,6 +3,6 @@ DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 EBUILD virt-manager-1.4.3-r1.ebuild 2385 BLAKE2B 1361cdbb0b185ff6dd6430e94c2416a9981ce360cbcd6330cde5f519989af3f9f85b98d194a23c2d6fe0f9fd9ccb701bf09f1fbae32d1906d1fa22ed30250bd3 SHA512 3a864d2802a1f61b3153c84c0cd1c91241d9003331aa749035133a06d21c06fbd094a9c7a5058b69f9a560961069611465b9054cfd57b7ce64299c83cf0fb183
 EBUILD virt-manager-1.5.1-r1.ebuild 2403 BLAKE2B 2e30a3cb3debac21490fb97a3bbc02bd7f24d5ebabe989340fe94ecc2dfbe30d9f7774fab428ca9d237e554f18863466359a6ab2f7c9e82f2dfa6a9dbf7f4e1c SHA512 952a3bb8d6f4e239b933e2b011db72dcb2d23ea34da193fcc58b755e44cb9acebaa3caceffff565c8db752188abba8d677858e96b76bdd801c8cdf54bedbb3d9
-EBUILD virt-manager-2.0.0.ebuild 2295 BLAKE2B d23dbc779c0d242a4559c30cc3c041c322d8176ceb2de3dbd96f049c40b71a0c7fad368849caa86ca22e72388ced1b97d82d962d7350dbca9a31bf308d579fed SHA512 e609cacd83c8b2f7f48d37e7b621064e5541ec68c379b52c90a23e62e2339fa325223363375c08df6e1d4408934b1fd027fe566982c4e8fc30b09b830bfe5fc9
+EBUILD virt-manager-2.0.0.ebuild 2294 BLAKE2B 8a62edd2effc55db7d7078ab7992fee1d1e7f4ed3e441a91094de234b02a2da367107d439d1c2199a05db898caad907a24df8b07130448943ff56ee3ba8ee39c SHA512 b4e60d6553c98b45e9566262b81dfb2e37f2844a1625b39de8b11ca7c0473435e9bfc69981d7f81c7941a9712077fe27b52773977af52f09d14a99d0a50d2edc
 EBUILD virt-manager-9999.ebuild 2287 BLAKE2B 0f3b49f424a7ee6b1170e13d72ccd842653aa6ab0df119b8dd4530b4202f9e38c6c8cb8f8a369ffd10955fddae38594b8c7181f836b2127913480b200f56549f SHA512 4f3b298579077ff216dccd348440260c003d6f82c60284d83637e91a48ebee7cb365955dcbd926b44c03b4e38c14da0b317b5350a36ac548427be9b9a7fba90f
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
index b99319a5ac52..944a821c3da6 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index f8714eea5bcd..7886d8b64b3b 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -12,5 +12,5 @@ DIST VirtualBox-6.0.0-127566-Linux_amd64.run 148766154 BLAKE2B 2e23341dc798aabc1
 DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
 DIST VirtualBoxSDK-6.0.0-127566.zip 10749531 BLAKE2B 98a9d1d85a5d835e9a6d1ed121f6650d795a695bf40fb05af235eba6454237a79487f801d6351f3c446b523001271faac8cc09880522f97cae73360c1179edf5 SHA512 1f25b9249c5e1e0a7caee867b1508f517e16afd23055decfe27a513d1199ebc72bfcd391a8e750403ddb80a4087df7cfd928604b827976d7075829c7e3d82e00
 EBUILD virtualbox-bin-5.2.22.126460.ebuild 8327 BLAKE2B 02bf2b29c01c69a3e8321964f494c274c0d22fd1e360235a919ebdc0a0d4c716a51540c51ff85aec6ea7f5a7cc4bb4b4625eca877e23458bb8e57fdf2c5e300b SHA512 b9a91b54c1d0a368b98a021cd24af53c452cc5731fb3495dc7f6e26578bab84d297cc7dd4e0847e8ecf696aa0057c103e1b241fa90d0dfdb11954ea15786438f
-EBUILD virtualbox-bin-6.0.0.127566.ebuild 8388 BLAKE2B 414fd859d1525aae205c4001d3d1c184a56b4283f5e942f80db3102c6bd4720b13bbd300d57b33364e580ec09b87079cb124499ee98763195212f75e92be009e SHA512 b77c7d6042011993687fe16a37e56c4b6209cef6b4e13d5ebde81325fc021f87030ad5d4d71b367f314d17851068f2380024bbe5067482e1a73127ded50bc585
+EBUILD virtualbox-bin-6.0.0.127566.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild
index 092c665883fc..871816079601 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -181,7 +181,7 @@ src_install() {
 	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
 	# The compile phase makes VBoxPython2_7.so.
 	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so VBoxPython2_7.so
+	use python && doins VBoxPython.so
 
 	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
 		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index 21763ef2627f..15e89a3bc857 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -15,5 +15,5 @@ EBUILD wine-any-3.18.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f79545
 EBUILD wine-any-3.19.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.20.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
 EBUILD wine-any-3.21.ebuild 21113 BLAKE2B eacc4b21ddb034c5897a08e127a34eb5f7954557c46bccb0ef2198c098c892bba57c3c6a11978788b5d331081c9ba95b4e131a423693afdc9e2e77b534d9cb52 SHA512 7d46682ec57935c30ae0927ef6512c1436e750939c42c0648d09782b692a31a3d1dea4ad074b1af05cc14e913e214630d1d812b0db8bc9d89f9e356f50388afd
-EBUILD wine-any-9999.ebuild 21156 BLAKE2B 96bf1d9d463525d93cbf4c2ef6c392666ec95f37dddd25cecce79532bbf902a8f8c702f6724cc6ecf929bebda5645e5f2017ea312e98cc430f986abc88c3dd70 SHA512 fc81a3d8642ae5b088ebe8157a48c5d252612d2d4ef06a3d473ff40fa6728c875bff0b9c5d644753dc385615c3c2ed116d4197ba773d0784903beea0a88ef1e1
+EBUILD wine-any-9999.ebuild 21153 BLAKE2B 097951ac2770e079194924c0aa294945c03a1e8cb829c246ae52201580841fada75a8922d163bb8982ec236f3f69deb603059d684a10e4b587eaf0b64bd822d5 SHA512 b9c3c8787c3d3f3d0decc6314aec412caf7c1b19e5efec206898d321dac1174bad5118e4364b5e062482193e4c26889033003dd5ca10a293e1e6613cc2d8c44e
 MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index ca707f87befe..460586cacbe1 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index b91d23961bd4..360fb0aa3852 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 5ce3c185d876..37e32aa6f252 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
 DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
-EBUILD eselect-postgresql-2.3.ebuild 923 BLAKE2B 337e9da82b5732a0f824577dc5ee291c4949808018ea94316af850893a80bbc45eea52ea1ff7ad1db02fc4eeb388023ba3c923a4993ad196d4e9870fe4366ea0 SHA512 3342c576a6f4672ab3289a02c5ad00bf4075de3ba7e3148dd30ab99e9ee9fa345cfc0c0b9f81c2931293f8a209205ccd06f1019a21e9b2a78567c075ada6ebca
-EBUILD eselect-postgresql-2.4.ebuild 1019 BLAKE2B 1b647fd427c11727ac1874e1eb4bf9eba0c7d8cc94dc456091478032c1b1d7ed8aad535262dffedaf254a8a63aeeeeb96ae5b0f70e1e71a9eec1f715b3474562 SHA512 53bd05b8dba327ab59059028137c0a772be66173ba9d818a224571fcbd82182b641a8c2c9547773cedd3a9e37acd9d105d79696e1ef23633e91a956a5f57efec
+EBUILD eselect-postgresql-2.3.ebuild 919 BLAKE2B aaa7f9e6ae8094210bdbee7fbb807e3fb38d3afa34a319778234c6d6e1fb983e334532d27cc1d4e347ff6e30f14c8372a347ad21b2f3de7cba3d396bdce74c5f SHA512 e6e52a816d934b53007329f31ef3ac66db711fa5e70946a0b811263134aed3894d836fc2f2b522879aaa055304df17efc64ab402ced0e4ab86fe62d739726e4f
+EBUILD eselect-postgresql-2.4.ebuild 1012 BLAKE2B f3fd07da9e71ce10c91a921ae162fa6d7b86fe205f004cfe4a48aea79ec2c651e4f862f8280995afa1a0d226a933b9356354933c09e92819b3c038431576a1d6 SHA512 3d3c46131c982c6ca01eed3ca7033167cdd89519042506e567d2a607164fca2468fa2e1b4009bb5b2f60cffb1d27812de70dcc17070e9473bf5426208d373c8f
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
index 18d367b4ed37..29195a23b083 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index bbb5d6bd1fc4..f02b5dddba6f 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="app-admin/eselect"
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index fb68aead4d77..9f992c822e2e 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afl/Manifest b/app-forensics/afl/Manifest
index 9aebd322d8ae..841053fcf21f 100644
--- a/app-forensics/afl/Manifest
+++ b/app-forensics/afl/Manifest
@@ -1,11 +1,3 @@
-DIST afl-2.35b.tgz 829515 BLAKE2B 5f03d00b21ec8e2169b78757c9be7ca57d35a66c42c169c4a14a554f8ecb9cdacd0bbb99da63e7007731377dd6e815e7ea886ac8b9623cd1be80976ffc51bdaf SHA512 77f286d0008055770812b7429a671caed54adb2355cd88e1cbdd13f9e739763f46ed6f3e25ddfbe7aa2679e0a71c9b1af9767d1c367df1778338fcf260bc38c5
-DIST afl-2.39b.tgz 830897 BLAKE2B cc03e3864b75f6bae232bafb3fc66c80be18b00e05982c1124ce7de7e8df9c54a66273985472507e64a927485ba8121ded565fe4021350a2e8caab7a4c9a3178 SHA512 0df37fc8dea65d4130bc0fc8aaa23525bde4832c7202efb78ebe740d661546adee575b48fb94d851ef26293ca28a6ff818ab1dfd643c8e688aceb520e11229d0
-DIST afl-2.46b.tgz 834265 BLAKE2B d292d4c1686c123af7ddee57d9d44d4d8618a49f57985493ed0017fdda88d95cca4b270c139416f95c21476c9aeea3bcbde0be737fcc1f2c38ef0b17379f2b46 SHA512 01e150f05a023277f6fbf165f1ee0799f9a330efae562d67725cf87b456f4104e086162796634fcfdd7c68aa33a38ef7df9ac5931f8893c14364d270b864d059
-DIST afl-2.51b.tgz 835611 BLAKE2B 6fb4fb60e2fd1d1a18caee84568bee98c4224b54bc55454c53d3c3b753274d183816c8fe229be84303722c7fc31e29bc244a149718ae7507f127e994c5b6e663 SHA512 fd67cf44b7336175041c2efa42b122e91f887f4a293618a59ea1e145ef47b9c0fab9fc274e4b94499c523bec950ff5a704050c3f4260e890ad97774c365a358c
 DIST afl-2.52b.tgz 835907 BLAKE2B 6df8b8f97a0b1ccb22466492bf15f054e7a05f77f2827c6555572fd610cbed24c903ae188e2242ba6ffec302e154e319adb627626a7927f17ffa5ab00cef604f SHA512 30d4526440cff109ef2a014278f52a04b1b33560b6ab7d7f59e1516655858ffb36dac81963d2d8f214984776742ca9a7942c27c8fb61f7eb70b5b35cd029008f
-EBUILD afl-2.35b.ebuild 974 BLAKE2B e06ad315bc94f79cb7f6075937c82ed8455b4b64bbc895707a951201e01dc33de550a46bf81c36a90c1d324de2804b9d65b4f2e2951f6131eb05951f3a0d1735 SHA512 e566e9be5989102921e019a44c6bbe7e05ff731c52d7c86387215c5c30b4e1385cef86e9535bfc0005b0ff45477c0dab5993642cfba3c8b75e57ab1190eee8c8
-EBUILD afl-2.39b.ebuild 974 BLAKE2B e06ad315bc94f79cb7f6075937c82ed8455b4b64bbc895707a951201e01dc33de550a46bf81c36a90c1d324de2804b9d65b4f2e2951f6131eb05951f3a0d1735 SHA512 e566e9be5989102921e019a44c6bbe7e05ff731c52d7c86387215c5c30b4e1385cef86e9535bfc0005b0ff45477c0dab5993642cfba3c8b75e57ab1190eee8c8
-EBUILD afl-2.46b.ebuild 981 BLAKE2B 25901d86a0626475e30a486ebf6afc5f515c2fac1c57e3fee978a5736ac33d4f9a48d5fbea9180ab513d714d89cde464db7abe608cdcb1009a91e80702bc4fdc SHA512 49858f57889193e9c571d5eacc3bec9489b4131135219e408355b821d2b5bdb3c1f29a1a937d6374c56e09a3d10f0a30729b321114648c7b2c7d17486b0816dc
-EBUILD afl-2.51b.ebuild 981 BLAKE2B 61d28b2b89faea3a6303dce3ba85e69b25ec7b4665d49b7dfa80e2a7fa90d4e1843e9d35917ff1afcc74de60b301189d4d0f42a171faa142d0d988ac570effc3 SHA512 c95e4d31469cd6ce8b54cf2d183838248ac483f7ecc4bd9ba5be17a884124f37316e87815ad85ea755075a2ce9157d20d6792d5f28236aefcc148e287d900f29
-EBUILD afl-2.52b.ebuild 981 BLAKE2B 61d28b2b89faea3a6303dce3ba85e69b25ec7b4665d49b7dfa80e2a7fa90d4e1843e9d35917ff1afcc74de60b301189d4d0f42a171faa142d0d988ac570effc3 SHA512 c95e4d31469cd6ce8b54cf2d183838248ac483f7ecc4bd9ba5be17a884124f37316e87815ad85ea755075a2ce9157d20d6792d5f28236aefcc148e287d900f29
+EBUILD afl-2.52b.ebuild 978 BLAKE2B d5b4be62f952d7f68caaf2536d7ed04843b8d601d6aacb3faab8d649b5205b32193c74b2dad994cc741ea3e291085e54bfb18a37d7e2309321c67903afb6adf4 SHA512 66a43106a86dcf3bbab29425a3a81e607c94549fd18e84ff22f2c7c413cbc3189197a72dfc3744c57e30d404a839be96e671b5473a3a30c23a2a6176dca34126
 MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
diff --git a/app-forensics/afl/afl-2.35b.ebuild b/app-forensics/afl/afl-2.35b.ebuild
deleted file mode 100644
index cbd560185fa0..000000000000
--- a/app-forensics/afl/afl-2.35b.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
-
-inherit multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
-HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND="sys-devel/gcc:*
-	sys-devel/clang:*"
-RDEPEND="${DEPEND}"
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-	CC="clang" CXX="clang++" strip-unsupported-flags
-	cd llvm_mode
-	emake \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}" \
-		install
-}
diff --git a/app-forensics/afl/afl-2.39b.ebuild b/app-forensics/afl/afl-2.39b.ebuild
deleted file mode 100644
index cbd560185fa0..000000000000
--- a/app-forensics/afl/afl-2.39b.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
-
-inherit multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
-HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND="sys-devel/gcc:*
-	sys-devel/clang:*"
-RDEPEND="${DEPEND}"
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-	CC="clang" CXX="clang++" strip-unsupported-flags
-	cd llvm_mode
-	emake \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}" \
-		install
-}
diff --git a/app-forensics/afl/afl-2.46b.ebuild b/app-forensics/afl/afl-2.46b.ebuild
deleted file mode 100644
index f6578457d15a..000000000000
--- a/app-forensics/afl/afl-2.46b.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
-
-inherit multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
-HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND="sys-devel/gcc:*
-	sys-devel/clang:*"
-RDEPEND="${DEPEND}"
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-	CC="clang" CXX="clang++" strip-unsupported-flags
-	cd llvm_mode || die
-	emake \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}" \
-		install
-}
diff --git a/app-forensics/afl/afl-2.51b.ebuild b/app-forensics/afl/afl-2.51b.ebuild
deleted file mode 100644
index 4da2fbf2e0de..000000000000
--- a/app-forensics/afl/afl-2.51b.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
-HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
-SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND="sys-devel/gcc:*
-	sys-devel/clang:*"
-RDEPEND="${DEPEND}"
-QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-	CC="clang" CXX="clang++" strip-unsupported-flags
-	cd llvm_mode || die
-	emake \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="/usr" \
-		HELPER_PATH="/usr/$(get_libdir)/afl" \
-		DOC_PATH="/usr/share/doc/${PF}" \
-		install
-}
diff --git a/app-forensics/afl/afl-2.52b.ebuild b/app-forensics/afl/afl-2.52b.ebuild
index 4da2fbf2e0de..9c58122f99dd 100644
--- a/app-forensics/afl/afl-2.52b.ebuild
+++ b/app-forensics/afl/afl-2.52b.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit multilib toolchain-funcs flag-o-matic
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 DEPEND="sys-devel/gcc:*
-	sys-devel/clang:*"
+	sys-devel/clang:="
 RDEPEND="${DEPEND}"
 QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
 
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 001975a9838e..98b9b35ec9b5 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 345dbfc4234d..5d901e8b41b4 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -1,4 +1,5 @@
+AUX 0001-Fix-case-sensitive-name-for-lmt.py.patch 1515 BLAKE2B b4a3007cc81d31c03100c636bb65de19677cc8fc76f754c738205a6040b6452fdd2f396f9f7291aa392a4b8bc9da019520c69de6aecea15a3e3a05dcf2d49d4f SHA512 fda611cf01de59ae55ff651706e919148cac5ec45c5af39cc9e288ba6f2a66b953fd9beda37ded1ca5f80fed9844d4d77cb8360a99dccd25a945eae641bf5429
 AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f79f14ac0bc37c293e0d40e7e7cb34bc31b1c387c10ee74978d1c030fafad60f4e2428a8fcadf03163d5e48a SHA512 4242cda1df6b55cd0bee66dfb9137b6f63118bc31c5f703ed44c42738f47dc794d7f1ed6dd9ba5696b606c4bf624428e8f21e1683cb698d8dda249833a4c5f68
 DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
-EBUILD laptop-mode-tools-1.72.2.ebuild 2580 BLAKE2B 3a7b3d0cc54ae21fdeb79ac41f990ea89ae151eac9f94947eccd2c246d7ec2d641fc5f1f3838be240fe218f4e29c3af761769cb6e57ee4742c735fea824e1b9c SHA512 45269b1cfa59434dc46b673317351fc25b811bcd08d4a2a90b7e419bc8a19f439e5c01f1564091bd4b2f737f6c04039de15a29d0d13ecaaa5343c54517c73014
+EBUILD laptop-mode-tools-1.72.2-r1.ebuild 2651 BLAKE2B 6029a915aa0984c9c7646291c8d733e1d7bffc46ed20690624eb386d2f4f75c95f2c65be8f0b1821c9d2b0bfec3f347bfbeac57024c04d3464be4f020bbcfe32 SHA512 2a5f2059ff323c87851600d2c8d14565cbb3e5abf3b767a471b4e74c1b024b4c0ce874cd52e90ac4812ac276f66b0717e324b377e057cb1e353992eece6f1e12
 MISC metadata.xml 436 BLAKE2B f89deae094b0a595dfc688ce45461a20a8b4b66191de36b3a40d01ee570c34ef59dbfae2fd14b6e4e7c76de4277907a74c21e7139d2f0c56d4eae50d4fcde32c SHA512 869ee9290fada409da987a2ecdd962591a425e43f89403046a208dee46802f3b0071c099590b486e4fe09a60dcf6de802088f153cedf44a361a58e7d9395d193
diff --git a/app-laptop/laptop-mode-tools/files/0001-Fix-case-sensitive-name-for-lmt.py.patch b/app-laptop/laptop-mode-tools/files/0001-Fix-case-sensitive-name-for-lmt.py.patch
new file mode 100644
index 000000000000..14d2801240f4
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/files/0001-Fix-case-sensitive-name-for-lmt.py.patch
@@ -0,0 +1,46 @@
+From f1c44c8fca177b399bc5cb889ff2dfba2427ae30 Mon Sep 17 00:00:00 2001
+From: Ritesh Raj Sarraf <rrs@debian.org>
+Date: Mon, 5 Feb 2018 08:51:26 +0530
+Subject: [PATCH] Fix case sensitive name for lmt.py
+
+Closes: https://github.com/rickysarraf/laptop-mode-tools/issues/124
+---
+ gui/{LMT.py => lmt.py} | 0
+ install.sh             | 2 +-
+ laptop-mode-tools.spec | 2 +-
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename gui/{LMT.py => lmt.py} (100%)
+
+diff --git a/gui/LMT.py b/gui/lmt.py
+similarity index 100%
+rename from gui/LMT.py
+rename to gui/lmt.py
+diff --git a/install.sh b/install.sh
+index 5692646..b68424f 100755
+--- a/install.sh
++++ b/install.sh
+@@ -209,7 +209,7 @@ if ( ! $INSTALL -m 644 gui/laptop-mode-tools.svg "$DESTDIR/usr/share/pixmaps" )
+ 	exit 11
+ fi
+ 
+-if ( ! $INSTALL -m 644 gui/LMT.py "$DESTDIR/usr/share/laptop-mode-tools" ) ; then
++if ( ! $INSTALL -m 644 gui/lmt.py "$DESTDIR/usr/share/laptop-mode-tools" ) ; then
+ 	echo "$0: Failed to install $DESTDIR/usr/share/laptop-mode-tools/lmt.py";
+ 	exit 11
+ fi
+diff --git a/laptop-mode-tools.spec b/laptop-mode-tools.spec
+index 2e4a164..72fa751 100644
+--- a/laptop-mode-tools.spec
++++ b/laptop-mode-tools.spec
+@@ -83,7 +83,7 @@ fi
+ #%{_usr}/sbin/*
+ %{_sbindir}/*
+ %{_usr}/share/applications/laptop-mode-tools.desktop
+-%{_usr}/share/laptop-mode-tools/LMT.py
++%{_usr}/share/laptop-mode-tools/lmt.py
+ %{_usr}/share/laptop-mode-tools/modules/*
+ %{_usr}/share/laptop-mode-tools/module-helpers/*
+ %{_usr}/share/pixmaps/laptop-mode-tools.svg
+-- 
+2.19.2
+
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild
new file mode 100644
index 000000000000..a9ae177ba5ad
--- /dev/null
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd udev
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
+SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+acpi apm bluetooth"
+
+RDEPEND="sys-apps/iproute2
+	sys-apps/ethtool
+	sys-apps/which
+	|| (
+		sys-apps/sdparm
+		sys-apps/hdparm
+	)
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )"
+
+PATCHES=(
+	"${FILESDIR}/0001-Fix-case-sensitive-name-for-lmt.py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
+		TMPFILES_D="/usr/lib/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README.md
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
deleted file mode 100644
index 822d2452f934..000000000000
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd udev
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Linux kernel laptop_mode user-space utilities"
-HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
-SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+acpi apm bluetooth"
-
-RDEPEND="sys-apps/iproute2
-	sys-apps/ethtool
-	sys-apps/which
-	|| (
-		sys-apps/sdparm
-		sys-apps/hdparm
-	)
-	acpi? ( sys-power/acpid )
-	apm? ( sys-apps/apmd )
-	bluetooth? ( net-wireless/bluez:= )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# This should avoid conflict with pm-powersave wrt #327443 and #396703
-	cat <<-EOF > "${T}"/${PN}
-	HOOK_BLACKLIST="00powersave"
-	EOF
-}
-
-src_compile() { :; }
-
-src_install() {
-	DESTDIR="${D}" \
-		INIT_D="none" \
-		MAN_D="/usr/share/man" \
-		LIB_D="/usr/$(get_libdir)" \
-		UDEV_D="$(get_udevdir)" \
-		SYSTEMD_UNIT_D="$(systemd_get_systemunitdir)" \
-		TMPFILES_D="/usr/lib/tmpfiles.d" \
-		ACPI="$(use acpi && echo force || echo disabled)" \
-		PMU="$(false && echo force || echo disabled)" \
-		APM="$(use apm && echo force || echo disabled)" \
-		SYSTEMD=yes \
-		sh ./install.sh || die
-
-	dodoc Documentation/*.txt README.md
-	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
-
-	# See src_prepare()
-	insinto /etc/pm/config.d
-	doins "${T}"/${PN}
-}
-
-pkg_postinst() {
-	if use acpi || use apm; then
-		if use acpi; then
-			daemon_name="acpid"
-		elif use apm; then
-			deamon_name="apmd"
-		fi
-		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-			ewarn "To enable automatic power state event handling,"
-			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
-			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
-			ewarn "added to default runlevel:"
-			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
-				ewarn "# rc-update add laptop_mode default"
-			fi
-			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
-				ewarn "# rc-update add ${daemon_name} default"
-			fi
-		fi
-	else
-		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
-		ewarn "automatically disable laptop_mode on low battery."
-		ewarn
-		ewarn "This means you can lose up to 10 minutes of work if running"
-		ewarn "out of battery while laptop_mode is enabled."
-		ewarn
-		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
-		ewarn "information."
-		ewarn
-	fi
-}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f4a7b27cabd9..64c95be8bdda 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
new file mode 100644
index 000000000000..d18e028cb607
--- /dev/null
+++ b/app-metrics/github-exporter/Manifest
@@ -0,0 +1,17 @@
+AUX github-exporter.confd 507 BLAKE2B 46ace5b98c0ec60c7a93c50524258e44537e1a4ed13d77c3b4f6651ce56f5323f2342d967b145515a544edb3203b71052edb12019f9105b8e6b4bce9da0d14aa SHA512 10430a3d1fcb6a7e125fcddfb27a610843f6646091efb8e53fa9eca7bd434c528562857267b59f75452eb78c78821e8856716d417145a9e930861e4340382d1a
+AUX github-exporter.initd 1512 BLAKE2B ab1f34d3084655da8b7f5345e7001f968d0f7361d8c0eb45070e8a7c1bb6216b65ccfec754897c2472b91fa457a50b363d51939ccc772ae64e153abe97b10cba SHA512 d0ebac39a04d94a10f6d38cbad660b7c8f4bf570bbda334d7e7eb6c2d635f6ac4425f462e2ed9b68bd4f8ac56842deaa6ab15b6c883cf4fd17078115feaaa9be
+DIST github-exporter-04.tar.gz 7023 BLAKE2B a2502fab29f7d987e7fe02a739d9d3bcc34376315581830033dc99d9c16be0bca52a30b8f491682de34ded4732c9216a05e8bfc1d2ac6510a22bd752a50bb5b9 SHA512 4837d78d058e8adb110ced899a9d136eed86aa3facf7258a6d7b392a3a61aa827662e63f8bd64b0ca44e6ed78518a6ae669068018ffc18d3bb42d19f4fb364be
+DIST github.com-beorn7-perks-3a771d9.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
+DIST github.com-fatih-structs-878a968.tar.gz 14629 BLAKE2B 673a25a39cab677bd275ccaf14675a1fa7847d1a089ceaa20cc981ca01a1cbba597e94467e7accdd1a4319acd44c5d7bd0f6e2de0eebd7fe2f43cc6cc9a94271 SHA512 3c00f10e17e6dd818422a6b8e1ef5454b3dd9cc78da22c56ec3c474bd7a590bb3dd56e803c01882b52ce12a6a4deda7935bbb786c3cebc2e60b379337a884752
+DIST github.com-golang-crypto-ff983b9.tar.gz 1645106 BLAKE2B 3d7271479ef812761a02c1d20429800cd29706e802a8ccf57e916bdb8befc87a9b1b1a88d42adb764a32fa5f4c5f5a5e434af63812a5bcd3de625658792a49a3 SHA512 19746e84901c0749da544ba02c74c8ccabfee5f186a0d00509e54f20c191da9ea56844de988265f072af1fae671d78d741a44f782b8c1704c9da0441436c2122
+DIST github.com-golang-protobuf-347cf4a.tar.gz 329489 BLAKE2B 828678cee603917e7f4efee2dd0902730a73932b94b12d4f4b35f0fcecaa329cdc39c3fa9926ce3706f86cc52c0aa4984f68ee0943ecc6d9571b0175ff671ab0 SHA512 de4307b91923a6890ab2f8eaf2ed4f7f32a45a4a0cc7b0d6f53ce31c5fe3ed08f378072075456d2c99c89a3b5acbca315814b8e5ec70e6ceb0ca62f7013f618c
+DIST github.com-golang-sys-48ac38b.tar.gz 1219195 BLAKE2B b632d935ed84ace8ddad5308556ddcfcca7b572fd1f65d8b5c39e9ba2b884c79f5c150cc3efa920654661b0958d894fa23445701dcd1d35f0f49ff4dda3bccd4 SHA512 8cea014c67df943dd68bb8787719acc0925f967f2cef552ae52c595ca4eda38adeab6c92b868822e08601cca20a61f16b78426d8b9252932168ffbd0f2403859
+DIST github.com-infinityworks-go-common-7f20a14.tar.gz 4072 BLAKE2B 79a788813840c8361e80ff882fff680ed83d3fe8485c09856290f0fa183438770210be600a3d6ae0d62e1a1027a43a6eef184d5a4b5f38fec9c15d54f16d384e SHA512 a8bc3d11eead090807bd7b64a71d7b078836e807b2a18ebb8e1b1ef286e920e993d3fe734eeafeccd80c8644b4c466a73b1cf479a4932c84e0e5fc328e50fdd2
+DIST github.com-matttproud-golang_protobuf_extensions-c182aff.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
+DIST github.com-prometheus-client_golang-d2ead25.tar.gz 131949 BLAKE2B 352e0ef2bd704f6c490e57520d415e89d950241c39f3cdf851524d4cca87c25c31bf2ffb77914981cb730cb474033f4551b50c5b6085e5e273c2d29aaab1f012 SHA512 ca89d613e8bc6cff928d9ce8d3d563c8277cb31756c66d8c0e6f6b6ce00c1405d10e465245ac63fd6889aeafae0d6914814384e94e127929fbcfd606a59e42a5
+DIST github.com-prometheus-client_model-f287a10.tar.gz 57203 BLAKE2B 2d56b90ced967f5f7a2c59bb330aaf8c56cf522091ee413ff27c22cb9e7d656080bd7d4dd2372938a873617054c7c98925e10fdc7996b136eaa4fd1b6482b734 SHA512 b4f900e725a638a7131eee1c6ff5bf550025b4d9e5bb2dd09149e91ce02a7aba458039c2162b6a1f9a6b6c7c8fc0fc29510b6c752caad51282a960d18860f960
+DIST github.com-prometheus-common-2998b13.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
+DIST github.com-prometheus-procfs-b1a0a9a.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
+DIST github.com-sirupsen-logrus-eef6b76.tar.gz 38613 BLAKE2B 32ff02d46dcdf08b273c406323236b0750433bda16a5072e4161b166863f5a062817166dc871e15fb169bfdb95ff45f167bc30b2e259294e0a51111b8a78afd3 SHA512 e7ca358b72bebbf663af426a110cd8da22bf33e2ec14fb7337af75a1cdd4aecb371436b8cc83f04a52a52ced56c02a762b12c2fe5ae5e64d7aee261a7254b14e
+EBUILD github-exporter-04.ebuild 1949 BLAKE2B 4a7f826fff339b28cbbeac15b89a39848c42509010f8cd9893416075fa6f1225b48e71e5ad11245100ea8a9100e1b5ee283fe3af96dddb8da4d35eef7c5dc048 SHA512 1a4bbf6af5931bd6878142d922cdab6e53c2b1adfc0b88421eee01c8a4265dc8e7435cdf831b67a729f58d26eb981c511ccbc956b4f859258a9ed3ab9b4861ae
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/github-exporter/files/github-exporter.confd b/app-metrics/github-exporter/files/github-exporter.confd
new file mode 100644
index 000000000000..35368901c8f1
--- /dev/null
+++ b/app-metrics/github-exporter/files/github-exporter.confd
@@ -0,0 +1,14 @@
+# settings for github-exporter
+
+# I will list the required variables here, but there are several more.
+# Please see the README for all of them.
+
+# LISTEN_PORT specifies the port the exporter will use. Below is the default.
+# LISTEN_PORT=9171
+
+# ORGS should contain a list of github organizations you wish to monitor.
+# ORGS="org1,org2"
+
+# REPOS should contain a list of github repos you want tomonitor.
+# If neither ORGS nor REPOS is set, the exporter will refuse to run.
+#  REPOS="user1/repo1,user2/repo2"
diff --git a/app-metrics/github-exporter/files/github-exporter.initd b/app-metrics/github-exporter/files/github-exporter.initd
new file mode 100644
index 000000000000..45ea133260af
--- /dev/null
+++ b/app-metrics/github-exporter/files/github-exporter.initd
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+
+description="github exporter for Prometheus"
+command=/usr/bin/github-exporter
+command_background=yes
+command_user=${RC_SVCNAME}:${RC_SVCNAME}
+pidfile=/var/run/github-exporter.pid
+error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
+
+start_pre() {
+	local env_args
+	if [ -z "${ORGS}" ] && [ -z "${REPOS}" ]; then
+		eerror "ORGS and / or REPOS must be set."
+		return 1
+	fi
+	if [ -n "${GITHUB_TOKEN}" ] && [ -n "${GITHUB_TOKEN_FILE}" ]; then
+	eerror "Please set only one of GITHUB_TOKEN or GITHUB_TOKEN_FILE"
+	return 1
+	fi
+	if [ -n "${API_URL}" ]; then
+		env_args="${env_args} -e API_URL=${API_URL}"
+	fi
+	if [ -n "${GITHUB_TOKEN}" ]; then
+	env_args="${env_args} -e GITHUB_TOKEN=${GITHUB_TOKEN}"
+	elif [ -n "${GITHUB_TOKEN_FILE}" ]; then
+	env_args="${env_args} -e GITHUB_TOKEN_FILE=${GITHUB_TOKEN_FILE}"
+	fi
+	if [ -z "${LISTEN_PORT}" ]; then
+		env_args="${env_args} -e LISTEN_PORT=9171"
+	else
+		env_args="${env_args} -e LISTEN_PORT=${LISTEN_PORT}"
+	fi
+	if [ -n "${LOG_LEVEL}" ]; then
+	env_args="${env_args} -e LOG_LEVEL=${LOG_LEVEL}"
+	fi
+	if [ -n "${METRICS_PATH}" ]; then
+	env_args="${env_args} -e METRICS_PATH=${METRICS_PATH}"
+	fi
+	if [ -n "${ORGS}" ]; then
+		env_args="${env_args} -e ORGS=${ORGS}"
+	fi
+	if [ -n "${REPOS}" ]; then
+		env_args="${env_args} -e REPOS=${REPOS}"
+	fi
+	start_stop_daemon_args="${start_stop_daemon_args} ${env_args}"
+	supervise_daemon_args="${supervise_daemon_args} ${env_args}"
+	return 0
+}
diff --git a/app-metrics/github-exporter/github-exporter-04.ebuild b/app-metrics/github-exporter/github-exporter-04.ebuild
new file mode 100644
index 000000000000..6bc641ecb2f1
--- /dev/null
+++ b/app-metrics/github-exporter/github-exporter-04.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/infinityworks/github-exporter
+
+EGO_VENDOR=(
+	"github.com/beorn7/perks 3a771d9"
+	"github.com/fatih/structs 878a968"
+	"github.com/golang/protobuf 347cf4a"
+	"github.com/infinityworks/go-common 7f20a14"
+	"github.com/matttproud/golang_protobuf_extensions  c182aff"
+	"github.com/prometheus/client_golang d2ead25"
+	"github.com/prometheus/client_model f287a10"
+	"github.com/prometheus/common 2998b13"
+	"github.com/prometheus/procfs b1a0a9a"
+	"github.com/sirupsen/logrus eef6b76"
+	"golang.org/x/crypto ff983b9 github.com/golang/crypto"
+	"golang.org/x/sys 48ac38b github.com/golang/sys"
+)
+
+inherit golang-build golang-vcs-snapshot systemd
+
+DESCRIPTION="Github statistics exporter for prometheus"
+HOMEPAGE="https://github.com/infinityworks/github-exporter"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/infinityworksltd/infinityworks/' \
+		"src/${EGO_PN}/main.go" \
+		"src/${EGO_PN}/config/config.go" \
+		"src/${EGO_PN}/exporter/structs.go" \
+		|| die "sed failed"
+	sed -i -e 's/Sirupsen/sirupsen/' \
+		"src/${EGO_PN}/main.go" \
+		"src/${EGO_PN}/config/config.go" \
+		"src/${EGO_PN}/exporter/gather.go" \
+		"src/${EGO_PN}/exporter/http.go" \
+		"src/${EGO_PN}/exporter/prometheus.go" \
+		|| die "sed failed"
+}
+
+src_compile() {
+	set -- env GOPATH="${S}" go build -v "${EGO_PN}"
+	echo "$@"
+	"$@" || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+	cd "src/${EGO_PN}" || die
+dodoc *.md
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Before you can use ${PN}, you must configure it in"
+		elog "${EROOT}/etc/conf.d/${PN}"
+	fi
+}
diff --git a/app-metrics/github-exporter/metadata.xml b/app-metrics/github-exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-metrics/github-exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/memcached_exporter/Manifest b/app-metrics/memcached_exporter/Manifest
new file mode 100644
index 000000000000..ec95c4928b07
--- /dev/null
+++ b/app-metrics/memcached_exporter/Manifest
@@ -0,0 +1,5 @@
+AUX memcached_exporter.confd 62 BLAKE2B b663b955cddd850ea26292f92e8462132057424cff4292a7c95b40f79c000e90aef739652cd0ca3d419bd648b3062b5374b38bf934ce30c9c5084d6abda7e196 SHA512 8859128c27264826b665f8be1ea87d7df4f9c4731dfc065914f69efb1a3fedb1cdc09cac99a2a67ef12668b87ceda2f2ae4ccd99c30d23b9eb424bfc51406452
+AUX memcached_exporter.initd 485 BLAKE2B c4e34f4ae1e43b78291f24f32857e548a9ba384f9f359962a65e2349c45096d665debad5b85f5109de4972cd957c87825d46cbedca5d954c76a1a34071e1a616 SHA512 78219e03ab100aa1fecb61ecc8bd8964eab03c1eeb0566185a6135c3fc4ce6fab07e303fb638ae6137d19fd41b6064aa9cfddc9be9739d56e1c8bd15d1e6f04f
+DIST memcached_exporter-0.5.0.tar.gz 1350752 BLAKE2B e9a326ca155e0e0a89dd556f0a97ba9bbe73e3e02a905497c55a5390be2cbf211dde9dda37355dd043b711258c78cf911c79ae898b6e0934f2d4b2ddef7ae946 SHA512 62ec7f9cefc88425ea3b53a634b2d5ff1534624b6e149c962372e81a7271fc1bf3c01c7d8641dc49250b8d124bec740b3c2768e62d51cfdc025a29f71a49b428
+EBUILD memcached_exporter-0.5.0.ebuild 994 BLAKE2B feae07b3e56d55f9a74b7b2a272e929064aeb418f65b5ac272a89ac63d2dcd4afee614eab2806b09b3cdd7f5678ccd7740efd77c8b6ceff0eba0cf2ed1b98a5f SHA512 df00ab947fa07b9597e25d659506cbb01f84fda13e9d5651051912868459092b205c73b53f7c34f33676c377938d30d2c2cc5f9af518cfad9ae3a060869ab6d8
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/memcached_exporter/files/memcached_exporter.confd b/app-metrics/memcached_exporter/files/memcached_exporter.confd
new file mode 100644
index 000000000000..ec7b89ec9cfe
--- /dev/null
+++ b/app-metrics/memcached_exporter/files/memcached_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus memcached exporter
+command_args=""
diff --git a/app-metrics/memcached_exporter/files/memcached_exporter.initd b/app-metrics/memcached_exporter/files/memcached_exporter.initd
new file mode 100644
index 000000000000..fa21bea18d19
--- /dev/null
+++ b/app-metrics/memcached_exporter/files/memcached_exporter.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus memcached exporter"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command="/usr/bin/memcached_exporter"
+command_user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+command_background="true"
+errror_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+output_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+start_stop_daemon_args="--group ${group}"
diff --git a/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild b/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
new file mode 100644
index 000000000000..b7ee78d65607
--- /dev/null
+++ b/app-metrics/memcached_exporter/memcached_exporter-0.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build user
+
+EGO_PN=github.com/prometheus/memcached_exporter
+DESCRIPTION="Prometheus exporter for memcached"
+HOMEPAGE="https://github.com/prometheus/memcached_exporter"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-util/promu"
+
+RESTRICT="strip"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed"
+	ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed"
+	default
+}
+
+src_compile() {
+	# needed since we use the default GOPATH
+	unset GOPATH
+	mkdir -p bin || die
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	newbin bin/${P} ${PN}
+	dodoc *.md
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-metrics/memcached_exporter/metadata.xml b/app-metrics/memcached_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-metrics/memcached_exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/nginx-lua-prometheus/Manifest b/app-metrics/nginx-lua-prometheus/Manifest
new file mode 100644
index 000000000000..bc3f966afa78
--- /dev/null
+++ b/app-metrics/nginx-lua-prometheus/Manifest
@@ -0,0 +1,3 @@
+DIST nginx-lua-prometheus-0.1_pre20170610.tar.gz 10307 BLAKE2B b08fcb126a6d7034c143c7e96709f3f2751d90f60f6b9225f55ed46f7f211ebcf5f1688bd8b2c82286e329dd23e09a5163ad316ba6568755936253e8e55590f1 SHA512 df1022a88e82e388e68146f81e51a53f9b0c1a14a43d58e468d258ac0ca9875c1c88af44c46c91d89dc7fc1fef0ffebdb9163f886d85fde995e61e2cac3b5c81
+EBUILD nginx-lua-prometheus-0.1_pre20170610.ebuild 828 BLAKE2B 1d0cf2b5a48155ed77c18942228f071b9a55e8106bb9ed6c9299adc1a427453726dc175a5502010aed6d412ce630ea167731138496748127b3ef986c846c5794 SHA512 d8fb080bce6eb397fd1fc895444f7162eaef5dd8f6be2aef75cc4e9d0de31426192bfec0ab3c545e63f595f8ab14ca061308d96baddf73f7a2cd8529451bf96b
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/nginx-lua-prometheus/metadata.xml b/app-metrics/nginx-lua-prometheus/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-metrics/nginx-lua-prometheus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
new file mode 100644
index 000000000000..b8af9afe146c
--- /dev/null
+++ b/app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is the upstream tag which corresponds to this release.
+# It needs to be updated with every bump.
+TAG="0.1-20170610"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library that exports Nginx metrics to Prometheus"
+HOMEPAGE="https://github.com/knyar/nginx-lua-prometheus"
+SRC_URI="https://github.com/knyar/${PN}/archive/${TAG}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND=">=dev-lang/lua-5.1:="
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	www-servers/nginx[nginx_modules_http_lua]"
+BDEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+	S="${WORKDIR}/${PN}-${TAG}"
+
+src_install() {
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"/${PN}
+	doins prometheus.lua
+	dodoc *.md
+}
diff --git a/app-metrics/process-exporter/Manifest b/app-metrics/process-exporter/Manifest
new file mode 100644
index 000000000000..01e6bd1bd64c
--- /dev/null
+++ b/app-metrics/process-exporter/Manifest
@@ -0,0 +1,4 @@
+AUX process-exporter.initd 265 BLAKE2B 9dcda67ec54f4b1576756f209768cb95947e304ed278e60323584ff08880ba1e45108054c84a453b39d85aa2c5a169f85ac28e0ca5b6c4e1b04ce64ccc9db381 SHA512 90a19f4ea330c86b37109d3d2560da50bb40625ec8feeed6d10cfc5e95ee4a6dcf1fba6c359c76727ef9d1c94fec06cc8e480a3392859df8b99347a2b54c4eb2
+DIST process-exporter-0.4.0.tar.gz 378006 BLAKE2B 053379e8e0cb95f099cebf53289c48c39d6c8ef22c8b0dcf0bd128453e601da98be9205bb5c7cda8a05d5f50addabbcb46f6ece44926da17c1bd8616e452783a SHA512 88f6f0e07bb7f3ea6c593ba359c09ace47eb0830ff0759b1f4dd64219a6c9069dc2891a328a90bdef13ea02efc576fb71de7ff095788b4dd45c2683c90904363
+EBUILD process-exporter-0.4.0.ebuild 713 BLAKE2B ffa91501c9ee04e4040b567dbb1666002bbb9abcdf70aff49dc3d8c7bba92d488634fbfd023f3f29d4928a244554cdbdd6f056a50991ffc52954f0f7d8a259c7 SHA512 b1ac1ed9ec5d8603693d5d2e0e4c04bb529bc35efc5e6b9c6cb915e3deff1904745b61c211bd3f058071d29f22dfd499e023f445cb443fc763883b556090bc37
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-metrics/process-exporter/files/process-exporter.initd b/app-metrics/process-exporter/files/process-exporter.initd
new file mode 100644
index 000000000000..d739825ecdfc
--- /dev/null
+++ b/app-metrics/process-exporter/files/process-exporter.initd
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+
+description="Process Exporter for Prometheus"
+command=/usr/bin/process-exporter
+command_args="--config.path /etc/process-exporter/all.yaml
+	--web.listen-address=:9256 ${COMMAND_ARGS}"
+command_background=yes
+pidfile=/var/run/process-exporter.pid
diff --git a/app-metrics/process-exporter/metadata.xml b/app-metrics/process-exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-metrics/process-exporter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-metrics/process-exporter/process-exporter-0.4.0.ebuild b/app-metrics/process-exporter/process-exporter-0.4.0.ebuild
new file mode 100644
index 000000000000..4ea9b6f62fa9
--- /dev/null
+++ b/app-metrics/process-exporter/process-exporter-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/ncabatoff/process-exporter
+
+inherit golang-build golang-vcs-snapshot systemd
+
+DESCRIPTION="Process exporter for prometheus"
+HOMEPAGE="https://github.com/ncabatoff/process-exporter"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${S}" emake build
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin ${PN}
+dodoc *.md
+	insinto /etc/${PN}
+	doins packaging/conf/all.yaml
+	systemd_dounit packaging/${PN}.service
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
diff --git a/app-metrics/vault_exporter/Manifest b/app-metrics/vault_exporter/Manifest
new file mode 100644
index 000000000000..8b8d344acb98
--- /dev/null
+++ b/app-metrics/vault_exporter/Manifest
@@ -0,0 +1,5 @@
+AUX vault_exporter.confd 58 BLAKE2B c34e7aa384449a3cc88592055f16111b5c23a8479cd4a8029c88002584d23c3d1bd490acebb3eba676637ab01ff733d057ee57e3a38ca7346072441173569b4b SHA512 a77f0a945ae0a42308a4d43e5de1eb02221ceef3bdd36f0fb716a7784843c35f3b00cee88fd45d477d417b297b532fc6953bf71cc86a7112bf45f872ba92f396
+AUX vault_exporter.initd 549 BLAKE2B 1a8a2a35af3c851318e461176fb87f9660b5a060238cc02edde976532bb7076fcb6a100ffa196224942e30149fda2e8f8d9a0dc211e5d57fce39a8d5645b65d8 SHA512 6470aec28a3a6ffa574dfdda2947b1d16d4255d7e7921d88622043b1dfa6b756427f98c288d3437f9f06539ca156267bfba6d03c6030259281c5acda05ba4dd6
+DIST vault_exporter-0.1.2.tar.gz 34555506 BLAKE2B 53178f8a16fceca442e38a756081cca438abdd786960de3dae073f3ce5f2ac2c5d06684ec56e48a2057b4a2161a25527b41c36d3705a054f0bae37357f33faee SHA512 71941c17d7146861a09ed48289efe15143d3fba18e56accdfdf977bf4443bb650e7201a4870b63793d372dcca8f53a04131c12803f019efbdcac9e0ca8909cbd
+EBUILD vault_exporter-0.1.2.ebuild 929 BLAKE2B 6d1853fb6a00503f05b69373c9dd96b03d36d2bb72d0970590cb85ea707697aa43768c91da59226fa6222d9999e82a3c447b7c5a6a57855644f343d87a17b549 SHA512 bddd7ffb3c662a6f340740bdc4bfcd7748c6863d959708e9b7ce644edcca66c23ae87e8f65a65f63381159bd7b6abf50808484f8520e6412cb5daac75001276a
+MISC metadata.xml 334 BLAKE2B e1317e1e9dbc0a7cfcc31c70693086ef92de9580c99d693040d00d5114a7b9c662c37332a384c21bf236ea46369225211dfeed43b6899e5858be1f10231f7c24 SHA512 fe06afc02cd875a5e214ac923d8b6fb89cad9d5f5c2aa4057fe87c99c0433d76fe3eaa675ca9ac9524352a9382869fb861b19bfb8cc8f6378dcf4fc43865e9da
diff --git a/app-metrics/vault_exporter/files/vault_exporter.confd b/app-metrics/vault_exporter/files/vault_exporter.confd
new file mode 100644
index 000000000000..c77a74db56d8
--- /dev/null
+++ b/app-metrics/vault_exporter/files/vault_exporter.confd
@@ -0,0 +1,2 @@
+# arguments for prometheus vault exporter
+command_args=""
diff --git a/app-metrics/vault_exporter/files/vault_exporter.initd b/app-metrics/vault_exporter/files/vault_exporter.initd
new file mode 100644
index 000000000000..254ff41679cf
--- /dev/null
+++ b/app-metrics/vault_exporter/files/vault_exporter.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus Vault exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/vault_exporter"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/vault_exporter/${RC_SVCNAME}.log \
+	--stderr /var/log/vault_exporter/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/app-metrics/vault_exporter/metadata.xml b/app-metrics/vault_exporter/metadata.xml
new file mode 100644
index 000000000000..3dfeb8c7054d
--- /dev/null
+++ b/app-metrics/vault_exporter/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">grapeshot/vault_exporter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
new file mode 100644
index 000000000000..3c48b2307d64
--- /dev/null
+++ b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+MY_PV=${PV/_/}
+
+EGO_PN="github.com/grapeshot/vault_exporter"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Vault exporter for Prometheus"
+HOMEPAGE="https://github.com/grapeshot/vault_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	newbin _output/bin/vault_exporter-v${PV}* vault_exporter
+	dodoc README.md
+	popd || die
+	keepdir /var/log/vault_exporter
+	fowners ${PN}:${PN} /var/log/vault_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5e0e0d2fbc72..130f62854f1c 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 14751728126b..ab81ea94aff2 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,10 +1,6 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
-DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
-DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
 DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20170717.3.36.1.ebuild 6197 BLAKE2B f414b02c162914ce6952cb1bc44d49ffa714050aa89e15df6ae6ac43037a3091676663603b08f89dc11c5a8e5b820f6c72e1f85e5eee3cfb4810f61c037ae53a SHA512 07847d4d40b9af9ca35b090b8314f179648f417e23193cf12593b5a02462cb3f8577c9e12615dd00c00d980620186f6268a45e368216ce47c4768106fd2be1b2
-EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5684 BLAKE2B ab01e71cab24cdadf6e234531c91ff456606259ad7f275506ff4f1288153a91b2f9cd00174a9caa5faeb301389da6afd5a3c75c2d2ad481f08e0fda86d3b4ada SHA512 ad6ed05e4f844ea23d3d2de1a897c65eba036446a34cef8711e03ec8fe828587fbaa12f3d1c5a6aaf47f8d92bc8a6953cb4a9eafc41889e238a3a878cf2130a1
-EBUILD ca-certificates-20180409.3.37.ebuild 5688 BLAKE2B a85b14582337039989ddc6524293da813ea97a56f6300624ec71d179d05d0b4b3258804b9445405068b2147897d5b23f9c34e5436c76f92abc89fde66d90b23d SHA512 7ed2cd8083eb72fded8eaa4c01cddab6427a1999cadf96d6b6cf051468edd9bb9a75884df36fbda33a3f30a8bb4f9d3d45e7d8a8b3cbe1fec535a4f8f949d810
-MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
+EBUILD ca-certificates-20180409.3.37.ebuild 5675 BLAKE2B 3a9d6e7d6e98ab84e2300ac21a0420c835f1ef870cdab61772f3c704545a3974d01c88b461d490310a9bf33c88e4c1e40d58ff4618cb308e08057050b665b3dd SHA512 7789acd51276ba30fc1709526d62a939756c1b94896ffea4ea6dfbb0b1862c2ab580847fb2d4168be87fbde0c28f0aad45b689f2e426ee017e02991064dfeab4
+MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
deleted file mode 100644
index 4a23bdb19395..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="insecure_certs"
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	if ! use insecure_certs ; then
-		elog "To prevent applications relying on system's trusted root certificate store"
-		elog "from using CAs where at least one major browser vendor Gentoo is following"
-		elog "has decided to apply trust level restrictions, the following"
-		elog "certificate(s) were removed:"
-		# Remove untrusted certs from StartCom and WoSign (bug #598072)
-		elog "$(find "${c}" -type f \( \
-			-iname '*startcom*' \
-			-o -iname '*wosign*' \
-			\) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild
deleted file mode 100644
index c956522df0e3..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.36.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
index 0c84a91f786a..6dcf1e3837c7 100644
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index 3aa7f10648b3..f4cf8a2a0180 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/metadata.xml
@@ -10,8 +10,5 @@
 			Include root certificates from CAcert (http://www.cacert.org/) and Software
 			in the Public Interest (http://www.spi-inc.org/)
 		</flag>
-		<flag name="insecure_certs">
-			Install certificates which are known to be untrustworthy.
-		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 5be4a90802a6..ddeb1e08c9a6 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,5 +1,8 @@
 AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
 AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
+AUX ckermit-9.0.302-cleanup.patch 2870 BLAKE2B 6fc0d26cfb1715d92a5e718e6e4d1771a38ebbfd52c601c1e0c18497e677e53a5c4c608c97054da8c14c8af3e1caf7d32bb59dd3d89999b5af22d31bc67dda90 SHA512 c99a47ecdadc27d4a8dca2d917e20e84683e1729ceb8ab07f1818eeffd0ee7d9ca87531862000866a74e7d3b3b3cf977255b8f584f3828ab3443b684a6195b7f
 DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
+DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
 EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
+EBUILD ckermit-9.0.302.ebuild 1976 BLAKE2B f67332691f13b68cbcb4bef52519c7058addb97a7212647e64f2d6fc0c71a6065bfbd4d2b28918e4e46481352ad31b7673ca05cb5e8192fe4dd5106a476e57d4 SHA512 4d4b0ce68adb41e1d36c768c04534f21886a29fb17f584e46edd70b7ad388814b34baea737f960b9a0b7015917c1bcdcd73c34cfbe6005da478f77123f28d07b
 MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild
new file mode 100644
index 000000000000..8c7e12e0f401
--- /dev/null
+++ b/app-misc/ckermit/ckermit-9.0.302.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+# Columbia University only uses the third component, e.g. cku211.tar.gz for
+# what we would call 8.0.211.
+MY_P="cku$(ver_cut 3)"
+
+DESCRIPTION="combined serial and network communication software package"
+SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
+HOMEPAGE="http://www.kermitproject.org/"
+
+LICENSE="Kermit"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cleanup.patch
+	"${FILESDIR}"/${PN}-8.0.211-build-wart.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export_build_env BUILD_CC
+	sed -i -r \
+		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
+		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
+		makefile || die
+}
+
+src_compile() {
+	# we don't enable any of the telnet/ftp authentication stuff
+	# since there are other packages which do these things better
+	# USE="kerberos pam shadow ssl zlib"
+	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
+
+	if use ncurses; then
+		append-cppflags "-DCK_NCURSES"
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
+	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
+	append-cppflags -DHAVE_CRYPT_H -DHAVE_OPENPTY
+	append-cppflags -DNOARROWKEYS # bug #669332
+	emake \
+		CC="$(tc-getCC)" \
+		KFLAGS="${CPPFLAGS}" \
+		LIBS="-lcrypt -lresolv -lutil ${LIBS}" \
+		LNKFLAGS="${LDFLAGS}" \
+		linuxa
+}
+
+src_install() {
+	emake DESTDIR="${ED}" prefix=/usr manroot=/usr/share install
+	dodoc *.txt
+
+	# make the correct symlink
+	rm "${ED}"/usr/bin/kermit-sshsub || die
+	dosym kermit /usr/bin/kermit-sshsub
+
+	# the ckermit.ini script is calling the wrong kermit binary --
+	# the one from ${D}
+	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
+}
diff --git a/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
new file mode 100644
index 000000000000..c645e75da835
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-9.0.302-cleanup.patch
@@ -0,0 +1,94 @@
+Various clean-ups and fix makefile dir creation.
+
+--- cku302/ckcmai.c
++++ cku302/ckcmai.c
+@@ -561,6 +561,8 @@
+ #include "ckntap.h"
+ #endif /* NT */
+ 
++#include <time.h>
++
+ #ifndef NOSERVER
+ /* Text message definitions.. each should be 256 chars long, or less. */
+ #ifdef MINIX
+--- cku302/ckuus5.c
++++ cku302/ckuus5.c
+@@ -7853,7 +7853,7 @@
+           printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
+           printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
+           printf(" --cdmessage:%d\n",srvcdmsg);
+-          printf(" --helpfile:%d\n",helpfile);
++          printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
+           if (inserver) {
+               printf("\n");
+               break;
+--- cku302/ckuusx.c
++++ cku302/ckuusx.c
+@@ -57,7 +57,6 @@
+ #include <termcap.h>
+ #endif /* NOHTERMCAP */
+ #endif /* BSD44 */
+-#else  /* !BSD44 */
+ #ifdef linux
+ #include <term.h>
+ #endif /* linux */
+--- cku302/makefile
++++ cku302/makefile
+@@ -1047,7 +1047,7 @@
+ 		else\
+ 			echo "Creating $(DESTDIR)...";\
+ 			DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\
+-			mkdir $$DESTDIR  || exit 1;\
++			mkdir -p $$DESTDIR  || exit 1;\
+ 		fi;\
+ 		chmod 755 $(DESTDIR) || exit 1;\
+ 	fi;\
+@@ -1066,7 +1066,7 @@
+ 		echo  "$(DESTDIR)$(BINDIR) exists...";\
+ 	else\
+ 		echo "Creating $(DESTDIR)$(BINDIR)/...";\
+-		mkdir     $(DESTDIR)$(BINDIR) || exit 1;\
++		mkdir -p  $(DESTDIR)$(BINDIR) || exit 1;\
+ 		chmod 755 $(DESTDIR)$(BINDIR);\
+ 	fi;\
+ 	rm -f $(DESTDIR)$(BINDIR)/kermit;\
+@@ -1104,9 +1104,9 @@
+ 		if test -d $(DESTDIR)$(MANDIR); then\
+ 			echo  "$(DESTDIR)$(MANDIR) exists...";\
+ 		else\
+-			echo "Creating $(MANDIR)...";\
+-			mkdir $(MANDIR) || exit 1;\
+-			chmod 755 $(MANDIR) || exit 1;\
++			echo "Creating $(DESTDIR)$(MANDIR)...";\
++			mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\
++			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
+ 		fi;\
+ 		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
+ 		cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
+@@ -1125,7 +1125,7 @@
+ 				echo  "$(CERTDIR) exists...";\
+ 			else\
+ 				echo "Creating $(CERTDIR)...";\
+-				mkdir $(CERTDIR) || exit 1;\
++				mkdir -p $(CERTDIR) || exit 1;\
+ 				chmod 755 $(CERTDIR) || exit 1;\
+ 			fi;\
+ 			echo "Installing certificates file...";\
+@@ -1146,7 +1146,7 @@
+ 			echo  "$(DESTDIR)$(SRCDIR) exists...";\
+ 		else\
+ 			echo "Creating $(DESTDIR)$(SRCDIR)/...";\
+-			mkdir     $(DESTDIR)$(SRCDIR) || exit 1;\
++			mkdir -p  $(DESTDIR)$(SRCDIR) || exit 1;\
+ 			chmod 755 $(DESTDIR)$(SRCDIR);\
+ 		fi;\
+ 		echo "Copying source files to $(DESTDIR)$(SRCDIR)...";\
+@@ -1168,7 +1168,7 @@
+ 			echo  "$(DESTDIR)$(INFODIR) exists...";\
+ 		else\
+ 			echo "Creating $(DESTDIR)$(INFODIR)/...";\
+-			mkdir     $(DESTDIR)$(INFODIR) || exit 1;\
++			mkdir -p  $(DESTDIR)$(INFODIR) || exit 1;\
+ 			chmod 755 $(DESTDIR)$(INFODIR);\
+ 		fi;\
+ 		echo "Copying text files to $(DESTDIR)$(INFODIR)...";\
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index eaee48b50531..342b6f9b9210 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,7 +1,7 @@
 DIST datovka-4.10.3.tar.xz 2554488 BLAKE2B a06c122403f7571c19abddca93e4d7270b66dbac9b86eb073634cc2c22dd26ad230ad36580b8f977e7033656d8f7066be89532c786ea554b293a2fab46309b9f SHA512 8a07c338b214bd0fdac216d6b278ebceee48aeb4df2d97a77a42f627479641d1824c5ed16f336f5da3205c46e753203aadfd0f83934b7caff4dc9c819e0cee0a
 DIST datovka-4.11.0.tar.xz 2575132 BLAKE2B c5fb753fe0a68c03571c490443428d36a76859b9be123e79a6fd32eb220f6f9f963c65e13b90e72554370c5d20bfef9fff6d47ebaa78e9865aff51d377280140 SHA512 ad245b0c2028a03690eeca6363e94852847ab20a4234aa89a4926d5727e9537e97a2dd53a6f8bfd7691e23480ab2c50ce681ffb7017a80996075bb000d6e1c5f
 DIST datovka-4.11.1.tar.xz 2583660 BLAKE2B 2d62e79c5be9d20e79d19bba43ce3d7fa8dd0b80e8bee6e63d04e63f6c878b84185b869fed1fc601f97350b499aa60041585693081e78bad5e0bc7e272aabcea SHA512 b36211b8830beb1f3a01b399303a1f2f87c77418975b007dac4b55613bdf54205eda0e7bac44d6c68e1102842eaa4231baaa46c31b99d5b6b145597f6a1366f9
-EBUILD datovka-4.10.3.ebuild 1081 BLAKE2B bbabd18fce31ecd0bd9033a59ce6740b8f3a6341d30ceba1159b7f439b258cb658dafbc42e617d30d2fee43b6c04e3b6d3174a41dacbc9400bad6438dd260ee7 SHA512 2133c2c95805f7ce88e2c05381c731db08f0b0f587938eda18d66a863c85716a1f04ee39bd9aa550371e483920222252a7d7341cd7215e35eb74403b79b6a1b2
-EBUILD datovka-4.11.0.ebuild 1083 BLAKE2B 5786e753c11d3c73611a61b2778eff825549adeb7418aefb71846f4a92ed6910136828f768eb04f7cb62313928a9cf7519e84f49fe2c1e713ae49a3897f01748 SHA512 1be92e4dbca5fa461c5df8906b7b1cf79fb86ef7478f6850db43d0629db280a22477e6d97f09f884e553011e8cc308c3458e94b09a291c84da46cb2541bc5ece
-EBUILD datovka-4.11.1.ebuild 1080 BLAKE2B bd4f51375216a6fcd0e25451a0174e2296b1499c20dca627b187a46a7fb114d72a34cb11b0f735185ec68bdfbc6a47a25be4ad37290148e32b7ddec403131e6c SHA512 498732996dc7b5b8a622d1985d6dd213791054889286f86ccf8b2180efbbda669a91b68a541eb3ba1017e733aa1365b155ad3d2ee8fbc4770ba01e734f2e783f
+EBUILD datovka-4.10.3.ebuild 1081 BLAKE2B a27635fbbcc3b4ee195a8fa0ff68589eb5fdd00f234f79567c1029138d2891ef0213dbcd898325051b3e7c87af5cd4bba98a845bb19029f9751bce02c8aa0269 SHA512 6996ec1347f64fc045412c5fb2a8aafdc543dd7d91457c9bd86ab9a50e2442aa2364fd4f1dcac5f7644ec4e0adf009d9c9359271269e9a0be0e9c13d7b049a69
+EBUILD datovka-4.11.0.ebuild 1083 BLAKE2B a4a869bb9f5c52cce582263b9804c565a8eb4698ca04f361aaf018741319dc861d29d6847b808e5a2820ca65114dd6463860990e464c61dbb90eae26e7d2157d SHA512 521ed39e272932112bccd9f18c5eed751e6d0dae210d97ce9bf6027ec72b65c3796886b3a229d6166de8c46c5f18bc101a169c6847f3ef3c64224aeafe1b38ec
+EBUILD datovka-4.11.1.ebuild 1083 BLAKE2B a4a869bb9f5c52cce582263b9804c565a8eb4698ca04f361aaf018741319dc861d29d6847b808e5a2820ca65114dd6463860990e464c61dbb90eae26e7d2157d SHA512 521ed39e272932112bccd9f18c5eed751e6d0dae210d97ce9bf6027ec72b65c3796886b3a229d6166de8c46c5f18bc101a169c6847f3ef3c64224aeafe1b38ec
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.10.3.ebuild b/app-misc/datovka/datovka-4.10.3.ebuild
index 57cd20fcd644..ed60f494f017 100644
--- a/app-misc/datovka/datovka-4.10.3.ebuild
+++ b/app-misc/datovka/datovka-4.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE=""
 QT_PV="5.3.2:5"
 
 RDEPEND="
-	>=dev-libs/openssl-1.0.2
+	>=dev-libs/openssl-1.0.2:0=
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtgui-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}
diff --git a/app-misc/datovka/datovka-4.11.0.ebuild b/app-misc/datovka/datovka-4.11.0.ebuild
index 79feb345fb84..59e45a1d68f7 100644
--- a/app-misc/datovka/datovka-4.11.0.ebuild
+++ b/app-misc/datovka/datovka-4.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE=""
 QT_PV="5.3.2:5"
 
 RDEPEND="
-	>=dev-libs/openssl-1.0.2
+	>=dev-libs/openssl-1.0.2:0=
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtgui-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}
diff --git a/app-misc/datovka/datovka-4.11.1.ebuild b/app-misc/datovka/datovka-4.11.1.ebuild
index 96259fc146fb..59e45a1d68f7 100644
--- a/app-misc/datovka/datovka-4.11.1.ebuild
+++ b/app-misc/datovka/datovka-4.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE=""
 QT_PV="5.3.2:5"
 
 RDEPEND="
-	>=dev-libs/openssl-1.0.2
+	>=dev-libs/openssl-1.0.2:0=
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtgui-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index b277bd776264..f05fb73015e8 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -2,5 +2,5 @@ AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec2575086845521
 DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
 DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
-EBUILD ddate-0.2.2.ebuild 516 BLAKE2B 703711262f7fd6e1a5e92522d78c1b10fb137f67cb849ace848e574be499c5a1b706ba50fba7bc2fbac931d6748cc59d596b7cc949c624b5d4782a789bb4b52a SHA512 cd8e63919d42f005733fdab83b1cd8be77749542352e6fea4bd35022b46a9e0cef7e11e8aeb179b535a5d83c8906ef795e32e7879e7a4e42ef9b65897df5d4aa
+EBUILD ddate-0.2.2.ebuild 515 BLAKE2B 034aa565dd58cf0f62658cfec500552cb846f0747201ca0b2d077b1253417f7e6dcd7fd8844c02644f72659a5160127de1517ce4463ddea243683825cb1679f6 SHA512 14964fa5fa21bfebf8e9255a0d26a21e9b01eacb60120cfe7ce854bef2ab80c803b35758daaf50d2e1a90c809a0af85132955fb03749efc67a010e96b119bd1c
 MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
diff --git a/app-misc/ddate/ddate-0.2.2.ebuild b/app-misc/ddate/ddate-0.2.2.ebuild
index 1b2e3b4760d6..1604d9f134c4 100644
--- a/app-misc/ddate/ddate-0.2.2.ebuild
+++ b/app-misc/ddate/ddate-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
 HOMEPAGE="https://github.com/bo0ts/ddate"
 SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="public-domain"
 SLOT="0"
 
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index c4045dd5020b..096fad34e8df 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -7,5 +7,5 @@ DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
 EBUILD geoclue-2.4.13.ebuild 1670 BLAKE2B 927f3a40e32f616621bc152ffc96d4226138e2e3c713978f73f0dc3d22b567fefec57d6a70dff61408d2c497dd8d71a5819caebbfdaeff18197b02cc6d904119 SHA512 9d6cb2985d67e0743ab603784e9154691ac9eefce5d1094213de1f36812ff3ac29946e6e9ee967b2b6dfbabcce3b78f0488ad079f98d5ed561a0eb14baf7a056
-EBUILD geoclue-2.4.8.ebuild 1595 BLAKE2B da073168dee9f469f3d4f89abfbf5b38a6a777115157956b13528c4af511a5fd10dd2e59a9af31ff65318d01fe2b398c510edd93a6acb2ded7961235733427db SHA512 5474ed354d535a1fb8f5a0558cccf8e8e063ba254d86ea44bcc4a00486aa10a4d741cf3eb9e906f500dbdb1b72ab3843c136454e269f63eab608e20fb6ffbb46
+EBUILD geoclue-2.4.8.ebuild 1594 BLAKE2B 0c55271ca750c2b6cd3d8471c7e8b9ac053781bf0f467903e67472e77476f7205af16dc93f2d878995dc3265f2f052707b0bbcf2478daa1ef8ac9f672766adaf SHA512 397335446dba393fa5b737cc274fb72eadff774c8a95635a0dca7916130091b94f24f02e304f2420b727223bc39c1ed7dda0be4f31657485734650d0ab02bf98
 MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
index 8ebbf6f9f6f3..c8aefa01ac53 100644
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection +modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 46f9f77ecebc..cc0ee0c01b9a 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -2,7 +2,9 @@ AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f54566
 DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
 DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
+DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 EBUILD gramps-4.2.5.ebuild 1336 BLAKE2B fbf43f646f953dc31e245f29e2efb6c0cbccceac8272162819aaab5363d284a821ec7220c022563085e3540c2ff23e57e766a88e74bf0dece8e7188fd5b3b4b8 SHA512 4eb326bcf7909cdf56ed57d0d97203003b34472e4c6a5c774c8b55f09afcec64ef1e3ae93acb21fff40343e78179cf5fafaa6b7d3e587636b4dfca481435cb27
 EBUILD gramps-4.2.8.ebuild 1606 BLAKE2B 8a147903eb6ae7c9d75328977b6fbab798a40ae3bb9d51fb600488f780bd3194213e949f257039c87dc8d2180bf5523dae567bb54feffa09ed36d009c02d1bd4 SHA512 f324c0791d404b280784e77edd660b313e647d3bd6d8849568b7ef13816d6329f6f340c7c4ff000f7d88c054e64511b0313cd24b492319341fa35d2babd96b7b
 EBUILD gramps-5.0.0.ebuild 1994 BLAKE2B 00994156b533444378cdc892b516d6cbabfa4467292727beeaf76e5b6313a0933c79ab03e27c2d4fd407c0a1369d63d062da1c157f7d2f3c91094e159f87fdea SHA512 72f722d1d8299196e5e686036a1c276f22b03fcaa29adc00596794056180f4004203974a4f06bd3e93576bdcb83fc7188b07318ab59d232d4fb9286684b4d77a
+EBUILD gramps-5.0.1.ebuild 1994 BLAKE2B 48f577c5ae853e4cbd0bfd170bcd5a97ca641cb0f241a0b134e3859191db3a2e6f25ae6c3d43d82ee6641b7e772698580ad8698f6396fcb6c14cc759534d40b0 SHA512 fa6bede54dabd32831281da877fef395a19fa5e493689673700785200241522f42c711265875aa0d54ef33f17609be1bc45be3239dfdb1e0835e9b16c9f49a85
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1.ebuild
new file mode 100644
index 000000000000..cbfbb66359b6
--- /dev/null
+++ b/app-misc/gramps/gramps-5.0.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 964d1b1f27de..569776d171ec 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -2,8 +2,10 @@ AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b8363
 AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c
 DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
 DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
+DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 EBUILD mc-4.8.20-r1.ebuild 2489 BLAKE2B 36736aba7e7cf3a54445d09aa3ca89940eea27f75662e338a177de584007467466f57878aeedeeab17c3de3ed99d508b571c6e17cf3668ad4c40324832479e98 SHA512 357c2fee6e10147f5b85b9dd645010f7a04365fd5f3d3b0d18fe6a25a48ec4534f492f924a869402a05072c26817bdda80b61f3c0af20f6aaa06d21376dceb0d
 EBUILD mc-4.8.20-r2.ebuild 2626 BLAKE2B 7c91fffbe41d84790039342966abc75ba05c40ddde03148493be89bdd5e1c8bef88640d8f800d10c571bdc74ee09153138d6fc06e2ec9f58657eeda21084f580 SHA512 fb5e82276dc7a1fe0e36d0f8cc2209aefebbb677e247685c918fb0ffbd36c132ef154a5e20b3dde2de4fde0adcf4afe85bc152fdb6289e186cd5dde2ca721bbb
 EBUILD mc-4.8.21.ebuild 2432 BLAKE2B a7c051633f812a0817f1fe590feece7f8926798a0e8aff4580d695fb1ecee428a82d66e269cfb3e1c3a041e1643079abd1ba30291a4f1c87e4d0e185fa31ff4f SHA512 fd97e7bf3293fb22d3dfa17cac05d2ee229fcf05c8bf496ea03e08b626abedc1e2b33b41711b38ae1c5083480682540c99064c49fc7969acbb9de3b4fd2442f5
-EBUILD mc-9999.ebuild 2677 BLAKE2B 615258f6fb5a176d5a839133f55b6f3fad98e571db13405285223228979bca96850128eca2ba9bf4df4da7a08983dcb8b4e7ee51ab7ac249e68b568f2e4bfa22 SHA512 07fd6b9559e0c72585536ecc1502ba28e988b2c7437acaa1d48f697d624afc2129f2f31c255eea08bf309dfd0d1dc93b64b88d6e71b098f296f92d1b0755e3bc
+EBUILD mc-4.8.22.ebuild 2429 BLAKE2B 5261ad2abafb3e1f3397a1c07d74adf2cf6c59c4085e5481ac8514e971492867d9a7434a5bfa99dc8823cf1520b3a39b02305d121d80d6a150dc77b95b11bb37 SHA512 de03b0544966d3ccfbf8792ee3eba005a7559813abdbfd7d1181e7609423fc5f32e2e7bb680a952a07144a3f98bff078e228ebf589bd6055f5b935fc56516e3c
+EBUILD mc-9999.ebuild 2677 BLAKE2B 343e80aaeab6142e07612d179ed6639c4a6675211351c705f2ab2e52ae2c7cd268590e144f9c8cf7a4ef2e33255c3323b31f8d3e5cd365f99483918706924990 SHA512 4af49a3dfb63f3ac62bbb05ed9d35672685dd16f14e750656d4c2b7924807d324032221c73629f854b01a6263da32ba8ed018d244e1a04146b96fec6a753fa0a
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
new file mode 100644
index 000000000000..d6f2ab5c5677
--- /dev/null
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		$(use_enable mclib)
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 3af128d35dc4..722ae657e0d8 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git"
@@ -68,7 +68,7 @@ src_configure() {
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
 		$(use_enable mclib)
 		$(use_enable nls)
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index e94b8173a5b9..8417386d9036 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,4 +1,8 @@
 DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
+DIST neofetch-5.1.0.tar.gz 115531 BLAKE2B 386544311fb3a46571791a7c61ee4657e155912add68172dd2c9fa59d6deb0f246b2a0880e00c31c422781ae765fe555c3f82aa2e7f93606419b2cd49f69a902 SHA512 a30ec9c0b5971f89e487a3d7f5a09b3a379cf2c1770abed82efcf2943dcea2640786d4adb276b3125e161bdf3aedee1549dd82ff05addb061479e5dc9afe99d7
+DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B 71422cd78067ef24294890b0df2b5e658403d32dc2cbc1e451c9c235bdc179c11acf362d80168ece7b0aac2926e7c7fe91a0e21f173c462689035b260472e274 SHA512 5b584d0085c16606b7322121cee1b6f3805993bc7ea667659f2eb91ea1ec72e6ad00d5feb64460ff08dd1bdd2cf40d4c3f1a1eb30b9dbf0919e39024ab4381c7
-EBUILD neofetch-9999.ebuild 648 BLAKE2B 05e30152c4f705eff009e3c87c44f4b9f1979e471c62edd347a33e44b9ecc33961a4049e2b7e419528d82c88a02aec7b2e24018e48232aae336569584e98f62d SHA512 62c141cc2bc888c346d4dfc6e79e014a62472cc7e3be32c71b46b2688f0da58f1acd765de5c38093eebb37700370318f3e2bd338882acc61e35ee5ac31b534b4
+EBUILD neofetch-5.1.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
+EBUILD neofetch-6.0.0.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
+EBUILD neofetch-9999.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-5.1.0.ebuild b/app-misc/neofetch/neofetch-5.1.0.ebuild
new file mode 100644
index 000000000000..45192c9d63c8
--- /dev/null
+++ b/app-misc/neofetch/neofetch-5.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
new file mode 100644
index 000000000000..45192c9d63c8
--- /dev/null
+++ b/app-misc/neofetch/neofetch-6.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+	X? (
+		media-gfx/imagemagick
+		media-libs/imlib2
+		www-client/w3m[imlib]
+		x11-apps/xprop
+		x11-apps/xrandr
+		x11-apps/xwininfo
+	)"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 4757864917ab..45192c9d63c8 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index 0b66878b9354..d811aa5b9faf 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,7 +1,9 @@
 DIST nnn-1.9.tar.gz 43405 BLAKE2B c085f13883eb379cc04b225d3a6bdbc95dcfb200a0c338bea82b64841918f41560a0b53ed49be0cf8eaec852eb1575d050197ece197fd655c2a3ba1c6cf20d57 SHA512 44eb3d569429ee27e35c0a1299e7cb248072b470b462a361eec3364163f03f577a1b28819cddfc9a85002d6ae90c61cc0633f0548c58cb154dfd8e6491c73369
 DIST nnn-2.0.tar.gz 45791 BLAKE2B dd6eb88302d39b1d5f321b3fa3a19f97c70477178f7c5678433be47fb8091ba6fa5b78f99dc2e15fb8d2c46fc012bab86b3b3ae1dd162357589e0926ed126d55 SHA512 73d6c0747461648e01b8145451a14a531002e0d005c59a3bef9d6d1a6cfc4ba7210a15879e92037af2c0e1d4c728b9c30894d7b029dedb2925634b4925ce2d72
 DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c4ca4c2b960b2bab8833b9f8f1bfafb6d2cc2257730ebe1b3a80e0a253d81f154580888517fbfc50341 SHA512 4ce20944df613706545cffb70896b9c494ed0304a591b1ffdae4886ac3783c2c1ab321b336b9873bd8b1382bc9c6ae8e0226f7abb98fb461ed64b28e1302d8f2
+DIST nnn-2.2.tar.gz 50955 BLAKE2B 010b68c20e7ce4ccc8df65192d7be0a76cb5a84973093dc97bd853a7f525904157d59f5db96ab0dd690c7fd340a90e8aab222003d51ceb8de8febebe62ba1c49 SHA512 0144c9f9c29c2ff3818cf14532354e8182f872580ce7c5a06ab8595b4354edc3a4ede3afc667cd0561a3de4d2f34965a9c057f7ac9555d86feff83abaaca5793
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
+EBUILD nnn-2.2.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.2.ebuild b/app-misc/nnn/nnn-2.2.ebuild
new file mode 100644
index 000000000000..8caa1e33b705
--- /dev/null
+++ b/app-misc/nnn/nnn-2.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index 5d65a89bccbe..c851d63e0065 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -30,5 +30,5 @@ DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD skim-0.5.2.ebuild 1453 BLAKE2B ef507de64a7662c061c7fdfab0d6fb60d8c2c92b772ca180e2f32a610740513f8986a0f1fc6616e356fd7d9cbdeb5ee1309a596de6a38e1de972010abb38b7bc SHA512 c724d955573262ebf63c24e2269ea4186e66304ea3dfa8c6c1d9f6e4f7f7c82dd7289b9e20b135664c312a49bd57318fbdcd2ccd8db67a6d8068e4e45ab1ae05
+EBUILD skim-0.5.2.ebuild 1353 BLAKE2B b9ce81124e4cceb55af348e45105bb5cc55ff1e21270534dc2e4fe2ce339717129e9e9d82380a3503aedfcb19106959cd0684ba41f0b06788baf8e7778077c67 SHA512 ee1d0d208c8b887487ad9e09a9ad3f144bb9838108036901495623682d4f5493082f5c4355798b83e14112903132b245df95eb46a9e4909552fbf40d0b0fb734
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.5.2.ebuild b/app-misc/skim/skim-0.5.2.ebuild
index ce539d637b2e..cc317a2e0812 100644
--- a/app-misc/skim/skim-0.5.2.ebuild
+++ b/app-misc/skim/skim-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2018 Gentoo Authors
+# Copyright 2017-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,10 +55,6 @@ RDEPEND="
 	vim? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
-src_test() {
-	cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "tests failed"
-}
-
 src_install() {
 	cargo_src_install
 	dodoc CHANGELOG.md README.md
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 0a8c637f6556..1a221a42e675 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -3,6 +3,6 @@ AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd
 DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
 EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
-EBUILD sphinx-2.2.11-r1.ebuild 2760 BLAKE2B 7cf7e92bae36294dac36a9c05d5696cb7baad3d2bdb3849521dc6935cc2a2b5c31bd25795249c11121aa12298d06068eca9d1b7705459e335de3f6014f323e31 SHA512 cd7e8a48b32cc96b6ea244164367e7e4d8b37216d6fbcdf11d16a0f44585961245bd76b890ac9aab75d6fe9559de85d58a2e6ef21c63d5c9f169fb80fb0a7cf4
+EBUILD sphinx-2.2.11-r1.ebuild 2773 BLAKE2B e9d0bb5f8dade5b9802160be4477b7d514f372357816607fd15ef497d9f9bb82b9b0a44d8a657a9219280113d7abed9fc1599f86027a312f2d2faf8ab8d7646f SHA512 20e0e2819a83b609623dc62887f09d9ea1a6eb93a533370f8f8b21ebcebb1869839171e238b0bedffda722e405d0ffb140dc5d31d22d8bef770a6737840c635f
 EBUILD sphinx-2.2.11.ebuild 2403 BLAKE2B d48c34fd604e6df0c652845bedb1f2c35046c1db6601ed995602fbfbd042a035d7296c1824eb29cd611d35408d821fb2c3cfb75b14ed87c865d416fe8806ac8a SHA512 6be2c83feb3edfa0c4b8fc80311fcf17099215da2006e706df7c5f556b248bcd269fa9f5aa752d0466c5bb6cdf656af0c4562ef9783c40bcbe84207b7a264585
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index 10d20cfd5fc0..b3133ba92eb8 100644
--- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 
 REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
diff --git a/app-misc/tkpasman/Manifest b/app-misc/tkpasman/Manifest
index 0f1cceb0d414..4bccf570fa05 100644
--- a/app-misc/tkpasman/Manifest
+++ b/app-misc/tkpasman/Manifest
@@ -1,4 +1,4 @@
-AUX tkpasman-2.2a-gentoo.patch 771 BLAKE2B 3ac72ed705357db279e5584412146c8a1e8079dca474bb679df89e46ea5e144978b4e6d9d7bc4a987cc9283e1fa22e57296304e018e4ebcac225915500f4d14b SHA512 6d0fca1b86d5e3a980245510ff98979ef4f9cd85cfdee6fee37e19b83824471fbf8154768ad8921d1ea9bced218c5b2a117022907c81f1775d332530680ea260
+AUX tkpasman-2.2a-gentoo.patch 703 BLAKE2B ec2580c2aea4d421197a71b043a76c72bfadbc6c5f0a9110f564f72704fe52d29e79404605dbebcef66810fbefc776ae9c9128035e42980b01a003354eec33a9 SHA512 af303de46041774aa6c95c8b69b7cc656e4c9b5bc9b199e13fe0b23c1a4ffa1ad67ec587fd8784395eeb571aa90175d7415fed0f463c3d7e71d0da044be0786c
 DIST TkPasMan-2.2b.tar.gz 31365 BLAKE2B 46588abfdc321b0b57da94b585c3bdc1ec724c8f30f6275aa428c0b5ee21b8ba486a0ac927f8062ff0ed38418933351346d4f44062b601355ee677f0ad1b3a6e SHA512 ca74ed6a5989c21b266ff4bed00963d46eb05e1a7a0822dceeae5c87bcbb7bf36a775eedf86244fa1121008a6df59fa38003e07e8cb6e4ddf98c895b61f24f12
-EBUILD tkpasman-2.2b.ebuild 784 BLAKE2B ab79f669c7e99180d4f0a505033d2ccb1c6b4b9d77f0d917b3a05fa60252e717ffeb3730401d28eb28119ef55a46a25beaaf70e2307ee775f5d92d4eee9e11a9 SHA512 6eacde9f32fd49c317705d52b21a24f936b7ff590c3648d5a456efea94a37fa70fbdb208e8f26b6efc0b507f90585c68f14a0263ec11617e36a1438b58e7c6ae
+EBUILD tkpasman-2.2b.ebuild 785 BLAKE2B f74df278645edd4f6f7a0ac18ef51220e0ba718155b84432719e04847ae782ba564cf716748f42b00b1e02656cd7903f302f29bd20083f31cc862e3bd1f9b89d SHA512 9a1c33aaada4fc755c21f6618f5ef8f73a393e890acc8f1ebeedf94a1832e14603fa6b81b441d7f73ffccc3d21675792dd0e42fb320f43c86f18bf3a54796e52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
index d52d5129b7c7..7fc54fe2b831 100644
--- a/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
+++ b/app-misc/tkpasman/files/tkpasman-2.2a-gentoo.patch
@@ -1,5 +1,5 @@
---- build.sh	2005-01-01 19:18:44.290385166 +0000
-+++ build.sh	2005-01-01 19:22:45.846161383 +0000
+--- a/build.sh
++++ b/build.sh
 @@ -44,8 +44,8 @@
  #
  # Try to find wish8.3, tclsh8.3 and openssl
diff --git a/app-misc/tkpasman/tkpasman-2.2b.ebuild b/app-misc/tkpasman/tkpasman-2.2b.ebuild
index d731fe173f99..009b2731e9b5 100644
--- a/app-misc/tkpasman/tkpasman-2.2b.ebuild
+++ b/app-misc/tkpasman/tkpasman-2.2b.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 MY_P="TkPasMan-${PV}"
 
@@ -20,13 +18,17 @@ DEPEND="
 	>=dev-lang/tcl-8.3:0=
 	>=dev-lang/tk-8.3:0="
 RDEPEND="${DEPEND}
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2a-gentoo.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2a-gentoo.patch
+	default
 
 	if use ssl; then
 		sed -i "s:^USE_OPENSSL=true:USE_OPENSSL=false:g" config || die
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index 415897ff69ab..4b57cfaf1a83 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,6 +1,6 @@
 DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 BLAKE2B b21a2065ba7a7832238cb6b6bbfe3e730593766a34244e139d0e357cad538a4462e68a9e884a6250fc72a10a775fa13e53054618c35804cc05ad0cc31854d9e3 SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7
 DIST tmate-2.2.0.tar.gz 610793 BLAKE2B febe2ed652e8387f65d938f09c6abbd92841a71a285035f6322bcf786aa4f80f71a0f49fc475743a8565bf4c7e434d9f503ffc6bae26d531429b1c58bc0ffbe9 SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338
 DIST tmate-2.2.1.tar.gz 610745 BLAKE2B 8a97d7726b528d12e14c74c07f795b18510a4b7a0068f1e1168b06e2a6856945518b3b9a35f71ba8598b8f9390d754443eca197f95f5c9c61d6160f4008ff65d SHA512 3d4ce7510cd8da39bc4fe63f2a64179846a813bb3560ca811d9e1e2a28b06d95a9033047a900d76bda069c249d7ebbe1143daa082b23212c5d32a50bf1819d2d
-EBUILD tmate-2.2.0-r1.ebuild 1192 BLAKE2B 761449c113afa1de7693e30a940eb3a9097b4a4e6c35cdf4c22f156cf7eb0c7d8b8abc7817f3c56f686ff68c4d9a1fff661eb9c3dbdadd81ec17f6a1b3063e27 SHA512 d8342c3932a874f952f6ce3cd1467261255b215059125ff8c638ed3eef806112d3051a2d2f7302dd4f8897c4c6ea48c111d5ddb2266d01db5354a34dfe6ced85
-EBUILD tmate-2.2.1.ebuild 1191 BLAKE2B f3f4e256431b130809a1085e875db05efa6a51ac173c7d5c538a8a4a5253c612b19738accbb320510de5e1e8dac46e2680965b0c8802697b0ae8e973f0f99695 SHA512 159e4e6a3d6d49253bb4c78a285c714c30d93b5753c20880195be487ab04edbd42f8abaec277e0c8f2297302696148892cc364574d0b26445aeabd291be75b24
+EBUILD tmate-2.2.0-r1.ebuild 1192 BLAKE2B f3af176ed3e72e976801e6710aa09e4fd3c1ec0ac9dcf2f7d287263c69339a03c36ec82bb31fc5bafd3b83966d392f6d1f57eff6277048669723c833c1558777 SHA512 3c37820c3ad97c90fed4a3cce146ef302dfe1f6eb00615cfe9eb8ec3e2de900caa59587136155ed2ae64e86a2c3ab3ac90a15c73f57e704bf853cf3649eee1d2
+EBUILD tmate-2.2.1.ebuild 1191 BLAKE2B 29f44defa32bc9a39e9f6122cfb2362ca8935918f23e2154edc514b67fa55807fa81b3c3c5a1bc1278ff852f0a6ef28f0b1883c2a635ef0743a6c008fcf5d788 SHA512 33df330f7aef0168a338d48a51e57066d304b100046bca6fa02b239712e58063bf6990dce9d60c0be75abaf85ed61f409cac3dc775afe0a2b575744f0b03b785
 MISC metadata.xml 329 BLAKE2B 4b983e08fb7a5704f11c7e07e91a322258b128d5a2826fbea1f62718b83daf71552d63304df6e0995a68ce33e05bf3e276aded270a004a95a43fc8f98501744d SHA512 0097a64f483d6b8a24bfa5006f6df9dbeb697ee04152f5451111449d69d54813ff6f474e8fc91b33a2db2e0ba6ad85d25b359ef6684a74c884d2bcf16cfa9e75
diff --git a/app-misc/tmate/tmate-2.2.0-r1.ebuild b/app-misc/tmate/tmate-2.2.0-r1.ebuild
index 37f0c9a8caea..22a9a0bf3174 100644
--- a/app-misc/tmate/tmate-2.2.0-r1.ebuild
+++ b/app-misc/tmate/tmate-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 RDEPEND="
 	sys-libs/zlib[static-libs?]
 	sys-libs/libutempter[static-libs?]
-	dev-libs/openssl[static-libs?]
+	dev-libs/openssl:0=[static-libs?]
 	dev-libs/libevent[static-libs?]
 	dev-libs/msgpack[static-libs?]
 	>=net-libs/libssh-0.6.0[static-libs?]
diff --git a/app-misc/tmate/tmate-2.2.1.ebuild b/app-misc/tmate/tmate-2.2.1.ebuild
index 0afcb394d3f3..f4cfc6999c04 100644
--- a/app-misc/tmate/tmate-2.2.1.ebuild
+++ b/app-misc/tmate/tmate-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 RDEPEND="
 	sys-libs/zlib[static-libs?]
 	sys-libs/libutempter[static-libs?]
-	dev-libs/openssl[static-libs?]
+	dev-libs/openssl:0=[static-libs?]
 	dev-libs/libevent[static-libs?]
 	dev-libs/msgpack[static-libs?]
 	>=net-libs/libssh-0.6.0[static-libs?]
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 12a41209c6c3..62627b64f7e9 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index e0baa7c705bb..dc6cc9666e60 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,9 +1,14 @@
 AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
+AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d5e97cc0e3f6e97e8b5e6f9c6c46f80e49b1e85e052dc16831aaf0a2b70abd9ecb4fa787bcefdeb2685c72dc59f2ea0ef SHA512 582d5e532ab237ee3f4bb87b12e47272d27f8c57448056a8900df7a76b38e8831dd2d352e0d4a3eb6bd1d651c5a34a7714a307c32ed218ce225ac17723615479
 AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d
+AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
+AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917
+AUX calligra-3.1.0-poppler-0.72.patch 2053 BLAKE2B 1a69315b986aeb2464a57c5fdb63e2d0c33cb256be64c868af666169ab693109c45ad0ed15f35639020e2e1eb707592694b07896dced4f364e0cff817ce3190a SHA512 216eb134eb24f10492581a30dacd7e7b8259cdac3d6f21423cc773b1752a8464eabb15c6263c5bbe4e8e741cf1e02db07e854b4f2113399773ad6c56025fe1b9
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
 AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 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.1.0-r2.ebuild 6841 BLAKE2B 08d6ba5579bec64f7fe865ecd47678cec0d85829063f4e8578792bf79a5a288943a6bd42fead2a557c8dc594676a8c04afe07f75762b40bc6de12957a9b3072b SHA512 1e0fdf8cc1a2b75320671be47eea2982aefaf108d158fa998d1b1a3a07e1e3332bd671075df281aa0ae34eb22fd2bc8c55f591f49fc7dec3f8b78b58555273f1
+EBUILD calligra-3.1.0-r3.ebuild 5738 BLAKE2B f4d518cd1d7556ea5685681e74da885baf760613a1ceb0f281d61402b3134537ae78938fa5fbb91e27c60404e0ca5f1cadee6d90a98ff69b61df46bfabd08308 SHA512 e3e4bd0fb709f2affe5a0f3433a67c17a606f365c39ae792cd98eb2facf68489ed4b8f53c78e87d500a7b3dce67ab3c6178b639a5d7e4ce839e5f2d927655386
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
new file mode 100644
index 000000000000..766e2b2b60aa
--- /dev/null
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_DOC_DIR="xxx" # contains no language subdirs
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit check-reqs kde5
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CAL_FTS=( karbon sheets stage words )
+
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
+	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+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-0.64:=[qt5] )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	pim? ( $(add_kdeapps_dep kcalcore) )
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
+	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
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-stage-qt-5.11.patch
+	"${FILESDIR}"/${P}-poppler-0.69.patch
+	"${FILESDIR}"/${P}-poppler-0.71.patch
+	"${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+	"${FILESDIR}"/${P}-no-webkit.patch
+)
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde5_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	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
+
+	# 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_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 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)
+		-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_features_stage)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
new file mode 100644
index 000000000000..f126e2e51386
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch
@@ -0,0 +1,70 @@
+From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Mon, 22 Oct 2018 09:41:53 +0200
+Subject: Stage does not use WebKit, so remove
+
+---
+ CMakeLists.txt            | 21 +--------------------
+ stage/part/CMakeLists.txt |  1 -
+ 2 files changed, 1 insertion(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b148c0..1e29140 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
+         Quick
+         QuickWidgets
+         Sql
+-        WebKit
+-#         WebKitWidgets
+-)
+-message("**********************************************************************************************************************")
+-message("**********************************************************************************************************************")
+-message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.")
+-message("**********************************************************************************************************************")
+-message("**********************************************************************************************************************")
++)
+ 
+ # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
+ # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
+@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES
+     PURPOSE "Required for Braindump's Web shape"
+     TYPE OPTIONAL
+ )
+-set_package_properties(Qt5WebKitWidget PROPERTIES
+-    PURPOSE "Required for Stage"
+-    TYPE RECOMMENDED
+-)
+-
+-if(Qt5WebKit_FOUND)
+-    add_definitions( -DCAN_USE_QTWEBKIT )
+-endif()
+ 
+ set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
+ 
+@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF
+     Soprano_FOUND "Soprano not found"
+     )
+ 
+-# calligra_drop_product_on_bad_condition( PART_STAGE
+-#     Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found"
+-# )
+-
+ calligra_drop_product_on_bad_condition( PART_SHEETS
+     EIGEN3_FOUND "Eigen devel not found"
+     )
+diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
+index d6000a1..9bdc840 100644
+--- a/stage/part/CMakeLists.txt
++++ b/stage/part/CMakeLists.txt
+@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate
+         KF5::IconThemes
+         KF5::Completion
+         Qt5::Svg
+-#         Qt5::WebKitWidgets
+ )
+ if(HAVE_OPENGL)
+     target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL)
+-- 
+cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
new file mode 100644
index 000000000000..c82fbd242b8a
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.69.patch
@@ -0,0 +1,83 @@
+From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 24 Oct 2018 08:28:00 +0200
+Subject: Fix build with poppler>=0.69
+
+Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
+
+Differential Revision: https://phabricator.kde.org/D16388
+---
+ filters/karbon/pdf/PdfImport.cpp    | 3 ---
+ filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
+ filters/karbon/pdf/SvgOutputDev.h   | 2 +-
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
+index c3e96b0..48b08df 100644
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+     delete globalParams;
+     globalParams = 0;
+ 
+-    // check for memory leaks
+-    Object::memCheck(stderr);
+-
+     return KoFilter::OK;
+ }
+ 
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 931917a..7901317 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
+            .arg(matrix.dx()) .arg(matrix.dy());
+ }
+ 
+-QString SvgOutputDev::convertMatrix(double * matrix)
++QString SvgOutputDev::convertMatrix(const double * matrix)
+ {
+     return QString("matrix(%1 %2 %3 %4 %5 %6)")
+            .arg(matrix[0]).arg(matrix[1])
+@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+ 
+     QString str;
+ 
+-    char * p = s->getCString();
++    const char * p = s->getCString();
+     int len = s->getLength();
+     CharCode code;
+     Unicode *u = nullptr;
+@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
+     double x = state->getCurX();
+     double y = state->getCurY();
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
+ 
+     QMatrix mirror;
+@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+         return;
+     }
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix m;
+     m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
+ 
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 85fe55d..2a44908 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -84,7 +84,7 @@ public:
+ private:
+     QString convertPath(GfxPath *path);
+     QString convertMatrix(const QMatrix &matrix);
+-    QString convertMatrix(double * matrix);
++    QString convertMatrix(const double * matrix);
+     QString printFill();
+     QString printStroke();
+ 
+-- 
+cgit v1.1
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
new file mode 100644
index 000000000000..6b50e3a42ed0
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.71.patch
@@ -0,0 +1,202 @@
+From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:04:39 +0200
+Subject: Mark the functions as override
+
+So when poppler API breaks (as it often does) it stops compiling and
+someone has to fix it
+
+From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 25 Oct 2018 23:06:34 +0200
+Subject: GBool -> bool
+
+It was just a typedef in poppler and it'll die in next versions
+
+From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 2 Nov 2018 21:23:13 +0100
+Subject: Fix build with poppler 0.71
+
+Port away from removed API
+
+diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -39,7 +39,7 @@
+ {
+ public:
+     Private(const QString &fname)
+-            : svgFile(fname), defs(0), body(0), state(gTrue)
++            : svgFile(fname), defs(0), body(0), state(true)
+             , brush(Qt::SolidPattern) {}
+ 
+     ~Private() {
+@@ -52,7 +52,7 @@
+     QString defsData;
+     QTextStream * defs;
+     QTextStream * body;
+-    GBool state;
++    bool state;
+     QSizeF pageSize;
+     QPen pen;
+     QBrush brush;
+@@ -62,7 +62,7 @@
+         : d(new Private(fileName))
+ {
+     if (! d->svgFile.open(QIODevice::WriteOnly)) {
+-        d->state = gFalse;
++        d->state = false;
+         return;
+     }
+ 
+@@ -75,24 +75,24 @@
+     delete d;
+ }
+ 
+-GBool SvgOutputDev::isOk()
++bool SvgOutputDev::isOk()
+ {
+     return d->state;
+ }
+ 
+-GBool SvgOutputDev::upsideDown()
++bool SvgOutputDev::upsideDown()
+ {
+-    return gTrue;
++    return true;
+ }
+ 
+-GBool SvgOutputDev::useDrawChar()
++bool SvgOutputDev::useDrawChar()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+-GBool SvgOutputDev::interpretType3Chars()
++bool SvgOutputDev::interpretType3Chars()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+ void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
+@@ -387,7 +387,7 @@
+     return stroke;
+ }
+ 
+-void SvgOutputDev::drawString(GfxState * state, GooString * s)
++void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ {
+     int render = state->getRender();
+     // check for invisible text -- this is used by Acrobat Capture
+@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             int *maskColors, GBool /*inlineImg*/)
++                             bool /*interpolate*/, int *maskColors, bool inlineImg)
+ {
+     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+     imgStr->reset();
+@@ -550,7 +549,0 @@
+-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+-                             int width, int height, GfxImageColorMap *colorMap,
+-                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
+-{
+-    drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+-}
+-
+
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -20,11 +20,6 @@
+ #ifndef SVGOUTPUTDEV_H
+ #define SVGOUTPUTDEV_H
+ 
+-// Don't show this warning: it's an issue in poppler
+-#ifdef __GNUC__
+-#pragma GCC diagnostic ignored "-Wunused-parameter"
+-#endif
+-
+ #include <poppler/Object.h>
+ #include <poppler/OutputDev.h>
+ 
+@@ -44,40 +44,37 @@
+     explicit SvgOutputDev(const QString &fileName);
+     virtual ~SvgOutputDev();
+ 
+-    GBool isOk();
++    bool isOk();
+ 
+-    virtual GBool upsideDown();
+-    virtual GBool useDrawChar();
+-    virtual GBool interpretType3Chars();
+-    virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+-    virtual void endPage();
++    bool upsideDown() override;
++    bool useDrawChar() override;
++    bool interpretType3Chars() override;
++    void startPage(int pageNum, GfxState *state, XRef *xref) override;
++    void endPage() override;
+ 
+     // path painting
+-    virtual void stroke(GfxState * state);
+-    virtual void fill(GfxState * state);
+-    virtual void eoFill(GfxState *state);
++    void stroke(GfxState * state) override;
++    void fill(GfxState * state) override;
++    void eoFill(GfxState *state) override;
+ 
+     // text
+-    virtual void drawString(GfxState * state, GooString * s);
++    void drawString(GfxState * state, const GooString * s) override;
+ 
+     // images
+-    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
++    void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           int *maskColors, GBool inlineImg);
+-    virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+-                           int width, int height, GfxImageColorMap *colorMap,
+-                           GBool interpolate, int *maskColors, GBool inlineImg);
++                           bool interpolate, int *maskColors, bool inlineImg) override;
+ 
+     // styles
+-    virtual void updateAll(GfxState *state);
+-    virtual void updateFillColor(GfxState *state);
+-    virtual void updateStrokeColor(GfxState *state);
+-    virtual void updateFillOpacity(GfxState *state);
+-    virtual void updateStrokeOpacity(GfxState *state);
+-    virtual void updateLineJoin(GfxState *state);
+-    virtual void updateLineCap(GfxState *state);
+-    virtual void updateMiterLimit(GfxState *state);
+-    virtual void updateLineWidth(GfxState *state);
++    void updateAll(GfxState *state) override;
++    void updateFillColor(GfxState *state) override;
++    void updateStrokeColor(GfxState *state) override;
++    void updateFillOpacity(GfxState *state) override;
++    void updateStrokeOpacity(GfxState *state) override;
++    void updateLineJoin(GfxState *state) override;
++    void updateLineCap(GfxState *state) override;
++    void updateMiterLimit(GfxState *state) override;
++    void updateLineWidth(GfxState *state) override;
+ 
+     /// Dumps content to svg file
+     void dumpContent();
+--- a/filters/karbon/pdf/PdfImport.cpp
++++ b/filters/karbon/pdf/PdfImport.cpp
+@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
+     SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
+     if (dev->isOk()) {
+         int rotate = 0;
+-        GBool useMediaBox = gTrue;
+-        GBool crop = gFalse;
+-        GBool printing = gFalse;
++        bool useMediaBox = true;
++        bool crop = false;
++        bool printing = false;
+         pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
+         dev->dumpContent();
+     }
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
new file mode 100644
index 000000000000..3b2e690257be
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.72.patch
@@ -0,0 +1,54 @@
+From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" <tcberner@FreeBSD.org>
+Date: Mon, 7 Jan 2019 19:50:48 +0100
+Subject: [PATCH] Make compatible with poppler 0.72
+
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 4a1fad6bbcf..b1d4ea2d427 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -25,6 +25,7 @@
+ #include <poppler/GfxState.h>
+ #include <poppler/Stream.h>
+ #include <poppler/GfxFont.h>
++#include <poppler/glib/poppler-features.h>
+ 
+ #include <QFile>
+ #include <QTextStream>
+@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ 
+     QString str;
+ 
++#if POPPLER_CHECK_VERSION(0,72,0)
++    const char * p = s->c_str();
++#else
+     const char * p = s->getCString();
++#endif
+     int len = s->getLength();
+     CharCode code;
+     Unicode *u = nullptr;
+@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+     *d->body << " y=\"" << y << "px\"";
+ 
+     if (font && font->getFamily()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++#else
+         *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
++#endif
+         //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
+     } else if (font && font->getName()) {
++#if POPPLER_CHECK_VERSION(0,72,0)
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++#else
+         *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
++#endif
+         //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
+     }
+     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+-- 
+2.20.1
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
new file mode 100644
index 000000000000..8fe36d7b460d
--- /dev/null
+++ b/app-office/calligraplan/Manifest
@@ -0,0 +1,5 @@
+AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c
+AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10
+DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
+EBUILD calligraplan-3.1.0.ebuild 2733 BLAKE2B fab64b817ba416775901ffa2615a7c9917b4105b9753fdaf2ed02da7f597e7c840173093db27fa31556cead1f6bf2590aab3d6f5c11be63adffc5e10c86bc07c SHA512 d134ca1bee68974627e8bf1ec9259cbdc62ab164801c2895a1c2532ff2a30f64723bf5fbe5051b4d4da6e53c7181c9d637f4139edfb13abbb3a1202ec8a2b4dc
+MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02
diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild b/app-office/calligraplan/calligraplan-3.1.0.ebuild
new file mode 100644
index 000000000000..1ee634ee1769
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/"
+SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities +holidays kwallet pim X"
+
+# 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
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(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_qt_dep designer)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-lang/perl
+	dev-libs/kdiagram:5
+	sys-libs/zlib
+	activities? ( $(add_frameworks_dep kactivities) )
+	holidays? ( $(add_frameworks_dep kholidays) )
+	kwallet? (
+		$(add_frameworks_dep kwallet)
+		app-crypt/qca:2[qt5(+)]
+	)
+	pim? (
+		$(add_kdeapps_dep kcalcore)
+		$(add_kdeapps_dep kcontacts)
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!app-office/calligra[calligra_features_plan(-)]
+	!app-office/calligra-l10n:4
+	$(add_qt_dep qtsvg)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qt-5.11.patch
+	"${FILESDIR}"/${P}-qca.patch
+)
+
+src_prepare() {
+	kde5_src_prepare
+	# Unconditionally disable deprecated deps
+	punt_bogus_dep Qt5 OpenGL
+	# FIXME: disable bogus deps
+	punt_bogus_dep KF5 KCMUtils
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep Qt5 Svg
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package holidays KF5Holidays)
+		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		$(cmake-utils_use_find_package pim KF5Contacts)
+		$(cmake-utils_use_find_package kwallet Qca-qt5)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+	)
+	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+	kde5_src_configure
+}
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
new file mode 100644
index 000000000000..213cc9935bea
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
@@ -0,0 +1,127 @@
+From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 1 Jan 2019 19:19:19 +0100
+Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
+ optional
+
+---
+ CMakeLists.txt                | 18 +++++++++++++++++-
+ src/libs/store/CMakeLists.txt | 15 +++++++--------
+ 2 files changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eed9d3c..3cb4b63 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+             Parts
+ #             Sonnet
+             TextWidgets
+-            Wallet
+             WidgetsAddons
+             WindowSystem
+             XmlGui
+@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
+         TYPE REQUIRED
+     )
+ 
++##
++## Test for QCA2
++##
++macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
++set_package_properties(Qca-qt5 PROPERTIES
++    DESCRIPTION "Qt Cryptographic Architecture"
++    URL "https:/download.kde.org/stable/qca-qt5"
++    PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
++    TYPE OPTIONAL
++)
++
++find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
++
++if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
++    add_definitions( -DQCA2 )
++endif()
++
+     find_package(Perl REQUIRED)
+     find_package(ZLIB REQUIRED)
+ 
+diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
+index 2c96fa7..f998264 100644
+--- a/src/libs/store/CMakeLists.txt
++++ b/src/libs/store/CMakeLists.txt
+@@ -4,14 +4,8 @@ endif()
+ 
+ ########### libkostore ###############
+ 
+-if( Qca-qt5_FOUND )
+-    add_definitions( -DQCA2 )
+-endif()
+-
+ set(kostore_LIB_SRCS
+     KoDirectoryStore.cpp
+-    KoEncryptedStore.cpp
+-    KoEncryptionChecker.cpp
+     KoLZF.cpp
+     KoStore.cpp
+     KoStoreDevice.cpp
+@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
+     StoreDebug.cpp
+     KoNetAccess.cpp # temporary while porting
+ )
++if( Qca-qt5_FOUND )
++    set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
++        KoEncryptedStore.cpp
++        KoEncryptionChecker.cpp
++    )
++endif()
+ 
+ add_library(planstore SHARED ${kostore_LIB_SRCS})
+ generate_export_header(planstore BASE_NAME kostore)
+@@ -35,12 +35,11 @@ target_link_libraries(planstore
+     PRIVATE
+         Qt5::Gui
+         KF5::Archive
+-        KF5::Wallet
+         KF5::KIOWidgets
+         KF5::I18n
+ )
+ if( Qca-qt5_FOUND )
+-    target_link_libraries(planstore PRIVATE qca-qt5)
++    target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
+ endif()
+ 
+ set_target_properties(planstore PROPERTIES
+diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
+index 1615a61..55e2c32 100644
+--- a/src/libs/widgets/KoDocumentInfoDlg.cpp
++++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
+@@ -26,7 +26,9 @@
+ #include "KoDocumentInfo.h"
+ #include "KoDocumentBase.h"
+ #include "KoGlobal.h"
++#ifdef QCA2
+ #include <KoEncryptionChecker.h>
++#endif
+ #include "KoPageWidgetItem.h"
+ //#include <KoDocumentRdfBase.h>
+ #include <KoIcon.h>
+@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
+     d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
+     QWidget *infodlg = new QWidget();
+     d->aboutUi->setupUi(infodlg);
++#ifdef QCA2
+     if (!KoEncryptionChecker::isEncryptionSupported()) {
++#endif
+         d->aboutUi->lblEncryptedDesc->setVisible(false);
+         d->aboutUi->lblEncrypted->setVisible(false);
+         d->aboutUi->pbEncrypt->setVisible(false);
+         d->aboutUi->lblEncryptedPic->setVisible(false);
++#ifdef QCA2
+     }
++#endif
+     d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
+     d->aboutUi->cbLanguage->setCurrentIndex(-1);
+ 
+-- 
+2.20.1
+
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..584d14e447e7
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
@@ -0,0 +1,124 @@
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #calligra:_3.0
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
+---
+ src/kptview.h                                         | 1 +
+ src/kptviewlist.cpp                                   | 1 +
+ src/libs/ui/kptaccountseditor.cpp                     | 1 +
+ src/libs/ui/kptdocumentspanel.h                       | 1 +
+ src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
+ src/libs/ui/kpttaskeditor.cpp                         | 1 +
+ src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/kptview.h b/src/kptview.h
+index 44d11935e71..a98e55342db 100644
+--- a/src/kptview.h
++++ b/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+ 
++#include <QActionGroup>
+ #include <QDockWidget>
+ #include <QMap>
+ 
+diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
+index f34e702e055..0e6db7b2ffe 100644
+--- a/src/kptviewlist.cpp
++++ b/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include <QStyle>
+ #include <QBrush>
+ #include <QContextMenuEvent>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ #include <kmessagebox.h>
+diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
+index 7991fafd779..54e3a87c94f 100644
+--- a/src/libs/ui/kptaccountseditor.cpp
++++ b/src/libs/ui/kptaccountseditor.cpp
+@@ -40,6 +40,7 @@
+ #include <QContextMenuEvent>
+ #include <QMenu>
+ #include <QAction>
++#include <QHeaderView>
+ 
+ #include <KLocalizedString>
+ #include <kactioncollection.h>
+diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
+index 00ea3af80b2..491cb1ebb86 100644
+--- a/src/libs/ui/kptdocumentspanel.h
++++ b/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+ 
+ #include "kptdocuments.h"
+ 
++#include <QModelIndexList>
+ #include <QWidget>
+ #include <kundo2qstack.h>
+ 
+diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1fc157..7c97a070b9a 100644
+--- a/src/libs/ui/kptitemviewsettup.cpp
++++ b/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+ 
+ #include "KoPageLayoutWidget.h"
+ 
++#include <QHeaderView>
+ #include <QPushButton>
+ 
+-
+ namespace KPlato
+ {
+ 
+diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
+index 21546118d33..91db5acbb18 100644
+--- a/src/libs/ui/kpttaskeditor.cpp
++++ b/src/libs/ui/kpttaskeditor.cpp
+@@ -45,6 +45,7 @@
+ #include <QVBoxLayout>
+ #include <QDragMoveEvent>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ #include <kactionmenu.h>
+diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+index 344ebc2b599..9146f06ab8c 100644
+--- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
++++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+@@ -31,6 +31,7 @@
+ #include <KFile>
+ 
+ #include <QAction>
++#include <QHeaderView>
+ #include <QTreeView>
+ #include <QStandardItemModel>
+ #include <QModelIndex>
+diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
+index c9e17b748a9..b67e9848807 100644
+--- a/src/libs/widgets/KoPageLayoutWidget.cpp
++++ b/src/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <KoUnit.h>
+ 
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+-- 
+2.16.2
+
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml
new file mode 100644
index 000000000000..a7529db60e61
--- /dev/null
+++ b/app-office/calligraplan/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="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="activities">Enable kactivities support</flag>
+		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
+		<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index c1171190ae79..8b97b3417de9 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,8 +1,12 @@
 AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
+AUX gnucash-3.4-test-stress-options.scm 14743 BLAKE2B f294001a1e888f72ca1fed616d62bd013d7b281ab1143e61ec61a595c2f0e51cfdfc1481a8a9992254fc430155e542138dfab284696ed7a6e0084bb3c81454f9 SHA512 3c8bc5c489c3de49ad940fb6dc99676d60fa0028f1014d2aaa519e8c6a76ceb7c91e2e97edc8e5e9b5c2f7d8a984f463f78ad3a10f49c4eb844e5d9e657b4030
+AUX gnucash-3.4-test-transaction.patch 1157 BLAKE2B 41e516e6cf6f29ea3c41b7dc464c38204b088575d7a9c66a355cf7e3eaaed0cfbfe8b7f30c816795ab84e4102e44475266119564c722ebd8f9401a6d462bec9f SHA512 fb4c578a35d85b12ecdf1a9b818225f410792e84f866573b7de97ce94890ddb22dcbf283baf1d0649a3f68ee83db9fb3aa0784ba9c4cec6b65d133d7e12793bf
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
+DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 478d8e2e4acbd0725ceaf997a1e62ba3875e9d4a003e8a3e69111a9d29118447fb2da8ef3e5dd5274d83a3adef1ee9f4a153cdfd17cabe69864b53bab8c7e813 SHA512 4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-3.2-r2.ebuild 3959 BLAKE2B 37cdc89d7db8903b4b89332d7f9b47cef47fb29588a443b979a49d43bad5e883158a939898368afc02cae89402b25a7498a5a373c51cb8fb9c5265c7d05c15ae SHA512 97da97ae88ed1aa564ec605d5e8d24852869745521457d98e76adbb4b72a2a28025bcddad413e2f85a2d3f6c4116c40a889438428c9c5197a873e1834077235b
 EBUILD gnucash-3.3-r1.ebuild 4018 BLAKE2B 17e75c78e4c6c9f45a36297765a512f4972670048358f745cad46a320004487621f145d8b9279ad8629a533e72f1259a39f4a42bfed501fc039b3a6e68ccbbac SHA512 66660f2357731b28a130de0c01cad1d30ea1a36aff30f02a144aa4d2e60945ba12f3847e0827d1548a9477f1f53b1293fefe28004db3e0875cce8495081b5767
 EBUILD gnucash-3.3.ebuild 3960 BLAKE2B fb2ce5241798a3aa3f7c1c69608c5707f44bcb847d73d64efc690478a1958ceb01f36d749377dc13502cc6e160875f62bbae40f79e4299aefb5b2f8c5d5e9d3c SHA512 a6bdc6f366cbcf8cec17f3772c45d8ed081d926326870ab966653eba405d693f20677a1dfb4db44f077fc673b42d96689ee71ee4bd7f47a7a78ad5c93edcd22d
+EBUILD gnucash-3.4.ebuild 4282 BLAKE2B b105ee7ff529866108c47933850d0207198ac81ca5c84ab0ca4c55bef0992d52f6d34ad4a6a07c015df374cca7a06a1d6c72b2265f048319995e270d6b0dd8fc SHA512 3710292c480f22a77aca55ab5c33860a550cae133abf81bef4b006e23003eced962425c469c963e941c6e4876d90e49ca8a7e6f3c91ce1f8a016bcade4a12558
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm b/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
new file mode 100644
index 000000000000..e85cd61a8efe
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.4-test-stress-options.scm
@@ -0,0 +1,315 @@
+(use-modules (ice-9 textual-ports))
+(use-modules (ice-9 popen))
+(use-modules (gnucash utilities))
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash engine test test-extras))
+(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report business-reports))
+(use-modules (gnucash report view-column))
+(use-modules (gnucash report stylesheets))
+(use-modules (gnucash report taxinvoice))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash report report-system test test-extras))
+(use-modules (srfi srfi-64))
+(use-modules (srfi srfi-98))
+(use-modules (gnucash engine test srfi64-extras))
+(use-modules (sxml simple))
+(use-modules (sxml xpath))
+
+;; NOTE
+;; ----
+;; SIMPLE stress tests by default
+;;
+;; PAIRWISE COMBINATORICS are enabled by setting environment variable COMBINATORICS
+;; to the fullpath for the compiled jenny from http://burtleburtle.net/bob/math/jenny.html
+;;
+;; e.g. COMBINATORICS=/home/user/jenny/jenny ninja check
+
+(define optionslist '())
+
+(define (generate-optionslist)
+  (gnc:report-templates-for-each
+   (lambda (report-id template)
+     (let* ((options-generator (gnc:report-template-options-generator template))
+            (name (gnc:report-template-name template))
+            (options (options-generator)))
+       (set! optionslist
+         (cons (list (cons 'report-id report-id)
+                     (cons 'report-name (gnc:report-template-name template))
+                     (cons 'options (let ((report-options-tested '()))
+                                      (gnc:options-for-each
+                                       (lambda (option)
+                                         (when (memq (gnc:option-type option)
+                                                     '(multichoice boolean))
+                                           (set! report-options-tested
+                                             (cons (vector
+                                                    (gnc:option-section option)
+                                                    (gnc:option-name option)
+                                                    (gnc:option-type option)
+                                                    (case (gnc:option-type option)
+                                                      ((multichoice) (map (lambda (d) (vector-ref d 0))
+                                                                          (gnc:option-data option)))
+                                                      ((boolean) (list #t #f))))
+                                                   report-options-tested))))
+                                       options)
+                                      report-options-tested)))
+               optionslist))))))
+
+;; Explicitly set locale to make the report output predictable
+(setlocale LC_ALL "C")
+
+(define (run-test)
+  (test-runner-factory gnc:test-runner)
+  (test-begin "stress options")
+  (generate-optionslist)
+  (tests)
+  (test-end "stress options"))
+
+(define jennypath
+  (get-environment-variable "COMBINATORICS"))
+
+(define jenny-exists?
+  ;; this is a simple test for presence of jenny - will check
+  ;; COMBINATORICS env exists, and running it produces exit-code of
+  ;; zero, and tests the first few letters of its output.
+  (and (string? jennypath)
+       (zero? (system jennypath))
+       (string=? (string-take (get-string-all (open-input-pipe jennypath)) 6)
+                 "jenny:")))
+
+(define (set-option! options section name value)
+  (let ((option (gnc:lookup-option options section name)))
+    (if option
+        (gnc:option-set-value option value))))
+
+(define (mnemonic->commodity sym)
+  (gnc-commodity-table-lookup
+   (gnc-commodity-table-get-table (gnc-get-current-book))
+   (gnc-commodity-get-namespace (gnc-default-report-currency))
+   sym))
+
+(define structure
+  (list "Root" (list (cons 'type ACCT-TYPE-ASSET))
+        (list "Asset"
+              (list "Bank")
+              (list "GBP Bank" (list (cons 'commodity (mnemonic->commodity "GBP"))))
+              (list "Wallet"))
+        (list "Income" (list (cons 'type ACCT-TYPE-INCOME)))
+        (list "Income-GBP" (list (cons 'type ACCT-TYPE-INCOME)
+                                 (cons 'commodity (mnemonic->commodity "GBP"))))
+        (list "Expenses" (list (cons 'type ACCT-TYPE-EXPENSE)))
+        (list "Liabilities" (list (cons 'type ACCT-TYPE-LIABILITY)))
+        (list "Equity" (list (cons 'type ACCT-TYPE-EQUITY)))
+        ))
+
+(define (simple-stress-test report-name uuid report-options)
+  (let ((options (gnc:make-report-options uuid)))
+    (test-assert (format #f "basic test ~a" report-name)
+      (gnc:options->render uuid options (string-append "stress-" report-name) "test"))
+    (format #t "Testing SIMPLE combinations for:\n~a" report-name)
+    (for-each
+     (lambda (option)
+       (format #t ",~a/~a"
+               (vector-ref option 0)
+               (vector-ref option 1)))
+     report-options)
+    (newline)
+    (for-each
+     (lambda (idx)
+       (display report-name)
+       (for-each
+        (lambda (option)
+          (let* ((section (vector-ref option 0))
+                 (name (vector-ref option 1))
+                 (value (list-ref (vector-ref option 3)
+                                  (modulo idx (length (vector-ref option 3))))))
+            (set-option! options section name value)
+            (format #t ",~a"
+                    (cond
+                     ((boolean? value) (if value 't 'f))
+                     (else value)))))
+        report-options)
+       (catch #t
+         (lambda ()
+           (gnc:options->render uuid options "stress-test" "test")
+           (display "[pass]\n"))
+         (lambda (k . args)
+           (format #t "[fail]... error: (~s . ~s) options-list are:\n~a"
+                   k args
+                   (gnc:html-render-options-changed options #t))
+           (test-assert "logging test failure as above..."
+             #f))))
+     (iota
+      (apply max
+             (map (lambda (opt) (length (vector-ref opt 3)))
+                  report-options)))
+     )))
+
+(define (combinatorial-stress-test report-name uuid report-options)
+  (let* ((options (gnc:make-report-options uuid))
+         (render #f))
+    (test-assert (format #f "basic test ~a" report-name)
+      (set! render
+        (gnc:options->render
+         uuid options (string-append "stress-" report-name) "test")))
+    (if render
+        (begin
+          (format #t "Testing n-tuple combinatorics for:\n~a" report-name)
+          (for-each
+           (lambda (option)
+             (format #t ",~a/~a"
+                     (vector-ref option 0)
+                     (vector-ref option 1)))
+           report-options)
+          (newline)
+          ;; generate combinatorics
+          (let* ((option-lengths (map (lambda (report-option)
+                                        (length (vector-ref report-option 3)))
+                                      report-options))
+                 (jennyargs (string-join (map number->string option-lengths) " "))
+                 (n-tuple (min
+                           ;; the following is the n-tuple
+                           2
+                           (length report-options)))
+                 (cmdline (format #f "~a -n~a ~a"
+                                  jennypath n-tuple jennyargs))
+                 (jennyout (get-string-all (open-input-pipe cmdline)))
+                 (test-cases (string-split jennyout #\newline)))
+            (for-each
+             (lambda (case)
+               (unless (string-null? case)
+                 (let* ((choices-str (string-filter char-alphabetic? case))
+                        (choices-alpha (map char->integer (string->list choices-str)))
+                        (choices (map (lambda (n)
+                                        (- n (if (> n 96) 97 39))) ; a-z -> 0-25, and A-Z -> 26-51
+                                      choices-alpha)))
+                   (let loop ((option-idx (1- (length report-options)))
+                              (option-summary '()))
+                     (if (negative? option-idx)
+                         (catch #t
+                           (lambda ()
+                             (gnc:options->render uuid options "stress-test" "test")
+                             (format #t "[pass] ~a:~a \n"
+                                     report-name
+                                     (string-join option-summary ",")))
+                           (lambda (k . args)
+                             (format #t "[fail]... error (~s . ~s) options-list are:\n~a"
+                                     k args
+                                     (gnc:html-render-options-changed options #t))
+                             (test-assert "logging test failure as above..."
+                               #f)))
+                         (let* ((option (list-ref report-options option-idx))
+                                (section (vector-ref option 0))
+                                (name (vector-ref option 1))
+                                (value (list-ref (vector-ref option 3)
+                                                 (list-ref choices option-idx))))
+                           (set-option! options section name value)
+                           (loop (1- option-idx)
+                                 (cons (format #f "~a"
+                                               (cond
+                                                ((boolean? value) (if value 't 'f))
+                                                (else value)))
+                                       option-summary))))))))
+             test-cases)))
+        (display "...aborted due to basic test failure"))))
+
+(define test
+  ;; what strategy are we using here? simple stress test (ie tests as
+  ;; many times as the maximum number of options) or combinatorial
+  ;; tests (using jenny)
+  (if jenny-exists?
+      combinatorial-stress-test
+      simple-stress-test))
+
+(define (create-test-data)
+  (let* ((env (create-test-env))
+         (account-alist (env-create-account-structure-alist env structure))
+         (bank (cdr (assoc "Bank" account-alist)))
+         (gbp-bank (cdr (assoc "GBP Bank" account-alist)))
+         (wallet (cdr (assoc "Wallet" account-alist)))
+         (income (cdr (assoc "Income" account-alist)))
+         (gbp-income (cdr (assoc "Income-GBP" account-alist)))
+         (expense (cdr (assoc "Expenses" account-alist)))
+         (liability (cdr (assoc "Liabilities" account-alist)))
+         (equity (cdr (assoc "Equity" account-alist))))
+    ;; populate datafile with old transactions
+    (env-transfer env 01 01 1970 bank expense       5   #:description "desc-1" #:num "trn1" #:memo "memo-3")
+    (env-transfer env 31 12 1969 income bank       10   #:description "desc-2" #:num "trn2" #:void-reason "void" #:notes "notes3")
+    (env-transfer env 31 12 1969 income bank       29   #:description "desc-3" #:num "trn3"
+                  #:reconcile (cons #\c (gnc-dmy2time64 01 03 1970)))
+    (env-transfer env 01 02 1970 bank expense      15   #:description "desc-4" #:num "trn4" #:notes "notes2" #:memo "memo-1")
+    (env-transfer env 10 01 1970 liability expense 10   #:description "desc-5" #:num "trn5" #:void-reason "any")
+    (env-transfer env 10 01 1970 liability expense 11   #:description "desc-6" #:num "trn6" #:notes "notes1")
+    (env-transfer env 10 02 1970 bank liability     8   #:description "desc-7" #:num "trn7" #:notes "notes1" #:memo "memo-2"
+                  #:reconcile (cons #\y (gnc-dmy2time64 01 03 1970)))
+    (let ((txn (xaccMallocTransaction (gnc-get-current-book)))
+          (split-1 (xaccMallocSplit  (gnc-get-current-book)))
+          (split-2 (xaccMallocSplit  (gnc-get-current-book)))
+          (split-3 (xaccMallocSplit  (gnc-get-current-book))))
+      (xaccTransBeginEdit txn)
+      (xaccTransSetDescription txn "$100bank -> $80expenses + $20wallet")
+      (xaccTransSetCurrency txn (xaccAccountGetCommodity bank))
+      (xaccTransSetDate txn 14 02 1971)
+      (xaccSplitSetParent split-1 txn)
+      (xaccSplitSetParent split-2 txn)
+      (xaccSplitSetParent split-3 txn)
+      (xaccSplitSetAccount split-1 bank)
+      (xaccSplitSetAccount split-2 expense)
+      (xaccSplitSetAccount split-3 wallet)
+      (xaccSplitSetValue split-1 -100)
+      (xaccSplitSetValue split-2 80)
+      (xaccSplitSetValue split-3 20)
+      (xaccSplitSetAmount split-1 -100)
+      (xaccSplitSetAmount split-2 80)
+      (xaccSplitSetAmount split-3 20)
+      (xaccTransSetNotes txn "multisplit")
+      (xaccTransCommitEdit txn))
+    (let ((closing-txn (env-transfer env 31 12 1977 expense equity 111 #:description "Closing")))
+      (xaccTransSetIsClosingTxn closing-txn #t))
+    (env-transfer-foreign env 15 01 2000 gbp-bank bank 10 14 #:description "GBP 10 to USD 14")
+    (env-transfer-foreign env 15 02 2000 bank gbp-bank  9  6 #:description "USD 9 to GBP 6")
+    (for-each (lambda (m)
+                (env-transfer env 08 (1+ m) 1978 gbp-income gbp-bank 51 #:description "#51 income")
+                (env-transfer env 03 (1+ m) 1978 income bank  103 #:description "$103 income")
+                (env-transfer env 15 (1+ m) 1978 bank expense  22 #:description "$22 expense")
+                (env-transfer env 09 (1+ m) 1978 income bank  109 #:description "$109 income"))
+              (iota 12))
+    (let ((mid (floor (/ (+ (gnc-accounting-period-fiscal-start)
+                            (gnc-accounting-period-fiscal-end)) 2))))
+      (env-create-transaction env mid bank income 200))))
+
+(define (run-tests prefix)
+  (for-each
+   (lambda (option-set)
+     (let ((report-name (assq-ref option-set 'report-name))
+           (report-guid (assq-ref option-set 'report-id))
+           (report-options (assq-ref option-set 'options)))
+       (if (member report-name
+                   ;; these reports seem to cause problems when running...
+                   '(
+                     ;; eguile-based reports
+                     "Tax Invoice"
+                     "Receipt"
+                     "Australian Tax Invoice"
+                     "Balance Sheet (eguile)"
+
+                     ;; tax-schedule - locale-dependent?
+                     "Tax Schedule Report/TXF Export"
+
+                     ;; unusual reports
+                     "Welcome to GnuCash"
+                     "Hello, World"
+                     "Multicolumn View"
+                     "General Journal"
+                     ))
+           (format #t "\nSkipping ~a ~a...\n" report-name prefix)
+           (begin
+             (format #t "\nTesting ~a ~a...\n" report-name prefix)
+             (test report-name report-guid report-options)))))
+   optionslist))
+
+(define (tests)
+  (run-tests "with empty book")
+  (create-test-data)
+  (run-tests "on a populated book"))
diff --git a/app-office/gnucash/files/gnucash-3.4-test-transaction.patch b/app-office/gnucash/files/gnucash-3.4-test-transaction.patch
new file mode 100644
index 000000000000..bf7180e664fd
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-3.4-test-transaction.patch
@@ -0,0 +1,25 @@
+From 95bee405cf5568f5899287ba62058cf894361676 Mon Sep 17 00:00:00 2001
+From: Christopher Lam <christopher.lck@gmail.com>
+Date: Wed, 2 Jan 2019 00:00:56 +0800
+Subject: [PATCH] [test-transaction] fix a test which was hardcoded to 2018.
+
+This test was hard-coded to pass in 2018. Fix.
+---
+ gnucash/report/standard-reports/test/test-transaction.scm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/standard-reports/test/test-transaction.scm
+index 755aba2983..2f428e24e9 100644
+--- a/gnucash/report/standard-reports/test/test-transaction.scm
++++ b/gnucash/report/standard-reports/test/test-transaction.scm
+@@ -652,8 +652,8 @@
+           (list "Grand Total" "$2,280.00" "$2,280.00")
+           (get-row-col sxml -1 #f))
+         (test-equal "dual amount column, first transaction correct"
+-          (list "01/03/18" "$103 income" "Root.Asset.Bank" "$103.00" "$103.00")
+-          (get-row-col sxml 1 #f)))
++          (list "$103 income" "Root.Asset.Bank" "$103.00" "$103.00")
++          (cdr (get-row-col sxml 1 #f))))
+       )
+ 
+     (test-end "display options")
diff --git a/app-office/gnucash/gnucash-3.4.ebuild b/app-office/gnucash/gnucash-3.4.ebuild
new file mode 100644
index 000000000000..970c9bf9bf22
--- /dev/null
+++ b/app-office/gnucash/gnucash-3.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# google{test,mock} version
+GV="1.8.0"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
+	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
+	  postgres python quotes -register2 sqlite"
+
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+# guile[deprecated] because of SCM_LIST*() use
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=sys-libs/zlib-1.1.4
+	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		>=x11-libs/gtk+-3.14.0:3
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	~dev-cpp/gtest-${GV}
+	>=sys-devel/gettext-0.19.6
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch
+		  # Fixed in 3.5
+		  "${FILESDIR}"/${PN}-3.4-test-transaction.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
+	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
+		|| die "Failed copying scm"
+}
+
+src_configure() {
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
+		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
+		# Disable fallback to guile-2.0
+		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
+
+	if use examples ; then
+		mv "${ED%/}"/usr/share/doc/gnucash \
+		   "${ED%/}"/usr/share/doc/${PF}/examples || die
+		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
+		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
+		   *win32-bin.txt || die
+		popd > /dev/null || die
+		docompress -x /usr/share/doc/${PF}/examples/
+	else
+		rm -r "${ED%/}"/usr/share/doc/gnucash || die
+	fi
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 322b6c1be3d4..c8066eaaa6a7 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -23,5 +23,5 @@ DIST x86-debug-libreoffice-kde-6.1.4.2.xd3 336243150 BLAKE2B 91f903eb7ea3b72b2a1
 DIST x86-debug-libreoffice-kde-java-6.0.6.2.xd3 587012572 BLAKE2B 5a3495eb3a1b9149e9378501303716c76ba1ce82f18339e60b1727f1467e351b9fa788196fae0f03aac122534d36f26d19d10421fea79603b4240a580b1a6b6d SHA512 64fcbb87757cb8519a2d4c9935c677f112d1d6f570ee30d6226525e9159fc136271e8b31f15ea06864d63f3003526d84c6253c6f532fd0cacc99f755396bbf50
 DIST x86-debug-libreoffice-kde-java-6.1.4.2.xd3 590359965 BLAKE2B bc169ef7144612def9255191fbd7d2765b42ed8e7f1a1450b4253c6bad1b582481c544c237c26d4bc41f724c4c114b8c55ec05989f337de59cd1285c29428d94 SHA512 31bf9f75e1722ea8dd17ef86d7819fcb0f40369ea7d7399fc88b4e715800bf9419cc4d4bd476dbe5840f8d7e9e9c9fe78289caf4938290224f58d5c5ab68e2af
 EBUILD libreoffice-bin-debug-6.0.6.2.ebuild 2626 BLAKE2B 632daab6702e56cce06c16acfda09c0042296e34dfd75246debfc6d40c786ac15f447505a9948dfcfb58062bd86cdc13ed1ec93c8f9cb7df7091fe14dd9f6064 SHA512 7cd35b5da20aee77866d7eb35af29b3335611a7407fe94ac0f30a8faf3aa70d707f1afc2e5c6fcec3fcc684e947f5be887676753b70799f681efee8282645031
-EBUILD libreoffice-bin-debug-6.1.4.2.ebuild 2628 BLAKE2B 2a0de51d58f88ff314e4fc25238f5ce291eda474619b5810ba41be1d9520b3d4abe6f46b2730af53138acfe4c3b57d4cb2bb3ad354fd1d9458535106a51c6c36 SHA512 65fb81e661de4a2b57016e92ce64f817c74696c57cc00a5e7693ba9b5341f262030154605e06a363fb75f9fa22d1fa0a491e1ce912af73cdfe3bcb8d216d0a5c
+EBUILD libreoffice-bin-debug-6.1.4.2.ebuild 2626 BLAKE2B 62ef593013fec0d24717823b361c0d0948aedc1e5bc2c99795d9b1f44f38f6e6de0598beb13342ceac5a7a8f247a981c9e9fefffbb4edd3ffc227aad57d8c632 SHA512 de472a71d20ae953b2a1f7da843c0cf24b25192e49d6f39862ec301734f5169e890c4717da8a280061b98936e7352662b0eb822e6587c18b7405c7a6f26aeb28
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild
index 9db8af43438e..dd563997b9b9 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index b6a74fe268d8..1637415b494d 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -24,5 +24,5 @@ DIST x86-bin-libreoffice-kde-6.1.4.2.xd3 15913661 BLAKE2B ebeea8f8efa2608ad23c0c
 DIST x86-bin-libreoffice-kde-java-6.0.6.2.xd3 24393402 BLAKE2B db927aa404b4b0d6e9cc5f8be019e5701937f3fc2146d731a8fa007ddedf5a992b1f36c4eb4e30f20821b497d20011441db305d344b24831cfa075a232dc542a SHA512 f42defba10412acb0676fe3e23dfd39a11456812db908ac1e8120d4ef9cf95fce6d1cdcd344c21b6675e17b8117488caa36b0bc44bcabbc77d19c95ac8789875
 DIST x86-bin-libreoffice-kde-java-6.1.4.2.xd3 25702585 BLAKE2B a66567473b111de9a8303f5fd861f5abb62de40be477f33f20755aa2e04896816ff04ce9bc6adcab841adb333a5edd8ae7f50c201d837166e81f38ccef49b8aa SHA512 f5c689cc8682652d2c9b7c3a5e7a7831295b55f241d63aa9e0f470ee772d8a7be4c72244e4e2d76fbc82cb075b0fcfcf293ddf27bf6aed83c73abc57f491fe33
 EBUILD libreoffice-bin-6.0.6.2.ebuild 6792 BLAKE2B 24f3505fe905125205eec9529be539352d8418ab4b8fa2cc1dede6ed841cdda05304fac9d71bef08236f16d375133dcb6b93142c65689764060203d7ad0013e9 SHA512 b5a2d493c5880dc772ccc2abeaf9b8eac9e1a87c44d08f912be30dd1ed3f897a7522edb27e9ddafffd4550adab36428e84707b50e6f90be1f27dd5e3da09c02a
-EBUILD libreoffice-bin-6.1.4.2.ebuild 6771 BLAKE2B aec3262e690a3fb489e89ee2533f50353ff430db44353baef765d5ba5f9c10f05fde8a3ff14a8cf05d8f669fa65315d19c4278bcfba14e6b61f1aa608289c49e SHA512 a5c9542c0692c006f13f0d3720b881b06abb51f5dbfae81f4a4f14c3a378008a6423af7c01973f40a736f86a225fee6b6e3765c111c01d4ed8b78c5139a4b2cb
+EBUILD libreoffice-bin-6.1.4.2.ebuild 6769 BLAKE2B b7fcbc498c3f2246ae4e06db9599eeaa1a85539861681c9327a13e304799529b186481515dafd031064f860e136847cdc58cba41cac00da2fb7ae31d8a905bb2 SHA512 1cf00015d51727ab65fb931963f7cedf376aa9906d65d5f9282cb415b43c8a6bd96692230c8a6f7f5d313b5b651472cde826a21d60ab80f63f72f7453c8cee76
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild
index 1e4586411304..6c64fa2c6a95 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index cb5d8663a54d..0a855571374f 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -335,6 +335,175 @@ DIST LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_xh.tar.gz 289979 BLAKE2B 99e987a
 DIST LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 793869 BLAKE2B 6520ff193de644324512f0b66e38843a4a8f4a3ffe2e03d0e5bb7994ce6975e50e921beae721f911488701577ae84e291188e98369de192e11786964814ace73 SHA512 9d6754d85b7dfc2d6fd53f01270d2881dc7222eae708c38a2f11c5d285fd45a4724ea61d9247a5ff0b200acd742306b82918d151e9f128bd1cdca9be9be392bb
 DIST LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 799086 BLAKE2B 38ae9fe79cfa89d31d503f9971d363d1b84e5910bb2becc1daf30a561c795bb1a6ecd4f889033ab480ad27b103a034769f42a5e6b76c923e0b25a3efe29a44ed SHA512 4514d7dfc8f355a342b5ebafdd9e4b491f691f7040dd806c486d244f419a113107f04ed56c3cce91a93c81196fda68c18132da34ed65d109f3ee508b29a65f41
 DIST LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zu.tar.gz 320320 BLAKE2B b8fd93d9377e50e4b07142b4bc84e612c11f644a7b6c03528390b5e22779336936bf4dedd267cd857b2f70e26cc600e46e165833197282f30e83ef4042380772 SHA512 7a211110104316b7f16e088d845d7b88a714ca8121ecb2c7f5c838c81ddf1f0113275b2efb54847d7f1403f382e7be7b731de393d3672926b5ab6d4e598d5e60
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_am.tar.gz 2571687 BLAKE2B da9386f971efd048beae227ababda48ba2413c4969d323227ba1c1c3d89f0fe2ab9563809f2570ea666d2fd15f75a5d2b3b02303f49b2e8ad1cf1016ad549bf2 SHA512 31df83a97f49992e87a590e20cba869ae5b8863d757fcb85fcf6fab0cf0dd94efb1d26082d0dc319b8c5f177403faad6c27339e97e1fdb1ea5ac9c564b59195f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ast.tar.gz 2463403 BLAKE2B ccb68d90da9b7cedf57a454b2ad1a6acee1dbf658ce9e8955add2a94bff8b70a21418d514e3c1d0211f439132ff805b11b6cc43f9c4bdbf123c0a65f413d7342 SHA512 f1c1ba18768b28f6eb95d7bdd260ee4ce6bbb573df2c77f5c0ef496fe71a5df3d3f077352b5a915832485091cf5f076e2a04d53f51e9c686c51ae518c5dd12bd
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bg.tar.gz 2657243 BLAKE2B d8a7ec3e68a90dd771e6fc36ab2459eac434cf6d00a8becdf74b5b8c94e898baf22792c9eb49670f16ad9ebd3c791628f4c8729f2e6375421b59f12e34d9533d SHA512 ffbf1434894eb832143d7b807df7958a3b284fb383db1465a2af18a1dd7c8cea6d792a41ed36383868a6ba52e78d835e009788867716f64ea6699dd32964cc37
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn-IN.tar.gz 2672160 BLAKE2B 792be295a96bec9be18593965f777c2334c19df5082f77b72a135c53d3279e8f1d23b859bd33f8108ce5ec3121dc686910eb4b49ee36c7fb0ce73e8e15a4635d SHA512 b1666ada2de81549f163617554e440d51849fce972a1cc9b9a8bcf36839a42e93f24c4a830d5221a2a62297ce7fce77aa40ee049cdadecc0aac13aff9d25e848
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn.tar.gz 2647118 BLAKE2B cac5786cd382c6e59da994312f2f49f85dfe009402f329f532c956fe3f8975f206b51458e6324fd6e38804272b7d30ff764e664d507c036d96eb222dd68260d0 SHA512 256fdfa64cbef4bacc30920ab2184c07c1a77e21333b3d8ab8dbcca77715ba6c5229ee786e0b788bceb4071f0b0e8051572015e4ad5deae1ccdb778555f2fb88
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bo.tar.gz 2660344 BLAKE2B 73c3c925a3cfa2396c2768e0e63336ae2d6cc0a08a8faf5703a3e7f16ce3c01938fe75004682b8d80860d2c8a284a3ebff39a571f63b97d838346970ca26c419 SHA512 4fcf5d24ac876bf0614b3d4833aa2113041e74faa9c10f1bfb8bf445c7dc038ad3c52811547a1ee8870f602c9472df7fbfb5f3e21dd9ce64fae39242e4b03b12
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bs.tar.gz 2376852 BLAKE2B bd669d4f37ea2ce80305caaaa47d16c5824092c094a5eb835157d952869b040c4d87466c3be7700da4024bc626614f143f1331e0e0122b850dfaada532fe927a SHA512 f594b2a39104c0e7a965924f634a3e03f865f2189577b964bd25fd1893b5dd511b1a02781d1c3c3e3acaf234afb7555f2845896bb3eed8de99fb1c17f26f698f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz 2459294 BLAKE2B 6eb79faa8b748a9c25acf3904139a707b3bc19273473ad3bb7ee5616f7a2d34371dd7aca6b259016e1fbe8ea5f0e7cf326baa17e928cf4be8606abdbd76cc820 SHA512 6a228a612179e9cca822b982a6ad4f024b2c6f014268b05a84e094b13edf255b8ead8e65cac9d979093f856f37de21fe5ea6f87ddb86468a56125fe580177157
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca.tar.gz 2445287 BLAKE2B f56fd641aa19bb9d63e59c5a37f4c3fec312f006c7e53e64eb43f8275b182d1712faf2570d92064d67fca15d961e62602ca9eed1ecbb4df47e024bf2e3ba90ad SHA512 8910842f35ba338e2b0cf8e24c4b43e89914d275858d34c0a68d1c29570800aeeb34daec5982facad0cc7ea996d0ab2f46d4524f3fd859bb844ec152b1715536
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_cs.tar.gz 2443838 BLAKE2B 750e53ab1f66ac83583f66583530baf5918b11ecd0d477b6fcbfd4bacdd815db2108a7102d72c0da196adf6f36986c1f6ae0b1dba3f7f211f6249d9ab52760c2 SHA512 49813c2fe21c979e42402e054b44b0d167a07223e393a1fb4e44a68b607a7bf5529e1e817b7ed1bbd81bc26d783f2bc3dea97988c67acf5f87486b42aa2e3fe9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_da.tar.gz 2406530 BLAKE2B 9043c896034d88dabdadb3393ead1ef40a25e9097b673c076453707582a5c84d6935e12c9fa0c7bb0f05474978fefba21b2bdcb4ce4f0d29a61d74a95e44fd2d SHA512 8af7925f1a526573ebfaff14cd51bc8a3d2313e70e32424c6b00ed032027c0c77984c4458e7a62f0aaf9756498850f00f033f4a44f0d28be5a65ed1fad7736f2
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_de.tar.gz 2501937 BLAKE2B 4b3926cfb75f1dadd68cfd44e298d3232659da6accb0a21cb29edf06506b152b7136dc06c2cf7ad34a9e6c237934d14758d65ba2e61339eef72e280c6a8df576 SHA512 8db82836141a155debdb9bbc0d30fb6a4ae97c50187eee4da67e6ea23904bf3650a9532ce725129c267c5e2f471745d06470be811f063c7cdca703bfb37d72b6
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_dz.tar.gz 2815836 BLAKE2B e328c4324f0c364d4157bb8c0a1707613ce2ec5bd26faecbb5f4f90e8d66e55b5d8cfa3a52b93160d162cfdb76288ea022906e4d0a3cebc1b7128a8fc9387267 SHA512 246b5047bc5bce0fa1382d95501870e53f0ead502013b756946b0afa2dd1d6ed7b6fdabebef39b884d77a04b942971389cf18c3349968e62f4d5b617be76bd26
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_el.tar.gz 2864556 BLAKE2B 5716fc71c853ba19b48f25b566aba05303c01e49dd3784fe533decd90bad2f38bf8f27bd7a36aeadd55e79d2849577136d9bbb45ade841aac5a3298e95800cb3 SHA512 5ef30f8e464e1d79b5f1ef8878bb07904c10e4b57cf1e5aeec386713fd82652612943a67626d92723d52ad37ab76df6720ceefceee1418948dc8c74cb1d54bc3
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-GB.tar.gz 2281619 BLAKE2B 3ac6982d4000a2375a420e890199d153fb1fc1db99121c4acdd6d2bacbd4248bd0839f60889a773f914a65e607295a84c99c840f4527138b66787c17e164be8e SHA512 729399060fd728ffcd4a45012e7172dfecd89d67688b922f5d545eb48285e40b410e7c29f02545373b097092dc0e8c6bb913e583841d864699b0d0748c237e8b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-US.tar.gz 2100640 BLAKE2B cdd472b6abc6822bea0737171ee7f78c580830a883812f788e9ea41e0f8043436a4698680f044c75c76f4fe65c2ebb56a539f4bda42c80d58cd8e0b38bd53a56 SHA512 bd25530186b01a6c682404edc29a4532dead0093100bae563cf494d8e7e1c99ad72b1318a2accefecec8e9dcaf50469732134a1bd7c6b6f90c3625e574e58470
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-ZA.tar.gz 2278595 BLAKE2B 33cdd9fdb8d4440e0f392ee57aed8ce88b83b55644445d0c770b96c34d42b0b7b9efa1b789e08a7eedca2c8ba024b63490ff244069c1ab6a59c56aff68aa685f SHA512 ae03217edeaf08582ab137d9b6ce2e428707efc1cbae01bbc935da08d2570b4fb78a7671ce792991651258ffae9ec49a12db8f49eda8915621331863a4072401
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eo.tar.gz 2359095 BLAKE2B 1897ed170848f4d95fd71d92223f7d227b8d7b91d8443e469dd33bdcb17499bb04feeff43145b42da96c15551028d12544f76bd3b2c83c9af9ad480eb630f3af SHA512 35261fc0d528d39bcf8182881bcb3d41c2083efee65af7c43bda37fbae54d0a830c043b0eabdf7a74f9912a066ab9a4f479b1014d4fcc45aa340da10f6c5f286
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_es.tar.gz 2486504 BLAKE2B 8fecfbc8c8cab1fb8eb7d7c57be52d2d0e8abb91ea43c20e59078cdd5eff25f869a7aa2ab3c8bab29ac94bbb6f3a497391fb4cba2d5f27ecf75ecbd2acbe50a3 SHA512 126dd095df740e9eeecd6125dbf6497bf8bb3dd4a0744c686d237fee65f7ebece2e5d64960ec6785028e1883df86e8a75644c612dff407b0fa26e2620fc2d506
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_et.tar.gz 2404246 BLAKE2B 291abd5c34a0d9366c349581e6c7e110bd0212a30cd56cf68da14fb076892a239724ab764d9082f05b26e23338ed0fa82dc4d0f61af4c4da419cd4388ad54691 SHA512 4079b18a43bdab96fd46f027c3a7e58ea54675c6b5c082823449d5de020dad6d5ec88a5165b42b5c3ba9e41e9501112f690f85cb92f2f307f887b90d07964560
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eu.tar.gz 2357201 BLAKE2B 19503bf48fbff3b4be7ba0d018c4376b7eb13492aa9ccc2417a2f6fa31342f00811b7c6e645d3e58e629ccf3388108f2aab38d77db769cccab631534c32d7dfa SHA512 436429b9223e5dba2f6161001b46e4b828752845d4705dbad970619b520c7a5c074656b6458f19aa26889950f84220f2394eb2ad459a399c7af182c0e92a7fd0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fi.tar.gz 2452869 BLAKE2B 193b7cec1d333eb92bc469befcf286117b17e8503cc5cddef1a875d25e3b793bd223ae2db7ca535d58a23ca351a2e4d01cb46ec748be604693cbf2464c40029e SHA512 7c06a665fd64e3e5589f151769a6d752eecec86b5ba811c939ce15727fc302ae3159395220e78cc7024ae1b4c527391658cf5f7d60b102e5926ab7627af6f36b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fr.tar.gz 2470525 BLAKE2B d702576e4796d9fbf27ae24833d6f345c8ffa95859e266a81f784346d40cba981ac4398732f84b3f2de1b57420a76ee69eb90d67a0e888fc1c50036935f8da3a SHA512 b4d99c0799b0bbb9bcbc921d193e783069499a0926b36d52c469d3425a945d7cd4623083a39a4c68ee840ddbbbfbc72186531b1d80d84a0e0340c2827d9ce761
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gl.tar.gz 2444869 BLAKE2B ae325d631f68c65965f50523abb239c4ad392b3f22a14cf48afc48062e5c18624c86e03b9f1317be42cf852a3048e20acf34cba22c539a1f6c777ebdd0c3e463 SHA512 763247e92b0dfd8005e440c87efafb24d90744845be60c96f973f29f6db34663b70b1d1021e616b0e35f975d75d3176389f220046ce34c739c874d336d8444ff
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gu.tar.gz 2330878 BLAKE2B e5c56566b87bbf010ebb805d685ee0d622e39d5aa62216d4b8e9bc966e26f1a74320372abca4fb5981aab2bc82d9429229094dec25e3a996988daecb3048a94e SHA512 0e70cf47cff015d393312a6fc3ee9eaa87002864b3524e62226020b0ee9f9ed6fb4a3ead782323e40bd7a8f501345a9d2c892aceefaabc52df8f173c92760791
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_he.tar.gz 2216788 BLAKE2B 103c296d77e403a32231d7086b0a8da436f7392d4447bcd6540d406b37d7c2c9e2cbaa8c438f1a0aa405a7cb5170e050e2fb9726c8ec6d8d1bec0ba36e9718f5 SHA512 f5312100892bed61f24382d726c8b6b4b7476ca6a04eb8ed28cb4d87c8c04d0e8e49b7a4191cb14348d84d0fdda07e9b4990497d2a450aaaa649ae5362b5b7f5
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hi.tar.gz 2437759 BLAKE2B 51ca472ee7a91558b7b6a4d29d9470fe1a04a205a800d9a08af9bcc76333195474e2615587b42eddcb8052432277c72e33ac8127e064fb46bbe4aec9553f6c53 SHA512 69f69ce4dcddae25425123916cbdab5447d6a3c7bef8c82c0b3ebf050a906bf5bcff7e4bbe4468c02dee552d6664b58afe80d34690be13af5c5d0035afa71d0e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hr.tar.gz 2333806 BLAKE2B ffac83aa59b67bffb07fffdf36fe5ad35a77f25259eb43ca7b4cb4ac1ac32e623a24aa843cb00bba1cbb73b335c9215dd649ee901633bb2d5d96d74320609be5 SHA512 7f2831e27a83803171483bc82d9d186cb59d57c091fe9a02ed3231f5257bb16dfee7589aacc39c54480e4bf3b60c875d0f5534bf3264ef6fb162cd70a096d222
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hu.tar.gz 2568522 BLAKE2B 1d9bc2e8820f6c3f98d8d7e47dd17c76e18c86e0a4d7c5a97984ce3fbff9b9e4ea81cb74b03e22198b5c5de093eba63780089cd3d99467837203faaddd93fc8b SHA512 af7bb0c4442dd3d922e5cbd4d6aad608648ae9af571a70aa4390520cea46b20676c17cea0f3de70d4c162aca706e48ca1a0234080f6023a44c8940dc861516d4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_id.tar.gz 2357608 BLAKE2B c649f64625d8ffb5d13d14a55a3bde0e1c12a5dec7741314c1d0a61964218312ac5c7cbf310ca1096c32069634a88bde2f4f78b3369c424addbac2babebc928c SHA512 6088ae86bba86176f77244db5db498a67b45623c8bc129dbac1b46b21a80167511ffcb37aad0ddb51ea0eee2078d93c39fd8766d26e8ab3805167ae0384dad11
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_is.tar.gz 2356271 BLAKE2B 155ce96c80e9f3db2bd9e5d3c87d22dee3d0688864381ce88156ac26decb0aa27c721f8cce88b97ee24096006709769ecdc901a7d44216b84a007cd9544821ad SHA512 68a8ae6e8102357eedf0aa3414aeefd5b4b594dbf1b94eaf51374a5d8f00be2ea0a0d94cfee06dcb8f570e3d068bccce853444d24a188697da7ca8dc7a91ae94
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_it.tar.gz 2448136 BLAKE2B 1d997bc1897a059bf258835e5b663e7a39d710a640295b49f6a9f7f842c140c970d513c9642cfaf297ef2f16404029e127df282aa7e37de91a9daa2ef1f7648a SHA512 06f59ec63e3d8f3d4f9280746a424c999e285822201f31df45c566ff078507eda0e2d0a3957c607ed3459f5c4f432f6abf57c78969b411cc6707abb27f72b275
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ja.tar.gz 2615231 BLAKE2B 680e1a7051fa0be36ff605cd93ecf2faa3bc78f4f4a329ae581c81cddb9656a27a8f2f411931b1c34a9718ce93db847322277762fea1950930040e73c6411186 SHA512 46d90fa74ba7c06012a2af726d1db2b25ec50327af8513c183d3c1af4fe4c4bfe73f5fe9fa131dc2b90ffc5092bfb3060b7088962df02280d37e4470a20a2a87
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ka.tar.gz 2469534 BLAKE2B 613ee6af4a7afb8916827bd5c18fb7b5b306c9970ef4f218cc3f1c6a24323c1877f4e14abcc0570c2c96673b561b0c2fbdc8687d84529a669cd9e42072cd6d07 SHA512 6c58353b6109e749fd7266671b3d808dcd65354309844d3f1ab5bc61e57e1cb17cbcb654f9b57e1d7057b61d50c54a56bbbc85b76cd4bb943280d6a62a4042d5
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_km.tar.gz 2756865 BLAKE2B 4b2a6ff38dcab09549b233d4d32b667a4f1af1dbdbb7dfb29c0de960c975ecc413efba03b892ef04c00e3e27d741480e7b0432c8ea0af58b0ac1157ae8b23ef0 SHA512 01297586e3bbca8f64729855f92ee242ad41929b20cc67bfbfb585be9baae27d19d9a4093b01cebb5c4dd5c0ae7ee4309e6e33602e05ec3d4639bc3145865893
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ko.tar.gz 2485287 BLAKE2B 5048375ac3ba112f1a54a0b42382f879e51352288e8f7a4e1fa38772423939bf104d54893930e6ebbafdfea53a3afb0a5e5caea7eac9cc318e3a731ee21bbcb3 SHA512 81af51dfbed9ab520496e66cce54e350411ce3b2afbfa540ac76bb63cfd735ad847bc7a45f29bec1f07d3fd1222eb6ac9b70ab6872da01ab27e0661f095a5df0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_mk.tar.gz 2451002 BLAKE2B 443341c8c49bca156586d35c535b411372bb424501ba4b0ba212d9d058e9a5b256f2e594aecc30e204ddcbfd73d12b191906e4461f44715c9906d2088b4d0cfa SHA512 e8e1352ad784f9a513b66e119df2a9db5c57fdf05cad838fd3bb737d7e6ca09c4cd121378d9a40c4e13a28beb52b1ceb595152b51d4d1d498e2d5da56cf41eb4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nb.tar.gz 2383138 BLAKE2B d6373cd14aad14b17f87024dd5476e40c656fc2dd521aa962bf4bbcb9e87c53da8d97ad1962cde44c817f6c25ed727fcce422580e4a1cb252a18e8e3793ee589 SHA512 8a7138032e015e42e7bffce9715fb2a8b8ac1c4e5f1be95c81914eaf408db9f70e9ce65981b2b0b37590abaf1162a8dbaa27af5cf737ae5869fbca72a6087c72
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ne.tar.gz 2680789 BLAKE2B ad4b673b9686ebc78fd9602265c83e3554305c77cdd623a920c00abbf836a7323d11e309e1f0e82830dd18816337940fe1eda45c2de19eaed83ef382bc6fa0da SHA512 c9b1ffc047fbd2fe58ae3ab682c96cd5daa7c5492c925c737bea896a4b8af1a9a8360bc91d989f57fc46d1cc056735b5f9aeb1023ddb40c3c48791d01abf9403
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nl.tar.gz 2451074 BLAKE2B 332ca6c12770a024188af800ab6df221a39b2732da73987165aabea36f17c80dfaf2839fb953adf1a46100785d18e15b5b522f844b6146352057ba042607baad SHA512 e8ee325febd212b367f037bf8fedad920323794061236aa5ac94e60fb5581d24e09345f240ebaf004e3db36f1d4955fcdbcf32268d412d073ff5cbe4cc622eb1
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nn.tar.gz 2377509 BLAKE2B 624194ded55721315bc9cbd922b4f41e5a6f55b35fb6242a7cda81bceacf8b8e7ffa87694de1107947c70279d4a5e4fc21ee0e4e2e93327f01140758c0a35bd5 SHA512 68840f6727b3326ed8b5f4cef503b254b10fc43c7c141f419885edb2b2065afcf9bce95621d2165149fea97caeb5c4897504dfee7642699d5faf4a00c7fd4b06
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_om.tar.gz 2465319 BLAKE2B cb1a406b2476b7aaa79b6380a28c2de5ac1d957fe2396257db3e6d5e5279869aa2a4289dccc0473c9f498328d5a9d72bb9b305888e9b45a0015b737874e4572f SHA512 cf2a4b7200ea08b002fe2c67384daf58af57d4d7ebc6703003e5173990fd87a48203bb305b5d8a26919963bcff40541dfd5813e6cc02206076c02ca33d50528a
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pl.tar.gz 2538942 BLAKE2B 6478502a925d23590df407071060bd0200d0a0022dcba1557d0bf33c855e715ad1b8c78af4e461dd15568ed05febe9a9e6c9aacdf57224d31763e1e5fada6e34 SHA512 d65d3ae0e61eb61d83f01e080a2f98e10eda11730945a60d7e36efd9f24acb965a584829c12030a2b4c529d0bbe4a9782549f4f745de5e4d534828657c1545fa
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt-BR.tar.gz 2455614 BLAKE2B 1c132355fd1529efa66c8fa6bc70978c971ac80e3915036ac674805351a1a623bf6aab8bc44fa3dbbe5806b3042ba01a25d85fae041c73fa3b600a05cd1f2c80 SHA512 1a20efadfe52b1e14d398f96a93c92aedc34f2b36dd21081b43491663c4068dcc112648422e897ccaac8d90726561118663c82a907cde74fb2c62f04293ac2c9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt.tar.gz 2420627 BLAKE2B eab38d4589310be8e5fa68dbda00c7be2b94381f92555e372e69bdf5133b84b72deca8de6c6087448397d80d0e090352b6f1d94a2d7a438f5a6954ac5476e46c SHA512 257871771a249a9b8547f67e131c75c4c3b820ecb473b4af75421921eb79879632810b73bd742df5edf01becd7c99daed9262e7ef59b91e9c694bd6c58ed6f49
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ru.tar.gz 2722987 BLAKE2B f52f1132a768bf8e258272198cb43d80a12e83f312e55917ee143f0cfe827a3123d9689d5b3180fb50647eb935dbee91a1b831775b1051cdf4773b9024fe01dc SHA512 f2883e10b440f78471093a5a55cd9a31b4106d4d37f2c05c8f7dfdeb87842cfad8812b5ac6ad5977836b71375326c3b55d56fd6a45cfc1dc625208fe41a8e27b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_si.tar.gz 2429900 BLAKE2B 142ea186ff1061ad5233b21f8961b117d91acdd8e27b5683b05bd5d1b1afcb8db961a2204ff1eaa0f4c4b59719e94c5d9a68aabc4901ee8ce4d0e7503bf14ebc SHA512 0692964e246db5125ec0f90d44b5c5e6737332212011d4448820f0232eeafa23885556b095d12de83d3caa4166e9597cded9b4e3a7a8aeb7bb15e61800b85d62
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sk.tar.gz 2477161 BLAKE2B 0d6cd0b70548345d56a9248b7b423ab1e83c153c1d33ec21aeb17417bc157747a9f059f7a8860267c816030b418c81579bbb115ae12c58165298de56fc43ebf6 SHA512 3fb01e87b812e31538d1c6451688ea65162fbb29d2cf18ece842ce7c7dec397281abd27e281144b03f7c82a37e0a98e57cd7998474f09d6e1cf56903db4ca066
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sl.tar.gz 2420219 BLAKE2B a233dd66157a6488f91484c1aec0bf8a4b6c585bddc238338eb33520f6e2323d64ba4fc3db8c0efee7d81edef1c240d3d0ba788ed4e3e89463e26ef33f279d8a SHA512 041e56b5fef1acd4a8e373a5e86d1dea30d63baa9c7bd48df15e6177552ae36102cfe662c9b75d80a0ff8b71dc052c4ec15737f4630b19f9a8027cf66b0c2b8e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sq.tar.gz 2334744 BLAKE2B 7c6178ad0cab17fff01228045a2a0d67a27b34a5dd2ab3c8229cb7c73994f0cfda7798e63dadf6534ed6750cf9cdaaccd65ad0218d4d090b8c1108e0daa04834 SHA512 2290772a28a243654d0c6788f39c9a1eb290a6f83553a12e233d19029e95b028aa44fa84c086381eaff2855c3d57c29ae9db6da7611ad52a1d11b80e1d396c50
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sv.tar.gz 2420678 BLAKE2B 99b1d8dd38fd229bbfd40a9d2dcc13997d521c4aa1708d8efa8029be2e7b98ee38042ae3d8092bf0c17dd177c960b75e019f0cc948103708181acc7c6b53bbbd SHA512 cb22e3003179b5ef9774d5064cb05e50eed7cfc94d5ac27a959bef1487d6c5f03916796af2530dd1c9949c349eb8236e5e6ead1f87fc35fa839df8b40a3c5aad
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tg.tar.gz 2421993 BLAKE2B 3e869ba43784c96bcd69b55a59cfd6bef8ee722a5691a10b114860de3b52be2031dd975408e8dec2ec45dc061bfdbdc49b9428dfc309b4e6bef862a148b9efc1 SHA512 804e317576a55c843aa6460bc77954674cc163cf31f49f28d367ec352f834aa2fad2496dc7d346bcde998d526bda15c9bfa3867265ea4e4718f25e1a55dc42c7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tr.tar.gz 2487201 BLAKE2B 8dd3cc3accaed203fb285bf2d3984b7ddc8264837a8ef72a9c83f3e51b3263fa70449b43a9f25c392faf92081626dbdcaf8f2e4dee5e195f59ebbe9e141c4f72 SHA512 9009368b351deeecb13fcdf9f09234ee672bf0c4e54bc9a6b186252af7551be3dc85bb60d3062ab842dc4b34c97a1acead547bc214ed01528f6e0b5c11344e22
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ug.tar.gz 2392384 BLAKE2B 509fc68875f0d16013abb01cfa5b34199346f1d1a60895271244cff5668fba94f41caa94b46cb9fc5f622696b14dfaf002df3cf99ae9f91d5003da85261116fd SHA512 391d5ee3e83d19d2d63a3aba7dd1e4b23039015f63f5fe89b1bd4887c29203097c2882542d805572884724751718e9ef117451e4a5cc46af774c6015b5c92ea0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_uk.tar.gz 2673708 BLAKE2B 3d753f4d3daa80515053da7d1d2df9899daade2f8964f1e30f33b008ce704d91e0a49d5f61eb6501f83fc8017a8268831855ddf0837e5cfe8cf74ca68dba6dfb SHA512 2b2d8ed592c38010bb1f17666e6f7930bf0fc445e1f8ae17a5c6af13e030f82be4abfce6d4063d8239a1d16fa73f92ca7c87a0decc056a86b5c48439077e1ea7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_vi.tar.gz 2475820 BLAKE2B 8c0260a040205ea3b983c246289993fc5cc26f2f7ab4747c8994987b9490a63ccbadd6ea7a26233e4f27e401d29b3f5896072732e26e1c0a4c1b7c8215a03c9f SHA512 afcea6703ee5836b2a100682f9730617a99bad5e1fbb09320a02550a100099cc76ca336f3de9ecc9c569261f71b2881841f5778454a2096fd152fafcb24ed9c0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-CN.tar.gz 2501722 BLAKE2B bfe73da1039d77533a0e240c9a81516055fef30edee504dcf6566ddd50c19484e4b6f6f0c0303d00af344578f88ff5e116e790d3d38dc59e298ba06aed7d43d9 SHA512 00b483b71bab77e3f02e285e4332764e21457e693b24e0f097520a1ef63ea44c693bf04aeb9b4a982609ca2845a518ac0614fb3cdd02a6ed227ad9158dd60eed
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-TW.tar.gz 2523440 BLAKE2B 592c1362f68bb6027c55c51271b6703983d03db7def59972e6c609409f219a0aa137e8da2a32f88a1f874c4bd492e7fbfc27540ffc74f9fecad0d60ad170c835 SHA512 fe739059dada6d0fa1977e79dca063929efb4aaf812299d319bd14db0fb6d2b8c33093c881037e1853c70ad865920cc0f2b9c6930268641feee4442771d83760
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_af.tar.gz 1005870 BLAKE2B 5e9b38b81de8376d67ff3e7ba4fe9ac45e9145bbcbd23cb7e2fc503c491b1c6ac4e534ace43ed29330eebcbfa80cf0072cd1c156c4504409a0c7a09e5ee493e1 SHA512 a44f521d86cb0160374cc5f69215d4e82309f9e4a3408b9d4f4670854984b0e9cea170402a8abd1de18d986604819c53f2f7bcaa30c6a431d0287f3599e5b9b6
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_am.tar.gz 762917 BLAKE2B 1e3ad464789b9fe1ac27a26cf77d51aa0a31b876b9d2a74b2fa62aff01c6f6ae646068c9dc307a4d6a2fef906ee2f28acca88c90af54ac6d74789a3578694bb6 SHA512 aabd1052ce57d28071c1e12df5114c402a3d01716d42603bfdb15780a54c6ca153adf40788c809f8a7818e375c11a2a15b96a7357f47a535e6815fc9d3b77dfc
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ar.tar.gz 2414699 BLAKE2B c6cae2860c8ecbbb78c8a0a4ab410ea0ed5d6d79a07d5172b07289c742b7b3394cee01b503ca8158b406317e7cf2745e487f84816f36606855f435a3b068b977 SHA512 757fbbe2632e93280e329e0babbbcfd9011170d5da1947a75852a19a60fd83993667159ca3f36789abce9de0f6ad1e4b6431b3743783399750938d7a1f47f1d2
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_as.tar.gz 532078 BLAKE2B 5c47e62fa7f57febdcda6065e5fcbfa71ef45f4ed532b4619f8bbcec41dfce74c226b158651abdcc1df5a81f4f8383a0b22ef71b580dbd34c300d9f4534a846c SHA512 8c88029b9f09318ba0e2afa7a684214687c9979648c21bee2385ea69965ea9cc50672fdf597ed9482acebce924f45320b0cbfebc57cfbee2aca6d736129e7d73
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ast.tar.gz 440083 BLAKE2B da1944d3cfc38b611e3e39ad2096af604271b7ad12284cc72ba21bb6a1e37b081b647a55e5d1a1d94b99f3d2d33c3112b34131612f8b9288d646a800bccf63b5 SHA512 4e0a137af9a9e5872b9bc64cf1a1e35eb697a49cc4ecfc65f24734a4f5f8dba2795e804a4cc2d0383535a24a9230256624eeccd95931c824c9768fb1644316b9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_be.tar.gz 1055573 BLAKE2B a13709089df4c453ef0c541132989cdedc4659d3bb9c370ebf3674e8d86d0a7aa7561160984c0619a18046e50e4dcb4aa700155466ba747c52a70a923bcb06c9 SHA512 a9bc0c22bdcd67d77e9622a26ccde24289924b5adbdf75dda6c3d26126d7d4a9c5b4c7c8d105be9843539399d5b2327ac3f473e710ff5df67180ce71223a0bcc
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bg.tar.gz 2447771 BLAKE2B bd2c2d288829e799184df3d79ece4e4dc3d2493aff6be58a7d9c743166f60d6b416b63a1fecced9135ba13c0016a3336d330cf6eae0f394755644514c27b9cde SHA512 e6cb3979aef3b48c5cb6b89d580dc931ccf54e96222fdec3ae5ffddc221f568bcf45a0c28ae643380e65c16ad8bf6397196f5aba43b9a6bbf04e5db4a1400b3f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn-IN.tar.gz 648839 BLAKE2B c737fab1cb6d9c2b8e5ddcecc844d8b9645894493d6e578b5d4659fc36dbcadace133909e3ac020813884ce2fc40c1026cce6553b574842edab131fba7d72907 SHA512 cbc11292181fe845f87c2739cc74c0fb137755dfec48041e23504d13fa77790e944873a0f2851c41cf8d55fbb426983903a6173d4a692f451c4062cb43dfc273
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn.tar.gz 788850 BLAKE2B 7d10cb8223d3484ab7d7ebec01236c6182d1c964f268dc3c0e8522f2f7ac3b407648f46df92f1a226171860b1269c775a17c2135ec8d4888e54cf00be482fd88 SHA512 bb47b70f47a5d0dc73116e35af2058ad6a8f7e9b8b9fddb2311251109716e1424c1bf0b360b63c5898e41a9eb2e9cbcdeac3d396f5d226cf44fdee98bdff5933
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bo.tar.gz 380202 BLAKE2B c5b65558a4780ffd00bcee8447a0f31c718cf37a41e1a9675b544c03369f549cd18b68c8ad1a5213733ef9a029e1df14dc347d04d5f87a368d38a1a35be32bb7 SHA512 9678b879d7502299a5e31127456a8a0e3b11e44141c1006350fdf15c19dd641f69950306ac7f7c2ee697e2e83bddd0dd3137c1a91fed4318c9e7bb80f5512c7c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_br.tar.gz 1538425 BLAKE2B d005ffbf43f1fd0c59f57ba4ccf56c882611cf83911d32d1638b720ef85ba248ee4f12766b9776f287b6d754959e603f6d65052a079f4543b6e2ab35b49ff49a SHA512 17a7ff503c4ffa973729cd1f5dcfb17699da7bc32610aceb8988c4080aeb228101e967511b31ef4707413852771e35a54d47a78c6e12ff7d804930f173be520b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_brx.tar.gz 337251 BLAKE2B 5b57c62078adb44e30ec7a7502fce2713108ac75ebf749a2180540586a77d8498e459ea0f2877ab45a5a2d190ed6df860220c3ee895872ae568bc89222055744 SHA512 960a70a48b6b6920a92e2933fb3df907ebd880edb7f98629bebbdab2498a5a1b58da1a68e6382dc0e562d2d44202dcd05820e5ce37269ce8b0c7c0ad948ac08b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bs.tar.gz 636864 BLAKE2B d52e1dfd2a3c6d3093640c65316449ccd52d4e05ab115edf5cb47444c5c1fc23d13be37448a358a00ea89953dfb6e460b3732e79040aed4c22ab9bcf00188a55 SHA512 0b704b7907d8fbbfa82b8f549dc41bdd0f5a5c5f6e6cee8dc7b41205e3d2be5929f5c631865c928e354dbee664856f068926976b1ad51a12ede0a01ce77b92b7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1973334 BLAKE2B eb468fa263022145d3d4268a8a520bca1d0b483d26ce3018c8489e08c8c7555e01d9823bdea11a324232c4a4fa15bdced4435ae13c8663065f6d555cd3ddda0b SHA512 3dae874a626832bf49cd8fb5d0dd6df3e3b70930b4d923f537959ba9e46527e60582bf0644e9e72464fd6fa3efde7b2a84ad9d326b9d9bbd72d73d672c7f612e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca.tar.gz 2014506 BLAKE2B 2b2680c5f1c2414e5015af999870abe85505cf8d50e6373573ad7477ddab734885451e5c1492690f1d82d0b2ddb119789e9247cb2c34f4b59b35daed9356118d SHA512 b92e44d62da70a72cb8bf5077b4625ffd964faf0a554598f7845fbca4687ea484a2fa14378317e2ddc2c66baca5189dc31e2b8310569d8b20abc1efb9bb20696
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cs.tar.gz 3188459 BLAKE2B d4966cd979d0737c3ceb5e88057b6d48cb9c39d56672fe542dbe5c822fa125976240de29ce2673fe1df6bdffc6226e61526de416741971f153f7b9584164d584 SHA512 4d8cdfad81c2cd056ea6b79cca51cf4217f019148214117196dfc200d971dca04559d23e0345b7070eeb8e649c6a8fb482a7c8cb7531af3cfea7f41d615fe5e9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cy.tar.gz 723524 BLAKE2B efce5f60ac27a4c0ea51187a26140acc85ff58f19f788a0e9375a71176502bd7f3ff879663684143d0d9933f9d32686e4b742647669e23ed954ce0ab6a2f65f3 SHA512 cc5096d3c260ccffce5e155315dcf0d07d23cbb8a54cece82b4c64d6fb245b21e38a20dbbf92cb96bd9a646e2fd2e5785e93a884d31ef8cb5fcdfdb25e76468b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_da.tar.gz 2628529 BLAKE2B cc561f13ad143dfc12e9560e288c58712e163909b0950531916d4e0ef46f47c0848a3a55907a4a04a27fad824c17fd99efcaec559d252922d450ffad66b4c687 SHA512 762d2d14091e24569499a5a67c1bd61b2434313f7a8ee70e03a2f195268168c55004c4804509a9074a0c64d1de518fc6ef779c457516611eeb4eff1bc9ae4846
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_de.tar.gz 21757590 BLAKE2B 4e0859fb96847b5e8358dc33a4f8c7f0c512ec37c7643c97d6801155316a1ff8a03ddd0da031544f182382f83fd54bdace69716f2ec6364318694df7d11c589f SHA512 e7963dedf8debca7eb69e68b1df454a401959ac773c6e97250e8561153ea0bbd161c3b967fbe0b363c6d6c7c67086aa6d6a4a66ba80642d35af5600149c0f784
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dgo.tar.gz 441088 BLAKE2B 178f8ab13b73aeb6c930f38f64a1c726664ea51a1fb637bf23537d5410c1461f4a3a0f16105f4ecefad50306ce1a9bbb851276c5037418f93e28630a23aca00b SHA512 448fca01351262ed8d609e4e08b43443a3ff0ba4a50f3dd0fbe2583849f901c0e0b7387fdf71b19da407c5b934fd0260f2f157d1726cc460bf740646a8b46b66
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dz.tar.gz 368456 BLAKE2B ea19516572dc0768ff7c18585104c885e144f2945b034da8a105e456af60e8ea1827aa82be741c45d5ddb1164808bf631516387c7b4732ee4dc46b3ef1741c54 SHA512 a7f70fbd3914bdc79bf68eebc3aa5d4533a4588b3499b8c41c3f3eb02606102f199a39b5433d4848575bb20754c5a22bc34161388c07399d740868312e82cc38
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_el.tar.gz 2827951 BLAKE2B fa1252e3166fb362908d9d28398b33d830e30974061100e534c3d386479045e65c92c02a26c65f5fe7d90f1ab34661d0fbeef3ac0952f521d56cb71fef01bbeb SHA512 355b7b5013d6b869eb9cc23a82e3c0bbb22026d88c24845436682e236c3239771ad8e9567a4fe9a941e583daec112d3f8ddf3c27185082d808e0e0dca9b068ba
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-GB.tar.gz 7337599 BLAKE2B 5d1c276ac895e44c2e7e2ff375bc407e824ef4ac952b94badf6eb0d1995c07a50728368672db001e1beb9d427a5402a9cd5bc142a987bf0c80059b74b06247f2 SHA512 e4e5051002651684d6cff04eb83f050ba5a093c55f37a83e8d885ec4afdd7e4b16bac8e340a9ece9b8151b3472a5bf1fbc0bb5fd4be290d994be74bef1b0c4b4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-ZA.tar.gz 6924937 BLAKE2B b7a656b1d5d2f155a1073d240f92e3c8d50b589419762f9d81a509d54bc4fb06ff80e5c53989d3e93cf1a22eaebad3e92110c572637b24c00aa97d9ef49fa484 SHA512 cf06568d2b0d0a633f5fafce558244a206422ec22963f0a38bd3115ba535fe7163425931a4d465fd0a13d84c5c1f42c4709767baf2fd0529871948909708f4ef
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eo.tar.gz 720146 BLAKE2B fe381264b27ccf649217303182f88643bb6e2fa0f64ef3d35828ca4fd7174fc1b0a25b027a728e2c529447e08220ec1205c7e40b6c5a08a3982e8e83c444facf SHA512 b5ba0908b59087086982c2007b4738c3e00dcaab3346ee9015e45cee877de41614dc1924c8c3b9e3712ec52d7d3b8c80b873ad1a4d1f1a5b3108fd607700d222
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_es.tar.gz 2236120 BLAKE2B 3981f03ff2ec1da40f1d27f09dca248516cba6cf9d38058ff8b7490c64a1d58ab682aba9563463080a2987a47369ed0ea50511973790e0f16036c42bcc3b1c7b SHA512 78ef0cc5fec9e1488f2e4fb3896fd2e83ae3dc6f5b6ca36c984bb1d4492f6526a8b7935a45f7e1f96f254fdf1da0aa59900195142fdba593b6df9a23f8e6d0e4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_et.tar.gz 1603424 BLAKE2B b0748fcb1b9ba3974222ee94d0842a4e1a2485d18102f0d93e96f95318ad889b80785751024d9ac452458adb3a4b735eddf0c6355761066eaaf507426d56f789 SHA512 7f0cdb5fe70746fb46a6dce7a9601d424488a9884fbd19ce64487fb55f9d37679027022683dd306abfe82df566ae6019d6ac0163f3f53e0b1a97ba7c74479a8e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eu.tar.gz 729300 BLAKE2B 4b1d232cb446dc9d923f97d0b396847b6c4852a6f400d0dd4579564a9cb31446de1696e43c4985f3f2e2b5f4b552a082a45d1c32bcd07fcd9119f222dbd32aa2 SHA512 715da70ebe1b97065f5bb6bf72c95ee30c6baeae386b74081ce6bf9eebf69a98b78d76852ddcd8655c44a84cd88fa1a50e01bb08e3019ff1a5fbf08f7d9448aa
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fa.tar.gz 332899 BLAKE2B 7ff3f4429f6a2a0d0596a4a8069dcd312ba52eea50102a002bd486b954d9020606fe0fe19551d0bd7ff8148b1d853c6863422e4d0b2c25aae0c40fe1c1f92451 SHA512 9873cca6d1176836fd73c6ef4eab953d931678a88f8c39f30dbf135bcccaa52d30ebd54dc9953d66b88edbb4ca62f5fda7062fc36a4f2e9d531294ec611191fd
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fi.tar.gz 703300 BLAKE2B a21d263ce5323ec7bd47c0d801dd9f931887369db613beb77d91ed72a5c3729e8f509da67d436fdc7071027858138052d2a870e25c721db039c53f0fe2e41a6f SHA512 1a67b790c4dc8bf77669e1d067180570c664ce61031de988a3f350df4b14fda30d27657c7da79f3c63246a2e451c20be58351856b2c2739b626ef2abe2133f06
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fr.tar.gz 3035783 BLAKE2B 19637ea9be3c231ac98bdf98cdf5452dca1a46e6a934bc61a9bf9c73c8717977801fcb4d05fa67726b06cafbdff075bcc1f7ec0fcc2a7abdb692a9c0ef851be6 SHA512 53a749b622b2c020502d7e64b6e91bfc71682857a029ded85233b16a670a7dfeebbf20522362593ae174e5f5e250eab5f613c6312e94200e3d2a86849e0d17be
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ga.tar.gz 742380 BLAKE2B 64590be295a0d149d02650e7de770d20f5a3ce204168c9467d036b15fa843f59c86daec7b1b1023595f4c90bf528f35e376aa603b6f66952acf7cf17204ef7cd SHA512 e78a9a03d42c3adc7d7c702d10752cbae77c5904b529619dccb3e15058b1dbbc23afe5b5e4e4a8eeb6b99cadc0c80a1dc8c9ec5880ba2d481965d59cae017cad
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gd.tar.gz 1780998 BLAKE2B dc449777086024583fb354f4ffb33dfc633c0f202d07e0a2ec68e0af99741d0800d5545b1efe9b40fb7e28b83d1942af2229337929ca9413cd21c7deec355e21 SHA512 04e00616b77f91bebe40af703611989f124c7718dfc5f4d53ac275e29a0da78a4eeab740c5d2155b11c90509192bb1bd9c3d6d3a61fc311190299f14d5824515
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gl.tar.gz 2620637 BLAKE2B bd4ae1c17dcecfcfa1a091197655d9bb3c0be70f8be202bb554331d416943ed5d521d6239deab67927bf1a76a4737b0b7b75041977f308bc9c4ed7c64e92312f SHA512 fb97606d839b0764a3d9d84088398ddfa2012038cedf4f97fc743c50173f0f22a38a67fc0eb687f66fa874754177c1e6c55d42840cbb14a3e42c8ef838a16ba4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gu.tar.gz 1229399 BLAKE2B e5e1119025ca114b5d6a3f6f4f23965cbe3848d07ea694d4063419cc5e938a39c5df04072e5419ab7ee5342a25e3d54978a687096b8152b6aa8fa4edda50d184 SHA512 3ffcbda877dfa93c6b5194676057b0a0d60e06f2ba0ea2485abdb4da0b8c7f0846562a82694c4f72487b122bf0ebedbc1551251d3e4c5eb3293344c37290c4da
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gug.tar.gz 509166 BLAKE2B 2d60dc3cf8db7872e690584bd372aa9e359cfd63fcbb3d2b8cea7e1ef06da77925e7df5d9f55092a62f5b58c10d2ed89822408c9558a8b23ecc5187ddaf2e25b SHA512 f689ab734988a5fba7e5a749578bce20c7f6b3c8ca60e231bb603411d44595e775f468d4ea38a578c2fa2e36fbf1e872d968bf6c1d91edf329867835e285c796
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_he.tar.gz 1621997 BLAKE2B b0673774069d6046b841f28b39a958bc8a3fa95f397b05f65624752b46139f71e64738fcbb0e9181fe531098cdf3106f65cb92e29f8a943d9a7d9dbcf476efba SHA512 c182db2449ac86edf063b35cb4dffe741f9ff9760463e790b729bc26b39c568ce6f1e8c0d303dfea3ad9ee9cec4db906b0b5d63b50de4dfe9bac03be3270dee6
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hi.tar.gz 570928 BLAKE2B 8a334e8ff0c496cbc971eeb3045d2f9e189f0d0f439614df7b660640d37e04c3f6859ac2a6b6dc54f60ec4c48abea9a4f028345271ca088bf0385266e45f85ad SHA512 b3cca2e6e58249bdee71b51808ecb2cfe6386812ebf53dc6056e89bc75299646d2292d984ee411cc4b671e92b3d9d38f1b729038883cca606eab3785a3d7632e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hr.tar.gz 970917 BLAKE2B 74ddcffeb5d3ffbeb34781730ed5c369f7af8946c4c48b96de1fb66d5c819abc95e800a5f1ea681708ed35e9b1a23f2bba72bdf63883b3c0049b4127afb2b689 SHA512 79e593ca71a56941335cee9b0fc1460949841cbac15ee49a5d3c23c9f23bd0dc5a6654a70cf0cbe904aa7f4938df3d4e4e4c972f6305e9e3fb1041bfd7aca9a1
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hu.tar.gz 3013146 BLAKE2B eab8ff68c108acaaf5fcfbcd64828c84ce216c27f4a67a22c5a624671e23475f945ff6444387e9755b7e696a8c1f3af78c023aee3e62a559af9afcb5248d9971 SHA512 536d75796e2fb5ee9d6bcd55ad591a96a97a89936d7f7918cc213e8a3f8b5daa3492e1b28f9e2cc5b26b764be538fd80450993802d1f7d084607902c9ec85c46
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_id.tar.gz 1582653 BLAKE2B 8e6762ff2dfc3807e08f368d490f6beae5f42ae2b630b9a6c7fb7474dd36be560e809f5a5a8f706ec1e3de44c8d86b0df01a6cbb94af0cb133da5742470125e2 SHA512 1ac03de19ba5107327e3b5676b451c5aa310af60c0339c238f3468ac26d8b1a856259431b0a95e4895362dac196e8e954a5f7b0c089a59e489e66025e7c246d0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_is.tar.gz 1500546 BLAKE2B ec2b1f606c37075bb826e304244ea91930584c82e8a41b4907f9a72dcd8373824361dda735c66c1884c85d283b6ae216bbbf88b647bba4ab50daef9e2c6cebac SHA512 89f1f8e5c65aa8dcfa3af8818c60d1c5450cfcefe8fdb040e014ba348571e6e79f65514aedc97b169ca82f1eddb63cc105b6626a29cef7cdb670aef02294bed7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_it.tar.gz 2068177 BLAKE2B c464e83a25017031b98649dbbc8745cf01d259e61ccee42b2af3749e483c5aaf79cdf1c7fbbe38be4295ec446e8bb748df0390d1ac50c1d3e6233a9cdef2301c SHA512 2670b06a223b69cbaad6ae0058772a6deaa5ed9a2565f40f40c5a2549ef0bf86f9d5b60614197719b4e8c3fd5c6bf229e23df16e63a2f9756e4b7239764d676f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ja.tar.gz 809447 BLAKE2B 754df3132cb691d5f691c56b19d46e5265969f4b16fb16bbee9b28a155d4986323fa7a5ec7eacb773fd07b912f3b3dfd4bd0673c9be375649712fea4dca7ad1f SHA512 4af477e24cad6432cd9554b102d817725769abcf71a90c195a8644caec5ea42c80c1680c0ba86c647738d52724ceb805223305d0ef56da11fdf6b99da6330c1a
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ka.tar.gz 360700 BLAKE2B 96fcdac4735c36faafd9c041aaaa7106406e9a9663cb9e74f52256d6ce3fa72984f3a803c07f7022fba8e9df87f76e8756992a9a33b37ad06f1d9b99e170b235 SHA512 290933180764aaea35fb953415299be75d9204a7b527570170f401e397237087140b816fc7d2f62dadd375f192bd032fdb6f27c6af5c63838ebc7bc6e8a60f98
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kk.tar.gz 781495 BLAKE2B 6bca798bd59e37652710dce01eac004e497ac0c7e568c5f6866b8d649a8138b1f3b6dd5e9b878a643111f853dff093a0cf0b20cb56f46ec18ee6f200e2254f22 SHA512 a65922bf8d5c10b02a01a99a47b5fe25d529a3964852112cbbea85aacf7de6ad46c86f95f65c0e83fd159060a8d675c59704d29ede867770c807064fe914f377
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_km.tar.gz 683519 BLAKE2B 5561e98fee6b89a5d89a0e9e985867d32b629765599056400fc8a71a0c836cb9fccd27314f010800b4994e98533b57d9b86183821890c9634b597a5f6f4c8c58 SHA512 19332babd8709ebe352a9b27c5c84e60c08526f5fac6f7778047ce98d397214c556616774158dc858999c2922247bb6e6df812740408d5c50ffc00287b20dceb
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 334445 BLAKE2B e43672c22f25b1843109bb6d6d94ff463b220d6dccbba8ddba81f4002efcd6ff2d6d05649674a79629dc9c5b28d1428f764ec559ccf0ad4f5424a51a6162e1be SHA512 203e298dd0669de228cfec4df980775abf3caaaa17615e07669fcf8591645209de58c4bb2902c1ff1f4f4c9a9e0dc7c44918a43f77f344a3e8491d5bc788a6e2
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kn.tar.gz 583571 BLAKE2B 7f59caf6d00bfa50eca0e21f486b8b8334ec791113deb188364f45f6c12f9305f1f2ff84e3bd762c84245af881ccdc9dfb2a204671f48b7fb945f206bbdcaee0 SHA512 61967f043c0727d22be66cf447da47f8079bbf6167147f82142ce64e38df7c4d867b3768ca8e3f5b93f66035fb888cf9b290d9cb8a383f206b22d87e7d001c6b
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ko.tar.gz 806346 BLAKE2B 20a6acdc429eabe2da3a8ba865ede6a696625fafc485bc4dae6f1e6442a547d19a2d5b0dca342ffbfd772db964377018db0669e0fdb7c18e10faa0174bd51d6d SHA512 95c3c8134d0ca18c56327b2a756fc36f58df6c663920544aae71ac6c5974297b7f36f9ecb16dcc9f0a6b43862dbaf2fa604f95d63933c2f7cd70160fef79a896
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kok.tar.gz 411976 BLAKE2B 17bb116083f039a0d82b45908031f7f5b9f74a1ffedd00189c8f527e8b44dc60e0e43ab494a1c8e0f0468364a95b194c2c15afbb1a048272efa2d473e7e9889a SHA512 35bd98baf976429b690629da7981a7788346879f2408ed9d81c7a017c53bfef575c8a74ec571e20bd2599c9e24356ea3d07e4c667b5b41d59560a9667627052d
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ks.tar.gz 330709 BLAKE2B 55509b49afbc5389b22fcf0b63dead338c0a8762781f6ae545957eea66104fa867bc159db2de4437065e759d4f81d687988300f17b72a95ed3a28dc63a46ded8 SHA512 e76e6bb09451952c61ef96b2f5d79f44dbd10d432f2a1c5f6b52125a978800e29f175e80fcb7bcc2468db5959650d710a7d39c23794e1bbc9d78877afb1e0084
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lb.tar.gz 142643 BLAKE2B 3dddae2f9ce9cfc8ea94a96e166f94c06087bd7b55ea0f205b76e831ee9f2d799ac60a8b5e60ac97db7d8af25b063676a24ceac8fc2a3c038925ee67db62078b SHA512 082f5a151d0988835744269b33f53fa07ba6cad1b5726dafec44f131e5c546308a285233f6c6158ff918611f1b419cc224fea67b0e68bd8cf7635adab9064f50
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lo.tar.gz 432235 BLAKE2B 1de7f8fb5a2dc27b377c53992b331f97791922f31a54bdca5a5441eba78d0611b3b3ebd5d722d2cb1dce54bba65cdf69e979cff47d992e1e25b2548fade7d919 SHA512 4ae1be8ffc3598fee0086462ce247dd104a884be73de3478063f1fe7d59b3f909b50ed0680f6b4e861f2304aafd51687f22bdb2db3408ef244633123a815fd3c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lt.tar.gz 1024373 BLAKE2B 62d1bfefd64cc890c76088dde5e4c157bbb3e715da9bb8b19b136b4b8c2ec1e44d0bcfb9440dd1c84496d3e2748a87352f71a76c877de4c126ca1843e92734f1 SHA512 c7b0c37e5d19dabf20a6047681c7b4e73b419419ddc2d349642eb437a4c03b3a8fcbdf309a04f5dc7c8a9b0bd7e12394b0b8fe54f6a5139f3215351f410d759c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lv.tar.gz 1480561 BLAKE2B 3599ac2b0618bdb77dbb0a85e5dffc3e825ae419ffd99b9cd02db758d9344e51c2967d2025a95a5e246cc7ae10d5e28a5c5748eb9fffbc9fc653535c6bfd8af2 SHA512 75c067f549a3f011d1dbf43bd7cc4eb229adbc9f9d09c50c4cc7390f36f0e59b3484ec8a260fb9476d8330b205c4db7212bbe51bdf9fd3c3df0af5b4d38b9fdd
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mai.tar.gz 331167 BLAKE2B 759c92f63b5c7f5f963f8acc06f19e42b5a6a5a2368ce95afe8527eaf67a84769cbb5466f7e64831b0a81d78eccbf01e49715f16f7e7421966e7630a9a538c04 SHA512 b3520d0891950915bfda6b76be7dc69199dc6893162eecbff32eb634f3825278b9c1fa0f1dfa44e125ee837c9887d6bf31a55d70d9efeb10b7571c706ca612aa
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mk.tar.gz 384208 BLAKE2B 948210451c735ba7fc2150d1fbece741ee8e68d149aa7c3c3bf761d1c39691cb3475088c40d9b0cb67355211df109c38b6db10f63b2b8836a494de1158333888 SHA512 26e7b32daf5ee7d163caa2495a24a1a39cb77b29693abd2a544344de1aaf0333649dc6aab0a4fe1decefbb10c301e2eb157143860a16edf67e73eb5ace13b81d
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ml.tar.gz 545135 BLAKE2B 5d7cffed39f03e16b59ca9604a28c8faafa992016b46245d9f4d206ae6af2de14f63291e4201bc5e40cf4a0b2dc2b6c030925902c6a1efb8ca22479bc61dbfe3 SHA512 ef7b677ca6284000d034bb2968e9964f65d1a9e89245985e52fcd8307066076bc1b32822a2996fd52c4a5414a59a1f5444c23d6b8ed442e8e855e395dd446c79
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mn.tar.gz 508313 BLAKE2B 69628a5a425fffbc4136d2e80f2e1778fe4033a4a9e8957ebd5f74ea6b85697bbc9a637ab53d7a5ee2e99460004db4173bc10a90312f3441e3b8e1a9d719faaa SHA512 95e2174267652aa22d93ebe08b16c0b4c7beea0b94eb0853a6171315dfd914bf1d949a845ab3f717d6f928363d8a002e5aacdc699d8015f3184ea817aa5e395c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mni.tar.gz 403802 BLAKE2B 2cb955bfe546b007e069e821475091f1daec22f3ee22aa743bc0e8a3298ee4e0fe21cf11dfe5919d64d260eb5bf39955409b11204cbf971d7c92a03c948e3cbd SHA512 f01b63718d96b3dde4d1f23b44cdd71832b7dafe3870fd91b4084eedd313bec6f967c96f01d644af25999f66861d0db6c6a650c4d86b471ee639096ed23ee2d1
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mr.tar.gz 579299 BLAKE2B 576591a3da11947d3fc8969c6dadc153faf510c37fb3c23996454e7b607abe66818d0f8f8198bccf77cb82c18cc211342fb1e9ca3022902ef480103a05891a0d SHA512 528ea295c2c5ab0b4806b762699a8d48731b9848a99c2d9c1b869a83e0ec50bb50810f7b97ca49d29a9eb09e6e2f480e779eb81da6f9edb5117fdc66200044a9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_my.tar.gz 465572 BLAKE2B 689fb8e457d9b7dab709f6e3bb7842b36eda307f894b3a37b32cc224f35a76bc158010f731a235aada08a69814c6e0b83c45cdfd2cfd4a915bbc288ed8b66de3 SHA512 067b70cec37d6ba8b57c76d546fc1bfac6eff79f79dc4bd1c0ba322f20d7cc8d1b439d3f7abb9973b59cfa1ff029684e4a040264324c8bc1fd8393d18e5394d7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nb.tar.gz 4064717 BLAKE2B f597aeaeb037bdbee94cf7128daaf4a7c1bf9583c86c250a40ef1484d0a8b916553dd621ee8cc22edb053898a6a8df3e6ced056823c0fe88febfaa986a7bdbd2 SHA512 cd0f80ef9b37c57304d9c2c52148cc92da60cd9c092ea14adc58fac7ed0c7288c771c9d26cf17c9bca034db8bde507f60b438bc6898401c4f88f6c7bf0e4924d
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ne.tar.gz 844377 BLAKE2B 71a5d091e4a406a07363010c4d7b7c34a7ee326da4cda3984c024ab3058eaba06bd224c93cdcdf98e7b5ef3ac81d1e69938c7aa5d6c7475cae7eee9bab11481f SHA512 5fffc4b121268d4232966784e120b20894a49f22f44515b9237b8a4cb4e685409d5df4e7c72907daedd917fbb1d049fae3c4f71396d9793fbfaad08d7343ae6f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nl.tar.gz 1519975 BLAKE2B 6199840682d0a3bea3887f3c70a2f1d1434afe082627c16c2cb8a155b1acb2bd0ed0a155625ef39e6c4dc2a197f347742a026c4087f178f8364de339a32bf061 SHA512 3ace44ac0a196099fd94e166a8921280aa4eac325aa770cc97cbcde5c34f4dd7bea825276413bb44791492f9bb8efe0fb5efab8f3b159b8c95784a65df69170e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nn.tar.gz 4064004 BLAKE2B afca89bbcf5669fd27c982a04136e3d28df56e6ed9126e507e435905b349bdfa42c8a768c195ff0859f016e1dfb82bba9ffef37a6563104c4ef00ca86f8574cf SHA512 50184d1576e5180412aa3c05705d9630fa5538d5f450ddc31de1ff646e51179d90ef97aefd405b4567b10816cc4159c867ad2a41523f8a1a24daf5eb611ccb62
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nr.tar.gz 277622 BLAKE2B 40214707c79b1ad8ba459b0771fe526caf0aef5ee6b916a0d3796886f38bfe2f99752b18f334324c96089bc820b65fa7d1896ffe82f0b75d0e038a6a064ec01e SHA512 e3d00c2760a3d0782117ebdcea1baf74461a1393cc4029e8aa21d61220e72ed9ff149a64e3a81d19376ef20a8b8aaf2712d3bfa97d6bea7cb6878e2efedb7487
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nso.tar.gz 322030 BLAKE2B ecca0a8ed7a63b896dbe360009bfca0d8f22db8ab0119f6d883fc3bf3c4b1ce78c59efe3dac4c1565391f71a43c145f2de7ffb84a50ec138f501adb9c14a003d SHA512 602fcc0cf8f8e45454a3e0d48fb2ba086e647403687e500e2d9bf073e1e2df17718b1b60d8f5cb1e0919a8b9e913bf60930bd6a67ebcb07eaab85d1da9bebc2d
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_oc.tar.gz 881984 BLAKE2B 0b628486cfcdff23928a4f2bea30ee12add31c44079a08a307b7394df8e6ccf97559131ebf7f2bcba563c83035474a75af4da4e35a4bc666a1a6f28c9d125eee SHA512 baa7185ffdeccb4cd8d4fdf9e340ef44b81ee9d7a755ecbfdc63b4312cf54a8e54c936ace8f4edbd5a1069157f5eded79559fe08aab5fca8fa9489fdf80c633c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_om.tar.gz 371019 BLAKE2B 8b5dfd21e688ad7e9720c06c32cdb0d4dd4ef6cc3d25102f2589a61fb29724397c0cdc7a878937828ca6a88351da3707e0ab54618faeac0487db659c657bac66 SHA512 edfcc0169a984517af6200e5e9ad36dd727cb1e645628c3d34f1d36c1c32aa74da12bf6fb476c3cc106ea974bfc6a3ce6779fa1c7481741f82f52b56286c901a
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_or.tar.gz 601999 BLAKE2B 47d8db7a6b392a809cf9f8718de5e2add151f38204fa834e68a96f96c0c1b479a3b42dfb85edbb102732e4e5af976db69fb0977362176c68d09a7771b71ed9d9 SHA512 b45fb5049a2aa80055f3ec1f1a35d169993c99d52e24a89a870cbffdb35d073e2502bdbb82d211b339c73b5e633ce02168fa4f2b88a6e4e593ac4ede5eccda22
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pa-IN.tar.gz 471558 BLAKE2B 2e4011b10882abff37095710769e64bfaea9a00a82225b9164b1f0a48c3ac24b56bad972259cd7f605c591f0dca9c4fdb59bfc75c2b53b6c82d207bfd12cf914 SHA512 1a195eba28d3499e9fd985e07162661f88329e06b1da896c121372345e6f37b5c29d0454cda424fdec449ea165145414da320514d6b74c9b815490aa4a5bf3b7
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pl.tar.gz 3093189 BLAKE2B 152308c27384676833ea1a09e6d1571d3d8c58513afa4320705b54c9fee6342bd2c99fc88b57ca813595bb38cad2e68d9e3c1acd7eb1336afa3b3a09a5765902 SHA512 f704f1d9ae3b23e64f531b840453a6a4f053d89ecd57e96e82dba68fb4cc59e26d87a68075eb9f1e040f1cb4e24b3a379c16eb2796d9acab1d684875a8ed133e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt-BR.tar.gz 2816984 BLAKE2B 9868df077893c2bffe6ab22fd5efa7b19604251b680318c87b06fdfb63f9ce3123f1aa87b4ac73e6c862a7b3c115d1735c711a9ce0f47d3c8d88941d6d10927a SHA512 f8a187d7a0ea7a4eb6b328f52bd9e21f55dffa5f2ee9a47948d0ed42cfe08e360d9bfd8017d25e1816326ab47769e439a83147db621caa627f7c26bae6bef720
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt.tar.gz 2371288 BLAKE2B 79a3b3aa816b30767950cfa0fa5c8450b63ec1ea5e4c16f05e55d8420c24f6d7d543eeeb4c3fc869f2040836e38816b698fe653747e606ba40faf79283e2924a SHA512 2526bca4d34fbfd66f124f75c0c409e287846fa097e08e105a624f6aa9208e6cb156a19bd646302aa7af4ab1bc848f7169c834230d09fd5a01cfdb0c53e623a9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ro.tar.gz 2531499 BLAKE2B a53619c8064e0af0157c2419c85563c8a667c47cb6a9365e0be32bc3c1e06866b0ae8a2ef18c560ce1b8d3d1cd1c3a58ffd239cd5512c37aba9ee5e51e4b6188 SHA512 ad001e554ae1736271faa9e157f31b0a9b1d07b9b2d066e0ac6208b2bbd3e69440d59ec4420ca45cc3420b2f25af04a715013ed0f6ba3420562318a06ac7bcca
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ru.tar.gz 1879325 BLAKE2B b90bac7e9671c9aab7f82c532d6f92cb0e41d2a3dacaf0fe2cc3e503ae22634e5fd36d768e3033b7b9a7fdecd37ad04494c5b358e9a7c030786d1ef275d87fc6 SHA512 a2499c871613e5ba0c7ef6acb5e2bf4b7f46504f1048a115d68675cdda23e8166bc51a43ce02592a04fa080acd5d8d0ec07c66018b98b601b2e70f202cf8e05d
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_rw.tar.gz 346189 BLAKE2B 9ee28e7f7c3c4acbf8b294f100b9cefc5e950077eff2e5e98905a0e7ebffe8ed4be5daff65c22f5b9faf9e8836e3e61c9563f622ef54b65262484147c8719320 SHA512 ba49d47ae20b550af0929c2ba2954a671c57972525a01cdeff91e98725822625c939deb4c6a6db67d4ef7f1425da347b5cf6cd9fa8f820f5aa573da09613c75e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sa-IN.tar.gz 451841 BLAKE2B 63449f8dc51985982512599bf0afcbae448584bdfcf9c3456faa39c74b26c296101710309c866353ffe3b3edf0b1ce9bb9215446c180ab11127bf10e28189b7e SHA512 42b333f26191adb55c7afcce90c633968862c34f61bb613b843e3ba60bc4dbb2fb350c7e75b3bc3ea58f2c7f865584ab4ad5153123b8254f758e60731c4a1554
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sat.tar.gz 522734 BLAKE2B 958d420fd7196eb2bc9302f0abdfed1e4653d75386e2494b996c93c902e33e3839952ce2f0075ef630b7e3233b37729f96d85bceaa5b63aa8512b4f8e7231cc1 SHA512 9d3fd353f9547addf4493a8fda36cca25c9519c94b8c45776ae607d14d5ab6830e2015dca9db96afee72378757c2345dbd0917140c0285f167b6f541441c2e8a
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sd.tar.gz 437887 BLAKE2B 927b3106b1aefcaabaa258a6734efeddfa3ecc784a65758f32e482fdc1d0cfcd6d95dbb5459ae3e8d1c6d6a091f89d0a62fefeb75b8e29bdd015f0a86c9b3f09 SHA512 5e1036613cc1871176fe82b01f6daa56c69fc43c1193bad8812d363979ec698b098dd26adaf0692342c941ab9b0b69d14f07d2e520124253a190b467328a3c0f
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_si.tar.gz 738479 BLAKE2B 3c763cf8444e8ddebf545b2914ce231f297ce6268b81ad3f284141b9e23625f89b1aa824cc8258996a097914aa9ec941cb919841f4911a26ec71307874db221f SHA512 30c8878521f9a184ed240f9a1096f88c136f77b5c8fbf61d2f23d64fc4c2957d1f95003b6b3d7dcde5e43234c901064738b91092228e05a01bd3ca2a0cc3c0d4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sid.tar.gz 452285 BLAKE2B 2ead23f4702035bac7ad855764136b9061117e1585d72899b9ce26265de6d32e5ea5b3de00aff9171e0106e89a6a5358c6065732b629d561be2307cad458010c SHA512 6027bef3c0f545ed98a16b52a942b3867e2b0ceb2c6cfa4b46adcf88e77c84de0c90b6cc6ab0937da1def8e227e05efee734c03c881f981f76372f6eaee16de4
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sk.tar.gz 2027916 BLAKE2B 3532ce41e4e295584d4f148344921cf7d5d5f71e4c8c4365ce671f0c9ff5f858d41a8ce9e00417cf9cf3fc15478d0d7535b54d6ee0844b2a957b2eff0e98d75f SHA512 22cad9561f96b523dab2f6ead49757cb441247946024db077a02e8cafecaa03569a10919a25298381ce47aef716e37ba4b98d7d93148a32050844f01dbad5840
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sl.tar.gz 2432924 BLAKE2B d61d758fb25b1092c36266ca2ad77add085dbcf169aa8f1544c4e36fb4d925fdc5db2a216390b47ea115e786ee1a4716bc5dbe0258d908d7569b338af3d58616 SHA512 6df80e2df5219713bc6eb6f8bd23fb975b82b2c48533a4060986fa8e69d59db07b9733d3039d110d1b08608abfdc778223d6dec9df9a4cd22a5f69574d1bd18a
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sq.tar.gz 1171063 BLAKE2B 7b34af71ac56b4c260ab2016b77c548996430de293998466865e9b76ac548a8560fd057217e4ca5fbd1931e652c7d9e74e34242c7f34b50d4017f6fd8c9fb762 SHA512 0fea122848d3442acf2cae8e9a301711a74cdd2f15f2354908594953b0c2734032d0f5b912e01f10d9c7997668f1b06c53d171081fa28d128ca2be1abb9a12bb
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1460949 BLAKE2B 11f961854bcf1a3d34a98f421adf69f87a86b1dc96d4525886643a22630022c148cc679973ca542eafdc4295ca8c019f8c35c216ba57216cab5ac536eacac480 SHA512 579707e3af81ce379a8e9313878f92e96297a95d58361ba8266c9d83e5c8f9da5adc68b98f27b3040362eb0dfb822e81d3111b6314847036eefe54504949e2c8
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr.tar.gz 1480531 BLAKE2B eb004a90633dd652fc621cd13d118407ec7d855808365ead58431c1ee8bab6431c61989338e2615ccd4155000067743cea577c2c747b1d7399f4ee311c8776f1 SHA512 13db28ae33a47fb82f26e4cdb039db46def31970543a5cdd91f36efffa301147e4eaa1fc96bcba1f1ac89ada6782c4f7b72c506ef82c8d7dc8106f5bc74af6f9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ss.tar.gz 286291 BLAKE2B 87fa7efdad8cf7f8d6a2db8038cd5f4a3c748593df840f5547ee9ee5078737e6a9851791f7a4f31e97460e98fd7152084cc9fbea1b6cc6ad759db4635b4af549 SHA512 e9a80215fcd75af6cbc0f3db81802024610009dced985b49b06e9eccd1815846d75b3a82beebb65cf9fdaf0fafe5091123ae9d45f691f4881cb9f14dc3076a74
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_st.tar.gz 279459 BLAKE2B 2bc74bfaf1605d41ef16f0e69c549721c8c85b8623d6f2bc17aad345fd856750843ede3e02f73c034d07271d9a888243027d585b5f1cdd2d05c81aceefab9e12 SHA512 8267b25f1307eb5c5797c4ddff9b33f335d5afd2d4f0dd84cc33246db80ac248ed3c145626d8e8fa32f7bc29a14d14e2304f5a0d09e574af8aa31ce5d814074e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sv.tar.gz 2609090 BLAKE2B 66397a0140543eb37a1dcfe739617e62bcd80fdfc0108c3e35ed3bffe9bf97b1b768964000e59b18b1d5e3d9ef895d373835aacdf09fcab214b75cc599db66f0 SHA512 30f543104e0395ca05c21e574ec6914b83eeee31995d2e988bd044b6f4ba17e133a611aa516681b9c570321ef960e588158436961004fa92b320a8ec5298f430
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz 318612 BLAKE2B 48351cde394c6ea2f51ae000dd20d784866c288de0e61d1842bc4190802c8530cadcc7f1ca5fa1d87472ab88b3fdccb814ac3d35c0653059eec56524f4f10440 SHA512 bc439b883d40cfada8392a0324fda5a32530d6b3657fb979fee4d8a028a744eb17eaeaff9cd4b028030390791a17625b4eb7833464d4e49d77be78bb07ee6725
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ta.tar.gz 685756 BLAKE2B f80347a0f3cc8b16089e0f6e9810bac0ebf1544c2dbb52e844bdb019bfddf6642f4597195369a27b9ff5bb071856897729c7fd3a7d9c573beb1eb1949be89883 SHA512 c9cd6a4f9ac3924962bdaaa8bc3e909a374b9e8032e4807b96af5b973dad555b6a8dade5bfa74921ff44e382206869d247a9200029db30198ad96321f74e4efd
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_te.tar.gz 1089429 BLAKE2B 1a06987242212b45ab353843e6e271cf3f8dc93b906312afac36a8f016cffb264c7fa4fbc0462c2af50bdc0b0e4b9e120afc4d69d1d148f8c56282debc123749 SHA512 f972fcf878bcc5697f55a068157c80de1e37fb67be94d523007c17676c153a62a2dae23da02cbaf2141eba6932d7025d89950fb8e44388dd977c605ed692072e
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tg.tar.gz 358358 BLAKE2B 718b4d2c0d815df37295a1e34f0df3b947f0073953a0e7d4903da951008a8a7ad2456bb4344017bc738bbeca158896b457df5d7e52cca450d594111d431307de SHA512 f4e0d2e9bbe1b83c55faaa02c1e2d27550cd897cf4548f0edec8204756c802c62b5fa72dbda66c92acbea6bf6628f0d964f8e6afa89968d540d4b5f10d6fc012
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_th.tar.gz 622578 BLAKE2B 3196710669e424377ef21c66ef1d0856f0bc455563c5de14f56ac0e9337c5b743fff8362ef242614d007b21bda17ca8fff2cc2059577122e40c9b06c65c4163b SHA512 4ab552cbb04e9a16def25c16be2d97356cb43f71d9814ddf15018fa260a24a0ff9e278c13745462a9e2c7e758975a2834e33da5164acff9bf745efc6bfb02642
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tn.tar.gz 258981 BLAKE2B b6231eca05fcffb413b4bacf2f1dce873100277cf662566479b6eef8849c4a8c32e0c56590e3dfc1345641f087f4f43de2deb4b4d7cc8f125d8d03f028ea099d SHA512 84aed21f125a44b1d6c8c6049abf93b75c0224fa40f228b55b2a8b4892a56693d33082409ab326ddf5c24b776c0343c27b929b3c67dc93ce17e32e7b48c6b352
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tr.tar.gz 760133 BLAKE2B c9d04b243ee62680cf58157109c4bd0e2a960110490b38e1245db32ff049494e2f17fc8fd339ac174e0351576abbdf0120057aaf7ddb50a6e4906937310b2b4f SHA512 f440c4374db91b27919d3d3c5ba36d16a1ab76a7a7126cc6f89bcd7805f09be29cbbce0bbd79a19a7eb3c95e840ba958aa35f6097025ed544cec305c71c4fc35
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ts.tar.gz 277099 BLAKE2B a2d0227276a229c1b16fbbd634758196c3690b9f490980312341bf7cc3eb054ad63c17cd3d57c3641994c60908d26678a29a4bbc4a564ce0ab84bbdef92618b2 SHA512 17e467b4c77f2cbf30b511c03a73f5c0c6523fcd0da2d76fe562778674e1435dffe27407979c662dbae2f350530f0166c646f1ccf6bc0b8a6f21683682f69f07
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tt.tar.gz 183363 BLAKE2B 5cc18cdd2c39dc0d480d55dfd4a1cff0df85e9810cf9b54b8257fb608ec8439ba667f54d0364ff30817efc55daccceae5a8cd474ec2a1ee2d0e0e42ba84990bf SHA512 b09d3ee2979b3c891f3e52089f4892399d81d7e3b7d8b15cb133dbaba598fda02c872987775def3a18abccb387b2ea17b66a65f20804e6713796dc9ee22472f0
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ug.tar.gz 549900 BLAKE2B d641437d5ded4d527da6951a523687d15afafcc89b513d26485956cc1da87ea881d2a25a2808379a8b3603269acdf98caec4bc49c26bdf5289681d7700a33577 SHA512 a6e156f68518ff3c30ffd821b1e483612be42b52d50e5feeac9bae10504558aa08a1c548551f656adf1d9a453a16ad01060a9992c09018b57f06e38dd095c89c
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uk.tar.gz 1621094 BLAKE2B feed3c66b03400dd0aa9943d39775f92ef10db97fcded85b6535a6a6ab78d7a843a46c20ef16ad307c4a9f1466d6f0a5263274ab4901fb321d05501cb9a91c1a SHA512 a87a763e4d4cf489c8edb6652f92d689b5d85d290ac1c2b9295ea8ec98939245e79a2af3ae36a5c20545d618b60baa587504319974a95f877fbad464d32217c9
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uz.tar.gz 314813 BLAKE2B 9d414708b1e10d05c4315ab3dbcde6e0a8a3a1f181f3096c20a5d3986b0eb1ed2fa3643fdc0c1c64a542da04412a050e16c3a9c38709f283861ad9db21afb84b SHA512 6e727b92d54ada836d42471f0148536db4f77e462ed192b01d63df56f1701d80e02a876bfdf4e3546f2891c95aaf0a0b21f1a02ba7d5d29a68f94f377c6fffcd
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ve.tar.gz 282347 BLAKE2B 17a8141746a1be060d4a54c8d696c62716cc8136ea0450d33191df72b643f8e99cd650342769260ba66828436d708f9d3027e9484c50e49dbc9869a57cf5320c SHA512 bc34571bc6d8fd2034f393c384295f70f1de2a3e07e0625985c307b85a4967755f2b4a6a346b9cf250483ce7aef2eb5d763b5ad60051bbed5af3115fbb1acda3
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_vi.tar.gz 464883 BLAKE2B 4491b32f8a6372b5dfcc21b04d9951dd1ab09de684a9221f2eb6673bb3acbe574bdcbcd2ceb922cafb54f4d5523734e864a5e09a9a54a29175bcefbe3178cb87 SHA512 45c3ce600084eb485fd03e749d7107ba2927c5ddf33ffba360485fd6855298237ed166e3e214ae6e102aa3cd324540ddf7c16afcec3878bda69d73a647a65905
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_xh.tar.gz 290220 BLAKE2B bfc25c5a8b4e9d9966d50c31ee94ee36be58a463ce482ee15e0150a940959b18d7f2a23ef476615851c601667c952b876a01629b3f610646be3b698282895bc7 SHA512 aab2042d9a44ea1aaecaaf6cf1be79c22db08c8865dbf4837beb6aa866a41dd35a96606c7380db4cc7e79b0dca8662f89f37c0fb68285939b508389ae20b6afa
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 809658 BLAKE2B 24d78fcaf2cb0498375b6107a3ce2a1c273eb9ede364a91e1ada69c8fbfea8bd454f8926844d24d040c217a017c6c6333039408b09b8870d9fbafe141022a70a SHA512 9b3ddef62a2e3093c64a0e19b7833958c0fc5f7f9993e0ebe32a65ac2be6abbc7356cafae9135a7346b482c01ab941237a3bb123a0437a804c4b548d45086737
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 807679 BLAKE2B b02599d2761a073648bffd91d9126c99341eb00c3ba42647597a24375fa95fad4688693bdb6f8730b4c215d5f5bc61c1a29673487a3e79e8f64e6585cbb94b65 SHA512 83ff35edc6c51ae4dbb043fe03a2aa489ae3aaa9c50e7ba9e05f870bc4155d2f1423336d0a0ba63e2a654fcf60bf6e7ad0fa9dcb8eb516cd59497a3c25991e50
+DIST LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zu.tar.gz 321260 BLAKE2B b6297b413a51bf63b97da41ae28dbd2bda21ad180af5b1a91a6cc8f9a14331b0e972cb37c5a94f64862e47cc8a0215651a488671c1d30fb5f6c9824bb77dba70 SHA512 37199aa84d3630bcfbfdf4d8fc17aa5e586a5316f574769c97877bdefff943489acd09fe59e00e898050e7234a7fe3b9cfbf6c69f52830a598258adbc406d56d
 EBUILD libreoffice-l10n-6.0.6.2.ebuild 3323 BLAKE2B 4640490672fd2643f71c011321f3876bbedf9cf5a83beb8e63d9e80f591a217c3db90d8124296ee7ad532b08df2ec0a4088c8ca06ec5287faf360d63f72c5076 SHA512 056058e0d7c780e19090d3a7cf5cc38d2338e36ee2380a090034ee2aba9390a4b18ffb8fa28fedc2f42ec22712d6a6ad47792df5958a7c587f666a70dc5434f0
-EBUILD libreoffice-l10n-6.1.4.2.ebuild 3626 BLAKE2B 8a2032ae2f935c88ef49a70a899adb798ed62c07fb35ebaae3db68bbe693b75299d1f0fac22052a91196aa9498d77b327476f6184fe3f78ff5daaf6409a835ad SHA512 598331678165243bb31ec61be5c6ec46b59cbf47b68a9aa6dd609f51c96fb901c5e23a12bc5d39101706ca5f0334ddc632ea8467f91112ad8aa1c798261da42d
+EBUILD libreoffice-l10n-6.1.4.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
+EBUILD libreoffice-l10n-6.2.0.2.ebuild 3639 BLAKE2B de8fea6f83477c0b6a7bfd5b4699a048e9c9bb86c0d62cc66907973561fd35bc699867f611dc9df594e4eb937a75ad869ad0dd528a9b660bfd1735aa93cd8e9f SHA512 9f3018e338a11dcb36280866393d526222fbf2adf81a9507a6d1e9f8922b98a98fc16a6dced01dee5aa415e171d59125b3212fddd73610d5e3b64443e9dea358
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild
index a11a956daf3d..8712656dd28c 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.0.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.0.2.ebuild
new file mode 100644
index 000000000000..620fa073a7ce
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.0.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+BASE_PV=$(ver_cut 1-3)
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+[[ ${PV} == *alpha* || ${PV} == *beta* ]] && PN_DEV="Dev"
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="https://www.libreoffice.org"
+BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${BASE_PV}/rpm"
+BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${BASE_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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${PN_DEV}_${BASE_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${MY_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${PN_DEV}_${BASE_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice${PN_DEV}_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${MY_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_${MY_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_${MY_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/}$(ver_cut 1-2)/
+	# Condition required for people who do not install anything e.g. 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 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/Manifest b/app-office/libreoffice/Manifest
index c6379c1bc5c3..797779a8d925 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,23 +1,21 @@
-AUX libreoffice-5.2.5.1-glibc-2.24.patch 361 BLAKE2B d95ded4f051c77aed22ce99f6273b73ec0893190622f55a3d6d3c3e3e53c59a2f3ce3f645b011c1afa02b727ee803898c65f8feff723955a2fe1a69de6d24480 SHA512 b5ff4c6d3771bcdde21613ad15459120ac1d759b1b3b422b5cba3ee23f7ddf88fde274956f2c91f0a6a37cb36a8d90d8f90bd865e6c2d3ff7c2100e2b469dbd8
 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
-AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
-AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
+AUX libreoffice-6.2.0.1-poppler-0.71-1.patch 8113 BLAKE2B 731f0a7622da871d901d7392ca2be3ffe4d397e8cb9127bbb5393de9bd861cddef0d99db8b037d5b6e841e1339ad7f815e6a10f5d892741af4971a4d95870244 SHA512 f657e1c31f8734ea646010012c094d2d9508dba7bc6ea9ffa5e02613066f8f75720474c02079148461930cc8dfd1b9c52a2544b0ef888760af790c1f62b3580f
+AUX libreoffice-6.2.0.1-poppler-0.71-2.patch 2654 BLAKE2B a0455e8eec3f221e418e24fb81fad849d5908c5239ca0a61ea329edfeddba91b06ca45ee324284a9fcab53dc88d4f290846c66bc1615030446dc588d6453e3ae SHA512 49ffc37d6ce484f9b601831518052fa09c925b51bfebe6965c3bffe3bdf19e2093d3859dcb57e13d6468fd1c5da7512f3164f4309832afd9ed591ab0541dde1d
+AUX libreoffice-6.2.0.1-poppler-0.72.patch 1667 BLAKE2B b24a61ecdd7560d5e89ecbebb2cf81ba0d3845bba40603455e549715ea3baaf0cdb9c9999d8c8efc22c4c516ba7239e6a6b8bbf29791ac76cabf1b683e2f866b SHA512 d9b300ff2493f2c1563d60babf2f7ff2620d059e9dadbbd0461d3b8c243130d7e458ba747df5abfa3e8e674a7751279a72be52e46b8077b4132cd46167bfe2ab
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
-DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
 DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
+DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
 DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
-EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64
-EBUILD libreoffice-6.1.4.2.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
-EBUILD libreoffice-6.1.9999.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
-EBUILD libreoffice-6.2.9999.ebuild 16843 BLAKE2B 164d3dcff010af3b9c8544c61c1f767dbd3ce998fac34379e2c431d9ce6d08f9a34d436005108b505b370e632cab6ffc0d3715a0999fab0c80a365ca05f9b69d SHA512 827da528559c43600afdfe96cb44c267abed25d29d5661399cfdcf86204e95d566827ece053f5dbd3c4d6279636f479c988b526f1998988c8d9d39ef57d7afcb
+DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
+EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8
+EBUILD libreoffice-6.2.0.2.ebuild 16977 BLAKE2B da9afade6f0175e61cc0ea4fe9078b02ad7986c844052a8da6e5ad5bf6821a2b2c239d6da14a8013a6d8994a8e47b7f2d7983895747719b2db908d58013c14d1 SHA512 ae994bb4750f9f3c5a3ab3d5e8b4bb848fc014071998430cd43e184e7d617b6bf50ce78b0002f3a1ddb9d06a1e98ee1bce4b57cb32a09e6fd18ddc86db181858
+EBUILD libreoffice-6.2.9999.ebuild 16963 BLAKE2B 0c37f62ada78a98b86fb4e79583e1badcf6a29d7c6797bc4675de6863b3c524976216c3dd1523b392e42c4041b848fd4966f5f65d136daa2b2e1248d62e3ed91 SHA512 d661ba2c44c6c1a251a08b630414b9cd0c3877a1d8be97df50362b87da35aba50a8d91a2055011a55ffb9d3c4d0e1ffcb0ab8c96f0476b0577ad59f079ff401c
 EBUILD libreoffice-9999.ebuild 16843 BLAKE2B 164d3dcff010af3b9c8544c61c1f767dbd3ce998fac34379e2c431d9ce6d08f9a34d436005108b505b370e632cab6ffc0d3715a0999fab0c80a365ca05f9b69d SHA512 827da528559c43600afdfe96cb44c267abed25d29d5661399cfdcf86204e95d566827ece053f5dbd3c4d6279636f479c988b526f1998988c8d9d39ef57d7afcb
 MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
deleted file mode 100644
index d714ff2074bc..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c	2017-01-11 16:54:33.000000000 -0800
-+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c	2017-02-03 10:22:51.697673613 -0800
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- /* do_pagein */
- static void do_pagein (const char * filename)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
deleted file mode 100644
index 03421c5e12be..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Kindly borrowed from Debian.
-
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some 
-               system dependent way) e.g. on the Win@6 tinderbox it always 
-               crashes
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of 
-               the time
-
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
-index 25db0b6..14e507c 100644
---- a/toolkit/Module_toolkit.mk
-+++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
-     JunitTest_toolkit_complex \
--    JunitTest_toolkit_unoapi_1 \
--    JunitTest_toolkit_unoapi_2 \
--    JunitTest_toolkit_unoapi_3 \
--    JunitTest_toolkit_unoapi_4 \
- ))
- endif
-+#    JunitTest_toolkit_unoapi_1 \
-+#    JunitTest_toolkit_unoapi_2 \
-+#    JunitTest_toolkit_unoapi_3 \
-+#    JunitTest_toolkit_unoapi_4 \
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
-index fa1684c..cc8e1a5 100644
---- a/sc/qa/unoapi/sc_1.sce
-+++ b/sc/qa/unoapi/sc_1.sce
-@@ -24,10 +24,3 @@
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
- -o sc.AccessibleEditableTextPara_PreviewCell
---o sc.ScAccessibleCell
--# i91044 -o sc.ScAccessibleCsvCell
--# i91044 -o sc.ScAccessibleCsvGrid
--# i84641 -o sc.ScAccessibleCsvRuler
--# i88330 -o sc.ScAccessibleDocument
--# i91045 -o sc.ScAccessibleDocumentPagePreview
---o sc.ScAccessiblePageHeader
-diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
-index dbfc3e1..d235c5d 100644
---- a/sc/qa/unoapi/sc_2.sce
-+++ b/sc/qa/unoapi/sc_2.sce
-@@ -15,11 +15,6 @@
- #   except in compliance with the License. You may obtain a copy of
- #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea
---o sc.ScAccessiblePreviewCell
---o sc.ScAccessiblePreviewHeaderCell
---o sc.ScAccessiblePreviewTable
--# fdo#45337 -o sc.ScAccessibleSpreadsheet
- # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
- # -o sc.ScAnnotationObj
- # -o sc.ScAnnotationShapeObj
-
-12:18 < _rene_> chris_wot: ping?
-12:18 < chris_wot> heya
-12:18 < chris_wot> you pinged?
-12:19 < _rene_> chris_wot: any news on 
-                https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not 
-                   gotten any further on that one
-12:22 < chris_wot> I honestly think that for this one just disable the test for 
-                   now
-12:22 < chris_wot> I'll ping the ML
-
-This seems fixed when opening the original doc.
-
-diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 54eed4d..78019bd 100644
---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
- 
- 
- 
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
--{
--    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
--    if (!pXmlDoc)
--        return;
--    // there should be no flipH and flipV attributes in this case
--    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
--    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
--    // check rotation angle
--    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
--    // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding roundtrip error
--                * hard to smooth out due to the use of string compare
--                * instead of number */
--#if !defined(_WIN32)
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
--    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
--#endif
--#endif
--}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+//    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+//    if (!pXmlDoc)
-+//        return;
-+//    // there should be no flipH and flipV attributes in this case
-+//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+//    // check rotation angle
-+//    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+//    // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding roundtrip error
-+//                * hard to smooth out due to the use of string compare
-+//                * instead of number */
-+//#if !defined(_WIN32)
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//#endif
-+//}
- 
- 
- CPPUNIT_PLUGIN_IMPLEMENT();
-diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
-index 1c3925f..a16f001 100644
---- a/svx/qa/unoapi/svx.sce
-+++ b/svx/qa/unoapi/svx.sce
-@@ -25,7 +25,7 @@
- #i111216 -o svx.AccessiblePresentationGraphicShape
- #i111216 -o svx.AccessiblePresentationOLEShape
- #i85539 -o svx.AccessiblePresentationShape
---o svx.AccessibleShape
-+#-o svx.AccessibleShape
- #i90294 -o svx.GraphicExporter
- -o svx.SvxDrawPage
- #i85501 -o svx.SvxGraphCtrlAccessibleContext
-
-19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it 
-               fails on your side probably because the paragraph style is 
-               different. 1. I will change the test to avoid the exact 
-               dimensions. 2. meantime you can skip that test: 
-https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd
-19:26 < IZBot> core - disable UI test that does exact comparison
-19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :)
-19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.]
-19:27 < _rene_> thanks, will do
-
-diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py
-index 8585e48d8c64..704f42c009a1 100644
---- a/uitest/writer_tests/tdf79236.py
-+++ b/uitest/writer_tests/tdf79236.py
-@@ -8,8 +8,11 @@ from uitest.framework import UITestCase
- import time
- from uitest.uihelper.common import get_state_as_dict, type_text
- 
-+import unittest
-+
- class tdf79236(UITestCase):
- 
-+    @unittest.skip("Currently broken")
-     def test_paragraph(self):
- 
-         self.ui_test.create_doc_in_start_center("writer")
-
-14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it 
-                fails for you.
-14:40 <@sberg_> noelgrandin, no
-14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output
-14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished 
-                yet, I guess
-diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
-index 3273055d5373..cb452139170c 100644
---- a/chart2/Module_chart2.mk
-+++ b/chart2/Module_chart2.mk
-@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
-     CppunitTest_chart2_export \
-     CppunitTest_chart2_import \
-     CppunitTest_chart2_trendcalculators \
--    CppunitTest_chart2_dump \
-     CppunitTest_chart2_pivot_chart_test \
- ))
-+#    CppunitTest_chart2_dump \
- 
- ifeq ($(ENABLE_CHART_TESTS),TRUE)
- ifeq ($(WITH_FONTS), TRUE)
-diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-index 4d65beeb90c4..f3d71501c41a 100644
---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
- }
- 
- 
--DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
-+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
- {
-     // the position of the flying text frame should be off page
-     // 30624 below its anchor
-     OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
-     CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
- 
--}
-+}*/
-
- DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
- {
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
deleted file mode 100644
index bd84b3162527..000000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
-index 457aedce0acb..4f02cf2b4040 100644
---- a/sw/qa/extras/rtfimport/rtfimport.cxx
-+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
-@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf")
- DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf")
- {
-     //Check page count
--    CPPUNIT_ASSERT_EQUAL(2, getPages());
-+    CPPUNIT_ASSERT_EQUAL(1, getPages());
- 
-     //Check if Headers/Footers contain what they should in this document
-     uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>(
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
new file mode 100644
index 000000000000..9899f5864ca6
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-1.patch
@@ -0,0 +1,164 @@
+From 5e8bdd9203dd642111c62a6668ee665a20d4ba19 Mon Sep 17 00:00:00 2001
+From: Mike Kaganski <mike.kaganski@collabora.com>
+Date: Tue, 20 Nov 2018 08:45:38 +0100
+Subject: poppler dropped GBool since 0.71
+
+See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html
+
+Change-Id: I258e08894486a925bed50a3a4232b6e805af6784
+Reviewed-on: https://gerrit.libreoffice.org/63625
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx       | 21 +++++++------
+ .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx       | 35 +++++++++++++---------
+ 2 files changed, 31 insertions(+), 25 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 575a90a..ab74b36 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
+ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
+     m_pDoc( pDoc ),
+     m_aFontMap(),
+-    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
++    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
+     m_bSkipImages(false)
+ {
+ }
+@@ -939,9 +939,9 @@ void PDFOutDev::endTextObject(GfxState*)
+ }
+ 
+ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
+-                              int width, int height, GBool invert,
+-                              GBool /*interpolate*/,
+-                              GBool /*inlineImg*/ )
++                              int width, int height, poppler_bool invert,
++                              poppler_bool /*interpolate*/,
++                              poppler_bool /*inlineImg*/ )
+ {
+     if (m_bSkipImages)
+         return;
+@@ -969,8 +969,8 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
+ 
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+                           int width, int height, GfxImageColorMap* colorMap,
+-                          GBool /*interpolate*/,
+-                          int* maskColors, GBool /*inlineImg*/ )
++                          poppler_bool /*interpolate*/,
++                          int* maskColors, poppler_bool /*inlineImg*/ )
+ {
+     if (m_bSkipImages)
+         return;
+@@ -1018,11 +1018,10 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
+                                 int width, int height,
+                                 GfxImageColorMap* colorMap,
+-                                GBool /*interpolate*/,
++                                poppler_bool /*interpolate*/,
+                                 Stream* maskStr,
+                                 int maskWidth, int maskHeight,
+-                                GBool maskInvert
+-                                , GBool /*maskInterpolate*/
++                                poppler_bool maskInvert, poppler_bool /*maskInterpolate*/
+                                )
+ {
+     if (m_bSkipImages)
+@@ -1036,11 +1035,11 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
+ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*, Stream* str,
+                                     int width, int height,
+                                     GfxImageColorMap* colorMap,
+-                                    GBool /*interpolate*/,
++                                    poppler_bool /*interpolate*/,
+                                     Stream* maskStr,
+                                     int maskWidth, int maskHeight,
+                                     GfxImageColorMap* maskColorMap
+-                                    , GBool /*maskInterpolate*/
++                                    , poppler_bool /*maskInterpolate*/
+                                    )
+ {
+     if (m_bSkipImages)
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da021a2a..a6135fa 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -130,6 +130,13 @@ namespace pdfi
+         { return const_cast<GooString &>(familyName); }
+     };
+ 
++    // Versions before 0.15 defined GBool as int; 0.15 redefined it as bool; 0.71 dropped GBool
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 71
++    typedef GBool poppler_bool;
++#else
++    typedef bool poppler_bool;
++#endif
++
+     class PDFOutDev : public OutputDev
+     {
+         // not owned by this class
+@@ -151,17 +158,17 @@ namespace pdfi
+ 
+         // Does this device use upside-down coordinates?
+         // (Upside-down means (0,0) is the top left corner of the page.)
+-        virtual GBool upsideDown() override { return gTrue; }
++        virtual poppler_bool upsideDown() override { return true; }
+ 
+         // Does this device use drawChar() or drawString()?
+-        virtual GBool useDrawChar() override { return gTrue; }
++        virtual poppler_bool useDrawChar() override { return true; }
+ 
+         // Does this device use beginType3Char/endType3Char?  Otherwise,
+         // text in Type 3 fonts will be drawn with drawChar/drawString.
+-        virtual GBool interpretType3Chars() override { return gFalse; }
++        virtual poppler_bool interpretType3Chars() override { return false; }
+ 
+         // Does this device need non-text content?
+-        virtual GBool needNonText() override { return gTrue; }
++        virtual poppler_bool needNonText() override { return true; }
+ 
+         //----- initialization and control
+ 
+@@ -233,29 +240,29 @@ namespace pdfi
+ 
+         //----- image drawing
+         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+-                                   int width, int height, GBool invert,
+-                                   GBool interpolate,
+-                                   GBool inlineImg) override;
++                                   int width, int height, poppler_bool invert,
++                                   poppler_bool interpolate,
++                                   poppler_bool inlineImg) override;
+         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                                int width, int height, GfxImageColorMap *colorMap,
+-                               GBool interpolate,
+-                               int *maskColors, GBool inlineImg) override;
++                               poppler_bool interpolate,
++                               int* maskColors, poppler_bool inlineImg) override;
+         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+                                      int width, int height,
+                                      GfxImageColorMap *colorMap,
+-                                     GBool interpolate,
++                                     poppler_bool interpolate,
+                                      Stream *maskStr, int maskWidth, int maskHeight,
+-                                     GBool maskInvert
+-                                     , GBool maskInterpolate
++                                     poppler_bool maskInvert,
++                                     poppler_bool maskInterpolate
+                                     ) override;
+         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+                                          int width, int height,
+                                          GfxImageColorMap *colorMap,
+-                                         GBool interpolate,
++                                         poppler_bool interpolate,
+                                          Stream *maskStr,
+                                          int maskWidth, int maskHeight,
+                                          GfxImageColorMap *maskColorMap
+-                                         , GBool maskInterpolate
++                                         , poppler_bool maskInterpolate
+                                         ) override;
+ 
+         static void setPageNum( int nNumPages );
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
new file mode 100644
index 000000000000..37b44556219f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.71-2.patch
@@ -0,0 +1,72 @@
+From 8ff41a26caf51544699863c89598d37d93dc1b21 Mon Sep 17 00:00:00 2001
+From: Aleksei Nikiforov <darktemplar@basealt.ru>
+Date: Thu, 22 Nov 2018 17:54:00 +0300
+Subject: Fix build with poppler 0.71
+
+Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38
+Reviewed-on: https://gerrit.libreoffice.org/63860
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx    | 4 ++--
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index ab74b36..101e3be 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
+     printf( "restoreState\n" );
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 71, 0)
++void PDFOutDev::setDefaultCTM(const double *pMat)
++#else
+ void PDFOutDev::setDefaultCTM(double *pMat)
++#endif
+ {
+     assert(pMat);
+ 
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index a6135fa..98d8ede 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -173,7 +173,11 @@ namespace pdfi
+         //----- initialization and control
+ 
+         // Set default transform matrix.
++#if POPPLER_CHECK_VERSION(0, 71, 0)
++        virtual void setDefaultCTM(const double *ctm) override;
++#else
+         virtual void setDefaultCTM(double *ctm) override;
++#endif
+ 
+         // Start a page.
+         virtual void startPage(int pageNum, GfxState *state
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index 0f4a35b..b0a6ac4 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -69,7 +69,7 @@ int main(int argc, char **argv)
+ 
+     // read config file
+     globalParams = new GlobalParams();
+-    globalParams->setErrQuiet(gTrue);
++    globalParams->setErrQuiet(true);
+ #if defined(_MSC_VER)
+     globalParams->setupBaseFonts(nullptr);
+ #endif
+@@ -145,7 +145,7 @@ int main(int argc, char **argv)
+                 i,
+                 PDFI_OUTDEV_RESOLUTION,
+                 PDFI_OUTDEV_RESOLUTION,
+-                0, gTrue, gTrue, gTrue);
++                0, true, true, true);
+         rDoc.processLinks(&aOutDev, i);
+     }
+ 
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
new file mode 100644
index 000000000000..7f0b1f71a1ee
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
@@ -0,0 +1,43 @@
+From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 8 Jan 2019 11:24:40 +0100
+Subject: Fix build with poppler-0.72
+
+Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
+Reviewed-on: https://gerrit.libreoffice.org/65960
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 101e3be..dab405b 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     LinkAction* pAction = link->getAction();
+     if (pAction && pAction->getKind() == actionURI)
+     {
++#if POPPLER_CHECK_VERSION(0, 72, 0)
++        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
++#else
+         const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++#endif
+ 
+         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+ 
+@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ 
+             aFont = it->second;
+ 
++#if POPPLER_CHECK_VERSION(0, 72, 0)
++            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
++#else
+             std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++#endif
+             printf( " %d %d %d %d %f %d %s",
+                     aFont.isEmbedded,
+                     aFont.isBold,
+-- 
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
deleted file mode 100644
index a05ea79b58b8..000000000000
--- a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.13.3
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=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
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/pango
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.3:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
-	# gtk3-kde5 vcl plugin backported from master
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
-		$(use_enable kde qt5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 29174b9eb1cd..541a32def7f7 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
deleted file mode 100644
index 29174b9eb1cd..000000000000
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.13*
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=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
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtwidgets:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	=dev-util/mdds-1.3*:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
-		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-qt5
-		--disable-report-builder
-		--with-alloc=system
-		--with-build-version="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
new file mode 100644
index 000000000000..91afb2dd0204
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.14.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/fontforge
+	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
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.24:2
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+	# master branch
+	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
+	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde kde5)
+		$(use_enable kde qt5)
+		$(use_enable mysql bundle-mariadb)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index b75bd717a250..d1351356c1eb 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -251,6 +251,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+	# master branch
+	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
+	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest
new file mode 100644
index 000000000000..885d0799da8d
--- /dev/null
+++ b/app-office/moneyguru/Manifest
@@ -0,0 +1,3 @@
+DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13560f753e137ff5370184c5aff3e038995c79ad48620a5653552406ea6fb56d356a209cd36774751db4f8e3777354c SHA512 9544a2fe17d0c1d4a6f1ee6c52c79e66ca76da6a6ac35067f1961fe2b44a8efe20173ee5932a91adeeebcb0a522b544df11ad388cb4c453a0641060d75f2a17c
+EBUILD moneyguru-2.13.1.ebuild 933 BLAKE2B 5d0942c18322103220ead22dd78cef0e2aae4faf9f436a58407b50473515de6830e144650063823acf657b0622cdd63453173147201264cc57648ac75ba09eed SHA512 b447088bc3edb64c0672e887cf3e3c4b05ff48d4b80faa45720bcae57e8a8c82b6fcaa0c2deae82edeedfa8708438510d426e53d80c43491586e2258fdf60c58
+MISC metadata.xml 327 BLAKE2B f5321e18ece590533473467467f84d9ad63c202d2249c469f88d9896ef635625e3ee48f3497d81fe9e418e8819fb06b4609684279223978a366332163b25c1c9 SHA512 b0d34d5ba1be127bc8ffbe8f712b8f469333517bc288d471e365106876ed7db0a411c96520b606fefdb273495d1f75cdd4c6caa131fba2aec2483ff39e099fb4
diff --git a/app-office/moneyguru/metadata.xml b/app-office/moneyguru/metadata.xml
new file mode 100644
index 000000000000..951b70bfa8e2
--- /dev/null
+++ b/app-office/moneyguru/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>vdurpas@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hsoft/moneyguru</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-office/moneyguru/moneyguru-2.13.1.ebuild b/app-office/moneyguru/moneyguru-2.13.1.ebuild
new file mode 100644
index 000000000000..ffe8516e22b5
--- /dev/null
+++ b/app-office/moneyguru/moneyguru-2.13.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Future-aware personal finances management"
+HOMEPAGE="https://hardcoded.net/moneyguru"
+SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport]
+	dev-qt/qttranslations"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-util/cunit
+	)"
+
+_emake() {
+	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
+		SHEBANG="${PYTHON}" \
+		DESTDIR="${ED}" \
+		PREFIX=/usr \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake install
+}
+
+src_test() {
+	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
+	pytest -vv core || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 162f061f912d..e8a9099303f8 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,6 +2,8 @@ AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace0
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
+DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797
 EBUILD scribus-1.5.4-r1.ebuild 7187 BLAKE2B 477cbf6e32b2b05eb2a66429fc80dbee31733bb80b035b8b52a0c830415ccf75648ecaf5b9f3e1c002aa6f2414cef2f83e8d5bd0711172ab8d0ba683aa83ee02 SHA512 be389ba247a5e4ebc583314c13b612bd7e7ff5496683cc373b35df84bf2fc38441435db5bcdbf6ca986291d1aa99eca80eb01f7ef324c27d5ba1e5e6c89e4b21
-EBUILD scribus-9999.ebuild 6871 BLAKE2B 9c7fcc1b812c369a5c5aef06ea901953bea948d7c2b5883a26ab3eac646d00f99bc73d48850015e90d5a302d0370cd2bc955f54ae79a42c5a8a022a34e73169a SHA512 eb671ff22788048944911dbcdf9d8888c5761722994651a40d60a8258604be32967a49bf11251ec2e71b02d03131ef565a877b59b6c37ff1d6b4228942be8f0d
+EBUILD scribus-1.5.5_pre20181227.ebuild 6942 BLAKE2B 7d57349a4f0c3f481d9459e42059da7b33111ad0560bd35bd8a3808c7081f928e8c802a4911abf9e49759ad133e776bcb65183e626ef08f0700eb07102835d1f SHA512 fd3bab874a55fbdebfdcb2dc3b4d6498bd0a485d71d403114dc6fa16f9034a94f05ac18e7a48294cba45091a11f44710f8c1dc87dc7c39843be5780bbd5f578d
+EBUILD scribus-9999.ebuild 6870 BLAKE2B 1fb6ae7e846178429e4c4380d7d8d50addf2eb9e9eda75caa23448eb31e3dd65d5eed2382a11274bad92949b43d063a24446f119b2a38098a8788dc99878dd37 SHA512 904507847c4fbce1f80748ad754685df086b27cb3f28c62aaceb4ede07bc16a6011c9508c22a798dda57a9f6aa0a3f59ee5c611d5a640f8e1ad43ee24217c7d6
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
new file mode 100644
index 000000000000..b92edd436ae8
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+COMMIT=d857c1a3430acf207cdde2512db6822c45e98732
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
+
+#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	>=dev-libs/icu-58.2:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.10.0[X,svg]
+	boost? ( >=dev-libs/boost-1.62:= )
+	hunspell? ( app-text/hunspell:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+)
+
+S="${WORKDIR}"/${PN}-${COMMIT}
+
+src_prepare() {
+	rm -r codegen/cheetah || die
+	cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+	find_package(PkgConfig)
+	pkg_check_modules(ZLIB minizip zlib)
+	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+	EOF
+
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt Scribus.pro || die
+	rm scribus/ioapi.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local _lang lang langs
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${lang}; then
+			# From the CMakeLists.txt
+			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
+			langs+=";${_lang}"
+		else
+			# Don't install localized documentation
+			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
+			safe_delete \
+				./resources/dicts/README_${_lang}.txt \
+				./resources/dicts/README_hyph_${_lang}.txt \
+				./resources/dicts/hyph_${_lang}.dic \
+				./resources/loremipsum/${_lang}.xml
+		fi
+		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+		safe_delete \
+			./resources/dicts/README_en_EN.txt \
+			./resources/dicts/README_hyph_en_EN.txt \
+			./resources/dicts/hyph_en_EN.dic \
+			./resources/loremipsum/en_EN.xml
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG="${langs#;};en"
+		-DWITH_PODOFO="$(usex pdf)"
+		-DWITH_BOOST="$(usex boost)"
+		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+		-DWANT_NOOSG="$(usex !osg)"
+		-DWANT_DEBUG="$(usex debug)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
+		-DWANT_HUNSPELL="$(usex hunspell)"
+		-DWANT_NOEXAMPLES="$(usex !examples)"
+		-DWANT_NOTEMPLATES="$(usex !templates)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang _lang
+	# en_EN can be deleted always
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if ! use l10n_${lang}; then
+			safe_delete "${ED%/}"/usr/share/man/${_lang}
+		fi
+	done
+
+	if ! use scripts; then
+		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	use scripts && \
+		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
+		python_optimize "${ED%/}"/usr/share/scribus/scripts
+
+	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+	local size
+	for size in 16 32 128 256; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
+
+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
+}
+
+safe_delete () {
+	local x
+	for x in ${@}; do
+		if [[ -d "${x}" ]]; then
+			ebegin "Deleting ${x} recursively"
+			rm -r "${x}" || die
+			eend $?
+		elif [[ -f "${x}" ]]; then
+			ebegin "Deleting ${x}"
+			rm "${x}" || die
+			eend $?
+		fi
+	done
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 3dc73f4dbe94..372e9412ba4f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,21 +43,21 @@ for l in ${IUSE_L10N}; do
 done
 unset l prev_l
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	tk? ( scripts )"
 
 # osg
 # couple of third_party libs bundled
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
+	app-text/libqxp
 	app-text/poppler:=
 	dev-libs/hyphen
 	>=dev-libs/icu-58.2:0=
 	dev-libs/librevenge
 	dev-libs/libxml2
 	dev-qt/qtcore:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
@@ -72,18 +72,18 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpagemaker
 	media-libs/libpng:0=
 	media-libs/libvisio
+	media-libs/libzmf
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
 	virtual/jpeg:0=
 	>=x11-libs/cairo-1.10.0[X,svg]
 	boost? ( >=dev-libs/boost-1.62:= )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
+	hunspell? ( app-text/hunspell:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
 	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 7302756362c4..683e2d7e617a 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,12 +1,14 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
 DIST texstudio-2.11.2.tar.gz 24143941 BLAKE2B 2c17b70cd497338ee9c7cd7fda0bdcb8775c3b487ae940fb0e755c8621d45a45a4381b064c0e18b9c134560e9a322d9c321453b01c3b05991d7d37467ea90f01 SHA512 774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7
 DIST texstudio-2.12.10.tar.gz 26770850 BLAKE2B 7dba024c34f6cf53ff8cfa21eedb53bbf7fb5aba0b00d1c7983240a46c46360bf6fdd783ec539019a9d385dd6862fc3bb9a0198c234c9546798835e1621d11ff SHA512 c3d1e14df8efe3f37dd71e5d0148f57f117c666b9487712fca5a7bd967eca4f7951c970bc5bffab14daef4fb8497af33edf2fce23cc9ae4cf598d905d9312ef0
+DIST texstudio-2.12.14.tar.gz 34206353 BLAKE2B 667d316fce36ca17b6d9f05deaf28794e5b85265da7e48673870848d029de19c7635656ebce2841a77ad9c057e7a3e301b66635ffab3e360cce085a7c065241c SHA512 fe2fe641a455425f87e28f3058f63df103823a97990365e3a3d67d14c4959a6e59db9205ce100f4ebbdb7c8a5c914b0514333b9b9537dd48053bf166e4326984
 DIST texstudio-2.12.2.tar.gz 26311798 BLAKE2B 1eb3add771a28918f39c69bb167eee31456ab87afcff0f4ae66ccd73d96fdfba5cbfbc57666908f7e7ffb5c69fd2d5aebf342338b9e3a56d3c31fb774f9cd1a7 SHA512 255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6
 DIST texstudio-2.12.4.tar.gz 26401510 BLAKE2B 53f1aca4f28154c5ae0f941e074e2da6d727dedf6b5604b301efccd95eea256a6cb91bf887985d81c65964c0e407cd1a8c2037a3bd73559aa115bec3954df744 SHA512 6e1d114ae87c854231399004504e460d078b9bf26ceb25c7fc592b79d3234f9880f8c021c3ddb2ef26a883dbddc2b94f98f368c976aa16973d3c1a6823a4150d
 DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3f8f1869cb667897bbdb48b99626089bf14a5e321c57ca5c9196d1cf2ce0beaad322b04d90f8a0b62189ff7c5be0d33 SHA512 16e846137b529f89f10dba3f847afe5a875ce1bc4029d002f76a1bcde491dd44756b27e38b4c5c159fcdb12b025759c8a0ebbbb8d8bd296e954b53032434170a
 DIST texstudio-2.12.8.tar.gz 26555418 BLAKE2B 172c36aed91d273629109412e43f947c00e7d37d392098cc012826391c88f461659764b6b8c4fcff3d84e6ba7b10a4adddcc4298267e0fa0448a61f4c9b9da15 SHA512 0076617f6421fa959c8c327bc81d4d27779358481b377d83856fe26b963d7c3c1e04d3b11e8f7eeb99cab9c089c8e7afcbb9c93a5aaccd00cf493792b802bfcb
 EBUILD texstudio-2.11.2-r2.ebuild 2118 BLAKE2B ef3cf0188f7be031583769e3936f91b8c40514bb7f308abeb568e2b1061f3683c62d35301969f30356f62c477ec65a429d97d69138a9b5f90c12949fb88d485b SHA512 18e063c1bd1927d0b433a3eef4739507921e44d028e3816f12736bacd68d4d64eb91db17efd55e108372ccc2dd0c0cdf760eb2b14c606a9613166caa2e1011fd
 EBUILD texstudio-2.12.10.ebuild 2007 BLAKE2B 56e06c2185573ab1ab9471dcd02a1cd8e02c24c8d3ed8d8f1a80536f837d54a06393a9fcb95c1ac4dada186d2b5f8bff198197e5908c7643bc67dd9f54a0f1a0 SHA512 42b5bd7dd4c5913ac91763869c003b297b538de155766f77ebb5587dedca75ab42bfe048905c55c2d0aae9245f3a616518554d906f226c9d3bbd853134fcc8ad
+EBUILD texstudio-2.12.14.ebuild 1850 BLAKE2B 2d4934ec4779406e6a3b160084a36040111fa86b8aa94a56d3b15ef2c066043cc10d64cf9897d61bebba71aa497ea2770853a7d113367866ef65066629e9e575 SHA512 53cc9e0de31fc95817af4c5a41b7e0b70037bce332ead663c88704daf7dd0c2daeaee7e921aa194a2f0726f102981db34d94da1921a541f1f2e26127d5d45b27
 EBUILD texstudio-2.12.2-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
 EBUILD texstudio-2.12.4-r1.ebuild 2008 BLAKE2B f1f75a8bd3aa0e7670f07ca4d8e1f277efe73571d41defd0d9aba41135724e2f416c3c8ec42ac3789d822de27ea043c926c033076aa795181f730139a0f900ea SHA512 c9c41476e79ec6a18504df3374f2c9548993e7880d4d4ce78e986704f2785fd7a4eeba939b9dca7bd7c2ef800d62c046b52a73768bd19bd204cc739180047b3a
 EBUILD texstudio-2.12.6-r1.ebuild 2287 BLAKE2B 2c3382c11397fe7d66f36afd2f0add6b5c1cae1d9253212a546c4d23d9097f182a53046756d35fb5135bbb08b0525c3769f2ddedd02d8fc4beb047f64ee4bda8 SHA512 2a49c0caf28da9b255ea4ccd729544bdd610bedfafde221babd4af540e459e6e0169cef7056b4e77054cabc7743449389f258b001726aa53466b9273a2ebd31e
diff --git a/app-office/texstudio/texstudio-2.12.14.ebuild b/app-office/texstudio/texstudio-2.12.14.ebuild
new file mode 100644
index 000000000000..53b1b3cbdb45
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.12.14.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils prefix qmake-utils xdg-utils
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( media-libs/phonon[qt5(+)] )"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed \
+		-e '/qtsingleapplication.pri/d' \
+		-i ${PN}.pro || die
+
+	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
+	eprefixify ${PN}.pri
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7a8ebbb74d6f..d7f9b1150144 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 71b0b292aed9..27cfa3331948 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,7 +1,5 @@
-DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 DIST eix-0.33.5.tar.xz 626628 BLAKE2B 2bb102279084f6bb6871bb4bbe55100708866337501c6043508ee13bdb92064c3a4a41d067b9d4c03af1a5ffbece53d9c66cf89639adf0c555a9511cae3d702f SHA512 7a71a411d4428ee491b9aee0f414e038a08f2195db58466db9b96f0d80edca7eaa153e63534c832c71e1b488e21fbd869a96bd10a21e06a93ce7eba1f808b684
 DIST eix-0.33.6.tar.xz 625512 BLAKE2B 3f27e3cfa00dc4979bbebbd3b31dfa29e7dcd527fdf7b3ca3fdc6a4ce45a64d7f07fe20ea4a526533aa506c2d9e7fcbbf7b5e83ad6a2d4bbacd1ce75b6cde4ae SHA512 3f04f06533d4e7a0acd5b6e85d1194c8f9b013595ebe75c3dda06cce42e7721a57393aed17e9dd6437780b48378691d84b6e595999ce4321ad114b239313c7cf
-EBUILD eix-0.33.2.ebuild 2646 BLAKE2B 3ad92e6cdac3d31adb3c8a3a914030265659a73322fbdadb0ae211bd0312685b1969f09c3af73239ddf2acd566922f86dae629c54c570f703a36e232805fc2bd SHA512 88ed2a920e0d5cc6e8d633f21b3990045a1b70453dd858902f82b84474bd2b3e4fb3e58748983c0c9dc74086b9f7deb278fdf6afa9188027cb18062b71452c18
-EBUILD eix-0.33.5.ebuild 2646 BLAKE2B fb7e288e68ff0ca07dba5d1e4dc0edb6bce81cc590a7b4e2101dcaa9898505bbd05efe295bee88ab1168a7715222f0682eae2e8b28b35d678d85301685428743 SHA512 ad5599bfdd46d0cea05bc40b8b3d827ca904f2e1cccf7448205fb43f0d0a1cfc70144a24c1933f915450e6a9f48d00812b621b44043fc8d9a0bd6324fd9efc60
+EBUILD eix-0.33.5.ebuild 2643 BLAKE2B 2a9c179699e2df18328b1a1ff78927f8f0c5f8f476d3715b14fd10eaf1cd22c19895b4ebe46d5c05b618263b604ba73e903dac3838342ef5d23faf847bbd7071 SHA512 829d144019b1ee4beb72b66d51a42f007b9b09d122deed5f0990582de5012d0128ecc584010034ee1ab52b8f15edf939cdafbe3527b2ae7c651c4fa1e87f1c11
 EBUILD eix-0.33.6.ebuild 2654 BLAKE2B 2923f5cf4b6db39cb1007e8b7b531c883ed02523afe53fefa4653e0e30ab2cbcc30f5d35c84dd07d347b85a894ce362410893b9db5d4204f1a9c506e2f0c963e SHA512 5445aae967a808d08b888f95be38df115c6db0f993dfad69f52eb480f5cbde14ffe670778412cd7a1edb6a773050e19f00def9fc2aa2b746abf36ebeb8116245
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
deleted file mode 100644
index 35f1e69f4cdb..000000000000
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-BOTHDEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${BOTHDEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-DEPEND="${BOTHDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT%/}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EROOT}usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EROOT}usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EROOT}usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	# https://github.com/vaeth/eix/issues/35
-	append-cxxflags -std=c++11
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-
-	rm -r "${ED%/}"/usr/bin/eix-functions.sh || die
-
-}
-
-pkg_postinst() {
-		tmpfiles_process eix.conf
-
-	local obs=${EROOT%/}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT%/}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.33.5.ebuild b/app-portage/eix/eix-0.33.5.ebuild
index 07ef00adc305..f39cd59bc55b 100644
--- a/app-portage/eix/eix-0.33.5.ebuild
+++ b/app-portage/eix/eix-0.33.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/hashgen/Manifest b/app-portage/hashgen/Manifest
index c3198d5db1ed..6da7e772e0e1 100644
--- a/app-portage/hashgen/Manifest
+++ b/app-portage/hashgen/Manifest
@@ -1,5 +1,5 @@
 DIST hashgen-1.0.c 36299 BLAKE2B 4419ffd2b4c8435b05b0cf2d9e54e2df5c539f945166da8305c910ec267e5d93cd26822ef189777cf952bb8644193fbfeaafefa4e98c5b7561845fb9a1f40c0a SHA512 4f8df94e91b02ebc611553d2dd9776de4ba77989869ed1ce411b91cc7fed224c3d8715d15cce6234caa25f2143962949dfd59da79d8f1ab211c287c604c22fff
 DIST hashgen-1.1.c 38543 BLAKE2B 8830fa1ebd3494ef6e42b12bb750e4b45f0ebb975de8aacc29e67200144cc9110532846b349cf36b0a060c3b2770095a65bc24be2eb7ea997adfd5be309328d2 SHA512 84c44689e2d0061566ce990b943ea76824f5cf257d611571cd0b5932154a079670f186b7e97d3e16de3e991a629db595a63c21336c6a57f48b967b5ebb40eea8
-EBUILD hashgen-1.0.ebuild 1277 BLAKE2B 6532dedc635b96156633fc402c02656c0211d991adcecb2ab1d9c977e26a647d502b8e0137eccf48ddb626cfc9add057e2ceb2a5a898bda4939852e185611fe1 SHA512 535cf69887158b5b1c3fe764a5b14c20fbe267d6fb48ceac097f09791f8b6beb0444347ec32a1ef9e418f716c755132bec05c0b6e8e783a87a7202fabf7197e9
-EBUILD hashgen-1.1.ebuild 1277 BLAKE2B bc660f5981efc90aa771766d47e85e7822a66ebe49c7aed90fe3831dec599ab165325fe73d90479b01dd280222fad1a2ffa4fd65f0c282739f5807c076d0eadf SHA512 fb8713b4e4da5ad0a1a18df533d9f6780ef35f58dd1624a1b0340470ee389eeb8748c1d8129869c40f9f7519dfd5f421bd4dc57369e2f6962ee97a7fe2b9c61d
+EBUILD hashgen-1.0.ebuild 1275 BLAKE2B a32fc75cfb026181bd0f7b182d888e6bbbc91efdc35e3fec4412dc6abf74429e76cd8622ae25e22a53ccf06519321f055332dad99868802be03e0498107216df SHA512 00dc4fe2efd8f433442406775134d8d34cf47074d78dc42e0c9c1a830b254d6206d9bb2b70860f4a03bffbb65ab647f46d971e16007aa149b153adddacf4df42
+EBUILD hashgen-1.1.ebuild 1275 BLAKE2B 2a1bfcfd8442f411d4b7e31a5cbf5cf586684cbed8e857d1abc09bc88d7a145aecfa050c4431dfdb6d228e24fd430d13c28507e778bd776a810ce0fbc2cbf8bb SHA512 51b06dade1b3ba23a1f34da3239b2fdd9c0b5e5dcc5569777654be5c3c9644cd90a5a9cca33f4c18c96981cd8374c94046f7066f996dd29cd718f6eee8bec1c1
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/hashgen/hashgen-1.0.ebuild b/app-portage/hashgen/hashgen-1.0.ebuild
index 26a83a7bc513..48a5df120816 100644
--- a/app-portage/hashgen/hashgen-1.0.ebuild
+++ b/app-portage/hashgen/hashgen-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
 	)
 	app-crypt/libb2
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-libs/zlib
 	app-crypt/gpgme
 "
diff --git a/app-portage/hashgen/hashgen-1.1.ebuild b/app-portage/hashgen/hashgen-1.1.ebuild
index eacb1653fc3e..e52b35617a66 100644
--- a/app-portage/hashgen/hashgen-1.1.ebuild
+++ b/app-portage/hashgen/hashgen-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ DEPEND="
 		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
 	)
 	app-crypt/libb2
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 	sys-libs/zlib
 	app-crypt/gpgme
 "
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ad5c464efbf1..f6e4ec34c30e 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 6e2616fa5b06..452337ad899b 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -45,6 +45,7 @@ AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc2
 AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
 AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c
 AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
+AUX bash-5.0-glob-pattern-backslash.patch 3206 BLAKE2B 899d59582a9e93ab71eff1c56121da5d76702cb295785949708a8f786821851c60191d4f1014b967725af427a6d718172ecd380cba4c3936a2ca2a1b79fdcdeb SHA512 e94d573264edcea06e8798796d1259f94ae6017499638b8d4bc83dcaf27b1489d62be9d99065398d514d24c18c14caf8bcb0ec1eb26db6a07df9fe17a667ee60
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
 AUX bashrc 3555 BLAKE2B 31b62f62632feb74cfadb5b831dd862eace55a603c24c07b50826070f599b0571962b315f7f45edb1a0dba91d7a36fa2b852215e9071012b02d0869cb6e5ab6a SHA512 4c2fded17c5346222939fac5b0a13913bdc062b93a4963ad33fe41cf00a04860b5006ec4c762acb6ce7e36e83f368d5c3427b8bc359ba6cba73d6114f219604e
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
@@ -59,6 +60,7 @@ DIST bash-4.1.tar.gz 6598300 BLAKE2B 8ed70736071f7d946b939247dd43214059c7d545d99
 DIST bash-4.2.tar.gz 7009201 BLAKE2B 52a4432ae401121ff187487a75a6541ce001c24d7d2251c3f0e33a58e93ff0c11b4c988003c6c740c13a51df0d752565023b8c39e79c96de52c73b49cc180523 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c
 DIST bash-4.3.tar.gz 7955839 BLAKE2B 398461e90a1ab6fd726b1a9db41c4c2a1e184034e3b96029bd17097338f1f9869d1c2216bde0b5b3c8e561629824348a0da3045cc425914e8e024180a175efe4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651
 DIST bash-4.4.tar.gz 9377313 BLAKE2B ac0e481dd4f2d5b91eea4f0156f1fc398ef8bd1ccd941366aa9b041be576114c51e1ff1431ec871e96fb72257c2a05a0ebcbd88c43c221610fef7dfdb2502fc0 SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29
+DIST bash-5.0.tar.gz 10135110 BLAKE2B a6c4d79144aa0c0f4a9433d618085c0d46b792b1de429b161f9f0266b55c099e13e44416c0886758a6f29411f5ceb79bfb0ec4eda47473f2713ae0b8081d6d3e SHA512 bb4519f06e278f271d08722b531e49d2e842cc3e0b02a6b3eee422e2efcb5b6226111af43f5e5eae56beb85ac8bfebcd6a4aacbabb8f609e529aa4d571890864
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883
 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399
@@ -369,4 +371,5 @@ EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
 EBUILD bash-4.4_p12.ebuild 7127 BLAKE2B a5909b73ff2daa32a6e3af1f25f15b3bf1d9cb0dc1a176a8826f2d47d370367ec91731b062f1916f664edca442cdc91971fee227ff51f0a80d53d1ad146011de SHA512 92233876cf54b44c82ee67e4b56089a83b589a5c2570f3a1d53b1b647e29ba498c5a7128bf7b1b6efc9384c8ebb0afe7843373a57a016066260de546d8d90eba
 EBUILD bash-4.4_p23.ebuild 7332 BLAKE2B 993cc0f3f3bf04a4e30f32bc42b2e8b4117d8e2618d19bd06a3d8b1cae6ce64eb271cc9b77c6b05a0b729b36a5395b29f84d1c194cdc62f55509dc5d7534d043 SHA512 c30d5a98507f1ff53b4489ca4d15ac257a5653094fb8466f4e346a149ba05ede0c945db0cef045b92b7f353cab9e349905a41e97684b739f384a509005d440da
+EBUILD bash-5.0.ebuild 7333 BLAKE2B badfc04cecd10a738f7231fa01af5b9e62d5e4103b3ae9a051c6f4532772352f84c49d01df12c6ee2fd706fba5d32a23ad635e4320c7cc82761e933dc6ed2042 SHA512 ec4531010c3d827e9584be8b3cb978a77b248f53b3c7c7a6461f101a12af3950f3e774f3babdc936931dd516e2bb9158b787c9f7045bd9fe3c824caa2789cbe1
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0.ebuild b/app-shells/bash/bash-5.0.ebuild
new file mode 100644
index 000000000000..9dd564847ad1
--- /dev/null
+++ b/app-shells/bash/bash-5.0.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+	nls? ( virtual/libintl )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply -p0 "${FILESDIR}"/${P}-glob-pattern-backslash.patch
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED%/}"/etc/skel/.bashrc \
+		"${ED%/}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/files/bash-5.0-glob-pattern-backslash.patch b/app-shells/bash/files/bash-5.0-glob-pattern-backslash.patch
new file mode 100644
index 000000000000..40379b3d4ccd
--- /dev/null
+++ b/app-shells/bash/files/bash-5.0-glob-pattern-backslash.patch
@@ -0,0 +1,133 @@
+*** ../bash-5.0/bashline.c	2018-11-27 13:20:16.000000000 -0500
+--- bashline.c	2019-01-09 09:44:26.000000000 -0500
+***************
+*** 232,235 ****
+--- 232,236 ----
+  static int bash_possible_command_completions __P((int, int));
+  
++ static int completion_glob_pattern __P((const char *));
+  static char *glob_complete_word __P((const char *, int));
+  static int bash_glob_completion_internal __P((int));
+***************
+*** 1742,1746 ****
+    /* This could be a globbing pattern, so try to expand it using pathname
+       expansion. */
+!   if (!matches && glob_pattern_p (text))
+      {
+        matches = rl_completion_matches (text, glob_complete_word);
+--- 1743,1747 ----
+    /* This could be a globbing pattern, so try to expand it using pathname
+       expansion. */
+!   if (!matches && completion_glob_pattern (text))
+      {
+        matches = rl_completion_matches (text, glob_complete_word);
+***************
+*** 1851,1855 ****
+  	}
+  
+!       globpat = glob_pattern_p (hint_text);
+  
+        /* If this is an absolute program name, do not check it against
+--- 1852,1856 ----
+  	}
+  
+!       globpat = completion_glob_pattern (hint_text);
+  
+        /* If this is an absolute program name, do not check it against
+***************
+*** 3714,3717 ****
+--- 3715,3773 ----
+  }
+  
++ static int
++ completion_glob_pattern (string)
++      const char *string;
++ {
++   register int c;
++   char *send;
++   int open;
++ 
++   DECLARE_MBSTATE;
++ 
++   open = 0;
++   send = string + strlen (string);
++ 
++   while (c = *string++)
++     {
++       switch (c)
++ 	{
++ 	case '?':
++ 	case '*':
++ 	  return (1);
++ 
++ 	case '[':
++ 	  open++;
++ 	  continue;
++ 
++ 	case ']':
++ 	  if (open)
++ 	    return (1);
++ 	  continue;
++ 
++ 	case '+':
++ 	case '@':
++ 	case '!':
++ 	  if (*string == '(')	/*)*/
++ 	    return (1);
++ 	  continue;
++ 
++ 	case '\\':
++ 	  if (*string == 0)
++ 	    return (0);	 	  
++ 	}
++ 
++       /* Advance one fewer byte than an entire multibyte character to
++ 	 account for the auto-increment in the loop above. */
++ #ifdef HANDLE_MULTIBYTE
++       string--;
++       ADVANCE_CHAR_P (string, send - string);
++       string++;
++ #else
++       ADVANCE_CHAR_P (string, send - string);
++ #endif
++     }
++   return (0);
++ }
++ 
+  static char *globtext;
+  static char *globorig;
+***************
+*** 3878,3882 ****
+      }      
+  
+!   if (t && glob_pattern_p (t) == 0)
+      rl_explicit_arg = 1;	/* XXX - force glob_complete_word to append `*' */
+    FREE (t);
+--- 3934,3938 ----
+      }      
+  
+!   if (t && completion_glob_pattern (t) == 0)
+      rl_explicit_arg = 1;	/* XXX - force glob_complete_word to append `*' */
+    FREE (t);
+*** ../bash-5.0/lib/glob/glob_loop.c	2018-12-31 13:35:15.000000000 -0500
+--- lib/glob/glob_loop.c	2019-01-09 09:44:36.000000000 -0500
+***************
+*** 55,59 ****
+  
+        case L('\\'):
+- #if 0
+  	/* Don't let the pattern end in a backslash (GMATCH returns no match
+  	   if the pattern ends in a backslash anyway), but otherwise return 1,
+--- 55,58 ----
+***************
+*** 61,69 ****
+  	   and it can be removed. */
+  	return (*p != L('\0'));
+- #else
+- 	/* The pattern may not end with a backslash. */
+- 	if (*p++ == L('\0'))
+- 	  return 0;
+- #endif
+        }
+  
+--- 60,63 ----
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2531716e4cf9..8072ee09883a 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,8 +1,9 @@
 AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693
 AUX fish-2.7.1-fix-printf-o-handling-on-ppc.patch 408 BLAKE2B 61ca4723e06eb2c969a01c476e026777cdb5b98d367ecf05599f0471da6f79901ebc1f3a672ca78f4c2216d3c1ff121fb0624bf2498be08685f2f6eac1528d20 SHA512 05f859c9d32b0003b489088054828f9ee9aba282ea6d2e6c659e4896e2b731e4cb8c2c524cfe5247784607a7c0bb781f3d918a22d5de69f5d9fceaa3e3c1a38b
+AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6b6f53e28be5832285e91092f4fbb7e5efc31bb1ab7ca2fbf9bec1b91e2f7d57817f5ddee38f2b3f120589fcbea1668f5 SHA512 07fb970b7eec223c3427b6058134101a5c032006d8ec16f2873352e9c701c38fe254506e9ff4e05f2ad684bd192c764452ec957af44a04f1beccf7f47bf58bb0
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.0.tar.gz 6472393 BLAKE2B 9a8226ca4dce40a7bbc62ad5791c5238d1257cebea296cd97a195438d771d7394acb012be6af118bf355a9b6e391ddee1061d83298356f664e0d5dbe3d859012 SHA512 e4159821d4263e5afb67adee82e30cfed0ad30f3772dd95beb0df71423ff52c21354970f64967f2de9fd1d31caa702208cfd9f2ce281bbf33114f3aa7cd539a2
-EBUILD fish-2.7.1.ebuild 2377 BLAKE2B 262fe7b6e70908e8142146126f2f2c4d9126734beb2e6a3a4cc5296098970ee06018252e91f433ca5b350ee102e6fbe13a5805a69071d2ed1579f0eb5391725f SHA512 45a88d8be56d4bbec5a87d02dfe33713bdfa7e87c27e12a22a483b99c2e956768bbd2bb3f4b02b5429ff4622cddc4f29d2fb2bdfef7e529a6df3255bb37f6dfd
-EBUILD fish-3.0.0-r1.ebuild 1633 BLAKE2B d33ddd9809d9fd2eb88828995bd99af52f7a3d58dca9bcf17843a2519b4688154a56ed0c6e051701c3f5f5b1964e1b1586d344afd60747f314f4f3b839f82673 SHA512 979ce8515ebf080480eddd7fd90c9066cc2317ac7aeecf6dc7d10ee92b2646dfb0c8121523ed9b4846732068c07bef7566c20662a753da1ccef3aa63dd8c28e3
+EBUILD fish-2.7.1.ebuild 2420 BLAKE2B 79966656a80d6cc9a62595a9f25cfcb94f9d8e0533858406cd30176a7a2f361fca57d3ca6c5db1af9c26d2336a059564e5746bd4e60dd7e85faf60713b72a44a SHA512 5f16328f26090b2621c12fa2287548b575e634dddb8eece585064d64bb344e2e31065746e8f7060da71172a8f406e73c18cf167cf6c8a18bc527026f0781752a
+EBUILD fish-3.0.0-r1.ebuild 1691 BLAKE2B 16609403cc4902946841384b4c94fc54aaffbd5c30020aa6b9d16d141b4884c41a0e8fe743e7616031fd09db1096bc08a1458ce8ac6bfdf823a9b2fe7bd4ba8c SHA512 7d5b14ff707b72a5e5eb287b3a867e78cde669711a63b7f60f19a9e18f29983ad4da5eac621ef8f3192f47c8cce88974b5d4f84a95dd23e6d3073bfb7846b697
 EBUILD fish-9999.ebuild 1619 BLAKE2B 0153dd8b58b2215d878421411226a7b32d7bca3ba69622456506b0c75bfde528a0ba2ad10000c046f87f4b4d77d828a1fa102c56be0f9972707d7017f7ce4e57 SHA512 f695e364fd3cd033775787fab19135bb8c10bdcb9f90d2943d7c62fe12dd8c0f8e4c58ad78577239a7019828b461da3fd820300cc5f0e314b215f72a7a3c9400
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
new file mode 100644
index 000000000000..8b9540ffc610
--- /dev/null
+++ b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
@@ -0,0 +1,31 @@
+From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Sat, 5 Jan 2019 15:59:25 +0800
+Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on
+ 32-bit platforms
+
+Rather than killing the process with close, read EOF after sending the
+"exit" command and wait for OS cleanup (per the expect examples).
+
+Not cleaning up with wait caused expect to crash on all 32-bit platforms
+including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b".
+
+64-bit platforms were not affected, for reasons that are not clear.
+---
+ tests/histfile.expect | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/histfile.expect b/tests/histfile.expect
+index 81ca11276..7ac056235 100644
+--- a/tests/histfile.expect
++++ b/tests/histfile.expect
+@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" {
+ # =============
+ # Start by shutting down the previous shell.
+ send "exit\r"
+-close $spawn_id
++expect eof
++wait
+ 
+ # Set the fish_history env var.
+ set ::env(fish_history) env
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index b58c91c63b0e..2bc49389213d 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,8 @@ DEPEND="
 	test? ( dev-tcltk/expect )
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch"
+	"${FILESDIR}/fix-histfile-test-on-ppc.patch" )
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-shells/fish/fish-3.0.0-r1.ebuild b/app-shells/fish/fish-3.0.0-r1.ebuild
index e9917b07a6c8..8cc9571025c2 100644
--- a/app-shells/fish/fish-3.0.0-r1.ebuild
+++ b/app-shells/fish/fish-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-tcltk/expect )
 "
 
+PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/app-shells/mcfly/Manifest b/app-shells/mcfly/Manifest
index 1510865a91bd..6546d1a9757a 100644
--- a/app-shells/mcfly/Manifest
+++ b/app-shells/mcfly/Manifest
@@ -1,5 +1,4 @@
 AUX mcfly-0.3.1-cat-dev-urandom.patch 770 BLAKE2B 461b8e65a2c7e3730a9e9921df4ff29a974322dcd631b375079333fa0bd01104f83579ce383b6d78c3eceac922fa4fa6e2bcafffcc7072ea16f2a2dcfc3cf750 SHA512 b142f01e6d347164fc7dcdcb0c4d64547df78b74fa9b15eed1de258c8201939b819d189f2e8efc577a7fc29c3ed452e713b3b2a7bbbeb9b958d0c53a8fde92e3
-DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST argon2rs-0.2.5.crate 353096 BLAKE2B 9f8136f54f96cd95facd78572e31d83d49474b77205277805173aa4afe3ebdccf2592dfcb72a68cfc8e7434b89cdf36058038b2c2d452c8289a5c0f4fbb3ed3b SHA512 09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f
 DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
@@ -20,12 +19,10 @@ DIST failure-0.1.2.crate 31820 BLAKE2B 8cb6574450790100718d353878da4fc4ed8cf4626
 DIST failure_derive-0.1.2.crate 4326 BLAKE2B 7bd8693ed01e20a70678dab39bf32df8184c79a1f763d75b62cede84316dbb939ff1c69843bc6e3432b6f213f671c1754c896fe9b0c73a89daab0b9e2179943c SHA512 244392baf1923c6a53b7db9cb72f88dc78c74ae4bd5a1df321c54bab7283f5623ae5c4f862156ad4fa32284b4e010d042a27aa4ec4a2881e1d7d1284d4f48c5c
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
 DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
 DIST linked-hash-map-0.4.2.crate 15980 BLAKE2B f31e0dc6f6bb3af355981491e42ce70ac91cbcf059c3d7da8ad2160c40c379bf6d10aab1fdc8400df4497e30ae8dc8c37149ec23084b589fb9a17b8dcf7fbdb4 SHA512 e9ca0dcf09338b8bf2e669eae241b1d07a08c430b2c1fb8adde9a79218aac8f0ad3a13d515202fbf7d0d6f3607e64c4fb3b8b9fe9190655897ae7aeeeb91dbce
 DIST lru-cache-0.1.1.crate 8645 BLAKE2B 027f7051ce930701b97017638f2091efef0b3be330fe1cf534d31c7040c8eb55d73d8e397644584d642e370ed2c109f6df61a6da020f6df5f5756cfccbdf9216 SHA512 f397be62edf59bcb36767e338427684274c3ec900d96f92c75859c61ae52f78c42a551bb298e256b76f65bc7b5765c453a07baa61dcb01bfb93ca8a41612b521
-DIST mcfly-0.2.5.tar.gz 242543 BLAKE2B 6e98cf65dd4184b475d58470eb241aa7f793fd51dc638a77e3407a71bd4e937db75d6f2bbc99d7f34b04ffbf216bfe48339763ca2fb670ac5740b5637bd6d6a9 SHA512 a0b2728d017271e8d7fc62fca08a433dc59bc0d7cc4c0bf1ab3d000fbd6bdb8a0aa94de2fc6334dc9035b654d529a4cbdae239a769a14f0a43723716e7ba46fa
 DIST mcfly-0.3.1.tar.gz 242505 BLAKE2B 178dc23567708593b89daa653ebdb5dab823197c56d9655abf8b15996736cfbc92acdd8643931c669678aab31eb8a14a4771c98373dec816d61ce0fb0e097b4d SHA512 308aeba0243b59d04655ffb06ce8ad20a3b7077543a3232e783581ef453a64f20c9c6fb5869cff23eac818103cc634c466340e8225346fb135c1b7cbe01d72bf
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
@@ -38,8 +35,6 @@ DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c914
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST redox_users-0.2.0.crate 11104 BLAKE2B 6768f135c7af11233adbdfc142c4d30aa3f802b3078a60d930bcd68385b6cea376ccb87652226d5b21c0d0bd61eed5e5a6fd377dbdfe6f75cc134b171ee0cf11 SHA512 00b15de3db031d94b68f39f60c56aed7f687da6c91a1b39463bfd838f6d39816b84bc2e071ad59e4ef7c142283fc4e6cf69613ce49462debd2cc52e96383aac1
-DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
-DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
 DIST relative-path-0.4.0.crate 18095 BLAKE2B e56e5cee41f3aabb63e4fc18e5b5f29ca5c3d49ff64b868f9b5e4d97f3d52d21b5bb9eaf8b3f13f993df45b77ce54592d962942546093fbd1674178216782405 SHA512 88cbc9bb2394e89a2ed3be8432504dd9d070536933968c2064e4a54f70c5e346ec3024b8d46d3871f73b71d761bbb45ad27f33963aa0f611c2f3ef1f4648efe2
 DIST rusqlite-0.15.0.crate 82548 BLAKE2B 0ab242b15554dedae3970873aae8e20463f62d60872c9e86325e2ab8b91d5b23a9824bfa8f03f99d916ca1ee68525424d01c3e66526bc9da25f7e186e2b645e7 SHA512 c7a66aa3bed9c0338a4e54f00416fd2ff50b90c12ebe4895237ec2db8c537bf500d64f65ae5219f870ff25c3a13ffe269d6b6653f28a9081ee52c3b9d0d1c972
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
@@ -51,21 +46,14 @@ DIST syn-0.14.9.crate 135921 BLAKE2B dcd62de853764e3b481a8613efa6cce15de43575e19
 DIST synstructure-0.9.0.crate 17651 BLAKE2B 8401b93fcf2db68f69fb1b61a246bc989029aa960dc7ce5d41a22467d275233c26fa75da669a25c0bce65c77df2f53bac87bf114df1bae55415b42742ff0998d SHA512 ad688b367317230b876d0a3fff6539a04d976d3d7025fb6161a0070acd38cc4ac1507a85313c4e1e804c778b3f9973957bb8a80ad2828096a31b5b53a899c605
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
-DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
-DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST vcpkg-0.2.4.crate 9571 BLAKE2B 1ebd2029c481961f45ea7cc9c62e83eb43b1f8b1c2a1b01019d54773a1143c1f87915f222c515e973ef39cb4c9e82009e2ef6d88ff1acf69faf76ea98bf4d925 SHA512 cf5ecb0fb60f655d36de3e9363f8b7be4b98cf1a99264977364a03bcdb488e2c1fee8d7c9ecbf4b32d3d1acc0952b68578cb1749bc5eeefadf8623c854dacad7
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD mcfly-0.2.5.ebuild 1916 BLAKE2B c130cffe242d62cada49b83fda14bf60a1b7efe96e4a4f57ed46e51bedf8e688ba1ff278d6774f34319db4126e1dfd3f18193664d5f86a49462793d55e5f114c SHA512 71f24c21fb2741696e66f6f9ee7b0755427d7ea49c0e99710498f6a41d38b5e1dc77f919eee19ad5dfb9ab236fde2fc6e7811f788f9e5301382f9bea3ceb1478
-EBUILD mcfly-0.3.1.ebuild 1801 BLAKE2B 04441cbb9ab48771e83d8933c600649d7a69a7636133a62efb62fa11f79d94b3a8b4c4676c52e041831a7df7d9116ff7f5938b960976c82e6eb40f64d97a30c9 SHA512 6824718aca5002dd90aac15e697ac34d1c9e1839379c88c9ac0ee35d555fb710939ee5a6fa08acbc22cf6b3968bcfa82d38b483b71ed90a20ad3959db7318a74
+EBUILD mcfly-0.3.1.ebuild 1705 BLAKE2B 1834f531ffa27c70f4583ecc87fcc30032eec6f498fe3cfa83622fc4183532dcd75554f9cd5697d66583ef40d689e50661eb108e7e1f87e47da4687d063fe317 SHA512 bd5bb108edb8d536c18815834ccb41834952a520220c11912e03bcb379a6bc624d62f9982bfe12ef661dff14d419ef7435cd2f91190198fc7950201f81c92841
 MISC metadata.xml 754 BLAKE2B 9ffcd71049bc11d8ad580f9721158f931918b2d0cd4fc9e465fda580bad0a853a47c58b4b258d98a654102d195015b32f9d8cbe62343b2c14222a0ea229ea3a3 SHA512 8159ff903511596ba5c7779f89a827101a6c22b8b36bde69cabf89470dcc970fc1755f921bb26952778f9b8e9e518ac7b45edb92c08471b9ec89f01074e8ee9b
diff --git a/app-shells/mcfly/mcfly-0.2.5.ebuild b/app-shells/mcfly/mcfly-0.2.5.ebuild
deleted file mode 100644
index 1141f801da05..000000000000
--- a/app-shells/mcfly/mcfly-0.2.5.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2017-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.6
-ansi_term-0.11.0
-argon2rs-0.2.5
-arrayvec-0.4.7
-atty-0.2.10
-backtrace-0.3.9
-backtrace-sys-0.1.24
-bitflags-1.0.3
-blake2-rfc-0.2.18
-cc-1.0.18
-cfg-if-0.1.5
-clap-2.32.0
-cloudabi-0.0.3
-constant_time_eq-0.1.3
-csv-1.0.1
-csv-core-0.1.4
-dirs-1.0.4
-failure-0.1.2
-failure_derive-0.1.2
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-lazy_static-1.1.0
-libc-0.2.42
-libsqlite3-sys-0.10.0
-linked-hash-map-0.4.2
-lru-cache-0.1.1
-memchr-2.0.1
-nodrop-0.1.12
-pkg-config-0.3.11
-proc-macro2-0.4.20
-quote-0.6.8
-rand-0.4.3
-rand-0.5.5
-rand_core-0.2.1
-redox_syscall-0.1.40
-redox_termios-0.1.1
-redox_users-0.2.0
-regex-1.0.2
-regex-syntax-0.6.2
-relative-path-0.4.0
-rusqlite-0.15.0
-rustc-demangle-0.1.9
-scoped_threadpool-0.1.9
-serde-1.0.75
-shellexpand-1.0.0
-strsim-0.7.0
-syn-0.14.9
-synstructure-0.9.0
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.5
-time-0.1.40
-ucd-util-0.1.1
-unicode-segmentation-1.2.1
-unicode-width-0.1.5
-unicode-xid-0.1.0
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vcpkg-0.2.4
-vec_map-0.8.1
-version_check-0.1.4
-void-1.0.2
-winapi-0.3.5
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Context-aware bash history search replacement (crtl-r)"
-HOMEPAGE="https://github.com/cantino/mcfly"
-SRC_URI="https://github.com/cantino/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	cargo_src_install
-
-	insinto "/usr/share/${PN}"
-	doins "${PN}.bash"
-
-	einstalldocs
-}
-
-src_test(){
-	cargo test -j $(makeopts_jobs) $(usex debug "" --release) || die "tests failed"
-}
-
-pkg_postinst() {
-	local p="/usr/share/${PN}/${PN}.bash"
-
-	elog "To start using ${PN}"
-	elog "Add the following to your ~/.bashrc"
-	elog
-	elog "[[ -f ${p} ]] && source ${p}"
-}
diff --git a/app-shells/mcfly/mcfly-0.3.1.ebuild b/app-shells/mcfly/mcfly-0.3.1.ebuild
index db606e07b5f0..033eae46c97b 100644
--- a/app-shells/mcfly/mcfly-0.3.1.ebuild
+++ b/app-shells/mcfly/mcfly-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2018 Gentoo Authors
+# Copyright 2017-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -87,10 +87,6 @@ src_install() {
 	einstalldocs
 }
 
-src_test(){
-	cargo test -j $(makeopts_jobs) $(usex debug "" --release) || die "tests failed"
-}
-
 pkg_postinst() {
 	local p="/usr/share/${PN}/${PN}.bash"
 
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 2c38723f5a1a..14d188657720 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -5,4 +5,4 @@ EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b
 EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
 EBUILD mksh-56c.ebuild 992 BLAKE2B 1ecbe94f3d96371818512d89b3f077402118058f382f1e3dfd9f57826eb783256bc193b4697272626cce52ccb8fe29a479646107750e1db94859b95b7bb7c524 SHA512 1f17fcf0f5cae5de4128feded4c1c92c9d75b3c507deb7e265058251c225bbb852c9ad305ac5bac0f4fb8739eb38c325e0f85c33dc1fa10fe6ede6e4a71a41b6
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
-MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-shells/mksh/metadata.xml b/app-shells/mksh/metadata.xml
index 28ef3c7b080f..6f49eba8f496 100644
--- a/app-shells/mksh/metadata.xml
+++ b/app-shells/mksh/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index 9114c15d97e8..b34b60faaa56 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,3 +1,3 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
-EBUILD quoter-3.0_p2-r1.ebuild 793 BLAKE2B 00cf5370c37448172e8c4ae0b1eb9850a906577ffffb6286b5697646648ce2d77d9b4d9688524d0b137e311858ce4df071dadae5dc5c7ba7be9023c81b62c15c SHA512 bc255d51e52f564a5d325d590da492c7f1bb3c154f99ca592386902adddb67b5cf2e5169300b3ea57e6fef52e0c5ed6bb4dcb543af2cb432b3cb53d871196f66
+EBUILD quoter-3.0_p2-r1.ebuild 789 BLAKE2B fb433f0498c96f300ac5c95838439a4922d3e6b74be9e2ced56b8d8bf665f14d55682793a4339320753ae4f7ef80c52a9d10cde6bbfb620e800160cd990d7363 SHA512 ec31d6efe14cfdbbe1cf69c67d5d9e26e9dcf15122a11e0b03f149ac4588add7925805f11f7d464a88c352a5749b173b6a7380d2b3b75f84d4116907e64a8813
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index 4c1901dae04b..7f68d0f93d75 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2018 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0d8918995c08..a56b1f8e7f85 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index 7130e5022b88..61fa63bbc4f1 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,3 +1,5 @@
 DIST bibutils_4.12_src.tgz 447566 BLAKE2B 64d185963028f29f4efb64c63ee6ddb59961744d525d4dbaf28bdd1edb28ac8ea86529082995d11245c258895f27457c9d01594564a44caa837b0ba76052b969 SHA512 04329ecb685bf4d5314c6d3a2d5bb21e67112d73bcb49f5a7808a4082f32a9aecb40add4ec4b5320be35f49cd8e101dc1e35409e7c6cad8c39238d2122f91dd0
+DIST bibutils_6.7_src.tgz 580792 BLAKE2B 29c5863bc414ef7b2f362d95352c0e042c1bcc3275017df82b0206d96520b3f5c3fe1e12563577b84a8bd94b0677bf1ad04ecbd80dcbcc194a71037bbd6facba SHA512 08db07408eee26bce42dbd00b7e821ef41dc12c7ce847425e81145927bcfc6ea7180ff719056e089917811aa9675a09dd52e1e02b8187b8618f67647efcb1236
 EBUILD bibutils-4.12.ebuild 1005 BLAKE2B 955eda004f2aa8378f379079bb0f5d2cfa64ab97bc95c6368ed432855b22152c4cb48e3f92604e17abb1ebd3ba560f2af542a3c24ff77069f5b56edb7a90be03 SHA512 fa3c470b226c04c7b3d4d1311ba44ee0eca3d70d34efcb4d69a11f1a6da85e94bf352fde88a76400a4cfbb3133b761bb71c4c45d9113775efa0e538ea390a61e
+EBUILD bibutils-6.7.ebuild 1359 BLAKE2B cff84426b4f5b8785d6990105923bcacf9e69537467c6bb291b84a216e0e10d17c5050a776c971b1ce7450ebe2c8ce867d667ace12cddc9da6177f54b27d9fe5 SHA512 9227cd90f15fb41be41adacb05a6c642abdabbef49ebb2ed0176c4014b9a06d889ec8cdc8e12e2899c324660ffc776d8954d5f3f016ef97a42097a946c77b309
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-text/bibutils/bibutils-6.7.ebuild b/app-text/bibutils/bibutils-6.7.ebuild
new file mode 100644
index 000000000000..0b626bb59e52
--- /dev/null
+++ b/app-text/bibutils/bibutils-6.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	# The custom configure script still sucks several releases later, so we'll
+	# just do its job ourselves
+	rm -f Makefile configure || die "Failed to purge old Makefile"
+	sed \
+		-e "s:REPLACE_CC:$(tc-getCC):g" \
+		-e "s:REPLACE_EXEEXT::g" \
+		-e "s:REPLACE_LIBTARGET:libbibutils.so:g" \
+		-e "s:REPLACE_LIBEXT:.so:g" \
+		-e "s:REPLACE_CFLAGS:${CFLAGS}:g" \
+		-e "s:REPLACE_CLIBFLAGS:${CFLAGS} -fPIC:g" \
+		-e "s:REPLACE_RANLIB:$(tc-getRANLIB):g" \
+		-e 's:REPLACE_POSTFIX::g' \
+		-e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
+		-e "s:REPLACE_LIBINSTALLDIR:\"${D}/usr/$(get_libdir)\":g" \
+		-e 's:make:$(MAKE):g' \
+		Makefile_start > Makefile \
+		|| die "Failed to set up Makefile"
+
+	cp lib/Makefile.dynamic  lib/Makefile || die
+	cp bin/Makefile.dynamic  bin/Makefile || die
+	cp test/Makefile.dynamic test/Makefile || die
+}
+
+src_install() {
+	dodir /usr/bin
+	emake install
+	dodoc ChangeLog
+}
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index c5e835835443..c97bcb99641e 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,5 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B acf6c12d9a346fe60b958f34c7608246b587a06a2146fff929e51120228e19e1b594882f25e1b21a538696deafe830ffd6bc8782908e78760396bff5c3b9a5cd SHA512 2a2f35d0bea016801901e0a244084b8eb9638bfb214198aeb8d6f50358fc609024c52c31ebcea0cbe21374b3769b2e71bc0c4bdd684208acf1a409688e0e9855
-EBUILD dvipng-1.15.ebuild 1121 BLAKE2B 3975d100ff1722886fc277ad7d37584bce315d6e3ced9e5cb62e86bab7430483cbf6bd6dba30fc2227097e9b6e247c7b65bf8590dad4c70476205f579b2b277d SHA512 95692a71c955e8d9ff08b32171831148aa455a60b765e2b1beea7687da1eeb1d8e7b9f0acd9c8da4a3f2173f26f1b77f6c2d67210d538eed25a88f80075eb82f
+EBUILD dvipng-1.15-r1.ebuild 1295 BLAKE2B 5b3272e0974907c12c4bfc87cd4ed918831066d78e81ceb4beea7f3d7d1cb571ce3bdcab09188e9a13516daaf6eaa16efc595a7b1badc5ca4fddf2f01be6d02e SHA512 0bcd7a13d6af039c90e8ffd9c34f88c50ef83153245bd786c5aec474a0894a483dc81b471a495b9ffd99c76b7cb7b779b2373247d7aa2685bead65ce740756f7
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index 13c8825da288..4f7f255a1b52 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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 ~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 ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
deleted file mode 100644
index 6b0df705d059..000000000000
--- a/app-text/dvipng/dvipng-1.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Translate DVI files into PNG or GIF graphics"
-HOMEPAGE="http://dvipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+ Texinfo-manual"
-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 ~x86-solaris"
-IUSE="truetype test"
-
-RDEPEND="
-	dev-libs/kpathsea:=
-	media-libs/gd:2=[jpeg,png]
-	media-libs/libpng:0=
-	virtual/latex-base
-	sys-libs/zlib
-	truetype? ( >=media-libs/freetype-2.1.5 )"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	virtual/pkgconfig
-	test? ( dev-texlive/texlive-fontsrecommended )"
-
-DOCS="ChangeLog README RELEASE"
-
-src_configure() {
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	if ! use truetype; then
-		sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
-	fi
-
-	export VARTEXFONTS="${T}/fonts"
-	econf
-}
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index dbbe03ff611f..267d62d84c73 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,5 @@
 DIST kbibtex-0.8.1.tar.xz 4060484 BLAKE2B 1dd100b0c469955f273907d79765268fdefdd4ae05faa851f4c1823c41f312810f2992113cda97c1f8e19c4c3bf35e7e79c6a0bc12cde60995edbd903a9b5ae3 SHA512 73c318b1d29de98761f43de9828a48e943528f413c6c2489e916f88ef4ba1424a300bd9eddd10fa763985322248ef863cad1b8cfc681f083eb9acdabd6c6dfea
+DIST kbibtex-0.8.2.tar.xz 4065904 BLAKE2B 5b862ef48dc3e0fb2895aa2ad0c1fa8e712c5f63d0a279b33f9d41fca0262bbde1bd00423657e2714dfbacb28657e067760192adfa033f70ac5771a7188ad4cb SHA512 f15e2d1969f79f354881ccb1e41c5d6f1628c4850b3bd177cba0b74b1aab9aa61935f65ef280d242d0ef2ac816ce45b8a2e8a4ff51720a2400ec52bd555f594e
 EBUILD kbibtex-0.8.1.ebuild 1939 BLAKE2B 391e01cd97909347fd764878562f327754be35dda6ca3f9d1e6e657638f75bb477bc583747dad0dff3d940842d1806dcf6e3937c4c5eb34b4b0b355f2ba299b8 SHA512 59844f3d031fdac85f1bbfbbb352fe693dd7b4030bb938fcb26543a4a81787ca54e36aff184dfb2ad9d881cd2054e95a4d3857f9d10197a3dec44521cba44356
+EBUILD kbibtex-0.8.2.ebuild 1938 BLAKE2B 908f280382a7f46ad8a31ee987fae0d03dae3c5f9b561ecce38ef6f5f4d083a12c3bccc5198938cc11f37ea4ca7758e9f9c77737397d5b181c49f09d396ddf74 SHA512 002b1394cc3fae4b92a9d535fdcb4ffc89b8274319a709f4adc95e0b312e103f1616c34f5faf94e656a01c14165dc405ac941938ab2d474068a5f61fa80c815e
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8.2.ebuild b/app-text/kbibtex/kbibtex-0.8.2.ebuild
new file mode 100644
index 000000000000..8cad7d3663ed
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.8.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://userbase.kde.org/KBibTeX"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="webengine webkit zotero"
+
+REQUIRED_USE="?? ( webengine webkit )"
+
+DEPEND="
+	$(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 kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	virtual/tex-base
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	webkit? ( $(add_qt_dep qtwebkit) )
+	zotero? (
+		app-crypt/qca[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	!app-text/kbibtex:4
+	dev-tex/bibtex2html
+	x11-misc/shared-mime-info
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package zotero Qca-qt5)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/okular:${SLOT}" ; then
+		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
+	fi
+}
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index c5fd18155a51..a4aef34f4a32 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,3 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
-EBUILD libnumbertext-1.0.5.ebuild 518 BLAKE2B e809eebb2784f556d6c2123fad20031ea1438e2050df2e267ff882c1136379da0465ca803dd37c4077c761d8d98229238ee747a86746ba7955e67396a488dd87 SHA512 7c419d85bba72b10aa72143816b5dbb90ed0526a2a30194f24a56418529a62167658b80818b4200f48140822fa83f0fa84d460383422fd0336ebba6eaafb77c2
+EBUILD libnumbertext-1.0.5.ebuild 516 BLAKE2B c92598eb3823ec55c7a47bf65bb490fe5a6f28e704a1185b0e4df807051f93d95a9d73d809d360511975e462c6a7f3fab8d4d438a54493b8b93cbca88fd9a2b5 SHA512 6703fcb3a84dc61742a45a425f471a8d83e7feeaf30af7ba753ce815ee5c30893f2e8829605dbc49bbe66e87ade704bff91acdec852a5c6e36ca9a763611579f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
index df23cdf0b8ea..75f60a1ce0a6 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index df2f1936effe..4c702e621bb5 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,6 +1,4 @@
-DIST libodfgen-0.1.6.tar.xz 359988 BLAKE2B 89ef70762780efa70ea044758d3c5e677024897bcd1f031c15544dc2e5cc0115bd286ca21051b8223768a2253eb681bdea534230c517de9c00a0a1f5b320eaf3 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5
 DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
-EBUILD libodfgen-0.1.6.ebuild 899 BLAKE2B 2c43dc49dbab829d73b66ea4de39dd435746a5c4272f17ddec5c10f337749f0ee38ab957e3bd8593009e8d01735efc64bb141cd2662bf4bd9b99d7d2c8a627f4 SHA512 e0eff9df3cc4632153e8fe3b6187112d16ee0d631eea999ba661d6c623515fd18e831a8f6197decb6709e6639371af511cd589abe5b904f44436f7f5c53861bc
-EBUILD libodfgen-0.1.7.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
+EBUILD libodfgen-0.1.7.ebuild 836 BLAKE2B ae63e6eaa67ff60c83107878e09319d0c5cee67886f845cacb3f179444804c09762c957c34866d08adff1b07117084a9f1bc56f4bf5c798fa4182d1e783427e0 SHA512 fd80024ced4338930497c47c9a90c37cf529558bf80f6adff711594889743346e1fd20b2b057260aeead230061c5e6130d8cf8145fed3243f31f29991a4e4864
 EBUILD libodfgen-9999.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
deleted file mode 100644
index b1617cd77829..000000000000
--- a/app-text/libodfgen/libodfgen-0.1.6.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
-
-EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
-HOMEPAGE="http://libwpd.sf.net"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror \
-		--with-sharedptr=c++11 \
-		$(use_with doc docs)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
index 03f14c4c7029..0f71db5b0fc6 100644
--- a/app-text/libodfgen/libodfgen-0.1.7.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 8ad0b20703f5..25cad0ee2f5b 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 635 BLAKE2B 9c311dff7c08dfa74d44796e8ab65746a6389fa2ed759bc913d66818d53386fdaf6f18f5fe51b0d36503715aac4357f40d5e57d1b696017ed98e342d836b4dcd SHA512 e9d0b5a43a85ec5dddcae072b13a503c4ec79aef906a825789155172c1207933171959496e06182327e3e180f5135d457dda749b27222dd0d7c53543c798a638
+EBUILD manpager-1.ebuild 644 BLAKE2B ae168f74fed7fb022427c8cef5f4a09f35556626d5fe1c40350d0f720686e12568407b72e02f9cd69ed6bab71ce9a544c7416666e7f6fc09e8413d1c68271062 SHA512 bd1b05102557cd95510036231fa5d6b0ec39f4c2b64ba8c3032259543654dc60e1eb03464c84108a663bb0befd22be601152f457b0926d9f7fbf1e27a231987c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 88aba7bab89c..560f4f885be8 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 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-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index a6fab29a91b3..9e4434fca83a 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1173 BLAKE2B 4f99015ef7b0da38077415ea071b9c9eef2a7c0b9585689ca570f25cd327c5f61a75a4a969836b12d325b0cc27f49ea7adb4dd06a4acf77ba0d7baf6c463e9bd SHA512 1a7909822a6273cfb80b2cb42c9964f76d2b62c2f2163d5e65a2648ba6f00c22c6edce97a0fcb570e24415593ed3cf53535b47f1425a3ce6f659493013a9de08
+EBUILD mecab-0.996-r1.ebuild 1178 BLAKE2B 46becd51f6b1f5b5810b1c8cb7ac8672284906fc6a2b1580f3c5de4f72dccca0f252f1d034e61b2c2cf6cf08332d6af32656b87ca54ed8b595bbc7a4ab3f15dc SHA512 206b5e25c34612da0354c69b843783bd1ce774a23eaf435ed72af237c2cd5c8d6e27262b4a1901d54a1a1b4859a9a7521ce4b46c0b061d05ae069eb3868810d0
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 7e38af358bf0..282eb9f459f8 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 007442666dd7..ea432332da83 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,8 @@
 DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
 DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
-EBUILD nfoview-1.23.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
-EBUILD nfoview-1.24.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
-EBUILD nfoview-9999.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
+DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
+EBUILD nfoview-1.23.ebuild 819 BLAKE2B d1b74841775b655e954defe1c11c2f7ba13b1f6c20c9af2b8738426f477adab8f516a3b1052ce9c9200ae14fff77e6e8486b67e94b6b31ec93b1e312e91bb587 SHA512 aab862f1d97248ce88aafa7871c0b4f4d488cd2d04b1b5dd7e94cc43a3bab39a9a6f667438df5d8e1a364a3f3bcda5240d1f00900bd856a76620eec15d6a9825
+EBUILD nfoview-1.24.ebuild 819 BLAKE2B d1b74841775b655e954defe1c11c2f7ba13b1f6c20c9af2b8738426f477adab8f516a3b1052ce9c9200ae14fff77e6e8486b67e94b6b31ec93b1e312e91bb587 SHA512 aab862f1d97248ce88aafa7871c0b4f4d488cd2d04b1b5dd7e94cc43a3bab39a9a6f667438df5d8e1a364a3f3bcda5240d1f00900bd856a76620eec15d6a9825
+EBUILD nfoview-1.26.ebuild 821 BLAKE2B ad858c4db3193a44b2924bbf4384720a89db244b8afad8296e4735def9a54d5d1ceca27c9a2e87d616a661140ac7cf7ad338acfd38e9efe6c2c4afa5127ac719 SHA512 183e2cf0e3f817a054a2fb886e1f11827a25be5271aa31221380a05ecb56e67d06104f66757c673c49dcb5282508fb5d872ab69a80c4553d25e48cf0e0e3e1a3
+EBUILD nfoview-9999.ebuild 821 BLAKE2B ad858c4db3193a44b2924bbf4384720a89db244b8afad8296e4735def9a54d5d1ceca27c9a2e87d616a661140ac7cf7ad338acfd38e9efe6c2c4afa5127ac719 SHA512 183e2cf0e3f817a054a2fb886e1f11827a25be5271aa31221380a05ecb56e67d06104f66757c673c49dcb5282508fb5d872ab69a80c4553d25e48cf0e0e3e1a3
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.23.ebuild
index 5b1cf0483c63..9eb90a2288e3 100644
--- a/app-text/nfoview/nfoview-1.23.ebuild
+++ b/app-text/nfoview/nfoview-1.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,10 +15,10 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
 HOMEPAGE="https://otsaloma.io/nfoview/"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
@@ -26,10 +26,6 @@ DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
index 5b1cf0483c63..9eb90a2288e3 100644
--- a/app-text/nfoview/nfoview-1.24.ebuild
+++ b/app-text/nfoview/nfoview-1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,10 +15,10 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
 HOMEPAGE="https://otsaloma.io/nfoview/"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
@@ -26,10 +26,6 @@ DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
new file mode 100644
index 000000000000..fd688874d731
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.26.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index 5b1cf0483c63..fd688874d731 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -15,10 +15,10 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
 HOMEPAGE="https://otsaloma.io/nfoview/"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
@@ -26,10 +26,6 @@ DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index b769f78f296c..55b3a7ee097c 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,5 +1,7 @@
 DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
+DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
 DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
 EBUILD pdf2djvu-0.9.11.ebuild 1248 BLAKE2B 2c853db54877e60077815a89a9257a0258fc6a5aa6f6a8baefa9b11b5c10f1819fdb4b93ae3cb23b1c604ee9401b3e69304838b6998bd60663637f492d3b976c SHA512 8b7525c6af445582c5710fb92c4133aecef5e1e8e6acd9764bebb0a12e61ad3981d3bfbb83c6d224f95d31cb9a0dc7bc128c9d89e4481a2ae3a57de24fe9c445
+EBUILD pdf2djvu-0.9.12.ebuild 1248 BLAKE2B 314a6564b04a6d638ce2f33f98eb5e66a1066210db47fd535430106b46253c5f064c7e03ba2d83a9b6403ccbec6c15cce8cbb0bfba60a30fd7de0faad7a2a802 SHA512 bd531152726f48d84dd71c02ceb60dd779708571fd015c1243c1b1b5b44ef9b7fb11a0ef70cf3d7af9d74a1fe2a3deb0e19fc457e3d8619ba11b71bf42fa9e0d
 EBUILD pdf2djvu-0.9.8.ebuild 1251 BLAKE2B 6a3487ef4e2195daf5c78447960874a504bcb4a2f5187b49e058df35ed7482f820058aec8d719a52aca3a558ce86cef5705c006d422ef516db9de69632767404 SHA512 b2a2ed2d2f9ebe91f15f2da833b5e5a638bc9a82b7a2562eb4548909bfca18d519f9d76f5f2e843115e73af8c7a232ad4b5f5de419ac08371114762ef2d42013
 MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
new file mode 100644
index 000000000000..069fd000f70f
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+
+RDEPEND="
+	>=app-text/djvu-3.5.21:=
+	>=app-text/poppler-0.16.7:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pstreams
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+DOCS=(
+	doc/{changelog,credits,djvudigital,README}
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# bug 626874, poppler headers require C++11
+	append-cxxflags -std=c++11
+	default
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index d0e7957da24d..80259a83d610 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,7 +2,7 @@ AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abac
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
-EBUILD podofo-0.9.6_p20180715.ebuild 4472 BLAKE2B 31b2f8b870f17715c8393f30cb61e4622ad0ce4463b7f5fb60be64880804ebbbad1336531710ec829c43b730688c1fe42a063f72edb529a8831d951fd87aaa8c SHA512 90f1499b1a1b27b7f905f7951f6ea5ed46ef13e6dba58c102dd3213b93bae4fee410a967a35b39219bb39fd0e3495e45d51429e389771a46963939ad1eb469cb
+EBUILD podofo-0.9.6_p20180715.ebuild 4632 BLAKE2B 2af8ae0d6149e015883bb9c834ee094a976f5a1df4f21544f61748b1d8711db96fc6b5fd48f7895d5d1abe5faa8b333a054995475d4ab4d1d851af1e5f1a5376 SHA512 a22bb250890628388f4fc7bc3205ee9eeeec9d7d1c4476a6d6dc9ae82d0f32a7ff18d6d8609546b9de0459db66b28773709b4688da574b7a2dd2b3e26038cb2b
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
 EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index 7f9639761070..dd1f3e60f7ce 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,11 @@ src_prepare() {
 	cmake-utils_src_prepare
 	local x sed_args
 
+	if use libressl; then
+		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
+			 -i tools/podofosign/podofosign.cpp || die #663602
+	fi
+
 	# bug 620934 - Disable linking with cppunit when possible, since it
 	# triggers errors with some older compilers.
 	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 435847e8f20a..7b4c1151629a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,14 +6,14 @@ AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c
 AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
-DIST poppler-0.67.0.tar.xz 1459412 BLAKE2B 1c24908839fc9e3b3b2a1e0c014f7b6a1c6cc622157e161437ece91a86a20db0d5ae67b35783a5a4b712ab4ba0e43f141ca516fde10b5a549b9d36a98c5de25b SHA512 36584c62970ae0ae7807687f9c0523560ae92ac323949be8916a0e8dc6e691633e55cdd76c6026253c337aed8a4b43a7759a3de74c9ec606654f65379fb0f206
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
 DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
+DIST poppler-0.73.0.tar.xz 1507068 BLAKE2B d88a7595d0d8b779d623b56d8dc25c753f2cfc6f015092ec9d254a2b2d701d0e760a069324a15d3a03c65c9c85c3398ad142d7f8cc259e5455f53b4d391596d3 SHA512 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a
 EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
-EBUILD poppler-0.67.0.ebuild 3564 BLAKE2B dc1af15e88db8bf07c842a1bbc1d56d4fda73d2ce6a37bcd22c8214d58d3f94503fc41e03eb3585afcae188eb291d5d243117eb2366c101326211f5a124e6925 SHA512 a5231cb7a56b08651b73383aa5fe59213bc8ddfd87eb647b2b8ca39fb5b82daf42a88207eb814825c6c93c3debff6a8df05e61299a9e7644adb18369fb81498c
-EBUILD poppler-0.68.0.ebuild 3485 BLAKE2B d318d8d17eef484adff050585b70b327590c4af2b4b499cf48638f6d1068673a227cb438d391f519a95b6b65d77aede6677c0f62c1764bb5d9dccae36ca6183a SHA512 da82c946c5e66ff08689836d74745ea2a7dc1c9c2fcfb0bee8a7865d387e7aa1676330a951d1a330f7be4c67e8fac1a3bd8b69b4761fc84639c920bbc13831c4
+EBUILD poppler-0.68.0.ebuild 3483 BLAKE2B c236308ba5a46d21a3a3f1b677861a537fd0742186e473586922cfc98ef8b9023ace81d09e74cecdc42ad733ecbdde020069eca8e8ffbfefd3f1216c3e3f45ae SHA512 1f5c09875192b72cc985431f05945fe60739c21c67fe3dc08826568c182cf3d9e71c33c7fc22091b3dba742bfe65a864a5ba3e24d9971734336503e24ae0c6d5
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
-EBUILD poppler-9999.ebuild 3552 BLAKE2B 28aa4602a965d43bd0c26c2a89cf8ba9ccc4925c21b7b626a13dbe0717384dd57142282bcd3838f690765e15b36f15d70a34dd6586421fb3854370d3494c154f SHA512 b548a0c857314bbe8edd2ff26be6cd08e0cbe83f177b31692591abf0324538ac1f75de73f31731ea5a300bd810496bcc528ae46800e7fed1567f6f84332e1d34
+EBUILD poppler-0.73.0.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
+EBUILD poppler-9999.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.67.0.ebuild b/app-text/poppler/poppler-0.67.0.ebuild
deleted file mode 100644
index 26464a9c1dc4..000000000000
--- a/app-text/poppler/poppler-0.67.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/78"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 9eaec634d344..2089421ff8ea 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/79"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.73.0.ebuild b/app-text/poppler/poppler-0.73.0.ebuild
new file mode 100644
index 000000000000..05c24b50807e
--- /dev/null
+++ b/app-text/poppler/poppler-0.73.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/84"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a91d71770d67..05c24b50807e 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
-if [[ "${PV}" == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/83"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/84"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -24,7 +24,11 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt
 # No test data provided
 RESTRICT="test"
 
-COMMON_DEPEND="
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	sys-libs/zlib
@@ -46,11 +50,7 @@ COMMON_DEPEND="
 	)
 	tiff? ( media-libs/tiff:0 )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	cjk? ( app-text/poppler-data )
 "
 
@@ -70,11 +70,11 @@ src_prepare() {
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
 	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
 	fi
 
 	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
 			-i CMakeLists.txt || die
 	else
 		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
@@ -119,7 +119,7 @@ src_install() {
 	cmake-utils_src_install
 
 	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
 		# For now install gtk-doc there
 		insinto /usr/share/gtk-doc/html/poppler
 		doins -r "${S}"/glib/reference/html/*
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 983f52d56215..966c2286764d 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -2,6 +2,6 @@ AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae8
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
-EBUILD unrtf-0.21.10.ebuild 413 BLAKE2B 6277e97d71ad9505ac71fbe31ae086d4db0d8d07ff5df70b0763de3a25251e6166c38f54566e9ef9759fa7ea34f4f3de55cd13f30b148baa6506759690d2b697 SHA512 07e7abf489982c41786e0b056823ae4a8e6010722701f22e348f88b6f2c06e09c1b39d13b9be1d54be05654b31fb1c9a9fedf5f6a36adb9a057eb337f226edcb
+EBUILD unrtf-0.21.10.ebuild 412 BLAKE2B fa0e1bec3f02b40ae0012643cc3602dbcf2d878e6fcb7968ececd30d4a50aa3ccaa8cffb473ff3b27b3333c661403cfc991bf1a1a8f246f449a65c44fb905f3f SHA512 acb90f6f9347a43f67f3e176f6e0618f1ffb931aee804c65d7511bf50cf10f27cc7ed3d83cf36bc9ce62ce7f9f1305033bf91014ff0be6a3adf386c474e1d15a
 EBUILD unrtf-0.21.9.ebuild 735 BLAKE2B bccc2ee4512c901399b519aea8ebdf0d6de2a5dc6999d15ce2110715d5322b614d804d1815919827b56aeae1737604e848e92f71ca23329ecb788757734ae1e8 SHA512 00130f5ad9a8ea05bd87c1ae43cefe47a5842215dd69d3195fe33af033ffdef6e719b9945e8523189acebe78d2eaddacc1d56f5b441ff730048cf5274c656a8f
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index a4177b96e52a..82d08af27342 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 6e4d1d6f2b9a..30cd8d698bc4 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
-EBUILD xmlto-0.0.28-r1.ebuild 1532 BLAKE2B 9fc9888b651e44318baf70f3a7c6fb8cf340f13c5ab773b715cc1a1be5b240dd3d2e8bee470cb0131a42edd83bb24723c856abf851db2a37c5240e7033c4dec8 SHA512 ded3ce8ba2701a3c6285c0f639585a41697166470f90dda286b83c46c968d2185455d88d2e5bb8f90bd309632621c8db4419d47e7d9e48d2bc75b2950a6f4417
+EBUILD xmlto-0.0.28-r1.ebuild 1530 BLAKE2B c0435791043c1c0c5f3ab90b90b6e5e1190d53e108c41c13c7952498cd76af41e36af22aeacf8b6b254ffa472afa477a43934dfdf2eb40b494011d8fb89cf238 SHA512 8c922e63f42b23db4afb8779fffaf40f2af039a045d7e9b066311298507a3d4e112ff2ffdfba84a964967bf42bef03bf45877080e705f71d91b0fa96ba5dfd9d
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index f85deee63e78..e00fe2e013d7 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index e86eb82c307f..07272ad3e39e 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
index 2c461a0291a9..7f85333cfa0f 100644
--- a/app-vim/diffchar/Manifest
+++ b/app-vim/diffchar/Manifest
@@ -1,5 +1,5 @@
-DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
 DIST diffchar-8.1.tar.gz 440558 BLAKE2B d10e1db0db4b475af34a268324bec6f8fa1248124df2a40716406d207633f3ca0ef64e2b0673a21c24673c8d0640de936d897a9adfdebbe033ad7c4b10e9648d SHA512 4457b2f769049999c13a2a7ea5a585ba081ab18234c7bcda28e22a481b807edc0c4183229ad7239bc9d10b27270b35c6f27f27f92637693ee869eff09c22fc63
-EBUILD diffchar-7.2.ebuild 404 BLAKE2B 0e367725b5b0ba6ee4d0ab82cafc55f1e5ee429a7478d5240836475f6d1bce055b947ed51bf3cc1c7d13748f5cb4d47af4ad86e50ac847dad9553a79a06f5eb5 SHA512 bed5f93ea8048e5b21b71250b95ec5cd89473b615e65222a47366aaee6a83b582674f0314f1213ae4d204afaae60d0dfa0e77feaba95078d24ccbec025955010
-EBUILD diffchar-8.1.ebuild 618 BLAKE2B d63fe1205a37f70f5691b25079656d1727bb364eddbdd7ce2acd2037106f6a6c4b682a0a92e2d4dc36d219b37e149fdbb94314791f1f5967ae2e056b8a019380 SHA512 099a29a014786fb3ccf061b7d53dbab49e21db206af2fb5949764d45fa151275006a7a9c0c1ea97a66f6fa659732e1bb59fe663a65078d22f15d2f8391f912f6
+DIST diffchar-8.2.tar.gz 440613 BLAKE2B e440ef29512348fe82fc4b644fb5e5d9db31582991f22447f2a896180091dc3bd4e2e789ce8ca8984507fd2fe1fe8f53d37ac6913d34960a174dd9003d729e84 SHA512 ff7c01a03bd989fbcdabfda8007e177acab191e283e1617e16dc2a366869ad6946df7b25a2e514f96ad7dc69350f07ffd5eac7b7769f0e017e029343c9756ea1
+EBUILD diffchar-8.1.ebuild 616 BLAKE2B 162420bd17e6cbb2b0ae7c114648f675f6ad43a6a8b623927f7b03718b94fb4e1fd8e9df817b76d2cd3d565ac3ed27df3a27a741090e5a3dfc293786ff7a990a SHA512 046366ce2e1214237a320c4fe843c774b57d56cc14321dafcfe68857101515bbd285a1a2e6276a5c85fd549d2134d85a7ded7efc564d2580ca4238a9f031d321
+EBUILD diffchar-8.2.ebuild 618 BLAKE2B 2954818750e6594724fc544f06753501bc4bad449a183bb4412e9ceefb86d61a9ca097a96b1e49670e00433429655b9f6dde9ff448f47c515543312ff7e0b256 SHA512 d194a0adcec6f9a7d27ddb530832406e3ec06060f12df1196b2dc05d1aee39e59568319916a71b11a46951d1e28b223e0637d6fa92f566b1fe55272fb4a0c3e8
 MISC metadata.xml 345 BLAKE2B 25adb1e474dae23ba85761950707568de3a87a9f9b0b38545e3a7cb127cd1099f0531f23c04f55a0b21f42a4d5a36b2ef454f2608c692c3afe9a90068dc4ffdb SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e
diff --git a/app-vim/diffchar/diffchar-7.2.ebuild b/app-vim/diffchar/diffchar-7.2.ebuild
deleted file mode 100644
index 6c45dd971e77..000000000000
--- a/app-vim/diffchar/diffchar-7.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
-HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
-LICENSE="vim.org"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/diffchar-8.1.ebuild b/app-vim/diffchar/diffchar-8.1.ebuild
index b3395586f7c4..b6e6ce6644cf 100644
--- a/app-vim/diffchar/diffchar-8.1.ebuild
+++ b/app-vim/diffchar/diffchar-8.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: highlight the exact differences, based on characters an
 HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
 SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
diff --git a/app-vim/diffchar/diffchar-8.2.ebuild b/app-vim/diffchar/diffchar-8.2.ebuild
new file mode 100644
index 000000000000..fa01d898d5c6
--- /dev/null
+++ b/app-vim/diffchar/diffchar-8.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+GIT_HASH="837334b268302cf6c597d88485aa8aad6a500b98"
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
+SRC_URI="https://github.com/rickhowe/diffchar.vim/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm *.gif *.png *.md || die
+}
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
index eb83cc2cc79d..a2cd3ac57b0b 100644
--- a/app-vim/dirdiff/Manifest
+++ b/app-vim/dirdiff/Manifest
@@ -1,3 +1,3 @@
 DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
-EBUILD dirdiff-1.1.5.ebuild 368 BLAKE2B 71dbc4958a6a7b3b17745c8f15fab89b2bacf919313e6261c373d73de67b5faf78a07f60fddabf21a72b34e70a8279f8fcbf01b1a5fa951f88a2ea798e948220 SHA512 4595aa09c345dff988be2c50c2c6d435b518954b41989604eb30a3a4b1190274d0db050e4a4237e5db9d626977538796b22cdf7e35822a321a60f6928b2f60ae
+EBUILD dirdiff-1.1.5-r1.ebuild 365 BLAKE2B 0796cb8b400c02bf77fbb12f6d3f619abc54624c8b84088a444b7de517028ff21cda6f0f89475367132e6d8c3766f1be2a971d7df465e2f84ee0b8ccabd807b0 SHA512 ca1f498b21d711495d171008a0976bae20563f3c461b284023755f9c377f52d07d759700adddc6d3df8e8af924be93816a7c84af709abae2e16351169fc06581
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dirdiff/dirdiff-1.1.5-r1.ebuild b/app-vim/dirdiff/dirdiff-1.1.5-r1.ebuild
new file mode 100644
index 000000000000..e4106987927b
--- /dev/null
+++ b/app-vim/dirdiff/dirdiff-1.1.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: diff and merge two directories recursively"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-apps/diffutils"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dirdiff/dirdiff-1.1.5.ebuild b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
deleted file mode 100644
index e0cd57fdb82b..000000000000
--- a/app-vim/dirdiff/dirdiff-1.1.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: diff and merge two directories recursively"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-apps/diffutils"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
index 9fe1e2c19ea9..c14ce14935d8 100644
--- a/app-vim/emmet/Manifest
+++ b/app-vim/emmet/Manifest
@@ -1,4 +1,4 @@
 DIST emmet-0.85.tar.bz2 31274 BLAKE2B ffba1130c7c51144524a9da6f1477f1c836b7f16b19c669050139540beaf933382b62a4a7784cf4e90703b153f53e2da8416126f606c6fd572e73efe7b09e9b4 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56
-EBUILD emmet-0.85.ebuild 378 BLAKE2B 9d232b4f3e89a913d5ce46679270baa39cdf03c83aaedab8648f95aaa1c3c24325d02f66709de1c11b5a244c9fee29dc70757b44276f585800ecf8469cb8e880 SHA512 6ea5cb5f681fe5eb8eb7824a41395670c5cdf3c2d4c715451efd513fa9bde18738378919f2a0ebbe586de46be3c43b4972391042a0be2d2a9c07d5aab625af9c
+EBUILD emmet-0.85-r1.ebuild 375 BLAKE2B d44eed4306f223fc2301cd8d32ce89851d16fbd116bad66181c8bd733d824c184442a2e25920e1b5fdd981c9064578d3488f0ef24e4b4d8cc395ae6718c7b323 SHA512 9afe6bbc7f2a81f9602b8bc1379eb321b06f420c0ef36f67cab4494dd7a63c66d400a5cb9c62a8e3f9e691e3b30e35d48d11357d60af9c3e5203177847fd310a
 EBUILD emmet-9999.ebuild 360 BLAKE2B f5aec8ce781ac38df2bd22ac221af1ef7ab0391c18ddae49eabb4f6eda16948afe29a6ca45617b69bd9e1b5a43e9453954619d6e3c827a67399b19469cdecea8 SHA512 c4a71da333a7e2dfa33a9cb73be661b605795c498be3bc1e72f2ec7c2759b572f5cef131e31fce8d58771af3c3946f08dcf2fa28288c18893229bbd2f0f13b9b
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/emmet/emmet-0.85-r1.ebuild b/app-vim/emmet/emmet-0.85-r1.ebuild
new file mode 100644
index 000000000000..6d4e2ef712eb
--- /dev/null
+++ b/app-vim/emmet/emmet-0.85-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/emmet/emmet-0.85.ebuild b/app-vim/emmet/emmet-0.85.ebuild
deleted file mode 100644
index 3fb6d0a756ce..000000000000
--- a/app-vim/emmet/emmet-0.85.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
index ff2b2ca56fb7..45d07b70efea 100644
--- a/app-vim/fugitive/Manifest
+++ b/app-vim/fugitive/Manifest
@@ -1,6 +1,6 @@
-DIST fugitive-2.3.tar.gz 30949 BLAKE2B ff62ad9f5b85fff6a06fe006884901ca0f80a5ee139032955a6af596cadf3dca18d73980da12429706102cbe8105fcbff5fb1dd6375b851f978746a5251f1d22 SHA512 8a176705c0326ac034abaf23423e58d490feb7f11dc45ad23641fafb95279094ed38475a90e7c2e7fc95c615558db75f3587740e2658f3988fa07a1957aa1039
 DIST fugitive-2.4.tar.gz 33340 BLAKE2B d5e5df47e0492510abae735dd47b51d797fe38862401f7d8e64404f6fa4e040641141c6febb13b05910cc44dc0372b084fe0ee8c3980a73d11d65e1a502ed627 SHA512 fb9d4129090bbafcace9400e9f21feae06bc9f903a54cfef7c4cbfa62856019a511b924c294e86fd26cd713d588ca0054a17d9676b59e2f406779ab5d51c3363
-EBUILD fugitive-2.3.ebuild 623 BLAKE2B d33285b4bd46225b4c6871a4a730d9db9c738a7100f423624914d2f99d0214a53db16d375701fcd4fe5c59994436fbfcb719772b9b2552fda9bd5331d56578ac SHA512 a1343ef40078b1345a163b3ae50620c2770b87cab3a360afd8b2af32a471569eac17e68a339ebb8591f012388775d09c557f3f0a2b9afc1b7510d31de22813c3
-EBUILD fugitive-2.4.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
-EBUILD fugitive-9999.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
+DIST fugitive-2.5.tar.gz 39318 BLAKE2B 437f4c36b357937fc83e0107882d535c5cc9e609801147d1a48c28e16c4f964c221ff404301e57c9d740a04caf4cf5383a1f307ad89a76294e13b784561223bd SHA512 9a58ff3fa9eae72fca3d1232d01856ef56fe38b7bbf61be44ec4cdf4f0f69fca69fafe19266d657530a6d08f856236b1d1370bb770b14402bb7e476d5ca4bb78
+EBUILD fugitive-2.4.ebuild 623 BLAKE2B d33285b4bd46225b4c6871a4a730d9db9c738a7100f423624914d2f99d0214a53db16d375701fcd4fe5c59994436fbfcb719772b9b2552fda9bd5331d56578ac SHA512 a1343ef40078b1345a163b3ae50620c2770b87cab3a360afd8b2af32a471569eac17e68a339ebb8591f012388775d09c557f3f0a2b9afc1b7510d31de22813c3
+EBUILD fugitive-2.5.ebuild 625 BLAKE2B 668ba1e4efa3a4dd956278462b24b2ca98b4e02378e2878c6ab85bfe5c13edf1336ead71aba7756e6e43af1e5dfdc9a4d678c2d2ffffbc9d9cbe0e8026fddcf1 SHA512 93a7857bee6df123e936ce6f1644b8ddd8fe5810dc3b799f71d93b4124e8277e4721b2793c2906009cf016be4119964643e168a79c0c8273e42b9991be9417d6
+EBUILD fugitive-9999.ebuild 625 BLAKE2B 668ba1e4efa3a4dd956278462b24b2ca98b4e02378e2878c6ab85bfe5c13edf1336ead71aba7756e6e43af1e5dfdc9a4d678c2d2ffffbc9d9cbe0e8026fddcf1 SHA512 93a7857bee6df123e936ce6f1644b8ddd8fe5810dc3b799f71d93b4124e8277e4721b2793c2906009cf016be4119964643e168a79c0c8273e42b9991be9417d6
 MISC metadata.xml 342 BLAKE2B cef6ff7e21df2703dc1c1138f95ad5f8e478a7c6bbd013791fd7c1b1754a2f7eaac9c84ebb42af9cef1943e7a94a880d0cedc030ff95966ac607a1b0b37dc37f SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842
diff --git a/app-vim/fugitive/fugitive-2.3.ebuild b/app-vim/fugitive/fugitive-2.3.ebuild
deleted file mode 100644
index 51d8b9f20974..000000000000
--- a/app-vim/fugitive/fugitive-2.3.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
-inherit vim-plugin
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
-fi
-
-DESCRIPTION="vim plugin: a git wrapper for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
-LICENSE="vim"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-2.4.ebuild b/app-vim/fugitive/fugitive-2.4.ebuild
index 3ec007ea68be..51d8b9f20974 100644
--- a/app-vim/fugitive/fugitive-2.4.ebuild
+++ b/app-vim/fugitive/fugitive-2.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
diff --git a/app-vim/fugitive/fugitive-2.5.ebuild b/app-vim/fugitive/fugitive-2.5.ebuild
new file mode 100644
index 000000000000..fe8da7842fc2
--- /dev/null
+++ b/app-vim/fugitive/fugitive-2.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/vim-${P}"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
index 3ec007ea68be..fe8da7842fc2 100644
--- a/app-vim/fugitive/fugitive-9999.ebuild
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit vim-plugin
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
 else
-	inherit vcs-snapshot
 	SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+	S="${WORKDIR}/vim-${P}"
 fi
 
 DESCRIPTION="vim plugin: a git wrapper for vim"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index e5e3801af0b4..d7424a736043 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20180821.tar.bz2 18361 BLAKE2B 4134fd0a3d75d86f3984f135021063b68588083f191efcb94d7b599460703d6eb501bad7de2aa0cc9cdc4447d73b83e4b36cee2acdd113e7d0a879e1e864e2fb SHA512 09c70ded667b489e03f02e0e72fca32f13a40501a5e319b387967e75f616c7f3dc44ceab3a46b776a509263f58668223eb85d51ba58ca3fbc48e4c05d7345dfc
 DIST gentoo-syntax-20181023.tar.bz2 18299 BLAKE2B ea037425ab00b05e4a52f943817fb264492793c842b6c9250450ab715fafebc55d0b5b95ff49945f62258f2dc70f357eeef3a5d908592c995cdc6e940f2f15af SHA512 a6bd592dd46ad80a4126321826dbbc4c130624027e7e71f0ea87fb164963e980e3ab3e1db1e87ee0ddad602f2ea2e9e7d955a0016c00eb8aef4c01c29057b737
-EBUILD gentoo-syntax-20180821.ebuild 1283 BLAKE2B 833c4fd4b2bc85a87359f188f86db454dafb1938183c4b65905d0cde2dc4099a0ba4e5cfbc4a99a18bd89f0d57ff47df48f4ad3a687b9aaa2309d22c57a1624e SHA512 b7af1703f420fed2e2a890e86e78e68037ff1405f55d7c8ec56a63c7466b998f1c9f024ae342ef45e301f8fe2acb5731c2bf941fb7a58ffdb67986dee9d4c69e
-EBUILD gentoo-syntax-20181023.ebuild 1284 BLAKE2B f6f66afde05a214c21f0eeb94d1381b2b3e400ec06d209032d66468a4fe4783ac33552fdc0e098981fca96381c720fc25ecfa507ebe8dc88ef3c55cd9f360cc6 SHA512 ede97dc717d702bf50a26daab6763d977310775ec5523a1eb6e94f54e56468ed6c5b14a1ffdef8fb14fc8958c2d96ce370e48db731a0406d895dde2e4a497e25
+EBUILD gentoo-syntax-20180821.ebuild 1282 BLAKE2B 6f6542618489fddeb1de17173abefa5915cc6c67f261d99b57358769d70d4607400a767ce7d3230a61158c38ec7ee3b3978cc58e21111ee95a872117d08d2284 SHA512 524b92e9ebd90271c26ad14f46ab716554dd141cd6f368257ee10771fdc5dc14932d831705d3cc89cb5d6a2d5083d00d90ee667426bc3e4a7aeddaedae2f23cd
+EBUILD gentoo-syntax-20181023.ebuild 1283 BLAKE2B 2bd7bc2ad1256759862e6edc8e06885d6a93fc2a5b0d9ac8d92cf98a4c492bc4d1d90c4d605d05b8050e934e235ec4243ea10acf9b4df8831a2f379927eb28de SHA512 cd43a7f59d46317361273fce804183eb58dd67521e1914ceebbcbb1cd77c0366256d4c1c906638f770a2bd25c5121e369c4e023ea8d3cfb19fe2a7ca7bcafe56
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 560 BLAKE2B 21f954af20949469ae0f30a81743d9bdd1114b64b51b640d0da2d294897a885878a13bb1d408c69cd9e1afe936fd02c1ae7170e48a2f5d2280afe525266e448a SHA512 89d979077e4171aece29bd44f3d6ab6a84261dfa8eaa655b5b5d77dc20c5e2ea7cd361002e0f4d8212793449bd86da03e2d2e59bc6d23a158dceca1d60d416fe
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
index 31b2eb13b129..f1c1d58814db 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20180821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
index 6015b3f75531..a2883aec426f 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
 
 LICENSE="vim"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
index 02d1fc21f979..4c0502c0a020 100644
--- a/app-vim/gitgutter/Manifest
+++ b/app-vim/gitgutter/Manifest
@@ -1,6 +1,6 @@
-DIST gitgutter-20171101.tar.gz 43534 BLAKE2B cb0b935c1b2d16a50bbecc73f4f8c657a9087bef56bef36af8ff52a7ff09d39293296eaf49507015eaeac7f4faba2a26a09a49296c28237029110068cb9f6048 SHA512 24d8ad740931df17c2c67e2a2a13e3bba7c1205ba5543f5c11353e639876f4a54e69170dc0a946660ee2e3a23a110c90f4195fa9a1ddfff19163f00d88528219
 DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aac1c6623b4645b8b1abd5719470ac181e09c8b736f8b8a14e6098b60cb8f97b114dc5c2a587b6d1875fcf27b4b12cf SHA512 15873b2cccc49f8aec9de312efedc615d6fa822b45ca8ce53cc6cc878fcaf3a6ab3f02eb5d082ff329528cce1b48358846b0aba3f9d3bc8aadd29aa57d3b1a30
-EBUILD gitgutter-20171101.ebuild 752 BLAKE2B 02fecaa88d65823737070954f3a392036694794537c1953ea218d16952a659ad5813e6e67e348c9d56e70b392e10f954dd2c31ad95fb95833e7901cc7b1d3eb1 SHA512 8ce0c16f4f4942f8e0b33790601d42b2652d8310a496bb8d2f61713c612d210a93ac9be1aa9ed88bc99da088feafc9da9967285528d55701437465bcbb06ebfd
-EBUILD gitgutter-20180316.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+DIST gitgutter-20180815.tar.gz 46741 BLAKE2B 85189390a2d8c5feaf8d2fabfd2c72bf79954fd1e9f2c3ffeca748e84caf13924f71ef5837ab62aef0ae003a01304305e73bbcb12dca27294c8164e960249fec SHA512 b6d3bd0f779d9afbd38df33888ab3ee0f1d8d10de0a6c5c6766f7f73a292cdd589a6774faa2871877075f6cedd29f14bba07c9a769d706e0e67d8817db86cfaa
+EBUILD gitgutter-20180316.ebuild 789 BLAKE2B 5117f2eef5b3fac7d0edd8c84bce91362c796a28b6c75deb880741c7524da061c9060e3e175c7ffebd35bcd7b81fbfbecfad73585027c784289869ea99d1a56e SHA512 bef6a4759f414ac8d01bd7214fbbb868b5fdccbf2f68fc58aff2f1591a5e552cb912fe0e61ade6f25f287843d65760c6fcba04b091af1a726cd495e42211b253
+EBUILD gitgutter-20180815.ebuild 791 BLAKE2B 43ecb9ad564614b597a3af65e92ff79e43910be3a3bb8303f26668bd26da7b5541c96284274c16f89f5708dca1d12fc3c0e2459777c46f7c1a4565442b7145dd SHA512 b032fc92d27d6c23ef0ce7a80e2778254fdd1a1d25f4f9a4f097050fcf6849afe55939575160403e784f32d46b12b0380807d5201b4db2c912794b9045868a0d
 EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
 MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-20171101.ebuild b/app-vim/gitgutter/gitgutter-20171101.ebuild
deleted file mode 100644
index 2dada9f85e8b..000000000000
--- a/app-vim/gitgutter/gitgutter-20171101.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vim-plugin
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
-	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
-HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
-LICENSE="MIT"
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="dev-vcs/git"
-
-src_prepare() {
-	default
-	rm LICENCE README* screenshot.png || die
-	rm -rf test || die
-}
diff --git a/app-vim/gitgutter/gitgutter-20180316.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
index 002f6583087d..c7ba8deee65e 100644
--- a/app-vim/gitgutter/gitgutter-20180316.ebuild
+++ b/app-vim/gitgutter/gitgutter-20180316.ebuild
@@ -11,7 +11,7 @@ else
 	inherit vcs-snapshot
 	COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
 	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
diff --git a/app-vim/gitgutter/gitgutter-20180815.ebuild b/app-vim/gitgutter/gitgutter-20180815.ebuild
new file mode 100644
index 000000000000..38fbbde158d1
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-20180815.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	COMMIT_HASH="50a7062909d91a290fae04219887b1b45f3138db"
+	SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	default
+
+	# remove unwanted files
+	rm LICENCE README* screenshot.png unplace.vim || die
+	rm -r test || die
+}
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
index 86c4fab7baea..3d573b1c379e 100644
--- a/app-vim/nerdtree/Manifest
+++ b/app-vim/nerdtree/Manifest
@@ -1,4 +1,4 @@
 DIST nerdtree-5.0.0.tar.gz 56162 BLAKE2B d4451ae6968454c6281e63233db13f0c5c834eab1a69662b2850d0cfa91f7255a51cbe5113c16224a57eef86862a032607c6eb1a7cc300af169491ce40e9cebe SHA512 7de6e7978604e89e2c03cadf74ff4a57545ff73a643039fdfe76f277e773374b5b5f9bbd5d8f3307df4af867f88fc687f9bb5e28ff9e90d11fecdef8bdb83d1a
-EBUILD nerdtree-5.0.0.ebuild 523 BLAKE2B db5eba02fb0e36219d1f5dcf163405599417964731240b80e8b299539a3a2475a6c9ef5ec3d05831f1af527cedd37a8f3d9cb1bd125d30f1b9151d9280e3592a SHA512 629735c0c41c0ec4ebec6b7ac4795402ba64c635af602ea9f6bee6e4526a5aa8cbf2705d99583e519850064348787f260b7223b05b94ad5a28b33d7f5c5268a5
+EBUILD nerdtree-5.0.0-r1.ebuild 529 BLAKE2B 2dbec1ec982f417e0b30f6656ea589f13dbe96c6ded8ad6e1a668183f55cddef5f8a634ab0eaed0f40874b439b43723bfb1d5e93ce41a73d745e0eb957201dd2 SHA512 dee101c05177325dc89c21b2804b194cce5002ca3726a0c02b88a807afaf6633c9e7d555a6159a3d2f315725b9c3d252193d63f9117a13b03aad0a257f03dfc5
 EBUILD nerdtree-9999.ebuild 668 BLAKE2B fc7d8bb32d825138c13e015ca6ca531caa547fa87ec87dc61bacf0897e8259ea675d6509ae7768ace8231dc29d2c99fe7cb236cf83a061857525195d3afb4398 SHA512 c6f79c9053a1f4dd98fb25345adfc992765544638402df0e0e6494cc5230d7901df53399eb9279b35d8d9064ebcca1e829a321ba1ad429af48f175a9efa7b247
 MISC metadata.xml 333 BLAKE2B de49a7c07d2268dc5550bd2bc842240e53a087e370a093dc08a5360b157e0411cc9dc99e210f1012afeee6123a55f46fda13187a9e6d857b5429e336f5ef6ae8 SHA512 703134609bdd4d7ed256d4c6e3f045fec2ad056d0348af8e97bf6513c5e63139ce0084e8ebca8fe56c925d5ad7fb7146256f932094ee21846a0f8915f0dc5dea
diff --git a/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild b/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..b07c2abb249c
--- /dev/null
+++ b/app-vim/nerdtree/nerdtree-5.0.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
+SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="WTFPL-2"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+VIM_PLUGIN_HELPFILES="NERD_tree"
+
+src_prepare() {
+	default
+	rm LICENCE || die
+}
diff --git a/app-vim/nerdtree/nerdtree-5.0.0.ebuild b/app-vim/nerdtree/nerdtree-5.0.0.ebuild
deleted file mode 100644
index d01ff3cf26ae..000000000000
--- a/app-vim/nerdtree/nerdtree-5.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
-SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="WTFPL-2"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-VIM_PLUGIN_HELPFILES="NERD_tree"
-
-src_prepare() {
-	rm LICENCE || die
-}
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
index 93c658b45f22..2824d2d8d1e3 100644
--- a/app-vim/pathogen/Manifest
+++ b/app-vim/pathogen/Manifest
@@ -1,3 +1,3 @@
 DIST pathogen-2.4.tar.gz 6458 BLAKE2B ce28371994938ab4386a6e0a45a9b096443129b7e8de47c92a4c1fa819b7c2aef1e32153866fd1d86a60f7ee2fe2c59ae972700cc22dec263364ef8f51ebe24c SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe
-EBUILD pathogen-2.4.ebuild 444 BLAKE2B 5a59957e8a27c402f4879183be28f52ccc74e026454b4832a06717ce3b1bb872ca3951ca8b21fb2f19453e13b7df443d10ae212a9e2da6de58b09025add38cde SHA512 b8ad5bce4f40f0037d1a36936c3ff4fc0b3b06dfde995cc07302e052dd5673d8a50b385085f2d4cdd0f261f1c71a10dd63e5cf9101501ed6c1d22c86cebb92a0
+EBUILD pathogen-2.4-r1.ebuild 443 BLAKE2B acec344c87596aacf47ba943a1d5f4f1526bb5354c49ca73bb784b143d25b05f2a5f943ce162c3bf6b73db5168ab2d3a7a2b745cfca723cd15697b835f7cdc42 SHA512 17d3f17e5ab35f40e21b420542e4f4920ea0aaee075d6527de5308b209c4e7ca66fce0e5ad52bd3d8853711ed73b33ca598d4236fd1e38192166868ef3898cbb
 MISC metadata.xml 342 BLAKE2B 19ba916c65add7bdf0dd77211eaf660c28cf2c377ec2a81b852745a5cb2c9576d8555619f7855a233af89e0460176761d80b751f8db7d76f1044efa665a52443 SHA512 c4839875a6c09fbc05ba0f94aa1a5b9f81c4f22c9972ac96113c48266a3a7b0f0417c8198b9df181eb0c7374960d8e49f241cc75a4efff598a821914f5560425
diff --git a/app-vim/pathogen/pathogen-2.4-r1.ebuild b/app-vim/pathogen/pathogen-2.4-r1.ebuild
new file mode 100644
index 000000000000..94ac011cc1c4
--- /dev/null
+++ b/app-vim/pathogen/pathogen-2.4-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: manage your runtimepath"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332"
+SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+S="${WORKDIR}/vim-${P}"
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild
deleted file mode 100644
index fc4009c0861d..000000000000
--- a/app-vim/pathogen/pathogen-2.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: manage your runtimepath"
-HOMEPAGE="https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332"
-SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86 ~x64-macos"
-
-S=${WORKDIR}/vim-${P}
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
index bcb5ecc3b2ac..53dc2aa23159 100644
--- a/app-vim/tagbar/Manifest
+++ b/app-vim/tagbar/Manifest
@@ -1,5 +1,3 @@
-DIST tagbar-2.6.1.tar.gz 51639 BLAKE2B 623f56dfb1ce7abde3281d9e1564e300f30cbfa9242772532025dd3d85640118b85ad3f68d20d6806ff3d994ba753722e096098231f750195569afc47635487e SHA512 eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22
 DIST tagbar-2.7.tar.gz 59027 BLAKE2B 6966ee9c412b0e7c9dd562f479ab4ae3fb4574034a32e33257ce95850f2861e333682d01d605f1c39dd6675a506e1792fed8a470b08152d14046bea215292698 SHA512 d964d3055f1679aad86b0756cc444a4857eb29ca22f2bd3567ad6c8d073e75d0c8823109038415f5bd1d269bbf8e36da6f34d70fedee54c10f90535ef79ff3c8
-EBUILD tagbar-2.6.1.ebuild 500 BLAKE2B 84300000ac7c06dcc5b1c2576022bd6918f475977de6f7eb1becea74fcb0cf3ddfa22bdef017572446fc4d3e2453683df706fc3ad5552ca432a0fbcef7680b65 SHA512 ebd88ae5174fa3b8438f3e77d088c0606d1148c4ed494395ff97908525a1d81f2d87d2001a9fda08c2b15ab0c9624ef6c437dd61c5358cf650962059ac50527e
-EBUILD tagbar-2.7.ebuild 549 BLAKE2B 2d0ccd8b0f6bc4e0e6d4407c20f7f608a88345e7e4f9a40fe544a9805d38d825ae8ba0e987a4e3e95b8e89b9de71a7237cdc45665fbc34aee67a073d10d0887e SHA512 53abc5047d1ad81ce73a8761d65ca969c3f17c4e37333a417a4568915a8edd38f3909fe400f3e5fe8ce2aea51bf55a4d0572e4b363ec9403954fba2eb41da47d
+EBUILD tagbar-2.7.ebuild 544 BLAKE2B fb11f3502be125f9acbc5d2e3749c6259f7fce141cc6d4d383f3833f8dc0681862291d197d42b3717760d14df288a6d529f675aacdec7866f440f3db7caa4168 SHA512 26e397d763e188f6faeb8ec832441bd0c36462a32e9100aa8b1053491895255ff63bf45f51efc82b4289501dfc9573981f9d360847b81b222b4cef3f3e1bfa81
 MISC metadata.xml 341 BLAKE2B 4a1c8210c02cd207a9772371a9f4a02308352360991a6d8734579a3fe79a40716b6fd310b16ba6359e869843cf8b3e80be9dbb62636cfb1eaa924d3217a31e65 SHA512 adfd265c7224b9d6f4013721066f15e26baf908c0c89b0357f0a6d92797ee08eecfaa6b3c28d5117b88e258f6a0eb2fbd2704c701a11da6dd6095511a298eefe
diff --git a/app-vim/tagbar/tagbar-2.6.1.ebuild b/app-vim/tagbar/tagbar-2.6.1.ebuild
deleted file mode 100644
index a1c2e7fb7e0a..000000000000
--- a/app-vim/tagbar/tagbar-2.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
-HOMEPAGE="https://majutsushi.github.com/tagbar/
-	https://www.vim.org/scripts/script.php?script_id=3465"
-SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-util/ctags-5.5"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/tagbar/tagbar-2.7.ebuild b/app-vim/tagbar/tagbar-2.7.ebuild
index 211696e57ae9..6820a54e5e04 100644
--- a/app-vim/tagbar/tagbar-2.7.ebuild
+++ b/app-vim/tagbar/tagbar-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://majutsushi.github.com/tagbar/
 	https://www.vim.org/scripts/script.php?script_id=3465"
 SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-util/ctags-5.5"
 
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
index f042d0b4bcf4..1a1f93e7d338 100644
--- a/app-vim/webapi/Manifest
+++ b/app-vim/webapi/Manifest
@@ -1,5 +1,3 @@
-DIST webapi-0.2.tar.bz2 20690 BLAKE2B 5438a88c94f77cbe5ce2a79b11c4da31199cc071b35a22fc78b01c9f4c1195d830353639ca05d3c95182fe3ae5c177cddec9d6acd0b2de198a3f77de5e1ad92f SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da
 DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
-EBUILD webapi-0.2.ebuild 328 BLAKE2B 1dbcbbb4a1ae8fa48871f527564061c5c1b8a4ba3ccb846ff82e4496af55bdb2f2834a7b79f6c4795517af4e0dfb8be3fa9f8cfcb1a59ed92fa38f4ac8935330 SHA512 3621693275ed6aa6b0b9ab14c79648b8d5cabf609e7ff2ef5df3d45b85de5d58c6560df7103dfc4b2a2ba67dbbaefcaf19f8651ad045ba0af6f76d726e7814e6
-EBUILD webapi-0.3.ebuild 468 BLAKE2B 81ad741b8522f2557471e33fca8e53184b1150a1ef54f61bebf5687cfb5eab502b3d1d2976c0568a0ee34d5d1a7c24f1372256faa579a1b58f5e8215b5af6ad6 SHA512 9c92be9f70769f76b709f8e8fc73de3db05bec9299434dab5644941617f95cc619ddeac137d13c998f4ba5daaacaa68a982fa6e001b43dc0a7d9d2d345970a30
+EBUILD webapi-0.3.ebuild 463 BLAKE2B 85fb64519b0859d04ff5779f4f8860a2e3d448c79728ef4f4bef31e454cdf2d2939d1281c81b451016729c1c1442b812450aec3d9e9a2bcdbbf589e38f91b42e SHA512 bfab8ea1cac08de5d3a0cce970958215df10a7138283b8fa829f267b2435916c84292b8135d3fc700db345a38dbf3e6c75b026f5d3886cc5ae48da7ca4d407bf
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/webapi/webapi-0.2.ebuild b/app-vim/webapi/webapi-0.2.ebuild
deleted file mode 100644
index 220b40e270c5..000000000000
--- a/app-vim/webapi/webapi-0.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: interface to Web APIs"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4019"
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="net-misc/curl"
diff --git a/app-vim/webapi/webapi-0.3.ebuild b/app-vim/webapi/webapi-0.3.ebuild
index 7a9673e4e753..84d31825dee7 100644
--- a/app-vim/webapi/webapi-0.3.ebuild
+++ b/app-vim/webapi/webapi-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: interface to Web APIs"
 HOMEPAGE="https://github.com/mattn/webapi-vim"
 SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 
 RDEPEND="net-misc/curl"
 
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index c180c5604f8f..f49ca23ffff1 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index d511ac3da4c3..8c265092ca37 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -3,8 +3,8 @@ AUX gps-2018-gentoo.patch 2976 BLAKE2B dd72c2c4c8dc8f971b819eb76b4433dd78c587d79
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64
 DIST gps-gpl-2018-src.tar.gz 40541905 BLAKE2B abe38dd23d9afede27b4ec8294e3245c12d52d60491b6e7c1b2d120a6f1e5d808fdcfb648e72da31376e2de176f7a039c5493341ad295db33b6a1ce44bb64096 SHA512 da0eaa85eb753f215354c9765272d85378f36ebe207314bab9211642f9d9b505a3d05cdec9de6964ae9139c4f8942a29e06c72db32b2aeb053a694e9c982e470
-DIST gpsLib.tar.gz 11017404 BLAKE2B b84219322950d5c3a7b202e4b5e423fcb95c528d4e0810f25674e8cfd0e9ca91a155fff500e4d25959cdba42492794fba8cb725e6955bcea8908a8043a387ca1 SHA512 e852285c8b67e5787396dfaa95feaff31e73bd4cd3a731e20c6970c2ade3ef6290ef98d9a6b7553d4daf6f2ae722ca5ff74add3fd4285ce259a1443e6b06a5a1
+DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
 EBUILD gps-2017.ebuild 2120 BLAKE2B a78b670ff9915bef812bb51b8a45e26feb1ec109b5cafcc1dbfbe3628aa33a02d32585829424e9660cb3759d464d7aca413c038aa5db2d24f0513ba86d2bfbf9 SHA512 f50681981837153b0df3080992c57c17315afbcc90848fe803b03d504284eb6f4f0a8c24cc2caa6aef2e4b5f29fb70af3b06b3c684e5b37844d350e1fa1150a0
-EBUILD gps-2018.ebuild 2561 BLAKE2B f5d771871c70710743fe85e644f9513e32c43cadd8b63be4fd95a8f9d499d75ea68f887d243c4192d93e80748f087cdd56c601d8d374df7d47e15324a78ceaf6 SHA512 f3a4cb6f0176fa786f2bdd52900c5481c98768321596e829309a56fee37183d8541797a7587a3c44a175978b11607a5735c9c81d7364e90af5e98efad98341c4
+EBUILD gps-2018-r1.ebuild 3118 BLAKE2B 24faa9b9cdc133350048cf32b41bf5b6a81d3b4cc11080d1cc8653fbd813d25c7303c61349018f9b63e5c07d574c7fa372d26011b5bec10ac8988bf06215bc83 SHA512 42bff264dbc3b35818b556247e4c7f16ece78023fe7e338db3b73f6a44342cd988330f44c7f6c10337117aa3f576b701e6476dade4d89c5004f1dfe7866cc0f2
 MISC metadata.xml 657 BLAKE2B c97ff9ab3140c87cb2066f25c639c3a5053c0775abfe23937b92f912ff71299bf136de797de6fd1010d576ba44f4e1b1f6e7dae4d1e076682382b33482240606 SHA512 498222549bd8c7e48575bdc0250cc810540928b19819759ba8a4f9b3aea39ad1b7b579b988a26b1bcf109774b356c7635e11e5e42a41dc76af8d9230a63f9d91
diff --git a/dev-ada/gps/gps-2018-r1.ebuild b/dev-ada/gps/gps-2018-r1.ebuild
new file mode 100644
index 000000000000..b8cd9b2a7584
--- /dev/null
+++ b/dev-ada/gps/gps-2018-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 autotools desktop llvm multilib
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
+	-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
+		libadalang-tools-gpl-2018-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
+		gtk+-3.14.15-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gnat_2017 +gnat_2018"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
+	dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
+	~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
+	dev-ada/libadalang[gnat_2017=,gnat_2018=]
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	gnat_2017? ( sys-devel/llvm:5 )
+	gnat_2018? (
+		|| (
+			sys-devel/llvm:6
+			sys-devel/llvm:7
+		)
+	)
+	sys-devel/clang:=
+	x11-themes/adwaita-icon-theme
+	x11-themes/hicolor-icon-theme
+	dev-python/pep8[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	if use gnat_2017; then
+		GCC_PV=6.3.0
+		LLVM_MAX_SLOT=5
+	else
+		GCC_PV=7.3.1
+		LLVM_MAX_SLOT=7
+	fi
+	GNATMAKE=gnatmake-${GCC_PV}
+	GNATDRV=gnat-${GCC_PV}
+	GNATLS=gnatls-${GCC_PV}
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	GCC_PV=7.3.1
+	default
+	sed -i \
+		-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
+		-e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
+		-e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
+		share/support/core/toolchains.py \
+		share/support/core/projects.py \
+		|| die
+	mv "${WORKDIR}"/libadalang-tools-src laltools
+	echo "#!/bin/bash" > gps.sh
+	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
+	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
+	cd ../gtk+-3.14.15-src
+	sed -i \
+		-e "/^libadd/s:=.*$:= \\\:" \
+		-e "/^deps/s:=.*$:= \\\:" \
+		../gtk+-3.14.15-src/gtk/Makefile.in
+}
+
+src_configure() {
+	econf \
+		GNATMAKE=/usr/bin/${GNATMAKE} \
+		GNATDRV=/usr/bin/${GNATDRV} \
+		--with-clang=$(llvm-config --libdir)
+	cd ../gtk+-3.14.15-src
+	econf --disable-cups
+}
+
+src_compile() {
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+		-XGPR_BUILD=relocatable" \
+		Build=Production
+	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	cd ../gtk+-3.14.15-src
+	emake -C gtk/inspector
+	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
+	emake -C gtk libgtk-3.la
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
+	mv "${D}"/usr/bin/gps{,_exe}
+	newbin gps.sh gps
+	cd ../gtk+-3.14.15-src
+	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
+	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
+	dosym "${D}"/usr/$(get_libdir)/libgtk-3.so.0.* /usr/$(get_libdir)/gps/libgtk-3.so.0
+}
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild
deleted file mode 100644
index 290f5bf27219..000000000000
--- a/dev-ada/gps/gps-2018.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 autotools desktop llvm
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
-	-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
-		libadalang-tools-gpl-2018-src.tar.gz
-	https://dev.gentoo.org/~tupone/distfiles/gpsLib.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2017 +gnat_2018"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref]
-	dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python]
-	~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=]
-	dev-ada/libadalang[gnat_2017=,gnat_2018=]
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	gnat_2017? ( sys-devel/llvm:5 )
-	gnat_2018? (
-		|| (
-			sys-devel/llvm:6
-			sys-devel/llvm:7
-		)
-	)
-	sys-devel/clang:=
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	if use gnat_2017; then
-		GCC_PV=6.3.0
-		LLVM_MAX_SLOT=5
-	else
-		GCC_PV=7.3.1
-		LLVM_MAX_SLOT=7
-	fi
-	GNATMAKE=gnatmake-${GCC_PV}
-	GNATDRV=gnat-${GCC_PV}
-	GNATLS=gnatls-${GCC_PV}
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	GCC_PV=7.3.1
-	default
-	sed -i \
-		-e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \
-		-e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \
-		-e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \
-		share/support/core/toolchains.py \
-		share/support/core/projects.py \
-		|| die
-	mv "${WORKDIR}"/libadalang-tools-src laltools
-	echo "#!/bin/bash" > gps.sh
-	echo "export LD_LIBRARY_PATH=/opt/lib/gps" >> gps.sh
-	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
-}
-
-src_configure() {
-	econf \
-		GNATMAKE=/usr/bin/${GNATMAKE} \
-		GNATDRV=/usr/bin/${GNATDRV} \
-		--with-clang=$(llvm-config --libdir)
-}
-
-src_compile() {
-	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
-		-XGPR_BUILD=relocatable" \
-		Build=Production
-	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
-		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
-}
-
-src_install() {
-	default
-	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-	insinto /opt/lib
-	doins -r ../lib/gps
-	mv "${D}"/usr/bin/gps{,_exe}
-	newbin	gps.sh gps
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 733b74765447..2bde9c945930 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 2155e011ddc9..5b1e94680d8a 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,12 +1,5 @@
-AUX glibmm-fix-threads-gobject.patch 933 BLAKE2B 83d9e91db00b4de81615733e557281cdc191b2662aa016799b3e72bc3f4e738a997d3ca084a3d36e1212406cedfde5c7f6ca2975fbef3ea34d1ee3c8e941728a SHA512 b4fbfdafe7198ddf7c40513e1b490880a1fd2013fa221231d6605bde0b3757d6a8820c540f417281853939efdc7c5f13656e7f6b8c8302d318aa28e10dfac4a9
-DIST glibmm-2.50.1.tar.xz 6444576 BLAKE2B dbbdb79d8de9510f9bec770523ca7f4c93d287cbd9890b2fbc08712f6a2815186ee792f6339820a14aa9e4d49c9d1735c6c6651994cc4e03549f0d96b33f87ad SHA512 4f25c75c1628ca2f4db1c29cebc63187d372603066b06aa6a66c6da792f9e02cb4a413e41f058a81e2d5a2b38d625de13df76115b278f010ce2fc493fe6e6bbb
-DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
-DIST glibmm-2.54.1.tar.xz 6837384 BLAKE2B 98e4acb5b80786a27195bea43cc425a45219078ef839e97c60c9e3f52b3a0b3c928e19469d679529b5091d8ac1953d4f315ea75618c3fcc8f33d15f6565b5783 SHA512 94f2a4d6972684e25e38ff2e6bcfc1e9c5e4d096856d3419320c14166e27e26b1ad69be434337e9b70c23842989988113521aae7a800ef2f29e81f1ae6c25a13
 DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60abae6506395b318be876d5ed680b1451920063f06d6d9655137d50482a9ba936caa0f6da127bb3855e43b4d877f SHA512 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08
 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
-EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
-EBUILD glibmm-2.52.1-r1.ebuild 1752 BLAKE2B 330668770206c91d714c45ae4e2a565c7eb48e323afe2169c21bbcfee771ec35063cc50ca3c58ea8b9ebc3bea3a550526acbe0424fe5469a9c00420b2f5f6696 SHA512 47a4098e1396009f4db2272e6172c4a61d904f44336dc502b56ac048a0edaab78322b5e32bc2d1f7bb9e00e67491b2108fe7fdac9ca3c4608ab3c5f52f3adf13
-EBUILD glibmm-2.54.1.ebuild 1763 BLAKE2B eda5976b2a3f3da472d76e0b3064dca99ff53cda1ac043e1f1e67f04f964634821c83a3186ebb4c73a099df9d294bff231417c91d8c12f5efebea700d021eca9 SHA512 bfb037e02f69876e40afb61f8de05296bb67f44ee727b9df36f6307ae80a9eada3f38c7173724d9697300298d41255ea87791e02f58cad6939b9ef7e004949dc
-EBUILD glibmm-2.56.0.ebuild 1634 BLAKE2B 623911c7023035a28be9413d76bebe5c610f3bd1b6a9132b2bf75c5f97a0faa64bb52e5fb50b3f015adede54230ebb7384ee0809a2596053821ec54c52a1bc93 SHA512 7a6c3037bf5393c99632f7e5b22ebc594729d4e1c96919233400d10d418610de9433890cc30b11fc6f26139f079486167dc6c6fde973c1e8cef6cd4b56ddc14f
+EBUILD glibmm-2.56.0.ebuild 1633 BLAKE2B 18f75726ccc969a8985bc2b04ef257277fb4eb7bde203030e09f3eba1f1a25d96a5d2a4318346c176b9a54c62a00ffadf4f045987f89f4d8cc448677c56311a2 SHA512 0827bac28286463c413d8bce0f25420e467c47f49771ca414fa5f12c357daf420a49c763ad2265ba14ba66a051387990d5f06d9fe6e9c757a1c9325f84c6c496
 EBUILD glibmm-2.56.1.ebuild 1642 BLAKE2B f5d71f2700a2dc20a6f922b882440f318ba515f2f2d5f6046e3281b9f38fa9cd69a4e5ed2b56a9bc556776d36fb71ff1a33cac48a087075f7db36ba6b6142e81 SHA512 605e7d33cc05737d144b580ff4c2ce45306898e5a1a4f6e5a60f2c9c256e7bd3e91e8ea845585f564544b771f7fa9adec1159a3ff7ffc645aad468c4b5e7eccc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch b/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
deleted file mode 100644
index 2da4a5621992..000000000000
--- a/dev-cpp/glibmm/files/glibmm-fix-threads-gobject.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 37d57ae9572b7d74aa385a30313eceae7f2d3fce Mon Sep 17 00:00:00 2001
-From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
-Date: Wed, 20 Dec 2017 20:00:32 +0100
-Subject: [PATCH] Glib::Threads::Private: Fix gobj()
-
-Bug 791711
----
- glib/src/threads.hg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/glib/src/threads.hg b/glib/src/threads.hg
-index 86d7a17b..c82a6130 100644
---- a/glib/src/threads.hg
-+++ b/glib/src/threads.hg
-@@ -628,7 +628,7 @@ public:
-    */
-   inline void replace(T* data);
- 
--  GPrivate* gobj() { return gobject_; }
-+  GPrivate* gobj() { return &gobject_; }
- 
- private:
-   GPrivate gobject_;
---- a/glib/glibmm/threads.h	2017-09-04 15:27:31.000000000 +0200
-+++ b/glib/glibmm/threads.h	2018-05-05 10:53:44.339288554 +0200
-@@ -657,7 +657,7 @@
-    */
-   inline void replace(T* data);
- 
--  GPrivate* gobj() { return gobject_; }
-+  GPrivate* gobj() { return &gobject_; }
- 
- private:
-   GPrivate gobject_;
diff --git a/dev-cpp/glibmm/glibmm-2.50.1.ebuild b/dev-cpp/glibmm/glibmm-2.50.1.ebuild
deleted file mode 100644
index a111edbd8924..000000000000
--- a/dev-cpp/glibmm/glibmm-2.50.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild
deleted file mode 100644
index 2a4e3739f629..000000000000
--- a/dev-cpp/glibmm/glibmm-2.52.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-PATCHES=(
-	# Fix build with GCC-8
-	# https://bugs.gentoo.org/654776
-	"${FILESDIR}"/${PN}-fix-threads-gobject.patch
-)
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.54.1.ebuild b/dev-cpp/glibmm/glibmm-2.54.1.ebuild
deleted file mode 100644
index 04705cc0aa29..000000000000
--- a/dev-cpp/glibmm/glibmm-2.54.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for glib2"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc debug test"
-
-RDEPEND="
-	>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-# dev-cpp/mm-common needed for eautoreconf
-
-PATCHES=(
-	# Fix build with GCC-8
-	# https://bugs.gentoo.org/654776
-	"${FILESDIR}"/${PN}-fix-threads-gobject.patch
-)
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
-			-i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	# don't build examples - we want to install example sources, not binaries
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(use_enable debug debug-refcounting) \
-		$(multilib_native_use_enable doc documentation) \
-		--enable-deprecated-api
-}
-
-multilib_src_test() {
-	cd tests
-	default
-
-	for i in */test; do
-		${i} || die "Running tests failed at ${i}"
-	done
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r examples
-}
diff --git a/dev-cpp/glibmm/glibmm-2.56.0.ebuild b/dev-cpp/glibmm/glibmm-2.56.0.ebuild
index 13e1f59bb723..20a072129508 100644
--- a/dev-cpp/glibmm/glibmm-2.56.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index f89c309ea7c1..9bf86e36c6c4 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -5,6 +5,7 @@ DIST waylandpp-0.1.5.tar.gz 168432 BLAKE2B 0d3efcb489a713be1ae9db0366b47436b0789
 DIST waylandpp-0.1.6.tar.gz 180123 BLAKE2B 552dbea6b6d9c3f937aa56a69c90485f6946366589793e53817bada7b2dc1eca0c58a741b22f5f0f7fac04bb14d668f01a1c2418343ebf32845dc1bf02656957 SHA512 93ed7157017394f7df0d7cdf2f56e1d8621893cc8cb77b01206534b8ca40528aba6bd2b922b359809bdca7831fa45668f85903e9e3dd6f0759839c7318349c94
 DIST waylandpp-0.2.2.tar.gz 180313 BLAKE2B 558f26e9ce2edcafacfbd874bcf99176a3bc10b2991eaba0dee64c06f0e7a25f3800b2facdd7e86c775003bd2f06ddb6911a3f956f9d8089512e95fd5d03c120 SHA512 e9288482e1b59eacf71a4164dfec3236f2d6d63aee6d530d1f71bbdb20db6986137a50ac34438219463a4208897424d28d2346d2c51dccaf3e77953e4db085f2
 DIST waylandpp-0.2.3.tar.gz 180539 BLAKE2B 8941200b46235c8b65926065a3a758871581fe21ffbcc17dc33a00c546c920247739d3137b528fe8971b7c1c2240b5a056387dcbaa1437047709e079cb2e58c2 SHA512 424ccef67e1faedfb03aa7465917e4dfc0eae578a1eb42bcdbe71df02955fef00fc1b480acb4828e168f051a82a13f923e0c9be93d3ede221e791a7af88647a5
+DIST waylandpp-0.2.4.tar.gz 240718 BLAKE2B 4493f3e19dd546412f110227c44440a422d0e1156eb24ed8bc3e58e5ebda22c0aee16e5f2a2efc1328a697c5436f81c11c67d7c46855f32f7531783a1d514ae1 SHA512 74855ea86926692a9f6ccb5645a7ed30000bab0f01a2f37a30f2c0a341d67d511ae217b8f69adc52fa2c25ac65afa182a6dbf2318360435a02b6ff428b4c9d51
 EBUILD waylandpp-0.1.0.ebuild 1246 BLAKE2B cb14f13bef95773ce5ea8edc6a94dd8917a658953a4b88ead8d3d3de61bffdeaf075aa14bdd2164549735db40f1bfde315af883110d722d3cf05407a150d90ba SHA512 cdeb50fcad7a3630338a1b830c81313ae2af699ff3b3dc7f16c2b4cd20fe25a55821afbbb56d741ba10d0352429683160fe22bb5f54f6e3c28a5d0716465cc6c
 EBUILD waylandpp-0.1.2.ebuild 1276 BLAKE2B f9acf8a81b75abcd6563c50967fc2e6935908b152d8696d94be7bb11867057c45893be2bf53a6e70c82aa99d9ada3a9c5207e2a7cd2bc1b143ff49f70187f20e SHA512 d41b8ce0f9f0fcc4c5ba5a0eccea6498a0750cf441d2bfe995d38a6ecc1c8d8e94d01147b28e9c1fcb0da6c45c593c27637eece7462cdd045e8f5441678d3182
 EBUILD waylandpp-0.1.4.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
@@ -12,5 +13,6 @@ EBUILD waylandpp-0.1.5.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691
 EBUILD waylandpp-0.1.6.ebuild 824 BLAKE2B 0de5bffc21852ee018103a2403fc83fbd93691e5fcd014c2f78408b8ce905cc5174cf52f4dd17705f30610a6527ee85d04baa6f820722e30cbde7d985e254929 SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750
 EBUILD waylandpp-0.2.2.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
 EBUILD waylandpp-0.2.3.ebuild 833 BLAKE2B 7556dc863efb653831be0c99d190726c9e8729ae28e5afa45163d775c96b0961bdcf2ea485aca2bd5c761003a1714ecd4dfe244124ba03e26490e051b0fee824 SHA512 5e996f8c29632d6a3e7aedb23fe97a93ffa23c43d19ec7f2d7e24bcc68c6114cc8d7bf33f370b437e35b32c6640a7f03e957b9d3647c2bc4bd4ac03c9faf1782
-EBUILD waylandpp-9999.ebuild 838 BLAKE2B ff161112d3fdb95abaa1d7b1df081faf705dfd4f4e704af21ee4f724b551aa97ac5cf913800f6f1fde6d0615771cda497d668c4e4cd15b43278b79adb576a304 SHA512 8265df8c99fa23b48680a98cdf78c7702cfe48aaf93dd77feb67275a5063aa2ebea93a044f3202c151d5d8d1aad89300d0bb7bbe8016b062058e19c161a6731b
+EBUILD waylandpp-0.2.4.ebuild 827 BLAKE2B f634ef2225206060dcdc2ad3b93d4e5055c3020819b32d4715490e13f90075783f716f155b7b1b96872c57311a60973ed895effaba8259208be2923b2aaf6afe SHA512 badf44bfaa0b56ce7f7b0ed5b49b4ff02f92bf7d14511a296187feb4eb144bd23a66aec7926dee962f01e05ed2410b18d45e080a7e52c900a981957884020cd3
+EBUILD waylandpp-9999.ebuild 827 BLAKE2B f634ef2225206060dcdc2ad3b93d4e5055c3020819b32d4715490e13f90075783f716f155b7b1b96872c57311a60973ed895effaba8259208be2923b2aaf6afe SHA512 badf44bfaa0b56ce7f7b0ed5b49b4ff02f92bf7d14511a296187feb4eb144bd23a66aec7926dee962f01e05ed2410b18d45e080a7e52c900a981957884020cd3
 MISC metadata.xml 401 BLAKE2B 3270a9fb51a7a5a0cede7e9bc863f1445db1eda5a3b132b8ed9d2eaaaddeb60b85720484a136e09d3e00b80240a637a9f8a9533311e2b6f17fb9798e2ed19ef6 SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
new file mode 100644
index 000000000000..c176d851c87e
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(ver_cut 1-2)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-libs/wayland-1.11.0
+	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.4
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 14c6fc58c138..c176d851c87e 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake-utils
 
 DESCRIPTION="Wayland C++ bindings"
 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
 
 LICENSE="MIT"
 IUSE="doc"
-SLOT="0/$(get_version_component_range 1-2)"
+SLOT="0/$(ver_cut 1-2)"
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
@@ -23,6 +23,7 @@ fi
 RDEPEND="
 	>=dev-libs/wayland-1.11.0
 	media-libs/mesa[wayland]
+	>=dev-libs/pugixml-1.4
 "
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 201800c02a59..5af29acc21b3 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest
index 7a0043be476b..7e38ed7b855e 100644
--- a/dev-db/cpp-driver/Manifest
+++ b/dev-db/cpp-driver/Manifest
@@ -1,5 +1,5 @@
 DIST cpp-driver-2.8.1.tar.gz 1526453 BLAKE2B 8ab4332f00a1da9f35be6fa8651ace54d71fbac76223c1665089096376dcfd6f5976beb83c25094f531786a4aa628aa4e288540ef7bcb8cc5221625dcd1ccf78 SHA512 1b303e874d6b24cb429ec92d6030880ad7d7b28b167a25c62060626c206f623863ecf58eab33e89b0efea4a474ca9500e1701b719ac203c76b0875c2b5d0a1c8
 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1
 EBUILD cpp-driver-2.8.1.ebuild 627 BLAKE2B 212092960beee408c49866469a4e45ec48535feba75ef2c3ed176bb281145ce24cd5b2ee340878d7557cd1e14f0fc8c6707e668597909bb92623f5f32bdd7240 SHA512 f423cd87d8fa5e1f42a94222b054bbba1ba2855369fe17aaa94a480515a5b3a200697a8a5570f41d7ac032ec985c370e025786cacee9b2e63e87100750a09e53
-EBUILD cpp-driver-2.9.0.ebuild 626 BLAKE2B f6a87bb80ec4adce79bd4c64cea7efc97a393f3e6a4f61bea421e2aa83e5019b8a22b157f0e909624447a31bfc61700787fc4ad6f8a8d548b8a46d99e6722b58 SHA512 919b810c65293e7bdb17c80e29e3538dd100fa4b0b17650a30b4d41d516d0555eca0a295291a17da9fb60c05f6e5c57214ee1d6b9d11721f25100b2d88d038b7
+EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5
 MISC metadata.xml 553 BLAKE2B 9cbe9ca09b891555c6f22e2a6da3fc24d938e5bfd30950c3f58e3e028f36a6784a0062c042b30c8215552191f9ccbb629693a059258a067effb97cd594e65fcb SHA512 7e02ca90a667319bd669dc10dbba7abc1018a1c4941fc213af728bd6b7afe48e5fca888f3f6d19798937f6fa5d8188cd784cd37f0ff690bc2295abab8ae408f8
diff --git a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
index 66d76de1def7..961a2bbec060 100644
--- a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
+++ b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,8 @@ IUSE="libressl ssl"
 RDEPEND="
 	dev-libs/libuv:=
 	ssl? (
-		!libressl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 011560c6a0c3..1da5c647d386 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,6 +1,6 @@
 AUX etcd.conf 978 BLAKE2B 2aaecc5c7b3d0b7a44f8de65d8362333bdcf9616de55a2c4fa1551eca91d80061c146165f1bf077c1d93e6874b4444384889875b3fe81299e46e10fd6e24d8ec SHA512 3b543104df93ebd6013b5e50c1e17b947e089bf27ba976859574f9fa57f2ed0ba16342984d12a68a00ff6745f37d229b1fe3206df7d713805e289d029774be0d
 AUX etcd.confd 129 BLAKE2B 1d7aff8c57e4dc0f4348a5de4bfff0a1552e8b4d228ee0f0ba2eb6eb944daefae1b5b55ba6b5416697b923e9144884d0828612403a11e627f8f7e82fa7444f68 SHA512 a08b1c1701370dc23ebd86db915d1e65747dc4ca57ce44d8cba6cf8434d5711786ac96725eed3285f4ba7cdde25ea25a51539d6cd74fc2f4b713f48cda15c4c3
-AUX etcd.initd 813 BLAKE2B 3d63e753f2a04b1cba20ddfdbc7d67acd2be14caff08de74d498e8819cc54680693e832658ed83ab8bfc4c93498daf90b1a9b7bcb541f16cf06a608b003d005f SHA512 f86df57fc91e98310f00803b29d149a8a2850028b2a349eebfe7fb4059e97f8232fd137a6eeaa3a8edf29922e2552c6a4af10ed40696f0775b65645ac2c57859
+AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f36fb83841be15ffca0f0f9b7c7c4bc6989665aa4e8a51fc73b0c66b5d2f960c6795fc21040da SHA512 5b8c12285b5d609abdfc5440589f7703951f6550e53783fe5e7eb3a4a3b12625d6f0526cbaf7e9922de3fbf0b86ff9d3f40de1ef55f26261f61d11d177d9a580
 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
diff --git a/dev-db/etcd/files/etcd.initd b/dev-db/etcd/files/etcd.initd
index c9caecf7ff69..a2c67d0723da 100644
--- a/dev-db/etcd/files/etcd.initd
+++ b/dev-db/etcd/files/etcd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile=/run/${RC_SVCNAME}.pid
@@ -23,7 +23,7 @@ depend() {
 	after bootmisc
 }
 
-start_pre() {
+start() {
 	if [ ! -d "${LOGPATH}" ] ; then
 		mkdir -p "${LOGPATH}"
 		chown "${command_user}:${command_user}" "${LOGPATH}"
@@ -32,4 +32,5 @@ start_pre() {
 		mkdir -p "${ETCD_DATA_DIR}"
 		chown "${command_user}:${command_user}" "${ETCD_DATA_DIR}"
 	fi
+	default_start
 }
diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest
index 5841b96b0423..092d63112af8 100644
--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@@ -9,5 +9,5 @@ EBUILD libzdb-2.11.2.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a
 EBUILD libzdb-2.11.3.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25
 EBUILD libzdb-2.12.ebuild 1949 BLAKE2B 69c6a78a97234e1566c9b4caf7390ea4799252d7a1221639548e15f21445d0ba45ef63ed2607ddb220b622ae54cc3ba70df7a3108a769c78dcfc117c6e88b1ee SHA512 e463dc5edeec408ae42d282319b9cd4e49338fb7cf86a7c26de5ca808d9e4159fce8610f14fb881ae999626be373db4918e5f9162387f0663a7fc99cc6372ca3
 EBUILD libzdb-3.0.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25
-EBUILD libzdb-3.1.ebuild 1947 BLAKE2B 9f4f0cc56ef76cd541f1b1cd3e0bcec1ca726926fbf696b29cdb67223bca088ca2628196198ad1c8d8b02c0e0318452e3ab8244209108eef8e443bec370fba66 SHA512 88f77f36dfa481d6886ecf767060fefd2064b2c31ddd950c64a2e6a34679951574f4cae330ab006ca4101c42b4cfa670f55a909fed1d5bbcb786dcc235a49744
+EBUILD libzdb-3.1.ebuild 1947 BLAKE2B 38bad6b83db476257e1996b547668fe6270a5bef50bd94f444cc9c79a71a57ef089961c9ab6fee965cf45da18c6adfb280eaeebe1a1d7e666b01b7c4b667f0f6 SHA512 8ce0096085f71c4a96699816cf916fc1916318a5185b48dd0975b4cfbd062d9ccd36250f47f4232c7ef83a9893ba11adc0d006f6ba9f18e9a4c8e2bb33f0011d
 MISC metadata.xml 252 BLAKE2B 607ece46067f5be04418014fa63f92ad521ce98dcd952feb4fcd1bcfcb16fd520bddb62e7f6e14486a7f45a2505cc258067adc1017af98ba9e69a78244bc62a5 SHA512 e7da72c861777d74f6459375f6f43e39f9e4dda779352c3e8942fcd658dcce6f995f016e34a74b331533f1815fba3faa9af024956a804f38a411990878e4bad6
diff --git a/dev-db/libzdb/libzdb-3.1.ebuild b/dev-db/libzdb/libzdb-3.1.ebuild
index 4de988ae6ebd..21ce5f4ef1c1 100644
--- a/dev-db/libzdb/libzdb-3.1.ebuild
+++ b/dev-db/libzdb/libzdb-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ RESTRICT=test
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
 	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index ca6d8b6970c6..87560f5920c5 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -6,5 +6,5 @@ DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4
 EBUILD lmdb-0.9.18.ebuild 1239 BLAKE2B cf75faf2a5fe6fd306eb7a28c2372a3bcb3a4395fb26f80e4beb9e99799a7c2d86755b2fe5d7172a24fc40d00519ee4a70cdd179f51f836853950311ae8d2549 SHA512 18b2c236625e0fd311521148dfd029a74c428459ab61847105d9e27cf2a602bf107af9147d11ada60a1efd972e29ea26ea59f7d7bd9848cf2dc145a05967fff9
 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad
 EBUILD lmdb-0.9.21-r1.ebuild 1960 BLAKE2B b2686f3859333a1f60b4e1053e40e7214ed3196e35b88956ada044f6655c7ae3a472e999db56d08bfeeb3d6520853b1091dc6d8a321827e67903c87e8aebbe15 SHA512 288aec449c08655fe4572451f2960cd6c489158198fc787cb5ec3bd489578995f651bd5d13c36924ef35c2497dd157ae46a78dc9b5e18b31f913753a2a8157bf
-EBUILD lmdb-0.9.22.ebuild 2130 BLAKE2B 2312bdfff558e5241c5afd70ceee42e766db99e6ae70b707c9d009a87c94f9422e8eed34dab9f9df2b5fc9845146c4650e901a5b3538f9fd75a3a9043d422e6c SHA512 de0b66a2f51abedd8ef5508eaa7ca2c3e293442005f4b1a46695edecda1a51c9b02237e9ed9d776d1f856b8d301164cff815514a488446cc2ec2af0952b260c2
+EBUILD lmdb-0.9.22.ebuild 2322 BLAKE2B 119d9c927f512ecb24aaeaba41641e3fa7bcfe99a9a2c31f27a6152d6a7d1976ec139677ea90a26e3e76f1aa011e16a554d7ca10391ca4d919de56649916f4a8 SHA512 c7f3540619dc06ef582539730f5060c1a2e784c410b91c7fc977749c3e78829e59cf424b6c9c15700168a22f48b22ae554700961374f42f339cd352c50d8c6d9
 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4
diff --git a/dev-db/lmdb/lmdb-0.9.22.ebuild b/dev-db/lmdb/lmdb-0.9.22.ebuild
index 3219ba9b0b51..9e4e027f8378 100644
--- a/dev-db/lmdb/lmdb-0.9.22.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,11 @@ S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
 
 src_prepare() {
 	eapply_user
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
+		# posix_memalign isn't available before 10.6, but on OSX
+		# malloc is always aligned for any addressable type
+		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
+	fi
 	multilib_copy_sources
 }
 
@@ -38,8 +43,6 @@ multilib_src_configure() {
 		"Makefile" || die
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
-		# ensure sigwait has a second sig argument
-		append-cppflags -D_POSIX_PTHREAD_SEMANTICS
 		# fdatasync lives in -lrt on Solaris 10
 		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
 	fi
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 4709841d2fb9..d98340b02e89 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -2,9 +2,12 @@ AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43
 AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60
 AUX mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch 998 BLAKE2B 7c07b70ec752832d62757ee08a6f56b59d47e11c68d5333308878ef6b030a3b959bf2d6ba6ec37f0960f1e5f0be702c974f53c81886cc7a8348d4eeca4eaaa03 SHA512 06fdd1bdcbe9550257e4947bae25870525f59a729c7b78eee703990b17b9ada152d32f80f1bb57f67455bc143725a7f166cf34f9de1edcd40c49e49a2d2a6826
 AUX mariadb-connector-c-3.0.7-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
+AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
+DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788
 EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2816 BLAKE2B 38450ea224a5f0e960abc65ebce37121ed02d1ec0d5bfc7c2d7a124c9ffd77f10090247493eb0c758b991e40cb8a845fe13355ba8e32b64bb2ca90fa957aca76 SHA512 f5670d8174889c3ccc8b7693cdd97d39c1c0d597d5980c6a5d15317662bffebea1e3b6573c438b076362c8c46649dedf8f285d90ac4f5ffb4eed4d4db82b0378
 EBUILD mariadb-connector-c-3.0.7-r1.ebuild 2828 BLAKE2B 3c7d2eefda6d8ee874c7570827ab015223f9bab0d7c649184d02492cdd319e2a7c281818cf633736e68f000203f23093ad40fdab31e185b4d5d1e1da7488992f SHA512 f45c2e1980bb4be51137b2658213a689acdc13f449704c2406f089179fb8ec897119b3c04fda353ffaad86c7f8bc33e2c2b25b6b56ec1be1eed8be68274970a6
-EBUILD mariadb-connector-c-9999.ebuild 2864 BLAKE2B 0bbc75c16ce0544e008b3e49df556b8c54875e93d04b706fd2f8e338295a3d02140a9eb64819c3a7e2b5485b4e17cd80528dd212330d3b9706b84e8529b43441 SHA512 b01b2b8267a532773ca62931572541ad98b13890297e39bf52f28f6d568fa82febe5662b59016fa17691f96207d3152d4f79e46a910a3e94d5455d312d3de0f3
+EBUILD mariadb-connector-c-3.0.8.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd
+EBUILD mariadb-connector-c-9999.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
new file mode 100644
index 000000000000..1a16a2c01015
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
@@ -0,0 +1,21 @@
+--- a/mariadb_config/libmariadb.pc.in
++++ b/mariadb_config/libmariadb.pc.in
+@@ -7,13 +7,12 @@
+ #
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
++includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ 
+ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
+-
+-
++Cflags: -I${includedir}/mariadb
++Libs: -L${libdir} -lmariadb
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
new file mode 100644
index 000000000000..c957edaec2de
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}
+	mysqlcompat? (
+	!dev-db/mysql[client-libs(+)]
+	!dev-db/mysql-cluster[client-libs(+)]
+	!dev-db/mariadb[client-libs(+)]
+	!dev-db/mariadb-galera[client-libs(+)]
+	!dev-db/percona-server[client-libs(+)]
+	!dev-db/mysql-connector-c )
+	!>=dev-db/mariadb-10.2.0[client-libs(+)]
+	"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if use mysqlcompat ; then
+		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
+		dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	if use mysqlcompat ; then
+		dosym mariadb_config /usr/bin/mysql_config
+		dosym mariadb /usr/include/mysql
+	fi
+}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 2e5ed26b63e0..c957edaec2de 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
-	"${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
+	"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
 )
 
 src_configure() {
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index fd83bc33acbc..b18e9f838f60 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -2,7 +2,7 @@ AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c1687
 AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb901c63ed307b2377d58931d5fa8940bd3bb97632d3f9976bcb1723a36b8cebdc0a74723a555abc54800b3afe5fea673 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53
 DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
-EBUILD mydumper-0.9.3-r1.ebuild 1025 BLAKE2B bbaf77ab28323c82103b68aeee4222bf218554e45e05ae07467c18dc69e25f43ab2b1e70ddafa69cb8f2045d85c361511016de81c8d6aa20db7cdd25ffdbe614 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a
-EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B ab2776d3e913a6ee95906839878acde43c87c9bb04f901218a1e864601d60cd73a4e2329cae9abb5033501163d7535d4d1e1ecaf9785e4d6d09b98519ef371b6 SHA512 2d1b0e7a932a09114dc5e3848510700b81e6c086551e21fc41a966b0f116b0d96584908359879786f6c16cd6313800721b498ca53bb826380d6625c38786efb2
-EBUILD mydumper-0.9.5.ebuild 1026 BLAKE2B 6ded4d30e464888593beb8bf4d06441c02e17b28ff59ddb3aa9142b42dde1ccf00b05dac0977fe514d23e1be06099c217df778976a799451982bf9ac2948985c SHA512 37776222d7cc3cbcc5b520f1731d445841028aec63899a6bbfb2c1a931b78aef3987555404955f1c2742782cd599065eefbe04b6739460fc5642d4e0e606ba84
+EBUILD mydumper-0.9.3-r1.ebuild 1023 BLAKE2B 1b209fa847a4ed7ff7b4091e79a952f42ee0250c1748fe7cd67b60f80cbf0363c30016e04f79edc070303e6a0aae1f44d7ebee30ef3aa9c50120ebc9c9eb2f70 SHA512 460a697001f5fb2ceec2bbc23d7e9193b0ebc7fa10b1229456e4f3f3ffbd015c41815933389b4698e6fc7cad15e311ed7ce45d6046413df6b3ec7e9a7e966be7
+EBUILD mydumper-0.9.5-r1.ebuild 1055 BLAKE2B f8a5c5949143d378831c334be0ad6ed73f855cdc960701438824e5d1cc00cbdac34d8e04d1588da3e99aba7973f3c44a2ba7c341b38aed0e77252e73603cfdab SHA512 79eb47b52924ceaffa575071a1be629d5df07af5cb9238230d6c63b3ad4561a57f7a8cf5f2f5a92fe3580bbc7ba85b1ef2bfd0527d117d8e000e212540ec4495
+EBUILD mydumper-0.9.5.ebuild 1024 BLAKE2B 82e4eb89e5e9d266906b388089f6292c1bb6b93adb891a927ed8ac9f6cda6543a49ff736efdda62ccb0c310d7bea769f0f02704ab6707a3afb851160b9f891a6 SHA512 e49e1e09f402008a521dc8b9ea0ebfcde58509d080d23b58e4bdc7c5d00a45bdc4a811ef88fd088e2a9f919ade2d03ad98b702b497f047ae75046936ce48d3b7
 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
diff --git a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
index f95deef1be62..3778cfbe001a 100644
--- a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="doc"
 
 CDEPEND="dev-libs/glib:=
 	dev-libs/libpcre:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	sys-libs/zlib:=
 	virtual/mysql"
 DEPEND="${CDEPEND}
diff --git a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
index a924406ea685..078613262f27 100644
--- a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="doc"
 COMMON_DEPEND="dev-db/mysql-connector-c:=
 	dev-libs/glib:=
 	dev-libs/libpcre:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	sys-libs/zlib:="
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
diff --git a/dev-db/mydumper/mydumper-0.9.5.ebuild b/dev-db/mydumper/mydumper-0.9.5.ebuild
index 1bdc840bd0b9..904232ebd4b6 100644
--- a/dev-db/mydumper/mydumper-0.9.5.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="doc"
 
 CDEPEND="dev-libs/glib:=
 	dev-libs/libpcre:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	sys-libs/zlib:=
 	virtual/mysql"
 DEPEND="${CDEPEND}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 604bf023abf1..670b38b491b9 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -11,6 +11,6 @@ DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b2
 DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0 SHA512 69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.1.ebuild 901 BLAKE2B 0e6c3feef947f749d7124284dad8ce91d14fed57d7a24730482dea19646a8b675113577138d4d81dd3e803df74f13a91fe40b1959fa145bf676b8d301a24d588 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31
-EBUILD mysql++-3.2.3.ebuild 1557 BLAKE2B 4d6e6743162da47c5af3f50f460a383de1b893f878d100d298e9af3e0dd520c197c551923195374a469cebe8b0662986f31e3531f51e1f9da8e4c13cff7fd1bd SHA512 c937096617395b6ea1fc9058037a9e7e7357bffed51c9d543cac61567effef511ab4767dfb0116115ea005929a5930b3d732cb7bcffb90fd48a263527dbf2470
+EBUILD mysql++-3.2.3.ebuild 1556 BLAKE2B 8bcedbe3e000c0132610b7347329e62d0d82adc00be4b34e5333c274140ea682e3300b471dcf08a7e661e9df801fc6820b6771e7d41d0c74968856deb9375bde SHA512 4b04105492d20515ad98db286d9746b6ab1fe0d38a49c7de870cf19ab5d6dc2579303aa36b7216caeceb58ff17668fa4149b9a762612b0ca203adafda7145898
 EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild
index 09d80aa43cdf..4b77996aeaf8 100644
--- a/dev-db/mysql++/mysql++-3.2.3.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND="virtual/libmysqlclient:="
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 0d50126db2a5..a5f1d2f9b552 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,10 +1,17 @@
 AUX 8.0.11-fix-build.patch 9453 BLAKE2B 72c42d2f0aac7de63151b4b12a5de6f1597f70be3a8a42d1a137c1a57329acf1adf196377e90c838e1d4995223fb58615814d8c14d3c8d86472ad795e1b456e7 SHA512 321444184d459f7e650b3f72589db4b2537f67c2d413f9d3d5a995c937497b6310bc2b58200fc61b5c0d8e8fe2030d65035ddbab672338d9df1b6cf3ce605ea9
+AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c
+AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a
 AUX mysql-connector-c++-1.1.3-fix-cmake.patch 4949 BLAKE2B a3eaa6f656d7f587aca06b02847c335028a1595e61232d3c4579e10678234aec2c6e2d5e12997e9e9d268bd5dc6eef952852a91d64800cbc949d61663b25b03b SHA512 985e5dd9f9f4aaae3b34ff05e32cb0d9ddb108aa20be32e14786b5b2664263149907b46828cb01d491ef07934b73b18ee715185c59bce940370955a544325f3f
 AUX mysql-connector-c++-1.1.5-fix-mariadb.patch 1793 BLAKE2B f65ad472bbdced9920ae8f3fef868282608ec8bd361037e503f3879db223337e84f447157ec7b30f33cf6461abb327422d31fdd677914e672845c358e19ba883 SHA512 a2b23164d9632b84df233dfb0ae52c809256a9ec163deaa663eb3512ffb622a6885c21c67998e51e848772170966bb74322d4ab8d6816dda686c5d6ab9fa300a
 AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f
 AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 BLAKE2B f2d2528cacfa4457c20587557e5125f9d642ce162319ba6b077173b5407319d8d07e6b525a5fb95e797d43a3ad4e9ceb111ebd07a52cf38df1db71b9b4f2ab4c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd
+AUX mysql-connector-c++-8.0.13-fix-build.patch 10931 BLAKE2B aeeaa25d76073525a45b7b4bd5b51b6bfa151b7c20f9e563ff98673b5273ad84a3ef9c2ce26f17b175f1038ab4924187ec2e2d059f2052855d8875823ee762bd SHA512 a965e2a475e7802e8a0dd64c39b6e0f9996b9c1c49d647c26cefac33bf52afceb012c7b0acad383006152fb52d94ffb5481d4be9b2ba957776529df842370ffb
+DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa SHA512 d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22
 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
+DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24 SHA512 0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
+EBUILD mysql-connector-c++-1.1.11.ebuild 1625 BLAKE2B 2cdf84829a4be8ce15dd387889335885c1f1f236226cb3af86c32af7851dc274bca09118fc288a0bfff6a4e005ff875002e5fc87c1abda065ec7b1ec7444940d SHA512 075637a15b9919bed31d2228baf4a71fe9802c75be5a2e656e334b7b17c1d659d056e166bf1142345d9d36d48be0c56a902718dcbead003c5e02a00ae18e7c7c
 EBUILD mysql-connector-c++-1.1.9.ebuild 1568 BLAKE2B 767d7a824046b4b1b18967abc04ae51b0610b15af54d8f1491b7d0731a2a25add4ff0bf2dd0445c793737eaf897205216e554e4405f2ab3d3eec30ef0662edc4 SHA512 55070fa6863b2e3cffc3e7f71bd2b652b198ae824e256b6f72d9c525602582c05a57262ba7f33bf01802551617d4963f30b3bbf15818a4fd1a406ac6286aa65e
 EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0
+EBUILD mysql-connector-c++-8.0.13.ebuild 840 BLAKE2B ad79745000c37f90f50ffb434613bdabcdf7cc8c8fb93e24e2148f08e65414f5bfcbd792a6b942494b776bbcd8b0717760d8576dc77d78607aeba473a2e5878a SHA512 8ed227a9269efc07223a71798225f4e573904aae94126c549e32abcf4e02459269c570a7d8e4e4db3ec7a825636a77feab6b1752ceaf23d4416cc42d4ea94e8b
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
new file mode 100644
index 000000000000..4b8a4a983096
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch
@@ -0,0 +1,15 @@
+https://bugs.mysql.com/bug.php?id=90727
+
+--- a/FindMySQL.cmake
++++ b/FindMySQL.cmake
+@@ -700,8 +700,10 @@ endif()
+ 
+ # For dynamic linking use the built-in sys and strings
+ if(NOT MYSQLCLIENT_STATIC_LINKING)
++IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    list(APPEND SYS_LIBRARIES "mysql_sys")
+    list(APPEND SYS_LIBRARIES "mysql_strings")
++endif()
+    list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES})
+    SET(MYSQL_LIBRARIES ${SYS_LIBRARIES})
+ 
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
new file mode 100644
index 000000000000..2868a3c024af
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch
@@ -0,0 +1,43 @@
+--- a/driver/mysql_connection.cpp
++++ b/driver/mysql_connection.cpp
+@@ -1067,6 +1067,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti
+     proxy->get_character_set_info(&cs);
+     *(static_cast<int *>(optionValue)) = cs.mbmaxlen;
+   /* mysql_get_option() was added in mysql 5.7.3 version */
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+     try {
+       if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
+@@ -1080,6 +1081,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti
+       CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
+       throw e;
+     }
++#endif
+   }
+ }
+ /* }}} */
+@@ -1097,11 +1099,13 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName)
+     MY_CHARSET_INFO cs;
+     proxy->get_character_set_info(&cs);
+     return cs.dir ? sql::SQLString(cs.dir) : "";
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+     const char* optionValue= NULL;
+     if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
+       return optionValue ? sql::SQLString(optionValue) : "";
+     }
++#endif
+   }
+   return "";
+ }
+--- a/driver/nativeapi/libmysql_static_proxy.cpp
++++ b/driver/nativeapi/libmysql_static_proxy.cpp
+@@ -325,7 +325,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void
+ int
+ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
+ {
+-#if MYSQL_VERSION_ID >= 50703
++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   if (::mysql_get_option(mysql, option, arg)) {
+     throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
+   } else {
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch
new file mode 100644
index 000000000000..9bc45d274d7d
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch
@@ -0,0 +1,329 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ba914a..e1127f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -669,7 +669,7 @@ set_target_properties(connector PROPERTIES
+ 
+ 
+ install(TARGETS connector
+-  CONFIGURATIONS Release RelWithDebInfo
++  CONFIGURATIONS Release RelWithDebInfo Gentoo
+   ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
+   RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+   LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
+@@ -740,6 +740,12 @@ TARGET_LINK_LIBRARIES(try connector)
+ SET_INTERFACE_OPTIONS(try devapi)
+ #  ADD_GCOV(try)
+ 
++IF(WITH_SSL STREQUAL "system")
++  find_package(OpenSSL REQUIRED)
++  TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
++ENDIF()
++
++
+ if(WITH_JDBC)
+ 
+   add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
+diff --git a/buildinfo.cmake b/buildinfo.cmake
+index cc57a2c..129afeb 100644
+--- a/buildinfo.cmake
++++ b/buildinfo.cmake
+@@ -112,4 +112,4 @@ if(WITH_JDBC)
+ endif()
+ 
+ 
+-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme)
++#install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme)
+diff --git a/cdk/cmake/install_macros.cmake b/cdk/cmake/install_macros.cmake
+index 37c1061..39336cf 100644
+--- a/cdk/cmake/install_macros.cmake
++++ b/cdk/cmake/install_macros.cmake
+@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
+     DESTINATION ${ARG_DESTINATION}
+     ${RENAME_PARAM}
+     ${PERMISSIONS_${target_type}}
+-    CONFIGURATIONS Release RelWithDebInfo
++    CONFIGURATIONS Release RelWithDebInfo Gentoo
+     COMPONENT ${ARG_COMPONENT}
+     OPTIONAL)
+ 
+@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
+     INSTALL(FILES ${debug_pdb_target_location}
+       DESTINATION ${ARG_PDB_DESTINATION}
+       ${PDB_RENAME_PARAM}
+-      CONFIGURATIONS Release RelWithDebInfo
++      CONFIGURATIONS Release RelWithDebInfo Gentoo
+       COMPONENT ${ARG_COMPONENT}
+       OPTIONAL)
+   ENDIF()
+diff --git a/cdk/cmake/libutils.cmake b/cdk/cmake/libutils.cmake
+index 959fc5d..aec2d91 100644
+--- a/cdk/cmake/libutils.cmake
++++ b/cdk/cmake/libutils.cmake
+@@ -282,14 +282,7 @@ function(add_library_ex TARGET)
+   endforeach()
+ 
+   if(libs)
+-
+-    if(${type} STREQUAL "STATIC")
+-        merge_static_libraries(${TARGET} ${libs})
+-        add_dependencies(${TARGET} ${libs})
+-    else()
+       target_link_libraries(${TARGET} PRIVATE ${libs})
+-    endif()
+-
+   endif()
+ 
+   #
+diff --git a/cdk/cmake/protobuf.cmake b/cdk/cmake/protobuf.cmake
+index 95ecc71..484687c 100644
+--- a/cdk/cmake/protobuf.cmake
++++ b/cdk/cmake/protobuf.cmake
+@@ -26,201 +26,8 @@
+ # along with this program; if not, write to the Free Software Foundation, Inc.,
+ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+-#
+-# Usage:
+-#
+-#  INCLUDE(protobuf)
+-#  [USE_FULL_PROTOBUF()]
+-#
+-#  MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS <protobuf definitions>)
+-#  ADD_LIBRARY(target ... ${SRCS})
+-#
+-
+-if(DEFINED WITH_PROTOBUF)
+-
+-  #
+-  # If WITH_PROTOBUF is defined, it should point at external location where
+-  # protobuf libraries were built using our CMakeLists.txt (so that
+-  # exports.cmake was produced).
+-  #
+-
+-  if (NOT EXISTS "${WITH_PROTOBUF}/exports.cmake")
+-    message(FATAL_ERROR
+-      "Valid protobuf build not found at the given location"
+-      " (could not find exports.cmake): ${WITH_PROTOBUF}"
+-    )
+-  endif()
+-
+-  message("Using protobuf build at: ${WITH_PROTOBUF}")
+-
+-else(DEFINED WITH_PROTOBUF)
+-
+-  #
+-  # If external WITH_PROTOBUF location is not given, then we arrange for
+-  # building of protbuf from bundled sources in ${PROJECT_BINARY_DIR}/protobuf.
+-  #
+-
+-  message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
+-  file(REMOVE "${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt")
+-  file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/protobuf")
+-
+-  #
+-  # Pick build configuration for the protobuf build. Normally we build using the
+-  # same build configuration that is used for building CDK (Release/Debug/etc.).
+-  # But we also support building CDK under non-standard build configuration
+-  # named 'Static' (this is a dirty trick we use to simplify building our MSIs).
+-  # Since protobuf does not know 'Static' build configuration, we build protobuf
+-  # under 'Release' configuration in that case.
+-  #
+-  # We need to handle two cases. For some build systems, like Makefiles,
+-  # the build configuration is specified at cmake time using CMAKE_BUILD_TYPE
+-  # variable. In that case we also set it during protobuf build configuration.
+-  # Another case is a multi-configuration build system like MSVC. In this case
+-  # we use generator expression to pick correct  configuration when the build
+-  # command is invoked below.
+-  #
+-
+-  if(CMAKE_BUILD_TYPE)
+-    if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
+-      set(set_build_type -DCMAKE_BUILD_TYPE=Release)
+-    else()
+-      set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-    endif()
+-  endif()
+-
+-  set(CONFIG_EXPR
+-    $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>
+-  )
+-
+-  execute_process(
+-    COMMAND ${CMAKE_COMMAND}
+-            -G "${CMAKE_GENERATOR}"
+-            ${set_build_type}
+-            -DSTATIC_MSVCRT=${STATIC_MSVCRT}
+-            -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+-            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+-            -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-            -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+-            -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+-            -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+-            -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL}
+-            -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS}
+-            ${PROJECT_SOURCE_DIR}/protobuf
+-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
+-    RESULT_VARIABLE protobuf_config
+-  )
+-
+-  if(protobuf_config)
+-    message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}")
+-  endif()
+-
+-  set(WITH_PROTOBUF "${PROJECT_BINARY_DIR}/protobuf")
+-
+-endif(DEFINED WITH_PROTOBUF)
+-
+-# Import targets exported by protobuf
+-
+-include(${WITH_PROTOBUF}/exports.cmake)
+-
+-#
+-# Protobuf library targets imported above (pb_protobuf
+-# and pb_protobuf-lite) are local to the directory from which
+-# they were imported. This is not good if cdk is used as
+-# a sub-project of a parent project, because the parent project
+-# must have access to these targets.
+-#
+-# For that reason below we create global protobuf/protobuf-lite targets
+-# and copy their locations from the imported targets.
+-#
+-# Note: we can't use ALIAS library because it does not work with imported
+-# targets
+-#
+-
+-add_library(protobuf STATIC IMPORTED GLOBAL)
+-add_library(protobuf-lite STATIC IMPORTED GLOBAL)
+-
+-foreach(lib protobuf protobuf-lite)
+-  #message("processing: ${lib}")
+-
+-   foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
+-    #message("- CONF: ${CONF}")
+-
+-    get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF})
+-    if(LOC)
+-      #message("- setting imported location to: ${LOC}")
+-      set_target_properties(${lib} PROPERTIES
+-        IMPORTED_LOCATION_${CONF} "${LOC}"
+-      )
+-      set_property(TARGET ${lib} APPEND PROPERTY
+-        IMPORTED_CONFIGURATIONS ${CONF}
+-      )
+-    endif()
+-
+-  endforeach(CONF)
+-
+-endforeach(lib)
+-
+-#
+-# To support 'Static' build configuration the targets imported from the
+-# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use
+-# 'Release' locations as Protobuf is built using 'Release' configuration in
+-# that case.
+-#
+-
+-foreach(tgt protobuf protobuf-lite pb_protoc)
+-
+-  get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE)
+-  set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC})
+-
+-endforeach(tgt)
+-
+-
+-# protobuf depends on protobuf-lite
+-
+-set_target_properties(protobuf PROPERTIES
+-  INTERFACE_LINK_LIBRARIES "protobuf-lite"
+-)
+-
+-
+-message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}")
+-
+-set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}
+-    CACHE INTERNAL "Protobuf include path" FORCE)
+-set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc
+-    CACHE INTERNAL "Protobuf compiler" FORCE)
+-
+-#
+-# Custom target build_protobuf ensures that Protobuf project is built.
+-#
+-# Note: this depends on Protobuf project generating the stamp file
+-#
+-
+-if(NOT DEFINED PROTOBUF_BUILD_STAMP)
+-  message(FATAL_ERROR "Protobuf build stamp file not defined")
+-endif()
+-
+-
+-if(CMAKE_VERSION VERSION_LESS 3.0)
+-  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
+-    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>
+-    WORKING_DIRECTORY ${WITH_PROTOBUF}
+-    COMMENT "Building protobuf using configuration: $(Configuration)"
+-  )
+-else()
+-  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
+-    COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR}
+-    WORKING_DIRECTORY ${WITH_PROTOBUF}
+-    COMMENT "Building protobuf using configuration: $(Configuration)"
+-  )
+-endif()
+-
+-add_custom_target(build_protobuf
+-  DEPENDS ${PROTOBUF_BUILD_STAMP}
+-)
+-
+-add_dependencies(protobuf build_protobuf)
+-add_dependencies(protobuf-lite build_protobuf)
+-add_dependencies(pb_protoc build_protobuf)
++#SET(Protobuf_USE_STATIC_LIBS ON)
++find_package(Protobuf REQUIRED)
+ 
+ #
+ #  Choice between full and lite version of the library.
+diff --git a/cdk/protocol/mysqlx/crud.cc b/cdk/protocol/mysqlx/crud.cc
+index 5cb12dc..6d32e21 100644
+--- a/cdk/protocol/mysqlx/crud.cc
++++ b/cdk/protocol/mysqlx/crud.cc
+@@ -295,7 +295,7 @@ public:
+ class Placeholder_conv_imp
+     : public Args_conv
+ {
+-  map<string, unsigned> m_map;
++  std::map<string, unsigned> m_map;
+ 
+ public:
+ 
+@@ -303,7 +303,7 @@ public:
+ 
+   unsigned conv_placeholder(const string &name)
+   {
+-    map<string, unsigned>::const_iterator it = m_map.find(name);
++    std::map<string, unsigned>::const_iterator it = m_map.find(name);
+     if (it == m_map.end())
+       throw_error("Placeholder converter: Placeholder was not defined on args");
+       //throw Generic_error((boost::format("Placeholder %s was not defined on args.")
+@@ -314,7 +314,7 @@ public:
+ 
+   void add_placeholder(const string &name)
+   {
+-    map<string, unsigned>::const_iterator it = m_map.find(name);
++    std::map<string, unsigned>::const_iterator it = m_map.find(name);
+     if (it != m_map.end())
+       throw_error("Placeholder converter: Redefined placeholder");
+       //throw Generic_error((boost::format("Redifined placeholder %s.")
+diff --git a/jdbc.cmake b/jdbc.cmake
+index 60898da..b5d8bf0 100644
+--- a/jdbc.cmake
++++ b/jdbc.cmake
+@@ -38,7 +38,7 @@ if(MYSQL_CONFIG_EXECUTABLE)
+   list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE})
+ endif()
+ 
+-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
++list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF)
+ 
+ if(CMAKE_BUILD_TYPE)
+   if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]")
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild
new file mode 100644
index 000000000000..d7c1ec3619aa
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="virtual/libmysqlclient:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.11-fix-mariadb.patch"
+	"${FILESDIR}/${PN}-1.1.11-fix-cpp-linking.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		-DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.13.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.13.ebuild
new file mode 100644
index 000000000000..f823bf40e1c4
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+legacy"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	legacy? (
+		dev-libs/boost:=
+		>=dev-db/mysql-connector-c-6.1.8:=
+	)"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.13-fix-build.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSL=system
+		-DWITH_JDBC=$(usex legacy ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index bf9c154b8885..d4c3ddb740a6 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -2,5 +2,5 @@ AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014
 AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 8bd00bb778e086cbdcd04b6ac904f36bd64bbbb332f913129eb3acbaf6da4d044fdc65523626a9fed47d6bf5859826af489bd9ae7ae51664c613c966a88708ba SHA512 46af56504ed2a69ce74a5e2040ee8b3355f5ac48fb80e4668b635f01a2650d07f50dd098ad43239e8b35a80e975a5a9549bd1b1a9c1a0612ed9e4750b537bb76
 AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49
 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
-EBUILD mysql-connector-c-6.1.11-r1.ebuild 2470 BLAKE2B 486c48eafc993ac8600e6be9b2d89cbdbf13800a21311b03500f96cfb051e7733dd0fae80d949b2736321602fb0bc11e6f4e940176df1c4a65fa1ba7fa8a67cb SHA512 5497b56e35bfefdc5aa91dbe9af658bd044d7e88029612ec1a1d200e76023d1135da726d630cf8ccd76d1877c9e9d1c126adc29c04aa3e5cdd781d245acc4ba0
+EBUILD mysql-connector-c-6.1.11-r1.ebuild 2469 BLAKE2B 0b3c29a3da5955af712047ef5ebf00f32f9166e0af9455f3051865723dcf122d217b09205ec4f37ed338a9d2d8ad8d03aee92a3091f0d555152e3d66a6f3a82e SHA512 62df1c7f91e1852d3be2cc54a07321aec211be06552ba5448cbeae968df08591cbb3c37ca10d3fb3eb691fad9385cb70b14647afc47d9a115e324d2871301e3e
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
index cb103e28c1ed..df2b8d7095be 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
 S="${WORKDIR}/${P}-src"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 SUBSLOT="18"
 SLOT="0/${SUBSLOT}"
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index a4cf786bf5ac..201960d51ad7 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -8,9 +8,7 @@ AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201
 DIST antlr-3.4-complete.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 BLAKE2B 57f7b0d661bc8211e123a027ce12e71be5637c189cc6e3b949df4f8e5a7edfc8c78f3c6e85b7292347dce2b720ee79070ac8fb91224396a3afae4104583d4325 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d
-DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 54941a760cc44b745039a59d0ad88e109605c47285b34098d7ebc9e7a32758027c07219f7b8dc96fad198fbc68086582ccfa5ba7e7a35fa1fff8ff57b467f91f SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f
 DIST mysql-workbench-community-8.0.13-src.tar.gz 16047080 BLAKE2B c31560a978620ae04210b452bcf90b75e7eb2ec20335470054b2640220ed29c3476f5ee1bacd86575f9b42481de5452e94b8d7a5e8f56eb17ea0770be19dc296 SHA512 d6f7aeb85e1bb59474d432f8088fd5603e5b539f3fce9c78db2aeaa8de3bc9356de09a6486138e07a29dd62b971e7601cce12a2e4a9f7309364081ee5db4b55d
 EBUILD mysql-workbench-6.3.10.ebuild 2858 BLAKE2B 09cfdc16accc4772a41b3f0de95982bd5aae411309bcc0b17efb7f4cb801ba94f4f9898226b7ddec30ff4544094f9526b4f93c34e535a4a306e65d021a57acfb SHA512 abe0d26d0e9424262d58b9063cfc2f979af87bd084339fc7a2d9384d188d7f762401ba6223b86a3ba73de9774d2eaef16c8b7d08d2bca4dc177684dd3828bd97
-EBUILD mysql-workbench-6.3.4-r1.ebuild 2798 BLAKE2B 20f49f347c9c3300de21e66e851e43670f78e128187287931a6eff0d3fb242ec5ef114d5b6749614895e146332220ce7d11be19a2c27ac153e1de457a18e7baf SHA512 9c9556b5dc88f38381357fdb9991ff94ac6d827db5c9e8320d4d665d1df9b779742364d52a1e1924f8cdd4579eb71e1f8c62af5cf5130ef7aaeab396a7138f54
 EBUILD mysql-workbench-8.0.13.ebuild 2676 BLAKE2B 5ad4a670e549174be069f984eacd450b4970fe3654c1b9ee1b832094616b9bf84352a38e606f01a1e662d3dcf88cbc1640c31d98007ada0dace758081600768f SHA512 2205d02eebf2bc3fdf95d1d80b5f94597eb000da73d5db0965728d0e50e16e98e121d75786f48d56b0b4b4e7f8d2f01042848c31ef765347c5c1fbd09fa85842
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
deleted file mode 100644
index 71ca6115b099..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="http://dev.mysql.com/workbench/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		dev-libs/glib:2
-		dev-cpp/atkmm
-		dev-cpp/pangomm
-		>=dev-cpp/glibmm-2.14:2
-		>=dev-cpp/gtkmm-2.14:2.4
-		dev-libs/atk
-		x11-libs/pango
-		>=x11-libs/gtk+-2.20:2
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		dev-libs/libsigc++:2
-		>=dev-libs/boost-1.55.0[nls]
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		dev-libs/libpcre[cxx]
-		>=sci-libs/gdal-1.11.1-r1[-mdb]
-		virtual/opengl
-		>=dev-lang/lua-5.1:0[deprecated]
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		dev-db/mysql-connector-c++
-		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-			dev-python/pexpect
-			>=dev-python/paramiko-1.7.4
-	"
-
-# lua perhaps no longer needed? Was used via libgrt only
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		dev-lang/swig
-		virtual/jre
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_unpack() {
-	unpack ${PN}-community-${PV}-src.tar.gz
-}
-
-src_prepare() {
-	## Patch CMakeLists.txt
-	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
-		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
-		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-		"${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
-		"${FILESDIR}/${PN}-6.3.4-gtk.patch"
-
-	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
-		modules/db.mysql.sqlparser/CMakeLists.txt
-
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	local mycmakeargs=(
-		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure
-}
-
-src_compile() {
-	# Work around parallel build issues, bug 507838
-	cmake-utils_src_compile -j1
-}
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 8b4298d70a5f..fc05e0ee870f 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -3,5 +3,5 @@ AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f70
 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9
-EBUILD pgbouncer-1.9.0.ebuild 1892 BLAKE2B d44fc3cfb7219eceffd1052c04d857f9ad3a2d3fb588b6811c174eb3d8295e4c8dc2912c63b8b71c50eeff61d6cf4d0c96bc398587e35f18f26bb37fad439722 SHA512 070a4cf26ce72183d63cd7bd7d54ff9940c9ecfc4f289d3aa04b356a27d3c1bd70a82a5756e796f0acb25d40c17656c930f68c87d3b207c42f49f2fad103c253
+EBUILD pgbouncer-1.9.0.ebuild 1893 BLAKE2B be596d0ec72a92b9c4351de0e9ff04b5f5f12e4c53684c12aec583e577ff20729f015890394e7ebeabdbf97ef84bcf6e4bad114b84c59e2ab07bd4ecd73c1013 SHA512 b65617a84baa28abb9c207f1a0567d9267cb936823539d908dcde9735fbb66d3b2619386e74fa8f4222cbba7b09227b03f3d9c2ec2abdfe21316110941a7c56e
 MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d
diff --git a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
index 258f5cb8675a..67cf28b802de 100644
--- a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-libs/libevent-2.0
 	>=sys-libs/glibc-2.10
 	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] )
+	ssl? ( >=dev-libs/openssl-1.0.1:0=[-bindist] )
 	udns? ( >=net-libs/udns-0.1 )
 "
 
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 72b5d35736ff..b0b94f8c924b 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -11,11 +11,11 @@ DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa
 DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70
 DIST pgpool-II-3.7.7.tar.gz 3325039 BLAKE2B 47f4d48b811af0fb6626a6ea4b46bd81d13997fa8756f533711f733eed7526ea79bbc929cf894911cc5697c37fd5fde0306eaee485f00b6c41c2701bf08c972c SHA512 9766d011f8a93ae292770b24915f6825d037d55ad3f75be131a58a9dcfb4d1a61f572f2c48f69ee0d3c6cbdfe76da15e417c26f102c646c3d9e1a2f71d205374
 DIST pgpool-II-4.0.2.tar.gz 3576212 BLAKE2B 4027b8d02f4422900e674ee49a1946521b0737e73c9cd73363cd1ad1328de294bdec219bb8df55db58c6b2da365f8094e6b2228e13f1d24f35f7fb373280bd66 SHA512 9014c34f69cdcb3064a3713ed97fa0847f5572866db709c53f703b2ff996dbb31988d6573fcd85c9bb715bb54b9c215adaf11eb2f90193371be804ec37ac955e
-EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 79706764ecb54cd2e682bb200640f6635f9a2f6ff8d26f9129a290ea68cb43adef5ba6f6622c591bd9cd5e996456f396d2f936ed8d4d303367fef0032bf2cd56 SHA512 7f74ded58782b8657b3c3f1de92a7a268a806019978e73ed3f4ed93c160d75d9e251acc2bbc39ee266dbc23f662fad8678b98f31b9a476d1b9f0c6b6719377c6
-EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
-EBUILD pgpool2-3.7.3.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950
-EBUILD pgpool2-3.7.5.ebuild 2636 BLAKE2B 1d4b4147857c2d5f181d455ade1bc8c2879c6b368b5394cdd0ec01afc68af668855432bafd76d1f01832908323efbbd2532c13b65109288ff32cb4e1983258b9 SHA512 ff1fbf75a9bd7281166546e9f04462062c033a052fb83a299e6fe266b5e018d76819ad9a347f1130015f784718f636ea3f070fffadde299219cb04301e2de845
-EBUILD pgpool2-3.7.7.ebuild 2638 BLAKE2B 554f9cf5bba88a23e09efec63bb6daaa24a29cf31738f2d177750bcfe3b5c2d938a01c28f0a37ac2aa0c2a20e6722050e8a69c52c6f7336dc01e3326ae982311 SHA512 7e150e36e77df5c44c991a51aa34a87762dddd9e15953f676c10ce5eb2d8107064a8a50247cb1d18062c5fbbc421f256a022c134683906fa73a0103f5860da7f
-EBUILD pgpool2-4.0.2.ebuild 2644 BLAKE2B b2f3c100bd902c2e7d1c937544c5199fa3b47ff67aa71ee29f8ecc79701dabba4fd1ab6dc3b5e50cb68bb90a4153e554fd022b04e5cf02b25ea5f36869c33346 SHA512 da03de0e0d76641814ca1de20e8b90e0ab14ae8b7561997e1692f827a6b8e4afbc3f4ab25bffa8d1f6486805649beff57c9b9aee7e71943fe5c096766a5ab52a
-EBUILD pgpool2-9999.ebuild 2722 BLAKE2B a9589fdfa37dc5650bce8cc5c7758b6956fba3670e5629308bc34d1b9e9642bb92fdc7e069231cd7fad1d2185afe8b763de6093b0e97446ddb4a7186915149e5 SHA512 ea19202c508243bb2801266cae49d7e8939a6d7ee51fc4d9a02fe7ba3c7464cf440dd712c098ddb183c56839b9e8093f9222f8348bb52bac921003f601a8514b
+EBUILD pgpool2-3.7.0.ebuild 2487 BLAKE2B 292fa47cc7cea86cef38366ded6d8a5a93b7f3c7919c28ef1adee32e6beb72e60a832d766d23bf4bfb1f0b67a40ac4758d6a7a3fba95100681cb2f0abc638d7f SHA512 9cf42db35ee9b77b3c2ca95730afddb47d91ed78de233a63c71700c76f600da7edfacaf8297204d77cf60dba7b77016b42c5659ff9624f1a6147111221974f37
+EBUILD pgpool2-3.7.1.ebuild 2489 BLAKE2B 906a0bcf441df3dd05f7cb00be416cc08ad61b9ce86807028b4a1050a8e69185bd5064315837fca230319d2c53d8bd68ddc7788a224d4d8455785d51c2302000 SHA512 58d2d255d522861fc037d651579ae24e7631d6c6253270fc85adebc65bfc9b54264c90df9710ba7b3fbae802d1c1666aeb1462d578947aff8c0e8190c0a1359e
+EBUILD pgpool2-3.7.3.ebuild 2489 BLAKE2B 906a0bcf441df3dd05f7cb00be416cc08ad61b9ce86807028b4a1050a8e69185bd5064315837fca230319d2c53d8bd68ddc7788a224d4d8455785d51c2302000 SHA512 58d2d255d522861fc037d651579ae24e7631d6c6253270fc85adebc65bfc9b54264c90df9710ba7b3fbae802d1c1666aeb1462d578947aff8c0e8190c0a1359e
+EBUILD pgpool2-3.7.5.ebuild 2637 BLAKE2B 11d6f1983309788e808af8e72d27a6b7fcfb18b71135215786046b9766509a7674ad52ef1b861ddc4d1156cba0fce62a768932e6509e8a0868984da4be4cdb85 SHA512 421c34bfc8aa2bdae0e213dfee556328b0b784af973ae8de8c6c84e2f4b433ce0afc34d16342b0d02abeabd52b828da188d53c73143b66e3b9e00d0c123fd675
+EBUILD pgpool2-3.7.7.ebuild 2639 BLAKE2B 34d313e94f20b68a44ae43819c0ce0c841fba808a363d940b49dc42c4f727b2f77ac103e2eb9996d7a6061db3b093ada25141c4d386935a54f87732930f4f002 SHA512 95578835aaa5a48c8f259ce297978dbaa7ebca684fa4080f7d4ee5923c9546a1cfddc6d34d0e87b0b647e9091eda34f492c91e88422ea5a0ac9a26c06b1d812e
+EBUILD pgpool2-4.0.2.ebuild 2645 BLAKE2B 96f9dc6083536ba5a0ec49faba18e87f3a6c8c357486bff8fbb348bfc2719f44f8f1a06382fbe46a59b01c0334cdf843faa011e7ba36f29d6e5a0c1da18c3e90 SHA512 d65dace277b41ff1f2f49168f6010fdf411df41624c3917e58f9b526c6f83eb75148133e253178329dd5623a074c6b18240d00831ae61337f673bf9ff22c1050
+EBUILD pgpool2-9999.ebuild 2720 BLAKE2B a63e0ba961271a6719fd7fab4a57280fd22eb93ada6d7a37a2c8d7bad381f64b4f160461adc4de760e1b1747cf9536ba56027d7a93710cff3d76251b3453a8ca SHA512 8e3c7a0e2c2562d31974dfd9a9503f1d2c20499b34f69fdd0ca26cf08f344fb115a5f65251e854e9fae9bbd6d007f5d1d9243c17b84885e359f42bad0c6ef5b9
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-3.7.0.ebuild b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
index 9ffbb68c699e..d69e1ec43a57 100644
--- a/dev-db/pgpool2/pgpool2-3.7.0.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	net-libs/libnsl:0=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="${RDEPEND}
 	sys-devel/bison
diff --git a/dev-db/pgpool2/pgpool2-3.7.1.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
index fe57ae924343..abc820600124 100644
--- a/dev-db/pgpool2/pgpool2-3.7.1.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	net-libs/libnsl:0=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="${RDEPEND}
 	sys-devel/bison
diff --git a/dev-db/pgpool2/pgpool2-3.7.3.ebuild b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
index fe57ae924343..abc820600124 100644
--- a/dev-db/pgpool2/pgpool2-3.7.3.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	net-libs/libnsl:0=
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
-	ssl? ( dev-libs/openssl:* )
+	ssl? ( dev-libs/openssl:0= )
 "
 DEPEND="${RDEPEND}
 	sys-devel/bison
diff --git a/dev-db/pgpool2/pgpool2-3.7.5.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
index 285ca5b87272..f4f989f9a38f 100644
--- a/dev-db/pgpool2/pgpool2-3.7.5.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:* )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 "
diff --git a/dev-db/pgpool2/pgpool2-3.7.7.ebuild b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
index 79ac82b65293..59df68c3ad24 100644
--- a/dev-db/pgpool2/pgpool2-3.7.7.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:* )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 "
diff --git a/dev-db/pgpool2/pgpool2-4.0.2.ebuild b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
index 099a14d08702..6bfa9756868e 100644
--- a/dev-db/pgpool2/pgpool2-4.0.2.ebuild
+++ b/dev-db/pgpool2/pgpool2-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:* )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 "
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index b565c24cfbee..839ce8a519a1 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ RDEPEND="
 	memcached? ( dev-libs/libmemcached )
 	pam? ( sys-auth/pambase )
 	ssl? (
-		!libressl? ( dev-libs/openssl:* )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 "
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 502272b6f141..8264deb839dc 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -7,7 +7,7 @@ DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 589cf7168d3698737a19d817b8efb91695c2c
 EBUILD postgis-2.4.2.ebuild 3111 BLAKE2B 5e73b003ce160340df936ffc7571fa4873b1e3cc6519fae8f7f452d98c2c5786c2ecedb96a544bef39f566a28db8089b7f9dfd37e97b910cf33fa83fb0307bcf SHA512 0cd08ef2930688412f1ffe4846ac88a9037f68dda0cde535c810fbbb218f2c033fec74a2f7b1539f0ff42ea40f085ea290fcdd3892fcc27a38fad25085686152
 EBUILD postgis-2.4.3.ebuild 3113 BLAKE2B 4ea7488d7c87a8d946d074d36f306db9791bca9d0d63f7ad67622defd797052fad8d4b0652ef2a3445ee1da436450e2f30683870dcf54de3255db9b61095e2b3 SHA512 a7f5e10d00f67a6f6c322ed59937ccd103e3491b9ae9ffc516240c5185b10ed808b4044e44ab276576e07a5bc34e3f9464abf242623b85e9a718733713cbeb1b
 EBUILD postgis-2.4.6.ebuild 3064 BLAKE2B 0db79ef8795463982620e44522a0eeafbaff89ad9da666ee0be4a5f30e1fac7d45b6cf79340289f0a8ebe49ec2fffbd0157aa576f63807e1b055547c196e13ef SHA512 e8c8f804684886fac800d8c9fb3f325203f8ebe1f0852eaee6eb3be7255038d9b9bba59a04be5a32de13c65f65d054194f4919946860edda8209c01254f089a4
-EBUILD postgis-2.5.1-r1.ebuild 3046 BLAKE2B 27e063256480698c255088e1e4ba53a8355ed325a228829f93d2606a8110f5315362cd1b52f7774c0fd3e2f28b95376d5dc2b8f7267115eb53dbaeedce893898 SHA512 154b19f8dd6b06c32f28e62cb6fd14af2b9ea46b126b61285790542f79d2168dff6ec765f4c423e38917f4fa364527e760592b25a1c8f9c90f6e15fd66f0c4e3
+EBUILD postgis-2.5.1-r1.ebuild 3046 BLAKE2B f2664d46785b9bb43bb35a23435649a785893dcbab78161e7afd9f56a8f1daecfe5c4e923f17266e06e560c2bd9113b4cb7858d8322bbc29eb31c33cdb5d809c SHA512 1182ea0a9fdd8430d4d43fc0bcc13825dec8531b6b0be111cdf480c634263b1599cc544630a20cd56073ded452d507fe895b95a5f5987a5df6e8b5bed152015b
 EBUILD postgis-2.5.1.ebuild 3064 BLAKE2B 0db79ef8795463982620e44522a0eeafbaff89ad9da666ee0be4a5f30e1fac7d45b6cf79340289f0a8ebe49ec2fffbd0157aa576f63807e1b055547c196e13ef SHA512 e8c8f804684886fac800d8c9fb3f325203f8ebe1f0852eaee6eb3be7255038d9b9bba59a04be5a32de13c65f65d054194f4919946860edda8209c01254f089a4
 EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec
 MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada
diff --git a/dev-db/postgis/postgis-2.5.1-r1.ebuild b/dev-db/postgis/postgis-2.5.1-r1.ebuild
index 5d81ec77f469..23608a5b3b00 100644
--- a/dev-db/postgis/postgis-2.5.1-r1.ebuild
+++ b/dev-db/postgis/postgis-2.5.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-POSTGRES_COMPAT=( 9.{3..6} {10..11} )
+POSTGRES_COMPAT=( 9.{4..6} {10..12} )
 POSTGRES_USEDEP="server"
 
 inherit autotools eutils postgres-multi versionator
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index c36a62f87ea0..f2cf0e740e6c 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -16,11 +16,11 @@ DIST postgresql-9.3.25.tar.bz2 17067593 BLAKE2B fd9ca5685e5511dcaa72da882b674846
 DIST postgresql-9.4.20.tar.bz2 17905682 BLAKE2B cb65228f8e78dc8b6303a06480a68de58ecac1fefa1342e4563f2c4051c9f5506b366b36c2dbd54207d25ae497625f8fc5e3e771174a6b3ec33c3c19d2c9ea08 SHA512 664c6e97979f38d263d1dc75a7db442f193a230435cad43ddfa2afcd42ac0d73b2aef0e846fddcc9008cd6d89cba2d5c0a4db93b111665646d3ff4d8f6fbe1e8
 DIST postgresql-9.5.15.tar.bz2 18707696 BLAKE2B f1be26085953d5a15a6545aed3527b9eec6eb57c72f2e05401e43200e628b3a42ee824dd1cb0138556b97fe4922a991489dffa77329b653475874766c1d5b944 SHA512 2ea241b6751a2812c689da9bde40151ebb7cdabdd14e93d92f8bea1e3fcf5bc0d4854834999f33270329e22a09c5aeaf8d59d36ca6e8860704f81f3adcfb30d5
 DIST postgresql-9.6.11.tar.bz2 20009048 BLAKE2B aa3e5b1e63c983226ea71737982e62eaff655af7e0f55f20ec886f5d7406b1e30e2fe5378b0dd1ef59e777f862ccc2386121653853d4c186a1b4853a9bbb1591 SHA512 a4314f92d1a661af4076d8c120533ecae76d91461043b8a6ad22dd6e5b562e0bf019bc7f3157a26d9666ba5866e254613ae5b690310168b029795dc088f8c060
-EBUILD postgresql-10.6.ebuild 13812 BLAKE2B abec94f81c8868c051958974cc88bdaecde385949a24797bec5324da0b0a7456b942b715b6285dddc6ca1af9662d1928ed5c52a2c211f35a18e999206ac6845c SHA512 21f723255aec272897fb812589b6c26e4d705cdeca6facbbb977e14596a22086d35c2b085fbcab01832489bae24e55377b07987c02759237612c2053bc7fe834
+EBUILD postgresql-10.6.ebuild 13811 BLAKE2B d182148b6aa53049dc6387b9c18a98248ec6b2a66811c877c05b6c2e08bb3e10669b288fa96d4e39f6b29449cf86424176f3983df8146a4b230ee0e0d59bcf60 SHA512 043bd74949a04514b05058dc699e5876babd6b780c67760fa84a9a73d95c2c209d03c2de0b110083f7779d51815f0f093140ad052fc7ab7cf65a722858c2618f
 EBUILD postgresql-11.1.ebuild 13842 BLAKE2B 3f97f0166b99742a1594de76bfb333df24bf48e3963041afea0cdcd293e6f8680ca8f5fdee680cf668f70fbb455b2b62a6159c79027b715cdca8f20750624c16 SHA512 1cfa615a5e8c55126a3b4ac46cf8e881640cc6d2f76612270c1dd391249213e9fc0485ed93ba5f3250683ae32dee8783c3ee267d94bf9b278f0acae1c2ee56aa
-EBUILD postgresql-9.3.25.ebuild 13561 BLAKE2B 8f3e75179dec828e49786bb1fb52ecb5488c5edab4dcc775b42e2343261f1f1cc55088121d40074cca5b89c243cbad42d8468b175a17bd86f8042e8b191f04c1 SHA512 7bddfe493a2295730e690f431f94b6f2d713cf9261fbea08c1dc380ebc7f29e60c96a045144d10ef6183473a340c2b8668f52e5fa05107822ba0e5493c208c40
-EBUILD postgresql-9.4.20.ebuild 14371 BLAKE2B 7f595656f7d398f89e9c34423dfefc97b5474dc8ff2cec61734041b62b1681e7055210eee5ccbad1a2e0ab364a44438310e93ec9d7937dd8910e03320ad88204 SHA512 e720d9f3bc8d4791cf38b7015498f90a2408ac5d243bd0ec3471fa3ad5ec1587fdab17fdb244cde35ae80b7bc322bf639c7160e84b7d64cda6a5cd1fd8af3f21
-EBUILD postgresql-9.5.15.ebuild 14599 BLAKE2B 8f0b7fc2b6b49a04996ed19cdf6a6b212c8f1aea60cbc9ea6809ed6913e67831cfe98ebc266ff7379f69be58b1f672ce0028e9d453932244759f75598c04d8a7 SHA512 522a170ce59a87e09ad8656ba1047b41ba41104edfcf5950260389e278725f076cd4ebb02ea5a95c8d9c8b372a80ec66d18be9bb7e08c70fea7116bf09a8fd1a
-EBUILD postgresql-9.6.11.ebuild 14832 BLAKE2B 68a35d4ce692842414e9485e9375d1b93fd3bba19ba63fbc599fa45035f05f6a1179e7acdfa5688156cfea819153fecec71a7871221f9f42a65a38ae8f59fc61 SHA512 4fb743a81947c4cf73a8e1fac9a1e782f2d07bc10fe810bf2cec868ded3f03fdeb64c5189405b75c55917c9bdae518f80c8a58f38e2fb27700d177793598403d
+EBUILD postgresql-9.3.25.ebuild 13560 BLAKE2B dad258dd261b0db61ae0dab4c94824abf347d2b7c155e49811801b81ac2b3449b377614e940c91d70240a9cb3ee34013494f6dcfce8fe24b1301b7a47160dcec SHA512 43ecdccecd395977956b26c6376f42eb79e7389c87fcca17dd27effe4cc847d5548df8b368572af9f70b80a77f62ec4a7e17c3bb78105ce854faf5343e9e38d6
+EBUILD postgresql-9.4.20.ebuild 14370 BLAKE2B a7f2e2bfa0b5ee85c11d525b6f29c3194e040495bf49ebfdbcae4dae5ea915325d98abc672b4727a985e056b0f0e9e9c85eb079164f93e94c55df0be68a04326 SHA512 5745139858d20d62c90a843060f5a57378c7590b1b26cf8a41f84603555973f581d06120b237a0fecf1a9d239a7af885761c75483addb955983528da44dd0d47
+EBUILD postgresql-9.5.15.ebuild 14598 BLAKE2B 5b59320bd25c183a251ff9176e774e222a15eb68749f890c16f7657e0968d519229f3498730b26b3b2eca2e76fcb304d96616cf11287ccfdcc62894379771781 SHA512 f11b94faf2376216c5506017108a6282efa4e02106597f9502daaccd14177925aa363eab51f5aafb029ce7f3f5617778f71a26cd9a4d1b830f1176a8c68764da
+EBUILD postgresql-9.6.11.ebuild 14831 BLAKE2B 95bcc8d1a47a6970bf5e2d1c89a8bbd3b48e16a4c40916e1d672d32c265711c371adad565a8ea32e15083a0f0f25f39daaefe1825e25ca1ba281067069522478 SHA512 289204e2f689f7ddc001954c784b9a73e035f8dc5960f38a50f38e8af2e82427b3e678f72d9fc11fba1b3e794286441f15a84c91f6d68f4e60f035912374094c
 EBUILD postgresql-9999.ebuild 14262 BLAKE2B 43b6b2ab7b5137e8a0ca2edf28781d30f7a27afbf01ab718f4742c4ec981071797074f6dcad9995796d30bbd0b1e39d4ee7a63a404e7246a9bafbb5298a12c47 SHA512 29e5bcb9463c6cb8a43e8ba04840aacda074ddbfdcccd1dafcbd66e13d5c20a765c53f637e1c8993fe6647c286f7ef40254f3211f3341054c96bec1f327393fa
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.6.ebuild b/dev-db/postgresql/postgresql-10.6.ebuild
index c7623f96e1fc..782491a4c4c5 100644
--- a/dev-db/postgresql/postgresql-10.6.ebuild
+++ b/dev-db/postgresql/postgresql-10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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.25.ebuild b/dev-db/postgresql/postgresql-9.3.25.ebuild
index 323262f88679..9a7ebf8f6dff 100644
--- a/dev-db/postgresql/postgresql-9.3.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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.20.ebuild b/dev-db/postgresql/postgresql-9.4.20.ebuild
index 0bff71b93931..203fffdd8b0b 100644
--- a/dev-db/postgresql/postgresql-9.4.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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.15.ebuild b/dev-db/postgresql/postgresql-9.5.15.ebuild
index 6d1dea2a84be..a40e03e18c2a 100644
--- a/dev-db/postgresql/postgresql-9.5.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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.11.ebuild b/dev-db/postgresql/postgresql-9.6.11.ebuild
index 02f04067dc1d..2643ac50ceaf 100644
--- a/dev-db/postgresql/postgresql-9.6.11.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 inherit flag-o-matic l10n 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index e7e73adb93d1..bb664e64a57a 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -30,6 +30,6 @@ DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa
 EBUILD sqlite-3.23.1.ebuild 9703 BLAKE2B 4e6cb6336b1bad31d56cdb3a1ea3ca32323b4280caaaa053221e1e405ea2edbd552860ee89934f66d68d19425f0632bea45eea33595cfb6f7e95c5b4bf5eb1d5 SHA512 7fa4f6ab562af73f00338da2e6aaef80751dfd7071c21abf64647cbf68b8e2180e524574c2f0bc38cf138bc8dd3edb7c75f4b3f2a28f788fe0cf108a158ef44f
 EBUILD sqlite-3.24.0.ebuild 9524 BLAKE2B dd5bd95346b77d111c1784a69feb6d44170375c82d7734420587d00fcc1f987fdb7676200f988c683606b856008f198b22999a8dd208a275b625702ba0341fae SHA512 0393124beded522a17bdd4f5690d0022f9646069ce735d79c316597743b036a06c0bd5a77635b428a78954920551876e10e55d1498305ec857b5d7eb2d4b05fd
 EBUILD sqlite-3.25.2.ebuild 9870 BLAKE2B 235bbb1eec1d35a1babb2bcfd4daa3f34fe69d4e5973b5fda452df9965bd083a64d15c273d89f25eb2168a72efb615606dcc0698e5e35787e070b16e186e491e SHA512 f467e23b508f8a2d7729f6bf02529b151b15d8b90dbf432512a1f2b122f2a3b2ce1135378dc57b7335d20153309e50df950e3150e05b01d9f068fd18a5a25575
-EBUILD sqlite-3.25.3.ebuild 9655 BLAKE2B 1782d46088e9f933cc8405fd3fbef4dce951a7d93941ae971d5117bbde974d1769e5032e87ec997804593068935f61af7bbf0373f791db37f5a9c080feb427ea SHA512 df6d29c97c99ffc4ef6d482298b54c88cc7152aea0bdca5ca6459e5a72b82f908c28a2cced28bfcefc23cd896a7ccba18c71bd8fa85b90ef93c454d8d7f729b1
+EBUILD sqlite-3.25.3.ebuild 9652 BLAKE2B ac7b2a5790b2d40ae6ecf67a653a7a7c393f9f7f80d456a95b0cae3f15ab8e84da7bd6ca7a8af7e7a969e06374b823d21c651d16338148520decd78843526a93 SHA512 0df0004e76afbc9b82d539518bb3a8bd796de6268affeed17cf34e1fd0bd83ec4edc4da159a38179f46df61dd8fe4650735a97940892838478fc0dab694e0493
 EBUILD sqlite-3.26.0.ebuild 9793 BLAKE2B 6d6a788f176bd582d6030bc1e814d672c3add3e2d96abc49b4aa1655aed406d8c1dd1dbb83f4d599ffa32a0d833af1d99eb06078962fdce5a4190bfc350ca760 SHA512 6e047df4a21c4aa94e2e9248bb21ed5b3b97537db2b71a80de245b04fc4e017687afb53e336fd086d838253d46a69d28ddfd2babbb8b83d8bb2b92806db13268
 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a
diff --git a/dev-db/sqlite/sqlite-3.25.3.ebuild b/dev-db/sqlite/sqlite-3.25.3.ebuild
index e77904944e43..520ad19dcf54 100644
--- a/dev-db/sqlite/sqlite-3.25.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.25.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${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 ~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 ~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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 6a1ce45cf0b4..6fd807912543 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 148605dd9225..d8045e0ce941 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,11 +1,13 @@
 DIST fast_tls-1.0.11.tar.gz 58366 BLAKE2B 1abf071b2007b1daddba53e3ea8823b5ad62d51d886968eef571495127c8ff97cf95d1bdd2a7183b6712e1518e5e3b302fd1150a26da768bef31087d4d291c3f SHA512 41ee00ef11fc0732fed4a1a0a114fc8c064ab489f9e74eaa769610c6236685f407702c5683ecc735857150e19b03e825bfec33ffcd0d03b503583f323bc48a7f
 DIST fast_tls-1.0.25.tar.gz 76303 BLAKE2B 3f926957dad6410a53bc933fb263d4cb269a8a0df6123be6231d9ac96a4e48188fd5db948fc779edb0cf705912f93319e7bed71c67e970d6324455afa0e9f132 SHA512 ff061ff19daa51348b075cbe393f0cc4b9c6c5824f9c458969685935e9d07439a5fcb40d76f365c622e7c2c2908c9eccdd86af192e54c8a326cc4bff5b067d62
+DIST fast_tls-1.0.26.tar.gz 76348 BLAKE2B 3016d26724119a2b0b6e4ce9691ceeca7009ee758465f7d7203cab526c9cf588cefd859cb452d7f28877a2d3cf4eef26f9941bccb7aee4794006d9c0f4e8561e SHA512 3be4ed4a346c2d20f7a9d080a12e98fcf180c2f25df7a505a798ca8581aee74c4dc2f92b74c1a6866d6b13e65940cf0adfaff3cceccb0fe9fb3f375a3ebcfcd8
 DIST fast_tls-1.0.3.tar.gz 57470 BLAKE2B 1e7a78ef0e46cb86bef8e621dded546f62bd93c02aa3166e4035e011dfa33a92397c51e01f24d9443de9aabfccd93a08ead28351f5d7147201be9a28f7f873c9 SHA512 701016ce045fcd13810f2c287772cc2828576b85bd1458227d9da9ce89c3e10e75c41a02eb78f6e1c155dd75b76ad3d3becf5b40832b1e1b4cf928488e3bdb04
 DIST fast_tls-1.0.6.tar.gz 57994 BLAKE2B db433550ff293f9e7b4eb0dd7f688f92c61efecc8188cea19b18ae92f4da4eae07076dc9bbfa6c50b4b573357d42e1c5b119a062fe2c6c50812c5befb08c6eff SHA512 d13a5758345521c9a295f6bb4aeedc58ea7fafb42ea3955ca61cb75e15c8755c7a331d139f2c544da9e8d23607a6520caf8fe1e1fad7c016acbca07c0d783fb8
 DIST fast_tls-1.0.7.tar.gz 58069 BLAKE2B d454f85e0ea010a564d5e88ded505c1a30f80d0b4c9f6ebafff043d8d718d05ff938f68cac5bb1939abd6ddf16cb833909b5db1b7439a57d51ccf6cd4c747b0d SHA512 46a3ebab09ec5e18b086c8c3e2a87a5d6a35e406e8988c48979d94c3e303d5f9a8bcdb1e8ce74266ba8c59fbb4a4310e445f5ad65f072d28a7b44a0bdec50b62
 DIST fast_tls-1.0.9.tar.gz 58299 BLAKE2B bc4c45b0fedea79f90644989c6ff734a85b701c2dab3121ad55ae548563ed92046add91780be172e2531dc5ef757415673aeda1215900db84aae178d707328eb SHA512 ed45a5b262d05dba23887e4bf391740f388079afe9a297221de2dae22b62c6dc51b9b739544a54501ee4aebdafce789290764e963218ed3c0095623b407bf0ec
 EBUILD fast_tls-1.0.11.ebuild 600 BLAKE2B ffc71b6e16de4c113317bb87a80262f1d724a1d91df77836e8bd07f8a03cd6ec814227a17588aa14b3858937975d653f710c335abc53a612e0ab47850766e420 SHA512 f33145c9e71f85dfa64364b53f10371fd8900c122ac6068ff32e8644cc5299b7ca1221caec38e900d81834e1adce177c7f29124cfd2b4fb60d625e0e6031816b
 EBUILD fast_tls-1.0.25.ebuild 604 BLAKE2B aaa476e6f79630217bdd37de024d38b097bab024ef79e8b38965289bda8e8895e7cfc0a6bce2f35e249f687412d6638effde2d8d46a773c13aaecbc83dd69a36 SHA512 6281b49e0bbb7ba91e786d48444dd39dd6173bc94b5fe66ef03b456e49942c80b48bcbbcb65cbc5620d6106601437b509821871016287545dad70ed2cda262a5
+EBUILD fast_tls-1.0.26.ebuild 604 BLAKE2B aaa476e6f79630217bdd37de024d38b097bab024ef79e8b38965289bda8e8895e7cfc0a6bce2f35e249f687412d6638effde2d8d46a773c13aaecbc83dd69a36 SHA512 6281b49e0bbb7ba91e786d48444dd39dd6173bc94b5fe66ef03b456e49942c80b48bcbbcb65cbc5620d6106601437b509821871016287545dad70ed2cda262a5
 EBUILD fast_tls-1.0.3.ebuild 532 BLAKE2B 4e67cd6b566be9f381af043f411c5df8e5cbc3fbb6fb6016201256f1eaaca3881e4ce947cd78e7ea77b9616ac064050bdf205a85cce32382b61bdc2dca563186 SHA512 14ae845928c88e7efbb4d9a693b9b61e301b2fd1edea60d01e7072c490c74aaf09b42fd6341047cabee49812f85110465aa24a8c9929e1276af6eee39f342c78
 EBUILD fast_tls-1.0.6.ebuild 602 BLAKE2B e46aeaf9df9d5f7ab938633175ba55901b9d894068f9463e6508b32cc379e6c198fd00e61d8b94b434aeb909e405bfd7674214902397cca2dd115656a557c226 SHA512 c920da9c247e00e8d2e2adb424ecd6bc2f31b9c363ffe8a2a5687cde527964918f89d7804c05269c1642788603bc2242789f4380d6d49c6517ba1c0e1b88a03a
 EBUILD fast_tls-1.0.7.ebuild 600 BLAKE2B 4b4d052cbdafd438f45968c4813be7e2d58a7e70698f4ab5f483fee137bec7becca997d2d6acc3947479f3c9f6364a0afb998eb65094702545c77501b53a6cdf SHA512 1428618c39ad08f6a37e28ff0b4793a384c196bc577b22ed3f375cd99587ff851816d2c5b9b310f3130a39375a17533cb615dc9680f5e556d514882cf0dfc4ab
diff --git a/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
new file mode 100644
index 000000000000..43413ad8829e
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.0.26.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND=">=dev-erlang/p1_utils-1.0.13
+	>=dev-lang/erlang-17.1
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index bd7828d5730e..126276bf9957 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest
index f5e27957cfbc..a121913a46b1 100644
--- a/dev-go/go-md2man/Manifest
+++ b/dev-go/go-md2man/Manifest
@@ -1,5 +1,7 @@
 DIST go-md2man-1.0.3.tar.gz 3279 BLAKE2B 0b693569ad7ff609508dd28b11bacdc0eb08ee0fd2b2a23dad5e26a670e1fc0fcc2321ee099114dc144fb8671dfcd7ed072e7feb17bb96e17c2f9ff0e748ddac SHA512 855809f068daae2becb31d4b182b0953a9a11428cf89d488e2148256c6f4292bf24d42bd1c5bc96ba2c1c18a8201e859629f2515f750de390e4325cc320ac7b8
 DIST go-md2man-1.0.6.tar.gz 40240 BLAKE2B 183a96b661419861fcca27e34fcd107070839087d61d3c36f3da3b3aa644678d4eeb6fa31ae3a07eb41dbd750ed43fa29b5518db9a56290530795f6b3cc16873 SHA512 73abf08470c7ba3c5e5f0212a19f37ae98a8582605d2493bb21b2e5c07fafa8fb711f05665e153863d195749a0870e674e203f377ec7bb8425b9d497fa9864d1
+DIST go-md2man-1.0.8.tar.gz 79284 BLAKE2B c6bf5c1507f0e7e6393c08592bf56e6423157f265a2f26b10f262c00b15c855e99c022d9e4b465247997b0c9d667ed71c727d03735af6214ec20ca30583235aa SHA512 4c52e01c9b07582b5d55d1e94935378a676bd284a3e8230a8a191d4678b1b6ae92b704a249117c542832170069a70c649e58a1752fb2973709259b5bc108db91
 EBUILD go-md2man-1.0.3.ebuild 680 BLAKE2B 0be51004c235bff0e145897be6c364d1dfc94d0fbceecb14b20c8ab25b966041faa7aed1141fce63f4f744c2d89a291d2ab7dd050e122cec96c7661531a822a9 SHA512 2d268d69fad75bc2c666fe09d430797e449cb287273b8dc46d8296d0ac1746756672f08c474e456801c5c38670f18b65ee2f99ad8c2b93f3d4e14425a0984a74
 EBUILD go-md2man-1.0.6.ebuild 706 BLAKE2B cb2a08c5ae1b2973bf17b979006bbb99f0c912c39edefd4368e329af875fb94bbfb1f86c3e570ebef0fbdf8a5f0ed7d5879c1b427782b5b40d3f195c98117887 SHA512 bc68af43db4be6c72c26688167229296ea5fe00cc912e2b349a0e50f28b4dec287db4c65db6f7333518897271c66bd742cf3e6bde22b1cd6eadd1f2147e2ab6f
+EBUILD go-md2man-1.0.8.ebuild 644 BLAKE2B 420bdd73c89d90ce3ce346760683c9682e20064d3201347d9a4e59016bb0d1111e9dcfe814a84886d4312a37e2ebb338f3beba65545d2f74e738a15365862a14 SHA512 925e0b619113267d54de5a9c9ee13115d88b85d71ca3f5e0f956e23dbb090f5ed26c05ece243f035322731220acd834ecda0b0c5e34824e135259f50014b8a16
 MISC metadata.xml 331 BLAKE2B abef71d699a969d2a5c0c1aa4daf5e13880f0aa997c5f11eb5fe7751d2b23f4bb9bd25ce5fde8caa3e2faac9dc501a721fe1e3494bd61a10863bdb17e79ea226 SHA512 49c11c5d5b483d762b6e1e88544cd4035a09bc9195999c90a2528542b993c974468fefeb7e384cac2b5474ba4441b258ec400fffff8536b47893bb52393f8db4
diff --git a/dev-go/go-md2man/go-md2man-1.0.8.ebuild b/dev-go/go-md2man/go-md2man-1.0.8.ebuild
new file mode 100644
index 000000000000..c3767538421b
--- /dev/null
+++ b/dev-go/go-md2man/go-md2man-1.0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN=github.com/cpuguy83/go-md2man
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~arm64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A utility to convert markdown to man pages"
+HOMEPAGE="https://github.com/cpuguy83/go-md2man"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	"${S}"/go-md2man -in src/${EGO_PN}/go-md2man.1.md -out go-md2man.1
+	dobin go-md2man
+	doman go-md2man.1
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 4500b59eb894..1902b0777445 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/hsopenssl/Manifest b/dev-haskell/hsopenssl/Manifest
index 7fec76406559..1214dfbc0e75 100644
--- a/dev-haskell/hsopenssl/Manifest
+++ b/dev-haskell/hsopenssl/Manifest
@@ -1,7 +1,7 @@
 DIST HsOpenSSL-0.10.4.tar.gz 67538 BLAKE2B d52fbc67bd053c8ce526bb0d30ef74ab11bbb200d01c2e00672c63f774911d113cd03c4c212077db9b56b1ac82a196bbb23adc0504b1b953c322deefa1c224dc SHA512 ab26d19a196ee299763c4a0953e5b805c9f34f9f6b8502562812e597cfdfa07bccfec08919682ce90aa3022144133ba609346139734fbfe89a42f7a6aba939e7
 DIST HsOpenSSL-0.11.1.1.tar.gz 72297 BLAKE2B 73838757886f3a7c0d9101459f995f07fab4f2f9db0ae7007178ddea9bed20c9a0538388a06bc59652701be30ef54ac2419426d7d1b7eb63d3012f79028dc208 SHA512 a7260bb47a4886e550fce71f83f1d9ab93e54fb40886b618f86db191651f95beeac30334d58ab10ab084bfcf9ff8a1b994254c13c09e678dae3b23a12b279541
 DIST HsOpenSSL-0.11.4.tar.gz 77764 BLAKE2B 883d38142f1c93c7fb02de59bf993433c2accf49750bdfb0dd1e1d948ed4bb964b9ef3e9d473f1904acc8954336daca176bad3b0f477a834a39a4b8ea93c68d7 SHA512 be67eec8af517bec360618883bdce1ed195bf11361ae7cad372a50cc135f0e1825a86cc581a5e94375ad85cc163553270d5c431e2a03a6a4b80dc03b027fdcac
-EBUILD hsopenssl-0.10.4.ebuild 798 BLAKE2B 0ed1f657fcb189572aa2289d394f5e1d46075d22fa2daaba8217e24a844abbb8855a135b5d2be4ba0ba74feda2d51b4b86df0ef9544046298b20babedd4fea1a SHA512 60cd15f89592a381ccec6dcdcefec88a38854221a421cde5ed52ea6d031a83c82e90ed95f4a9b9ed7cacd825b7dbdd17084eee9f0683b991ae0b66a6b0972dca
+EBUILD hsopenssl-0.10.4.ebuild 796 BLAKE2B 9a5d4c15cb5da443ef276dce412576539cd916923722cbc309d7c65aaf3a314feca11a6f8f4ec9338cd542d3b2ebd5193658ee2c1a2c24df47ca6db176177023 SHA512 aca9c548d05f3979751ef150efbc5adfc4e1f51665155c500b75599f2049ae491dca3dd467490a6341c3f85f89be86996de3f8b58742d88ac1cc16479992122a
 EBUILD hsopenssl-0.11.1.1-r1.ebuild 1481 BLAKE2B aee91d16b1eda58eb2e39871fa6464d234d648c5a911d3157a2c0302772dd2d704570eeb6749047618dde4293286742c2e25739e46e50f28b42dd7278a71f9ec SHA512 a16cf5aa02820c0a86c56a650d72fbc689f4059950424a15a74bd9861e0481059707b30883f50a22aca1336cd7916109dd3c4ba50334714e3f33c18c9031144d
 EBUILD hsopenssl-0.11.4.ebuild 992 BLAKE2B f7c7e354748fd66a4d01d0ffbd7ef67316a526e330fb9f6ac5328ac599c9da1b51949ea7d7f020da6b9c49edf4230e8fef01464fa0bfe3eaf0212ba75ca445d2 SHA512 2cd27d03f8185f17072e0653dde6eeda0d4bf9820c911fa507861258cdb7012a84d60fe2d70c0b8f1d87af9ae68f1c1926c018db4cbda07895e6f57c56f70d38
 MISC metadata.xml 1174 BLAKE2B 26b5c812f3c01512d1f0c6b754a9c9742dd62d91be4097bda649e01b17fee3c4aff921cc3b63e6c4e90c370e94625c5718e269022791d6883f81f517cc5b0d92 SHA512 3de12003fe30d1d183838d2ee19f898a2ec58807c13745d264f30be21d655b7fa40a8dc7163763dc3d72070125c81f4fabd20bc2422e2704cf060d29fb55d2db
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
index c8d0fad5e1d1..f0bd0d86b08a 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE="+fast-bignum"
 
 RDEPEND=">=dev-haskell/network-2.1.0.0:=[profile?]
 	>=dev-lang/ghc-6.12.1:=
-	dev-libs/openssl:*
+	dev-libs/openssl:0=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8.0.2
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 41e981d3d6cc..dbca342e2a55 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 91cf6515ae9c..5aa3cd705a67 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1091 BLAKE2B c3790b2b3f92d86365dbfb8b2e8a4b3495d094ed814cccc34af69a234378a4e8efa58c71383c74b33c1b82ba3e51292a6491b032d1cd12c9668a9b6ba69f20ea SHA512 0edf4e4de728350fadc225db5d9e7c4e1cce0ecdc93090c8a0d66fc430d3051a06151efed7f6f18ca85557214419fcd16e3be0cac1063934f50c2674a55432a9
+EBUILD java-config-2.2.0-r4.ebuild 1096 BLAKE2B 196f94f029d9cd4fc082fd37c264587f55f0778dfd564272723dd0bb25b5a7b0b6ff4bdb05ac2cbef1b2452581c2bb57a51688a999d31234d4bbf41ea62699fa SHA512 417d45a6c6b52990a7e4ea1fafc75aea163dbb8b1f7eea87acea42597bd03bbc0a339b5ad7b829be3c2c24b5d865028c225da4de205767ace6a4af4d25598c39
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 6cec0799a1cf..f74fb67ff8ff 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Java environment configuration query tool"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index fac7a7569b9b..eaa17f223378 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,4 @@
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 DIST jdk-11.0.1+13.tar.bz2 90134818 BLAKE2B c79f32dc5b531a06317afb87ef15495267e914b9b292a1d434514a90298d8234e7e0ba92659416b15d9392c7513d976a0c81411953cb6706a27ee57c965e36fb SHA512 c534c2fa8dcd4fdebef6f00473d5ceaae4a33bd1e1a417846508e25f154b1ded649a73468c8c71ac0c1e27bab5f641a3b480a264b532a0c30be2869c3d11a15d
-EBUILD openjdk-11.0.1_p13.ebuild 6320 BLAKE2B f16e007b9c91e335406c034a6b74586c364258f80dc0f04055a2c55fef628488ac74c8b905fc50f4c89798912ce0f48e9934619a2a399c1ee0bad0aaebd2e7ec SHA512 fbe77732a6a63717265dd8521180a8d467b45e210b2f55c0ecb748dbcf81eb51f05f586e2f84b8d03c3e731dc772b676f1e7d4ad3324877ddc9d9e8b6be3fb6e
-MISC metadata.xml 889 BLAKE2B e25b4908a272d8c0024eac28c74d8dd8824f96609c05b0130ff0cb7aa332d5f110182812dba35ce2adfa7984f43fc4696412d29b443862daa95ec1e4e47aa7ec SHA512 6e7735bd595cdb8b3353d9b0114405cb474f994d1784df41e105613a050c8ef2146d00c99da3431ce784412d08a4705568ba0ee872ef46f951718ccc5b348370
+EBUILD openjdk-11.0.1_p13.ebuild 6411 BLAKE2B e96038feaf6e15b157c759620ff1827d9415ca0750205670178e8e30cc15e053f6b0b649f4338144a6b2a033c9c1a74cff6206d0e1d719136b1c4b19f82b51a7 SHA512 6a8be9fd58ed246db0341d07a35529a6f535915c1760881efeca80350411d3179fa6620e88cb85419246278968574118221cf7b49626a72ebc1e9c11c0218d09
+MISC metadata.xml 955 BLAKE2B 5fcc3e2073db70e6c79ad69c8d3cdc516393d4f0bb18e89a5801ce45afc55a90584d6f65389cbb75b1b81e1bccbfddfa2edc54aef2dbfa8c65ec54087e3a11c2 SHA512 07e908b635f563d116e8dcb8ad9f550f679168c6d548732dca0090424f6caef5c849fcf64036e8732884e190cbbe125097eb3f5ef8ec65b54ad86ed1f1893331
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index c76b9ca5d45e..efa076c6f48e 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
     <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
     <flag name="source">Install JVM sources</flag>
+    <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
     <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
index 5b9ce2a9bd0e..d606429ebcf0 100644
--- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,12 +33,13 @@ REQUIRED_USE="
 	jvm_variant_zero? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
 "
 
-IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
 
 CDEPEND="
 	media-libs/freetype:2=
 	net-print/cups
 	sys-libs/zlib
+	systemtap? ( dev-util/systemtap )
 	!headless-awt? (
 		x11-libs/libX11
 		x11-libs/libXext
@@ -170,6 +171,7 @@ src_configure() {
 			--with-version-pre=gentoo \
 			--with-version-string=${MY_PV%+*} \
 			--with-version-build=${MY_PV#*+} \
+			--enable-dtrace=$(usex systemtap yes no) \
 			--enable-headless-only=$(usex headless-awt yes no) \
 			--enable-full-docs=no \
 			--disable-ccache \
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 652543ec1bfb..f9985eea0093 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,9 +1,3 @@
-DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa
-DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
-DIST tomcat-native-1.2.18-src.tar.gz 411789 BLAKE2B 16f1ecff3abfa6bf1f88c44af4a6ba58addac69bec1c257325c429fe6eec6a522fd2ae7932d68afa9bb442b0cf248731ce3e1a9db2b383f502093bf0ea5bfd23 SHA512 66481c1f36dc7ea909bf8d55075a232bf6dea3300b56d36415b13da4aefbee16cb52456f3d44b4a2b09b43cd8c7df628145a0623b9cdfa322bc2432e6c44827f
 DIST tomcat-native-1.2.19-src.tar.gz 418183 BLAKE2B cab8621bca4dc41e87ebf6418337da8a86d56a0717aacd62c6e4fb2d039e413cb29e8f169abbd353719ce083d302613d3e0f64cd54f1bc8e57f26a523a828025 SHA512 7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
-EBUILD tomcat-native-1.2.16.ebuild 1238 BLAKE2B 2fea3080d1f68c5718caaf3e4a4780a66e511e3d2dc5b960adc86e788f1c6257dfd69dec607690d76178bb5fb4f2bb2723b2549c9b73b8dcb67a8fcb36a34887 SHA512 c86d56772be860e570f5ade50c5baa51c6267e689c767834aaed6965f9a483404d00b55558e10def1d8b0af9713cacd5e8018d41625403bc8cbc658c18db7727
-EBUILD tomcat-native-1.2.17.ebuild 1155 BLAKE2B 1a170dd795495595c0938b27017c5e017822f4ff515dc3ee60d645494c4999a378cc760ac0a49e0bc1b3e25183a0659b533f7158aae8d05e9eb1106b5e04a295 SHA512 2cce0be375c489a52c61fd629e6c2c499a27538df65f472e14fb4e6272aedd29fb6240831e3ad91990c41375b685d81255a61da350893e3ddd7c003e11f37358
-EBUILD tomcat-native-1.2.18.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
-EBUILD tomcat-native-1.2.19.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
+EBUILD tomcat-native-1.2.19.ebuild 1151 BLAKE2B 8420a566f91395dbcfb2eda52e1d2690d28d9eeb3da1591f331b479589b01a6303e5280f4ff5eee914c5207b3aa433be5779209b5550cb4b68401206a0d89a5c SHA512 384a632497f10dae1e481f0aeead04997f4742b32f00f53514d2851d0218e0b4cca519bb2340bc258935e5afb94f206bb5b790737f877f2708fc8b62e3e479b8
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
deleted file mode 100644
index bebd76103701..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="https://tomcat.apache.org/"
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-
-	! use static-libs && prune_libtool_files --modules
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see https://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
deleted file mode 100644
index b9e42b33f4c0..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.17.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
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild
deleted file mode 100644
index bb3b879154d2..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/openssl:0=
-	>=virtual/jre-1.8"
-
-DEPEND=">=virtual/jdk-1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-
-	cd native || die
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	eant jar
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native || die
-	default
-
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
index bb3b879154d2..fb46a0bf4e2e 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 0bc79f5ac4be..a030a9820893 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,17 +8,16 @@ DIST apache-tomcat-4.1.36-src.tar.gz 3715200 BLAKE2B 0af7c15e821c7b437c4a12c07aa
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 BLAKE2B 289c586c9664efb63f921bffab80a180639ff4c14cc1f676cb7aff27c9416a20e142bc56862c0a06b26d30bc5a7415b07c0b7c3263286af860b27ee940f745b4 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 BLAKE2B 9ec9171f7fb5aa43a3d7df0d3e06932b214d9740c56e95468f45d2f4ea0e157f9bd33dcc715ace9f950761b1fbfd7a5cbf9fec47f98feb1088641a24de4a8f4a SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 BLAKE2B 7baf1fc24a7c9aba7e2ddac63fe0c0975178616bfad8cd625d2910d18ad9b00cd85c98ba4a1ada251119629b96ff464ac623857f6928e3b9465708cdf5bc7513 SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
-DIST apache-tomcat-6.0.45-src.tar.gz 3494054 BLAKE2B 5dc7ac1c941b3b307ff6ccc53b59ddcd141c5ece00424a89025272d170e00ed14462f9805be0e26750f60ff1eb223e2829e7d215502f526e800bf2ffffaee30a SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.82-src.tar.gz 4697342 BLAKE2B 1106ed04dc83e64e395de29f01a7752a0578b0c88046eb59614a7cfc0d8a98e3aebb698c8eb56763eea41620d9b42482971c5093304184b1028c6bd8f9770ada SHA512 fc92388d81316de0246df4074c417ffa341eab55308c0694e9ea71c5497c863b42019cd1f38628ff640114c501a06c4e9c428cb2b6f1bc1c16fb337a286718db
-DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
-DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d
 DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a
-DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
+DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
+DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384e36478c69e7592dd35119d8b7b974273c57a4855082f309146ed160144dbdcced3236fd586b047970bd8558bbe7b7e002e9fd SHA512 0b56bc723277b2888896ab34ec3e49cb56bac94ddf1a9b96bd023982e2ffabd5317f63b3c0971afdc8cd7a6364197409df461d22151dbaab3a2be7daf6858b9e
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
-DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
 DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
+DIST apache-tomcat-8.5.37-src.tar.gz 5233414 BLAKE2B 1848180c3e0a3f4559e5c232bea8bad6d05f09d9c4f2f9f903178012b7b8837d395a5ac73c8ac0504fbd3d1df3c2dc785022e1c97da4441cfdcf8b790170ff7c SHA512 29ddbf7bfef19441a8a043020b5f1149d12590dac8120012a2167b6892e3db7c644990e49ba14cc4b4c7339faed65f010a7b24d660db0fb8adde34f032099cec
+DIST apache-tomcat-9.0.14-src.tar.gz 5472704 BLAKE2B ee533afd733dacbe4a20baadb4c5dc9fa7620d695c1c57b1662894945731f978508b45ef0d8169068c13ba862804868f12d3e494873643589b9f57bc9ec0a342 SHA512 46119f6ae9003b7a178dd5158c1eae3b5116461e73c5d78cd763bff82b80f282ff08cee5175cf850d3f209af900677e93bab31c556035a6eaf6aae86a5d42fc6
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST apache-tomcat-9.0.8-src.tar.gz 5115250 BLAKE2B 8eaf0aa963711f90278d6d20986f4ba583c64e9e2b1f0b82ccc676a854a2078fe29c3b691d49af529074c9eea02ba78802cc9a4bb5cd7a3e561f6dfcb342c50b SHA512 22a3c9a2c9f2fa87b218ec5deb50248af201e83111bbeb7fcfbb7dde5aba3e2d61b53bc40500b3e364a9fb94b576ad8a4683979534274af0f3bcdfb86aa045e7
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
@@ -27,17 +26,16 @@ EBUILD tomcat-servlet-api-4.1.36.ebuild 982 BLAKE2B f7c7e92165fcd0181b65bd9fd905
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1406 BLAKE2B 804845f9eb553b2f24edfa30e8fcc4047c379bd185730f0681ddd23605c513f9adf921d7eb724729b2894a888ab030de47b7f6c1764ef9d8425eaa4cb2cb65a8 SHA512 5419209691c73817366f0ffdc7f9b3c1f75562e318d7b45c77f433ddfc3aeeb6b5fcb61ca23e05947772207b35221e6eac9a9a7b3e2f461bc71f52ed024c0b6a
 EBUILD tomcat-servlet-api-5.5.34.ebuild 1419 BLAKE2B 8c55639dd2ef3367f74b6371561922851d0514cdcc8a7a87f48d7f86e4bb97dbbe5097633e8d3dad317387cab4383edbf63b326d543f2e99927bc7aaa4b73ffe SHA512 a8725711c6e98068fd30e1642125bc092dc9eeb9cd706611c0526e47fa110d5ff7059e25476435c66abcfeee73ec220855c4dd7cb6eb0a204a4024af43bbf410
 EBUILD tomcat-servlet-api-6.0.44-r1.ebuild 941 BLAKE2B c253c51b56d719fc6abe9cc714ef2ffbc2e4dcd8fa1ebe61b77968cb15f8d8e224300c491e445350396b67713a0474598f6c8d761361b3d49c05411f29df900f SHA512 b0a47a4631bbfcc5986ed9f61565782aed2437e169210bcae2df459adcaf6fd9727133006701650735ace3d0203235f22b845dca2791abb79c0564c8ad03c764
-EBUILD tomcat-servlet-api-6.0.45.ebuild 944 BLAKE2B ec11ffa4834b9dc0966892c0d221640ec7ef75633806394b69b0bfa79d51728ba552809cf3c462d063198982de879a2acb32be2ecf5d5dd30d5db8eae60a0b78 SHA512 a9ec48dabbf5d7668c7e23b8e891faff8be25bd3f4beae55b0e8d95cff271ab81c03f13bdd2f127fe40aacb70f4db845452f8ffd66c82f4b11604d4cbfd46141
 EBUILD tomcat-servlet-api-6.0.53.ebuild 943 BLAKE2B c7b1a81fcb5f243e1888df39fc624a11385809ae602b4af2547b8a8a04ba4b1f4baf66703e9cd16ccf380b0dabe90c93b95c282c6605db03186d180a491c94c4 SHA512 d6bcfceea13c347ef6b467c3e2b18313465717d3c855c5011f3d5a0b130bc7a6f19c1f02eb647bdc328d16ceb8582ed7f3b68ca13c60bd29861a68700bb52e02
 EBUILD tomcat-servlet-api-7.0.82.ebuild 906 BLAKE2B 2169547e97371a8532c797f02e31ad1e17b04d2f03f7ab3041dac4ac1f23e699cdea60fb5779436d259cb3fdba6c59cd083d9cf4f874e8dad3f3194919c38c6c SHA512 ea84aa02351af9a21ffdad739619e1b8bc22b0978a03f464fedd7400257ed253040c2bd89be2749f00889f009988dd4083a5ceb81a89d3d6d5e8a5b6bfc07dbb
-EBUILD tomcat-servlet-api-7.0.85.ebuild 907 BLAKE2B 4d44c9e83f65cb6997d11bc0cc586980ee5adb884b0e41b4a4f7e9e1634507d1cdf2d077e5e53138003d04e893c6f240afd54db14d00d0f98385e4dfe0cc41e1 SHA512 36a32450116f61421399c8ccd31ab78d37f743ea5f1c8a58f6a045e0a50cb5d505ba0e448d0335c463a50f9e3132859c7cb6a8517ac88147dcce656bf3528377
-EBUILD tomcat-servlet-api-7.0.88.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
-EBUILD tomcat-servlet-api-7.0.90.ebuild 908 BLAKE2B cfcc0e873d630eeb6f43cff3cbc8d48587563baa299e4ef8550cdcd02cf6289ba96d4f70653c0328cee35898d8b560596d13f8fae24ccff9672a2b4ee3fa7694 SHA512 f670f2f7885177a3fe36088033f143673ed1b104877daad5f6c895da7e2964301e018e5ad80b5eeb5cfa2aa2e226a99fe034dc752edb133cfed758be9bbeb7f4
-EBUILD tomcat-servlet-api-8.0.50.ebuild 964 BLAKE2B 1b68372c27f23b04a1c042e7f689f32ce5b9a6b29d397cc94c41eab20194489ea551d66dc69e8e1689b17ff9a158d31387677893d22ba5dd759d5bc1dc78e780 SHA512 f7cb5af08726a44158c0ffa080737c2ddbd8f14f2c29768392af2a413fa0c98e87b5f96828c569fa34241e5dbde8857fa5790dfd69c347c592ce207ca633536e
-EBUILD tomcat-servlet-api-8.0.52.ebuild 965 BLAKE2B 8137fd074339a70166e04ecbdd631dbeb32ae21804918a65d79bd30b9790c54bfc9acffae5bfc6390b86d1b230959eba5043539bc367cafc0bb7f4eb6582b33c SHA512 f4e9c7c4be07457d48d8162a2e68c12a21289cc58b509cc2cc2570bd11a60d74ff83e98c31ed09a96a12e376eb22042a21ed08319a74c21fe6b3faa663bd4f05
+EBUILD tomcat-servlet-api-7.0.90.ebuild 904 BLAKE2B b380f8e0c06f18c2d2c4042fc9a746c2008a2a195f45d7d4a7c6636f4fc22a0b99590e94dfa41a47910ff13b3d45b04d18e055f933ef03ea1f722fba79a9b979 SHA512 eaab24b5d2ad2abde36fc52328a17893cd8f618bd3e8c9c06350f06549b7daa34667f2206e622ae2fbb1d9f06881e084b9b1b3482a434ed69e57b43e737d4670
+EBUILD tomcat-servlet-api-7.0.92.ebuild 905 BLAKE2B 30ef1491ebc2075c2ac674b51daa2ca189e07c96d15ab3ed001ae5fe65a06f9d65dc9ee89a6f2f183d6445ffb8ddf9be616327f5e5c64c493688edcfc4c39eaa SHA512 541679a0de3f1e192a738f956fea4fd1ca7f56476c5dad5c3f017be01f03a4506f2798a0985aa42cfb49dbf40db3015ea5da93d5ac362f2bacb824d442102bb2
+EBUILD tomcat-servlet-api-8.0.52.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02d644bba3d81b2a88d34f9288cbd08cc58a40220e5a2f791074d3aafa7dbdbe3a9a1327436e4427aa5017ab3a11667b98c390 SHA512 6eb575f867923c318e684ae4fb182753fbb15e078d1da4fc8583461c2c7360bf9a2b82e3fb8839046895ae8f9a1d5c7634348edfb6ba0c12b6599805a5e50427
+EBUILD tomcat-servlet-api-8.0.53.ebuild 962 BLAKE2B cf57e5305077b064008121ae8d423c2186351bd562527905b3f6f9d7600a2e266692de55542da2e72374882c6093d0bde64063308c25d9dc86dc1ca35c555690 SHA512 3981c9b56fd8be65ebf66224f358713256b4df888aece2074f196193058f93f249234bd24a57f643c17badc435a6157e6ebe908cf6903dd25f148871b75cf178
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
-EBUILD tomcat-servlet-api-8.5.30.ebuild 1012 BLAKE2B 9b0a3428cace85369df81f0396d28a6d1a616be8d47702bd8a86fdaea6f97add9ebfd005e9834b39c48ab27767a2284bc2dc9d4299c80bc6f3b249639c593d39 SHA512 5f9c4742f04f8d607e54a7abd01d4dcaacd461a0751785f5c153d8547b20a70fe6c5d243a9d4f8c8f84c7d4230c05d66f4c8041940d7e00741afa11a952619f7
-EBUILD tomcat-servlet-api-8.5.31.ebuild 1013 BLAKE2B 1500538e35d723b1f5f78eb587db6169a531ae47c8cd66a05c19fddae518b4119ac84922100e840de84ff8cb647f974b55b3374b599560b62cfb1f743dffe18c SHA512 0f8c8fea52bfd4f9ef321a258e6dde507fa99a3d5d3626be1bc4c6972d3a6e57bde977d3dbbf3e5de3e3b877fbbb2ede8857d94e5cadd420a5994e21558a16c3
+EBUILD tomcat-servlet-api-8.5.31.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
+EBUILD tomcat-servlet-api-8.5.37.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-9.0.14.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
-EBUILD tomcat-servlet-api-9.0.8.ebuild 1008 BLAKE2B 315c88c9c197728d0587b70a6601d9bcf96d2b8a638c6cea32a06bf0d3e12161a6bcd2484fd4552bdc0e042a2a7a604e304636bea99e5f2f6bbf2f20b2cda407 SHA512 fe215a2c4c26d54748eff5a1250b65d16c2913e0040eb7b31295de9b4be46a84b725a8c34307db9211e17c77abbd7e49725c1ecd99519964d0995eaa30711fe6
+EBUILD tomcat-servlet-api-9.0.8.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
deleted file mode 100644
index 2fec3f8c4603..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-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-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
-	rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
-	find -name '*.jar' -delete || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.ebuild
deleted file mode 100644
index aeaf64e366fa..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.85.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"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.ebuild
deleted file mode 100644
index f0304e00ca2a..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.88.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"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml ||die
-	java-pkg_clean
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild
index f0304e00ca2a..412dd425bf5f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild
new file mode 100644
index 000000000000..15794b7e3626
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.92.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
deleted file mode 100644
index 8a7cc91eceec..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.50.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 ~x86 ~amd64-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.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
index be4a03387b4a..4186988a08af 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~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.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.53.ebuild
new file mode 100644
index 000000000000..1075753abf3b
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.53.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
deleted file mode 100644
index 06c703b27fb1..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.30.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-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-8.5.31.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
index c543bdd19c25..640c06837c8c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~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.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.37.ebuild
new file mode 100644
index 000000000000..a6df79ab2dec
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.37.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-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.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.14.ebuild
new file mode 100644
index 000000000000..e35055493b79
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-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-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
index f00a9f12c2d2..d66f7a815533 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ 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-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 7e2ae7ee839f..495781a64eff 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 81fb29383a33..a2b341b0b7f5 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,7 +11,7 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324
 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
 DIST go1.10.7.src.tar.gz 18333472 BLAKE2B 8e1d85ced41541f1c7a02208da6ff518d7af76e078c47b2b269b31868fad8578b70494aad0ab35a33b1273d2f55523ee5e97e688991a62bf2289821c1c669c1f SHA512 798e0ea053b38f4b4f5a6fbdefb30ad09d95b7e8af424bd5f1aa7856bf7ca4e9c9bbd32926e2936f2b332f88a1980e92e6b61862fd9e779edf64f965fd8d1ffe
 DIST go1.11.4.src.tar.gz 21108067 BLAKE2B 3e9e433d9f85cadcf4c62bbc7a27d80944d4dbe4f4e43bdeddc407a7957a51b28082d5b90d4e27f06cc554792bb9eb7ccbf221003f012c91cd1f329af998ae4e SHA512 9aa2e1800807841ec0432289b672c1607bdcb295f29c02d38adfaf1e3bf043040c9f916e4cb170875d92fe168c5ba6baef2b3d1f824a56ff9138ca2cdcc646e0
-EBUILD go-1.10.7.ebuild 5650 BLAKE2B c3812d6c74ddb4bd89b32213974a879223ae61266de385e12647b5decb9e4de2aa39a52d8bc307ae057be6d81e666006fc6b9156dc53469ea435584f1caf8562 SHA512 de3bc87153de87cf2bb44a99fdf851ac81c57707ab6db021843c87c628e8940d8ac85cd263121554dd6d2ed1432fc3781f4ec20132aeed996473326c2a0e9ae0
-EBUILD go-1.11.4.ebuild 5994 BLAKE2B 8d65b61d9f1fec87e09b1615eb423e094649f99b5c96f4bdb0e64032b8b6b506277d33d2f45c2771864e89efa5f6bb244e75edd40a5582d0ecb866c2314d535e SHA512 5642f4147ad262d121f0f7c1b3cc30318241937b9e1ed8010e2103e1dfd17646a03736d97675aa71c1c507475c1aecb37b7f1985b92cda991af189be4643de85
+EBUILD go-1.10.7.ebuild 5663 BLAKE2B a154eee5fa9b7842a6e61c9fdae55f93445cb96309dacad390abe55321584d9eb66a55990263906939cec6f41f4c9209c277255a860ba489a7340a4c9b9d07d7 SHA512 56a839b6077d61ddc8ca64c6ba0629e7bccd9f74388ac8be52424f54d8177ce0c50f2c197b86fee5b6d6b902b6afe33bc3e625cb39dbea3357e19498fa2ca637
+EBUILD go-1.11.4.ebuild 6007 BLAKE2B f5ca906e6dab818933f0c22086543b4fef28a35da4291c19b358ac65e2d4418bb0aa52928da34701d3f1e5214bb1e86e02d1aa9bf8ede3e9380c61236a78aa3a SHA512 420d2bfafbeeb7512c55f2f9cbef88fd233b5ce9968b106fff9e8ba7963d345909aa07c0f7b8a81bbf5695ead63596f80bad2d93dd53a722431a2718b79bd07e
 EBUILD go-9999.ebuild 5991 BLAKE2B d5679b2d7fc97084a0b8b3c3cf07698f15a831a8a60ca98669a9eff704ec9545c318472936bc6dec83aa0c943a2db294e74f027de4a650d2514f31cba035b7e4 SHA512 3a5973f3094a4196ec3afbab69fd6453c488c84abd83d70490a5573246616b8d7605412d22946bf2f23a2c315ad988220472cef32ba2b116e79f945e86224e1a
 MISC metadata.xml 538 BLAKE2B 78502c369a490804b2c69eef864276c2be5d0ee84ec189b6cc8584f8f42668a35f3c74bd25ceb53c469716337cbab908c576ca880c492f5961fedafc74cc346f SHA512 514a441a522218fdca543a22370e965a2bfc1f1f2c37e77431143329bb3d3f4f53e99ad5d7f7d7c61877f77387a777f7b4f339b9a3e45322d01d39d3d0ea1309
diff --git a/dev-lang/go/go-1.10.7.ebuild b/dev-lang/go/go-1.10.7.ebuild
index 9ce0ac6ccf5a..44ca41c8b29e 100644
--- a/dev-lang/go/go-1.10.7.ebuild
+++ b/dev-lang/go/go-1.10.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
diff --git a/dev-lang/go/go-1.11.4.ebuild b/dev-lang/go/go-1.11.4.ebuild
index 3e74892a018f..414547edcf62 100644
--- a/dev-lang/go/go-1.11.4.ebuild
+++ b/dev-lang/go/go-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest
new file mode 100644
index 000000000000..028d19eb3c8d
--- /dev/null
+++ b/dev-lang/julia-bin/Manifest
@@ -0,0 +1,7 @@
+DIST julia-1.0.3-freebsd-x86_64.tar.gz 79521844 BLAKE2B b635bd6d5bca4800433956c5be6151d34165c9780a55fa491298cfb1da97ec99e6108a44b0fb5fe79f48cc4342344bc480a3afe44c0abea7367670978fd10794 SHA512 36037443b53f1412841d6a56fc8fcc6b979bcc35b2f2de29984bd386d89f64daaf7d18512f8ac04dbadc531bdbc1a8966c1701008878792a10608cccb9b59635
+DIST julia-1.0.3-linux-aarch64.tar.gz 72764975 BLAKE2B 148a434f0867bfb55be7417f85e539e6bb48c6a91d24951e983986091b3d418688202c7f2e6169c1f4b85328e3066d6418e8ec50093a590c26294a72f92a93d9 SHA512 a6a143c3709646ae30e9ca66a714b4226340f6de8cdd18e2b2d0f4ae612fec5136097f69b40554c4a39486a6c1222fba192a3bd304d195263e92152c20df0714
+DIST julia-1.0.3-linux-armv7l.tar.gz 78956998 BLAKE2B 53ccdf59a5d9e898dc9310411e1d127b2acf8da89e8d539409a3c0e9df0eb804dff83116a4627e7883752f462834ad7a88973b787cb0f9360eb652f4f86414d4 SHA512 1e0145c2ca58eac5f5a1b92e5f7a72b04b468acb073e92635a6d3e7921431da1aa5ad01ef07d5df2bbe7637870a7e9986faca4f1d9fc815cf880ec85b1be630b
+DIST julia-1.0.3-linux-i686.tar.gz 84731342 BLAKE2B 455c88880eb57c5fecb38393664b922478f2e289024004e184eca8adee1093a64e88f1d281bcdbbdde1f29827ccc81b394487a4aa9761dd4922e0c774db5ebac SHA512 166c563f41750cc21329791bf55ba52a12a10dcdd54aea6d8d67e763eba6237042cde03fdac404684b7952602212dac66262dba4703eba9921b86813b76110a3
+DIST julia-1.0.3-linux-x86_64.tar.gz 88732284 BLAKE2B 616f483804394ae17e1845835b2a49f862c9c9144f4deee38696b56e3d5d26ceee41503c6b1fc9c9fedfa5275bc36c2ddb67e31faee9312a10e04a7c563c9898 SHA512 925b16dadb9c6be1d074b929be74815d38451efcdcadf94748edfe572b8f91c0bec72c4c8440673bf3c75987bc14970e6f4cb9799f0386b0e30fe4628e2cdeb3
+EBUILD julia-bin-1.0.3.ebuild 1270 BLAKE2B 7f276ab4dfbc78529e9147061401143c3a326717538642e6862d080d3c81e11f4b1ac7e7ab5af6d5284b1faf922df24c8d2920a3823fe435a5420efc7f634f17 SHA512 c578f0a3609d42ad8c55496295506cd7151a7651ec8361f848d83618f8b109a47490b7ea226c803d8184abd8d42ae55fab80ff2dd3a06b515c11fc2043391461
+MISC metadata.xml 1269 BLAKE2B c7ca56d7660c41df452725bae9526d587d79754a3e7b0cb0584bacc588b63523e4fbae113b26f48290d874bc49fac1eb2ecfc97946e516212cc511346f876e26 SHA512 8e0325b241bc76162b843b64e2fdac98873cba21e8e39d2ddd439647466d94e163fe315eeeae78435398db17635d3447ec9c713bf53d894487ac6acb67c5afdf
diff --git a/dev-lang/julia-bin/julia-bin-1.0.3.ebuild b/dev-lang/julia-bin/julia-bin-1.0.3.ebuild
new file mode 100644
index 000000000000..efee49f0bbee
--- /dev/null
+++ b/dev-lang/julia-bin/julia-bin-1.0.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN/-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.0/${MY_P}-linux-i686.tar.gz )
+	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.0/${MY_P}-linux-x86_64.tar.gz )
+	arm? ( https://julialang-s3.julialang.org/bin/linux/armv7l/1.0/${MY_P}-linux-armv7l.tar.gz )
+	arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/1.0/${MY_P}-linux-aarch64.tar.gz )
+	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.0/${MY_P}-freebsd-x86_64.tar.gz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+IUSE="elibc_glibc elibc_FreeBSD"
+
+RDEPEND="!dev-lang/julia"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto "/usr/$(get_libdir)/${MY_P}/"
+	doins -r ./etc
+	doins -r ./include
+	doins -r ./lib
+	doins -r ./share
+	dosym "../$(get_libdir)/${MY_P}/bin/julia" "${EPREFIX}/usr/bin/julia"
+
+	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
+	doexe bin/julia
+
+	cat > 99julia-bin <<-EOF
+		LDPATH=${EROOT%/}/opt/${MY_P}
+	EOF
+	doenvd 99julia-bin
+}
diff --git a/dev-lang/julia-bin/metadata.xml b/dev-lang/julia-bin/metadata.xml
new file mode 100644
index 000000000000..33f454aec98f
--- /dev/null
+++ b/dev-lang/julia-bin/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Julia is a high-level, high-performance dynamic programming language for
+		technical computing, with syntax that is familiar to users of other
+		technical computing environments. It provides a sophisticated
+		compiler, distributed parallel execution, numerical accuracy, and an
+		extensive mathematical function library. The library, mostly written
+		in Julia itself, also integrates mature, best-of-breed C and Fortran
+		libraries for linear algebra, random number generation, FFTs, and
+		string processing. Julia programs are organized around defining
+		functions, and overloading them for different combinations of
+		argument types (which can also be user-defined).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">JuliaLang/julia</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 4b0d4a140b55..bca20905a242 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,17 +1,15 @@
-AUX julia-0.6.3-fix_build_system.patch 3543 BLAKE2B cbeefd07f805f5052e4ed505d442c4ca2ef02becd87211706298c3340dda6c2672f91246c5bc8d339a0d931b7a1c8121568a0bbbd382c75c7c463b0226363ae3 SHA512 0a7881db50df8dccd6296327a8029a7335d131e7c3e4233bf284ab50875bb12856ae8b08e381d322c48a5180343199a6c9e4a454118390136723bc254eb2dd1a
-AUX julia-0.7.0-fix_build_system.patch 3200 BLAKE2B 9886e2012c68028132a4e1573fb9dd0c5b77bba82bdcf5afdec7cb0af5cc5fc2f6bde9ded690d54f745877d9a0164b5751853395d398fbe12d97c677a5a4a191 SHA512 cc13f9e4d146e62c6f607e85bd6185daafbb7cbaedb806269d4827b53796ca004f477f665dee45686ca999689612a1931a8e2bed516ce3a76256596b9e823cf0
-AUX julia-1.0.0-fix_build_system.patch 3200 BLAKE2B 9886e2012c68028132a4e1573fb9dd0c5b77bba82bdcf5afdec7cb0af5cc5fc2f6bde9ded690d54f745877d9a0164b5751853395d398fbe12d97c677a5a4a191 SHA512 cc13f9e4d146e62c6f607e85bd6185daafbb7cbaedb806269d4827b53796ca004f477f665dee45686ca999689612a1931a8e2bed516ce3a76256596b9e823cf0
-AUX julia-9999-fix_build_system.patch 2920 BLAKE2B b9021a4092cb95c86b10ad7ff6e1623528070f81ef86c0b6524b88e93dd625df49aaaad43ede09bbac02e824b6bf589106289ea8cb9f702ef0617710ba8a94a9 SHA512 90b134e0eb2897300d7601f19a6010b9515162a12ab020002d99ae276d0bdd197efd512fd1468770dbc7204161bc90acfb84e9db7ba23b18d81bece98935e64f
-DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d
-DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
-DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
-DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18
+AUX julia-1.0.3-fix_build_system.patch 3227 BLAKE2B 55c76b8f3af9755517e8e4a797ad259004c4fb714315eb0001ffcc008d304dbfe8a008b2701435b5073f92a96e879eb8cf8e3b1c20ca62cade3b42c83f5944fb SHA512 8b5c2448fd75d84e7670de7d50ff2c258d4aa750ef07a2c1eaa11f8874793024af163c3526bdbd65efa1045acda8f0ebbcffe94a6018051ac9de59bf4168ec8f
+AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297bc2cb5529b58943fcd13060f0b2b3f329571ebbd82208793651ac5120cd4ed19b6eca6c3d0c829509288460a9e0e78817b48 SHA512 70f5cf43261216e16001acc2c64e0bc1457e1fd48a918b218f8b0b21877a44c274f3aad81f68f7176665ec94c2d17f89a880e1c0a9332beae9d25668f9a85a25
+AUX julia-9999-fix_build_system.patch 3345 BLAKE2B 0a8eeaa3590beb0215c9f696a7dd1d6c614238dbf12f72cd2ccc81a36bfc3bdaae22afe45d95b1868bd211a67c3c483889dfa2feae86816054101c0a6865394f SHA512 edc7fdd6f6844a359368e2356dafabe951304a7b3f144d4a5181003de8f3f2eefc9b8882db6dcd65c049226a2505446d900eda3056e3c6bbe45fbaea3bd3a647
+DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
+DIST julia-1.1.0-rc1.tar.gz 7672785 BLAKE2B 3c49e189bec2da8d6d3f4c689600aa42e8092fe4343175981f8d998407bc6ef6c1bee20d579dc21594c2e9f9469898fc59d28807202b394cf64678b497037e0e SHA512 ceba088ef7abe103a34b1eb6f3b9660165bac038e62d4def22ba207c1c6fddb8a90625b3aa967c32dcad5c24dd83a8f25781347fc8b4078f40dcdffd07b554ce
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
+DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
 DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
+DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
-EBUILD julia-0.6.3-r1.ebuild 4632 BLAKE2B 7eaa908368c487b54150f3d7b4ea42b36d66a3219e6da91805184bb29ff70e9adfef32dea45bec6e23e04e6bae25dd2f4cf608a24776992e678578ed4d038c20 SHA512 aa749655bf23845e9124146cc6ca12245660e76addd23a38f46fb1ff8849b4f8e5e05b4f83ee5c4f5dfe005fb9e462aee39e7831a351afd96fb29a0795ebc486
-EBUILD julia-0.7.0.ebuild 5261 BLAKE2B abf094bbd73bcdfa0fe415a98498b65f32eafe13f5d5239d19f6324dd9213b811311f7162072af9d74740de50da9cf571575ab8cebfd6ebd3ac27fff3f95f566 SHA512 aac8187040ab4b525aa0803ec7e48e56d642365a4586a3aec6dd98b490279f21f31863f127eb17bed81be7ccb70e26f87c6411fc5dbb18885fff24ddc5869b4c
-EBUILD julia-1.0.1.ebuild 5258 BLAKE2B 3a69cdd1efd15a1520aa824f3d8a8d2e03400ca34cdf742d50b22c40dc1ac6668ba5fb5bd64f2b6a288b581816ada817b949aac3f6d0e853fe0551b7cc902de5 SHA512 8c473c864ed19a5df08f0921f20754a96d432f9187036d1cda3ee9967c0299ac25b0955438f5c54ae6c556c996b3979c3d2b6a219bae050fb633fe83cc651b81
+EBUILD julia-1.0.3.ebuild 5236 BLAKE2B 83945df39251e32a57b3681f60dbc5faad8f67f104a51ea06e8416a46e34816d496f48c1e874ba0f03fb79f9e424e551441a763b3f4d67ed55f1a8da5ccc1bf9 SHA512 61dc15a6f0f7bdfec0e1371b8193965170f3c261e69cb3ce71748e654ce2602200c9b5ba69fe0ec23cbe175b85f9d7784f95a02f59f570e88ff01d1ceaa1cdbc
+EBUILD julia-1.1.0_rc1.ebuild 5250 BLAKE2B 8471f259d84a4ec26fd7e2b92646be12204ed852241525f080b1e3f95dfd8875bc7aec1611f2b37c80e48bb2e09d2309c556d9422ea5d7aae61a4aee16a80d10 SHA512 28d410c469011982fc578f9b5c258a1407463b6b5f6e114fdeb3ee80ea3cb32541728e2d697cda8f6c35f51137a7ae65d10b10e44c5d449b057173c63986acf4
 EBUILD julia-9999.ebuild 4089 BLAKE2B b38fb0ae040da02961650abdaf40ec17632899cd63aeee83f0b1bb67a760d68ea80a251e29baf594b15b944017ae894db607a4179ef025fb18fb5fbaecae53c3 SHA512 dfb930b357f61479cb28d4d1c5f08fe264ac8ebcd4cd41a0da4c947209b6318cad25bf011e45ea1db3575dcf667f694119a8b40f7ad181914309cd0b93467729
 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
diff --git a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
deleted file mode 100644
index 41e64672adf8..000000000000
--- a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index 7f3a37c..3560d93 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -180,7 +180,7 @@ USE_GPL_LIBS ?= 1
- # Directories where said libraries get installed to
- prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
- bindir := $(prefix)/bin
--libdir := $(prefix)/lib
-+libdir := $(prefix)/GENTOOLIBDIR
- libexecdir := $(prefix)/libexec
- datarootdir := $(prefix)/share
- docdir := $(datarootdir)/doc/julia
-@@ -400,7 +400,7 @@ ifneq ($(OS), WINNT)
- JCXXFLAGS += -pedantic
- endif
- DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -ggdb2 -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECLANG),1)
-@@ -411,7 +411,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS := -fasynchronous-unwind-tables
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g
-+SHIPFLAGS := GENTOOCFLAGS
- ifeq ($(OS), Darwin)
- ifeq ($(USE_LIBCPP), 1)
- MACOSX_VERSION_MIN := 10.8
-@@ -440,7 +440,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS :=
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECCACHE), 1)
-diff --git a/deps/tools/jldownload b/deps/tools/jldownload
-index ab4fd69..e2c2408 100755
---- a/deps/tools/jldownload
-+++ b/deps/tools/jldownload
-@@ -5,9 +5,9 @@
- 
- CACHE_HOST=https://cache.julialang.org
- 
--WGET=$(which wget 2>/dev/null)
--CURL=$(which curl 2>/dev/null)
--FETCH=$(which fetch 2>/dev/null)
-+WGET=/bin/true
-+CURL=/bin/true
-+FETCH=/bin/true
- 
- TIMEOUT=15 # seconds
- WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
-diff --git a/doc/Makefile b/doc/Makefile
-index 743804d..e06dde0 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -25,7 +25,7 @@ deps: UnicodeData.txt
- 	$(JLCHECKSUM) UnicodeData.txt
- 
- clean:
--	-rm -rf _build/* deps/* docbuild.log UnicodeData.txt
-+	@echo "Do not clean doc/_build/html. Just use it..."
- 
- cleanall: clean
- 
-diff --git a/src/Makefile b/src/Makefile
-index 9fde74d..e01ab2e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
- 
- # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
- # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
--ifneq ($(USE_LLVM_SHLIB),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
--else
--ifeq ($(LLVM_USE_CMAKE),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--else
--ifeq ($(OS),WINNT)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
--else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
--endif # OS == WINNT
--endif # LLVM_USE_CMAKE == 1
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- FLAGS += -DLLVM_SHLIB
--endif # USE_LLVM_SHLIB == 1
- 
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
diff --git a/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
deleted file mode 100644
index 028a2f7e08cc..000000000000
--- a/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index 8cb2c1014..d3be9de8e 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
- # Directories where said libraries get installed to
- prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
- bindir := $(prefix)/bin
--libdir := $(prefix)/lib
-+libdir := $(prefix)/GENTOOLIBDIR
- libexecdir := $(prefix)/libexec
- datarootdir := $(prefix)/share
- docdir := $(datarootdir)/doc/julia
-@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
- JCXXFLAGS += -pedantic
- endif
- DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -ggdb2 -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECLANG),1)
-@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS := -fasynchronous-unwind-tables
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g
-+SHIPFLAGS := GENTOOCFLAGS
- ifeq ($(OS), Darwin)
- ifeq ($(USE_LIBCPP), 1)
- MACOSX_VERSION_MIN := 10.8
-@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS :=
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECCACHE), 1)
-diff --git a/doc/Makefile b/doc/Makefile
-index 89b79880d..c3125fde1 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -29,7 +29,7 @@ deps: UnicodeData.txt
- 	$(JLCHECKSUM) UnicodeData.txt
- 
- clean:
--	-rm -rf _build/* deps/* docbuild.log UnicodeData.txt
-+	@echo "Do not clean doc/_build/html. Just use it..."
- 
- cleanall: clean
- 
-diff --git a/src/Makefile b/src/Makefile
-index 257152d24..240a4a350 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
- endif
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
- 
--ifeq ($(JULIACODEGEN),LLVM)
--# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
--# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
--ifneq ($(USE_LLVM_SHLIB),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
--else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--FLAGS += -DLLVM_SHLIB
--endif # USE_LLVM_SHLIB == 1
--endif
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- 
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
-
---- a/base/Makefile	2018-08-10 23:56:13.825429621 -0400
-+++ b/base/Makefile	2018-08-10 23:43:29.461769645 -0400
-@@ -207,7 +207,6 @@
- 	ln -sf "$$REALPATH" "$@"
- ifneq ($(USE_SYSTEM_LLVM),0)
- ifneq ($(USE_LLVM_SHLIB),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
- endif
- endif
- 
diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
deleted file mode 100644
index 028a2f7e08cc..000000000000
--- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index 8cb2c1014..d3be9de8e 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
- # Directories where said libraries get installed to
- prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
- bindir := $(prefix)/bin
--libdir := $(prefix)/lib
-+libdir := $(prefix)/GENTOOLIBDIR
- libexecdir := $(prefix)/libexec
- datarootdir := $(prefix)/share
- docdir := $(datarootdir)/doc/julia
-@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
- JCXXFLAGS += -pedantic
- endif
- DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -ggdb2 -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECLANG),1)
-@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS := -fasynchronous-unwind-tables
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g
-+SHIPFLAGS := GENTOOCFLAGS
- ifeq ($(OS), Darwin)
- ifeq ($(USE_LIBCPP), 1)
- MACOSX_VERSION_MIN := 10.8
-@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
- JCPPFLAGS :=
- JCXXFLAGS := -pipe $(fPIC) -fno-rtti
- DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
--SHIPFLAGS := -O3 -g -falign-functions
-+SHIPFLAGS := GENTOOCFLAGS
- endif
- 
- ifeq ($(USECCACHE), 1)
-diff --git a/doc/Makefile b/doc/Makefile
-index 89b79880d..c3125fde1 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -29,7 +29,7 @@ deps: UnicodeData.txt
- 	$(JLCHECKSUM) UnicodeData.txt
- 
- clean:
--	-rm -rf _build/* deps/* docbuild.log UnicodeData.txt
-+	@echo "Do not clean doc/_build/html. Just use it..."
- 
- cleanall: clean
- 
-diff --git a/src/Makefile b/src/Makefile
-index 257152d24..240a4a350 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
- endif
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
- 
--ifeq ($(JULIACODEGEN),LLVM)
--# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
--# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
--ifneq ($(USE_LLVM_SHLIB),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
--else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--FLAGS += -DLLVM_SHLIB
--endif # USE_LLVM_SHLIB == 1
--endif
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- 
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
-
---- a/base/Makefile	2018-08-10 23:56:13.825429621 -0400
-+++ b/base/Makefile	2018-08-10 23:43:29.461769645 -0400
-@@ -207,7 +207,6 @@
- 	ln -sf "$$REALPATH" "$@"
- ifneq ($(USE_SYSTEM_LLVM),0)
- ifneq ($(USE_LLVM_SHLIB),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
- endif
- endif
- 
diff --git a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
new file mode 100644
index 000000000000..98f4fc5c754a
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
@@ -0,0 +1,87 @@
+diff --git a/Make.inc b/Make.inc
+index e5c102f..c4c6640 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
+ # Directories where said libraries get installed to
+ prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
+ bindir := $(prefix)/bin
+-libdir := $(prefix)/lib
++libdir := $(prefix)/GENTOOLIBDIR
+ libexecdir := $(prefix)/libexec
+ datarootdir := $(prefix)/share
+ docdir := $(datarootdir)/doc/julia
+@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
+ JCXXFLAGS += -pedantic
+ endif
+ DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -ggdb2 -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECLANG),1)
+@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS := -fasynchronous-unwind-tables
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g
++SHIPFLAGS := GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ MACOSX_VERSION_MIN := 10.8
+@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS :=
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECCACHE), 1)
+diff --git a/base/Makefile b/base/Makefile
+index 21c7ad4..737e40d 100644
+--- a/base/Makefile
++++ b/base/Makefile
+@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib:
+ 	ln -sf "$$REALPATH" "$@"
+ ifneq ($(USE_SYSTEM_LLVM),0)
+ ifneq ($(USE_LLVM_SHLIB),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
+ endif
+ endif
+ 
+diff --git a/doc/Makefile b/doc/Makefile
+index 3d07733..8bd3bc0 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -29,7 +29,7 @@ deps: UnicodeData.txt
+ 	$(JLCHECKSUM) UnicodeData.txt
+ 
+ clean:
+-	-rm -rf _build/* deps/* docbuild.log UnicodeData.txt
++	@echo "Do not clean doc/_build/html. Just use it..."
+ 
+ cleanall: clean
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 20da34d..84eae21 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
+ endif
+ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
+ 
+-ifeq ($(JULIACODEGEN),LLVM)
+-# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
+-# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
+-ifneq ($(USE_LLVM_SHLIB),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+-endif
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ 
+ COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
+ DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
diff --git a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch
new file mode 100644
index 000000000000..394f5900a90e
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch
@@ -0,0 +1,53 @@
+diff --git a/Make.inc b/Make.inc
+index 81ff923..79e47f1 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1
+ # Directories where said libraries get installed to
+ prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
+ bindir := $(prefix)/bin
+-libdir := $(prefix)/lib
++libdir := $(prefix)/GENTOOLIBDIR
+ libexecdir := $(prefix)/libexec
+ datarootdir := $(prefix)/share
+ docdir := $(datarootdir)/doc/julia
+@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT)
+ JCXXFLAGS += -pedantic
+ endif
+ DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -ggdb2 -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECLANG),1)
+@@ -428,7 +428,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS := -fasynchronous-unwind-tables
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g
++SHIPFLAGS := GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ MACOSX_VERSION_MIN := 10.8
+@@ -457,7 +457,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS :=
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+ 
+ ifeq ($(USECCACHE), 1)
+diff --git a/doc/Makefile b/doc/Makefile
+index 99e60ee..2027fb5 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -30,7 +30,7 @@ deps: UnicodeData.txt
+ 	$(JLCHECKSUM) UnicodeData.txt
+ 
+ clean:
+-	-rm -rf _build/* deps/* docbuild.log UnicodeData.txt
++	@echo "Do not clean doc/_build/html. Just use it..."
+ 
+ cleanall: clean
+ 
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
index 336d6e3e590c..13cc8cb19da1 100644
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -1,8 +1,8 @@
 diff --git a/Make.inc b/Make.inc
-index 8cb2c1014..d3be9de8e 100644
+index e9cb241198..66f3e6afd7 100644
 --- a/Make.inc
 +++ b/Make.inc
-@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
+@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1
  # Directories where said libraries get installed to
  prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
  bindir := $(prefix)/bin
@@ -11,7 +11,7 @@ index 8cb2c1014..d3be9de8e 100644
  libexecdir := $(prefix)/libexec
  datarootdir := $(prefix)/share
  docdir := $(datarootdir)/doc/julia
-@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
+@@ -416,7 +416,7 @@ ifneq ($(OS), WINNT)
  JCXXFLAGS += -pedantic
  endif
  DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
@@ -20,7 +20,7 @@ index 8cb2c1014..d3be9de8e 100644
  endif
  
  ifeq ($(USECLANG),1)
-@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -427,7 +427,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
  JCPPFLAGS := -fasynchronous-unwind-tables
  JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
  DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
@@ -29,7 +29,7 @@ index 8cb2c1014..d3be9de8e 100644
  ifeq ($(OS), Darwin)
  ifeq ($(USE_LIBCPP), 1)
  MACOSX_VERSION_MIN := 10.8
-@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -456,7 +456,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
  JCPPFLAGS :=
  JCXXFLAGS := -pipe $(fPIC) -fno-rtti
  DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
@@ -38,11 +38,23 @@ index 8cb2c1014..d3be9de8e 100644
  endif
  
  ifeq ($(USECCACHE), 1)
+diff --git a/base/Makefile b/base/Makefile
+index acdd4bb9f8..4483149b2b 100644
+--- a/base/Makefile
++++ b/base/Makefile
+@@ -216,7 +216,6 @@ $(build_private_libdir)/libLLVM.dylib:
+ 	ln -sf "$$REALPATH" "$@"
+ ifneq ($(USE_SYSTEM_LLVM),0)
+ ifneq ($(USE_LLVM_SHLIB),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
+ endif
+ endif
+ 
 diff --git a/doc/Makefile b/doc/Makefile
-index 89b79880d..c3125fde1 100644
+index 99e60ee665..2027fb5952 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -29,7 +29,7 @@ deps: UnicodeData.txt
+@@ -30,7 +30,7 @@ deps: UnicodeData.txt
  	$(JLCHECKSUM) UnicodeData.txt
  
  clean:
@@ -52,24 +64,41 @@ index 89b79880d..c3125fde1 100644
  cleanall: clean
  
 diff --git a/src/Makefile b/src/Makefile
-index 257152d24..240a4a350 100644
+index e4da8c6357..85a411d9b7 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
+@@ -50,33 +50,7 @@ ifeq ($(USEMSVC), 1)
+ SRCS += getopt
  endif
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
  
+-LLVMLINK :=
+-
 -ifeq ($(JULIACODEGEN),LLVM)
--# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
--# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
--ifneq ($(USE_LLVM_SHLIB),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
+-SRCS += codegen jitlayers disasm debuginfo llvm-simdloop llvm-ptls llvm-muladd \
+-	llvm-late-gc-lowering llvm-lower-handlers llvm-gc-invariant-verifier \
+-	llvm-propagate-addrspaces llvm-multiversioning llvm-alloc-opt cgmemmgr \
+-	llvm-api
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --includedir)
+-LLVM_LIBS := all
+-ifeq ($(USE_POLLY),1)
+-LLVMLINK += -lPolly -lPollyISL
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/include
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --obj-root)/tools/polly/include
+-FLAGS += -DUSE_POLLY
+-ifeq ($(USE_POLLY_OPENMP),1)
+-FLAGS += -fopenmp
+-endif
+-ifeq ($(USE_POLLY_ACC),1)
+-LLVMLINK += -lPollyPPCG -lGPURuntime
+-FLAGS += -DUSE_POLLY_ACC
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/tools # Required to find GPURuntime/GPUJIT.h
+-endif
+-endif
 -else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--FLAGS += -DLLVM_SHLIB
--endif # USE_LLVM_SHLIB == 1
+-SRCS += anticodegen
+-LLVM_LIBS := support
 -endif
 +LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
  
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
+ # headers are used for dependency tracking, while public headers will be part of the dist
+ UV_HEADERS :=
diff --git a/dev-lang/julia/julia-0.6.3-r1.ebuild b/dev-lang/julia/julia-0.6.3-r1.ebuild
deleted file mode 100644
index a473e066f884..000000000000
--- a/dev-lang/julia/julia-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-inherit llvm pax-utils toolchain-funcs
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
-"
-
-S="${WORKDIR}/julia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# julia 0.6* is compatible with llvm-4
-RDEPEND="
-	sys-devel/llvm:4=
-	sys-devel/clang:4="
-LLVM_MAX_SLOT=4
-
-RDEPEND+="
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	>=dev-libs/libpcre2-10.23:0=[jit]
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	dev-vcs/git
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.3-fix_build_system.patch
-)
-
-src_prepare() {
-	mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die
-	mkdir deps/srccache || die
-	mv "${WORKDIR}"/bundled/* deps/srccache || die
-	rmdir "${WORKDIR}"/bundled || die
-
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting  git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of dsfmt, libuv,
-	# and utf8proc
-
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		USE_SYSTEM_DSFMT=0
-		USE_SYSTEM_LIBUV=0
-		USE_SYSTEM_PCRE=1
-		USE_SYSTEM_RMATH=0
-		USE_SYSTEM_UTF8PROC=0
-		USE_LLVM_SHLIB=1
-		USE_SYSTEM_ARPACK=1
-		USE_SYSTEM_BLAS=1
-		USE_SYSTEM_FFTW=1
-		USE_SYSTEM_GMP=1
-		USE_SYSTEM_GRISU=1
-		USE_SYSTEM_LAPACK=1
-		USE_SYSTEM_LIBGIT2=1
-		USE_SYSTEM_LIBM=0
-		USE_SYSTEM_LIBUNWIND=1
-		USE_SYSTEM_LLVM=1
-		USE_SYSTEM_MPFR=1
-		USE_SYSTEM_OPENLIBM=1
-		USE_SYSTEM_OPENSPECFUN=1
-		USE_SYSTEM_PATCHELF=1
-		USE_SYSTEM_READLINE=1
-		USE_SYSTEM_SUITESPARSE=1
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-		libdir="${EROOT}/usr/$(get_libdir)"
-	EOF
-
-}
-
-src_compile() {
-
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	emake cleanall
-	emake VERBOSE=1 julia-release \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	# Julia is special. It tries to find a valid git repository (that would
-	# normally be cloned during compilation/installation). Just make it
-	# happy...
-	git init && \
-		git config --local user.email "whatyoudoing@example.com" && \
-		git config --local user.name "Whyyyyyy" && \
-		git commit -a --allow-empty -m "initial" || die "git failed"
-
-	emake install \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/{examples,html} \
-		"${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-}
diff --git a/dev-lang/julia/julia-0.7.0.ebuild b/dev-lang/julia/julia-0.7.0.ebuild
deleted file mode 100644
index f7b451ce750c..000000000000
--- a/dev-lang/julia/julia-0.7.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-inherit llvm pax-utils toolchain-funcs
-
-MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
-MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_DSFMT_V="2.2.3"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
-	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
-	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
-"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# julia 0.7* needs a patched llvm-6
-RDEPEND="
-	=sys-devel/llvm-6*:=
-	=sys-devel/clang-6*:="
-LLVM_MAX_SLOT=6
-
-RDEPEND+="
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	>=dev-libs/libpcre2-10.23:0=[jit]
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	dev-vcs/git
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
-)
-
-src_unpack() {
-	tounpack=(${A})
-	# the main source tree, followed by deps
-	unpack "${A/%\ */}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting  git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of dsfmt, libuv,
-	# and utf8proc
-
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		USE_SYSTEM_ARPACK:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_DSFMT:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_GRISU:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_LLVM:=1
-		USE_LLVM_SHLIB:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_OPENSPECFUN:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_PCRE:=1
-		USE_SYSTEM_READLINE:=1
-		USE_SYSTEM_RMATH:=0
-		USE_SYSTEM_SUITESPARSE:=1
-		USE_SYSTEM_UTF8PROC:=0
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-		libdir="${EROOT}/usr/$(get_libdir)"
-	EOF
-
-}
-
-src_compile() {
-
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	emake cleanall
-	emake julia-release \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	# Julia is special. It tries to find a valid git repository (that would
-	# normally be cloned during compilation/installation). Just make it
-	# happy...
-	git init && \
-		git config --local user.email "whatyoudoing@example.com" && \
-		git config --local user.name "Whyyyyyy" && \
-		git commit -a --allow-empty -m "initial" || die "git failed"
-
-	emake install \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-}
diff --git a/dev-lang/julia/julia-1.0.1.ebuild b/dev-lang/julia/julia-1.0.1.ebuild
deleted file mode 100644
index 6f417285d135..000000000000
--- a/dev-lang/julia/julia-1.0.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-inherit llvm pax-utils toolchain-funcs
-
-MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
-MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_DSFMT_V="2.2.3"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
-	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
-	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
-	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
-	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
-"
-
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# julia 0.7* needs a patched llvm-6
-RDEPEND="
-	=sys-devel/llvm-6*:=
-	=sys-devel/clang-6*:="
-LLVM_MAX_SLOT=6
-
-RDEPEND+="
-	dev-libs/double-conversion:0=
-	dev-libs/gmp:0=
-	dev-libs/libgit2:0=
-	>=dev-libs/libpcre2-10.23:0=[jit]
-	dev-libs/mpfr:0=
-	dev-libs/openspecfun
-	sci-libs/amd:0=
-	sci-libs/arpack:0=
-	sci-libs/camd:0=
-	sci-libs/ccolamd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/fftw:3.0=[threads]
-	sci-libs/openlibm:0=
-	sci-libs/spqr:0=
-	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
-	>=sys-libs/libunwind-1.1:7=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	>=virtual/blas-3.6
-	virtual/lapack"
-
-DEPEND="${RDEPEND}
-	dev-vcs/git
-	dev-util/patchelf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
-)
-
-src_unpack() {
-	tounpack=(${A})
-	# the main source tree, followed by deps
-	unpack "${A/%\ */}"
-
-	mkdir -p "${S}/deps/srccache/"
-	for i in "${tounpack[@]:1}"; do
-		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Sledgehammer:
-	# - prevent fetching of bundled stuff in compile and install phase
-	# - respect CFLAGS
-	# - respect EPREFIX and Gentoo specific paths
-	# - fix BLAS and LAPACK link interface
-
-	sed -i \
-		-e 's|git submodule|${EPREFIX}/bin/true|g' \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
-		deps/Makefile || die
-
-	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
-	libblas="${libblas%% *}"
-	libblas="lib${libblas#-l}"
-	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
-	liblapack="${liblapack%% *}"
-	liblapack="lib${liblapack#-l}"
-
-	sed -i \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
-		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
-		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
-		-e "s|= libblas|= ${libblas}|" \
-		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
-		-e "s|= liblapack|= ${liblapack}|" \
-		Make.inc || die
-
-	sed -i \
-		-e "s|,lib)|,$(get_libdir))|g" \
-		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
-		Makefile || die
-
-	sed -i \
-		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
-		src/Makefile || die
-
-	# disable doc install starting  git fetching
-	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
-}
-
-src_configure() {
-	# julia does not play well with the system versions of dsfmt, libuv,
-	# and utf8proc
-
-	# USE_SYSTEM_LIBM=0 implies using external openlibm
-	cat <<-EOF > Make.user
-		USE_SYSTEM_ARPACK:=1
-		USE_SYSTEM_BLAS:=1
-		USE_SYSTEM_DSFMT:=0
-		USE_SYSTEM_GMP:=1
-		USE_SYSTEM_GRISU:=1
-		USE_SYSTEM_LAPACK:=1
-		USE_SYSTEM_LIBGIT2:=1
-		USE_SYSTEM_LIBM:=0
-		USE_SYSTEM_LIBUNWIND:=1
-		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_LLVM:=1
-		USE_LLVM_SHLIB:=1
-		USE_SYSTEM_MPFR:=1
-		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_OPENSPECFUN:=1
-		USE_SYSTEM_PATCHELF:=1
-		USE_SYSTEM_PCRE:=1
-		USE_SYSTEM_READLINE:=1
-		USE_SYSTEM_RMATH:=0
-		USE_SYSTEM_SUITESPARSE:=1
-		USE_SYSTEM_UTF8PROC:=0
-		USE_SYSTEM_ZLIB=1
-		VERBOSE=1
-		libdir="${EROOT}/usr/$(get_libdir)"
-	EOF
-
-}
-
-src_compile() {
-
-	# Julia accesses /proc/self/mem on Linux
-	addpredict /proc/self/mem
-
-	emake cleanall
-	emake julia-release \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
-	emake
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	# Julia is special. It tries to find a valid git repository (that would
-	# normally be cloned during compilation/installation). Just make it
-	# happy...
-	git init && \
-		git config --local user.email "whatyoudoing@example.com" && \
-		git config --local user.name "Whyyyyyy" && \
-		git commit -a --allow-empty -m "initial" || die "git failed"
-
-	emake install \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-	cat > 99julia <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
-	EOF
-	doenvd 99julia
-
-	dodoc README.md
-
-	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
-	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
-	rmdir "${ED}"/usr/share/doc/julia || die
-}
diff --git a/dev-lang/julia/julia-1.0.3.ebuild b/dev-lang/julia/julia-1.0.3.ebuild
new file mode 100644
index 000000000000..1194c9009642
--- /dev/null
+++ b/dev-lang/julia/julia-1.0.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit llvm pax-utils toolchain-funcs
+
+MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
+	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# julia 0.7* needs a patched llvm-6
+RDEPEND="
+	=sys-devel/llvm-6*:=
+	=sys-devel/clang-6*:="
+LLVM_MAX_SLOT=6
+
+RDEPEND+="
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0=
+	>=dev-libs/libpcre2-10.23:0=[jit]
+	dev-libs/mpfr:0=
+	dev-libs/openspecfun
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sys-libs/libunwind-1.1:7=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack"
+
+DEPEND="${RDEPEND}
+	dev-vcs/git
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.3-fix_build_system.patch
+)
+
+src_unpack() {
+	tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${A/%\ */}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+	# - fix BLAS and LAPACK link interface
+
+	sed -i \
+		-e 's|git submodule|${EPREFIX}/bin/true|g' \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		deps/Makefile || die
+
+	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+	libblas="${libblas%% *}"
+	libblas="lib${libblas#-l}"
+	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+	liblapack="${liblapack%% *}"
+	liblapack="lib${liblapack#-l}"
+
+	sed -i \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
+		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|= libblas|= ${libblas}|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|= liblapack|= ${liblapack}|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting  git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of dsfmt, libuv,
+	# and utf8proc
+
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		USE_SYSTEM_ARPACK:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_GRISU:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_LLVM:=1
+		USE_LLVM_SHLIB:=1
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_OPENSPECFUN:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_READLINE:=1
+		USE_SYSTEM_RMATH:=0
+		USE_SYSTEM_SUITESPARSE:=1
+		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+		libdir="${EROOT}/usr/$(get_libdir)"
+	EOF
+
+}
+
+src_compile() {
+
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake cleanall
+	emake julia-release \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+	emake
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	# Julia is special. It tries to find a valid git repository (that would
+	# normally be cloned during compilation/installation). Just make it
+	# happy...
+	git init && \
+		git config --local user.email "whatyoudoing@example.com" && \
+		git config --local user.name "Whyyyyyy" && \
+		git commit -a --allow-empty -m "initial" || die "git failed"
+
+	emake install \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	cat > 99julia <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+
+	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/julia/julia-1.1.0_rc1.ebuild b/dev-lang/julia/julia-1.1.0_rc1.ebuild
new file mode 100644
index 000000000000..36db882f1ed5
--- /dev/null
+++ b/dev-lang/julia/julia-1.1.0_rc1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit pax-utils toolchain-funcs
+
+MY_PV="${PV//_rc/-rc}"
+MY_LIBUV_V="2348256acf5759a544e5ca7935f638d2bc091d60"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+MY_LLVM="6.0.1"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
+	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+	http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz -> ${PN}-llvm-${MY_LLVM}.src.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND+="
+	dev-libs/double-conversion:0=
+	dev-libs/gmp:0=
+	dev-libs/libgit2:0=
+	>=dev-libs/libpcre2-10.23:0=[jit]
+	dev-libs/mpfr:0=
+	dev-libs/openspecfun
+	sci-libs/amd:0=
+	sci-libs/arpack:0=
+	sci-libs/camd:0=
+	sci-libs/ccolamd:0=
+	sci-libs/cholmod:0=
+	sci-libs/colamd:0=
+	sci-libs/fftw:3.0=[threads]
+	sci-libs/openlibm:0=
+	sci-libs/spqr:0=
+	sci-libs/umfpack:0=
+	sci-mathematics/glpk:0=
+	>=sys-libs/libunwind-1.1:7=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	>=virtual/blas-3.6
+	virtual/lapack"
+
+DEPEND="${RDEPEND}
+	dev-vcs/git
+	dev-util/patchelf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	tounpack=(${A})
+	# the main source tree, followed by deps
+	unpack "${A/%\ */}"
+
+	mkdir -p "${S}/deps/srccache/"
+	for i in "${tounpack[@]:1}"; do
+		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+	done
+}
+
+src_prepare() {
+	default
+
+	# Sledgehammer:
+	# - prevent fetching of bundled stuff in compile and install phase
+	# - respect CFLAGS
+	# - respect EPREFIX and Gentoo specific paths
+	# - fix BLAS and LAPACK link interface
+
+	sed -i \
+		-e 's|git submodule|${EPREFIX}/bin/true|g' \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		deps/Makefile || die
+
+	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+	libblas="${libblas%% *}"
+	libblas="lib${libblas#-l}"
+	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+	liblapack="${liblapack%% *}"
+	liblapack="lib${liblapack#-l}"
+
+	sed -i \
+		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
+		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+		-e "s|= libblas|= ${libblas}|" \
+		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+		-e "s|= liblapack|= ${liblapack}|" \
+		Make.inc || die
+
+	sed -i \
+		-e "s|,lib)|,$(get_libdir))|g" \
+		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+		Makefile || die
+
+	sed -i \
+		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+		src/Makefile || die
+
+	# disable doc install starting  git fetching
+	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+	# julia does not play well with the system versions of dsfmt, libuv,
+	# and utf8proc
+
+	# USE_SYSTEM_LIBM=0 implies using external openlibm
+	cat <<-EOF > Make.user
+		USE_SYSTEM_ARPACK:=1
+		USE_SYSTEM_BLAS:=1
+		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_GMP:=1
+		USE_SYSTEM_GRISU:=1
+		USE_SYSTEM_LAPACK:=1
+		USE_SYSTEM_LIBGIT2:=1
+		USE_SYSTEM_LIBM:=0
+		USE_SYSTEM_LIBUNWIND:=1
+		USE_SYSTEM_LIBUV:=0
+		USE_SYSTEM_LLVM:=0
+		USE_SYSTEM_MPFR:=1
+		USE_SYSTEM_OPENLIBM:=1
+		USE_SYSTEM_OPENSPECFUN:=1
+		USE_SYSTEM_PATCHELF:=1
+		USE_SYSTEM_PCRE:=1
+		USE_SYSTEM_READLINE:=1
+		USE_SYSTEM_RMATH:=0
+		USE_SYSTEM_SUITESPARSE:=1
+		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_ZLIB=1
+		VERBOSE=1
+		libdir="${EROOT}/usr/$(get_libdir)"
+	EOF
+
+}
+
+src_compile() {
+
+	# Julia accesses /proc/self/mem on Linux
+	addpredict /proc/self/mem
+
+	emake cleanall
+	emake julia-release \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+	emake
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	# Julia is special. It tries to find a valid git repository (that would
+	# normally be cloned during compilation/installation). Just make it
+	# happy...
+	git init && \
+		git config --local user.email "whatyoudoing@example.com" && \
+		git config --local user.name "Whyyyyyy" && \
+		git commit -a --allow-empty -m "initial" || die "git failed"
+
+	emake install \
+		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	cat > 99julia <<-EOF
+		LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+	EOF
+	doenvd 99julia
+
+	dodoc README.md
+
+	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+	rmdir "${ED}"/usr/etc || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 2e6ecad6d43c..cfd6ea72cc5f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -7,8 +7,10 @@ DIST mono-4.4.1.0.tar.bz2 85897587 BLAKE2B 79651189e696aa7352704e1ac659302423b12
 DIST mono-4.8.0.524.tar.bz2 87392723 BLAKE2B ac17c3da6d6c08c4cb72c4fa300ded92625bd8c14c1e45ea9539efa42c8d085759f7bb298fe5df57bd41f18abf83f293d26a9e6272944933fcff0a3c16a7e4f3 SHA512 eb77b768a4a26e6a2a872f4845769cdc83f01af3377ecd6d932437d2a1b54bfd1ce727563906146195a54997b4b624fb75449a6f0bcfe818cbc4e6544841bf2b
 DIST mono-5.14.0.177.tar.bz2 219729440 BLAKE2B c21af7f541e5fcd456faeaf654ded7937da5241feb94b0de464a880915d758791ff7a645dbcb4023e7cced7ab0854bb8da0cc246abc6ab575bb278aa58fdc8c7 SHA512 f13afbe4289e177705642f79f4236710bdc8db8e956782c5370baf22207d6713f7997ec286c7742416c8206d2da205f295437d1afcdc430628d13e32f0e87d2d
 DIST mono-5.16.0.220.tar.bz2 231487021 BLAKE2B e5154c5e356bc277a8809471e5bf8a87092224f54f08535d9860229040bdd3fec304404b893ddd36253f58b351e7023ce9649521a0e850fabfefb3e6700473c1 SHA512 f5266b28747dd7735acb047e1d7a3660d9984126e518885babba6cce5b8dd9959134f7b5c6cd79309b4fb1feaf9af9d0015fdbc2d4bd088928a279b5c1dcefb3
+DIST mono-5.18.0.225.tar.bz2 276603472 BLAKE2B 477781bf04758934a3450fe9d51409d300a463f0188748636a25559c4665860f429bc5a36ef78a5012a291046ba1dac7537ab5fc837ca2e7262daa5a3c47dfc4 SHA512 e7750a2290773a8769d3a0dbe98b45026d82225a432d9febbb2cf5ec14d546d08dc26729ae9ecd72242aa28f6c87140766d82563dc7c060e1230e19be8308632
 EBUILD mono-4.4.1.0.ebuild 3384 BLAKE2B fd16089b151c1666ceda7d05285fa8a10143a4157e46b75a3412b42dec80c0929f9ba8d9523ac65b64fb827ea8d1ad88fbe98a5e7d0d12423b970912d0ae50e4 SHA512 6c9c9ce5e19a33e4dbc1b0cdb2d17804a67eed5061e422358c971de5a2eb95b2848c4515312a4b082087c50040c1e7f9c687a134ca30354d8f4bde796432b126
 EBUILD mono-4.8.0.524.ebuild 3025 BLAKE2B e076a2771ffe50f999905f2565e741edc24c5e5b7998a92b528011cc9d03aa0cf0decfc538e9acba41afc7afb42e6486da29353940f4bef467288a5ca2e22998 SHA512 73c6b525881aa71e829214fc3ba05aa172942e3a441d79903af39b385e12eb31cae7083972a69a6bc1e29af98c5fa4828a7d96dc3c8564fca8daa01204ff8a5a
 EBUILD mono-5.14.0.177.ebuild 2968 BLAKE2B 17e110b05811a8c82cda8a5931cfdee4c4cb9b00ec86c4a5c8e4c205ab20743c8e61876822055e3ba065d9ee9d29595cf08cedcb7a87f4b53468b408c1a3f7d7 SHA512 2385767fee4277490ac3be828baf8c09c99534658ea708e025cdaa43830a36df3c96f5b4a089ac9a9026ab9c4989cf6379b93330ffe29ce1b5beac7198fb5047
 EBUILD mono-5.16.0.220.ebuild 3022 BLAKE2B 4596e60c26b9ea401f6322319a61e4a8faaa0245ab43db186102285497cf4a6864dfcf375f1e722664a049cbbe6ec52e4c84e720f63e8585d2f8c06841c906d5 SHA512 396f4e8a6f2d1b3ea4c960fb0fd571b919734b92b940364fef75f4b1f60a69d9604f089d91c88adddd243718dcd14e92c6e803d58f737a58dbb69293b89651f7
+EBUILD mono-5.18.0.225.ebuild 3022 BLAKE2B dc90c8e779910b113825314f61ee2b771da4fb3e62fe55fc7798e3f02d6f38d2e5f3d7e6ac03db051d94445eb120c967551e374d658e8644e587957f363a3208 SHA512 c0d01b5c236755adc7a4d2e0f4ecb1af45f27d88d77e3abdc32b462a85eed4837656a216a91a004e3bb27fff8ca388b5348b6b0c61a22c9a8f2141901ef5148f
 MISC metadata.xml 507 BLAKE2B 91655de22fc1ff309c36ecef9d77aa8cada0b8f13ae30677665de837e99b7b43622a1dc0c677b0f5455c06b8e8a295c3c4f39753f66e749163a4f002ee481016 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20
diff --git a/dev-lang/mono/mono-5.18.0.225.ebuild b/dev-lang/mono/mono-5.18.0.225.ebuild
new file mode 100644
index 000000000000..cdd575f10cad
--- /dev/null
+++ b/dev-lang/mono/mono-5.18.0.225.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+SLOT="0"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+
+SRC_URI="http://download.mono-project.com/sources/mono/${P}.tar.bz2"
+
+COMMONDEPEND="
+	!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+	ia64? ( sys-libs/libunwind )
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+	|| ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+	sys-devel/bc
+	virtual/yacc
+	pax_kernel? ( sys-apps/elfix )
+	dev-util/cmake
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.1.1-x86_32.patch
+	"${FILESDIR}"/mono-5.12-try-catch.patch
+)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	if use kernel_linux; then
+		if linux_config_exists; then
+			linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+		else
+			# https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+			ewarn "kernel config not found"
+			ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+			ewarn "See https://bugs.gentoo.org/261869 for more info."
+		fi
+	fi
+}
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTECT is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	# use paxmark.sh to get PT/XT logic #532244
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+
+		# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+		sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+	fi
+
+	# mono build system can fail otherwise
+	strip-flags
+
+	# prebuilt files were left in tarball by accident:
+	rm -rv external/corefx/src/Native/Unix/System.Native/.libs || die
+	rm -rv external/corefx/src/Native/Unix/System.Native/*.{o,lo} || die
+
+	default
+	# PATCHES contains configure.ac patch
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-silent-rules
+		$(use_with xen xen_opt)
+		--without-ikvm-native
+		--disable-dtrace
+		$(use_with doc mcs-docs)
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd mcs/tests || die
+	emake check
+}
+
+multilib_src_install() {
+	default_src_install
+
+	# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+	# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+	# for reference.
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+	rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 9f2f826b4d05..94335f3f363a 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -2,6 +2,6 @@ AUX mujs-1.0.4-gentoo.patch 638 BLAKE2B 4f4f5a3d21f49380ab9b2c87d3e367e1a8349079
 AUX mujs-1.0.5-flags.patch 839 BLAKE2B 843d1bf60167dfb91a5736ee936098c8f6b716f7a70118512d102adb3dc00223d5a3f1fb8da3a57b89797d5b26ebf8120cc1ef2013162aeff288be07cb99d99f SHA512 35681b868e129edffe27e41b793ef073b9ebeb5842212116f9740257515a3fb0d2f00d828a72d96b630c7632184ff9340325a5d79503e5a4c5a52892bd26f4bd
 DIST mujs-1.0.4.tar.xz 91520 BLAKE2B 6ffe62b19b140e2ae63ebe59a3b3bd352936ccba53dda3b0fcf575440dc790a0767c7de8c0a1441d26c11c65074520a80050cc0efa1113be0df51a802e719574 SHA512 a32498fee20ab6ddc8bbf79b4fdd82f3560d4e4b28bbe57c4e8f1df4a8a5367a689b6c9a391761abe47a8f15d2832fede4a508330eb181744b9563ae9954c102
 DIST mujs-1.0.5.tar.gz 119353 BLAKE2B 48f1b598e50d5804b0d64230cdd6b4d3f719187ea0906f45c9f45baee2c8df59c6fd09dc25afc9e1ce4e20a9866d158d16a4632bec552fddd8fac70b20e2363f SHA512 c1c59b5e80e0e5f580f30dfc0b4707b6a1e44a73c746b9783bb24d91429ddf8ed670a7663478300cc568cfc15a511720b6d18be2ade40a3a66fc7ab8f3933c2d
-EBUILD mujs-1.0.4.ebuild 1016 BLAKE2B 981407517b165d3c1ffaa8fcd0d425363371de19331542c836fea7b09c641e1716402429dc5963ac7ca2cd6c65fbd900fc1ee3323e6cc2168143f79a5729ba3e SHA512 18487401cfadae4794d86ee26ab40bbf748c7b0ee5f62b699e87c26c72401791f10c1729b5d6a4b7916d38e0568623ad90a37b96ff937bfa43cd0a041fa2defd
-EBUILD mujs-1.0.5.ebuild 1120 BLAKE2B 902cc90db33b4e002b62548f45aae172074f14b10d381d3aea7bdb3d851e931d58a2ef7220e5dafc18def85a86ed59a97973165920b1ece3e47b99feebf55008 SHA512 6ad59ba623213920c573e44bb25ac2cdb4667cbe93d8bb6542a8ec1498e5dce8ddbd569ab4da96a58106bcffbe1ceb628ac3eb47ae80369554414e9aaf7fed8e
+EBUILD mujs-1.0.4.ebuild 1021 BLAKE2B f037a744c255dd71fbb9ce3312d45a42c6648e88324a8fa16e6f1b27672607f9c0e0b22974afdd4ecdb3ddb7d692b9ccbd7ba781ba2a4074dcb1b2188e362a41 SHA512 1e5fbe3b2c145623ab863eec5d4570597334b43c7c9dc95ab87a530ce28d33be365ea0a6fa15433cb34c2c45085720864d40fb9a73e60217bc20cd58c8b26bbb
+EBUILD mujs-1.0.5.ebuild 1177 BLAKE2B 2af9a2bd3552a4657c95fd4e577a813ff45a741101d06639432cbe243e7fec224ef3e36a2d932b80508587081bee19ce006262d8aa42415486799390b09a6382 SHA512 7b3690851df30fdac48617e4dca00cf4ddc46665af43a21aeec885eb725514eb0c5adf9613d98ed82dfcd18999e74f091167b80f74f9172b989e7d8eebeb6e65
 MISC metadata.xml 555 BLAKE2B ea6b447ad19ed256c8a8f4b81b51ad3b336824ea357e746bd9194d7a30dadceae89ec00630e7dc5fe15435fb6f85da65e4d3a22363f5ab40365afd157b2e9302 SHA512 cb5e725aad6542f1d1c569fb82a79973d1e528f3c43251e3f60a8cb2af229747cc6c7ead5fa8b39e46a50498251a704453c90b9863641008b01317b1d8b89bc7
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
index 2946c902c8ba..cb17cf6855f7 100644
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-lang/mujs/mujs-1.0.5.ebuild b/dev-lang/mujs/mujs-1.0.5.ebuild
index 11960e25273a..1c4faff8eb85 100644
--- a/dev-lang/mujs/mujs-1.0.5.ebuild
+++ b/dev-lang/mujs/mujs-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,12 @@ SRC_URI="https://github.com/ccxvii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}/${P}-flags.patch"
 )
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 211b58372dc2..60390ccd511b 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,13 +1,6 @@
 AUX nim-0.19.0-paths.patch 934 BLAKE2B 08237a430441660a2d2380b243185c49301c80c9f5043319a7fc95419d9e8e84a4dd756bebef8692a396b80cef186fc9f9105e60a6877dca2171abee49d26d81 SHA512 c41fa08bd364af89557deca7e1f1a5d39c7e6b9e35b30b9f399465426c94953880ef4e7ac59acc1fdec70551ed5afbeb5de6b2fbd4d489d7b3538387bfa058ea
-DIST nim-0.16.0.tar.xz 2907076 BLAKE2B 5f14bb2634da32deb810381edf817e3885382ffce0a35db0ae3faca818bb0f5646b1619609e971fbe93ef383f3c4060029bf51a12ef0b4df75ebf0dde12753b5 SHA512 6be1c00328b7e5bdaa9070e1cd0e3c6e1883c5bc1e44e9c574785f9bce93697f05753f598cf6fdaa6c5a66f08c2ad6f7afb8f6650fc3b1c8e461eb0cf80baabd
-DIST nim-0.17.0.tar.xz 25079320 BLAKE2B d01ade93ff299962aeea3dc9c90f0a8fe87acef8c2ee6d7d521d936c680aded0d8383221b7c11c3b2a8d6c28311c939456f271bbc90c1115acaae2c1987fa908 SHA512 90d709b39746fac5582b9df69d3eb9e3b7a39563a98f7a3002f00716b936e4e0d2be47d8b877878318692e6e2b85c08077dfcc20d9059573a1967402c244894b
-DIST nim-0.17.2.tar.xz 4083084 BLAKE2B c1a4134592bb6a57bfaf6174becb409e40075c77042964c639b39fe7b30f094bfc8d404d6e1e4e527a95333a8ee4597477f1052da1af58c3216042bb2f85c826 SHA512 7b4ed1eb1e9067ce72b76b95c43ec74eb38f04611776c174ba6a697254a9253fed61258712fb938f15e662bb3b0d36138194fc8fa89bbcb4d22888263e5e2880
-DIST nim-0.18.0.tar.xz 4412632 BLAKE2B f7286542daa4c3502f4edeb9d93e6a69169228a50248f1c5c02421cb8e70c0ab99bc84cc91b35a6227a4974345423eeb3b5ffecdb18e321b0a82eb8fd0879a16 SHA512 8f59cb4a8d44949cdd1154fb44df548005329da8255becf2f54083ce58323ff8d6cf7b2fdd86d4b1f446bd9f977e8eaf4b13c7ca6723da8a10c7b671954de772
 DIST nim-0.19.0.tar.xz 3321644 BLAKE2B e1de3b8a4c756315bcd110ddc62c03eb1a379403d8c102eb4d6d131cccabe3dccdfdac33d46037fd8b3b241d727acb42f5cb0b616a4079830ea3abf63089f90a SHA512 f7f3c8e0e9a6509b6404e21da4693ceb279112dd7a7c39edc7e717f21554442914c9cf7d811bb4034ff244e34d77dabf6e09b5e3e77c37314adf99cc0c3b2311
-EBUILD nim-0.16.0.ebuild 1175 BLAKE2B fd12bb32d3aadc6631aabf7be51b1cc09eaaeeff9acb299b9be803833cd16760c2ec09e2b8338273ecad5b0205a999b3e53dfbd0f728b05ad2d8567b4556ac34 SHA512 c5c45529851e97f6420dc7e29486303c4902e0e95f9523d931252bca6dfa4f3c8b3a23b34fc64988d2474f677ad3b4d707cc1a8c71f591aa29343d5e7b414127
-EBUILD nim-0.17.0.ebuild 1144 BLAKE2B 0010e83ef4dd92447a0414098b06be1a66f07bb33b17f56a523239e78d2978b570843220211261ca83271238161feb1835fab89a480a31ad435a94ed9bde4934 SHA512 a9ccbf0dd0e1dc43fa7a1756d8400478cf70bf94e7a7b7a5a9c595543f541fd3fdaa563af5b2093cc5c2de32747658820bef7420924db94f5f9255890723fa7a
-EBUILD nim-0.17.2-r1.ebuild 1498 BLAKE2B 1416c3a761c9a1a6419e4ffb102d8dacba114800e4b115155491bedce3e4df7623bda95c49bd0eccdc092c8253848025a002126783109b2773c8da6720d2ecdf SHA512 54510a0b9a95be76a3b6a2a4badf77b26fdf3cf6438232a50ca021182db7f762960bb4119f26008f09cce2781cc113ba22e1a74fe390f546c26c3a28853d3733
-EBUILD nim-0.17.2.ebuild 1330 BLAKE2B 6cc7a6a783e3c51a57946ffbd2edf4986b8484378e3f3779f008b3c5d77032eed2b008dfa7c22aa2ab800426151f6b6d05239e15ae7b62e0e3b9133c7c038d36 SHA512 6d5639bac184c4b31e7c62366970b745f151c3853464666549e543c8ded6f02e8d3a559df5b7e3ef724cbe9e1952630a1f3fbadaa1bbd0ef6312ace4306fa9d4
-EBUILD nim-0.18.0.ebuild 1571 BLAKE2B d1210b325c5f1148ac26acb6c62129d410d7f2dd1a3275c03e8e9262fed06ff9c9a1b79b2b58baa5fa201e7eb9e4ce18f717e245ecd2a3bbf3af77ee71e31a98 SHA512 9de1bac7ad584e8e4c62ff98f2d2631d41a21997f5ce4715206e39af3f977354cd72d1f25e29de83fab5208e093c13a58b7d566c72f2b69d50f4c8071f1a5047
+DIST nim-0.19.2.tar.xz 21176300 BLAKE2B 85250ca174c2ef6ee77e8c1a2b35316bb9b21e591438d7d3bf560c0d38f1ba64c811ef99c0c3147acceddd6d27fcd5ff2dfccf65cb92218484649f1029e0dd1b SHA512 fc7ab034dcdf3cb5f1cc379595ee9ae6da7c6256eef4b294e3bf31ff559efd48598a9974ca9a0f41d899f01af6a916feb9c5eb7f888f637287ce357722d41421
 EBUILD nim-0.19.0.ebuild 1693 BLAKE2B 17595414f280770bfa08aa1e9088bc2c39b10076e1278670b8bae2f74f0ee949a5be5f84c52bd40a55626ffb99c7cc9efa1358d11bafc94d8486683ed5c34971 SHA512 ad5744520d9fcb2a07213bca63af4e8d88e5a40142aae030bec2115c11a946aec3cde3994b033413bd40065f264ac1595d1ee35ee328871122fdf0a9f55d0326
+EBUILD nim-0.19.2.ebuild 1701 BLAKE2B 722d99d2d6c83eb62a362ce0020bdfcb50f1b185f5e8deaa09e1a12a7570d8496869d40c2c4bba09099deab8fcae41e69ccce0dcb9133692d0cbdfe974b32047 SHA512 8b54a7ef70bfd9143c5fbaaa9e3f5a77e3e19c6d926b90473e3732345b73f0a3dccc2a1c46a90ed3f1e684624b1e6e6061f3309c2ad464a81d561ff60064fdec
 MISC metadata.xml 328 BLAKE2B 9205920d8c9b12118456bd186f2e882b3e6f75b7cc3f766def1e79e2e4f7ac695370409ff1555e379516606568f181f4ba3625322f70e41bfffd21d319b0035f SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49
diff --git a/dev-lang/nim/nim-0.16.0.ebuild b/dev-lang/nim/nim-0.16.0.ebuild
deleted file mode 100644
index 6f4bf09dcfa8..000000000000
--- a/dev-lang/nim/nim-0.16.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=Nim
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-DEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	./build.sh || die "build.sh failed"
-
-	./bin/nim c koch || die "csources nim failed"
-	./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed"
-
-	if use doc; then
-		PATH="./bin:$PATH" ./koch web || die "koch web failed"
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" ./koch test || die "test suite failed"
-}
-
-src_install() {
-	./koch install "${D}/usr" || die "koch install failed"
-	rm -r "${D}/usr/nim/doc" || die "failed to remove 'doc'"
-
-	dodir /usr/bin
-	dosym ../nim/bin/nim /usr/bin/nim
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/*.html
-	fi
-}
diff --git a/dev-lang/nim/nim-0.17.0.ebuild b/dev-lang/nim/nim-0.17.0.ebuild
deleted file mode 100644
index be6d8989a30b..000000000000
--- a/dev-lang/nim/nim-0.17.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-DEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	./build.sh || die "build.sh failed"
-
-	./bin/nim c koch || die "csources nim failed"
-	./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed"
-
-	if use doc; then
-		PATH="./bin:$PATH" ./koch web || die "koch web failed"
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" ./koch test || die "test suite failed"
-}
-
-src_install() {
-	./koch install "${D}/usr" || die "koch install failed"
-	rm -r "${D}/usr/nim/doc" || die "failed to remove 'doc'"
-
-	dodir /usr/bin
-	dosym ../nim/bin/nim /usr/bin/nim
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/*.html
-	fi
-}
diff --git a/dev-lang/nim/nim-0.17.2-r1.ebuild b/dev-lang/nim/nim-0.17.2-r1.ebuild
deleted file mode 100644
index b5b88357cd22..000000000000
--- a/dev-lang/nim/nim-0.17.2-r1.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 bash-completion-r1
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-DEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	./build.sh || die "build.sh failed"
-
-	./bin/nim c koch || die "csources nim failed"
-	./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed"
-	# build nimble and friends
-	PATH="./bin:$PATH" ./koch tools || die "koch tools failed"
-
-	if use doc; then
-		PATH="./bin:$PATH" ./koch web || die "koch web failed"
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" ./koch test || die "test suite failed"
-}
-
-src_install() {
-	PATH="./bin:$PATH" ./koch install "${ED}/usr" || die "koch install failed"
-	rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'"
-
-	dodir /usr/bin
-	exeinto /usr/nim/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		doexe "${bin_exe}"
-		dosym ../nim/"${bin_exe}" /usr/"${bin_exe}"
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-0.17.2.ebuild b/dev-lang/nim/nim-0.17.2.ebuild
deleted file mode 100644
index 3942e4e7b582..000000000000
--- a/dev-lang/nim/nim-0.17.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-DEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}"
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	./build.sh || die "build.sh failed"
-
-	./bin/nim c koch || die "csources nim failed"
-	./koch boot -d:release $(nim_use_enable readline useGnuReadline) || die "koch boot failed"
-	PATH="./bin:$PATH" ./koch tools || die "koch tools failed"
-
-	if use doc; then
-		PATH="./bin:$PATH" ./koch web || die "koch web failed"
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" ./koch test || die "test suite failed"
-}
-
-src_install() {
-	./koch install "${ED}/usr" || die "koch install failed"
-	rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'"
-
-	dodir /usr/bin
-	local exe
-	for bin_exe in bin/*; do
-		dosym ../nim/${bin_exe} /usr/${bin_exe}
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-0.18.0.ebuild b/dev-lang/nim/nim-0.18.0.ebuild
deleted file mode 100644
index 53766c3e8a09..000000000000
--- a/dev-lang/nim/nim-0.18.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 multiprocessing
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc +readline test"
-
-RESTRICT=test # need to sort out depends and numerous failures
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${DEPEND}
-	test? ( net-libs/nodejs )
-"
-
-_run() {
-	echo "$@"
-	"$@" || die "'$*' failed"
-}
-
-nim_use_enable() {
-	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use $1 && echo "-d:$2"
-}
-
-src_compile() {
-	_run ./build.sh
-
-	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
-	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
-	# build nimble and friends
-	PATH="./bin:$PATH" _run ./koch tools
-
-	if use doc; then
-		PATH="./bin:$PATH" _run ./koch web
-	fi
-}
-
-src_test() {
-	PATH="./bin:$PATH" _run ./koch test
-}
-
-src_install() {
-	PATH="./bin:$PATH" _run ./koch install "${ED}/usr"
-	rm -r "${ED}/usr/nim/doc" || die "failed to remove 'doc'"
-
-	dodir /usr/bin
-	exeinto /usr/nim/bin
-
-	local bin_exe
-	for bin_exe in bin/*; do
-		# './koch install' installs only 'nim' binary
-		# but not the rest
-		doexe "${bin_exe}"
-		dosym ../nim/"${bin_exe}" /usr/"${bin_exe}"
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		dodoc doc/*.html
-	fi
-
-	newbashcomp tools/nim.bash-completion ${PN}
-}
diff --git a/dev-lang/nim/nim-0.19.2.ebuild b/dev-lang/nim/nim-0.19.2.ebuild
new file mode 100644
index 000000000000..2dc958a2a86b
--- /dev/null
+++ b/dev-lang/nim/nim-0.19.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 multiprocessing
+
+DESCRIPTION="compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="https://nim-lang.org/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc +readline test"
+
+RESTRICT=test # need to sort out depends and numerous failures
+
+RDEPEND="
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${DEPEND}
+	test? ( net-libs/nodejs )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19.0-paths.patch
+)
+
+_run() {
+	echo "$@"
+	"$@" || die "'$*' failed"
+}
+
+nim_use_enable() {
+	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
+	use $1 && echo "-d:$2"
+}
+
+src_compile() {
+	export XDG_CACHE_HOME=${T}/cache #667182
+
+	_run ./build.sh
+
+	_run ./bin/nim --parallelBuild:$(makeopts_jobs) c koch
+	_run ./koch boot --parallelBuild:$(makeopts_jobs) -d:release $(nim_use_enable readline useGnuReadline)
+	# build nimble and friends
+	# --stable to avoid pulling HEAD nimble
+	PATH="./bin:$PATH" _run ./koch --stable tools
+
+	if use doc; then
+		PATH="./bin:$PATH" _run ./koch doc
+	fi
+}
+
+src_test() {
+	PATH="./bin:$PATH" _run ./koch test
+}
+
+src_install() {
+	PATH="./bin:$PATH" _run ./koch install "${ED%/}"
+	rm -r "${ED%/}/usr/share/nim/doc" || die "failed to remove 'doc'"
+
+	exeinto /usr/bin
+
+	local bin_exe
+	for bin_exe in bin/*; do
+		# './koch install' installs only 'nim' binary
+		# but not the rest
+		[[ ${bin_exe} == bin/nim ]] && continue
+		doexe "${bin_exe}"
+	done
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		dodoc doc/html/*.html
+	fi
+
+	newbashcomp tools/nim.bash-completion ${PN}
+}
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 2a32a1555bdd..9ab90c5183a6 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -4,6 +4,6 @@ DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B 756936592c7e0c87da27f154f07850eb3e4b2ed
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
-EBUILD ocaml-4.04.2-r1.ebuild 3508 BLAKE2B 1a46d48c5437f9222a0aaa68239cc970afa34e8d274c2c7877e435e83e2b0d4a15e98fec2d29b24d428a84c119e5ba7a4aa648389bd4b44bc74f7c3979497578 SHA512 323393773b5d46690ecc34751a49106f1279f8547bce2ef4407030c775adbc249af1d318f0e706f243a21d32d3e42c9b6204a2934e80d615993fc9021ee3e63c
-EBUILD ocaml-4.05.0-r1.ebuild 3666 BLAKE2B c33c87456eda6f6e99dcba1b84708af9af3463d49b66f9a821f7c1b7abebccf279a3395635337fb8f8a70b6bc3a1d5682756c06bd478e270f62790730cac13f3 SHA512 319937b266bfa2a3afdc4fca7ef3db16a32bf2fa1d817ffe0913acd4ab879b067b1145071183f0574586a83728a7f0cc3b4b89f6fe5b7761b4313fdbf2b12df5
+EBUILD ocaml-4.04.2-r1.ebuild 3504 BLAKE2B 1dbf0011b1b3835aa4324bb77383c30187c97f6d34778a9150d0592f1f56a8ae7a5a0fe5567a3ef28cee2e7c329286b6a56eb3fc4b321f4d4a9282f31e92736f SHA512 1db9a71ca451aa79ac421d05589e49ee2167252bdd7129adb5c7a309f2f65378d26ea2d81d97af78b0c05051b2e37d3dd9a201604debf8b514969b4aa94318d9
+EBUILD ocaml-4.05.0-r1.ebuild 3662 BLAKE2B 0d0e9331aaaa2acbb29d32cfefd3a673768edb801d630c884f13df7e1829267440ee6cf2a954977504da207e6c6e47c8199239f67247a24cc5800aeba9a38041 SHA512 277e1815a35409ea1323defca663830db46c9f9dfeeaf434915bf53741c777fdb070b2a4616c1a0f6fd9c6594eb02f7dfd61b3c01bad91b3e29b12a8f72a8eba
 MISC metadata.xml 685 BLAKE2B 3a75f4190c512c50dcfb570cf75c99c93b4bebf11b6d030b56e6f8d6839b94f2c8ee3da87425721b7554e86c0ac4e56ce3281af1702149e852c9592599e48434 SHA512 d57c80b4921393738ff8d58ca7bef5638b7ac7a21cfdef6c1d61c46ef576426afe2dcbf7341fda1ba5ea77b3ebdd1cb299e94a245577d9d990a536f10efeaf68
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index 27b31db0df9f..f790ab2d1cdf 100644
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic eutils multilib versionator toolchain-funcs
 PATCHLEVEL="8"
 MY_P="${P/_/-}"
 DESCRIPTION="Type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
+HOMEPAGE="https://ocaml.org"
 SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
 	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
index 078795d80000..f0a79f5e329d 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic eutils multilib versionator toolchain-funcs
 PATCHLEVEL="9"
 MY_P="${P/_/-}"
 DESCRIPTION="Type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
+HOMEPAGE="https://ocaml.org"
 SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
 	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
 
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 892515b218db..7863da3d4cd2 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -2,8 +2,8 @@ DIST parrot-7.1.0.tar.gz 4688341 BLAKE2B 1b1f894d0a54a11044ae8069d6f79509f2a0c6c
 DIST parrot-7.11.0.tar.gz 4703987 BLAKE2B d832ce0225af6d86877ab775a773971484d1c17c6c517310536b10df05cbf30cba909439e59dda1a14d8688fe3bf0318ea5dc84a552dd3b3e7129ce0b2eb4f9b SHA512 6f321a7d92b43413bc8cf2d2a03378e27de49573968471ad833232f90f0b61eae81626a80be94d84a783153c5beca3ba57c31fcc861b8b3c6cd33cd2d433a19a
 DIST parrot-7.5.0.tar.gz 4693149 BLAKE2B d5e88d5dedb3f95348d7b7bfeb1230251a866be5d4ada46ed5b4b80398227b6351566a07fdb6d7f8866bb69e39dde58b8c3ba707fd2737e70839eab0898c1bd0 SHA512 6c009dec6bdb9f419b20f3bb6c103b16018b27b2ed0094f13c957f66d9735cfc126c15f787d4ce577cd0c6492d61264c35c23d50ab29517b65f00df7c4b4d619
 DIST parrot-8.1.0.tar.gz 4700495 BLAKE2B a90cd3c43be2a6812eaf5a5881cfd97e7011b5b82234c5eaf61e54cba923544a2f2c649387afe55d4e710a1e92ff31b1d32454a230fda6005b40778598f1915e SHA512 f5c4ffeb22a8f4949081ba9d98e3129eb067f6f0ed139248ca1d521570ccbada5dfa69ca2e390868a00ed275780552a5cd06eb271ff14ff753bf8375b7c658c2
-EBUILD parrot-7.1.0.ebuild 2344 BLAKE2B 535c04048a69168045e6da2bc5cc2a816482ffdf83b243b42f99ce224134bc7ad93d40999c4b057e903a6ccc546c83c957f3fc1a9e820096e91f00e0a8624a1d SHA512 1cb703ee015f94462940036a88313e57213bf08c7b9f58822daa674aa4f8c772b7a7fae29e89d8006fb563dcce96843a4e3758a09dc963c34dab1eee2ef1b80d
-EBUILD parrot-7.11.0.ebuild 2345 BLAKE2B b971f0521738964923f5788aa684f655bbd6c3a60117a6fa92511ea5d45f441738b2a73062ecdc8a53a5d5b9b9e7e893ad9656c25cfba99489feff44e4a32597 SHA512 d2ffb1d58e4901e6da667154f8f295b8ddf234a07974c51f044d69cbf82ed37456e9e51a9327c2cab742eda6260af3890c23ed9b349606d87260a1d3e7b62d33
-EBUILD parrot-7.5.0.ebuild 2345 BLAKE2B b971f0521738964923f5788aa684f655bbd6c3a60117a6fa92511ea5d45f441738b2a73062ecdc8a53a5d5b9b9e7e893ad9656c25cfba99489feff44e4a32597 SHA512 d2ffb1d58e4901e6da667154f8f295b8ddf234a07974c51f044d69cbf82ed37456e9e51a9327c2cab742eda6260af3890c23ed9b349606d87260a1d3e7b62d33
-EBUILD parrot-8.1.0.ebuild 2365 BLAKE2B ee1b16eb794742437941686e766e16cbbe0397b5b0dbc770b90a58265fca2607bbc489becce9f85f5aa1ef7b3f2506e62d1bf1cddfbcad066ee616279b123a96 SHA512 2e9f32a7a2aad13bbe9c2a774dad9edc55c2174b2834d6bba938114c26b0efccafa581f68cbc4faf93f5b44bb6484a3fab6deaa30598d2f195c036f36c1c5f3a
+EBUILD parrot-7.1.0.ebuild 2344 BLAKE2B ca45139cd4a708d1d4f80d0e0b4e347914ff3adb7f846558367ad08b4899ff055eafbbf622c33708a1b19713073fd05d229ee75dd520049e5fbb2cc8bedbb476 SHA512 fadb6fbbc7e5c7d054086b4ddb99ee14cbd41d8b2c1e27237d7675c27943334f276955b9bfc737cf64515ae472f6fe87872b4f99bc0cc5b887ccdba0887af404
+EBUILD parrot-7.11.0.ebuild 2345 BLAKE2B 27584553946eb37d86eda31f7e72bda14040d4870137e6edf699806bdb4736763cf1071b26851ff9a18c35dfae328eba060519c4925683e26c6144f658f1d5fd SHA512 4bf1cac9a5fd4875ee3acb23e057a9cc3a3d9f0b88d132da0882eeb5210e25e397700d5d95128991066790807baa07a6ae11d427c17fcec6a15658876d9b4003
+EBUILD parrot-7.5.0.ebuild 2345 BLAKE2B 27584553946eb37d86eda31f7e72bda14040d4870137e6edf699806bdb4736763cf1071b26851ff9a18c35dfae328eba060519c4925683e26c6144f658f1d5fd SHA512 4bf1cac9a5fd4875ee3acb23e057a9cc3a3d9f0b88d132da0882eeb5210e25e397700d5d95128991066790807baa07a6ae11d427c17fcec6a15658876d9b4003
+EBUILD parrot-8.1.0.ebuild 2365 BLAKE2B dda55e1d080c59e849bca9fd0c87c463f2be84057c38398721501e3f451e09a1d5eddbc52d5bc69a385ef572e31d0b5a38bcbf5b891fffcc34425ced9f0bc39c SHA512 0704af051ddcc347ace2ff5b2be38a0767873c862903f9ac3bce139b9b11d22ac4b3be9fa60ec5be18e5e90ad4bb14e302b1968e4d7487499b4528278716452f
 MISC metadata.xml 247 BLAKE2B d94a568c950df425b54d5f8ce29c206c221f01e64654597f2d4a0f7bc86ea508797045e3fb6eb14bb8a2aadec08995d877434d85dc9e622fc6207d2df28b23c2 SHA512 9bd9ddeb07e0644027c9a1dca33f0704de6062bc6b17333adde82a177991f35265f90e1b623e3a6288fedd729597921f48e4fda17fb8d402b1b2f3fc73c6d693
diff --git a/dev-lang/parrot/parrot-7.1.0.ebuild b/dev-lang/parrot/parrot-7.1.0.ebuild
index 21858f8b882d..148ef1c2d811 100644
--- a/dev-lang/parrot/parrot-7.1.0.ebuild
+++ b/dev-lang/parrot/parrot-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/readline
 	unicode? ( >=dev-libs/icu-2.6:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
 	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	pcre? ( dev-libs/libpcre )
 	doc? ( dev-perl/JSON )"
 
diff --git a/dev-lang/parrot/parrot-7.11.0.ebuild b/dev-lang/parrot/parrot-7.11.0.ebuild
index e81e39db8695..9655f5fbc606 100644
--- a/dev-lang/parrot/parrot-7.11.0.ebuild
+++ b/dev-lang/parrot/parrot-7.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/readline
 	unicode? ( >=dev-libs/icu-2.6:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
 	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	pcre? ( dev-libs/libpcre )
 	doc? ( dev-perl/JSON )"
 
diff --git a/dev-lang/parrot/parrot-7.5.0.ebuild b/dev-lang/parrot/parrot-7.5.0.ebuild
index e81e39db8695..9655f5fbc606 100644
--- a/dev-lang/parrot/parrot-7.5.0.ebuild
+++ b/dev-lang/parrot/parrot-7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ RDEPEND="sys-libs/readline
 	unicode? ( >=dev-libs/icu-2.6:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
 	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	pcre? ( dev-libs/libpcre )
 	doc? ( dev-perl/JSON )"
 
diff --git a/dev-lang/parrot/parrot-8.1.0.ebuild b/dev-lang/parrot/parrot-8.1.0.ebuild
index 53828b81e7be..dc938a69dfc2 100644
--- a/dev-lang/parrot/parrot-8.1.0.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="sys-libs/readline
 	unicode? ( >=dev-libs/icu-2.6:= )
 	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
 	gmp? ( >=dev-libs/gmp-4.1.4 )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	pcre? ( dev-libs/libpcre )
 	doc? ( dev-perl/JSON )"
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b9ef3ab9b929..abebbe262d2b 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -16,7 +16,7 @@ EBUILD perl-5.24.3-r1.ebuild 17393 BLAKE2B 999d7df269e15390e4f7d146ff94eda530198
 EBUILD perl-5.24.4.ebuild 17363 BLAKE2B 84744ba06ce9dc0cab51aae3da10917679a20b5997f13154c269285173a6c6b0ec20ae365b059daa52f86f2addcf97dbe8866a29cd2c9c32ee51030de9a44bf7 SHA512 d393349752cfcdb53bd6d99559ad1eb5385e716f772bc4377e07bc3d7064a293e5cc0369feca2094513e710e8724c2a0a82fcf342ad68c4e1d2c1d0d42200071
 EBUILD perl-5.26.1-r1.ebuild 19255 BLAKE2B a29acfd3ea358d0d46886aae104acf8e55ad7c9380848343ad84dfc58294645fa6c72c4cbc598e54072585f880175581ef25e7e6e2a9080764968ab925cdbb9d SHA512 4630da50892ac674de4b9e5858ffd9b1c50b08558a91a1579958f728aaf3d9581b3f960c0d9caf5a460c3435a626c9294d8abc73c7f7da098199018a144a5788
 EBUILD perl-5.26.1-r2.ebuild 19668 BLAKE2B 5936c92398cf8a889bd946705f2667abd07fc81a64ea3f8c44cd83f3c29719352f4ea938b8d7fb7e3d5d138dcba12f94692166aaca8d98a3640c772850ec9e5c SHA512 154b021e91b01ecd55a5af50bc530f080745b122cd5a77652589c236d4bceea93f4379a1c8e751eb1787118e3133e1f5daab8dccf88365f7976c8a015591190e
-EBUILD perl-5.26.2.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44
+EBUILD perl-5.26.2.ebuild 20019 BLAKE2B 38c2c85504c8242e5fd2f6b0467f304e3ff30e3e343f63cff8be0fa6d9a69802762dc2b5997fe8ba5eda226dc103766b47edd6484f7e489761878528c04cf783 SHA512 d4607430c7c682c6ae7f6fd7883b7b4192269e19782a5a03512ba2351bce16137c5a98570db42af6616ec4599e6e1a5316f239a37332883c3110243a7783e326
 EBUILD perl-5.26.9999.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44
 EBUILD perl-5.28.0.ebuild 20220 BLAKE2B a6e1e9d5e94f128dbb8e3c8859ed41a48cb0ec311104901d854144cbc854986dcbd8bcbe5dc78d26a5e5877eb422d1a6a203566f0fe7a6efd71b69f1a9925796 SHA512 c156b1b6ed7aaf836b4d281d844f62583ae823225903b0da0e4941e26dc1e631e5468074fb42217de27ef3d8582e911f0fbb33495e38342019d6975cdc11aaad
 EBUILD perl-5.28.9999.ebuild 20220 BLAKE2B a6e1e9d5e94f128dbb8e3c8859ed41a48cb0ec311104901d854144cbc854986dcbd8bcbe5dc78d26a5e5877eb422d1a6a203566f0fe7a6efd71b69f1a9925796 SHA512 c156b1b6ed7aaf836b4d281d844f62583ae823225903b0da0e4941e26dc1e631e5468074fb42217de27ef3d8582e911f0fbb33495e38342019d6975cdc11aaad
diff --git a/dev-lang/perl/perl-5.26.2.ebuild b/dev-lang/perl/perl-5.26.2.ebuild
index 3efe8267e5be..fba6a2d4a045 100644
--- a/dev-lang/perl/perl-5.26.2.ebuild
+++ b/dev-lang/perl/perl-5.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]]; then
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b384a485b567..12c460ba4386 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -17,30 +17,21 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
 DIST php-5.6-openssl-1.1-compatibility.patch 42559 BLAKE2B b7f13866cd8545543143932930f31bcd928fa0b4b36ef63f04798b9ef4699f12b4f4227772ac9e6e5c498aaeacf7b106abcfa48031a12214e123de4b79d3a4cd SHA512 eed695a3dd7ce27e8651b4a4b96ccd0514f256e7d2f0214fac899e9eeea6412aa24f863f1b5d13305bcac50667ccb62709597fb34da1002b005ebf411dd2f5df
 DIST php-5.6.38.tar.xz 12467408 BLAKE2B d9ee47e193d80bce8a9ed6ffd3eb13e67ba6d1f597ece2803cd92fddc6245f46cdfe644d6cda12a6bb409b92c1fe748610cc5eb43dea0bf063fda81188ee8b3d SHA512 66c51a8e954b1496c0bad0a2864a2a1537dd1c1c573b553991d6d5bce85fc7bc340e56a21109bc5e9a03799e703204b980b569c95a5c0a1bddb01c8947e7a682
-DIST php-5.6.39.tar.xz 12467096 BLAKE2B 354b147c0fcc13eeec0ab333bcaa32ad26e2f4eef19a0ee52cf596ff96997eaf32cbb6d980cacf643167ed01b06ee9d27eeb7c00c95c8023d305c967c1ce3539 SHA512 814ea2d74df9c3c7041769803ceb4ba20dbfc18885ff85f91dca0c3ab694e3ebfb6a564427d116b35382fe292583a54d449f2528495032ca9724cfbdea82c226
+DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 DIST php-7.0.32.tar.xz 12030780 BLAKE2B 0c277eac4c931a6e30954cceb7feef8dea1c3ef4aebac91779b7e1a6f90f608faa93d1750a2dc8f354c73304e0f7a9b9ac17bb0d1da4768ddb68925752c11aef SHA512 4a7c9a6b91ad7da69303916202062d639e6f02dcd483e851a44d8c7a2efeb5c9a666097935ab60d700c4445f86a0c68df1515300c57af1cdb76528b54b757608
 DIST php-7.0.33.tar.xz 12033040 BLAKE2B cb7a4eb3ba8ede93ae8e85b6a11664f33654f7e94fa077ac9a33ab95157c0c2b3b05f98413e13e36f710c6d00b35d49d38bf26092a36e508b88805d092764287 SHA512 9298e185702ea801e9243671ecb0b781c2b04181a2f9fd6490bc14897a333a2c0cc88fe27b0c69c6dd0079629a71c330ed1aa337f48cac6cbd624addb8855500
 DIST php-7.1.22.tar.xz 12227848 BLAKE2B 72fab94b1c7ecfd3479f6d6c9a76a9d8813f7789402664201615d79ab8b5bb26fb1b7273769c4898a36f0336e0ce4d50bf2f17b81ddb54acc9583e39623e3a5b SHA512 0fc0907d303711dbc4ba0a18618e3e73550c73d13988c769f8d50066017b1efe3feb0d22d5539f69271ea4e9532a3d997e22841cb59bdbf96313169e1c03538d
-DIST php-7.1.23.tar.xz 12227528 BLAKE2B d03470b07ae041c4677e100c1b4f7994d3e15d4830eccba3c654c1f3546345c8205cac057011d2d43ab962ebbc01652f6748270daa40aa1e540453923500288c SHA512 d5a451f1a48415175e3117ffa84ef3504275a407698b59c13eeb403958aa27342e04dc4ffea9791b923ac0cc5d6fdacf2e8672f0e19755bae858707c7fc3627f
-DIST php-7.1.24.tar.xz 12205112 BLAKE2B d4dd8bdd980cbb2c8cd813cad44da7a322d75641bb5f4eb986f6be44acf61898e64e43a3206da08b6c68fb1213a95cf5c6bf28bc75356d9abd9711330fa04554 SHA512 ee54d04fa1bb049807e7876baf6a4d12ab8360367bb44ac77c71e53ee8ca078342b4a86f2bc4587838ead27fb8204fea8e739bd582a9e146513ae5d465e59202
-DIST php-7.1.25.tar.xz 12205972 BLAKE2B 3d69cc87d75ee45dc85e5e672ddb6c312fcba12882e227d28e397e1e796e0149588b9519beeb990111315a747a07fa5349ad5f9662c0725b4551478f9e95b51d SHA512 10a75b96d5fa104bc1d5b63f4606d9cfacfc594f7d6ab34f9c5e9e8f209b896516c4121b9cbd323a862724d6dfbd275ef902993cfab619d9a4b9518790b9147c
+DIST php-7.1.26.tar.xz 12206956 BLAKE2B af78f764349a05905d7db22260c8a6415a2755b29e0dd01225160235b3b38ea76c8910d79c69798aa2de3fc6d4d41e45ab951161b54e62753111f81ac9d85bc2 SHA512 3c80dce2d5dcbf6f253ca4ca4e4ce01fdd3a3d31a6e6045f539fefadc1ea3c391d4d4995600a4ff758ab0361e0ec2244e2eaa6591ecb3e9b8e8a9c44f67a5b32
 DIST php-7.2.10.tar.xz 12160864 BLAKE2B f1959a00622c1bd11fa87c61d152c802b307f0b9e89b51ed86b40086cda03eeb6652d47b59df8cc7c9b4e79ab687ae1292b978f453e9f07ac352d209b64c62d8 SHA512 aa90fce17034b2649012d66461626ae74c21ea938b1c71c7eb12419e562c641b432df87a7e900c245ad28df39624cf64a1b2f8ffb123608d94cd35e41f09c0fe
-DIST php-7.2.11.tar.xz 12132268 BLAKE2B 8007f6a8f4236efb796681d25f2066deeba98e6e136def0c323aa13399951d58d7f218b3544b3bd0418dfe220f87a38b6515547c50f65c641bd09a2d440eb4e1 SHA512 0cd8578147d17d612e013dfc22b73977719177058b39c7b61dd0bfdfb8c2441aba78af49f58c824f7e66c89b5ad201c36fafb89ccf1e2d20f19b79d6a8fed7e5
-DIST php-7.2.12.tar.xz 12141472 BLAKE2B 25d55fcbe63aab64c658e9c4ab52b552831d5c03a8887e1c64f0cadbb8b0d9f3c38cd5d15dac89002c328b737ad864fce392baa0891292ee77d1975562a2bc17 SHA512 bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8
-DIST php-7.2.13.tar.xz 12116484 BLAKE2B 00d265c10343e590772a4de103ae885149a56a7c0ef957cb24d5e81f86021231da5e75b655081e9fcba99b83956d55265b6af1d779ee65cebee9a974f936a634 SHA512 9df1d43e9cd701db10281811b328721b85cb90c6c8dae1842b0fd848cb5388328918b3040bbad7634b340550d82b93746ea479ed45f4d8a80e8a316e6324115d
-DIST php-7.3.0.tar.xz 11928820 BLAKE2B 36fee652cbbc28bbeb1b2df037b4b05084910d94af86c16150d776b82f91fb85691f9846c51538dbf6f3e64ece26894fe9c7a5f272d2848d41cdf8e1338b9805 SHA512 d991101eb833d3a47833aa930341e75c56f26c4cb0249896728ebe209c6c02af1704fccc3052128d8f9fdffc60dcef0ece38a532697131141946898d8b1abcda
-EBUILD php-5.6.38-r1.ebuild 23051 BLAKE2B 2f4bb600718476e7c1f587618c26d60949dab9037f5688688cb4a47cdf1621cde4e7e4065d878b229436feee24e1520e399cd4e532966d4a0e36ddd5b9f606f0 SHA512 fa50618759e8280ca7d81fb92a73f5987b3c52dde2d8cadda2576767ac1eb9423b3f047e5f4eca62c41762d3f65977a22ce22ce56266942975ab07dc79ab30e2
+DIST php-7.2.14.tar.xz 12156460 BLAKE2B 88727241ca3fd68238ce50dcb4c12868f8e6df54213b04dba7650c5f98c3f18a3d02e0a191c0ebd13d85c83cc686fef60135f69ca7cc3e425bd5d7f80035fdd7 SHA512 13f2c97b730e3e872bd24bcc004c6cff5e2cc633c37a4eb60b8b5d1d4454bc5985f7d52943448d61cf4a227c64be770edc5eadd2c9612b297d71c0840b4b1259
+DIST php-7.3.1.tar.xz 11944376 BLAKE2B 55b3192774c08b1e4c6621e16176a1e352ff6ba5540794a5d769b6416929723638f1409f2f8224c7fe3db99c9b020fa51db7b78d50eaa00e790308562a0a5334 SHA512 0663d90537fe3901cad00ba1056782050b8a61e8edb49f01851add4992df21d23aee3e9468e32b76b7f53ffd513f1ba10c9513c549e247d796416ed176355348
 EBUILD php-5.6.38.ebuild 22798 BLAKE2B 8bef3ae060eeb63fcc492a7c8c8a8b642b84f46ef7ed29e69badeecf26c0f853e974c8f224739875fee1b345987775c05f451908d4731550eab156993a55d23a SHA512 0a97787e0b80643e620815c32b29a56063ddb92c31516ad34f89be9769cc3cf9ba07eb0271d433f330d6493df2b1a63af29bf8b7ede81bdd3fbc2751be5ce561
-EBUILD php-5.6.39.ebuild 23265 BLAKE2B 87584041cb4d7e21ef21f6fc25dc3b03f8bf46037caa7aba79c7f5b29fb6af081e34b9f994f2e4df461398181777ab81fda80621f7672dfe1697660252462cd4 SHA512 6b9e20c877b5d7d85b60737dd24f798194fc7b6a2470e6356270645dc39ffa2fd083a63740b3957ed7f5f3d8e94290d35dd96ee98ca8e264fb620ce61397ade5
+EBUILD php-5.6.40.ebuild 23265 BLAKE2B 38d224436109eca363ace926556602f6836f6db16db9b3694093348382ddfa2c6ad2a1be73a320a42a7f0eb9762da4ef8a178b0e6ebf67de5dac86ea13188647 SHA512 cd85fc699792e78eef6842d9990bf289a27ecb49236ce1e2a285e94ce7125674a698e36630db84fd9706335e0b1b6a0baa1c3141d868abbbda91f5eb2c5d4960
 EBUILD php-7.0.32.ebuild 22008 BLAKE2B 26829e446d9608f52212a32e0092d83d65966a270a8e4d35f8ac4559f0679a4ff955848eb9c9ae3f7d25300d347a226adc1b71d1b322d09fe512188360f2182f SHA512 a9fdfe7a831fa4ad71ddd4bae29582053ee86a824dc93f02581a3add372561f34d457f2c9198c72c619b10666b679d3f929f6aaf309c2d446a60e9447e8d3cc2
 EBUILD php-7.0.33.ebuild 22169 BLAKE2B c42c62525fdb4e5e0de2cd232c2e6c04fa0c561f0095db4f3d05822cbbde8bc8938369870cea1dd3e7c9a0ea87899e2323a185195fe177441eb94a66ea2095c0 SHA512 c909409059798a4cbb2284a71affc0df5c47db6bebafc291323eeb865b118712a4b344b4f556be95d3035333481ed147804e908b1d8e5c68b38bb178ef0651b8
 EBUILD php-7.1.22.ebuild 21715 BLAKE2B 13f34b9730b2f0f22cfcbf26af6575259d08d61f158b0c9bd9b6e7756326037e32e92992ec510bc1649eca0beb2044f820888c7e9b1fa48174974e754947f181 SHA512 187fd61cf4df1cda5c53e14aea0ac327c5e9fab193843165de2afe7e13fdb5b8be1ebab70fcb776dcb8ebe1966feedcc075e589c4ddf1f9f6d3d58f45519a9d4
-EBUILD php-7.1.23.ebuild 21933 BLAKE2B 4080e9f9bea273c051f26db5ccd8781f5b448cc800999f71e527f7e0a243f84dd5fc420aa9b6ae86d293588e8de13644c14a48212cc77a3197801c4bb118cb19 SHA512 dcc63f2e7373a9b57a2d3bb010a125d3ce74b7bcb030490b4051853cac78964ac59bd7d1309c5c8f1d11cf2b52615c075c846575528eb6968422736b08add279
-EBUILD php-7.1.24.ebuild 21933 BLAKE2B 4080e9f9bea273c051f26db5ccd8781f5b448cc800999f71e527f7e0a243f84dd5fc420aa9b6ae86d293588e8de13644c14a48212cc77a3197801c4bb118cb19 SHA512 dcc63f2e7373a9b57a2d3bb010a125d3ce74b7bcb030490b4051853cac78964ac59bd7d1309c5c8f1d11cf2b52615c075c846575528eb6968422736b08add279
-EBUILD php-7.1.25.ebuild 22041 BLAKE2B 29e1e02ede599d151b8ca60fda7ab63cfb84d3a75b14380e680fa886e3f068a61c48b48e89db6b3d45dba4e3a88919175375de584ded8edac6d80d4c48b12df6 SHA512 e39340ed01c7fe6e14ebb8c8b9afe624fe6b2292280457302f53cf9b20308729fcb06cf1a2ec5de69b8e7c4cd12d9c46ca250590df034fa7e16eb7be90b968b7
+EBUILD php-7.1.26.ebuild 22041 BLAKE2B b179e5afbe4800570905c6178a0fc19c2e6d69d599f80e17026afa9cb28239aca15b6c7848d6a5ca6f58b8a25f0fc5c35fc6cbb85d40d570a5c2e630c449cd9b SHA512 184af4d6b38ea3610da71fdae4173677de348c11676f9609b0f3e612129fe5dbabe9db6080b7a2bcfab420712f24b2c8ed3a26926b6474d0eef28c09c302b1b1
 EBUILD php-7.2.10.ebuild 22246 BLAKE2B e06f62b7f5563d48d9e381b6ab44cc72e9e63831e209ee638321e93b90a1f42abb9a41b757629b45cfa610f7e985f40fbd002c5121acf86d862f8d648ee16f44 SHA512 c662c27b70663131899ffe595476bff326a337d584855e27f62480bf8824e3a3f49caee7c80b4f3aa19ccc40d1f95f3a9c4518621cbd43abd751981ba334e190
-EBUILD php-7.2.11.ebuild 22464 BLAKE2B 43c52b71820962862ce7e208e45bea5180014075894125075fbfd0f217412f3cbe5b6bf6642e76ad9145d2cb26a1ae94b6880186c86a196eac851d97f10fe000 SHA512 44b1f8a4eb74480d878fc8e8f9a1eb1ed8cdc35c9f4091cce2b6668d0b9afa86538e7dab5271ef9e6ea07d71e0e3cf4d9325297c3abfe2a63a754134166c02f1
-EBUILD php-7.2.12.ebuild 22464 BLAKE2B 43c52b71820962862ce7e208e45bea5180014075894125075fbfd0f217412f3cbe5b6bf6642e76ad9145d2cb26a1ae94b6880186c86a196eac851d97f10fe000 SHA512 44b1f8a4eb74480d878fc8e8f9a1eb1ed8cdc35c9f4091cce2b6668d0b9afa86538e7dab5271ef9e6ea07d71e0e3cf4d9325297c3abfe2a63a754134166c02f1
-EBUILD php-7.2.13.ebuild 22565 BLAKE2B 3744aa6f80c3de1db2ecd9bf1358d3afdca6fde51a840fdc290ca90ab35859f7c15d3881b6726722486bb22e0d767405f7cbd0cfdb05888496c79f5209b4709f SHA512 614cb46ded4c189475352dce004f2ef20636470c9d289c9482144417defc184a3f6a63407ddda20cef723730fac266c33c204856d9a1796b41cfdd514f9e9ed7
-EBUILD php-7.3.0.ebuild 22531 BLAKE2B 06ff025e987ed3d150fd3309ac3837a9a2f69b50f13ff42977aa7d5977916fddc700f9c95cdba608980d3e95164b0c50b03fbd4939f9faadc77f1b86e6dac046 SHA512 7772c5ea41b650e2e1acb46c79a4a6400bbc760a18b8439b62361b4e49c9d91b9bfaa40dd05b8409bf77f473495987c58ec8c0d5c8d81e9c0386ab358629ca13
+EBUILD php-7.2.14.ebuild 22565 BLAKE2B dbd79aa6952966fd85749d2323ff72b32cd43018b8685e83321410b6fb7f37ce495e49c08daa0559900855d01d605f4981e5eddd6414fe343e54bb0caa660e9d SHA512 8108f9c95763d767dbfa125f9c4c46e9ed4e76db2cf4e4e708993483ca917607167d43a50c7a90485df0c2d530b65cf2b1cfe30f4e2229f23f1b70074ae14e99
+EBUILD php-7.3.1.ebuild 22531 BLAKE2B 5e7829bfce6c1d99cf39cf1058f2c3f896de26a71880a1365ed4fca9c40977208165d201bb5abffda0e8c39d722d4565a62200cf438f043cafd82192e9f21e57 SHA512 929c387adb105d805a16536f7fa87f2d8c134c39485eeec6433ca5a154d302a64d904b8c5b25796f1f4f1e5deab304e0363e692e6784d2a4ea8ed36a163e18c1
 MISC metadata.xml 3268 BLAKE2B fcd85522c4dbea03403eee66cd3be945f4f998d5eb483ac9c47bd2be2f5f2f4be8586ecc58d50ced7798fdd63ef2136e56d559fa06e870d242239127a97b7b76 SHA512 c44c7fdf1592ba4c0b2cf6f29a97a4a214d2193cb164dcc90454e4a762860a5f3fa67908217543fe72811d403c2ef3b15d2f80f2657f09c1e078d31ef35c12f4
diff --git a/dev-lang/php/php-5.6.38-r1.ebuild b/dev-lang/php/php-5.6.38-r1.ebuild
deleted file mode 100644
index 362851c1e1d5..000000000000
--- a/dev-lang/php/php-5.6.38-r1.ebuild
+++ /dev/null
@@ -1,779 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic eapi7-ver systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz
-	https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( <dev-libs/icu-61.1:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/libmysqlclient:= )
-		mysqli? ( virtual/libmysqlclient:= )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	vpx? ( media-libs/libvpx:0= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	vpx? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	recode? ( !imap !mysql !mysqli !libmysqlclient )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	sharedmem? ( !threads )
-"
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
-	eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
-	eapply "${DISTDIR}/php-5.6-openssl-1.1-compatibility.patch"
-	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
-		|| die
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	eapply_user
-
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with mssql mssql "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_with truetype t1lib "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-		$(use_with vpx vpx-dir "${EPREFIX}/usr")
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib)
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.39.ebuild b/dev-lang/php/php-5.6.39.ebuild
deleted file mode 100644
index 18d767d93953..000000000000
--- a/dev-lang/php/php-5.6.39.ebuild
+++ /dev/null
@@ -1,785 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz
-	https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib:0=
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/libmysqlclient:= )
-		mysqli? ( virtual/libmysqlclient:= )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
-	)
-	unicode? ( dev-libs/oniguruma:= )
-	vpx? ( media-libs/libvpx:0= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib:0=
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	vpx? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	recode? ( !imap !mysql !mysqli !libmysqlclient )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	sharedmem? ( !threads )
-"
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
-	eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
-	eapply "${DISTDIR}/php-5.6-openssl-1.1-compatibility.patch"
-	eapply "${FILESDIR}/php-5.6-intl-detect-icu-via-pkg-config.patch"
-	eapply "${FILESDIR}/php-5.6-intl-use-icu-namespace.patch"
-	eapply "${FILESDIR}/php-5.6-intl-icu-memory-corruption.patch"
-	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
-		|| die
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	eapply_user
-
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-
-	mv configure.in configure.ac || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with mssql mssql "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_with truetype t1lib "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-		$(use_with vpx vpx-dir "${EPREFIX}/usr")
-	)
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib)
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.40.ebuild b/dev-lang/php/php-5.6.40.ebuild
new file mode 100644
index 000000000000..e2eae91bd9b6
--- /dev/null
+++ b/dev-lang/php/php-5.6.40.ebuild
@@ -0,0 +1,785 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz
+	https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib:0=
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/libmysqlclient:= )
+		mysqli? ( virtual/libmysqlclient:= )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+	)
+	unicode? ( dev-libs/oniguruma:= )
+	vpx? ( media-libs/libvpx:0= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib:0=
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	vpx? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	recode? ( !imap !mysql !mysqli !libmysqlclient )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	sharedmem? ( !threads )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+	eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
+	eapply "${DISTDIR}/php-5.6-openssl-1.1-compatibility.patch"
+	eapply "${FILESDIR}/php-5.6-intl-detect-icu-via-pkg-config.patch"
+	eapply "${FILESDIR}/php-5.6-intl-use-icu-namespace.patch"
+	eapply "${FILESDIR}/php-5.6-intl-icu-memory-corruption.patch"
+	eapply "${FILESDIR}/php-freetype-2.9.1.patch"
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.23.ebuild b/dev-lang/php/php-7.1.23.ebuild
deleted file mode 100644
index b5d12b4aed60..000000000000
--- a/dev-lang/php/php-7.1.23.ebuild
+++ /dev/null
@@ -1,734 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.1.24.ebuild b/dev-lang/php/php-7.1.24.ebuild
deleted file mode 100644
index b5d12b4aed60..000000000000
--- a/dev-lang/php/php-7.1.24.ebuild
+++ /dev/null
@@ -1,734 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.1.25.ebuild b/dev-lang/php/php-7.1.25.ebuild
deleted file mode 100644
index 4f5aca9bdc9d..000000000000
--- a/dev-lang/php/php-7.1.25.ebuild
+++ /dev/null
@@ -1,736 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
-	coverage crypt +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-	"${FILESDIR}/php-7.1.25-intl-detect-icu-via-pkg-config.patch"
-	"${FILESDIR}/php-7.1.25-intl-use-icu-namespace.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with crypt mcrypt "${EPREFIX}/usr")
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.1.26.ebuild b/dev-lang/php/php-7.1.26.ebuild
new file mode 100644
index 000000000000..4b508c147df3
--- /dev/null
+++ b/dev-lang/php/php-7.1.26.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.1.25-intl-detect-icu-via-pkg-config.patch"
+	"${FILESDIR}/php-7.1.25-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.11.ebuild b/dev-lang/php/php-7.2.11.ebuild
deleted file mode 100644
index 818e210d1a58..000000000000
--- a/dev-lang/php/php-7.2.11.ebuild
+++ /dev/null
@@ -1,746 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-	zip-encryption? ( zip )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.12.ebuild b/dev-lang/php/php-7.2.12.ebuild
deleted file mode 100644
index 818e210d1a58..000000000000
--- a/dev-lang/php/php-7.2.12.ebuild
+++ /dev/null
@@ -1,746 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-	zip-encryption? ( zip )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.13.ebuild b/dev-lang/php/php-7.2.13.ebuild
deleted file mode 100644
index 8c9fb3ab3022..000000000000
--- a/dev-lang/php/php-7.2.13.ebuild
+++ /dev/null
@@ -1,748 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( hash || ( mysqli pdo ) )
-	mysqli? ( hash )
-	zip-encryption? ( zip )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-	"${FILESDIR}/php-7.1.25-intl-detect-icu-via-pkg-config.patch"
-	"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.2.14.ebuild b/dev-lang/php/php-7.2.14.ebuild
new file mode 100644
index 000000000000..e76e0e56e784
--- /dev/null
+++ b/dev-lang/php/php-7.2.14.ebuild
@@ -0,0 +1,748 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.1.25-intl-detect-icu-via-pkg-config.patch"
+	"${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.0.ebuild b/dev-lang/php/php-7.3.0.ebuild
deleted file mode 100644
index a349c94b9431..000000000000
--- a/dev-lang/php/php-7.3.0.ebuild
+++ /dev/null
@@ -1,748 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eapi7-ver systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://secure.php.net/"
-SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
-	BSD
-	Zend-2.0
-	bcmath? ( LGPL-2.1+ )
-	fpm? ( BSD-2 )
-	gd? ( gd )
-	unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-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"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
-	coverage +ctype curl debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
-	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session session-mm sharedmem
-	+simplexml snmp soap sockets sodium spell sqlite ssl
-	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
-	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
-	>=dev-libs/libpcre2-10.30[unicode]
-	fpm? ( acl? ( sys-apps/acl ) )
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	argon2? ( app-crypt/argon2:= )
-	berkdb? ( || (	sys-libs/db:5.3
-					sys-libs/db:5.1
-					sys-libs/db:4.8
-					sys-libs/db:4.7
-					sys-libs/db:4.6
-					sys-libs/db:4.5 ) )
-	bzip2? ( app-arch/bzip2:0= )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	coverage? ( dev-util/lcov )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( <app-text/enchant-2.0:0 )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-	gmp? ( dev-libs/gmp:0= )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	lmdb? ( dev-db/lmdb:= )
-	mssql? ( dev-db/freetds[mssql] )
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql:* )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline:0= )
-	recode? ( app-text/recode )
-	session-mm? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	sodium? ( dev-libs/libsodium:= )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	truetype? ( =media-libs/freetype-2* )
-	unicode? ( dev-libs/oniguruma:= )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	webp? ( media-libs/libwebp:0= )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? ( x11-libs/libXpm )
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
-	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/mta
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	>=sys-devel/bison-3.0.1"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
-	|| ( cli cgi fpm apache2 embed phpdbg )
-	cli? ( ^^ ( readline libedit ) )
-	truetype? ( gd zlib )
-	webp? ( gd zlib )
-	cjk? ( gd zlib )
-	exif? ( gd zlib )
-	xpm? ( gd zlib )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysqli !mysql )
-	session-mm? ( session !threads )
-	mysql? ( || ( mysqli pdo ) )
-	zip-encryption? ( zip )
-"
-PATCHES=(
-	"${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	# Always install the production INI file, bug 611214.
-	local phpinisrc="php.ini-production-${phpsapi}"
-	cp php.ini-production "${phpinisrc}" || die
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" php.ini
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
-			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
-			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-	if [[ "${sapi}" == "fpm" ]] ; then
-		einfo "Installing FPM config files php-fpm.conf and www.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		doins sapi/fpm/php-fpm.conf
-		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
-		doins sapi/fpm/www.conf
-	fi
-
-	dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	default
-
-	# In php-7.x, the FPM pool configuration files have been split off
-	# of the main config. By default the pool config files go in
-	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
-	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
-	# we'll install the pool configuration file "www.conf" there.
-	php_set_ini_dir fpm
-	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
-		sapi/fpm/php-fpm.conf.in \
-		|| die 'failed to move the include directory in php-fpm.conf'
-
-	# Bug 669566 - necessary so that build tools are updated for commands like pecl
-	# Force rebuilding aclocal.m4
-	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
-	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
-	local our_conf=(
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}/man"
-		--infodir="${PHP_DESTDIR}/info"
-		--libdir="${PHP_DESTDIR}/lib"
-		--with-libdir="$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-pear
-		$(use_enable threads maintainer-zts)
-	)
-
-	our_conf+=(
-		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
-		$(use_enable bcmath bcmath)
-		$(use_with bzip2 bz2 "${EPREFIX}/usr")
-		$(use_enable calendar calendar)
-		$(use_enable coverage gcov)
-		$(use_enable ctype ctype)
-		$(use_with curl curl "${EPREFIX}/usr")
-		$(use_enable xml dom)
-		$(use_with enchant enchant "${EPREFIX}/usr")
-		$(use_enable exif exif)
-		$(use_enable fileinfo fileinfo)
-		$(use_enable filter filter)
-		$(use_enable ftp ftp)
-		$(use_with nls gettext "${EPREFIX}/usr")
-		$(use_with gmp gmp "${EPREFIX}/usr")
-		$(use_enable hash hash)
-		$(use_with mhash mhash "${EPREFIX}/usr")
-		$(use_with iconv iconv \
-			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
-		$(use_enable intl intl)
-		$(use_enable ipv6 ipv6)
-		$(use_enable json json)
-		$(use_with kerberos kerberos "${EPREFIX}/usr")
-		$(use_enable xml libxml)
-		$(use_with xml libxml-dir "${EPREFIX}/usr")
-		$(use_enable unicode mbstring)
-		$(use_with unicode onig "${EPREFIX}/usr")
-		$(use_with ssl openssl "${EPREFIX}/usr")
-		$(use_with ssl openssl-dir "${EPREFIX}/usr")
-		$(use_enable pcntl pcntl)
-		$(use_enable phar phar)
-		$(use_enable pdo pdo)
-		$(use_enable opcache opcache)
-		$(use_with postgres pgsql "${EPREFIX}/usr")
-		$(use_enable posix posix)
-		$(use_with spell pspell "${EPREFIX}/usr")
-		$(use_with recode recode "${EPREFIX}/usr")
-		$(use_enable simplexml simplexml)
-		$(use_enable sharedmem shmop)
-		$(use_with snmp snmp "${EPREFIX}/usr")
-		$(use_enable soap soap)
-		$(use_enable sockets sockets)
-		$(use_with sodium sodium "${EPREFIX}/usr")
-		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
-		$(use_enable sysvipc sysvmsg)
-		$(use_enable sysvipc sysvsem)
-		$(use_enable sysvipc sysvshm)
-		$(use_with tidy tidy "${EPREFIX}/usr")
-		$(use_enable tokenizer tokenizer)
-		$(use_enable wddx wddx)
-		$(use_enable xml xml)
-		$(use_enable xmlreader xmlreader)
-		$(use_enable xmlwriter xmlwriter)
-		$(use_with xmlrpc xmlrpc)
-		$(use_with xslt xsl "${EPREFIX}/usr")
-		$(use_enable zip zip)
-		$(use_with zip-encryption libzip "${EPREFIX}/usr")
-		$(use_with zlib zlib "${EPREFIX}/usr")
-		$(use_enable debug debug)
-	)
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm || use lmdb || use tokyocabinet ; then
-		our_conf+=( "--enable-dba${shared}" )
-	fi
-
-	# DBA drivers support
-	our_conf+=(
-		$(use_with cdb cdb)
-		$(use_with berkdb db4 "${EPREFIX}/usr")
-		$(use_enable flatfile flatfile)
-		$(use_with gdbm gdbm "${EPREFIX}/usr")
-		$(use_enable inifile inifile)
-		$(use_with qdbm qdbm "${EPREFIX}/usr")
-		$(use_with lmdb lmdb "${EPREFIX}/usr")
-	)
-
-	# Support for the GD graphics library
-	our_conf+=(
-		$(use_with truetype freetype-dir "${EPREFIX}/usr")
-		$(use_enable cjk gd-jis-conv)
-		$(use_with gd jpeg-dir "${EPREFIX}/usr")
-		$(use_with gd png-dir "${EPREFIX}/usr")
-		$(use_with xpm xpm-dir "${EPREFIX}/usr")
-	)
-	if use webp; then
-		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
-	fi
-	# enable gd last, so configure can pick up the previous settings
-	our_conf+=( $(use_with gd gd) )
-
-	# IMAP support
-	if use imap ; then
-		our_conf+=(
-			$(use_with imap imap "${EPREFIX}/usr")
-			$(use_with ssl imap-ssl "${EPREFIX}/usr")
-		)
-	fi
-
-	# Interbase/firebird support
-	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
-	# LDAP support
-	if use ldap ; then
-		our_conf+=(
-			$(use_with ldap ldap "${EPREFIX}/usr")
-			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
-		)
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-
-	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
-	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
-	if use mysql || use mysqli ; then
-		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
-	fi
-
-	# ODBC support
-	our_conf+=(
-		$(use_with odbc unixODBC "${EPREFIX}/usr")
-		$(use_with iodbc iodbc "${EPREFIX}/usr")
-	)
-
-	# Oracle support
-	our_conf+=( $(use_with oci8-instant-client oci8) )
-
-	# PDO support
-	if use pdo ; then
-		our_conf+=(
-			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
-			$(use_with mysql pdo-mysql "${mysqllib}")
-			$(use_with postgres pdo-pgsql)
-			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
-			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
-			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
-			$(use_with oci8-instant-client pdo-oci)
-		)
-	fi
-
-	# readline/libedit support
-	our_conf+=(
-		$(use_with readline readline "${EPREFIX}/usr")
-		$(use_with libedit libedit "${EPREFIX}/usr")
-	)
-
-	# Session support
-	if use session ; then
-		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
-	else
-		our_conf+=( $(use_enable session session) )
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	our_conf+=( --with-pic )
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	# --with-pcre-valgrind cannot be enabled with system pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-pcre-regex="${EPREFIX}/usr"
-		--with-pcre-dir="${EPREFIX}/usr"
-		--without-pcre-valgrind
-		--without-pcre-jit
-	)
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Cache the ./configure test results between SAPIs.
-	our_conf+=( --cache-file="${T}/config.cache" )
-
-	# Support user-passed configuration parameters
-	our_conf+=( ${EXTRA_ECONF:-} )
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build" || die
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		# The BUILD_DIR variable is used to determine where to output
-		# the files that autotools creates. This was all originally
-		# based on the autotools-utils eclass.
-		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-		cp -a "${S}" "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		local sapi_conf=(
-			--with-config-file-path="${PHP_INI_DIR}"
-			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
-		)
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm|phpdbg)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( "--enable-${sapi}" )
-						if [[ "fpm" == "${sapi}" ]] ; then
-							sapi_conf+=(
-								$(use_with acl fpm-acl)
-								$(use_with systemd fpm-systemd)
-							)
-						fi
-					else
-						sapi_conf+=( "--disable-${sapi}" )
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
-					else
-						sapi_conf+=( --without-apxs2 )
-					fi
-					;;
-			esac
-		done
-
-		# Construct the $myeconfargs array by concatenating $our_conf
-		# (the common args) and $sapi_conf (the SAPI-specific args).
-		local myeconfargs=( "${our_conf[@]}" )
-		myeconfargs+=( "${sapi_conf[@]}" )
-
-		pushd "${BUILD_DIR}" > /dev/null || die
-		econf "${myeconfargs[@]}"
-		popd > /dev/null || die
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-	addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || \
-				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index #nowarn
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi" || die
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir "/usr/share/php${PHP_MV}"
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}" || die
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp${PHP_MV}$(get_libname)" \
-					   "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					phpdbg)
-						source="sapi/phpdbg/phpdbg"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}"
-				else
-					dobin "${source}"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
-							"php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
-							"php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
-		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
-					  "session.save_path=${T}" \
-					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
-					  "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		elog
-		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
-		elog "your apache2 command. OpenRC users can append that string to"
-		elog "APACHE2_OPTS in /etc/conf.d/apache2."
-		elog
-		elog "The apache module configuration file 70_mod_php.conf is"
-		elog "provided (and maintained) by eselect-php."
-		elog
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT} || die
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	# Remove dead symlinks for SAPIs that were just disabled. For
-	# example, if the user has the cgi SAPI enabled, then he has an
-	# eselect-php symlink for it. If he later reinstalls PHP with
-	# USE="-cgi", that symlink will break. This call to eselect is
-	# supposed to remove that dead link per bug 572436.
-	eselect php cleanup || die
-
-	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
-	   elog "To build extensions for this version of PHP, you will need to"
-	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
-	   elog
-	fi
-
-	# Warn about the removal of PHP_INI_VERSION if the user has it set.
-	if [[ -n "${PHP_INI_VERSION}" ]]; then
-		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
-		ewarn 'remove it from your configuration at your convenience. See'
-		ewarn
-		ewarn '  https://bugs.gentoo.org/611214'
-		ewarn
-		ewarn 'for more information.'
-	fi
-
-	elog "For details on how version slotting works, please see"
-	elog "the wiki:"
-	elog
-	elog "  https://wiki.gentoo.org/wiki/PHP"
-	elog
-}
-
-pkg_postrm() {
-	# This serves two purposes. First, if we have just removed the last
-	# installed version of PHP, then this will remove any dead symlinks
-	# belonging to eselect-php. Second, if a user upgrades slots from
-	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
-	# his existing symlinks to point to the new 7.0 installation. The
-	# latter is bug 432962.
-	#
-	# Note: the eselect-php package may not be installed at this point,
-	# so we can't die() if this command fails.
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.1.ebuild b/dev-lang/php/php-7.3.1.ebuild
new file mode 100644
index 000000000000..189bf20f3661
--- /dev/null
+++ b/dev-lang/php/php-7.3.1.ebuild
@@ -0,0 +1,748 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eapi7-ver systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+	zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	zip-encryption? ( zip )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sodium sodium "${EPREFIX}/usr")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zip-encryption libzip "${EPREFIX}/usr")
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	# --with-pcre-valgrind cannot be enabled with system pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+		--without-pcre-valgrind
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a2180fc1bf2e..5033fe2002e6 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,8 +16,8 @@ DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7
 DIST ruby-2.6.0.tar.xz 11918536 BLAKE2B f51fe57c1ff83d99c834f29d1bcc8e847f7a4cd3a10e202391327373d9d803fcc356d210cc07b9038915039a7462c0263fa7567b63366d1ab6273b9a82e651d1 SHA512 c56eaf85ef7b79deb34ee4590b143c07f4fc83eb79775290761aee5a7c63374659613538a41f25706ed6e19e49d5c67a1014c24d17f29948294c7abd0b0fcea8
 DIST ruby-patches-2.3.8-r1.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
 EBUILD ruby-2.3.8-r1.ebuild 6877 BLAKE2B aa01c8cecf39d0ff2f221d4b51a79d258df1a31687bb3b18154ffd4b998fe73e43304339eb3d49ed6b691ac96cb821730c866a180d4199d8659dc53b24a43790 SHA512 03bfc466d6f8890c353056d702c9af7c0dd789606d3f7b3f83b087ab5bdb619fafcf6fd1021e73b5f37b78fa9214b9a473ba2b3619ea7e51a13fe2d35ad7cce0
-EBUILD ruby-2.4.5-r1.ebuild 6631 BLAKE2B 11b247fb28a2e0eb9d9997829327991b6bb730fde51bbf6e68c2136cefa8c99c3193ebe60cac8dacb37f967af69293b2b18515638ba01a6fde9e4eb2efcd20ce SHA512 0780e2d9c06967e1d6184909b553a90d20341741a5a66ccc3096fc72b6758af6c6d66822618839d9c0fc898424cbbab8f9b4de29109ca9bf01ba103baf88cf21
-EBUILD ruby-2.4.5.ebuild 6617 BLAKE2B adcef1d6173667bccb066244400be4d9ee9e309790a6312f38b06a4074eb66b044e2a350930bbb47b281cdc547814aebc98d5c50ba815c53615b463653449cea SHA512 33be7e1798cb2008914d49dce2de371cff94be22c46f69fb8d4f5483e97502671bddb0c08c2041d31f6a408fe39537e25a9e5febc7a00406afd2318dfaa5530f
-EBUILD ruby-2.5.3.ebuild 6419 BLAKE2B 197a536b058b026cd0fa211fe4a391e4deb617d047e4ca200e5674383b94aa3d1dbccc56235303ae7caa8e405939a0e3211e6e4110cb52ae513c824ce969c8b1 SHA512 8b366d49c0e23dc5c1b1554db2238c084e39ac37d89f8a71b6c5e40b8e1025712de118ce622631f93081589c49dbcb543883ed0629d6a0b4925c18bc81b2c26d
-EBUILD ruby-2.6.0-r1.ebuild 6858 BLAKE2B 6a7350189f7a1809e495389cc49759f6be33677d3e43274522cb9bc38485d1f34b08f24f30f0e516a5509fc24ffc83351134ad7c0be568c55e2596beaa92ce0e SHA512 b1c16bb76b21b5ff2219880d81629f7151b4a4ba51ee1e8b733e5df625c1d0a7492b093167badc7278f2f45aa97f6cbacc7e3cf3fd71f9c457dca1e37cc8204c
+EBUILD ruby-2.4.5-r1.ebuild 6653 BLAKE2B a62d8e82bcdd8dc0fe40b23163a202789df2345a237905180c3f1a87b48664d959492cb9b488125b363d04f3d5e69398f260c4cddba14d6c19587445e6a56dcb SHA512 878744fca945aca6dd9a4a66c4030b52868da3aa44256974131ddbe0f4aefd2916388b389b458bd58e670114a32c01e2024084dde2e5cc472344508c8656112b
+EBUILD ruby-2.4.5.ebuild 6639 BLAKE2B f65d2222da50c671e2a3f369ead18c7a736709a3fa5b5630e92f7faf2f0e4d81add663b63de91e94432786997099ea8efb98222dc40f2d83cc39f94410908afe SHA512 31e9207b49054adc86796f24baf271b6bd7ed1ab55417c5ca34b287644d1d9b5a82fd08564b24f1e5760a6258d554cc94ff56b730f211aa420161aa34ef13e64
+EBUILD ruby-2.5.3.ebuild 6441 BLAKE2B 9c8fd5b761a8653983be1a7e37df0f7b515dab2bf566ee9d8327635f47d2605904795bc90a6396d1c7b667c3792a4fc0f45683bdc6b8b63def204129189e2afa SHA512 f875337bd521bd1dec9543f95079a025c214c925f18deee54e477010ad2f9a7fe7ca65b26a614081023c6551661bdb8dce0ce55415ce99c83b5fb9c52ce6db86
+EBUILD ruby-2.6.0-r1.ebuild 6880 BLAKE2B 484e071ad6c79233a258309c118071dfbbf40e4571e29d6af3e2a71f53ba2a93434b4d1ea6a4a0d3f079f2ee21392afc4164262b9697dec4bda3f050b953c3c1 SHA512 54fd9e1336cba0c626eeeb991f82ef8a044cb21bf2263e159e0489def23385e96054e46f06259d945e08313ceb0f6f88fcc62adb8ceb660dc041d293913cc616
 MISC metadata.xml 824 BLAKE2B e426ed390cdea118f3301d329ce93729095bafb0a04db9a64edfd709251d6f16f91153d56976f99b82d7a9df4a452513d65593732ccbd7f71332870b52f369a7 SHA512 b6f4fab5888fb9605164d7f627edc86514ec2f83d9dd8c74003ccc5a0d9b6a306986930e027e81f09928fc7ac6677a7de58cebf75c31c2ada73e2a506a447453
diff --git a/dev-lang/ruby/ruby-2.4.5-r1.ebuild b/dev-lang/ruby/ruby-2.4.5-r1.ebuild
index 1555bd43a75f..04e38de79d98 100644
--- a/dev-lang/ruby/ruby-2.4.5-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ RDEPEND="
 	)
 	dev-libs/libyaml
 	virtual/libffi:=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20161226
 	!<dev-ruby/rdoc-3.9.4
diff --git a/dev-lang/ruby/ruby-2.4.5.ebuild b/dev-lang/ruby/ruby-2.4.5.ebuild
index d42c9f75e2ab..bcd79ecb3247 100644
--- a/dev-lang/ruby/ruby-2.4.5.ebuild
+++ b/dev-lang/ruby/ruby-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ RDEPEND="
 	)
 	dev-libs/libyaml
 	virtual/libffi:=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20161226
 	!<dev-ruby/rdoc-3.9.4
diff --git a/dev-lang/ruby/ruby-2.5.3.ebuild b/dev-lang/ruby/ruby-2.5.3.ebuild
index 227ceca8820c..7c56ce9dff6e 100644
--- a/dev-lang/ruby/ruby-2.5.3.ebuild
+++ b/dev-lang/ruby/ruby-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,7 @@ RDEPEND="
 	)
 	dev-libs/libyaml
 	virtual/libffi:=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20171225
 "
diff --git a/dev-lang/ruby/ruby-2.6.0-r1.ebuild b/dev-lang/ruby/ruby-2.6.0-r1.ebuild
index ccaa7a4cae2d..8303c4eeaff7 100644
--- a/dev-lang/ruby/ruby-2.6.0-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,7 @@ RDEPEND="
 	)
 	dev-libs/libyaml
 	virtual/libffi:=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20171225
 "
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 80ce8dc1ad37..3fe31b58fd2b 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -23,5 +23,5 @@ EBUILD spidermonkey-24.2.0-r3.ebuild 4016 BLAKE2B 4f52b07f5f156f701ba6e1dc7837a1
 EBUILD spidermonkey-24.2.0-r4.ebuild 3989 BLAKE2B a859c05afcfe262398de5f0b4d0c148eaf2d94f57e9f029814982efcc740acbfc8349e756f75b3ce83a746571e27a31d88c78126b1b1e0cc9154e4b86f53dc8e SHA512 ca080e9993b2c10aed9abd0d54bd0722e8f4a53ed755f60389e9bf6b0d3347115ca7cc347b708592619ef69f6f1f38e5c9778c949f7224e579e7da09cd269067
 EBUILD spidermonkey-38.3.0.ebuild 3870 BLAKE2B 6a7f006f4cb758971945ad3c1f55b6aba78a5bc0847c6c5477abcd14c51453c999f161acc70d0efd2be0b9bdc414a4093d5ce4c7b472992c910be1025cf7d83b SHA512 fe84cf0d5a1e245bf89a449e6aeded26ea2091facd69341f264fceff6ebe48755c51b344eac9762ec6bf45ecc22a705fb6579e7f0beae7424bdad19f58e3a25f
 EBUILD spidermonkey-45.0.2.ebuild 3980 BLAKE2B 8f5b8aaba2c9ffc9adf16ff14216375434ddb3511add9817022e2913b41b415fdb3a2899ab341dc3e389460dbdf6d00cfb86270e8fd7a8de78eda6bbfc73b6ee SHA512 f99a6f6385e9cd39b8f6acb63b4c5f6e05250eb475e7906c6b06251c2a3de593d2617cbed3ef9f5c13b6009bcac6cb9b989ec362e0bfc6e351adcbec033d2806
-EBUILD spidermonkey-52.9.1_pre1.ebuild 4228 BLAKE2B 0a7487c06f20ca465b348dc4ed8ec283868b8df40ca643befe096c27a12fb034b16b62cfa588c505bd96960db64837af2e07c9fbe51a5b1044d9cf90ccde3409 SHA512 f9f54eb60b550669b3fb9a683f7d548f0a8dca7ca6b1352c71ebbe4a3024b22612a87cb8ca2a3cc3106ae28dcb461254d497ac8b0836eb33512fb3e5a72584e9
+EBUILD spidermonkey-52.9.1_pre1.ebuild 4227 BLAKE2B 3ffdc94b92b8ff62b049ff4573db52ca5fadd14877e07729beb89a7ee9305503ffd6a4a0494ef9c983b2358da1c0bdb1343f5ab10693d8a25fd8addb55965ae4 SHA512 d1958e8206423a5817285cf61b8f3c7f8a67015807cba9cc3c2f0035c18e151df7f7ea508d115f316194cbe5961905991aae14446db96c09f3e694a3bf5cc532
 MISC metadata.xml 906 BLAKE2B 8557bb4bfdce358f543be3ff571177d61beb5713ba6fa4c24c8e91522ca30f8c5b1bf42abd0324164cc6febd04d07c1ae3a311d6d68d62992be6368c20650ca9 SHA512 a411a781913fe81801799d4d801645fd8029ee4fb727431589cb948f97464edd828b8d86969b2207880432db8e8e627fad829fd95394fa121bb0ae97ae8249b0
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
index f2fe8d1b2cc9..fdc25eefab6e 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.
 
 LICENSE="NPL-1.1"
 SLOT="52"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug minimal +system-icu test"
 
 RESTRICT="ia64? ( test )"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index c984a8a3e2ab..1f73d74d6891 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -6,9 +6,11 @@ DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9a
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 DIST swipl-7.7.22.tar.gz 10408402 BLAKE2B e804190a07ad000f054f05bda6c895cae7aa588d6e31a86f17bf2ae4934d747939023035ac8a1b758e5d8e82a39f4a493d19fa41ee323a91333903b7ccb1b78b SHA512 bce8fa4bda39c8841533b4b8d98520b04df3272d8fe49924a49d5c6b7c66ab2defe5d121b1c7fb83506842645258ab6925a1c18740322f468c08e19374f67bfb
 DIST swipl-7.7.23.tar.gz 10422411 BLAKE2B 88a28d290070524d9f552e9d816f70723ac3ceb20dd8ae14e2f894188de024c89157ab68cb692b3a56839580047ebea92f4b6c3c39694b0b0077fd5c4616b30d SHA512 38430827c7f1fd151b448b0c71cd53a59681dfd04b97b8f71c3fcb6d4f86d261f46c3e76d4ebb52e987b665a7505ab5ee1d8528613f9b6bf319d177deb09d28f
+DIST swipl-7.7.24.tar.gz 10433121 BLAKE2B 25efe95c11000fa19ff66ff52ecede8d4fb24c99a4405e1e16313e66947d61f64d572ec1d54017542ea9999258115f647a77a9d7871495b47d6ab3873c2d3f61 SHA512 24c2ffbe7ef9906451490f4b7cfec6afa969a59d265479b659e4287e30c4d00aa977cf55dbe81e560812f517b1270657a360bd917f94660ff2a05fb52efa4cbf
 EBUILD swi-prolog-7.4.2.ebuild 3398 BLAKE2B 368ef93ceb17042a28699f9aa469e6b5c39aa29154b810e43fd050ab3bc1079f83680cfac8f4108c7c297a51e9bdd28357a0b6241c08faef3ea5f81ab1605558 SHA512 76d094f62e442ac86d32eaf467179fdcf4d4edf6034f711104e91f8a01b7e343208ef0b6e492ed18c8c0605b96a48f1adef8f3903f861c716e882cb9695b0dd2
 EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0297d5a24d9ef84a48c36600077cea8c8b77b010d28e25dfe0766e12d1f560f42e5597a602f6bdfc7351ea6e0fa62 SHA512 830766267d3e4b60897dfcdab5263cee600ccfa2cd80f970ef3b4c3695cc3ddf9989ae85527f45cdf124898210f108a98a32a613de2543a8db813d42482b0687
 EBUILD swi-prolog-7.6.4.ebuild 3456 BLAKE2B 55d9eb2b52f47dc7fd5df9f2743775e7aabd4f070d93e31f51b038f278604909f1f48dbb4cbd12ba96614f8619923712c465d424eb224874ba158f1670d615d5 SHA512 cf64a47e39b21557915fcd6e88ac5bb01fc56bb26afebf81dedaa087ac12a3c5952383a55594dbe22de8885c6a3afd47858963a4c0c68f705be20045a518d12d
 EBUILD swi-prolog-7.7.22.ebuild 2488 BLAKE2B 1f195a8e10416089ec8d761fd183b0b7631b63c60bc2cb391d0b0ebb92a55c561db407ee6448ac641b0c02011180f0593b6966b51f0aa3371c96e09ec6629b01 SHA512 4f11ed60ede7c6dbccfb0668372384dffb63416554a60d338596f644634ad42a4010274da61c17e1e5d6283a4e295964757ab0d3c7789f2fca70f5d8f3a1750a
 EBUILD swi-prolog-7.7.23.ebuild 2427 BLAKE2B aa119c6fa3572b4ebc5f200630c88a51593ba1b5a155320a0424fbb87940f635db445287f3cd637932c6e6fb6aaecf9486004de90d74495637cc683782489b4d SHA512 9f9e1dd93753c624d4278bf3f260c45bbcf16e202380a45d838a36f272ccdcc3dc50a24efa1f6ca8da1024eb8aca0db7b65e45f097a868733893f1392821f0af
+EBUILD swi-prolog-7.7.24.ebuild 2427 BLAKE2B 71e2150b40422e03dbc34fa9d37e59b8cb568359a583ca4948d33aeddbcc4c52b9085f58c2cd397bb488d2cccc5155246bde8415db6393bbe62093a0a49d8698 SHA512 7151cddf87753b74e68ee7c02d9cfbf92a988d0457a58e60b6956db28e41bdd9585964a1ef188a79fb9d60a9d44c14a2324a1651784041dfbf41570098b52d66
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.24.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.24.ebuild
new file mode 100644
index 000000000000..bba3b8614dd9
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.24.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="versatile implementation of the Prolog programming language"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+
+RDEPEND="sys-libs/ncurses:=
+	sys-libs/zlib
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtgui:5
+	)
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )
+	yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	sed -i -e "s|\(SWIPL_INSTALL_PREFIX\)   lib/.*)|\1   $(get_libdir)/swipl)|" CMakeLists.txt || die
+
+	eapply_user
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DO_DEBUG
+
+	mycmakeargs=(
+		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+		-DUSE_GMP=$(usex gmp)
+		-DINSTALL_DOCUMENTATION=$(usex doc)
+		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
+		-DSWIPL_PACKAGES_BDB=$(usex berkdb)
+		-DSWIPL_PACKAGES_PCRE=$(usex pcre)
+		-DSWIPL_PACKAGES_YAML=$(usex yaml)
+		-DSWIPL_PACKAGES_SSL=$(usex ssl)
+		-DSWIPL_PACKAGES_JAVA=$(usex java)
+		-DSWIPL_PACKAGES_QT=$(usex qt5)
+		-DSWIPL_PACKAGES_X=$(usex X)
+		-DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	USE_PUBLIC_NETWORK_TESTS=false \
+	USE_ODBC_TESTS=false \
+		cmake-utils_src_test -V
+}
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index abc80b8947dc..c767bbaa9283 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -8,9 +8,11 @@ DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40
 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
+DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
 EBUILD tk-8.5.17-r1.ebuild 3566 BLAKE2B a3eae0668b78a075d72b9c8a6751d341d5e021a1cba8d0501fdfb22a25b00095ba289dc46a4bf567e55639172a94dd0401af46651cea11879cdfa367c1e196f3 SHA512 3d09b21189e2cc5016da816ea1fbe99d393704b32aa31a307cdb52bca0d3c91b413031a4ea90b4e52ba12e49cdc22e38d150317b0190243de788a862c83a65b9
 EBUILD tk-8.5.17-r100.ebuild 2162 BLAKE2B e4e280058b3059213d10a20fcabcd54a17e74bf78bd6e18ac5acf3a51a3fd870743ea40dc793b6a0ce5ebbfefe9744f26c900542ed511f4ba2d37c404069bc63 SHA512 e0958680ae7beeb6f5ffe06093f27d482c22cba9dfc71fe727425d8fbe4b20e6270b2ddd6e8860b0f7433f84224f8b8251800570ea81f75209146876fd94bda7
 EBUILD tk-8.5.17-r101.ebuild 2222 BLAKE2B d632b0304e36ffc9d758efd99fa128c83ab655661d25361c747aff17b9dd16ddadd4386ae9586fa131d6e0288228603232eae7ab24088095e48d60ed8c9772e1 SHA512 82594980647370fbae9201e661024216776b8d1e3fa3d198e5181d99e810f681fb5e4cabc00be41dbcd477c99a80c3a1d8822ef285cf294bded8c41f64d63607
 EBUILD tk-8.6.8.ebuild 4116 BLAKE2B dca2259fdb3ae44dcf8f3eb91562b22f9cd8065bc15bad201dee93d868670c13a3026c50e21efa04a8fcb9dfb71b04d824f210914aef85447ac38ce4ed30194b SHA512 ae2c69570844eeee386378ed6b5f66fc8c4dfb2c52a517b8ddf8b65880e600ce7e8cf1fef0e9c04f7e7a549e279f5023d981b5ba2ac82981573aa0265776bb58
+EBUILD tk-8.6.9.1.ebuild 4064 BLAKE2B 744b229835faa450ef10f415ff9f0b26865d78bbdbb931875c9f727c266d93e7ca10e460f78f7b653902ba81f97f82060108889857f08dca5fe685983e783efc SHA512 028397af0b0875a2194079d21c6e72b49062b9a565473a448788e9164a3921c87413c253055f1d2a4f53988c898144a2f4cb3d079cf2b8728a14075be8cb84df
 EBUILD tk-8.6.9.ebuild 4030 BLAKE2B c0a38cae7a1dcba81f9f0389a8313f82799340b58203140d0eeb88f5bcb6149f93b840a971129b1f0019747aac07da8adf28c64e0df5dac6d341191f0dc22ee2 SHA512 67067dc795a38f18d4cdb4f3f53f00f493d14804475da0d0b537833ce6988faf22b7ac248821dbe1a1338bef310b5f29336ec3bf7e6195f2c8cb0af97ae95f8a
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.9.1.ebuild
new file mode 100644
index 000000000000..36af12eb46dc
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.9.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch
+	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	"${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+	eprefixify Makefile.in
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm configure || die
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if tc-is-cross-compiler ; then
+		export ac_cv_func_strtod=yes
+		export tcl_cv_strtod_buggy=1
+	fi
+
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_test() {
+	virtx emake test
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	if multilib_is_native_abi; then
+		dosym wish${v1} /usr/bin/wish
+		dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+	fi
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 6d2b4561dad2..25f9322a2ecd 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809a226236dd8a6bd533bb8ceb5b87add1d4d1c9eec60e0a94e64cafafcd1f46b2b2ae12fc951515fe8571e2195 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0
 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec
-DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
+DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
 EBUILD vala-0.32.1.ebuild 779 BLAKE2B a8eaaeb0010f6d8e69b1c6554e45243a26f28d73be18e33b8e6ec3594863e888b3aa147618fc2cb6bb6b2d83c507f2b5b78b5d3146e819e608a294164e9affb9 SHA512 abf548841218503fea503b57cf6424cf2178858aae82b6d85f79f04a826609149f5cc9c17ba1cd27276fab2764cf14b83401c6a41114ec603775876ef73e1cc0
 EBUILD vala-0.34.16.ebuild 780 BLAKE2B c531790f0f07a15a169f27ed7fb76533368646beec9b6dc20f29bf05f0055d90e30ad5706b5f97956d3ea6be241bafa9932139286f2f22d12e1fb5d6df5624e1 SHA512 51edab676afcc162df78c5a1031c19e80129d9dc27b28b7e3da825d71c173755cf8bbc841c140ce52f7765bd9acad29d31096af8be7d3a09d2e9a835cd2cc285
-EBUILD vala-0.34.9.ebuild 779 BLAKE2B c5afaae1aba3eca78c7cbb50a3c854e7ecabb3545f897d61038df5fccf69d1b7993a79a526926eaeec2a082445fd1eccebeeeb737ec2256431cfd66b6b479755 SHA512 d4ba98022a7077701ea670d411cc50d8c2470cf9d6444a2db4e7fd18a0fa83f9d45b9370899ea2ecdc6a371046fca714528ee9f34b95e60aff29819b981ea41f
 EBUILD vala-0.36.15.ebuild 859 BLAKE2B 5c8d865b6bcca1ea81fe946a15a6477c1249116e995d0f3cbbdd12115c10b9ccdd5577e44b37c0bff6c0e245ada068128d334451f616fecc8158e82afbcd3101 SHA512 8374dc4b879dc3eaa2153be5ae662cf687cda3190316d3b769368186cabf05f5f58dec155cb330daeff7dbfa65cdeb763e919c1ae58049a4285904b487ac90c0
+EBUILD vala-0.36.17.ebuild 868 BLAKE2B f493cf3fd23bf54572722d02abe0759b51a141d4137c58b40a0ab8d92f78e4c4bb5a3353305a8502d661ba219dcc7cc668c7e95c2bc15048c3100b3c95f75871 SHA512 0a86d5003edc0ba773919f6d7b93ecfa6deb42e8a5a489922132df3627f357711c630ad268335bf55f4b5b5525e64e13b8eba0a45901e0e2672b35ff403d9ff8
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.34.9.ebuild b/dev-lang/vala/vala-0.34.9.ebuild
deleted file mode 100644
index afd18d5920eb..000000000000
--- a/dev-lang/vala/vala-0.34.9.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
-inherit gnome2
-
-DESCRIPTION="Compiler for the GObject type system"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/vala-common-${PV}
-"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2
-		dev-libs/gobject-introspection )
-"
-
-src_configure() {
-	# bug 483134
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
-	gnome2_src_configure --disable-unversioned
-}
diff --git a/dev-lang/vala/vala-0.36.17.ebuild b/dev-lang/vala/vala-0.36.17.ebuild
new file mode 100644
index 000000000000..c5622e8f1c96
--- /dev/null
+++ b/dev-lang/vala/vala-0.36.17.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.36"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection )
+"
+
+src_configure() {
+	# bug 483134
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		VALAC=: \
+		WEASYPRINT=:
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c77d3583b36a..279f583ca6a6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 7872d63ce1ec..e3a164297bce 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,3 @@
-DIST appstream-glib-0.6.13.tar.xz 1974864 BLAKE2B e9e0967b7657250659b3597bc2f6b049a20750e6dc66ee3672f3794b8c50f5060e48c7d4cd76d16e9e7d7cbc7d3364b7600e1c20fe24b33538c66d2a80cf0888 SHA512 d7e95a31d3f6fba974af2fab423282c7b0291d1325a634d8040fe2c2c2fcde49981be18900415251b3d71f20bb9e945e16d7c00fa830b27deac2e5547ec4c8b0
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.6.13.ebuild 1607 BLAKE2B eea0a1a10bee741ee4692f82f2ea336b4deaac8cd37c5896be32494b9a9bfec0d05398abaaec44b1bb877ad7d7b3cb6cf7ae13fd4f0d6f7679fe0c15271a31e9 SHA512 64debcba99dbc1659ff1f102ac603c54c883b13a5e9700cb99470bc0028bbf5d9445791daca0b68918d2c57dc9f7af8774979c6437bdae7305300788c3533924
-EBUILD appstream-glib-0.7.9.ebuild 1627 BLAKE2B 3b07109dac64751608a74b44cf1b2c51bd5d0ad57aa7f2a35fdeba41f901028ef265683c2ee9d22a1eed811ce00373e22751cfcc09a9a87580d3cd77bbf32d3e SHA512 28acb5d5b4ceb6aef1e9af97f10fe3aeb29b8e9de38bcbc766542fc6dad89535ba72ab216db00bd369bc29a971afc2b542244d3e5cd388cc7b6faa9ca79acfd5
+EBUILD appstream-glib-0.7.9.ebuild 1625 BLAKE2B 4dc70f130069326fccfe7aff638e1dbdb14c05ba2a5a319669898f49e9286819b54b893afdeb9ec326d3640724fb01fa1d5fb1f8826e73936a22b5e1ee029cbf SHA512 61fc14b820c58422bc7ce556971f754f8fa20ec9dfac5e8e4ec749487e6e8ab2665557237cd3f8f03974876b50cb220ef7a854cc914c6fb56f435596778b3b0c
 MISC metadata.xml 352 BLAKE2B 2d04b5c85e8a4e5a62ddf862b7dc1d757896d4f7a5aa052b9139cb050d16aedf9b571b543484b91d3795a979703b4bebb6c42695f8238939a4179a613110053f SHA512 491790151594360b57d05b217381b3b6c6f3d3a72e8066d923230060a4b05d0e2ff1e31cdcb94eb8b1ac077a011d695f33b857bf049c04292a9e324c065895d9
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
deleted file mode 100644
index d3214a7ab0d3..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="+introspection nls stemmer"
-
-RDEPEND="
-	app-arch/gcab
-	app-arch/libarchive
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.45.8:2
-	>=dev-libs/json-glib-1.1.1
-	dev-libs/libyaml
-	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.51.92:2.4
-	sys-apps/util-linux
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-	x11-libs/gtk+:3
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=sys-devel/gettext-0.19.7
-	dev-util/gperf
-"
-# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
-# are migrated to appstream-glib
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-builder \
-		--enable-firmware \
-		--enable-fonts \
-		--disable-rpm \
-		--disable-static \
-		--enable-dep11 \
-		--enable-man \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		$(use_enable stemmer) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
index ec60c641073a..9b345dfb9a82 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +introspection stemmer"
 
 RDEPEND="
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-libs/libyaml
 	stemmer? ( dev-libs/snowball-stemmer )
 	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 # libxml2 required for glib-compile-resources
 DEPEND="${RDEPEND}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 454926f70bc0..c04600abe6a8 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,10 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
+AUX botan-2.8.0-build.patch 614 BLAKE2B 99a1d63c4703014d858dcd7296eb63d5d46ecb38d349532e9ad2fb7f57e97eefc9421fce9db6e0d28f0464ccad390995bccb7c985cc5498aeb05b063e429ff44 SHA512 0f2e089caa6a65acb955ef74a1776950eaf00b83c6c2bed1e0b6876dbcbb01487fb64be9e6492ddf6428ae7e513c38f49899280bfe23065ceb137678eb2cd9e5
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 DIST Botan-2.8.0.tgz 7152674 BLAKE2B 7838423fc7cc3521b3feb95ab3958f8cd4df86534f1ef30d717b47e54a9a7ae0d2ed6618370b9adfd0a178b509750e5aacda8457caa89f408292837fe3426de0 SHA512 12f734eea3e60a956f75a5b58e9bd83fac7b0dbcd71fb9577b025d171702d87a9a11e2e73162320bdefb2d25f3900757d89dd7fe13089321c88d948efc2ba214
 EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
 EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
-EBUILD botan-2.8.0.ebuild 2494 BLAKE2B 2ff89959474d178a826802df9c6885d6eae6ce379011a3a3609f106d8af2761d6206d628b8cc4d522f97af4e3dcfe25a8962cacbbfc5d1fdee43b47b67f08c0c SHA512 1a67d9d1f391c2f0af33105b2a63be06e5e477b74e1cb2c81769587069c2b542daa635d6768ce76d9b4b977415a03d26505dbeadd698b4b1bbec7e18f33d8b08
+EBUILD botan-2.8.0.ebuild 2539 BLAKE2B b81003c69fd64e252e2fa20e79eeed1ae1340cbdd284ea5c9224ae8c2ccb55660510f1350e856615cc9fb8a21ff73ef8e483a823a0aaaf10255af347b5149b88 SHA512 5c332f6e8a7160333d54ded63285c3a8f56cf9ee1ce47d55ce5f3522014abf4cd53c2ab6699bef5724f50fc7daca5a1b2006e076ded7e03c6a0aa8b0685589a0
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.8.0.ebuild b/dev-libs/botan/botan-2.8.0.ebuild
index f64ebf1a8fe6..4f995a89686a 100644
--- a/dev-libs/botan/botan-2.8.0.ebuild
+++ b/dev-libs/botan/botan-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 BDEPEND="dev-lang/python:*
 	doc? ( dev-python/sphinx )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	local disable_modules=()
 	use boost || disable_modules+=( "boost" )
diff --git a/dev-libs/botan/files/botan-2.8.0-build.patch b/dev-libs/botan/files/botan-2.8.0-build.patch
new file mode 100644
index 000000000000..04755a0381ac
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.8.0-build.patch
@@ -0,0 +1,22 @@
+From 813b7230735960f3e5225f1f74ca680c9ea84101 Mon Sep 17 00:00:00 2001
+From: Shawn Anastasio <shawn@anastas.io>
+Date: Sun, 30 Dec 2018 14:49:43 -0600
+Subject: [PATCH] Add powerpc64le as an alias for ppc64
+
+Add powerpc64le as an alias for the ppc64 build target.
+---
+ src/build-data/arch/ppc64.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
+index 9ab7cccded..23d3bb2a10 100644
+--- a/src/build-data/arch/ppc64.txt
++++ b/src/build-data/arch/ppc64.txt
+@@ -5,6 +5,7 @@ wordsize 64
+ 
+ <aliases>
+ powerpc64
++powerpc64le
+ ppc64le
+ ppc64el
+ </aliases>
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 4c21c788c774..cc1cff6ba04e 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -4,8 +4,10 @@ AUX capstone-4.0-FLAGS.patch 418 BLAKE2B 425d12eeeca7d4ca2d350d0ec821c6861c0fd7d
 AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a9b1cf735cb13835de19eeed208a20c2b4f8b3cf59683ff72bc726b83ca41d696f3889b7019e2751d79c8d4fba48f736018 SHA512 92d839aad1a576ae550c618ffda3cd070419b72b105583f3861d47df0a57f29fbf8b4e1727c7768199fa650e1c734726f7cc8bd0ef913da336ed16d6d77feda4
 AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
+DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
 EBUILD capstone-3.0.5_rc2-r1.ebuild 1444 BLAKE2B d1be427a65e94ba5651b0097e32bc087a9b93790f996e6c966bba8f12114723e16ad0cf3892f3caee7fe5bece69093343e07d4cf05cd93c659be8988cd3ae027 SHA512 abf20572bd401faab86e3ffb8ca03945e7665328c0b66f3946249513bec5fb6fcb13f98c5239ec468c414924768aaa4b73a648d304b28a3eda6450bfa607b01d
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
+EBUILD capstone-4.0.1.ebuild 1451 BLAKE2B 01418b507ec79d9224461267013e6ce8229315de52e98b9a92f7287c8d1b63082f76ced8da608e5a40f59f3381f5dbf8ff7ba92a3a070c840d67ccc4e70801b2 SHA512 57deabf8bce191530a926bfc5750a316a4e1054622c731fdac07dba571c36ed24b6cc1c14b30e5cd84e7c4e9d3619c529ad9e78948cd948da2e4762560c6cf18
 EBUILD capstone-4.0.ebuild 1482 BLAKE2B a58f57f87f1d03efe7ea2335ee3073a43f36a7ac41b01aea3f65f1cc036d16094707aeb1a7f9a2fcf26a57e7e78fe0555cee8513690f1dadba69cc46534b49de SHA512 403ad9a8f467376fc00c4648895c9def8b48f98b406f294ba474f94cbc85b2b99cd16399c736cc280e66df6626dc254751564ab87a93d37033890893e52fe166
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
new file mode 100644
index 000000000000..c0b0864f5e26
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-FLAGS.patch
+	"${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	{
+		cat <<-EOF
+		# Gentoo overrides:
+		#   verbose build
+		V = 1
+		#   toolchain
+		AR = $(tc-getAR)
+		CC = $(tc-getCC)
+		RANLIB = $(tc-getRANLIB)
+		#  toolchain flags
+		CFLAGS = ${CFLAGS}
+		LDFLAGS = ${LDFLAGS}
+		#  libs
+		LIBDIRARCH = $(get_libdir)
+		EOF
+	} >> config.mk || die
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	default
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index f91ff59fa81e..8aa1e02259fb 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -1,4 +1,6 @@
 DIST console_bridge-0.4.0.tar.gz 230398 BLAKE2B 9f8473402d3df14284530be1285b62201fce6d08db7fca6675725fa104bbf929999a2ef84d7a2b7ea12f5645e609447ed7af6e4babe0832d953b3e181ada6071 SHA512 ebfd2ee31bd27380db750e1c40d9f09f50cc7db72f4aceaac9c5bf94894eb8db8ac7cbf67d82cfc27aa154d0e8f2c25ad80b12d06ee90679b5fd6d10fd8d4037
+DIST console_bridge-0.4.2.tar.gz 254013 BLAKE2B 9a02e1a6748c954783615be3242a90a27dd117940dbd5d9a3b5cb1f265ead3c6dc7891a7db2b9f908ce45bc200c50f9e15b5ef1069721d6cc0c9aebd44eb00fe SHA512 21e5d8eaef03512de48189a678318ddc6cb824a99e06885a3185c8316fb1839596c79be4472795b5ffe4be33bf5896b305410fb1144ee979d071e273f66bf532
 EBUILD console_bridge-0.4.0.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
+EBUILD console_bridge-0.4.2.ebuild 660 BLAKE2B 0f97c722af6e86c9181b86b22df65ebbe6b6e1886a5bb462bf4538d4bec4d20ca7e1dc84076426dd8a0e01206e9c693b3c011c890c43d5bbb863d65453e68a69 SHA512 8b712f5dce7bc67dbe004d81820e9b213e85246863ddeb1b883631f52d1c3bf186a78049529a147746cb4ec1eefce4cb51e9f5694c491a4fe93346047f8b1256
 EBUILD console_bridge-9999.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-0.4.2.ebuild b/dev-libs/console_bridge/console_bridge-0.4.2.ebuild
new file mode 100644
index 000000000000..24c3a5e41f0a
--- /dev/null
+++ b/dev-libs/console_bridge/console_bridge-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/console_bridge"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
+HOMEPAGE="http://wiki.ros.org/console_bridge"
+LICENSE="BSD"
+SLOT="0/4"
+IUSE=""
+
+RDEPEND="dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index bbc7ae58afb1..337cfddb8fb2 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -14,6 +14,11 @@ AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2467 BLAKE2B 83acc34ebe96
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
 AUX cyrus-sasl-2.1.26-openssl-1.1.patch 10798 BLAKE2B 4b304d0767b0467ef8df20ca51d6f64339e7b0eb7204dd630e364fa760c532f54d655365d7c96887e7276d40e42377a546e847827a93487318716dd2438a321e SHA512 8fa8370853d0e1f03b701453f79edf783015b354f221467cb64770d88cd0c7bb56b813a16a3777811082b3a2492699264c0447d254b32d033d2c6eaced19486e
 AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 BLAKE2B 4b817b78cfb81181bc2c57402e2e621ccf1cea346c1460d46e76a605cdbd426aefc0fcae5c18c193dcde1562e8fe16a177ead00b3bc3084c03dd0e2466866ac3 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995
+AUX cyrus-sasl-2.1.27-as_needed.patch 1141 BLAKE2B 7d289e96ef1f4593dd48db270dd698a7cf6f21aae3c58043b0f8af30c2d935b24d2a4902f39c9fcfc3261833d1b09032511919f15fc94f62527e46ea25cb2fcc SHA512 9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94
+AUX cyrus-sasl-2.1.27-autotools_fixes.patch 749 BLAKE2B b7f832a5e937053deaf1696f8dbf777ebf789df8165fe90f6d1be7efc47e4114a8a467c74f4acf06245e7ffab22f62436159cd610ebe5c5b0cef61f1cb01fb71 SHA512 0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64
+AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c7b4ef8415df55bf9c5ce821902331792056e6df63e366fd3adebfdf09f0292aae889d0db632521f37ec5ebf74005b71a474ccc6fe250 SHA512 4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904
+AUX cyrus-sasl-2.1.27-doc_build_fix.patch 417 BLAKE2B 2a76fcce47d248ccf0dfd08b6d18c94c5426601964fff64c0579b3c2ef2be28673e80a00f298e4830797adc3404c7c79ebce8b5869af443248bd1a25fdf7f2eb SHA512 6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde
+AUX cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch 734 BLAKE2B fa45f0bc2598602b9bff76fa4462010507227f4e914ae265c2715cbfb13f71848564e886bd59ce9ff0f6ff4920b215cf28a4511d8928cd93283469fa9e657011 SHA512 fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7
 AUX cyrus-sasl.conf 34 BLAKE2B f41e1d0d58f484958648cc6f6e2903cf7555f825a1f073b247b4080f575f8508b9a73c9d02c155178d2031019a48ff6300adf60bbb0286a6f7dc710c72f433c3 SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e
 AUX java.README.gentoo 934 BLAKE2B f3447c8422f07cfc17b5e240d5c2fe894f94118132360dda4a5eb04fa51acab10b13d01fcb68beaf6308926256e7c95c457a43f3f697e0c755c7c08143e6c3f6 SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4
 AUX pwcheck.rc6 409 BLAKE2B c3e27eeeca23d60aad6078d0e66887b40742a516caf585bfe21619275bae59bd2a9da0c31299c03f1c1aff2e340b93b434816e16d196554d59e78b7fdba5f78d SHA512 797317f0361d6d849ca35c5189ba0cb562e58d62022ce7c29229aab71e8ce4c1e3e6409cd3b092b666724a00b0b3b6071e527cc49050fc34590ef3b1a7648f8a
@@ -23,7 +28,9 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
+DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.26-r10.ebuild 7743 BLAKE2B 26b36b8f68ae6af768e41dba4b7946c814411c70fab471dc9c93dc1487d39079306a1e3eb768920720dc7369883804a0b2a92b8a3c1ed6c997879001ea198eb6 SHA512 2b3f5221dfd76f463642ba9fee1d983c383bd9e490dda8cf41ab63e1f63723866faba25bb2042bc35ab954fb4021d9e2450c99da778185c92aa1527dd53eb9e7
 EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b57203513d7f3c8a82c410085c487f39a54706741700025164188dcef9a8b4622c7491ea995e8c33f374b893044a4a608dca3e1c3 SHA512 741e51ddbe4393927fd637ef84d953126c5fc2c5a877077113e36973239cfd3b0879d20c69dafc74a8b108ba363bc8e87db8bfd533da818ede78f20010efdc5e
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
+EBUILD cyrus-sasl-2.1.27-r1.ebuild 8039 BLAKE2B 3fba92605a4038d917f4f2a4e3544aabd3b7047fa0af8a27ad3fea73068b0479364c3302d65e9950ff2cda451abff9dc0e87e9142e1f71864767c6644bf7af5e SHA512 e8ba46123177faa0c664378e26ac26bb975253a35523f02ce993901da0441ad991079ad444d383f3d0879e7fe046529c2a294c9f39890480cb782b2508d459b1
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
new file mode 100644
index 000000000000..707e90d46a20
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+
+CDEPEND="
+	net-mail/mailbase
+	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	mysql? ( virtual/mysql )
+	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	)
+	java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sasl )"
+
+DEPEND="${CDEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
+	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
+	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
+	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
+	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
+)
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Get rid of the -R switch (runpath_switch for Sun)
+	# >=gcc-4.6 errors out with unknown option
+	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+		configure.ac || die
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	# #486740 #468556
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# getpassphrase is defined in /usr/include/stdlib.h
+		append-cppflags -DHAVE_GETPASSPHRASE
+	else
+		# this horrendously breaks things on Solaris
+		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Java support.
+	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myeconfargs=(
+		--enable-login
+		--enable-ntlm
+		--enable-auth-sasldb
+		--disable-cmulocal
+		--disable-krb4
+		--disable-macos-framework
+		--enable-otp
+		--without-sqlite
+		--with-saslauthd="${EPREFIX}"/run/saslauthd
+		--with-pwcheck="${EPREFIX}"/run/saslauthd
+		--with-configdir="${EPREFIX}"/etc/sasl2
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+		--with-sphinx-build=no
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with openldap ldap)
+		$(use_enable ldapdb)
+		$(multilib_native_use_enable sample)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable java)
+		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(use_enable srp)
+		$(use_enable static-libs static)
+
+		# Add authdaemond support (bug #56523).
+		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+		# Fix for bug #59634.
+		$(usex ssl '' --without-des)
+
+		# Use /dev/urandom instead of /dev/random (bug #46038).
+		$(usex urandom --with-devrandom=/dev/urandom '')
+	)
+
+	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+		myeconfargs+=( --enable-sql )
+	else
+		myeconfargs+=( --disable-sql )
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myeconfargs+=( --with-dblib=gdbm )
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myeconfargs+=(
+			--with-dblib=berkeley
+			--with-bdb-incdir="$(db_includedir)"
+		)
+	else
+		einfo "Building without SASLdb support"
+		myeconfargs+=( --with-dblib=none )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	if multilib_is_native_abi && use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		if use sample ; then
+			docinto sample
+			dodoc "${S}"/sample/*.c
+			exeinto /usr/share/doc/${P}/sample
+			doexe sample/client sample/server
+		fi
+
+		# Default location for java classes breaks OpenOffice (bug #60769).
+		if use java; then
+			java-pkg_dojar ${PN}.jar
+			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+			# hackish, don't wanna dig through makefile
+			rm -rf "${ED}/usr/$(get_libdir)/java" || die
+			docinto "java"
+			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+			dodir "/usr/share/doc/${PF}/java/Test"
+			insinto "/usr/share/doc/${PF}/java/Test"
+			doins "${S}"/java/Test/*.java
+		fi
+
+		dosbin saslauthd/testsaslauthd
+	fi
+}
+
+multilib_src_install_all() {
+	doman man/*
+
+	keepdir /etc/sasl2
+
+	# Reset docinto to default value (#674296)
+	docinto
+	dodoc AUTHORS ChangeLog doc/legacy/TODO
+	newdoc pwcheck/README README.pwcheck
+
+	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+	edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes
+
+	docinto html
+	dodoc doc/html/*.html
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+	systemd_dounit "${FILESDIR}/pwcheck.service"
+
+	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+	systemd_dounit "${FILESDIR}/saslauthd.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+	# The get_modname bit is important: do not remove the .la files on
+	# platforms where the lib isn't called .so for cyrus searches the .la to
+	# figure out what the name is supposed to be instead
+	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+		find "${ED}" -name "*.la" -delete || die
+	fi
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	elog "pwcheck and saslauthd home directories have moved to:"
+	elog "  /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
new file mode 100644
index 000000000000..7cd9e151fbb7
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
@@ -0,0 +1,25 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- cyrus-sasl-2.1.27/saslauthd/Makefile.am
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
+@@ -25,7 +25,7 @@
+ saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- cyrus-sasl-2.1.27/sasldb/Makefile.am
++++ cyrus-sasl-2.1.27/sasldb/Makefile.am
+@@ -54,6 +54,6 @@
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ libsasldb_la_LDFLAGS = -no-undefined
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
new file mode 100644
index 000000000000..2ce971efc5b5
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
@@ -0,0 +1,31 @@
+--- cyrus-sasl-2.1.27/configure.ac
++++ cyrus-sasl-2.1.27/configure.ac
+@@ -44,6 +44,8 @@
+ 
+ AC_PREREQ(2.63)
+ 
++AC_CONFIG_MACRO_DIR([config])
++
+ dnl
+ dnl REMINDER: When changing the version number here, please also update
+ dnl the values in win32/include/config.h and include/sasl.h as well.
+--- cyrus-sasl-2.1.27/Makefile.am
++++ cyrus-sasl-2.1.27/Makefile.am
+@@ -44,6 +44,8 @@
+ #
+ ################################################################
+ 
++ACLOCAL_AMFLAGS = -I config
++
+ if SASLAUTHD
+ SAD = saslauthd
+ else
+--- cyrus-sasl-2.1.27/saslauthd/Makefile.am
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
+@@ -1,4 +1,6 @@
+ AUTOMAKE_OPTIONS = 1.7
++ACLOCAL_AMFLAGS = -I ../config
++
+ sbin_PROGRAMS	= saslauthd testsaslauthd
+ EXTRA_PROGRAMS  = saslcache
+ 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
new file mode 100644
index 000000000000..c331039e2f16
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
@@ -0,0 +1,17 @@
+Author: Fabian Fagerholm <fabbe@debian.org>
+Description: This patch makes sure the non-PIC version of libsasldb.a, which
+is created out of non-PIC objects, is not going to overwrite the PIC version,
+which is created out of PIC objects. The PIC version is placed in .libs, and
+the non-PIC version in the current directory.  This ensures that both non-PIC
+and PIC versions are available in the correct locations.
+--- cyrus-sasl-2.1.27/lib/Makefile.am
++++ cyrus-sasl-2.1.27/lib/Makefile.am
+@@ -98,7 +98,7 @@
+ 
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+ 	@echo adding static plugins and dependencies
+-	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
++	$(AR) cru $@ $(SASL_STATIC_OBJS)
+ 	@for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+ 	if test ! -f $$i; then continue; fi; . $$i; \
+ 	for j in $$dependency_libs foo; do \
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
new file mode 100644
index 000000000000..bdd02f779660
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
@@ -0,0 +1,11 @@
+--- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
++++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
+@@ -23,7 +23,7 @@
+ from sphinx import addnodes
+ from sphinx.locale import admonitionlabels, _
+ from sphinx.util.osutil import ustrftime
+-from sphinx.util.compat import docutils_version
++#from sphinx.util.compat import docutils_version
+ 
+ class CyrusManualPageWriter(ManualPageWriter):
+ 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
new file mode 100644
index 000000000000..c585cb158e15
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
@@ -0,0 +1,16 @@
+Gentoo bug #389349
+--- cyrus-sasl-2.1.27/m4/sasl2.m4
++++ cyrus-sasl-2.1.27/m4/sasl2.m4
+@@ -220,7 +220,11 @@
+                  [AC_WARN([Cybersafe define not found])])
+ 
+   elif test "$ac_cv_header_gssapi_h" = "yes"; then
+-    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++                 [#include <gssapi.h>
++                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
++                    hostbased_service_gss_nt_yes
++                  #endif],
+                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
+                                [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
+   elif test "$ac_cv_header_gssapi_gssapi_h"; then
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
new file mode 100644
index 000000000000..e5e436404895
--- /dev/null
+++ b/dev-libs/editline/Manifest
@@ -0,0 +1,4 @@
+AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
+DIST editline-1.16.0.tar.xz 250376 BLAKE2B a9e080eb2b105f7c83dfbb26dfaebf07d7d2d664098504f4995b12b14b100420118ab70454afbba63518f4c510e2349b68923fade2412940e190177cfab442df SHA512 99e1070d9d658aaec82582d5148a58e7039182f9d73e755547bc090682821fbfb29af19261f38db9a0f022e304e8f8e779e79f7b21f57ad5c80af5bcf316c6f6
+EBUILD editline-1.16.0.ebuild 779 BLAKE2B 69e9135b9e9ad50fd347cb21bfbae40fc826167a53c05f8267171d54f48d665903eaa454851e651a1cc83065d6fc0f1328338a9c2810234ca4f0d6a836d73621 SHA512 f85547ae9ae1143454bcb8540ed30752a12234716f36d77ddbe69ea3886f6cd9f60df67fe18439bde49895164c2b65c214611263ef092009f69ab0d014609e79
+MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.16.0.ebuild b/dev-libs/editline/editline-1.16.0.ebuild
new file mode 100644
index 000000000000..d11555380163
--- /dev/null
+++ b/dev-libs/editline/editline-1.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
+HOMEPAGE="http://troglobit.com/projects/editline/"
+SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-1.16.0-rename-man.patch)
+
+src_prepare() {
+	default
+
+	# To avoid collision with dev-libs/libedit
+	# we rename man/editline.3 to man/libeditline.3
+	mv man/editline.3 man/libeditline.3 || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# package installs .pc file
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/editline/files/editline-1.16.0-rename-man.patch b/dev-libs/editline/files/editline-1.16.0-rename-man.patch
new file mode 100644
index 000000000000..0f339eeaa136
--- /dev/null
+++ b/dev-libs/editline/files/editline-1.16.0-rename-man.patch
@@ -0,0 +1,16 @@
+To avoid collision with dev-libs/libedit
+we rename man/editline.3 to man/libeditline.3
+
+This patch also needs a rename from outside the patch:
+    $ mv man/editline.3 man/libeditline.3
+
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -3,1 +3,1 @@
+-dist_man_MANS = editline.3
++dist_man_MANS = libeditline.3
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -273,1 +273,1 @@ top_build_prefix = @top_build_prefix@
+-dist_man_MANS = editline.3
++dist_man_MANS = libeditline.3
diff --git a/dev-libs/editline/metadata.xml b/dev-libs/editline/metadata.xml
new file mode 100644
index 000000000000..2907abeb0c42
--- /dev/null
+++ b/dev-libs/editline/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>slyfox@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 54399974d382..8fb014cbeb5b 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,6 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r2.ebuild 7801 BLAKE2B ae7c174c2df99540483b1b0de1bb89e661e2f4441a743701555628aad39c5f5b6f7e1a6ddbb4dac0831878b5ba67e38fbd6163a60fbfc6e6481e87ca4378e185 SHA512 49bd3450f13a4f772d2f05635eaddaa952dde536b47eafe90eb427c9edde12eae2b6177b81c9fb14459a303d82bb7e1948f4124cfccb53c6aade83794cb0b8fa
-EBUILD efl-1.21.1-r2.ebuild 6685 BLAKE2B 05b5ef33a7b5341593d0a8d4f873e96b6e8a2dc080cf39ef1795b5da5410f5425b21b4d29299aba69839439ec45bb246a43e93a79aa0d2e468a924cc090d4668 SHA512 99c02c9ef63fa6319b3d8d359dadde7c671daaf0d42246264b7e3ecddc0be4f6aa5958f62759cb723c211198754a3d473285235b6961fedf083298059580db70
+EBUILD efl-1.20.7-r2.ebuild 7802 BLAKE2B 537434c5ca8d4c5c8c61d3dc017df4bf64707888d7536bd6c2c607eec06d8131e256f1fa41ebc5d1dd1b29787c2927e338beee0cec8e52d4434e763180d7fe0c SHA512 9508f51fa6f028340c5c6d21e43c0df6f0bf6ff50744381b10aab4d3cdaff804fb187dbb72ec9a535253fdfb5e4fa3c09de8de8e6d17de76f04b6840010a9ae1
+EBUILD efl-1.21.1-r3.ebuild 6687 BLAKE2B 3b6cd48bd9c4186ce7c8b8928769eda0cccd9a9535d6311dd91266444c5011b773b3dcadec682b78f2131073a30312ad33718543c1a199ba5f13257e51392737 SHA512 2df46d9a38b32efece57ccf2e1e6e082b1dd8be6bda45edd9b7c2c3e4bc610c5d423aeb47c740b3f1738408b6f5cef9c3cbc88be112c75eaafdea46fd547f710
 MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
diff --git a/dev-libs/efl/efl-1.20.7-r2.ebuild b/dev-libs/efl/efl-1.20.7-r2.ebuild
index e340440bf9b2..beecaff39a29 100644
--- a/dev-libs/efl/efl-1.20.7-r2.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -80,7 +80,7 @@ COMMON_DEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls:= )
 		!gnutls? (
-			!libressl? ( dev-libs/openssl:= )
+			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:= )
 		)
 	)
diff --git a/dev-libs/efl/efl-1.21.1-r2.ebuild b/dev-libs/efl/efl-1.21.1-r2.ebuild
deleted file mode 100644
index 609c8e0bae66..000000000000
--- a/dev-libs/efl/efl-1.21.1-r2.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	egl ( gles )
-	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
-		!sdl
-		egl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-RDEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	egl? ( media-libs/mesa[egl] )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	gles? ( media-libs/mesa[gles2] )
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
-)
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-xinput22
-
-		--disable-doc
-		--disable-eglfs
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		$(use_enable xpresent)
-		$(use_enable zeroconf avahi)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use egl ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-}
-
-src_install() {
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
new file mode 100644
index 000000000000..a2bedffdb459
--- /dev/null
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( opengl egl )
+	?? ( opengl gles )
+	egl? ( gles )
+	fbcon? ( !tslib )
+	gles? (
+		|| ( X wayland )
+		!sdl
+		egl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( X fbcon )
+	wayland? ( egl gles !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+RDEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib:=
+	virtual/jpeg:0=
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	egl? ( media-libs/mesa[egl] )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles? ( media-libs/mesa[gles2] )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	nls? ( sys-devel/gettext )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
+)
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-xinput22
+
+		--disable-doc
+		--disable-eglfs
+		--disable-gesture
+		--disable-gstreamer
+		--disable-image-loader-tgv
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use egl ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake || die "Compiling EFL failed."
+}
+
+src_install() {
+	einstalldocs
+
+	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index d8a1976dfff6..e471b49aa23b 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,5 +1,3 @@
-DIST gdl-3.22.0.tar.xz 529072 BLAKE2B 7215c53051dc3ec467c97615fa7e8059bf6c610cd166bea28ba256bf26b4de75fc63ab1e627acdeb8228257844ae1b47bb5d88cef24c7efcbd5bfbe508928eae SHA512 408fd75627497c658b65e9cd39b8779ad0db2fdc1f780e369237fbdd3f0ccc035cd86456ff72e1581c524f1d35673d3b31ebb074290babf025596d08d823833d
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.22.0.ebuild 699 BLAKE2B b497476365878d4091df1b297ca87acb5e78537b32acefc6d28eed4bf03fda0c33ff14b07c66156330c555dfb42780fc7e844630204ecec0c4ad06e2f60769a3 SHA512 68e75de4dc853f09c7cb43f4533592c64ff6fbbcdf9bb4fb77e40fdf48958b78029b57edadd90f65e1194b08d3a7003e5e5a5dada30543a68f7b59b0b805c8d6
-EBUILD gdl-3.28.0.ebuild 723 BLAKE2B bf4fec64d725f469dabf30586c75eec182cda8ad4bd1d7596bc8bca6075555d8aa781dd60b40491716243f61d476c0ecf2c9049fe8eaab866ce88798dd0362ef SHA512 c434572fee9b871cd189fb0109d30c1f7e98806cbdf082c58905c1b9de275b00824975d031d7f73593e98efb13eb6b5c3949ec4e0e1ada35723a49d0b285948b
+EBUILD gdl-3.28.0.ebuild 722 BLAKE2B bf6261dfa8590917598108170b826de6ff41139ff5d66d9163d4ee99eafc90880f156c37cf324bf78a86fcb3e01a820a98c0650bb9f24bb8d7a1146115712544 SHA512 403d3a58a377c23974911b2760f0ace194f1ebe223f5e63118fe7bf6f363ce43f519b8330522f1d04f1e82d4fd4110e371322bbf2b8fd8be513ccc0e9d578664
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.22.0.ebuild b/dev-libs/gdl/gdl-3.22.0.ebuild
deleted file mode 100644
index 9659716660ac..000000000000
--- a/dev-libs/gdl/gdl-3.22.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME docking library"
-HOMEPAGE="https://git.gnome.org/browse/gdl"
-
-LICENSE="LGPL-2.1+"
-SLOT="3/5" # subslot = libgdl-3 soname version
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=dev-libs/libxml2-2.4:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 5d411e0cfe9f..efeb11f9b85f 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 32fff81e96d6..25e9ff472515 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,11 +2,9 @@ AUX 2.56.2-network-monitor-race-test-iterations.patch 1128 BLAKE2B c34bbf557917c
 AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94da1847152a87064eb5c9f9b0ae6996eca84e89c7807bea5cb7c58b8d42dee07eee96647d2439b8c62af023b37849d4465e0c013eca6 SHA512 70d942086f6181532b5f95c5a3e0d8bfc7d204ca2d4ee68850af82062b572cc146ac4a5516547011ef39386e10bc291deea32a19fe518e649f4f8ac60271b69c
 AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
 AUX glib-2.58.2-gvariant-test-fix.patch 3423 BLAKE2B b0dd08cf1629da3c8e42e43e4f9b64be07116c836d1c218368ab1dd312d06313845c70f21b54db95b068816171b268d35192a3521c5856e410ba5b99f1d0943e SHA512 af8fd3cd431d1bc3aef4447ce26911b107a57903f66cc5e1825c3a26386084838500f2f6f250552f96d93bea18b5412ad338e84f2ff3783573161a2d0a336337
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.56.2.ebuild 9838 BLAKE2B f56bc9cfdfed984fe95b2457a659650cff24d5863810bc817673883f0efd7b7b5ef908e41194598fde0ee72dac72eaed2a606761fb03d260d6261bf8da7362fe SHA512 4068eb62fb85ceb1b517bdda34c1a035310767a9f7c9a2b0c6bd0fcdbbfd01b4d5b2b0a3c80de70b13e5e71ddedca5e94164e4cc3cc8c8b33854375b1e16a035
-EBUILD glib-2.56.4.ebuild 9949 BLAKE2B 0e34b6ecfac3181f4fb1622ee6dceb62adc5f51399dc54a4f19ae82e5baffe049f1317e9458ed66138b0a8b6ab8e985841945315f0a1cd571adc56ea897f7033 SHA512 8584e101e711f8347a2398aaea206b4fc231f328f3e8c5fb31c1c60e05685255b8320be55b57c3fcef8b027a9c6f08c0dd066a8d1229b24b966a0eae24ed9de1
+EBUILD glib-2.56.4.ebuild 9947 BLAKE2B 50af8725895ea42d6999c4de74a08f4cd65cd96d9320aa31eed39e2fcd474ee6ae58a5846df34abf6703bd7111ba0eefbe4293e860bc2386433a680e90846a2c SHA512 650dc7e115ed3f7e857e4bc180849c2ddf05a206a8090bcad21988e83fcfbc387ea25d3ae7f7bcaa051c22e12bd2ed2a33057ac586beefda55b13239f2613179
 EBUILD glib-2.58.2.ebuild 10788 BLAKE2B d264b9ecc154bdb41593bbe1c9c32181499be6edad3660113dc98f5b252eb5a701854eca9822549d0d767066c594f6f771fa0391e495589a74309a8ca4a14f4a SHA512 4af70f9db60e55918e29c4e6af7e373a9532276fd061c77b91ba66b96cc61d10978aa8e47abdd76d225706a0c12d8aa2e645a4c2c403557514dc22862e93d0d3
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
deleted file mode 100644
index 9ccdbdf98d32..000000000000
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-util/gdbus-codegen-${PV}
-		virtual/libelf:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/gdb
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
-# python depending package, which can be buildtime depended in packages that
-# need these tools, without pulling in python at runtime.
-RDEPEND="${RDEPEND}
-	>=dev-util/glib-utils-${PV}"
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# Less max runs in network monitor race test to avoid hitting timeout limits
-	eapply "${FILESDIR}"/${PV}-network-monitor-race-test-iterations.patch # included in 2.57.1
-
-	# gdbus-codegen is a separate package
-	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
-
-	gnome2_src_prepare
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
-		export PCRE_LIBS="-lpcre"
-	fi
-
-	# These configure tests don't work when cross-compiling.
-	if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		case ${CHOST} in
-		hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		*)            export glib_cv_stack_grows=no ;;
-		esac
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
-		export glib_cv_uscore=no
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
-		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# libelf used only by the gresource bin
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable kernel_linux libmount) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(multilib_native_use_enable utils libelf) \
-		--with-python=${EPYTHON} \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=system \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	virtx emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
-	rm "${ED}usr/bin/glib-genmarshal" || die
-	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}usr/bin/glib-mkenums" || die
-	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}usr/bin/gtester-report" || die
-	rm "${ED}usr/share/man/man1/gtester-report.1" || die
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use pkg-config
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	# force (re)generation of gschemas.compiled
-	GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild
index 94964f583362..9cccbd6aa5be 100644
--- a/dev-libs/glib/glib-2.56.4.ebuild
+++ b/dev-libs/glib/glib-2.56.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index c0c0428b2783..1a0503f49a52 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.0.tar.xz 1962544 BLAKE2B 2d5f9bbd2fb69015dfe52b7b9a8aaeba5d06c3c00e853212f098181efd1a30cb4588ebf173f1370dccc03d5a137ec1a0823608a7271ffd7d7e882a214c0e4189 SHA512 bb45f34b80ff237478602ff05ce0f736373185b7aa260c17aaf00a519d0b75ce9e24b0f6b256ce0f17b613e9f67174c54e302411110bf5f143947591f5f5aa43
-EBUILD gmime-2.6.23.ebuild 1736 BLAKE2B 2661694f8a00f0548c276ace8e9efe295545c6806f5cd12ddf324f4e8b9eb73dbef1a3378b6bde0c1efbb10f2479a63ec746b442e15e43f46704738d4bbecc54 SHA512 132d038b1c3ffadceb04131d4531539dbea6041de75d1e2e2db952b289b21c862ad3c330fcf7302ba255076fc05b0e12152d1ffa8dbb8657667b68c5b792c5ff
+EBUILD gmime-2.6.23.ebuild 1732 BLAKE2B c90cc326aea44d0e2ed12dc62a98d7f206dd33327a25ad897bb3a637a59148516fcef7f39e1f8029941cbc83836fe7e5df6f624cb1ad66f5f104d5c8115d9c66 SHA512 ad3f04f9358ab96caff5b1621d01d60b8db8888c16f35c410afdcc2932f4835630190a39b8c3df74b911667968bdfa34825e9b197f22b47463b318b374b32e68
 EBUILD gmime-3.2.0.ebuild 1565 BLAKE2B d2b07d8e77c51f0df053fe29aa5cb5ddd684d0c0b328ebed6ba5df1269e5130343fc8d11fe71bd08eb965d8d97713bc4d1d2c55e8791bfb1a7fca73cc304770b SHA512 eaa6764d31758a82b3e53c93174f7e2c3bbbd2a6c86ab9a7a3438d2213026880af0a31c33e9280902d8f4fbe2d04e3b6a0d0f525fd349d0beaf213bff211b009
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23.ebuild
index 4a089f9280cb..f3ba278aac5b 100644
--- a/dev-libs/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc mono smime static-libs test vala"
 
 RDEPEND="
diff --git a/dev-libs/gost-engine/Manifest b/dev-libs/gost-engine/Manifest
index b17d82b55b45..504d40e2fd41 100644
--- a/dev-libs/gost-engine/Manifest
+++ b/dev-libs/gost-engine/Manifest
@@ -1,4 +1,4 @@
 DIST gost-engine-1.1.0.3_p20181031.tar.gz 473151 BLAKE2B fb8dc737c3bda181de168d918744d6e036886753e70cfcd0516499dd5d9a1ba3af0d44d26fc50570318375a142adfec532327dc57fac5996266b12551631b5fd SHA512 9f0df3c48191aea75d3fee5b5886ba32451889bdbb97c5e540f14a57d8d41606d858769a70b51c0c2c958565b347c5a613004e7c3f81658281d6a3eecd030707
-EBUILD gost-engine-1.1.0.3_p20181031.ebuild 864 BLAKE2B ff78c12ff5cfe4bede97bd64c58d1ea572b495236525ac63ca1d242d5ffccba36b9351a472f99b9d75372bda269d99700c452d70e6e08aeacd0503363cc02db4 SHA512 8ef33427d10f325bde6293bb67df52211c9510ff2d667e816fa2c52c22071a40d467ce5c48187d787d1daf28f7c368812a7bb255972ea28159000682eb11db45
-EBUILD gost-engine-9999.ebuild 795 BLAKE2B 0ba9ca58c0ee3556c87375f64fe4bf81c5020b8bac436c6a384f512a119101989ea2366d31fb0a1e2e2098c87230593f8ceed94d583c8e2287736087aafa85fe SHA512 2c81b725f7548b8cf495d53ace88650c5d900f7c0ce42baaddf27d6f0fff89e90814fc6e377ac12f7f7bbd632d5b9963f1f71c8124621bc182c08daa8efdf67c
+EBUILD gost-engine-1.1.0.3_p20181031-r1.ebuild 872 BLAKE2B 56d7d15c6e05c12e81ef011a5680e459ed566fa9dd99abb3b4b516e34daba57a8836f2d0727008960706e59449dbcd72720f92e44aa76c2eb3590e4f5bb21f30 SHA512 005a8592a97e4be5d05274222cd95a72f94d7c4ca8f2a1af79e39e86e2e0c38723023243deacb4bd7f4fde04ccbe97559b1d1891b6e630b54ea6f4900f4f729c
+EBUILD gost-engine-9999.ebuild 797 BLAKE2B 6da28707e72dfeb1aca295ac8572815eed38a7c9b070438e8d61978c951a6ac310b6f0f89a318b5e61ecdd7cf844462f6214ecf554e28e8cfe4ec74800e65275 SHA512 033105332abc1945bd0f1a7902dc07f172e15d950a86f366c3d9e999e62d00bb6632048ec2e61f09d600edc74896cfba431c5892f00c4141f7d8cf88eb6e9de3
 MISC metadata.xml 464 BLAKE2B 9c303e26fd69fa53be0d278f86502ced45a06a8e07a14a954ec999445f774f606e6db0a4892b325bc715c1c7062c62a8104ffdbaebfb97bc9b03f5555f0c0b3e SHA512 0b13e24bbe8d4d629a886000eee238df48d31fdc697e6ae86fc1b4d71284799f3a714df10ddee243139479a632eedd72e11235760cad0f45d9471637d140891a
diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
new file mode 100644
index 000000000000..9bcff53af420
--- /dev/null
+++ b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
+HOMEPAGE="https://github.com/gost-engine/engine"
+IUSE="test"
+RESTRICT="!test? ( test )"
+SLOT="0/${PV}"
+
+COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? (
+		dev-lang/perl
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+LICENSE="openssl"
+
+DOCS=( INSTALL.md README.gost README.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa"
+	SRC_URI="https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/engine-e5cc3684f3b3ad40e186e23b00b253d234df92ab"
+fi
diff --git a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild b/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild
deleted file mode 100644
index bcc01c052ff0..000000000000
--- a/dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A reference implementation of the Russian GOST crypto algorithms for OpenSSL"
-HOMEPAGE="https://github.com/gost-engine/engine"
-IUSE="test"
-RESTRICT="!test? ( test )"
-SLOT="0/${PV}"
-
-COMMON_DEPEND=">=dev-libs/openssl-1.1:0="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? (
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-LICENSE="openssl"
-
-DOCS=( INSTALL.md README.gost README.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/gost-engine/engine.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/engine-e5cc3684f3b3ad40e186e23b00b253d234df92ab"
-fi
diff --git a/dev-libs/gost-engine/gost-engine-9999.ebuild b/dev-libs/gost-engine/gost-engine-9999.ebuild
index 60425b979899..1d7a11fbc17e 100644
--- a/dev-libs/gost-engine/gost-engine-9999.ebuild
+++ b/dev-libs/gost-engine/gost-engine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 SLOT="0/${PV}"
 
-COMMON_DEPEND=">=dev-libs/openssl-1.1:0="
+COMMON_DEPEND=">=dev-libs/openssl-1.1.1:0="
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? (
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
index 4075b76241c7..266c2820723e 100644
--- a/dev-libs/grok/Manifest
+++ b/dev-libs/grok/Manifest
@@ -6,6 +6,6 @@ AUX grok-0.9.2-libdir.patch 1223 BLAKE2B 7a303aa738c98f9ff11bdb76e28d7b0ef13beb2
 AUX grok-0.9.2-libtirpc.patch 665 BLAKE2B 21c00cba5fd0bb68104c8a5cdd886d8d634463afc41fce2bcc5384ff80bd32bb5ef75b53ca25f2463e35f276fe1efc1677f3075d73d3fe5a4b77df1f593e9a3e SHA512 565d08bd4f2d58f5db4f095cc5276077fb9c3de159ecc54c65825d2d8db1af56e6c5c567d5259cbf4b866c6e99d996f5c94b36c7bbd40162088ee74321c32a33
 DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e
 EBUILD grok-0.9.2-r1.ebuild 797 BLAKE2B fdcac4abcd8b3ed5fa3b88822c27f2c8b163dc20109367adef8112a4e4ab3d5b7d0fc6ebc10aa1746b0d54b5c74986e282c7d20be4fadd6634bc83228dd0c6a5 SHA512 4ec5c6a91ae7eefccf96fb686665bc19a64d3758bbcd63bd1b37bef7825458c9cd7a23c0bbb9b17e96bcb6137aa096b8ca09230de902b49b7f515c38ade25d2b
-EBUILD grok-0.9.2-r2.ebuild 982 BLAKE2B bb400f7d0d80d5a1649ef162bb87b8799a71a5ffa2712779756a9e423568aad044f5792c007fd5fc4a6b89deb833317c1f6dc9c62ec27b119bf2970b047aa45b SHA512 a4827e7d5f6fc7145a7f3cab3f39e95e2dce926a4898b0a82853fbbcdbdafcca4c1608f0521a5ea5890a76b70aac1ea5ddb59524020c507585fb3bcaecf9fa19
+EBUILD grok-0.9.2-r2.ebuild 981 BLAKE2B f6a34209d30159694a93bbec7a85574d03b54192a46da658d988e90471b0aef8266c3d2859d62e50fc8b36cada5951ac02626a02c330258bc504af7fc18a1193 SHA512 c8d1822ff477e7569a12e2e5a0370ac9b48f46a5991ab0b80b6766cacb7403d8221575ea178ac464049eae8f1861ef178cb3e891432800a01db4ffaa765244a5
 EBUILD grok-0.9.2.ebuild 660 BLAKE2B d44f0f9c6e52b1acfa47319c5679c39343b0143456bbd1aa124625f2ca04b19269531bca78a054abd410e0124964b9f50eeabfe0656515c0c159fd3027603021 SHA512 cd035ee0106ddbfa87bdd216dabeb1ae4e43e22720e266b1c8311ae9a152fec1b9944542e51b901c249930d59dbe8d8724a303e44410fae993afcb6918445ce3
 MISC metadata.xml 254 BLAKE2B 8b393297b0cf2112182d89c18f2fc26d2b57e4d191f96bdcad17d2809fc52c51e0b76c1e8f9b7998f36f296be7015eb8a0a730d18892ee83343b28738cba6ea9 SHA512 4cc0684e2b8c6a3d54834d288930076f6b90205f375b4c91bc8253cdda537d44022e34710d3e9fe657f57d5ac69b57320fe5ae8b7abd4d4162259b4fa9aa6fcf
diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 72d46636f25f..0e18ee718f15 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 IUSE=""
 
diff --git a/dev-libs/handystats/Manifest b/dev-libs/handystats/Manifest
index 45198a2a75bd..76f43910247c 100644
--- a/dev-libs/handystats/Manifest
+++ b/dev-libs/handystats/Manifest
@@ -1,7 +1,3 @@
-DIST handystats-1.11.0.zip 141871 BLAKE2B 169bbd5d6e2d3cdab8e2054d11c5082303d164818055391557ed651e4c2017df1b35f145ddd4464d70127992e3007b1d1bbd769e70b4d8fa5d0aac57382c12fd SHA512 e6d5fa200c3ca006adc9601c6f200dd7fc4dd57cff45c530990781880536aefdad7eb2fa266df24802f44b9f838ea5ddfd8a60fbeaef4e3b83002fdbd556f4ec
-DIST handystats-1.11.1.zip 142005 BLAKE2B aa5a2ec6e5696d41092655d108b80b474536a2a77e4b15a3fdf94ab7a5449a92d9a3d6eff960690555889ed9794a89139806128183c36a7fd9e61fba8b17fc2d SHA512 cfb8cdc7e528ef6bb92ef94099081f77f2407bf85477e7bcc8ef92abc69e8e14a8f1de3d2df26f1a7f8103247a133abb47c5a2771a60b9cf589c292d43ace712
 DIST handystats-1.11.3.zip 142270 BLAKE2B 1e166bb48c201c38ef856fd5e57ac21bff6c90e172dc3b22fcf60ef377e9a43d7778569dd10236d9e934068d0af9a81956c391c3b4c080b649b41e4573be0c6b SHA512 0ece97c1cea48112514098f9481195ccfa7e5dcd1025c4f0dca5aa8266f783cd9f0c96af17f3942bcf13a7d89e51107a12c44f39ede0fa8d17412a25f89cc331
-EBUILD handystats-1.11.0.ebuild 474 BLAKE2B 7a4d1bf6e861c1eb9808103a2eb7084c70b09d597b187bf3dca6f8eeea325875191e426b55304f589373c234134b6ae545998c6b8f0c7e6c1e790058bb87ed2a SHA512 0637af04692cd87b2f69d9537a3fecdb3cca34523ea97cf1a077ef518a3ef73e003d11133f53af82f28c518456fdd2b79b62fa601aaba1eb8ddb96972007bbfa
-EBUILD handystats-1.11.1.ebuild 474 BLAKE2B 7a4d1bf6e861c1eb9808103a2eb7084c70b09d597b187bf3dca6f8eeea325875191e426b55304f589373c234134b6ae545998c6b8f0c7e6c1e790058bb87ed2a SHA512 0637af04692cd87b2f69d9537a3fecdb3cca34523ea97cf1a077ef518a3ef73e003d11133f53af82f28c518456fdd2b79b62fa601aaba1eb8ddb96972007bbfa
-EBUILD handystats-1.11.3.ebuild 474 BLAKE2B 7a4d1bf6e861c1eb9808103a2eb7084c70b09d597b187bf3dca6f8eeea325875191e426b55304f589373c234134b6ae545998c6b8f0c7e6c1e790058bb87ed2a SHA512 0637af04692cd87b2f69d9537a3fecdb3cca34523ea97cf1a077ef518a3ef73e003d11133f53af82f28c518456fdd2b79b62fa601aaba1eb8ddb96972007bbfa
+EBUILD handystats-1.11.3.ebuild 452 BLAKE2B d9bd03340c8991a373c852f197266d8ffb6ae1da33159e2cc4a172e9a1b895a089e9ee35bb14c48c2b8d1ce5c6106040a8c9fa718b05fbc09e4e825fb05cb3e6 SHA512 f2edd6856fa016d768988803d3a912e447d78cf376a33dd9e91668f586f30b291c91ff03f93b4e1611443f6d041a9cbb523b7fe4491ec37e4a93cc6394040c08
 MISC metadata.xml 339 BLAKE2B a3907312a8e0c8e8f0fab9797a00e71688a8666b45d99cd398625a4942b1f6a1aee25cdd1ecd69420655d2a89dbce403a1af64d42a9ba065f3bb800e60528def SHA512 b580c217727760303e40a58fcf9522b893f60707bf5ff36a968e99cbf4318d6fa0ae471021963e5948790afd3e7773da26e493b03a880e70c13697815deca09e
diff --git a/dev-libs/handystats/handystats-1.11.0.ebuild b/dev-libs/handystats/handystats-1.11.0.ebuild
deleted file mode 100644
index 7e1c7fc9246c..000000000000
--- a/dev-libs/handystats/handystats-1.11.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RESTRICT="test"
-inherit cmake-utils
-
-DESCRIPTION="C++ library for collecting user-defined in-process runtime statistics"
-HOMEPAGE="https://github.com/shindo/handystats"
-SRC_URI="https://github.com/shindo/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost"
diff --git a/dev-libs/handystats/handystats-1.11.1.ebuild b/dev-libs/handystats/handystats-1.11.1.ebuild
deleted file mode 100644
index 7e1c7fc9246c..000000000000
--- a/dev-libs/handystats/handystats-1.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-RESTRICT="test"
-inherit cmake-utils
-
-DESCRIPTION="C++ library for collecting user-defined in-process runtime statistics"
-HOMEPAGE="https://github.com/shindo/handystats"
-SRC_URI="https://github.com/shindo/${PN}/archive/${PV}.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost"
diff --git a/dev-libs/handystats/handystats-1.11.3.ebuild b/dev-libs/handystats/handystats-1.11.3.ebuild
index 7e1c7fc9246c..66511d4f301b 100644
--- a/dev-libs/handystats/handystats-1.11.3.ebuild
+++ b/dev-libs/handystats/handystats-1.11.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-RESTRICT="test"
 inherit cmake-utils
 
 DESCRIPTION="C++ library for collecting user-defined in-process runtime statistics"
@@ -15,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${DEPEND}
+RESTRICT="test"
+
+DEPEND="
 	dev-cpp/gtest
 	dev-libs/boost"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 1de5b4f81f2a..57d035f66518 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,10 +1,8 @@
 AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a615272dcf1ad3a5ae2ddfdb08eeaa9bec4d037493583bf181417df49087fcca6f6aa3d977a8e72b98df68e3389c4e47343c062d036 SHA512 54835db4db5bca704aed015a911a1f5285fbd3f6d09493cdcf98493d87a03851c9ee79cc9cbcb45da409513ad5b3af38b302aa5d164992d94af1f80c6349aeb8
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-60.2.ebuild 2525 BLAKE2B 71f0e92ffabdfbafb429837c1c9241252fdc898da64ad2128fb4427ce7cfc492a9369c0d38e6545bfa3f39d5434a7a8dd9dd809b242bdab4a5b57c5bb2c2f477 SHA512 bf1d94af09720cdd5cb6461004182bc2debad0e12dcf46bcae21ac485a36011dee14ce54433940ee035f9306a1a986acdb697ecb8023aa6f0be25b15b285cee2
-EBUILD icu-layoutex-62.1.ebuild 2524 BLAKE2B 3ca648c43e0cd815b338d1096b44892c252ec6d82054f6ea6051b19fb05462b56b30777ae91786ed3f8f0990a35d99810944eb795995093766ed96fd237312a8 SHA512 cbc383eee712119e35b85c69601e839b75023816695f38c2db73a808d392c35f3a2b7f76c9a0bea71f750eb2891a1d38ad9549dc75555f1d021f76af4b9da1c8
-EBUILD icu-layoutex-63.1.ebuild 2531 BLAKE2B 39e78321a8f8ed4541390415886fc29c2b7932b5ff70dd3f631305d4c2f786902d9f4ec36b0ab939088b68135c0884528696c7a2c02f7c25ad26d15f76962442 SHA512 ec1e5f6a9db9c7bd3893304682173512fc11a6aa4e50029ecc961d0d12f91501e612a358d076a8d58090dba4fb1ae8b4a02ad6ee5387fd755172d5564717ead9
+EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild
deleted file mode 100644
index f0879bb2332f..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-62.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
index a57e7bd99f09..85df91623811 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-63.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 RDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index ff6e7521f9cc..fbf1db0e5ece 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -6,11 +6,8 @@ AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f57d53a7450c68cdad5f84941f771db07fab1f5a16451d59c7aa2750e5a4d5b5fa9a904c43d131529b648263ea SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694
-DIST icu4c-62_1-src.tgz 23468750 BLAKE2B c0b665af53a494fc064425e6b3e66ae11d31509f4edc42268b12b85ece5ea635ebc76a8f3ab65a49b74a849a67ffd526e15e6d1b5b07e13c7f94cc94bef1d31c SHA512 8295f2754fb6907e2cc8f515dccca05530963b544e89a2b8e323cd0ddfdbbe0c9eba8b367c1dbc04d7bb906b66b1003fd545ca05298939747c832c9d4431cf2a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
-EBUILD icu-62.1.ebuild 3688 BLAKE2B ff8e850ead70730bfe852bbf2795d72d41325afd7b723e6abf815cad316a4b777ba0f94a71952eaa06dec331aa122d1dc4958728ba9ade5239e39d62cf18a4c2 SHA512 7ce709631d488554ca575361126362973f74589380367acc5b0cfedef93ea5d9ce339326e1fc9969640c3eff4537d4b6f669342400cc9cae7fc3a6a721e32c50
-EBUILD icu-63.1-r1.ebuild 3330 BLAKE2B a3b6b4a0073ec7897caa8e72d8920630e3fe531de65edabe9d4b64fe599b0782b50dcd9edec58bf4bcbd8a10206a26a98e56b521fec8749df58dfb94330bb0fd SHA512 935b9556f133831ab480058f4fa84def822d747eaaf18da6eff8eebdd026d18d9acb6fd700adc9ab8b40056f209764c3a25feaf2e390a9ee9bede8c87266077f
-EBUILD icu-63.1.ebuild 3697 BLAKE2B ce9836ddb2c78d65f8d3620a4dbb72cbaa77f9dde72d345eda94ed74973b6fed8d8e726362228b02721ddb627b9fda85855e57e1a3d01cf125ba70a83a835975 SHA512 2d0bae7f3bb25e8a0adbc3c7320f99e632c70b53133819f56d31d3a2f0b43f4172e59175952ab1aea880727b5495f0c553b2802b469bcf547e454bb7cc934c19
+EBUILD icu-63.1-r1.ebuild 3323 BLAKE2B 83e6bbaeb18beb010f77e84ab91414aeea009dddd6c4f390ac17f5dc94e6da7a6bb50a046765f31cd37b8cdf4b8218b173991b9678a94741bc6140d4be281778 SHA512 97b245465c3e6fbcb0c968762799ac8692fc8a7f453feee1fc1d4b35bce5f49497b21b43e425ede308e30c00603ad3ee1cd038478cac5f2ffa82ba7d170c2e9e
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-62.1.ebuild b/dev-libs/icu/icu-62.1.ebuild
deleted file mode 100644
index 6d1550b32d6a..000000000000
--- a/dev-libs/icu/icu-62.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild
index e069f52e1b33..410ca96652f5 100644
--- a/dev-libs/icu/icu-63.1-r1.ebuild
+++ b/dev-libs/icu/icu-63.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/icu/icu-63.1.ebuild b/dev-libs/icu/icu-63.1.ebuild
deleted file mode 100644
index 1f5b0bbb21f4..000000000000
--- a/dev-libs/icu/icu-63.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-58.2-darwin.patch"
-)
-
-pkg_pretend() {
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-}
-
-src_prepare() {
-	# apply patches
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-gcc ; then
-		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 9 \
-			|| $(gcc-major-version) -lt 4 ]] ; then
-				die "You need at least sys-devel/gcc-4.9"
-		fi
-	fi
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 49330a905e79..d1a9aaaeb6a4 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,5 +1,5 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 549 BLAKE2B e5318164c5f5914856683eb5983531e1817605b984f6a2f0b4a2905b470b1e66e701c46398221d5ef65787516c2f8b944bf99eb802541d0ddb7f99aca27d26b9 SHA512 a51c129669dda6211b33edf136dbcfdc6ef6f7f0dc5757c4d9770853e29a458e58ede0b7d06ea586988be2753a10f842d2713003d3648443be1162a78f50727d
+EBUILD ivykis-0.42.3-r1.ebuild 548 BLAKE2B 03cd8d4730a9c3ca3bdcedba29fa7c83e974c72924d8f5c23e32f2e237861640ed772a4642871f0399211b837e68641e11b2e7e8db9c61d1bfe989d55acf6c6b SHA512 57dc8181352f4371ae54974c2d20e1ff8bb25714299ba1fc910b2bb6b132c543936fc61c6294006b63503810fc84297d2730442a70409b4b277230564434651a
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index b4a2c42b7422..bb7cc9b108ce 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 src_configure() {
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index eb62bc4ede13..23975aecad58 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,7 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
+DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 845 BLAKE2B c1dc7acd0b9bb849774c43cb60a51011e067228348e4f81f4a3005e4f3c47ad310b707e53270efa7163c50a5fb3b79d1b95e296d2f2efa82983090644b1b4645 SHA512 665569db3edf7d1bc9701536c75226b71b2860a56cda6b5a76c37882eacd9f018267a97dd10ab987c1b6e628a08762f8754019a570bbdab54d2717b0beea9849
+EBUILD jansson-2.11.ebuild 835 BLAKE2B 8418b7e36bef00dea25d625c70f473285f69cebeeb166b7a9a3049d43b98b6505c9bec1a90110f6b2f305bf67e7f5e85d47d4c0991238c392f9945e2a45c9768 SHA512 d4db2975eb58192f6786127b820d97d9ef7ab073e6b50360f3dafe0fb74b430368352dbf6943e90b592e7852328f0caf08667a5bf1ca2644332a3c0459ee48a9
+EBUILD jansson-2.12.ebuild 843 BLAKE2B 845079169e230b7e38d2746e59d64e5d50c1ec4f31a65358a57e3ba070ca8bbe4311508a357818df6a2b6b95f5d5a7e6d38c4706209f77af71f4977ffc554924 SHA512 a63d2a052aef16c61b356faf80e1255c986a77415994be0c6e53e170eb77cad7d48d67889cd319f0abd068485a3b7f32eb7b1fa3aa555095da321719b46f06a2
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 595c96d72f9c..bdccaed5cbce 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
new file mode 100644
index 000000000000..5fee180dfaaa
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="http://www.digip.org/jansson/"
+SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
+RDEPEND=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake html
+		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index fb2d2cb2fd94..a99c86f0a4d5 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,12 +1,6 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.4.4.tar.gz 814289 BLAKE2B d53ff660e28eaea1c11f95cc70348a2a5883e0dc5ae56482b0afe96e61938e4d15688f8abf9783976443c00b6a69e9037b5080194babb97200e25e2c548b9153 SHA512 a1955a3f7a7fd190f7d85ad07e30dee74b0f4b7ed670a4a9a7613317d2898faf776cbed0c5c7b6da25ddd5099c9638e9abb2aca16aec61c568fc2f8c9789ffe4
-DIST leatherman-1.5.2.tar.gz 814349 BLAKE2B 1bc2d85426683e9f82d31ba9e3b63b4c9185b0bfa5ae832ea252ecbd922b44dfa67b6011145489d5c5809a76011aef8b143f6b705ea0436d914fc0d8ca8091a2 SHA512 9cef854fd7a95c54fcfc2e639e469dfaa4625757ea8aceeb9ac2162bfc89cbcbc1d5e8217af5f1fad4f31d98528475e22157ca6b1046a36e0928074f866ddafd
-DIST leatherman-1.5.3.tar.gz 814340 BLAKE2B 7dec42f1a62511a4f63ca197212f3b81f5baa862b0a7f825c2caa7e9af6bdd15e7b5aad39649d7e5dbb6bd62df19895bbf851421f9aa2795ced785c2e28bcdcf SHA512 e2616a42c6879755f338f9f0291bf28c7465d51caa3326be521ae3e0d5d79e82099c8720dc19223ad9112cde81c4579faf28a2b467f802baefc99dd59212b818
 DIST leatherman-1.5.4.tar.gz 814395 BLAKE2B 251cacad45e1571d54e7b78201bb0b3578d983022267bfd3438e921f93ba466995629759d9657c71938a5866fc13d1b70dabe2f3a43137ef52164f67da3a8aa5 SHA512 67a3a0a946024d0cee44ccb314d13abb3df83d7c7d0bfe58d5e966d57ef26240dc011a8e6865f017674a00043429379ae9e033a9197c4173c3fa173918d0b0f9
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.4.4.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
-EBUILD leatherman-1.5.2.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
-EBUILD leatherman-1.5.3.ebuild 1150 BLAKE2B 57977d3e1690caf8fd64c78e9c765e5bbe8f8d21faf82a53994a70a89d9f9667adfd8850784029b151b158dc8391edc97e6e875543bd43eeba0165ac717c100f SHA512 5c3e73bcbfdbc1f334b38ede1855e673e9d403c00b5352522844c7b25644212f31c1bf9d1e40e103d197b08a008f90c378acc9eabe90815309c5c19b0b57c160
-EBUILD leatherman-1.5.4.ebuild 1152 BLAKE2B b99c4ef34fbcfd3d13e14fdf749beef32d4154a9a5bb8ce33255e3e59447c7e4d87e067772296f862955f9faf8ebcde31d0d59f7f414f4c08b0e0d1f2573d3a4 SHA512 ea60992fb8aedc29ad5176438edd7f1f1e20a495d25ec8250ff1383aa56e1b836baf8ab0fa094c32b231ddf005dda11c631d9f8d6c367ba009cfb0a45e7fe306
+EBUILD leatherman-1.5.4.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.4.4.ebuild b/dev-libs/leatherman/leatherman-1.4.4.ebuild
deleted file mode 100644
index 29a1dceafddd..000000000000
--- a/dev-libs/leatherman/leatherman-1.4.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-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
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	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.5.2.ebuild b/dev-libs/leatherman/leatherman-1.5.2.ebuild
deleted file mode 100644
index 29a1dceafddd..000000000000
--- a/dev-libs/leatherman/leatherman-1.5.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-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
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	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.5.3.ebuild b/dev-libs/leatherman/leatherman-1.5.3.ebuild
deleted file mode 100644
index 29a1dceafddd..000000000000
--- a/dev-libs/leatherman/leatherman-1.5.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-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
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	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.5.4.ebuild b/dev-libs/leatherman/leatherman-1.5.4.ebuild
index cc7a76208a23..3e365ff23fc8 100644
--- a/dev-libs/leatherman/leatherman-1.5.4.ebuild
+++ b/dev-libs/leatherman/leatherman-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 6ce423d8eb3e..49f24cfd2450 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,7 +1,5 @@
-DIST libarcus-3.3.0.tar.gz 29695 BLAKE2B a63ca06133cf7db556fe82cc7ea060badd7838d697822d64e09c52aaa81a8509bfa6010037004593da3b1e66dde510767a992524f8e1719e614932b88b9393fe SHA512 a911fb5784ceb835ba2c175ce42cc10544bdd0834e987d8ac1be2517293f00e596f94910d8bf5f37f61e63246ba6e78d28a23bc061809e70b1bb6ad1a21107c9
 DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb5dd12282dc894b877a91da3f9822e4db8bf16cb53f313396598d3890be9e06e50737b0a50edfc84543285f251 SHA512 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d
-DIST libarcus-3.5.1.tar.gz 28935 BLAKE2B ae850a0923e45446f248fb9944cd795cfa07e05ae4a1c0c91089fd60711603cb1c7b6c3ec81e71496e1a5a2752abb215cbcf725be65a0f8ca92dd0c9d24ed3f1 SHA512 a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712
-EBUILD libarcus-3.3.0.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
+DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
 EBUILD libarcus-3.4.1.ebuild 1085 BLAKE2B 9d15a9454356b09eb8f05a4548bf49ee8d9ce710d47ec89baf5d11cfbc8b1c9dcc2db503e491f3558eb9da4e5456e823a51fbf7aec33d7ef68b6906d572d5d99 SHA512 95709735d9f791bb344442964ca877d480060ea8fe13c82941a30fbcdc84da2ab9c055570f37f6dd757c5347dd1451759558c73f8a02f7fd22215cd5c9f54a77
-EBUILD libarcus-3.5.1.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
+EBUILD libarcus-3.6.0.ebuild 1082 BLAKE2B 733d32a831ac633bf7c16381686b9dadee78308180dece9d442e6c1b52a0ac650c6c074331d7e3cce7c7fcca028aa1f534adec2947ed9abef06164442c94c71b SHA512 5b73e47eed0860fe6fea6be6c442a5e1129bebca414dee7f053ba896cc920a53f059947da785324d00e0c01d9ecfd2cc9b5b89c0b12428b4945e14b9941d9419
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.3.0.ebuild b/dev-libs/libarcus/libarcus-3.3.0.ebuild
deleted file mode 100644
index d0e49ef66b98..000000000000
--- a/dev-libs/libarcus/libarcus-3.3.0.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
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
-	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libarcus/libarcus-3.5.1.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
index 3714aa3353b2..3714aa3353b2 100644
--- a/dev-libs/libarcus/libarcus-3.5.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.6.0.ebuild
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 4fd281308467..d316d6fc216a 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -8,5 +8,5 @@ EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d53291
 EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
 EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1985 BLAKE2B 3e3630645405acc2172a3f996bba47e3b0b550c281d761a1928939eb08162a695ab6baf756143120a6344f1d277bd7db7b0d4b2e7b0b93f649084ee0ec737ecd SHA512 2c7eae0fa97b3e3d34c4bff97065e1d33682219b30504efe8998f52cafd9296f5019a64cf71895caaac354fe64a3c5216a381c730a073d6640e644ef55a3434a
+EBUILD libcdio-paranoia-0.94_p2.ebuild 1984 BLAKE2B 2cbcee0810f24583630fd8e667b75de64298a6bfdeb5ce536b482154143f4a800283e3476080ad8a61f41305999c872589d9903b46ff04b777b1328e6881eab2 SHA512 e0934e47b5526e0e54e07666c7190cc3647e3549648e2011629c48cc463d8020cf5fa3358e0deb7686dfb76b4b3ec43bf3f63f4e77ba6005fd10a77c65b478e0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index 37b882db5432..2a24133ba42b 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 218b0c211990..cc241697d363 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,8 +1,6 @@
 AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
-DIST libcec-3.1.0.tar.gz 1097121 BLAKE2B f216c03c26fd51366282d649d18ca969f362438a2803a7a15dc2aa1ec7caeb4e2a9f02b74e569da4d4c6aa24427ec5bd1870a230dc9c0bc575938c3929a7772b SHA512 e06f65d85ee268ec23380186d11e53f3e477bf25b955c9314cc13555eedeffee902dc8a0f3005248250c584760ab68c461b087b305dc4ef463da628ee1ab433b
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
-EBUILD libcec-3.1.0-r1.ebuild 2048 BLAKE2B 131b91fcd3720d8fc36dfa9e782f0ce7ee858d18a028393a7bbf9e3dcc375cd96a3752b52ae8c60ef0da8c607416cd7e8552fdd012545135c88febb7896b61b7 SHA512 e6d11e0d455c0e277b864ab2def6209ded30718d8939032576d1ee5d5370e743adfe44545bde1869342775b0d13f2b64152cc0f134564bd920a54ce7d69ade3c
-EBUILD libcec-4.0.2-r1.ebuild 2161 BLAKE2B 69d64d87ad45b660b9407cf7ada57d1746ad02a18025615c4eb9085abfd8d21ca282a1efddc751919b7c4ee704bf943968c85a23f83d5a382e55b4dcd8329509 SHA512 fd2a22614487c9196b5c0de7245c45d4a2c26b96145e2a84ad04b6f387a2836e8b2ba23ef2292d9886267f8443b184ebd3ef57a9a6a0d68b237a638f6cef25f4
+DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
 EBUILD libcec-4.0.2-r2.ebuild 2163 BLAKE2B 4883f1ea58c7ca5cdbfa0d61c99e8f4b261ebf8d4e350d6fa764a333267a1f4e37324f085381cff91b329713ef0b3dd54e1579bbf7827125a6f6ef0109e6b9d2 SHA512 85f4ab4548364ceac25394e3939655ab404315e6e18f0fb8de2aec05250e359d08d187a2724557469e4fc092eb8a2a21a757f0dc317a0d59379bc90d55ddcca2
-EBUILD libcec-4.0.2.ebuild 2112 BLAKE2B a489f01bb2d2f4e4429a45cdf55d53afba13222b4e371380e47f90613831f600f3b92a269589eaf932abdf5503822a936e20f7255d909b8a37f77f504166366d SHA512 5bb45988de38b50974c2d52053733c0861cb2416957a83208178b620cd9938ac0af4e5fc8467d0c0c9e9049214e61fae3321effd89ea203c84303b604b5b6a7d
+EBUILD libcec-4.0.4.ebuild 2115 BLAKE2B e12e5796f4778dde204bd88b237404e691e3b600b49689817d88abdd9ce0d503664925a9bbc88ae555bd857efe9eae7774a8ec22ee1b0565535567614ee6f7c2 SHA512 c6e93057a6bf55017e7d8f4b88abc34947d1748c946383674559d5e9ca5a3f8742c1ce129e9075739c381720e10d8f8f13d14ced8ad5b77c3d2931f49411b7dc
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-3.1.0-r1.ebuild b/dev-libs/libcec/libcec-3.1.0-r1.ebuild
deleted file mode 100644
index 46b752cba094..000000000000
--- a/dev-libs/libcec/libcec-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,78 +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 cmake-utils linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cubox exynos python raspberry-pi +xrandr"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/udev
-	>=dev-libs/libplatform-2.0.0
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	xrandr? ( x11-libs/libXrandr )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-S="${WORKDIR}/${PN}-${P}"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
-	use python || cmake_comment_add_subdirectory "src/pyCecClient"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_PYTHON_WRAPPER=$(usex python)
-		-DHAVE_EXYNOS_API=$(usex exynos)
-		-DHAVE_TDA955X_API=$(usex cubox)
-		-DHAVE_RPI_API=$(usex raspberry-pi)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_SITEDIR="$(python_get_sitedir)"
-	)
-
-	# raspberrypi-userland itself does not provide .pc file so using
-	# bcm_host.pc instead
-	use raspberry-pi && mycmakeargs+=(
-		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
-		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You will need to ensure the user running your CEC client has"
-	elog "read/write access to the device. You can ensure this by adding"
-	elog "them to the uucp group"
-}
diff --git a/dev-libs/libcec/libcec-4.0.2-r1.ebuild b/dev-libs/libcec/libcec-4.0.2-r1.ebuild
deleted file mode 100644
index f52629d16720..000000000000
--- a/dev-libs/libcec/libcec-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,83 +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} )
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cubox exynos python raspberry-pi +xrandr"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/udev
-	>=dev-libs/libplatform-2.0.0
-	sys-libs/ncurses:=
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	xrandr? ( x11-libs/libXrandr )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
-	use python || cmake_comment_add_subdirectory "src/pyCecClient"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_PYTHON_WRAPPER=$(usex !python)
-		-DHAVE_EXYNOS_API=$(usex exynos)
-		-DHAVE_TDA995X_API=$(usex cubox)
-		-DHAVE_RPI_API=$(usex raspberry-pi)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_SITEDIR="$(python_get_sitedir)"
-	)
-
-	# raspberrypi-userland itself does not provide .pc file so using
-	# bcm_host.pc instead
-	use raspberry-pi && mycmakeargs+=(
-		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
-		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You will need to ensure the user running your CEC client has"
-	elog "read/write access to the device. You can ensure this by adding"
-	elog "them to the uucp group"
-}
diff --git a/dev-libs/libcec/libcec-4.0.2.ebuild b/dev-libs/libcec/libcec-4.0.2.ebuild
deleted file mode 100644
index 6c8fc121c6aa..000000000000
--- a/dev-libs/libcec/libcec-4.0.2.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
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cubox exynos python raspberry-pi +xrandr"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/udev
-	>=dev-libs/libplatform-2.0.0
-	sys-libs/ncurses:=
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	xrandr? ( x11-libs/libXrandr )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
-	use python || cmake_comment_add_subdirectory "src/pyCecClient"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_PYTHON_WRAPPER=$(usex !python)
-		-DHAVE_EXYNOS_API=$(usex exynos)
-		-DHAVE_TDA995X_API=$(usex cubox)
-		-DHAVE_RPI_API=$(usex raspberry-pi)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_SITEDIR="$(python_get_sitedir)"
-	)
-
-	# raspberrypi-userland itself does not provide .pc file so using
-	# bcm_host.pc instead
-	use raspberry-pi && mycmakeargs+=(
-		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
-		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You will need to ensure the user running your CEC client has"
-	elog "read/write access to the device. You can ensure this by adding"
-	elog "them to the uucp group"
-}
diff --git a/dev-libs/libcec/libcec-4.0.4.ebuild b/dev-libs/libcec/libcec-4.0.4.ebuild
new file mode 100644
index 000000000000..38c70e8e9200
--- /dev/null
+++ b/dev-libs/libcec/libcec-4.0.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+
+inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
+HOMEPAGE="http://libcec.pulse-eight.com"
+SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cubox exynos python raspberry-pi +xrandr"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="virtual/udev
+	>=dev-libs/libplatform-2.0.0
+	sys-libs/ncurses:=
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	xrandr? ( x11-libs/libXrandr )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Do not hardcode the python libpath #577612
+	sed -i \
+		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
+		src/libcec/cmake/CheckPlatformSupport.cmake || die
+
+	use python || cmake_comment_add_subdirectory "src/pyCecClient"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKIP_PYTHON_WRAPPER=$(usex !python)
+		-DHAVE_EXYNOS_API=$(usex exynos)
+		-DHAVE_TDA995X_API=$(usex cubox)
+		-DHAVE_RPI_API=$(usex raspberry-pi)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_SITEDIR="$(python_get_sitedir)"
+	)
+
+	# raspberrypi-userland itself does not provide .pc file so using
+	# bcm_host.pc instead
+	use raspberry-pi && mycmakeargs+=(
+		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
+		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "You will need to ensure the user running your CEC client has"
+	elog "read/write access to the device. You can ensure this by adding"
+	elog "them to the uucp group"
+}
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index b3b3715d14b3..3d5a53a00ed5 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -11,5 +11,5 @@ AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b2074
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-EBUILD libcgroup-0.41-r5.ebuild 2278 BLAKE2B ec2c74741935fcbc5f747a66cedb1d8ae743872f5dd923b31c44642ce136595a5e109cf7c04adef76da940f0bf58982f0a06bbcb5156737ebe516b59019687cb SHA512 d83c1385e1ff81bf9c1cc0a906070218e218dc3343193bfb2b94cd131f52b515ed28c17278629c4c44cbaf698663f726b66c346b3d65ab8f35b0eb7ba3da9b3e
+EBUILD libcgroup-0.41-r5.ebuild 2418 BLAKE2B 84688a35fa6f7977bf60699e9397950de5878c414297d8ef3d826f21ec341348615cbfc1aaa5fd56f7ffead9466aa7733c0c79294ce45410e33897272a4b6bbb SHA512 f6e55ecf4b2a3edec4bdf513837819b254343717f1fa4192f5a5d2da09092ebf717d01ff42a975597c6e70bebf182dce2150d1a0e4bbb258cf4a037138d68f31
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
index a4301a5acce2..6c2563903010 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-IUSE="+daemon elibc_musl pam static-libs +tools"
+IUSE="+daemon elibc_musl pam static-libs test +tools"
 
 RDEPEND="pam? ( virtual/pam )"
 
@@ -51,6 +51,11 @@ src_prepare() {
 		-i src/pam/Makefile.am || die "sed failed"
 	sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
 
+	# If we're not running tests, don't bother building them.
+	if ! use test; then
+		sed -i '/^SUBDIRS/s:tests::' Makefile.am || die
+	fi
+
 	eautoreconf
 }
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 18a4066eea77..2d55d350c668 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,7 +1,5 @@
-DIST libcharon-3.3.0.tar.gz 141001 BLAKE2B 80d880ac274a53dc6673d9993ef8474091a036e6faac8fa44df3ace0f4b2fcf0102229b0f407acf9f7df7c56fb08a60c7ac3b7078e5e5daf86e1f0fe3fa453fa SHA512 92e7a33c77d05224f0b07c92f105d66010e727f67ec51e6dc314c001953e14047a7d59e2e0887950dcd38d25595df5186161ff1c0272a1193bcd8ccd64b0033b
 DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34abca284457716b7997633a86e3cc2101f788b5c39b9292944d884985f3c342459626282695be484be5adf32b53501 SHA512 9aa269e477ce6c5c563986fcfd0061032dc58df30a7bd687a243db06ef071e888d45cc2c47cfeaac0837672529d6b3150a0a60d0cb357cea5035e47ba16115f3
-DIST libcharon-3.5.1.tar.gz 143496 BLAKE2B bffbe111b6d671d4c2b636e3f708555ba98acafb0d0475c07e0658bca7a557a678097a0daa600dd59f71628802a5c2b995683a25965da200681373b9184e9a1f SHA512 d8cf3b95e09fe9f046e7b2c3a2163f8d125e25c2b5c13c286fd8144bda865457bd730a01f8ac83b3b4eb68ff4b7d1a59e030e99f92f5bea612845380c71ff772
-EBUILD libcharon-3.3.0.ebuild 504 BLAKE2B 188e3bfd6a13b1525123e03a0280de11a4b7a2b67d5cae076e42451fea4ff5e8b2a8d4f5d4a75c3dd92f0d64afa16998fa470d160e42df06dc344ba090953772 SHA512 dfa8d0be05a34962782ca993312882155f1b945e35d2ba4257825639e13b3b1fece2b97cee65bf3595ff38d6424f59c680adab0ddb06e796b076d571e1f1f7c8
+DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
 EBUILD libcharon-3.4.1.ebuild 512 BLAKE2B b5594e176423627d35f1371ffba5c29495fc824d11c3b6b25a698bab2765bcb7c01c30c23a8811e64cb9434a0bb0dc5098612aa103619ae53ee73f349002d2f3 SHA512 44f8c7fbdf5392cec38dce8873c6ffe118fff658e8fd9309db2021b81eed827b23de7038168f1654273782c13d67562bbc1150a5c58a604458f12c2ad061e851
-EBUILD libcharon-3.5.1.ebuild 509 BLAKE2B ac239e495d601ce824933e0d142f524bd0434d4ef4cee4467c35d43d794e4436671cdd4813f93c9ebba4b7993ce17c2f70a4e85b12cfafb0d3ee28f27c0cb8d0 SHA512 0e8586d08199572067904c6df2b736a854276e376368c1f647268a0eb14ce9a976b19d68980a65b5972ef94f068a79117c32d5b2634de4d719520f0890947dae
+EBUILD libcharon-3.6.0.ebuild 509 BLAKE2B ac239e495d601ce824933e0d142f524bd0434d4ef4cee4467c35d43d794e4436671cdd4813f93c9ebba4b7993ce17c2f70a4e85b12cfafb0d3ee28f27c0cb8d0 SHA512 0e8586d08199572067904c6df2b736a854276e376368c1f647268a0eb14ce9a976b19d68980a65b5972ef94f068a79117c32d5b2634de4d719520f0890947dae
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-3.3.0.ebuild b/dev-libs/libcharon/libcharon-3.3.0.ebuild
deleted file mode 100644
index c2de02822b82..000000000000
--- a/dev-libs/libcharon/libcharon-3.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils python-single-r1
-
-MY_PN="libCharon"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libCharon"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libcharon/libcharon-3.5.1.ebuild b/dev-libs/libcharon/libcharon-3.6.0.ebuild
index 503dd3878a83..503dd3878a83 100644
--- a/dev-libs/libcharon/libcharon-3.5.1.ebuild
+++ b/dev-libs/libcharon/libcharon-3.6.0.ebuild
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 0f260b04dfa6..4410c6a28d07 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -2,5 +2,5 @@ AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b6
 DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
 DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
 EBUILD libdazzle-3.28.5.ebuild 1333 BLAKE2B f96e034c10cf9142ead418a0b86980e5450c9529ce4d408317ed9ebabe80821596b5b4cee3a422e80aeb66e515e2c0e6cce0f20ce0dff46ade2f3a369d2ece1d SHA512 43e1def81a4f3e09fa7a91617216c3e989e8fe2019e65bc712010942c93753018c9783b15b203480cd69c811ac267eba215ad676ba1d882c58cd35983aa48a37
-EBUILD libdazzle-3.30.2.ebuild 1420 BLAKE2B 866e53e83f16edc934c2d6e19c0afe0ff55fbc75a44925510768b99e1ccc30e194a61f5beb6f7bfc84f983218cf505a69679f0bb332ba92704ff9dd141b95792 SHA512 92d8cab32919018da9fc50fedc8d86126e4804a1952ae2999799471ed384fffe88e8e9b9ba9fedd6f0ddca7fb09707d254b03b1d4787768b52b36a11d86a3e21
+EBUILD libdazzle-3.30.2.ebuild 1419 BLAKE2B d87760661734a827985526636989937e75b0f214dcf03b37b26c132b2a63785225cd86f7cc719d04d5829f4aad09a8e37edfafc711a96542ba5ca02fa7bfa714 SHA512 1f19ae7639dd6dc8ead5a1eecdc2267605390742b9f09372fdd8ac76774dd84fd8076debf72accb2327ff7630e49b46546ae33cd71a1f732f194a87a19248e61
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
index 635275f8d6e3..176f07af9599 100644
--- a/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 4283e79691e2..e1bd33f3b9dc 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,4 +1,3 @@
-AUX libdbusmenu-12.10.2-gtk2-signal-fix.patch 1379 BLAKE2B d625c02fe3e43f01c9ad0f5cefffe748a7ef59e7a5326fe65b5fefd0e060ff85a93affbf2594417f8a5dbac9325180be9cebf1e0f758ade1753304da7e6560ae SHA512 a96488c1522a202248fdaa9e3ca6a4a8c50d548e4e347894a3f30708b883a46c291cc5c5d611e58cafa5ca020451d3c358c8011a227af7f19129f897db8ddc78
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
 EBUILD libdbusmenu-16.04.0.ebuild 4010 BLAKE2B 57f8dc0556ec2ff1f14cb1cc8941851f4e51fea3ce06a2b3fb6c03ad975247373c7063b6bd8c771001f1f0ff3a19c1377d812acddbd5926347c67305074e0dab SHA512 451323a8a7017cf9c0c39180936693099253cec15ac6ab4cf215f85c518b7095c5265c771c14a3d4ba02e45905ed7b29aa2773fbeb2f4c3b50c812a744d86656
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch
deleted file mode 100644
index 6d270f1370bf..000000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'libdbusmenu-gtk/parser.c'
---- libdbusmenu-gtk/parser.c	2013-06-18 19:59:44 +0000
-+++ libdbusmenu-gtk/parser.c	2013-11-03 02:46:23 +0000
-@@ -97,9 +97,7 @@
-                                                 gpointer            data);
- static void           item_inserted_cb         (GtkContainer *      menu,
-                                                 GtkWidget *         widget,
--#ifdef HAVE_GTK3
-                                                 gint                position,
--#endif
-                                                 gpointer            data);
- static void           item_removed_cb          (GtkContainer *      menu,
-                                                 GtkWidget *         widget,
-@@ -431,11 +429,7 @@
- 
- 	pdata->shell = menu;
- 	pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu),
--#ifdef HAVE_GTK3
-                           "insert",
--#else
--                          "child-added",
--#endif
- 		          G_CALLBACK (item_inserted_cb),
- 		          mi);
- 	pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu),
-@@ -1394,9 +1388,7 @@
- static void
- item_inserted_cb (GtkContainer *menu,
-                   GtkWidget    *widget,
--#ifdef HAVE_GTK3
-                   gint          position,
--#endif
-                   gpointer      data)
- {
- 	DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data;
-
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index cece42ff1b82..96b17c32b371 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,5 +1,5 @@
 DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd7356e82857afbf9a8d6ff4bee0a0b98f2e39c4adb69a0349c33a29f1cdd90ec901c3501c0fcafb45faecbfea7c SHA512 477b06e2b6ea9b2e34fe0d91328c9191a678b173751e595359c05772db50a4d348ac132bec0c926fba91ceccc013e15cd4cc57a6b734874c06073bf23151bac7
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
 EBUILD libestr-0.1.10.ebuild 695 BLAKE2B 61c95d400c72a1eb15ac704941d275a5ab57dfbd589ebcee9450088ad5c019c4bc3982b937b972d03232b63b58ea51a1b20cb8b918052fa1613d7cdf8dcb5b09 SHA512 a408d345bdb13b504264d0ef514e2c858c134ccda3cb3b20a0393666362af43e7ac6f2aab66067a592fc01c84863513281bc3d8ebaf06e2a6939896866ef6747
-EBUILD libestr-0.1.11.ebuild 699 BLAKE2B 329ef54d65bcb55ed287cededb099846f9979d0a2c90755a43f116ab6aa4685c122d5384a1e08383641a39df1d7a5f8fe3396ef14e002a4fc04b86971604898b SHA512 05c146486d7f51a510af2feed4e082d5787b74c71bb90714f4a34ddb93824736dbea562372423e726378168f8186ec1efb611ad9ea43769755d0605018f126bb
+EBUILD libestr-0.1.11.ebuild 698 BLAKE2B f5e3f834011ae340bb7d200b0c156b6601f13de8f3413b91a0d2d6a14808d5158d3c5392be36a69ef9244120fd5c5272c6d8e45ae999f553f2ce1880d607fd34 SHA512 bffe8497435f673574f78f6bf83f1d16eb122f537d0e9c7de06148dd05cde700bbaecf9e687cbcc201ada106ba1110c97d1adb25168af36a1965319ced292122
 MISC metadata.xml 504 BLAKE2B 9be3182332c3b6e62b74573534d7c1099b5bfab19cad517322c1a03df1909afbfc973cc10fa525b6383ba385d9669c86a2bf309a841bfa70cf35faef40b2493c SHA512 7eefcd09976509a7fcefd342543158a06524eaaaa6e2bcd81b1373cbfd43eed1457b5f240be6f38242dc3236d392a5c3691c0f0889d6a71c302b86c8abe5e8f3
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index a93a82468cd3..1d625e762d5b 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://libestr.adiscon.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa x86"
+KEYWORDS="amd64 arm ~arm64 hppa x86"
 IUSE="debug static-libs test"
 
 DEPEND=""
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index ac16cc66396d..aa987a161f20 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -12,5 +12,5 @@ DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320
 EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
-EBUILD libffi-3.3_rc0.ebuild 2070 BLAKE2B 7d53ad6fa9507d557f3daeca835517b2eca33d422f4f7f2500edeec9522e581c7b4b6c8224c478ed23f80de83274dbfa0889a4805368d533a50aef67117296bc SHA512 39c967836885558ac90b7779e69b180c08ea007f06bd628881f44f7a5d574ef19886734a1b17e71f0bb161a55c633eb59336e15aca82fc8bef463fe9e53cd1e6
+EBUILD libffi-3.3_rc0.ebuild 2103 BLAKE2B 7583ddaf99b9897a26cc00717f3a0959d279552ede2b571ecc341d9e5a75d04a9fa9caf8d6b75307c27b0ac09411dd2a20854c798e3b7fddaeed000e410295b0 SHA512 48113f9415175f1fc2d4706dc2ec940581e08ca03f735a9778870d7236766bd955b3fd56576aa1bbbdf59b606c5c65375a66e4d05cd6fb79f0046080d133dea4
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 5f56796bb879..28a4141b97e5 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,7 @@ multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	econf \
 		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		--disable-multi-os-directory \
 		$(use_enable static-libs static) \
 		$(use_enable pax_kernel pax_emutramp) \
 		$(use_enable debug)
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 79430cb5a0d4..2ba001cf03b0 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,9 +4,9 @@ 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
-AUX libical-3.0.3-findicu-pkgconfig.patch 1760 BLAKE2B ff9dc09bc7f82632abf3d89d50463a2630f83a4cae1fe264cd1d3739c33d98634bd0e347cabe4e924f96e7791fedf06b71b790745a2519e5517e8c5305e3a1e7 SHA512 f6ecf28b65bbf9a10b3a26b5bf2e8b81574c6724b917d12943bae9f3773e40198cf609ea685a7222361941bd13cef73b3a60b86ae250fb6bd171c0845e243861
+AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
-DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
+DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
 EBUILD libical-2.0.0-r3.ebuild 1708 BLAKE2B a6fc6d8a7ca16ad6a629c5a708b138535a098d65cb0c89c39df889d2d6087c11ddf884afb18fc1d7fcbb297262c2b5b53fa7d0108b825d8cd0057948a3c3efdc SHA512 24d4b757d3bc4657c3d24cdd442b91f7b64113a88c023de39a7f01ec13ad91f255595acb9c0767835837a660fabe316cb3f160f4beab6614a8e20b3cf7ea77ef
-EBUILD libical-3.0.3.ebuild 2043 BLAKE2B a0a4448402c5236149e4abbd6693d4c644735384df3fa43a56d54bef7a9f971e2f7143ee59c0e068a12d4300341efaf65da44fee8385fa805fe11df8800503a1 SHA512 d0ad2e651743715869783b10aabe6b3f7b7afb515aded889f587e9195a7b20b2f270ab9bdd7444d4384d0c65b13240d40e78b726fe3cf100303977089dcb686a
+EBUILD libical-3.0.4.ebuild 2051 BLAKE2B 3e64a56437c5b4f9b5fc30ace560499ec7065441a358a268212d5c0aa135671af03200d7c9154e74929281c2bbb4fdea5dabaa8396c896fb1d7569856229c34c SHA512 b16dfdaac032f875d4d17eca8619525319dc550902bc4dd98578fe19ed95997be72857c06a7431092879e8bfa1a12d189a6fd188d8a960aaf6f30ce6238b9b8f
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
deleted file mode 100644
index 7f0ffc4b4280..000000000000
--- a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Sat, 26 May 2018 09:06:10 -0400
-Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a
- hint
-
----
- cmake/modules/FindICU.cmake | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake
-index 12a1812d..53213efe 100644
---- a/cmake/modules/FindICU.cmake
-+++ b/cmake/modules/FindICU.cmake
-@@ -23,16 +23,12 @@ if(WIN32)
-   file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
- endif()
- 
--if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
--  # Already in cache, be silent
--  set(ICU_FIND_QUIETLY TRUE)
--endif()
--
--#set the root from the ICU_BASE environment
- file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root)
--#override the root from ICU_BASE defined to cmake
- if(DEFINED ICU_BASE)
-   file(TO_NATIVE_PATH "${ICU_BASE}" icu_root)
-+else()
-+  find_package(PkgConfig QUIET)
-+  pkg_check_modules(PC_LibICU QUIET icu-i18n)
- endif()
- 
- # Look for the header file.
-@@ -42,6 +38,7 @@ find_path(
-   HINTS
-   ${icu_root}/include
-   ${_program_FILES_DIR}/icu/include
-+  ${PC_LibICU_INCLUDEDIR}
-   /usr/local/opt/icu4c/include
-   DOC "Include directory for the ICU library"
- )
-@@ -56,6 +53,7 @@ find_library(
-   ${icu_root}/lib/
-   ${_program_FILES_DIR}/icu/lib64/
-   ${_program_FILES_DIR}/icu/lib/
-+  ${PC_LibICU_LIBDIR}
-   /usr/local/opt/icu4c/lib/
-   DOC "Libraries to link against for the common parts of ICU"
- )
-@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
-     HINTS
-     ${icu_root}/lib/
-     ${_program_FILES_DIR}/icu/lib/
-+    ${PC_LibICU_LIBDIR}
-     /usr/local/opt/icu4c/lib/
-     DOC "Libraries to link against for ICU internationalization"
-   )
diff --git a/dev-libs/libical/files/libical-3.0.4-tests.patch b/dev-libs/libical/files/libical-3.0.4-tests.patch
new file mode 100644
index 000000000000..7ecf6e1f2d76
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-tests.patch
@@ -0,0 +1,25 @@
+From 3066463eb407853626277442eba725ddde58b843 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 6 Jan 2019 17:41:10 +0100
+Subject: [PATCH] Try to fix test dir path
+
+---
+ src/test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index b1179c2c..af7ce3fc 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_definitions(-DTEST_DATADIR=${TEST_DATADIR})
+ macro(setprops _name)
+   if(UNIX)
+     set_tests_properties(${_name} PROPERTIES
+-      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
++      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/test"
+     )
+   endif()
+   if(WIN32)
+-- 
+2.20.1
+
diff --git a/dev-libs/libical/libical-3.0.3.ebuild b/dev-libs/libical/libical-3.0.3.ebuild
deleted file mode 100644
index fe0236af8a46..000000000000
--- a/dev-libs/libical/libical-3.0.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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 cmake-utils python-any-r1
-
-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"
-
-LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
-SLOT="0/3"
-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="berkdb doc examples static-libs test"
-
-# TODO: disabled until useful
-# 	glib? (
-# 		dev-libs/glib:2
-# 		dev-libs/libxml2:2
-# 	)
-# 	introspection? ( dev-libs/gobject-introspection:= )
-COMMON_DEPEND="
-	dev-libs/icu:=
-	berkdb? ( sys-libs/db:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-libs/timezone-data
-"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-findicu-pkgconfig.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use examples || cmake_comment_add_subdirectory examples
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DICAL_GLIB=OFF
-		-DGOBJECT_INTROSPECTION=OFF
-		$(cmake-utils_use_find_package berkdb BDB)
-		-DICAL_BUILD_DOCS=$(usex doc)
-		-DSHARED_ONLY=$(usex !static-libs)
-	)
-# 	TODO: disabled until useful
-# 		-DICAL_GLIB=$(usex glib)
-# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile docs
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-	cmake-utils_src_test
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
-
-	cmake-utils_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
new file mode 100644
index 000000000000..9682f722827d
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+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="berkdb doc examples static-libs test"
+
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
+DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DGOBJECT_INTROSPECTION=OFF
+		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DSHARED_ONLY=$(usex !static-libs)
+	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake-utils_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 961bf5df68bf..ad1722ff8e24 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,9 +1,9 @@
 DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68
-DIST libinput-1.12.3.tar.xz 519496 BLAKE2B 15cd2aa14b6ad754534bceb6b99e05fc911666493f38e1c92097f5e08a06b751a17a4b0546176d5450ca8fde205bcb0dc5d7eaffe41739ae1bc6527205d8349b SHA512 cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02
 DIST libinput-1.12.4.tar.xz 519596 BLAKE2B 87802d2eb841360ada3216a4064cdf750f43f3bf85377f08d35b4e9144319dc0115b03bf9a67f819c708763c677650100ffb783e8432d3c1a42cfb2355e7acaa SHA512 4e43ed5213059a481e5a73549c8325e5729d08512c4f580b924d4338a1b69dabd77fb612bec418f294c1da96c738ce26e45f8de8fbc222ab1af71a1535b3240f
+DIST libinput-1.12.5.tar.xz 518612 BLAKE2B 6bd4c770aa4e22f3ef80cff12731dd8ed8f50ddfbc6d06c02af7b4f1b38122baea412b806825ed511ac3e586505c2dfec66061ed459c6526a74af91d275e7709 SHA512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff
 EBUILD libinput-1.11.3.ebuild 1431 BLAKE2B 5a4cea8729ff7ad1d4e4d219ee3d8e02ab131bd25affb3644d44886093dfa87278a6a8c5e92f87a2f05c521c05d8420c0e7b52b864a189a9f22b8ca984dcdb79 SHA512 965c8f37e7af5b012a0e3586aa104c2b1ea465314b046aa0cb4d6a32b71688fc91b37639a4c2e3397fca4a2235ac7a2d04c861e2fc530fe73c92fcc8354910f7
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
-EBUILD libinput-1.12.3.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97
 EBUILD libinput-1.12.4.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97
+EBUILD libinput-1.12.5.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.3.ebuild b/dev-libs/libinput/libinput-1.12.3.ebuild
deleted file mode 100644
index fd569fa961e8..000000000000
--- a/dev-libs/libinput/libinput-1.12.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-
-inherit meson python-any-r1 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc input_devices_wacom"
-# 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:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=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 )
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT%/}"
-}
diff --git a/dev-libs/libinput/libinput-1.12.5.ebuild b/dev-libs/libinput/libinput-1.12.5.ebuild
new file mode 100644
index 000000000000..fe9e7e7cf8c1
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.12.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit meson python-any-r1 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# 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:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=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 )
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index fedfe1a537b7..3a7bd241f81e 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,5 @@
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
 EBUILD liblognorm-2.0.5.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
-EBUILD liblognorm-2.0.6.ebuild 1492 BLAKE2B 7b720082871f2621eebd0e216826918c91a89c9a230545197ebc672f01d8587b116a596c7be08315cdd27d61efdad3d661e4e28a833fc0e9456c5a08f1909429 SHA512 4d546cea7bf736d7ddc34bdee6b7e6243b58961dbd10eb2755ab9fb9b4acde0279553c77de2d6c71163cbc4de174fc61a9b12d6e68632df1e50ffebcc80030ed
+EBUILD liblognorm-2.0.6.ebuild 1491 BLAKE2B 20bca423ad7004e7313fbca385320ac0e3289fb8044f9778fa55e356d6845dc6292d4bbc1f38d1d2d760030e3b1d2a212cbcf50b064f744f6df98f3de1e3cca4 SHA512 b32f281a2caf7b6b9d8df6d956f08eae8f73a76ef0c6c263671067b1e1871ebf57a12a02b79b4733806d7bdec2191043e94b056e163b2ee4ef8655954c522e5d
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index 64174c3d34c4..52b3e6aa5550 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa x86 ~amd64-linux"
+	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index ab391ace8c06..06001a149724 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -8,6 +8,6 @@ DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645
 EBUILD libmspack-0.6_alpha.ebuild 1181 BLAKE2B 6ce72cf323c65a4f42ab61ec19e0924e1423e61f117da0e4aee90bd9acf0d54ec68b96256dab9c4af13941bb0f5ff483b3df86a7605858f987fa609343f2e2d5 SHA512 17a9f9f04c6b4c5dae20b9f4f3011a871493a23141808102bac3a0ac4a912dd16d5a843da9862e2c92b09765f291ce8c42f5b92c926cbbafc7e8cb15364d93ed
 EBUILD libmspack-0.7.1_alpha.ebuild 1350 BLAKE2B 2547d6a0d39530f7e019ea0073cd809c563094fc4ae8198f7b0c27c29d714b34c8f5f2a308d6a8df3a3cd5c847715e97a3d154483a90c3314e32a9761d0a3d4c SHA512 c4bd1afc5c42640541b70140295a860412beabfc7f90407acc2dc7263f711531bd3cd00b4f1280841a2fd556c7e4e32d554519e5a54ea258f5e24b963d08a274
 EBUILD libmspack-0.8_alpha.ebuild 1298 BLAKE2B b62b3be7492625949a8fa1e25c536c27fa4781c07c8eac0cf3e503981d7b66be8d3223be02eccf7b37a9dfa75bd6bff4fb8f9da408098e2596deed6d0a6e0445 SHA512 5a9ba806bd8973788c6839ea19cf7b69fc2cc7fb7b35156b59e58ea78bb8d619a3fdb95363d88ef9f640c0326cc2b35f6cc5f41e66707febaeec74f7c1e0712b
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1670 BLAKE2B 9a145ce14b07060a4b0e80d5a2e1bda7486995b3b2c00a7f1b8a7c722206d65c1ce1338e347ef249938f850247f012e3426ea5890b5e234ff4182cb345538710 SHA512 bf3ebde2112b5bc7f81d7d44f56900334938d38c96e360a391b6a7f90152fccee68ef2a4b38b17b5ade3e214261757a1a4bbd3baec827f698c172d11be5a2bd7
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1675 BLAKE2B 919960328701426f5bb890142f8c90ccee59887d1f72af23239ee54b41ccadaacd7235e2a9fe53e2a65a81ca76b6b3d6fbef84dfe109d88ec230823adb0308b8 SHA512 7b2f6aeea72e1d27a4722a797c3d4a46cf7ac02716e40c6a051fdb38d3547c6d9b37b9b6fb3c0f87c922b7799eff46debab20fc449260aefea12f9bb971417d5
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
 MISC metadata.xml 355 BLAKE2B 27dbf410ad5287ffc5ec6336a0c4cfc8eb02b52d72c9cceaaf39518dd435fc647e5c667f003c2b00141bd076fb574e6914f8cd3ad37de693bccfef9942e46689 SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index 7ab44aa86a67..c092c9af01c8 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 05c790b2f246..87dcc8af1c0b 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -5,5 +5,5 @@ DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7a
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 EBUILD libpipeline-1.4.0.ebuild 496 BLAKE2B b28d348f01d4a9dc8a5016ed332613edef894ad199b7a24f0a81745b0d17b8e00523e538405a9b3246b97c7f1997cde9e4fa385b4868c728f33b81cdb864cac3 SHA512 35930d7ba97cee5d03c5464929411b9497fc6f0439cfe3d093b49baf5084af44951e70ad1287bbf98d7dddc9bc9e013b971233ae54d5c211ab6e0bc535c7f86e
 EBUILD libpipeline-1.4.2.ebuild 659 BLAKE2B ec089cba0d20931ad41e6296e665b209b107951a29169776ec2b58a454e228f33f0a86ee120728b9cfd68d78da1dfe55820b1fee42d3d06674153112e4c46501 SHA512 ee5a01ba66fb4131a9cbf38a219e7e53b4385b01a71eb35b449049b984b7e55b9642a4f5bed3853dfa099ae70dd9f53ed79e2994de2df42085d3ac819bfffe5b
-EBUILD libpipeline-1.5.0.ebuild 774 BLAKE2B 4c9adc18f6fe606385cab11904c6552dd520402ee120448d55e39579890a5a1595330fcc637e9f8d39978926ffbfd2b5f4dd5b5edc8709e0d45a9c78d3719e82 SHA512 3103d6649f43f787ee4e9b7947a9ff1b77aeea32cd3d4fc3583076fb6a5f111190a9d817f5f7db45668440ce6892fa4ac4182c017973955165f947e1867804d1
+EBUILD libpipeline-1.5.0.ebuild 783 BLAKE2B 48cc2c46e4f50a65048065ff848d3e0ed8963769f3359c700329513460d4fdfe4bd8f6d02922d939a2aba57eb290d04a7c912aa3e99901ea734f2ff8c607dc79 SHA512 25b5d61e50cd82efb75d3e3fb1c9ffadf1737edf04f754dd120d6046bf20c84ac8e41acaa8633494e24ed0ee8d6f1117a897c9c19526708c12f061150a7eff41
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
index 698019ed702e..8420e902a259 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 39a9bfd7b86d..664d7252087a 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,5 @@
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
-EBUILD librdkafka-0.11.6.ebuild 1250 BLAKE2B 83c2845e9f2a12567352097955f10801217b567096dc578f2aa22d7be5b6bad81d4811b48f165a6c5d4d9b9fb5ae67fabe2b6ed2bec274846ccf75e14c8fca80 SHA512 bf3d7dc2eb27c8fb2009bdc42313637734d4be012e1fd4efb70b6d750a78663bda08d081da4aea0e81b95f1460302792ea1139156a35af37d75bf8f20c847bc5
+EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
index d56225a7b926..3e90b50ba9b1 100644
--- a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
+++ b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
+	KEYWORDS="amd64 arm ~arm64 hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 9a82d701d931..9796adfdb89a 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -2,5 +2,5 @@ AUX librelp-1.3.0-dummyclient.py-Py3-compatibility.patch 857 BLAKE2B 7729a27955c
 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
 DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
 EBUILD librelp-1.2.18.ebuild 1445 BLAKE2B ac565231d635024c869cf9d2f8ea43b6ffed96a94d0fa1445167c6b8c60facc8987193ccb5a0ac76ae34a019866b84d7bbc4dbf6264f47acb7a3d7d01a35ed4a SHA512 8f6275b915b3c228465d38badb43c2fcbf1928100d7cc3f46e33c0cd17df34d5136315257b28ef8cfff2ee3f1f52168085cce7b9cd4b062d18acf8dbf866ec81
-EBUILD librelp-1.3.0.ebuild 1692 BLAKE2B f187c1cba35e7daf2d998ca034c1ac383151cba65b3e6e2d6e558128ea5ed8d5f7cf9a046bdc0d47c9305a921cc671f47f94c972ded142415461bb0c48cac461 SHA512 e201a383785ee9f8ca66ebee8ece43d64905e7fbccf65363f27cc0e7f0db7488a2d5f8acda02825394f2b5d102ead9013b9903076f6faf89c33642357db968d8
+EBUILD librelp-1.3.0.ebuild 1691 BLAKE2B 04e0943bc0a3e6629df788a4da76bfaf39ab97d3372bf1af13734660fe6d34d7cf234915500bb47eae97d0eee00c63ebdd7061bd9dc4a1ca3e1917a639745b9f SHA512 d6a40ca3e37e155efd1200758738b0290ce8b290fe2fd4d0c909783832e27b8f443a118f7bab5b21868a8539441c70fc75505f6137840d5e1ce53b9124ed35a6
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
index 188faec8adc6..b764146b9aad 100644
--- a/dev-libs/librelp/librelp-1.3.0.ebuild
+++ b/dev-libs/librelp/librelp-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
 	gnutls? ( ssl )
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 3f0e0432a3d5..c06f6ffa4a13 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,8 +1,6 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
-DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
-DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524
-EBUILD libsavitar-3.3.0-r1.ebuild 1034 BLAKE2B b82848b61888ced896ee8c6a4aa4e121db0aa75303fd1470f52cc8ed9777d8544bd14ad4e2a172734b71550a15241073a7d3bd97934951f95c2c56ed4308dc1f SHA512 f1fec09df09fb5629de89ea3804119286dd1b2c81ee374671aa820cce89f5e74e2ede83ef6cce6d8830b17468949c06131f3b4517024352c50b874c8ff431b97
+DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 EBUILD libsavitar-3.4.1.ebuild 1039 BLAKE2B a6b6119d55bcc19b7cccf71e143cdee21798f0e60c6177c1fb43aec4bc707441746cf4517009e544e0bb9ba2a90177a5a422de3cf6512bded01d4194d83ab1f7 SHA512 fbee3ebe2af9fae1622428b260cbc937482000bf5e4e15430bd3041cf41d84a074422bd59f7fc6bf0254839025493b11aeb8abaaee7fda06eef2a0cb5e098a13
-EBUILD libsavitar-3.5.1.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
+EBUILD libsavitar-3.6.0.ebuild 1036 BLAKE2B fae964502773685bccc2379288b7767c89f1cb5fdb893b7248050d87b3a324a503d890e80d5b9116484db0b4774e0d7cf5c89574bdc3ce4b1d657733715011ee SHA512 1b06c9d885ab9a29f0b4239b3412b4ba276d948881178ded503d1708aec19383c2846ff95dd860b77c89be64644fea735560a3c8462143695d31fca9877bc615
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild
deleted file mode 100644
index 4b686c7e432d..000000000000
--- a/dev-libs/libsavitar/libsavitar-3.3.0-r1.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
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit cmake-utils python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-	use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
index 939a582d09b2..939a582d09b2 100644
--- a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index e8400a062878..147e71c80cee 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,6 +1,8 @@
 DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
+DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
 EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1353 BLAKE2B bfbf6e0c1c1a5d7d96c1aa3fd64e54fedff0b4eabdb236d6bf3fc0fbf03d72b785da93405513ac2b6e37a7daed5305ee395b6fe8dc0273cbd61e5e95b03fc30a SHA512 efd501d39be71c46edf7df416592444f9de7d9906acb923357c2697e4ea8d9a01f17b2151387dad0dacc66ca8ebd27bd611a17b57cdca10716dd828915bd6efd
 EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1517 BLAKE2B e4f8d22c81d86bf74d8069e10694e0c3c43fe94b59a60c3bb9eddd6cb77a6307a7c0c1583330ff5747c46d033a46358468f3b9f4a6f0fc302e4c239099745375 SHA512 c1b4a3f70b89438f8bfb5bf63b410be26853d0abb26cb9198a6a1ba70fd46e432fea3d135b6edf6cb24ea2bec677019d380e82390d0f294540752088ed2b1b5c
+EBUILD libsecp256k1-0.1_pre20170928.ebuild 1560 BLAKE2B d98554be2cc72ab9797a876de945275356d4ade9ef203dac2d49b9163085e5d8d0d07d9f54e634c256d312c198a2c5e3df1966cd79037948d23de53900eeec0e SHA512 29ac329b8a7d6ead6524154efc911250cb819a8b9aab1c7081432913c27a478037fbf05cf7fe769ef9646e3cd39c9f8ed511fdfa5a9865b2e55724e5c844a120
 EBUILD libsecp256k1-9999.ebuild 1336 BLAKE2B 5baf2da422fca882c0af05159aa3a0700f69e47ee74e164db1a16a842620e7d76e57cb89614384224395060faae8180c104538e6a3b57ddfacfba6b7a7f23b73 SHA512 a155348e020c9b2a29db0d41ebd0311add97e74f7daae1cd499dee9564152664df3f9acab575ea0f4cd0bc738c013c7dc48d2167b97a7a3b3788b669d8ee743b
 MISC metadata.xml 945 BLAKE2B 7a352dd1f76e95f59cc73d2d80755f81d59e53ea01749e00f25dbdede5d3b430ee8ad5962e90b80c5abeb3a8674279460119a90f7dc656e9b9b3c5a1db486cb8 SHA512 77427813529d0396c4db94a1df6580d3719764049fb55a7b095ac936326e694c7047bfa67aa168252c94a72bda0e25370244ce74d4c3d358948c4106293a75b8
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
new file mode 100644
index 000000000000..388d889bc11f
--- /dev/null
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils
+
+MyPN=secp256k1
+DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
+HOMEPAGE="https://github.com/bitcoin-core/${MyPN}"
+COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
+SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
+
+REQUIRED_USE="
+	asm? ( || ( amd64 arm ) arm? ( experimental ) )
+	ecdh? ( experimental )
+	java? ( ecdh )
+	test_openssl? ( test )
+"
+RDEPEND="
+	gmp? ( dev-libs/gmp:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? ( virtual/jdk )
+	test_openssl? ( dev-libs/openssl:0 )
+"
+
+S="${WORKDIR}/${MyPN}-${COMMITHASH}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local asm_opt
+	if use asm; then
+		if use arm; then
+			asm_opt=arm
+		else
+			asm_opt=auto
+		fi
+	else
+		asm_opt=no
+	fi
+	econf \
+		--disable-benchmark \
+		$(use_enable experimental) \
+		$(use_enable java jni) \
+		$(use_enable test tests) \
+		$(use_enable test_openssl openssl-tests) \
+		$(use_enable ecdh module-ecdh) \
+		$(use_enable endomorphism)  \
+		--with-asm=$asm_opt \
+		--with-bignum=$(usex gmp gmp no) \
+		$(use_enable recovery module-recovery) \
+		--disable-static
+}
+
+src_install() {
+	dodoc README.md
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 0f091c187992..f4f5c8fc3f07 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -3,8 +3,10 @@ DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c
 DIST libsodium-1.0.14.tar.gz 1876526 BLAKE2B 37e9b785cc397f58ab07e38eef9e6f3ed8a2dbfbfd1c865b64d8d9b9440db3f8aa32671065cebf4f73d449889e7abfacf63910add08f0e27582cd6fb32bfbacd SHA512 46663b05aab13ec4003ecc32c89bdaedf60824703be522661eeaa3db8013140bda434c19a759dc38bcbce757e9673a03e701c0eac1526a31a4b7a15608ae8696
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
+DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.14-r1.ebuild 1049 BLAKE2B 6a2fca4e15d07b6f757012c33597beab78c3ef05dd57928876e8301c91d710c87a1c8ec168c8deb98d4f211a0d945ccaa85dffb588155fd36c63f5f7c286a019 SHA512 ec83eb24460a3614219d1139982ed129e1c2a8fb1e459e769084280e296684671e4f82529e4c3945434a3ea345042617e2ec5bd94cad8e9db179c08c9218a3c4
 EBUILD libsodium-1.0.15-r1.ebuild 1044 BLAKE2B 1e07b5338e770271c8a0ea1833d066d88b95a61992dd5cb98da4ff5e3c897c221e6c11651871619f145bf4f55fb42b1c993fd7970470913356c8b94244a1e633 SHA512 bcf15ab7e59a53ee010fe61cf76715d46ec021b4565c51fb363513e6b9e65cedd4ed4369dad97e3c65d6e71d29ef7e1a85f7883f97c54820a1edc527ae787abc
 EBUILD libsodium-1.0.16-r2.ebuild 1195 BLAKE2B ae355b038ae057b6779d33d4f2fbc198b02c66152869c2143528a8e443b563eeb6a344d53ec83fb3e502d08bee9e8ba80eb7445e33cc76c5006374ec93b841df SHA512 58a1df0ca09c5c6275f9af6ec153146fe212a955ffe04614a8e1ddf218aa4ce054333ffce8f642e8bcff9156f2ad46c06a291fbe8d6908e790c93e509896bd81
+EBUILD libsodium-1.0.17.ebuild 1201 BLAKE2B 78187b846b6684bb38c7f37a7c9907ce1e7079208b88762af86a78d25368e0a08266c7415e1e8e322922ffbdc1f0bfe2c3db27e5f1bedf8a39ffa9d2490d7ae3 SHA512 e94631c074eb8318a94e7605abba110e0e1e9c209028af00f954c9995cd8776c23c42694e4225caea117ba6d2e70638b9cac07bdcc50a6495caf4c50bb82d723
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild b/dev-libs/libsodium/libsodium-1.0.17.ebuild
new file mode 100644
index 000000000000..dcfe073f5754
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.17.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		$(use_enable minimal)
+		$(use_enable !urandom blocking-random)
+		$(use_enable static-libs static)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable cpu_flags_x86_aes aesni)
+	)
+
+	# --disable-pie is needed on x86, see bug #512734
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
+		myeconfargs+=( --disable-pie )
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 6e4391759798..5fbd6937840f 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -3,7 +3,7 @@ DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21d
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
 DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 DIST libunistring-0.9.9.tar.gz 3736674 BLAKE2B cb328e2378aeabd8f1282ed6f66f556c6301a88bdbb11d1a7ea73569700a8af9bbbfa9336faa7b390e5f5df628001d5e9bf2081f0c36d139296f16d657e70de6 SHA512 dbf067ba5c748e198f8837e603710ff63714d1bb4642a2cd2facb8f1034b617250c8695f4e1caad77c417bdcb0f1e1664eafa5a18eca77126741a4363a1c9cf4
-EBUILD libunistring-0.9.10.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
+EBUILD libunistring-0.9.10.ebuild 1005 BLAKE2B 37192bffa650072fb98c3b70f55b871e60bd748d09d857c9d05d29264ed047c325d298e12168335b4680f37514e6e72ca2c725e1a8b1c3e3e511af0b16299df9 SHA512 fb0feb9ddb5dd173869847ccd5c5aea9b2a69b145df987613ffe9f1ddfd7523cf6e15072fe30ea5d978c572c7c609ad6a2b0debace41bf94ff03037fc63861d9
 EBUILD libunistring-0.9.7.ebuild 998 BLAKE2B 75ab1eb5ac3e5099677cfb03dfac09c9b1a4851754a5633d94de4c925c8f44b56ed23a06b4b39a6fb8b4329eeb0344887a4f1582fe77987670f27c4bf75e25b1 SHA512 fe39a9540299c3cf1d8538aa8eecb0f9824e67ea460d05abe458df6cc7f9ac0f8a239d944e2f1029566c8f26d610529ea90002beb6856e545e323945a3949bf0
 EBUILD libunistring-0.9.8.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
 EBUILD libunistring-0.9.9.ebuild 1011 BLAKE2B 1dcbc1efc9937a5a225a1b26c25df2162a304f7fe1d6834adb47aeba2998ae0404449a14c59866deaf652fe860c50623a34edd82c683321c891212fe13a140b2 SHA512 4282f418c75273ceb2fcbf52109e460c60ac278e5ca126affd5d363b9d31f1abc74e5598fecedcce8c33300d9271b447dac962f23e8d8c58bd1901ca09849f6a
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index ba7327e2d797..226a286a26ca 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 PATCHES=(
diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
new file mode 100644
index 000000000000..822e29fb57ac
--- /dev/null
+++ b/dev-libs/libvarlink/Manifest
@@ -0,0 +1,3 @@
+DIST libvarlink-16.tar.gz 56886 BLAKE2B 6c65199ced429eac733d1114cfad59c4514d299bd3bba0d4a9907498655545fd9edb9999428f39df936cd1e6710bacc08c04f05710e80f0ceb974b43809b9c22 SHA512 8152fc4fab4e9e829c2bc1585e479c23b0329c59da0be8712ff64dbbe01cde9630f228ac7edc06e9faa39dfd3d38007032ec6ed561e2363d4d33f65856f1a271
+EBUILD libvarlink-16.ebuild 614 BLAKE2B 722d69431a69960ec702b12d2e517786f4f41c6451e8755a5c66cdcba63bc11dd1ae7ccfda4581afcf95af3ee5be5dc2d60fc24dd74a639dbeb3404a32ed86ce SHA512 9c4d527a1775c84c8d6acab718df04f497cc162d60aba0ea659b720aee81984b3f187d78c78512ca6c926ae8ad72320c7970d0632378662aadba8804798c6ed1
+MISC metadata.xml 327 BLAKE2B 9b7695e2581a6bf4ee1b9906b19c8ad04b2b2db2c78a93cfd2def1bce4e7fd02c79bdf3123225acd3758fcfe660a71780542b2fd00109d38b171d085d3945260 SHA512 e1e61bf472281418c1e3f4a673decf0c2c82ef82630c3a7c06fab8f58721d3e0fb8fb8b634a37914d65e11d24173967f339b9383d93488ff44a39903478011ec
diff --git a/dev-libs/libvarlink/libvarlink-16.ebuild b/dev-libs/libvarlink/libvarlink-16.ebuild
new file mode 100644
index 000000000000..b15afea5560f
--- /dev/null
+++ b/dev-libs/libvarlink/libvarlink-16.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="C implementation of the Varlink protocol and command line tool"
+HOMEPAGE="https://github.com/varlink/libvarlink"
+SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libvarlink/metadata.xml b/dev-libs/libvarlink/metadata.xml
new file mode 100644
index 000000000000..b3e25ca23723
--- /dev/null
+++ b/dev-libs/libvarlink/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">varlink/libvarlink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 70b59bf11c20..879689448817 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -4,6 +4,6 @@ AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88c
 AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
 DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
 DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
-EBUILD libverto-0.2.5-r1.ebuild 1513 BLAKE2B 751d2c63ba2794894bfdeea87513e514d5092c556f61454d65ac65ecaae830470563aa1d67ccb53ddef9efff58bf2677929e4d20c9edbf26a13b51f8929d4d44 SHA512 7bc75b511a82cb5fcd41be4515ababeaaf23b8cce57b924ede667c9291aac100592842c1dee55ec7d6ab7ccca8cd0c9c90c3b5924aa788bae9802650fddd7f2c
+EBUILD libverto-0.2.5-r1.ebuild 1512 BLAKE2B 951697802ba260ad2976ad599231b1feb1d63f8b24bd656d554e90d2dc350e7ae08663d82dce2688cb2b666b767b208ea0370ea5459d8f3f8bd75c28ec778211 SHA512 9d82060dfd52ea4543073d688b17ba4f1b904da712afbb0c1149ff74ba511f58fd02e2ef90f2f7e1491336c973133bf21e57272f2b0daf101c0d9dfbe9048867
 EBUILD libverto-0.3.0.ebuild 1737 BLAKE2B 7630b8cabb87827838e7366e0b3fdc047eebb91a380e17b1ddda7b71fcb280fcc0bd8ad5559ac150a16e73154c270540762179ff6c9b5fd09bc95181d932f9df SHA512 f13a3ea85ee2fa92ac49315c4fcc70c19340706505062b027c06d90f7c32ecd30d53dc2cf6fbee12913d7a55f72238f05807cda68fb17b71444f4c8f071956e7
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
index 1486d1ddb5e4..9502f0809ac0 100644
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 # file collisions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 90f7cf30165a..ed8ea12b5ddd 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,8 +1,13 @@
 AUX libxml2-2.7.1-catalog_path.patch 2225 BLAKE2B 9a9c5836e5227e51de05d1e19c27b828c3c082c671d9b9bfb30afbe971fca580fb87cd86560e2ed431b4dc1495585c62f01da0f36e401d4dbdc4d8be2269cca5 SHA512 bcad080ee84c926c75df8baa47937bdfcfa207235263249f4025e64cbb5ac9be883e1ac4dc1ee55944116da2f84ced27b7cae781aa855579796f3f53a54aacb1
 AUX libxml2-2.9.2-python-ABIFLAG.patch 728 BLAKE2B d81b042b5000717d5aa88ac4cebf78749f5a4ef661c227537171c5695d97a16ca75c790c8b540e3481a54dc2d935112b46e0a23509c887e16e3f2886c08f1d69 SHA512 2f801329ad4e13dc70450d41f7659a510fe429b3aa9b66859fed25c4e3d95381d6f253f3a60a54002a16999296d3bd2adaca5e4cca92186492bfc7de3ac84426
+AUX libxml2-2.9.8-CVE-2017-8872.patch 2209 BLAKE2B 5d91d5252737a38f5a37aee31409cf9489af112f157161e069d75b8929a5e46b14934f5cea1ff97fa2ef51f0f99be02f6c3287a637c6aad79ef4f52e44ec83de SHA512 8c466cb05dc1ccb8b08d77761f63a69b884b251f85291a4b60362fad06f6b359685854eb26a9dff0d87ecb74ddaa6f33e5611c71c20d0f813ab3a57b4da8b775
+AUX libxml2-2.9.8-CVE-2018-14404.patch 1837 BLAKE2B fea63c5520733da251ad22087cff9ffb9b40ffb105ad6832cc60db5c6fbeec03147e2c502b8f34b8b1189d105eb73c2b4abe46903c381d63d1b9d753a49c36cc SHA512 7dd09401a6acdea20e356a3608ffa23606a499ba6437542bd5db93e4c72143aef74fdd249da2d0069b27a4a8e08f70f4ff6db19b0e191d1cedfcb1c7f0abbf55
+AUX libxml2-2.9.8-CVE-2018-14567.patch 1651 BLAKE2B b6f79d2ff56d7846410d8d0395139819b9aee5a59cd1e44fd8c5173d222f70164e65d0db5d923cd7decbe4fba223d1f8947c64b07ffe6b06453604b160fe74a4 SHA512 3de674cd91e9fc8f63c292aa70fc03861114ff1d1d86694c940c7ed41b65c1f60699fc667a0e686ea237fda235fc5c3ceddfab791a0857b0a4fc3c0850bcb724
+AUX libxml2-2.9.8-out-of-tree-test.patch 1311 BLAKE2B 7b3e7abf273c1ab2cbc42b1fcd4ff7bef365503d8c04b315b0857574054409ac76c367f7ef0c944d448ef3ca84268082f59424758894cffa31a93925a81972c8 SHA512 4b665c7c4bea2d938f7b2021a38f274b9e40dd38c5e2085716cae02c60cd3ff9aa109185e7bfdd38d2724d76500c99da0db0968f634b56f7ef418a7a72ef144a
 DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc695aaa3e456ba51a66c0294a741d7b60eb4c31c7040443bbd54712c019424078bd533856a9650b39a703a926d5 SHA512 28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.8.ebuild 6421 BLAKE2B 98377ff5878e8ce958f9b26972cdd7943cccd49501b8aef622983337f512d77c56bfabc9e067306f3f8350176354c39d9aa26e0331b804c3b4de36e95aae90d1 SHA512 fde54a21af5aa5d9fa3acbc84cc13064d81f98b6ce0fed790d1fabc70f587237bbcca2fd4d51766a444bb16b4700b6d33c789f463a56c124f2686da5b0f8b599
+EBUILD libxml2-2.9.8-r1.ebuild 6929 BLAKE2B 118f631199ac16882386289926e79ff92f01efda5f43d50a7e3ea1e3f63c11d0e8914d99962478870377f11815b4a6c536ff729d7890613aab993ac382e0003f SHA512 a7ba10378ba62ad7070abc0f3ef4cafdb1b92599f15ddee89b63dda4d9bb34f00851cae0a638b6bcb90b8ff8436902d37a92325b50048718d53b8caff3b16a2f
+EBUILD libxml2-2.9.8.ebuild 6533 BLAKE2B d3221db79de340179ff899f16848e2c2f4d472d7b5836d4251bfcc1abadb10705a8cdf711c15ce057869367b0b9581bfd5ec242029403d369906c8f41909f839 SHA512 4724cba5b6c9ab9db540c96ec7a87811695b272c339b0e4e2cc9248f548948b953372d7be025d5374d1979c522b3b532ffdced7a7e88fcf532d59ecb4c584ef6
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch
new file mode 100644
index 000000000000..6062f63df9ea
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2017-8872.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/618110
+https://bugzilla.gnome.org/show_bug.cgi?id=775200
+https://gitlab.gnome.org/GNOME/libxml2/issues/26
+
+From 123234f2cfcd9e9b9f83047eee1dc17b4c3f4407 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Tue, 11 Sep 2018 14:52:07 +0200
+Subject: [PATCH] Free input buffer in xmlHaltParser
+
+This avoids miscalculation of available bytes.
+
+Thanks to Yunho Kim for the report.
+
+Closes: #26
+---
+ parser.c                     |  5 +++++
+ result/errors/759573.xml.err | 17 +++++++----------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/parser.c b/parser.c
+index ca9fde2c8758..5813a6643e15 100644
+--- a/parser.c
++++ b/parser.c
+@@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
+ 	    ctxt->input->free((xmlChar *) ctxt->input->base);
+ 	    ctxt->input->free = NULL;
+ 	}
++        if (ctxt->input->buf != NULL) {
++            xmlFreeParserInputBuffer(ctxt->input->buf);
++            ctxt->input->buf = NULL;
++        }
+ 	ctxt->input->cur = BAD_CAST"";
++        ctxt->input->length = 0;
+ 	ctxt->input->base = ctxt->input->cur;
+         ctxt->input->end = ctxt->input->cur;
+     }
+diff --git a/result/errors/759573.xml.err b/result/errors/759573.xml.err
+index 554039f65b91..38ef5c40b8e3 100644
+--- a/result/errors/759573.xml.err
++++ b/result/errors/759573.xml.err
+@@ -21,14 +21,11 @@ Entity: line 1:
+             ^
+ ./test/errors/759573.xml:1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+ 
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
+-     ^
++
++^
+ ./test/errors/759573.xml:1: parser error : DOCTYPE improperly terminated
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
+-     ^
+-./test/errors/759573.xml:1: parser error : StartTag: invalid element name
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
+-      ^
+-./test/errors/759573.xml:1: parser error : Extra content at the end of the document
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
+-      ^
++
++^
++./test/errors/759573.xml:1: parser error : Start tag expected, '<' not found
++
++^
+-- 
+2.19.1
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch
new file mode 100644
index 000000000000..59bfc0fa9b88
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14404.patch
@@ -0,0 +1,54 @@
+From a436374994c47b12d5de1b8b1d191a098fa23594 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Mon, 30 Jul 2018 12:54:38 +0200
+Subject: [PATCH] Fix nullptr deref with XPath logic ops
+
+If the XPath stack is corrupted, for example by a misbehaving extension
+function, the "and" and "or" XPath operators could dereference NULL
+pointers. Check that the XPath stack isn't empty and optimize the
+logic operators slightly.
+
+Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/5
+
+Also see
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901817
+https://bugzilla.redhat.com/show_bug.cgi?id=1595985
+
+This is CVE-2018-14404.
+
+Thanks to Guy Inbar for the report.
+---
+ xpath.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/xpath.c b/xpath.c
+index 3fae0bf4e0a0..5e3bb9ff6401 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -13234,9 +13234,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+ 		return(0);
+ 	    }
+             xmlXPathBooleanFunction(ctxt, 1);
+-            arg1 = valuePop(ctxt);
+-            arg1->boolval &= arg2->boolval;
+-            valuePush(ctxt, arg1);
++            if (ctxt->value != NULL)
++                ctxt->value->boolval &= arg2->boolval;
+ 	    xmlXPathReleaseObject(ctxt->context, arg2);
+             return (total);
+         case XPATH_OP_OR:
+@@ -13252,9 +13251,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
+ 		return(0);
+ 	    }
+             xmlXPathBooleanFunction(ctxt, 1);
+-            arg1 = valuePop(ctxt);
+-            arg1->boolval |= arg2->boolval;
+-            valuePush(ctxt, arg1);
++            if (ctxt->value != NULL)
++                ctxt->value->boolval |= arg2->boolval;
+ 	    xmlXPathReleaseObject(ctxt->context, arg2);
+             return (total);
+         case XPATH_OP_EQUAL:
+-- 
+2.19.1
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch
new file mode 100644
index 000000000000..0d289352d2f9
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-CVE-2018-14567.patch
@@ -0,0 +1,50 @@
+From 2240fbf5912054af025fb6e01e26375100275e74 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Mon, 30 Jul 2018 13:14:11 +0200
+Subject: [PATCH] Fix infinite loop in LZMA decompression
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Check the liblzma error code more thoroughly to avoid infinite loops.
+
+Closes: https://gitlab.gnome.org/GNOME/libxml2/issues/13
+Closes: https://bugzilla.gnome.org/show_bug.cgi?id=794914
+
+This is CVE-2018-9251 and CVE-2018-14567.
+
+Thanks to Dongliang Mu and Simon Wörner for the reports.
+---
+ xzlib.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/xzlib.c b/xzlib.c
+index a839169ef2ec..0ba88cfa849d 100644
+--- a/xzlib.c
++++ b/xzlib.c
+@@ -562,6 +562,10 @@ xz_decomp(xz_statep state)
+                          "internal error: inflate stream corrupt");
+                 return -1;
+             }
++            /*
++             * FIXME: Remapping a couple of error codes and falling through
++             * to the LZMA error handling looks fragile.
++             */
+             if (ret == Z_MEM_ERROR)
+                 ret = LZMA_MEM_ERROR;
+             if (ret == Z_DATA_ERROR)
+@@ -587,6 +591,11 @@ xz_decomp(xz_statep state)
+             xz_error(state, LZMA_PROG_ERROR, "compression error");
+             return -1;
+         }
++        if ((state->how != GZIP) &&
++            (ret != LZMA_OK) && (ret != LZMA_STREAM_END)) {
++            xz_error(state, ret, "lzma error");
++            return -1;
++        }
+     } while (strm->avail_out && ret != LZMA_STREAM_END);
+ 
+     /* update available output and crc check value */
+-- 
+2.19.1
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
new file mode 100644
index 000000000000..fcc441d05de2
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch
@@ -0,0 +1,40 @@
+https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14
+
+From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 3 Jan 2019 05:44:03 -0500
+Subject: [PATCH] fix reader5.py test when building out of tree
+
+When building out of tree, the relative path this test uses doesn't
+work.  Resolve the path relative to the test script itself instead.
+
+Url: https://bugs.gentoo.org/565576
+---
+ python/tests/reader5.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/python/tests/reader5.py b/python/tests/reader5.py
+index 82d0daea474a..da5355ffc4c6 100755
+--- a/python/tests/reader5.py
++++ b/python/tests/reader5.py
+@@ -4,6 +4,7 @@
+ # this extract the Dragon bibliography entries from the XML specification
+ #
+ import libxml2
++import os
+ import sys
+ 
+ # Memory debug specific
+@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman.
+ <emph>Compilers:  Principles, Techniques, and Tools</emph>.
+ Reading:  Addison-Wesley, 1986, rpt. corr. 1988.</bibl>"""
+ 
+-f = open('../../test/valid/REC-xml-19980210.xml', 'rb')
++basedir = os.path.dirname(os.path.realpath(__file__))
++f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb')
+ input = libxml2.inputBuffer(f)
+ reader = input.newTextReader("REC")
+ res=""
+-- 
+2.19.1
+
diff --git a/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild
new file mode 100644
index 000000000000..86521ab289ae
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.8-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu ipv6 lzma python readline static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	cd "${S}" || die
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Patches needed for prefix support
+	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix build for Windows platform
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
+	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# CVE-2017-8872 #618110
+	# https://bugzilla.gnome.org/show_bug.cgi?id=775200
+	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2017-8872.patch
+
+	# CVE-2018-14567
+	# https://bugzilla.gnome.org/show_bug.cgi?id=794914
+	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14567.patch
+
+	# CVE-2018-14404
+	# https://gitlab.gnome.org/GNOME/libxml2/issues/5
+	eapply "${FILESDIR}"/${PN}-2.9.8-CVE-2018-14404.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+#	epunt_cxx # if we don't eautoreconf
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	emake check
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e ${CATALOG} ]]; then
+			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index 1917e19e6284..fbb37285cb7f 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -81,6 +81,9 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
 	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
 
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 696d551af7aa..769d60b1ffe2 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,5 @@
-DIST libxmlb-0.1.4.tar.gz 82036 BLAKE2B 26adc2a33e0e63c6340127cb25dffa62d88d1c1ea6c760fcd54189ecd899f4d27547194e3e6ebc9d638dcba384fb2435e832915d5e75018f9f03ca7dbecdd878 SHA512 58b5f51fe0d6c6bc9f8e960f26ef79f3fb437f6802505d4e216e6bb32f95bd134f3230056dbc922bd5cf734ce1ef2278a2931653c1653cfca9baf6ddcdf38b78
 DIST libxmlb-0.1.5.tar.gz 82894 BLAKE2B 37918d06938ff2a33efbcca712c1424767e88e0a0471a6458f41d97a5004fc3c93be67e3a47f031186fe157ccc610de5101e254dca8a0e9fb2d908c4f466e418 SHA512 c396ff647b6c0d86c8a1cfa5926699c0d16e0d62ae29afc542bcf4a148d7c1daa9239636222dae04c1236553d09257c7440ac383efb8912bfa9ccd761f3b59bb
-EBUILD libxmlb-0.1.4.ebuild 930 BLAKE2B f193bec72b41e589643ec1eee0856bd09ab8236357c71f8c57562d3425408d77bc799949a07497edcdc0effadd67febb5415decfc8b9b998de7e6f44cb1d5804 SHA512 b54cd8542667a35fea53d58b88643a8f9134fb0f1576f2378b2b793cc5e266720b2adc972fa16810123d8ce26071269646437d297e60f8c4405152b6223a9de0
+DIST libxmlb-0.1.6.tar.gz 83399 BLAKE2B d4c1bb0d95863107bf71225317beb99cabf04e650087e08da10a14cdca2925566fad022123a86966cc8499fa30c89e47fbf7c521bb89b1d74d8636b0ae82926d SHA512 da9e36e97fa4335f21eefa74147676105924a760464647322a3f0a29ac13c815d692eac81b0ae5d47340eeb654989a7ddd2b83f686e5f222a48f749786a047bd
 EBUILD libxmlb-0.1.5.ebuild 891 BLAKE2B 59caaa4e69c05ed265fb19d2ebe1476c615fa0358c2da1c8a138e35cca84cf2f6579a4c9d1da57e9ad8c8595d8282e5e947571c68a2b939726b11c8dca2ba35a SHA512 f7ca17456bad539fd71a3be24fd3fc3f30fe2562a2fa41dfa38a1191249bb02832a042500c4a38b0f69c60e33f0af639a454bec6875ed628910f014c89bb1d37
+EBUILD libxmlb-0.1.6.ebuild 891 BLAKE2B 34f27e93fffe28465bdb955703e192f3337eafbd5fe6cbe3260afdd035406a642c116b208ba309f45449b61f6eab99d948d8210ef3880e17ec4f890eafb388f9 SHA512 6636fad0789ea13c0a1476a65fa204bdceec6b7967f811533afd11a9ae04b628ffd50bfcd91408913f8981a96a5fee559ad2eb5f4829d2a1ee61dcce76435a1a
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.4.ebuild b/dev-libs/libxmlb/libxmlb-0.1.4.ebuild
deleted file mode 100644
index 5567d3bd9d55..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MESON_AUTO_DEPEND="no"
-inherit meson
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/util-linux
-	stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	dev-util/ninja
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dgtkdoc="$(usex doc true false)"
-		-Dintrospection="$(usex introspection true false)"
-		-Dstemmer="$(usex stemmer true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.1.6.ebuild b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
new file mode 100644
index 000000000000..b56b6d247192
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 6c998dd60f0f..d7401ba941c2 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -9,5 +9,5 @@ DIST nspr-4.19.tar.gz 1139967 BLAKE2B a8358249647a3d0e073f00febc475199d6479e2a34
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 EBUILD nspr-4.13.1.ebuild 3865 BLAKE2B eefd29695e1bf4666d2d3f99193d09566d7bec69cec353779ca612bcddc89d4f8d47607446e6286a6d80dcdbd01e4879546f209f32c2a1379bd04b757ae481b1 SHA512 594efb0fe957e619cb41c90c1d414dbb3d8c24e26cd82ef752e97dc220f2a9ae85048a1bdfac4712b931b265ef27f3108f8837580ed35e3efd401340403f36a4
 EBUILD nspr-4.19.ebuild 3858 BLAKE2B f0e8c816a00279b80002266dd3a1d6423c6ca77e886b3684514ee180ca2dfdbe627e8c001f2f479f54d706f640e8c82e2b1bc63c5c0cf9467d7e251a8e6bddbb SHA512 f835e068933d27ac8d1e0f91b5a2a5121e1ae6c505dbb5654cf64629211c324b9ae45d102062f4b7e4fca09231b5ddedb73008d8873e51284e814f79053f1672
-EBUILD nspr-4.20.ebuild 3817 BLAKE2B db6cb0c9336227857d2f62a60351771c46f35e957924fb32786aca5715b71f7a9a111e2a53be117a5e38707c6d31c0ef8e58601007df0dd3142c8f6189cec08f SHA512 8f15729f2e46c090d531d805adef11d833db780959f0b18a2cf36e8b9cda5345d9884b75473937f7f41b4275213d8805ac816248de95d8551d6b3676479c56a3
+EBUILD nspr-4.20.ebuild 3816 BLAKE2B 09bf776c700c1615c3413cdc26acd3167b5f0041a0c40ba81cd4c536822acd23d268d753df123ce163ada8472617644df5d81c9bdf3cae478dcf1598668e8f32 SHA512 2725065e38898cc938b9f373268683290a12541c31b5bb9115ff7a2b76f1426663e2c4ff92da901087c274d3438d1c059c07f96c715ea5cee20ded23ef3a259d
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.20.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index db18a0960398..dbc07b9d6927 100644
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index bf5bc12192de..f2be609c4987 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -12,7 +12,7 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9187 BLAKE2B f2c2a4d1470950405afeb2acdec4443818406ad60f85fd88dd399efaf30b62c7bb2e8d8002cd6c1fb1a7e3e3af6e85c953db10d0e2340d64dbe3dbcce1379219 SHA512 b0244c44bfdaf7f24fb36aaba4c9efea40d4e9439df81981b9f83f5f415aabcab17ed1726f0ab55729b82f8198b4b39c699eef4422259e95262f7a7f69f64802
 EBUILD nss-3.37.3.ebuild 9428 BLAKE2B ff335d4edc83f45859d84cbf10514062adede17c3e5a0931a80125e70fd8e3e415809f1ef1ea4ac2549695bdd626fe56fbc4bca658d7c92f3657b16c32ee72c1 SHA512 57fd38ea8f3a71e8c880358f11f5ea5603a103563d2341ce280d188e3b2451c1bbcc38a6fc2b2ba01b7166a87952dd9922e553595c0851ba9d240e989362c414
-EBUILD nss-3.40.1.ebuild 9419 BLAKE2B 46d33fb71df227a9729b4f965018a0892e1d98d36406deb210a0812f9b95457002934f8c62bd7a087fd851043afc4d582ce99093b3ce735f88c00ddae8410b3c SHA512 8aa0a935c260c6ad70faae11b5d21fea67422b624351db911fa960f9a307bf7ef91894b1c4b41e95fb8a450d0578e0522daf20239113811f3f9369df7c412f33
+EBUILD nss-3.40.1.ebuild 9418 BLAKE2B 5de4f0762d6275675cfd462e587377fe7438c9d48914bdd208c6ad748e6c1ac8b2875de8d1328fcbcf485d1e2b0e053666eb8323920fb858cfce2958eb4aca5d SHA512 2cadcbebfbce23963c848a5d5de1dec18d624d55d1cbf27f82e926fa30a87d653adf819178c7bb7edde1be22368de0d112beac82ba46ff1b457b8a5deccfd34f
 EBUILD nss-3.40.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c
 EBUILD nss-3.41.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.40.1.ebuild b/dev-libs/nss/nss-3.40.1.ebuild
index 3a5a82a781d3..544eacce9d20 100644
--- a/dev-libs/nss/nss-3.40.1.ebuild
+++ b/dev-libs/nss/nss-3.40.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 250dd4078421..afd3dc9fb8c7 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -2,6 +2,6 @@ DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fc
 DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b9127090723d50f4c22874042719a31bcd23f2e3b1fac1daf62d723b1c8884036b8543c4c83a7fe5e2ad8e4daf625 SHA512 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df
 DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
-EBUILD oniguruma-6.9.0.ebuild 968 BLAKE2B 066fb7294194006674cb563e5268c47f4dc68e07ed776c0bdf40861e5cdaa1d366c5a25ca524d4d5d7afa029393d6c0117336053dbc816e56502639289afbf60 SHA512 bab262d0d505da968f7d1e1cf542ed47fd5657bf362b33c9d43d1c80b1221d27f7f762a81f0ccf9b970f0fc01001d8c940f75e260c0c542eb2f2ce72b29bbe62
+EBUILD oniguruma-6.9.0.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
 EBUILD oniguruma-6.9.1.ebuild 978 BLAKE2B 4a07a3eb8d1d61f09126c71b431e3dad423febc29dcd8434a345931c17469e4530214c8dbc0e96fb8980955606daf4db84be0fdf17a08b78ce1842e7b627f357 SHA512 94fc81c18f9c908b6fc743f7df96f2702e708be2a2dec1eb9d8baba527f5d6e6db2444c57120fd898fe88974b34e71bd66a438a1ecb95bc9ff3f9d138c7f96d3
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.0.ebuild b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
index ec71399f2df5..83ded610f130 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2018 Gentoo Authors
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-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 ~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 ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 261c3dc13c70..c99ab5fa009c 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,13 +7,16 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
+AUX openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch 1072 BLAKE2B cb1cc03561193fbf8686b48d544d9dbf4674ca8b514e6ff5a569001667cd4d02331acf1b8c2bbc2d85232e43e0898470369d69dab3f70580825f5a10000d7058 SHA512 3ae6ae44e9dba31e2aedecc6be635e627e81367abd7f537deca90919506e2004379b7f954a0df1187a03e21509052d232daf2c657d68b1e7e3000b94e48903b5
+AUX openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch 3928 BLAKE2B e91a7fd153622e92acab16cdcb19d933398a685afe8d7bbf53090986bd263afd64c9ea23c57dee0022423ca4b8e08f8121791b4e1f6f00e47cf7f2440ac93228 SHA512 c7e59cccece9a60658bdad4efed193c69d14f8b2a9a515845b24adf9ceeba3039c8fef9aa474f33688a4ff3395a4013de5ea4a56bd4787b59a66ed4d388bfcec
+AUX openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch 19341 BLAKE2B b8d36862f26f17efda5025ca7e0d12d4438f431235f66419a621eb6ee62bbe4b4bc6719d2aeaf249c37f53e98bba30177990f1f1120b6728597e99129711845b SHA512 61ac466583fbf324abdf73332580fd2a4e5d86d30f51d1363aaacf5305af8d7fe0cb40ba6fdeaa94c388bb2f37c2e489b17e05473258e7f69957f31d8a25261f
+AUX openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch 957 BLAKE2B 9b059003d4b77c7d1479841d003c61ac51aaed6096877fc1e787659c11cd9bd0d2375154666477151bbf0dd707ded874c9341d9ede191ab2efc137acc6ba36b0 SHA512 e78cd97444b85a879af428efd7203ac8ada44b5d5c915b3b842b4c97574056e1678f1030521299f3ffa18d589b7e0494a3a3114c2f9c57d2763590d60aac9d56
+AUX openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch 2181 BLAKE2B 28b1185b5502cbfaf7ae1a74d02389bcf5a651a5c20ad7c0f109d06a4512e34db333bc8e9457ebbc6f7d90b54b885f6473e9440f34d8cd96d6b6bedd1b61705d SHA512 b24347811c8723c6bf5ab2c0a15bb18a57b4a54889fcd5feda8bc7bce3b54368ddcbb2b10b0052a6f4f460e34054bdfda2c49f88109f66ed2eac0780560c284f
+AUX openssl-1.1.1a-preserve-errno-on-dlopen.patch 1639 BLAKE2B 9c900dfd975a3446931ca4c7e34030eb8c3be2ce8f11c737cda627f3be2443ba8c31ffe73cc1c60a64d267aeb5c9023cfd62913fab96f0077c045828a870ee15 SHA512 a0bd5656890626d836ce8c9a09fba8b631504e13eb8844e56a493804bdf129cbba010a1b3905b8493960eb7441d531810f732663b61d6e61f79bee3df311d0c4
+AUX openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch 1665 BLAKE2B 12c117f85fdd7e27c5af5be8a87627d0adde280be49a64fe4548e7b204f78568ff7e40ced76156d48f72a847034724f3191b669a81b30d3f62d35ffd026a1317 SHA512 67c095262ffe1a8d570510ebe4ae84adbd1db1d5b5b9c29ebfb8bc10174a32cdb6f43a123eade7cde03a9fd301a289d98636b5793887c866c07342cfc5ba4911
+AUX openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch 2171 BLAKE2B 6d1491a337eee20608f08f9a2338d84d1f7ba091feab614cb3c2660e6bca9df7c4b3d71eb6850a50f9a26003763241307c9bdfc8c91babe022a7d177f14951fa SHA512 c7667572a7171380b987ed4befd8012d130cab091b843b8260e1b7f4c880492ce8dd83cc1d4eec9b3dde348f1b8a7c04e9290dcb8c4e2190de54f8bd57f2c440
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
-DIST openssl-1.0.2-patches-1.6.tar.xz 16004 BLAKE2B 28c7e9a8c8b09a34aa6ed21dec18b04c1d6140276e319cfa99b63db5ae188ca7837c444e8352748ffc86e6df7676534aef2f28788e825ee8207c0f876efb5b7b SHA512 eac9bbbebd8d942707ef385ee466929045bb4698985f7a0fb16f529f2101a246735cc2e654bfbdaa8a178224bb5ac564478a7587e6156cfcbdfe62a719bfb0a3
-DIST openssl-1.0.2p.tar.gz 5338192 BLAKE2B fe4c0e2bf75d47a76e7377c7977be7bcaaa532061ab89ee989786eeb6495295711a29a88bf026c85d9ed55c97e71b0e9c8cf4c29b6e58a3dc56bcff518666823 SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
-DIST openssl-1.0.2p_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2p_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2p_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 DIST openssl-1.0.2q.tar.gz 5345604 BLAKE2B c03dd92de1cc8941a7f3e4d9f2fe6f8e4ea89eccc58743d7690491fc22cc54a9783311699b008aeb4a0d37cd3172154e67623c8ada6fc8dde57e80a5cd3c5fc1 SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
 DIST openssl-1.0.2q_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2q_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
@@ -30,8 +33,9 @@ DIST openssl-1.1.1a_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffa
 DIST openssl-1.1.1a_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
 DIST openssl-1.1.1a_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
-EBUILD openssl-1.0.2p-r1.ebuild 10098 BLAKE2B c440754d7c2b257509cb2796372afb58ac031d7a5bc8125a5cceec9889e3498eb6660610171972e61a1332eb5e130076167cfed3e8dfcda16238ef443db9454f SHA512 0b45aa92749affdc1ed3c7fefecb49f7fc2f92b062b6045dda241b1d28ecddb98fc1767f56c31a0dadd4eaf9d44a2142f3dc6cbc724275fa70db07aab5dcedaf
-EBUILD openssl-1.0.2q.ebuild 10262 BLAKE2B 50b146412a9b36588f3451f1192ad68b614dea0962aa797bdefb259cd770547e47cae695558557a6762e7e77c4e6703152eed29aa043d50e3574b37440fa7512 SHA512 5de60ca0ab4bc2b09d98988957f72148032891bedfd404f01633397f7fb3febfb2ef248a130edfb742643968028ba1182fdf7205e8cc66d30cf23590c8b1e9b3
+EBUILD openssl-1.0.2q-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
+EBUILD openssl-1.0.2q.ebuild 10254 BLAKE2B e543d26a7a1f9848e7ddca3bbfea3eed4a656e3b6dbb9d8c770f25472a2d584a2e513c2f8978af5a8efab9d33ee8616f7b1a20f02d3a05c5beec1e1da15d0dd8 SHA512 21e54c2937acac8ab2a4514ae7f824ada21183bd0eef11b5b1f7bedf1eb423bd2d98de6efe5c6b8263c88dc98437a2632733ce60c46d220f127a2715300e76bf
 EBUILD openssl-1.1.0j.ebuild 9991 BLAKE2B 8df26c653ad304e724c59eb12882e535a9c03b00814f727d28bba62e0948480378b5c3d2fa1a8f59bb889e89c0abba0db14f60b2a306757bd32b8d6e9e8d1194 SHA512 5efe70f82141870a996785e7bce29a11671d8c1e4e0dec26b5ca737fe07fbac298c9ab4b0ef19c74593d82a030ddca31ec9e1961af1b8252ceb08e206e8edb12
+EBUILD openssl-1.1.1a-r1.ebuild 9831 BLAKE2B 3579028bac72fb81ffe175ab75532d0459e1b2b00e636d331498c7b3144ead73fb862a537cd3028b2c774320cec86a6ec6d734da42315664ea81876b836185c9 SHA512 e1e8169c37dfabef28378c053ee9f0fff45eefce1e19b5e8abaa507ee80496a2f31511296a2c9bdc50a3de7d8719752f26457238ae4b86fb777956259d3e11a1
 EBUILD openssl-1.1.1a.ebuild 9280 BLAKE2B 47a9ef1e05899f295bc2ce197821ce19ffbfaed7924be4131d07a6ae285dd339c9ce673b380163bf53b2a13e9e41d97ff4001482ea67754af77f481bd756ffee SHA512 4d1f897d5755ef451b17aa37c57df0c60bf4e5180029990debf060cab9f656100c74f110d6faa1e629b65c4d945e1da72488de1054df9e9133734e6d3626b108
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch
new file mode 100644
index 000000000000..8014be130ab7
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch
@@ -0,0 +1,27 @@
+From 3be71a31a1dda204bb95462a92cf7f247e64b939 Mon Sep 17 00:00:00 2001
+From: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Date: Sun, 16 Dec 2018 12:43:59 +0100
+Subject: [PATCH] Fix a minor nit in the hkdflabel size
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7913)
+
+(cherry picked from commit 0b4233f5a4a181a6dcb7c511cd2663e500e659a4)
+---
+ ssl/tls13_enc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
+index c3021d18aa9..e36b7d3a066 100644
+--- a/ssl/tls13_enc.c
++++ b/ssl/tls13_enc.c
+@@ -41,7 +41,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
+      * + bytes for the hash itself
+      */
+     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
+-                            + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
++                            + (sizeof(label_prefix) - 1) + TLS13_MAX_LABEL_LEN
+                             + 1 + EVP_MAX_MD_SIZE];
+     WPACKET pkt;
+ 
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch
new file mode 100644
index 000000000000..8f249e22a1d2
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch
@@ -0,0 +1,97 @@
+From c25ae0fff78cb3cb784ef79167329d5cd55b62de Mon Sep 17 00:00:00 2001
+From: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Date: Thu, 27 Dec 2018 22:18:21 +0100
+Subject: [PATCH] Fix cert with rsa instead of rsaEncryption as public key
+ algorithm
+
+Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
+(Merged from https://github.com/openssl/openssl/pull/7962)
+
+(cherry picked from commit 1f483a69bce11c940309edc437eee6e32294d5f2)
+---
+ crypto/rsa/rsa_ameth.c        |  9 ++++++---
+ test/certs/root-cert-rsa2.pem | 18 ++++++++++++++++++
+ test/recipes/25-test_verify.t |  4 +++-
+ 3 files changed, 27 insertions(+), 4 deletions(-)
+ create mode 100644 test/certs/root-cert-rsa2.pem
+
+diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
+index a6595aec054..75debb3e0a9 100644
+--- a/crypto/rsa/rsa_ameth.c
++++ b/crypto/rsa/rsa_ameth.c
+@@ -34,7 +34,7 @@ static int rsa_param_encode(const EVP_PKEY *pkey,
+ 
+     *pstr = NULL;
+     /* If RSA it's just NULL type */
+-    if (pkey->ameth->pkey_id == EVP_PKEY_RSA) {
++    if (pkey->ameth->pkey_id != EVP_PKEY_RSA_PSS) {
+         *pstrtype = V_ASN1_NULL;
+         return 1;
+     }
+@@ -58,7 +58,7 @@ static int rsa_param_decode(RSA *rsa, const X509_ALGOR *alg)
+     int algptype;
+ 
+     X509_ALGOR_get0(&algoid, &algptype, &algp, alg);
+-    if (OBJ_obj2nid(algoid) == EVP_PKEY_RSA)
++    if (OBJ_obj2nid(algoid) != EVP_PKEY_RSA_PSS)
+         return 1;
+     if (algptype == V_ASN1_UNDEF)
+         return 1;
+@@ -109,7 +109,10 @@ static int rsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
+         RSA_free(rsa);
+         return 0;
+     }
+-    EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa);
++    if (!EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa)) {
++        RSA_free(rsa);
++        return 0;
++    }
+     return 1;
+ }
+ 
+diff --git a/test/certs/root-cert-rsa2.pem b/test/certs/root-cert-rsa2.pem
+new file mode 100644
+index 00000000000..b817fdf3e5d
+--- /dev/null
++++ b/test/certs/root-cert-rsa2.pem
+@@ -0,0 +1,18 @@
++-----BEGIN CERTIFICATE-----
++MIIC7DCCAdSgAwIBAgIBATANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
++IENBMCAXDTE2MDExNTA4MTk0OVoYDzIxMTYwMTE2MDgxOTQ5WjASMRAwDgYDVQQD
++DAdSb290IENBMIIBHTAIBgRVCAEBBQADggEPADCCAQoCggEBAOHmAPUGvKBGOHkP
++Px5xGRNtAt8rm3Zr/KywIe3WkQhCO6VjNexSW6CiSsXWAJQDl1o9uWco0n3jIVyk
++7cY8jY6E0Z1Uwz3ZdKKWdmdx+cYaUHez/XjuW+DjjIkjwpoi7D7UN54HzcArVREX
++OjRCHGkNOhiw7RWUXsb9nofGHOeUGpLAXwXBc0PlA94JkckkztiOi34u4DFI0YYq
++alUmeugLNk6XseCkydpcaUsDgAhWg6Mfsiq4wUz+xbFN1MABqu2+ziW97mmt9gfN
++biuhiVT1aOuYCe3JYGbLM2JKA7Bo1g6rX8E1VX79Ru6669y2oqPthX9337VoIkN+
++ZiQjr8UCAwEAAaNQME4wHQYDVR0OBBYEFI71Ja8em2uEPXyAmslTnE1y96NSMB8G
++A1UdIwQYMBaAFI71Ja8em2uEPXyAmslTnE1y96NSMAwGA1UdEwQFMAMBAf8wDQYJ
++KoZIhvcNAQELBQADggEBAJ0OIdog3uQ1pmsjv1Qtf1w4If1geOn5uK0EOj2wYBHt
++NxlFn7l8d9+51QMZFO+RlQJ0s3Webyo1ReuaL2dMn2LGJhWMoSBAwrMALAENU3lv
++8jioRbfO2OamsdpJpKxQUyUJYudNe+BoKNX/ry3rxezmsFsRr9nDMiJZpmBCXiMm
++mFFJOJkG0CheexBbMkua4kyStIOwO4rb5bSHszVso/9ucdGHBSC7oRcJXoWSDjBx
++PdQPPBK5g4yqL8Lz26ehgsmhRKL9k32eVyjDKcIzgpmgcPTfTqNbd1KHQJKx4ssb
++7nEpGKHalSo5Oq5L9s9qYrUv37kwBY4OpJFtmGaodoI=
++-----END CERTIFICATE-----
+diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
+index 6c3deab7c67..b80a1cde3ed 100644
+--- a/test/recipes/25-test_verify.t
++++ b/test/recipes/25-test_verify.t
+@@ -27,7 +27,7 @@ sub verify {
+     run(app([@args]));
+ }
+ 
+-plan tests => 134;
++plan tests => 135;
+ 
+ # Canonical success
+ ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]),
+@@ -361,6 +361,8 @@ ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"]
+     "Not too many names and constraints to check (2)");
+ ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"], ),
+     "Not too many names and constraints to check (3)");
++ok(verify("root-cert-rsa2", "sslserver", ["root-cert-rsa2"], [], "-check_ss_sig"),
++    "Public Key Algorithm rsa instead of rsaEncryption");
+ 
+ SKIP: {
+     skip "Ed25519 is not supported by this OpenSSL build", 1
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch
new file mode 100644
index 000000000000..2db64d83e45c
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch
@@ -0,0 +1,420 @@
+From 0fb2815b873304d145ed00283454fc9f3bd35e6b Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 4 Dec 2018 08:37:04 +0000
+Subject: [PATCH] Fix some SSL_export_keying_material() issues
+
+Fix some issues in tls13_hkdf_expand() which impact the above function
+for TLSv1.3. In particular test that we can use the maximum label length
+in TLSv1.3.
+
+Reviewed-by: Tim Hudson <tjh@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7755)
+---
+ doc/man3/SSL_export_keying_material.pod |  3 +-
+ ssl/ssl_locl.h                          |  2 +-
+ ssl/statem/extensions.c                 |  2 +-
+ ssl/statem/statem_clnt.c                |  2 +-
+ ssl/statem/statem_srvr.c                |  2 +-
+ ssl/tls13_enc.c                         | 73 +++++++++++++++++--------
+ test/sslapitest.c                       | 48 ++++++++++++----
+ test/tls13secretstest.c                 |  2 +-
+ 8 files changed, 92 insertions(+), 42 deletions(-)
+
+diff --git a/doc/man3/SSL_export_keying_material.pod b/doc/man3/SSL_export_keying_material.pod
+index abebf911fc3..4c81a60ffbb 100644
+--- a/doc/man3/SSL_export_keying_material.pod
++++ b/doc/man3/SSL_export_keying_material.pod
+@@ -59,7 +59,8 @@ B<label> and should be B<llen> bytes long. Typically this will be a value from
+ the IANA Exporter Label Registry
+ (L<https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#exporter-labels>).
+ Alternatively labels beginning with "EXPERIMENTAL" are permitted by the standard
+-to be used without registration.
++to be used without registration. TLSv1.3 imposes a maximum label length of
++249 bytes.
+ 
+ Note that this function is only defined for TLSv1.0 and above, and DTLSv1.0 and
+ above. Attempting to use it in SSLv3 will result in an error.
+diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
+index 70e5a1740f9..307131de93a 100644
+--- a/ssl/ssl_locl.h
++++ b/ssl/ssl_locl.h
+@@ -2461,7 +2461,7 @@ __owur int tls13_hkdf_expand(SSL *s, const EVP_MD *md,
+                              const unsigned char *secret,
+                              const unsigned char *label, size_t labellen,
+                              const unsigned char *data, size_t datalen,
+-                             unsigned char *out, size_t outlen);
++                             unsigned char *out, size_t outlen, int fatal);
+ __owur int tls13_derive_key(SSL *s, const EVP_MD *md,
+                             const unsigned char *secret, unsigned char *key,
+                             size_t keylen);
+diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
+index 63e61c6184a..716d6d23e08 100644
+--- a/ssl/statem/extensions.c
++++ b/ssl/statem/extensions.c
+@@ -1506,7 +1506,7 @@ int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart,
+ 
+     /* Generate the binder key */
+     if (!tls13_hkdf_expand(s, md, early_secret, label, labelsize, hash,
+-                           hashsize, binderkey, hashsize)) {
++                           hashsize, binderkey, hashsize, 1)) {
+         /* SSLfatal() already called */
+         goto err;
+     }
+diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
+index 5a8f1163dfa..a0e495d8e83 100644
+--- a/ssl/statem/statem_clnt.c
++++ b/ssl/statem/statem_clnt.c
+@@ -2740,7 +2740,7 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL *s, PACKET *pkt)
+                                PACKET_data(&nonce),
+                                PACKET_remaining(&nonce),
+                                s->session->master_key,
+-                               hashlen)) {
++                               hashlen, 1)) {
+             /* SSLfatal() already called */
+             goto err;
+         }
+diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
+index e7c11c4bea4..a8e862ced55 100644
+--- a/ssl/statem/statem_srvr.c
++++ b/ssl/statem/statem_srvr.c
+@@ -4099,7 +4099,7 @@ int tls_construct_new_session_ticket(SSL *s, WPACKET *pkt)
+                                tick_nonce,
+                                TICKET_NONCE_SIZE,
+                                s->session->master_key,
+-                               hashlen)) {
++                               hashlen, 1)) {
+             /* SSLfatal() already called */
+             goto err;
+         }
+diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
+index f7ab0fa4704..c3021d18aa9 100644
+--- a/ssl/tls13_enc.c
++++ b/ssl/tls13_enc.c
+@@ -13,7 +13,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/kdf.h>
+ 
+-#define TLS13_MAX_LABEL_LEN     246
++#define TLS13_MAX_LABEL_LEN     249
+ 
+ /* Always filled with zeros */
+ static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
+@@ -22,30 +22,47 @@ static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
+  * Given a |secret|; a |label| of length |labellen|; and |data| of length
+  * |datalen| (e.g. typically a hash of the handshake messages), derive a new
+  * secret |outlen| bytes long and store it in the location pointed to be |out|.
+- * The |data| value may be zero length. Returns 1 on success  0 on failure.
++ * The |data| value may be zero length. Any errors will be treated as fatal if
++ * |fatal| is set. Returns 1 on success  0 on failure.
+  */
+ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
+                              const unsigned char *label, size_t labellen,
+                              const unsigned char *data, size_t datalen,
+-                             unsigned char *out, size_t outlen)
++                             unsigned char *out, size_t outlen, int fatal)
+ {
+-    const unsigned char label_prefix[] = "tls13 ";
++    static const unsigned char label_prefix[] = "tls13 ";
+     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+     int ret;
+     size_t hkdflabellen;
+     size_t hashlen;
+     /*
+-     * 2 bytes for length of whole HkdfLabel + 1 byte for length of combined
+-     * prefix and label + bytes for the label itself + bytes for the hash
++     * 2 bytes for length of derived secret + 1 byte for length of combined
++     * prefix and label + bytes for the label itself + 1 byte length of hash
++     * + bytes for the hash itself
+      */
+     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
+                             + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
+-                            + EVP_MAX_MD_SIZE];
++                            + 1 + EVP_MAX_MD_SIZE];
+     WPACKET pkt;
+ 
+     if (pctx == NULL)
+         return 0;
+ 
++    if (labellen > TLS13_MAX_LABEL_LEN) {
++        if (fatal) {
++            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
++                     ERR_R_INTERNAL_ERROR);
++        } else {
++            /*
++             * Probably we have been called from SSL_export_keying_material(),
++             * or SSL_export_keying_material_early().
++             */
++            SSLerr(SSL_F_TLS13_HKDF_EXPAND, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);
++        }
++        EVP_PKEY_CTX_free(pctx);
++        return 0;
++    }
++
+     hashlen = EVP_MD_size(md);
+ 
+     if (!WPACKET_init_static_len(&pkt, hkdflabel, sizeof(hkdflabel), 0)
+@@ -59,8 +76,11 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
+             || !WPACKET_finish(&pkt)) {
+         EVP_PKEY_CTX_free(pctx);
+         WPACKET_cleanup(&pkt);
+-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
+-                 ERR_R_INTERNAL_ERROR);
++        if (fatal)
++            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
++                     ERR_R_INTERNAL_ERROR);
++        else
++            SSLerr(SSL_F_TLS13_HKDF_EXPAND, ERR_R_INTERNAL_ERROR);
+         return 0;
+     }
+ 
+@@ -74,9 +94,13 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
+ 
+     EVP_PKEY_CTX_free(pctx);
+ 
+-    if (ret != 0)
+-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
+-                 ERR_R_INTERNAL_ERROR);
++    if (ret != 0) {
++        if (fatal)
++            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
++                     ERR_R_INTERNAL_ERROR);
++        else
++            SSLerr(SSL_F_TLS13_HKDF_EXPAND, ERR_R_INTERNAL_ERROR);
++    }
+ 
+     return ret == 0;
+ }
+@@ -91,7 +115,7 @@ int tls13_derive_key(SSL *s, const EVP_MD *md, const unsigned char *secret,
+     static const unsigned char keylabel[] = "key";
+ 
+     return tls13_hkdf_expand(s, md, secret, keylabel, sizeof(keylabel) - 1,
+-                             NULL, 0, key, keylen);
++                             NULL, 0, key, keylen, 1);
+ }
+ 
+ /*
+@@ -104,7 +128,7 @@ int tls13_derive_iv(SSL *s, const EVP_MD *md, const unsigned char *secret,
+     static const unsigned char ivlabel[] = "iv";
+ 
+     return tls13_hkdf_expand(s, md, secret, ivlabel, sizeof(ivlabel) - 1,
+-                             NULL, 0, iv, ivlen);
++                             NULL, 0, iv, ivlen, 1);
+ }
+ 
+ int tls13_derive_finishedkey(SSL *s, const EVP_MD *md,
+@@ -114,7 +138,7 @@ int tls13_derive_finishedkey(SSL *s, const EVP_MD *md,
+     static const unsigned char finishedlabel[] = "finished";
+ 
+     return tls13_hkdf_expand(s, md, secret, finishedlabel,
+-                             sizeof(finishedlabel) - 1, NULL, 0, fin, finlen);
++                             sizeof(finishedlabel) - 1, NULL, 0, fin, finlen, 1);
+ }
+ 
+ /*
+@@ -177,7 +201,7 @@ int tls13_generate_secret(SSL *s, const EVP_MD *md,
+         if (!tls13_hkdf_expand(s, md, prevsecret,
+                                (unsigned char *)derived_secret_label,
+                                sizeof(derived_secret_label) - 1, hash, mdlen,
+-                               preextractsec, mdlen)) {
++                               preextractsec, mdlen, 1)) {
+             /* SSLfatal() already called */
+             EVP_PKEY_CTX_free(pctx);
+             return 0;
+@@ -337,7 +361,7 @@ static int derive_secret_key_and_iv(SSL *s, int sending, const EVP_MD *md,
+     hashlen = (size_t)hashleni;
+ 
+     if (!tls13_hkdf_expand(s, md, insecret, label, labellen, hash, hashlen,
+-                           secret, hashlen)) {
++                           secret, hashlen, 1)) {
+         /* SSLfatal() already called */
+         goto err;
+     }
+@@ -517,7 +541,8 @@ int tls13_change_cipher_state(SSL *s, int which)
+                                    early_exporter_master_secret,
+                                    sizeof(early_exporter_master_secret) - 1,
+                                    hashval, hashlen,
+-                                   s->early_exporter_master_secret, hashlen)) {
++                                   s->early_exporter_master_secret, hashlen,
++                                   1)) {
+                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
+                          SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
+                 goto err;
+@@ -604,7 +629,7 @@ int tls13_change_cipher_state(SSL *s, int which)
+                                resumption_master_secret,
+                                sizeof(resumption_master_secret) - 1,
+                                hashval, hashlen, s->resumption_master_secret,
+-                               hashlen)) {
++                               hashlen, 1)) {
+             /* SSLfatal() already called */
+             goto err;
+         }
+@@ -624,7 +649,7 @@ int tls13_change_cipher_state(SSL *s, int which)
+                                exporter_master_secret,
+                                sizeof(exporter_master_secret) - 1,
+                                hash, hashlen, s->exporter_master_secret,
+-                               hashlen)) {
++                               hashlen, 1)) {
+             /* SSLfatal() already called */
+             goto err;
+         }
+@@ -738,10 +763,10 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+             || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
+             || !tls13_hkdf_expand(s, md, s->exporter_master_secret,
+                                   (const unsigned char *)label, llen,
+-                                  data, datalen, exportsecret, hashsize)
++                                  data, datalen, exportsecret, hashsize, 0)
+             || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
+                                   sizeof(exporterlabel) - 1, hash, hashsize,
+-                                  out, olen))
++                                  out, olen, 0))
+         goto err;
+ 
+     ret = 1;
+@@ -797,10 +822,10 @@ int tls13_export_keying_material_early(SSL *s, unsigned char *out, size_t olen,
+             || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
+             || !tls13_hkdf_expand(s, md, s->early_exporter_master_secret,
+                                   (const unsigned char *)label, llen,
+-                                  data, datalen, exportsecret, hashsize)
++                                  data, datalen, exportsecret, hashsize, 0)
+             || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
+                                   sizeof(exporterlabel) - 1, hash, hashsize,
+-                                  out, olen))
++                                  out, olen, 0))
+         goto err;
+ 
+     ret = 1;
+diff --git a/test/sslapitest.c b/test/sslapitest.c
+index 108d57e4781..a4bbb4fead4 100644
+--- a/test/sslapitest.c
++++ b/test/sslapitest.c
+@@ -4028,20 +4028,25 @@ static int test_serverinfo(int tst)
+  * no test vectors so all we do is test that both sides of the communication
+  * produce the same results for different protocol versions.
+  */
++#define SMALL_LABEL_LEN 10
++#define LONG_LABEL_LEN  249
+ static int test_export_key_mat(int tst)
+ {
+     int testresult = 0;
+     SSL_CTX *cctx = NULL, *sctx = NULL, *sctx2 = NULL;
+     SSL *clientssl = NULL, *serverssl = NULL;
+-    const char label[] = "test label";
++    const char label[LONG_LABEL_LEN + 1] = "test label";
+     const unsigned char context[] = "context";
+     const unsigned char *emptycontext = NULL;
+     unsigned char ckeymat1[80], ckeymat2[80], ckeymat3[80];
+     unsigned char skeymat1[80], skeymat2[80], skeymat3[80];
++    size_t labellen;
+     const int protocols[] = {
+         TLS1_VERSION,
+         TLS1_1_VERSION,
+         TLS1_2_VERSION,
++        TLS1_3_VERSION,
++        TLS1_3_VERSION,
+         TLS1_3_VERSION
+     };
+ 
+@@ -4058,7 +4063,7 @@ static int test_export_key_mat(int tst)
+         return 1;
+ #endif
+ #ifdef OPENSSL_NO_TLS1_3
+-    if (tst == 3)
++    if (tst >= 3)
+         return 1;
+ #endif
+     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),
+@@ -4076,33 +4081,52 @@ static int test_export_key_mat(int tst)
+                                                 SSL_ERROR_NONE)))
+         goto end;
+ 
++    if (tst == 5) {
++        /*
++         * TLSv1.3 imposes a maximum label len of 249 bytes. Check we fail if we
++         * go over that.
++         */
++        if (!TEST_int_le(SSL_export_keying_material(clientssl, ckeymat1,
++                                                    sizeof(ckeymat1), label,
++                                                    LONG_LABEL_LEN + 1, context,
++                                                    sizeof(context) - 1, 1), 0))
++            goto end;
++
++        testresult = 1;
++        goto end;
++    } else if (tst == 4) {
++        labellen = LONG_LABEL_LEN;
++    } else {
++        labellen = SMALL_LABEL_LEN;
++    }
++
+     if (!TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat1,
+                                                 sizeof(ckeymat1), label,
+-                                                sizeof(label) - 1, context,
++                                                labellen, context,
+                                                 sizeof(context) - 1, 1), 1)
+             || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat2,
+                                                        sizeof(ckeymat2), label,
+-                                                       sizeof(label) - 1,
++                                                       labellen,
+                                                        emptycontext,
+                                                        0, 1), 1)
+             || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat3,
+                                                        sizeof(ckeymat3), label,
+-                                                       sizeof(label) - 1,
++                                                       labellen,
+                                                        NULL, 0, 0), 1)
+             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat1,
+                                                        sizeof(skeymat1), label,
+-                                                       sizeof(label) - 1,
++                                                       labellen,
+                                                        context,
+                                                        sizeof(context) -1, 1),
+                             1)
+             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat2,
+                                                        sizeof(skeymat2), label,
+-                                                       sizeof(label) - 1,
++                                                       labellen,
+                                                        emptycontext,
+                                                        0, 1), 1)
+             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat3,
+                                                        sizeof(skeymat3), label,
+-                                                       sizeof(label) - 1,
++                                                       labellen,
+                                                        NULL, 0, 0), 1)
+                /*
+                 * Check that both sides created the same key material with the
+@@ -4131,10 +4155,10 @@ static int test_export_key_mat(int tst)
+      * Check that an empty context and no context produce different results in
+      * protocols less than TLSv1.3. In TLSv1.3 they should be the same.
+      */
+-    if ((tst != 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3,
++    if ((tst < 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3,
+                                   sizeof(ckeymat3)))
+-            || (tst ==3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3,
+-                                        sizeof(ckeymat3))))
++            || (tst >= 3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3,
++                                         sizeof(ckeymat3))))
+         goto end;
+ 
+     testresult = 1;
+@@ -5909,7 +5933,7 @@ int setup_tests(void)
+     ADD_ALL_TESTS(test_custom_exts, 3);
+ #endif
+     ADD_ALL_TESTS(test_serverinfo, 8);
+-    ADD_ALL_TESTS(test_export_key_mat, 4);
++    ADD_ALL_TESTS(test_export_key_mat, 6);
+ #ifndef OPENSSL_NO_TLS1_3
+     ADD_ALL_TESTS(test_export_key_mat_early, 3);
+ #endif
+diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
+index 319df17bab0..de318df02b4 100644
+--- a/test/tls13secretstest.c
++++ b/test/tls13secretstest.c
+@@ -226,7 +226,7 @@ static int test_secret(SSL *s, unsigned char *prk,
+     }
+ 
+     if (!tls13_hkdf_expand(s, md, prk, label, labellen, hash, hashsize,
+-                           gensecret, hashsize)) {
++                           gensecret, hashsize, 1)) {
+         TEST_error("Secret generation failed");
+         return 0;
+     }
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
new file mode 100644
index 000000000000..c2f8bb638b3a
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
@@ -0,0 +1,26 @@
+From 3ccccb91ae1c07a4310778b3d7ba74ff4ff787f0 Mon Sep 17 00:00:00 2001
+From: Paul Yang <yang.yang@baishancloud.com>
+Date: Wed, 21 Nov 2018 13:16:27 +0800
+Subject: [PATCH] Fix wrong return value in ssl3_ctx_ctrl
+
+This fixes issue #7677
+
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7678)
+---
+ ssl/s3_lib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
+index 866ca4dfa9b..99ae48199c2 100644
+--- a/ssl/s3_lib.c
++++ b/ssl/s3_lib.c
+@@ -3781,7 +3781,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
+                                   EVP_PKEY_security_bits(pkdh), 0, pkdh)) {
+                 SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_DH_KEY_TOO_SMALL);
+                 EVP_PKEY_free(pkdh);
+-                return 1;
++                return 0;
+             }
+             EVP_PKEY_free(ctx->cert->dh_tmp);
+             ctx->cert->dh_tmp = pkdh;
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch b/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch
new file mode 100644
index 000000000000..cfa84c73a5bf
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch
@@ -0,0 +1,68 @@
+From 99992ad22019e752c7b103a45f860a48b6bc0972 Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Wed, 21 Nov 2018 11:44:42 +0000
+Subject: [PATCH] Make sure build_SYS_str_reasons() preserves errno
+
+This function can end up being called during ERR_get_error() if we are
+initialising. ERR_get_error() must preserve errno since it gets called via
+SSL_get_error(). If that function returns SSL_ERROR_SYSCALL then you are
+supposed to inspect errno.
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7680)
+
+(cherry picked from commit 71b1ceffc4c795f5db21861dd1016fbe23a53a53)
+---
+
+diff --git a/crypto/err/err.c b/crypto/err/err.c
+index 03cbd73..2eeeab2 100644
+--- a/crypto/err/err.c
++++ b/crypto/err/err.c
+@@ -19,6 +19,7 @@
+ #include <openssl/bio.h>
+ #include <openssl/opensslconf.h>
+ #include "internal/thread_once.h"
++#include "e_os.h"
+ 
+ static int err_load_strings(const ERR_STRING_DATA *str);
+ 
+@@ -201,6 +202,7 @@ static void build_SYS_str_reasons(void)
+     static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
+     static int init = 1;
+     int i;
++    int saveerrno = get_last_sys_error();
+ 
+     CRYPTO_THREAD_write_lock(err_string_lock);
+     if (!init) {
+@@ -229,6 +231,8 @@ static void build_SYS_str_reasons(void)
+     init = 0;
+ 
+     CRYPTO_THREAD_unlock(err_string_lock);
++    /* openssl_strerror_r could change errno, but we want to preserve it */
++    set_sys_error(saveerrno);
+     err_load_strings(SYS_str_reasons);
+ }
+ #endif
+diff --git a/e_os.h b/e_os.h
+index 5340593..8e6efa9 100644
+--- a/e_os.h
++++ b/e_os.h
+@@ -49,6 +49,7 @@
+ 
+ # define get_last_sys_error()    errno
+ # define clear_sys_error()       errno=0
++# define set_sys_error(e)        errno=(e)
+ 
+ /********************************************************************
+  The Microsoft section
+@@ -66,8 +67,10 @@
+ # ifdef WIN32
+ #  undef get_last_sys_error
+ #  undef clear_sys_error
++#  undef set_sys_error
+ #  define get_last_sys_error()    GetLastError()
+ #  define clear_sys_error()       SetLastError(0)
++#  define set_sys_error(e)        SetLastError(e)
+ #  if !defined(WINNT)
+ #   define WIN_CONSOLE_BUG
+ #  endif
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch b/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch
new file mode 100644
index 000000000000..ed8f2dd96be0
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch
@@ -0,0 +1,51 @@
+From ef97becf522fc4e2e9d98e6ae7bcb26651883d9a Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Wed, 21 Nov 2018 11:57:04 +0000
+Subject: [PATCH] Preserve errno on dlopen
+
+For the same reasons as in the previous commit we must preserve errno
+across dlopen calls. Some implementations (e.g. solaris) do not preserve
+errno even on a successful dlopen call.
+
+Fixes #6953
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7680)
+
+(cherry picked from commit 3cb4e7dc1cf92022f62b9bbdd59695885a1265ff)
+---
+ crypto/dso/dso_dlfcn.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
+index ad8899c289a..4240f5f5e30 100644
+--- a/crypto/dso/dso_dlfcn.c
++++ b/crypto/dso/dso_dlfcn.c
+@@ -17,6 +17,7 @@
+ #endif
+ 
+ #include "dso_locl.h"
++#include "e_os.h"
+ 
+ #ifdef DSO_DLFCN
+ 
+@@ -99,6 +100,7 @@ static int dlfcn_load(DSO *dso)
+     /* See applicable comments in dso_dl.c */
+     char *filename = DSO_convert_filename(dso, NULL);
+     int flags = DLOPEN_FLAG;
++    int saveerrno = get_last_sys_error();
+ 
+     if (filename == NULL) {
+         DSOerr(DSO_F_DLFCN_LOAD, DSO_R_NO_FILENAME);
+@@ -118,6 +120,11 @@ static int dlfcn_load(DSO *dso)
+         ERR_add_error_data(4, "filename(", filename, "): ", dlerror());
+         goto err;
+     }
++    /*
++     * Some dlopen() implementations (e.g. solaris) do no preserve errno, even
++     * on a successful call.
++     */
++    set_sys_error(saveerrno);
+     if (!sk_void_push(dso->meth_data, (char *)ptr)) {
+         DSOerr(DSO_F_DLFCN_LOAD, DSO_R_STACK_ERROR);
+         goto err;
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch b/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch
new file mode 100644
index 000000000000..84c43a3c3e04
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch
@@ -0,0 +1,57 @@
+From 145419423e1a74ae54cdbd3aed8bb15cbd53c7cc Mon Sep 17 00:00:00 2001
+From: Richard Levitte <levitte@openssl.org>
+Date: Fri, 14 Dec 2018 19:33:55 +0100
+Subject: [PATCH] ERR: preserve system error number in a few more places
+
+It turns out that intialization may change the error number, so we
+need to preserve the system error number in functions where
+initialization is called for.
+These are ERR_get_state() and err_shelve_state()
+
+Fixes #7897
+
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7902)
+
+(cherry picked from commit 91c5473035aaf2c0d86e4039c2a29a5b70541905)
+---
+ crypto/err/err.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/crypto/err/err.c b/crypto/err/err.c
+index 5cfb02d821b..aef2543d60b 100644
+--- a/crypto/err/err.c
++++ b/crypto/err/err.c
+@@ -697,6 +697,7 @@ DEFINE_RUN_ONCE_STATIC(err_do_init)
+ ERR_STATE *ERR_get_state(void)
+ {
+     ERR_STATE *state;
++    int saveerrno = get_last_sys_error();
+ 
+     if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL))
+         return NULL;
+@@ -728,6 +729,7 @@ ERR_STATE *ERR_get_state(void)
+         OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+     }
+ 
++    set_sys_error(saveerrno);
+     return state;
+ }
+ 
+@@ -737,6 +739,8 @@ ERR_STATE *ERR_get_state(void)
+  */
+ int err_shelve_state(void **state)
+ {
++    int saveerrno = get_last_sys_error();
++
+     if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL))
+         return 0;
+ 
+@@ -747,6 +751,7 @@ int err_shelve_state(void **state)
+     if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
+         return 0;
+ 
++    set_sys_error(saveerrno);
+     return 1;
+ }
+ 
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch b/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
new file mode 100644
index 000000000000..5ea4fb97bfce
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
@@ -0,0 +1,56 @@
+From ed371b8cbac0d0349667558c061c1ae380cf75eb Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Mon, 3 Dec 2018 18:14:57 +0000
+Subject: [PATCH] Revert "Reduce stack usage in tls13_hkdf_expand"
+
+This reverts commit ec0c5f5693e39c5a013f81e6dd9dfd09ec65162d.
+
+SSL_export_keying_material() may use longer label lengths.
+
+Fixes #7712
+
+Reviewed-by: Tim Hudson <tjh@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/7755)
+---
+ ssl/tls13_enc.c | 16 ++++------------
+ 1 file changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
+index b6825d20c2d..f7ab0fa4704 100644
+--- a/ssl/tls13_enc.c
++++ b/ssl/tls13_enc.c
+@@ -13,14 +13,7 @@
+ #include <openssl/evp.h>
+ #include <openssl/kdf.h>
+ 
+-/*
+- * RFC 8446, 7.1 Key Schedule, says:
+- * Note: With common hash functions, any label longer than 12 characters
+- * requires an additional iteration of the hash function to compute.
+- * The labels in this specification have all been chosen to fit within
+- * this limit.
+- */
+-#define TLS13_MAX_LABEL_LEN     12
++#define TLS13_MAX_LABEL_LEN     246
+ 
+ /* Always filled with zeros */
+ static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
+@@ -36,15 +29,14 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
+                              const unsigned char *data, size_t datalen,
+                              unsigned char *out, size_t outlen)
+ {
+-    static const unsigned char label_prefix[] = "tls13 ";
++    const unsigned char label_prefix[] = "tls13 ";
+     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
+     int ret;
+     size_t hkdflabellen;
+     size_t hashlen;
+     /*
+-     * 2 bytes for length of derived secret + 1 byte for length of combined
+-     * prefix and label + bytes for the label itself + 1 byte length of hash
+-     * + bytes for the hash itself
++     * 2 bytes for length of whole HkdfLabel + 1 byte for length of combined
++     * prefix and label + bytes for the label itself + bytes for the hash
+      */
+     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
+                             + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
diff --git a/dev-libs/openssl/openssl-1.0.2p-r1.ebuild b/dev-libs/openssl/openssl-1.0.2p-r1.ebuild
deleted file mode 100644
index d691659c26a2..000000000000
--- a/dev-libs/openssl/openssl-1.0.2p-r1.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-PATCH_SET="openssl-1.0.2-patches-1.6"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# 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 "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED%/}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED%/}"/usr || die
-	fi
-
-	emake INSTALL_PREFIX="${D%/}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2q-r200.ebuild b/dev-libs/openssl/openssl-1.0.2q-r200.ebuild
new file mode 100644
index 000000000000..44b9547d141e
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2q-r200.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f25'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# 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 "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/openssl-1.0.2q.ebuild b/dev-libs/openssl/openssl-1.0.2q.ebuild
index ce0ecdd0d5b9..9b19234d960d 100644
--- a/dev-libs/openssl/openssl-1.0.2q.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2q.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -22,7 +22,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1a-r1.ebuild b/dev-libs/openssl/openssl-1.1.1a-r1.ebuild
new file mode 100644
index 000000000000..0ad3e058c0c9
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1a-r1.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-sure-build_SYS_str_reasons_preserves_errno.patch
+	"${FILESDIR}"/${P}-preserve-errno-on-dlopen.patch
+	"${FILESDIR}"/${P}-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
+	"${FILESDIR}"/${P}-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
+	"${FILESDIR}"/${P}-fix-some-SSL_export_keying_material-issues.patch
+	"${FILESDIR}"/${P}-preserve-system-error-number-in-a-few-more-places.patch
+	"${FILESDIR}"/${P}-fix-a-minor-nit-in-hkdflabel-size.patch
+	"${FILESDIR}"/${P}-fix-cert-with-rsa-instead-of-rsaEncryption.patch
+)
+
+# This does not copy the entire Fedora patchset, but JUST the parts that
+# are needed to make it safe to use EC with RESTRICT=bindist.
+# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
+SOURCE1=hobble-openssl
+SOURCE12=ec_curve.c
+SOURCE13=ectest.c
+PATCH37=openssl-1.1.1-ec-curves.patch
+FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
+FEDORA_GIT_BRANCH='f29'
+FEDORA_SRC_URI=()
+FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
+FEDORA_PATCH=( ${PATCH37} )
+for i in "${FEDORA_SOURCE[@]}" ; do
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
+done
+for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
+	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
+done
+SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		# This just removes the prefix, and puts it into WORKDIR like the RPM.
+		for i in "${FEDORA_SOURCE[@]}" ; do
+			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
+		done
+		# .spec %prep
+		bash "${WORKDIR}"/"${SOURCE1}" || die
+		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
+		for i in "${FEDORA_PATCH[@]}" ; do
+			eapply "${DISTDIR}"/"${i}"
+		done
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX%/}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# 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 "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	# Fix quoting for sed
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+		-e 's:\\:\\\\:g' \
+	)
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED%/}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED%/}"/usr || die
+	fi
+
+	emake DESTDIR="${D%/}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED%/}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED%/}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 359524cb4225..25d024b77588 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.25.1.ebuild 1068 BLAKE2B a7bd914904169256a29cf51ba84d20101907c0c53868704534f9b6f6efa0b82397feb2279cff114637562894760d68f99f0784be10e5c935345520f7f2b0b8dc SHA512 d13e90eceb030d46fd1a5535622a1692e7c1680d0bc3949f73bc00864608651265a20d4196ba48f6ba6cca7e9c4eedebef3381d59563c899f29e5f5760979b54
+EBUILD pkcs11-helper-1.25.1.ebuild 1066 BLAKE2B a7d4606c1d48a2b9fca76f84140afafbfa6f5d9af37020b32a70054752547e81357642f3005d7e7912342d76e58e6648ef27d335c83825d81ab460a36d1ec910 SHA512 599384f0573a01bcdb6b600c2606bffae9d10d9f0a9557b29a9e8c3be74b7307d48896f2afbca5e9a2960c94ac6d15957533d64c814497adee4fa1c11865b599
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index 0be43f28eb84..3776a870c787 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~spa
 IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.7:=[bindist=] )
+	!libressl? ( >=dev-libs/openssl-0.9.7:0=[bindist=] )
 	libressl? ( dev-libs/libressl )
 	gnutls? ( >=net-libs/gnutls-1.4.4 )
 	nss? ( dev-libs/nss )"
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index ab7219de4988..f59be82b70e5 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -5,8 +5,8 @@ DIST poco-1.4.6-all-doc.zip 2072762 BLAKE2B 51b8426d050e7ae373fbb0f3959657e37f1c
 DIST poco-1.4.6p4-all.tar.bz2 3158594 BLAKE2B 76accf617ddd087131a5960c131680451959704fee4b17b65bf85367a172d2fe023c9c7efde59fe5bd4142c7ca153734fb4ccbbf06bd5d0365a59d6e75a328a5 SHA512 ae4e1190a0ba719f807d0abaf1c47ff445a8f5867157f209260672546f3755ff021c7073bc8d5e656be383d5667dc15ad7eae8208728053fb61439c4c80a7fca
 DIST poco-1.7.6.tar.gz 8044937 BLAKE2B ad9bf61eb00ce4e1ef5079e07be04ceff79bf823cba49ffb0e144a1e579d9de4f6f8d3df6b629c522de5c2b7b4c7df0933777686b72190d717e407bc28ae2a49 SHA512 a02b7ff66acf080942517b3b8644d6e5c7136c5edc6e58fd13083a74b97b5619253fc9db7863284a565226f95410ad4da1fa9738d14885f560aeb03c1f7c18aa
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.4.6_p4-r1.ebuild 3450 BLAKE2B bf27e0ab8a20a5fa04add798f24e6c2199bb0688266a963a020e858d7f77b0e709da65c5d3e0527880d57803341fa6b0dd95b5f1aa13977a364b310a17a14dde SHA512 3d69fe0e340a9406e26902577004c8314192a1794942c70a7f56342f9644fee87909a11ec3172b6d2f7b4c0f3687157f79130e88b60115442e74daafe6cfeb42
-EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B a14df4b50fac726746d4692ac651e25ecfbfc487a7322d307d145b6e41de501c727e3d5729c6183275809cd8be3817e3f9ca256069abea147b01366c15375466 SHA512 dd0a231de34a03305f756d676ba6bd7e71bb919fac8752028610a4cbdd89807e058b74b1eba0a50b30878190dd42f2ca20cb84ea0cccbcd8cac8659ea9436a41
-EBUILD poco-1.7.6.ebuild 3302 BLAKE2B f1a53d2e9aefc01c2ea7c34d742e0bb974f2961613a887fc6e5a6a182600e9e9387e5581216d2a5529ca7aa65dba3ba2470dd2aa31bae86f2f4e867373ecc1eb SHA512 fc9587211f348abb68a5d94e76d926ae9e74ae840551d2ca493b0cd680d5be1b1193161ee69aa647f63c7a429465cf2dcfd5a0bbd6494e67156d46c796faf07e
-EBUILD poco-1.9.0.ebuild 3302 BLAKE2B f1a53d2e9aefc01c2ea7c34d742e0bb974f2961613a887fc6e5a6a182600e9e9387e5581216d2a5529ca7aa65dba3ba2470dd2aa31bae86f2f4e867373ecc1eb SHA512 fc9587211f348abb68a5d94e76d926ae9e74ae840551d2ca493b0cd680d5be1b1193161ee69aa647f63c7a429465cf2dcfd5a0bbd6494e67156d46c796faf07e
+EBUILD poco-1.4.6_p4-r1.ebuild 3448 BLAKE2B 8f15cfcb7f3ab49d75bf3dab8990dd48766391f0c20819efed6ec965b463a594ca0b2ec60030d224436deb9b1a1cb03298ad33c72f6e8b94fed28321a634140a SHA512 b3ef11fedf1a849d83f87b90fcf3be6d9a5d85b2981ceedda5eb699657bdaf150bc45e1451563e76f26f2b7a3e7fe82d9fe5d8790607fa9ef38dc70ce78e0815
+EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B 82795ed8256b63859142d760d1c4999ab504be036d00bd2338058318bb7e864372c333822c3b3ede153aa4f4608a22e62d2c797269a10846ee120304fba1a9a2 SHA512 9365431a50298aadfa1d91d3d859dbddd8b3a028aacb4eeb4d01564d063a91d198da08bdb6e8f886b7dbe1ab4f9285fe5e5a334a471bb136b908cf89c4e3bc64
+EBUILD poco-1.7.6.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
+EBUILD poco-1.9.0.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
 MISC metadata.xml 2399 BLAKE2B 51e232e6cc89bc70510d74db1c6bee49039aab297db20572b1fe408cf8148ba43ad17768745283da06d178e46a3b811a9ba600206514fb9ac20d3a35d01de090 SHA512 fc80467849b42aa6ce51582512fc5f6f75b7e6502a90c96b5e6fba1115e347c46d173c77a6054d45c7fb75ec4f40e3e9d89c4c68f806fc8f7be52f9cb9aab66e
diff --git a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
index 24c307774d53..c148f9b0f5e9 100644
--- a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
+++ b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,7 +24,7 @@ DEPEND=">=dev-libs/libpcre-8.13
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl )
 	)
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/dev-libs/poco/poco-1.4.6_p4.ebuild b/dev-libs/poco/poco-1.4.6_p4.ebuild
index 1a4742f5ae5d..93c4559ec12a 100644
--- a/dev-libs/poco/poco-1.4.6_p4.ebuild
+++ b/dev-libs/poco/poco-1.4.6_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -23,7 +23,7 @@ DEPEND=">=dev-libs/libpcre-8.13
 	mysql? ( virtual/mysql )
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	sqlite? ( dev-db/sqlite:3 )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/poco/poco-1.7.6.ebuild b/dev-libs/poco/poco-1.7.6.ebuild
index 127c9d0ac2c1..e4cc18980d1b 100644
--- a/dev-libs/poco/poco-1.7.6.ebuild
+++ b/dev-libs/poco/poco-1.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/libpcre-8.13
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
 	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0 )
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl )
 	)
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/dev-libs/poco/poco-1.9.0.ebuild b/dev-libs/poco/poco-1.9.0.ebuild
index 127c9d0ac2c1..e4cc18980d1b 100644
--- a/dev-libs/poco/poco-1.9.0.ebuild
+++ b/dev-libs/poco/poco-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/libpcre-8.13
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
 	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0 )
+		!libressl? ( <dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl )
 	)
 	sqlite? ( dev-db/sqlite:3 )
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index f0b3aa285885..c4248ed1d46b 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -2,5 +2,7 @@ AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc9
 AUX protobuf-c-1.3.0-protobuf-3.6.patch 7730 BLAKE2B e1647b88490f55aae206218ef5f6b7f466162a27bcbb9b6ad752e8819bc8c99e56849931b2899d807ed0da31efdf66b2f24a5a1f810b3ddc365ddc4fcc507760 SHA512 f7b0d5b3d2ca52b38c2283eb27cafb6030bce8d86c3b4d61ef07763cfc9df87f58b5f308bbf481e3fc03ad5e5528d96f542e9d689706d0bac111e7573d6d5170
 AUX protobuf-c-1.3.0-restore-protobuf-2-compatibility.patch 1182 BLAKE2B b05104b82aed8dbe5620cea73d366788355dd7041489ef3994dcdcb9fdc8b1d1265f6a8f8a10b310675fece850f11570210d63b6ce047acbd6968f5a68b6a247 SHA512 82761f41d60ad7ab69f3ca9479593bd25d4d2225b9e6f8b2b4d9f577f0ca36572432b0dc6f94ba8729da87d4b5474b977037fbf5b4dd27c3fda186e7307d8eba
 DIST protobuf-c-1.3.0.tar.gz 488443 BLAKE2B 8eca559ad06aaa5cb09984b3d2e7c5767cd341c2e439b94c2d219226c612992808da091d01f5e0ad5f14e47292d4a621037953b58a5bea827e7c22837234ffe6 SHA512 ba49bf45a9ae93d41f200f4f18c4f9469c63fcc2a2392b3b45f083c378a6876891890448ceba216083ad351aa35f4669cd920973f53e5780de9ec4c8f61279bb
+DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 EBUILD protobuf-c-1.3.0-r1.ebuild 1012 BLAKE2B 77fb5f79db19f8d814ae0a309e5c0725e4ab25fce3d7ef1ba5db5feed093d0261adb84b3095f563e2e55bf5c07fae08ebae67c1eddf6be52b74a11299fe460ac SHA512 c3d469dd035e0760cb1902bd37ca61de23dcf76fe2107d000755cd52ae8b0576cf7d6d6fc736a128340dcd977267cc3771226eb6c54d1997cb8199d5c874ecb8
+EBUILD protobuf-c-1.3.1.ebuild 948 BLAKE2B 733a6a4b8fb3ef072224a521c47847b1cda3805b6ea28fee4a646239b5746070f4418347361c903c90f21fc4ff14165745e91dfc278adfee4ec9c0ced99de817 SHA512 7f6da8206476a490d59c02a1c7cc541fd32cce18be0032c01247a939e722371945642ab60c05b018365fe0a5f20d18a61249aa7a9c2b788110a45bd3acdef112
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
new file mode 100644
index 000000000000..bc235c7da92d
--- /dev/null
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Protocol Buffers implementation in C"
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+# Subslot == SONAME version
+SLOT="0/1.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if ! use test; then
+		eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 52a4771f14cf..faf9a09795af 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,3 +1,8 @@
+AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e4404a29ea2706961d8611399f07082b605c8b7d1849df854240f4ce87c73d30df0c69aeaedca2b4e5a2ff2fc340998af51c04a410b151e377b701a86f3458 SHA512 90c3c8b2a9d1d205829f58bcdce567d849b4099366bbcdc3eba11b4c3bf04151f66ebd3b7bb983ddfd2dfeb937164fba6d4046bfab3dbc5554b508477f2d5798
+AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
+AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
+EBUILD pugixml-1.9-r1.ebuild 894 BLAKE2B 00ce29f0fead8e018b103411a3f15dc0b54d806bd1e648c3250b6b6995003db35aaeac9bf4f751bd104cfa5ace392612c70ddf183dfa20359e9890bc23ff6a23 SHA512 66fb1f82736c84ff63b2f5d7359120806f2a540a1c5f54606bd286cea88377af13d3913e556f6fa032057ab8ec5737edb18a13354753797948ca8be7c53e11db
 EBUILD pugixml-1.9.ebuild 595 BLAKE2B fdcea3a006480c5ddf8c60ad27d01be9c75b6791409809a39bb1985b881e62269cf3b387ece63ff1b0bd123cf85df06713f78ee636bf768e0f3d6e01414eafbe SHA512 e0f17a0ee26983ddc62cd9b751868e0abe1e8272957a981df199b324e93653f2a4275fd45d8736bc2c02331a672794178d3f11d4823cc0b28de2106e62de2935
+EBUILD pugixml-9999.ebuild 682 BLAKE2B 43d98ba135daff2413a0505a8ea22efe483bbdba1e2b8cdc7bb96f70dd0605e516aa13c9e42a74008d0dcdfc0b0a5ad01d9e1bf71bb4dede49a6026493f9423e SHA512 02030b482bf1c8a62b16300139a84d9419a5d303802222703efce893c4a51532a12ab8bad5c8ee75d6a47b58d184851b19cea24af6e37605160bb23d23114234
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch b/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
new file mode 100644
index 000000000000..18928e39cd6f
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
@@ -0,0 +1,39 @@
+From c12889f7ccee3a91754f12a4f5b2bf5eb87acabd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
+Date: Wed, 27 Jun 2018 00:53:42 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for pugixml.pc (#215)
+
+- Up to now, the libdir was hardcoded to "lib" inside pugixml.pc and
+  the install directory of pugixml.pc was "lib/pkgconfig"
+- Adds support for lib and lib64 by using CMAKE_INSTALL_LIBDIR variable
+---
+ CMakeLists.txt        | 2 +-
+ scripts/pugixml.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 148f7b0d..d322a631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+ 
+ configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ if(BUILD_TESTS)
+ 	file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index 04b4d3b0..fbb7f8b8 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include@INSTALL_SUFFIX@
+-libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
+ 
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch b/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
new file mode 100644
index 000000000000..4551280b3728
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
@@ -0,0 +1,71 @@
+From daeb8013b20f9c47e85730faaa4131064a1f9c2e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 9 Apr 2018 13:48:53 -0400
+Subject: [PATCH] cmake: always install the pkg-config file (#193)
+
+There's really never a reason to *not* want this installed. If an option
+is needed to specify installing in a versioned subdirectory, this option
+should be explicitly described rather than hidden in something else.
+
+As an added bonus, this makes the CMake install code slightly *less*
+complicated.
+---
+ CMakeLists.txt        | 10 ++++------
+ scripts/pugixml.pc.in |  6 +++---
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90fa6793..d7bc1b20 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(pugixml)
+ 
+ option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
+ option(BUILD_TESTS "Build tests" OFF)
+-option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
++option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF)
+ 
+ set(BUILD_DEFINES "" CACHE STRING "Build defines")
+ 
+@@ -55,7 +55,7 @@ endif()
+ set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
+ get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
+ 
+-if(BUILD_PKGCONFIG)
++if(USE_VERSIONED_LIBDIR)
+ 	# Install library into its own directory under LIBDIR
+ 	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
+ endif()
+@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config
+ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+ 
+-if(BUILD_PKGCONFIG)
+-	configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+-	install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+-endif()
++configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+ 
+ if(BUILD_TESTS)
+ 	file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index 3c97c28d..804c4d38 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,11 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@
+-libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@
++includedir=${prefix}/include@INSTALL_SUFFIX@
++libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
+ 
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
+ URL: http://pugixml.org/
+ Version: @PUGIXML_VERSION_STRING@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lpugixml
+\ No newline at end of file
++Libs: -L${libdir} -lpugixml
diff --git a/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch b/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
new file mode 100644
index 000000000000..7a9b0c139cd2
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
@@ -0,0 +1,39 @@
+From b3db08ffccb78d680d8f7665ad9ed4cff6f92fcf Mon Sep 17 00:00:00 2001
+From: Millian Poquet <millian.poquet@inria.fr>
+Date: Mon, 10 Dec 2018 18:54:40 +0100
+Subject: [PATCH] pkg-config: Use CMake GnuInstallDirs FULL vars
+
+Fixes an installation problem in Nix packages, as non-FULL variables are
+already absolute paths in this case.
+---
+ CMakeLists.txt        | 2 +-
+ scripts/pugixml.pc.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddc5a5ad..e8c4f592 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+ 
+ configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+ 
+ if(BUILD_TESTS)
+ 	file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index a1678272..f9c3fd45 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include@INSTALL_SUFFIX@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@@INSTALL_SUFFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@@INSTALL_SUFFIX@
+ 
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
new file mode 100644
index 000000000000..93ca3d730441
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-always-install-the-pkg-config-file.patch"
+	"${FILESDIR}/${P}-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch"
+	"${FILESDIR}/${P}-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
new file mode 100644
index 000000000000..3cc627c8675a
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index d5ffb021a420..226fc66b9657 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -8,5 +8,5 @@ EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c538
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
-EBUILD re2-0.2018.10.01.ebuild 1328 BLAKE2B 3058341c1d4fcce3a610d54aaa5c8b1bc8487c8f971054af6fcde11d89c8e13c15e5bec983e656d03679c38ffe1a46499c29c6094d48a839c0eb20ea7b49ae31 SHA512 92b91e0e68a0642deb9990639afcd00cb21356cd3485eccbbb3b154ef5cf0d270920c1d409813550aa024b88722c1d53a134c304a7b0978f4717bbd688642821
+EBUILD re2-0.2018.10.01.ebuild 1341 BLAKE2B 3bd051faca16b5d6421fc344781751b0815b8946f96e86d97124aa693c2df3a3b610e5786db3d0b6a48b6499e4b06c7b406c8e855419a82465ef311bfd097323 SHA512 1c8f844a835404b65762055e019ebe91b1ca341ea44b962492af3ccb96601801babf7a2412869e131f33e26f79fef7aa424a4e89bc6dce7ebea574a21bc4904f
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
index 53b26f20853d..2763b03cd7ce 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2017-03-01"
 SLOT="0/${SONAME}"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 9bd1e5929b8c..145ce455a601 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1415 BLAKE2B a9e2e342902a1c8642b099ff3e157b2b6c214da620d9285412b694f8dafebef4f293b835bc41865df47b8fe5212c6d6c59533592dc30fd2b4d823f34ed0ba38e SHA512 6d31292eab86a8cd66789df25064f8bf7fbe389bd2b547ad03d334f6a9ba7f390249ea3a1de61bf8928dbf13d7bf585d41e350eaf097bc2b4a9fd8e91af83770
+EBUILD snowball-stemmer-0.20140325.ebuild 1414 BLAKE2B c65a25acd7c95910c740740713117da1247ffcdff6cd5298363f651ea38174aaae0301b3ad3a459f423f293aa2cbcb19d3c526c750483b185f5fe575fda3f42b SHA512 41fc47e3fb877dc3be8a3d1f8acd75569bac4806aa4b67fb3f655a963c973dcb307b62b1fe05256800609b0f2df288aea6e17f87185318547294af43b20335ec
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 2291dbcf20ef..fe6fcbcaf303 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index dec320c24bd5..e8aaaa48e4fa 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,6 +1,6 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
-EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B c20642ae2741ce0941fa12b8ab4ba3162df9484c775a88c5e4a15b0e774471fc872b0c9d486a081afdda800d4e08b4798b05b44c32a387dd93b4ea1f433c2309 SHA512 721f120e09c2fc85154cecd824a85c36d499fcb11eb5173a52cb3c73c941fa7234d97492a1e675f04ceca192475cd31fde61313f0951eb0ba5618b434e483662
-EBUILD softhsm-2.5.0.ebuild 1089 BLAKE2B fc038b382c50a1f0b065dcf1145b5a74189119961f24432d78c89516cf3fb225a6de38118f63a5be9e2965b138810b395850e3f9d2a4c06cf06ad8bd4408a4df SHA512 d6f213a0edab60adc5c741f5a54d650ec4ee268c689e5b893ac1f4417f7f70cf90cf93d5b8dab105cfaa03dcea7ad4cb809b7e4693962233af1a79f83e00ebea
-MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
+EBUILD softhsm-2.4.0.ebuild 1034 BLAKE2B a23e92f44ed9bb03277cd3d124d4d1eb7e0a0eec0ec67b793d2c999d44490c63a546595bbba20b5913b8aedda9d7695b357ea05c3be9f1ec0610a9a6fc10b2d4 SHA512 bdf82fc5041a0c0eb40344f1a9a3393dfdc726118a1d9491cd57f68f40c1e97d5101e0e7ce071711a3182d8e772c93d2477205c3eee73100e43f4865c18dc882
+EBUILD softhsm-2.5.0.ebuild 1085 BLAKE2B a86e64d8a8bd46cd7f63b35fd6c1aa241ec688a8bcd0f526fb31aa96880b5f8093dbceb107fbfac76929421d06e4f6a14772795e3f35087d68dcce326ffd36ea SHA512 e1399d22f68ec1ede572605ba1d37f99d14338bff0fbc30ec2c332806959bcf248787b0da9be2c22ad679c1ed2f8b543f1b8c0960c9362518203ef9be046c9bc
+MISC metadata.xml 365 BLAKE2B 1661f2dba2653a4fd4ca4ed53b9d10ca647c3e13ec93eb21062505578489e4d403c497f304f18be655e116f7bdad253f79de7cf185af9512676c43ff5fe3f8f0 SHA512 a5641e507a0fb5bb77278a39c5dd3f9f228438f650e8ea8710855c0499521b88b7197d89d7c5866471826485e840863258520b026c3ca1b2eb7555bc842dd262
diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 1db90fe1ffe9..5b486dde6ca3 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Crypto</name>
 	</maintainer>
 	<use>
-		<flag name="migration-tool">
-		Build db migration tool
-		</flag>
+		<flag name="gost">Enable gost algorithm</flag>
+		<flag name="migration-tool">Build db migration tool</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
index ec4f819aecca..70b3e1b0f080 100644
--- a/dev-libs/softhsm/softhsm-2.4.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
+IUSE="bindist gost libressl migration-tool test"
 SLOT="2"
 LICENSE="BSD"
 
 RDEPEND="migration-tool? ( dev-db/sqlite:3 )
-	!libressl? ( dev-libs/openssl:=[bindist=] )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl )
 	!~dev-libs/softhsm-2.0.0:0"
 DEPEND="${RDEPEND}"
@@ -33,7 +33,7 @@ src_configure() {
 		--disable-p11-kit \
 		--localstatedir="${EROOT}/var" \
 		$(use_enable !bindist ecc) \
-		$(use_enable !libressl gost) \
+		$(use_enable gost) \
 		$(use_with migration-tool migrate)
 }
 
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
index efb92f3af4d2..c05dee21086a 100644
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bindist libressl migration-tool test"
+IUSE="bindist gost libressl migration-tool test"
 SLOT="2"
 LICENSE="BSD"
 
 RDEPEND="migration-tool? ( dev-db/sqlite:3= )
-	!libressl? ( dev-libs/openssl:=[bindist=] )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	libressl? ( dev-libs/libressl:= )
 	!~dev-libs/softhsm-2.0.0:0"
 DEPEND="${RDEPEND}"
@@ -37,7 +37,7 @@ src_configure() {
 		--disable-p11-kit \
 		--localstatedir="${EROOT}/var" \
 		$(use_enable !bindist ecc) \
-		$(use_enable !libressl gost) \
+		$(use_enable gost) \
 		$(use_with migration-tool migrate)
 }
 
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
new file mode 100644
index 000000000000..e43df89b2998
--- /dev/null
+++ b/dev-libs/stb/Manifest
@@ -0,0 +1,3 @@
+DIST stb-20180211.tar.gz 1327803 BLAKE2B a910ac78c5e3760a3e4c74e033d15230c39abd89aeb083ba6c7cd23f8339926e8ab82fde1b6f4fe7a1a312023979a74b961abe263c40b18b3bb8239cbdfa204e SHA512 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b
+EBUILD stb-20180211.ebuild 710 BLAKE2B 75034d290f674ae8f7e893bd425f7d4a7914e00b953e584e19a4aa7c6ebfe7e15d0e0c1568360f0d60807ab7d7c1bead724a00f27f4f06f1f7b24f5c6c6334aa SHA512 fc6da46ae51d2941d8d944aa43cfbb1b6f25172055e305de2be331100b2e41500f3f6f27753577e51d98ecf02979e640e5afd663b58da284306b63f861f5f2ab
+MISC metadata.xml 566 BLAKE2B 31083e6f694a1b5f7fff41a5ca5df347107cb75c6a116cae7f8d6652ff55a197539d90cfc77828728f1b10e1ff091e1bf658fa95298de1da3415472fbb837fd8 SHA512 d6db1290da820060b19a4cee9536caf912eda54a4e11a8ef21ef4e74e60cb1580a1ba320803f0c5b815a77a6b906c9c3d11c6193443ae4abc451c8b5c978fae3
diff --git a/dev-libs/stb/metadata.xml b/dev-libs/stb/metadata.xml
new file mode 100644
index 000000000000..c6be08a32616
--- /dev/null
+++ b/dev-libs/stb/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mathy@vanvoorden.be</email>
+		<name>Mathy Vanvoorden</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nothings/stb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/stb/stb-20180211.ebuild b/dev-libs/stb/stb-20180211.ebuild
new file mode 100644
index 000000000000..6efc838e61bb
--- /dev/null
+++ b/dev-libs/stb/stb-20180211.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# There are no offical releases
+CHECKSUM="e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"
+
+DESCRIPTION="single-file public domain (or MIT licensed) libraries for C/C++"
+HOMEPAGE="https://github.com/nothings/stb"
+SRC_URI="https://github.com/nothings/stb/archive/${CHECKSUM}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+S="${WORKDIR}/${PN}-${CHECKSUM}"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	# Move the header files in a folder so they don't pollute the include dir
+	mkdir stb || die
+	mv *.h stb/ || die
+}
+
+src_install() {
+	doheader -r stb
+}
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index c2d7f29375bd..0b3325b72c8a 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -2,5 +2,5 @@ AUX tntnet-2.0-zlib-minizip.patch 1432 BLAKE2B 137e4deaa5c2e6bd57695e19d643657c9
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 EBUILD tntnet-2.2.1-r1.ebuild 1889 BLAKE2B 5205f1c8c547cad508c6c8528dd23001e57f90a25988f73fa892042c80c0a694cc81c442e8ed003afc988bf6d31c2c23e24586ee6b47b61c3b84e27c206c4667 SHA512 c74171d0347eeaa84b64c988c06ac40cbe56c0b5df2e55ab946ca10e1639ed96d1e2ea279d2229a8f3c29cbf3cb4823ef961ce3ec62f3681d72a57c19e4e8272
-EBUILD tntnet-2.2.1.ebuild 1819 BLAKE2B ab388f7b9baff54a23ffbdb045c8d5b24ee315cefa4a6728ce837822984b6c2b9f602db3e4a873129667992188c28d67973b2f319305c526fe06fa45b5cb2941 SHA512 deafb4fa61fdd887da29bb4e62d57eb1e0d6d88ac0a6227a39454285d14689ed92adec2c2d38d84e37ab2d03b374269486fc4a5e5f7da8c388f54c7281ba344b
+EBUILD tntnet-2.2.1.ebuild 1817 BLAKE2B 07c9432256c041dc21fcfb6691f4fe4f07b0f694317119517c446f1169baa77f4eef14a7b4fcde8eef1300feb3b8d24748b099713af273a34f5b9af8ba1b82bc SHA512 f67099b4cac43aefd68a0d4f819bc9f9d4cbe825d03356e2587e2f0832d0423f60df9e8817f71fec61fd2339af3eaac70d83a8bbe6a1e36c3c27a4a3abcd4998
 MISC metadata.xml 555 BLAKE2B 89b58ae15701bd0e48eec8e3adcd99228f4a202b60b9904d04fa1b461c70f06876f36f2ad48b9f5596ca164f9eda7ca2617380503c427698c6a2ab1edc822c44 SHA512 060415a8e9aa8550ba30ef7f987ef5862e03fc9abd905eaec60715401279ed92d467b116cdce70626a3bfb3ca58d0d999611da23b09726a78ad47d553f97d4e4
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index 6102ea7fb03c..bd46d16526d7 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/cxxtools-2.2.1
 			>=net-libs/gnutls-1.2.0
 			dev-libs/libgcrypt:0
 		)
-		!gnutls? ( dev-libs/openssl:* )
+		!gnutls? ( dev-libs/openssl:0= )
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 24aa8889870b..14e9a70e4cab 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -3,6 +3,6 @@ DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a7
 DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
 EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
-EBUILD univalue-1.0.4.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
+EBUILD univalue-1.0.4.ebuild 727 BLAKE2B 20207eb6e56b56a0643c19268b47d654aa73a4bdcd8295ecdb6aa441c3e71a3ec87452d7e97eddac0141b8f1f34c8fcd7d08ab90c3b8c1f6913ccd89c6d18b5b SHA512 30c06c6566cfb1e4df255a36de6e6d50f03f2354e84cb9ffbcf9c64ff7afd43f219dd0667542296c49bff81457e31a927a0aba2b5e44140de38b5b34b167b449
 EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
index 989d23ce6cce..d0f789dcb1dd 100644
--- a/dev-libs/univalue/univalue-1.0.4.ebuild
+++ b/dev-libs/univalue/univalue-1.0.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index e493a642f1b9..e736cf8c97ad 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -3,8 +3,10 @@ DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac698
 DIST uriparser-0.8.5.tar.bz2 359469 BLAKE2B 44fb7d8bd5dac8bb0dd68bfbc4fb2adec310a913a7ebb92850fb2b8833c159db7cb29fa4f8b5de3e3b3def018024d1e69a0814bcd12aa24b6a14deca6f6768fb SHA512 e9b0228092cf12b824975000b0a6dbe2e413d3642203666d77c5b42f04bc13e0ec3f61d6a2c44d9613bea15e8cf7ec42cc4c92c5bc4318ee3349c1b380409d5c
 DIST uriparser-0.8.6.tar.bz2 360214 BLAKE2B 18a0e02f5dc6efa840cd6647c4595f238f811e8131750959b31f5283c5632b8892fa38767f883110ff2fbcb9dd07afabcaef64b206b9a951a773bd9d4b1cd9e9 SHA512 b95e6d7c7f835002f6ea1a9c0962f4d385cd16519c40b921e9a9679140fd5d6cd326002b452fc73431aa2f36d049ae510c034a423eca143a6285f9b4b3dd7b83
 DIST uriparser-0.9.0.tar.bz2 371895 BLAKE2B 13479fe75d8dcc9514da6c26d9a60a68256b895f012d3b36e156353f1f37b2e572a3c8014f5cab30fe1d6da58ef840ea9878eabb48625a7449e46c7dbc13247c SHA512 8ad631726c59d244b945221e803dcb13daa6df6550b3de94da19745f4b4d53a5ce17dba54280273181479f2803dea4ca7b0154ac3b54ca39fc4eda2c8a03e3f7
+DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
 EBUILD uriparser-0.8.4-r1.ebuild 1065 BLAKE2B 1ae3176b5642f9fb5e037dd3eb06d8e1ac1f00027f7e5226e1063172148054efc4dd49b42b6f21f0ab5f21e44849e93957651457836e20649507aa26c8e0243a SHA512 1e4f875b4e8a88540ed16d0043d728485df7d92a20d4a89cd7fa1b00ea40f01587532e7e4ab1705bcb2bccc35f9345f945338f86030917daa71dbae8fe8d0ffc
 EBUILD uriparser-0.8.5.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
 EBUILD uriparser-0.8.6.ebuild 980 BLAKE2B 145266c02bcac0f9129cd644b3950161ee68a04fceb41a8002bf7275ada1c3fb3d681dd214aa9b604a10c7a5cd1006945a2536e45728b88152d9fdd9fb7717b0 SHA512 0af97e47d0b3bccd0d9b2eada5e9145a239729818991aef769b26ff6ef6258ae919a8b6bf0d644d01f93a4a4b36735f0fe2b8ee5ce8aa83aa85f12dc17058f68
 EBUILD uriparser-0.9.0.ebuild 951 BLAKE2B cea02d809f6651663191db84f6fd497f2d222355ebbbbc2dfcb1b5cb16a60d3df231887c077fdbd02d70c8d2907fa303715766d51eb3a550978a6211d9235053 SHA512 330943bfb6f3a962cdabd509a1ae8019249eff565d1e19dd5bd123c01809f518f60c4a2f648b77e7bbd526910019627e9e5736587cb79f344811dc9fccf7dc5e
+EBUILD uriparser-0.9.1.ebuild 951 BLAKE2B 5f97944518f66f96560e0787ea636a421b01ef0f83b1279136bcfabd1e6bb039ea2325d935ba7142744e92e8b01dd06f53d8046ae4ca298e4d338d83d918dc30 SHA512 8ee1b567efe79a4b5d1d9c73d7f82296c4ba63d0e69a3d4beb02346f0e737f10efabe614dc74608481da2ecec0c8484262dc65edc93c522eb4ac388f524de066
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
new file mode 100644
index 000000000000..7fcaa4b05570
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-cpp/gtest-1.8.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	econf \
+		$(use_enable test) \
+		--enable-char \
+		$(use_enable unicode wchar_t) \
+		$(use_enable doc) \
+		--docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+	default
+
+	if use doc && use qt5; then
+		dodoc doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 62ebdd62b777..060318410d73 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,5 @@
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
+DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92
 EBUILD vala-common-0.36.15.ebuild 2518 BLAKE2B 3cf948007e3d995897b9099b2c74ecefddda03a1a94757eb61d85eb7c23ad0d9f3d718fa2796d71cbd7e3143afb08beed13f1511b65c5f5b2e24567fdd639497 SHA512 da792acf4f2d5456b878d70068b4655049e3a0ae7d70a158423e1952d19e212b373823e572051c49dab4822d699a58b0aec1a92130e4659460ee7127d3f81914
+EBUILD vala-common-0.36.17.ebuild 2528 BLAKE2B 22a27070320c74579be8eacdbc325a6e58be193d787521c73aee40028c4e02e3f3ce4d8d987b889e1d253fec1109fb7031358f3c6317a11616e788c2f8763d8e SHA512 ebdc12ff8170abfade55b3f5013c1813a23d545a5c0d1d828a5257c7f5cdf7687ce27e4d085a84c977ac171ae32daf383214ab353a2c44befb5d6e1f148a5c20
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.17.ebuild b/dev-libs/vala-common/vala-common-0.36.17.ebuild
new file mode 100644
index 000000000000..e3b21a2a5dc5
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.36.17.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 7b9cece2d2b5..590d29418da5 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -6,12 +6,12 @@ DIST xapian-core-1.4.6.tar.xz 2839964 BLAKE2B ab35e3098d8cf996565399681710736838
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
-EBUILD xapian-1.2.24.ebuild 1553 BLAKE2B 77d756575e5d0fdabd59f970ad6edfa4a197c1083a9080392725b6d74e6d9d0f948bed1dd7dbdeb29c0a16bbe70490af0a5b4505e539cee62272949768ddb931 SHA512 9e7f9ed40d9087f3c1fcb1cfe32e30646d2041e4abcc4f5f26940356b40e6d8bf9a80d7d57c86d3f4ecae369d974bbc0f141628fae831903f16d0b81ca336a48
-EBUILD xapian-1.2.25.ebuild 1819 BLAKE2B c97c37172439b92f86628598e9b039aff8447dfed845a2bb20caaae2d4245cd83536032a4fd482b7a5e0560cb73affedcaff0b6ef31184c2c71bf648e6b55e95 SHA512 dd3bbb7ca195bc2e4337910c2719c80d24c04d4fb4dac53fd3edeaa35e26593d2af82eb11ae5de364292cff941e8fa590fa5eaabcceac08b9741b47f9e6dc6df
-EBUILD xapian-1.4.4.ebuild 1908 BLAKE2B cbb63641f65e5bd48dcf353a5131e5199d9b9574a166528375a8dbffeb324e89b8c0129778241486e9cc8e9ac9ff18c464651e63f09b21a9e9e473698ad31444 SHA512 d1369efedd3aebc02ae4bbb7e2c201accad3a825248cb51cc14682266692a860c57e621ae3f7c2fc2a8183b612a9d824d99dff5ad5bbb6d3a9dd47f199a31b2d
-EBUILD xapian-1.4.5.ebuild 1906 BLAKE2B b7402f69fb0d7f5e2dffa92651cafbb588533d9eba1eacb1a3dcc91245f7b609ab74ddbfdcef014acb267a85a1dc819deaa2b7ad0b83845b923ea7350e79561c SHA512 eeb3f0d3e7cacb4c8be2c92a889d53c470023fc3ae583509af879e3a546f8212d64527afe38cbef6d7e674292b4c20d03ab5454d48f510bb0f98c1f20bb2d68a
-EBUILD xapian-1.4.6.ebuild 1917 BLAKE2B f7a307085cc7322e471a9e0418c6d8f2f65b78b387f32dd4cd8a0bab719c8646cb22d18ffa6707ae5689288b7d6cefdd324e2b10cec20882828d9c6bde89022e SHA512 64b7c6a931b1611795cd62327529a7eef4a4897e0c345c20ba8c5e4c559e7d45ec2f932d87174b49fdfe8a309de8d9cf4c298ded68fb1b67214db8fd637ee032
-EBUILD xapian-1.4.7.ebuild 1909 BLAKE2B 5f0f6b1a3f7b94b1848972200d627a12414f234c97cd4cde66922a161892bd914082dd4b5722b86dbee1c508377467f838bee0bf4b03b58caa3bac5ec4449642 SHA512 86414396d6ef8430416efa12124c934219f54cb814f2fb38e48c7af1d00e65cc3fc14d4ce3ffb56d1233662acef6ba0069b9b42caf88606295cfb0bf48b1d4b4
-EBUILD xapian-1.4.8.ebuild 1914 BLAKE2B 8d08a55a1db74ba1d71d6f5208627a41861d7b5759670e58749ff52a796c471b1e4fd1293ecee3748c719ed82842bf8af7a2b84107d63aa5b4b515774fe3d048 SHA512 5d143c95dad7d470705065bbb23508b774b9557a65d80bd22f8b56519f49d82144354fe05192574daa7a4c4518c129795d1b1eb5b3917a7b1159cc63a00d0497
-EBUILD xapian-1.4.9.ebuild 1914 BLAKE2B 8d08a55a1db74ba1d71d6f5208627a41861d7b5759670e58749ff52a796c471b1e4fd1293ecee3748c719ed82842bf8af7a2b84107d63aa5b4b515774fe3d048 SHA512 5d143c95dad7d470705065bbb23508b774b9557a65d80bd22f8b56519f49d82144354fe05192574daa7a4c4518c129795d1b1eb5b3917a7b1159cc63a00d0497
+EBUILD xapian-1.2.24.ebuild 1556 BLAKE2B 640a8b36ebde9e7ba51ba28d5da9f99a5a6f0f150d8bbda4ef643a942359125b56d222d09755c4fb87fa420a64740a782eee78231d8b35b4389c5213040d5cc8 SHA512 d2a9ee33d454d8d0a67e2ed98c0dd3b7733fbe3b1a25b78b408fbfeab6570943e1a94a556c9eb57b000ff32a2a19d0a861e9018a198f20eb0e53e72c0fe5b314
+EBUILD xapian-1.2.25.ebuild 1825 BLAKE2B a02e05c9fa4cc3ad0fefd2feb2dfc24a6f2be4dda3cec34b5af474435702bd89ebddd1bc3d22c7e531d833e6f90be158f0b25f76f417821271b4c8ac647f2839 SHA512 ff3fd69f399c3521ee25c745d11454b2e6b1a5bca5ff828bfa71f70c72199b2150e6c1d8fc2cedae62203c73c9e52f3aabfee5107042f26e0eb707b47a745c8e
+EBUILD xapian-1.4.4.ebuild 1911 BLAKE2B c41444f3a2e7bb7365d56d960b411ed1fec08cd5c3ceac87b92ddc157d72e23b876f57f30ca2adf89c597949f9ed4cd5eb2099176c9bccd99dca34e7074f74af SHA512 06bc64d5ccb5ef6559ffd285d36952009db2511a7e34ffc43cfc13580e75cf1c9aa2c14ffb069dd25381f08276e9a57cea10f36a6e7a9a09138cea36090856cd
+EBUILD xapian-1.4.5.ebuild 1912 BLAKE2B c259fbd9eaa377a7be7cac43d9c50b4d60555cd16b8869efa42df5d4122574e0288c61e58614d5ab890fd514c6a1641d302c037bd404b643a0aab27df9da6446 SHA512 08c76112cfbf22c5be648af2496c312586e0238cc5056221ec544e834b40f77c9faf93cb35d8887f8537603de8fe4f1756b6475d9d420858f0fdc9b37939b3cd
+EBUILD xapian-1.4.6.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
+EBUILD xapian-1.4.7.ebuild 1914 BLAKE2B 70a2b93aa714d6d1f47e403b95b06e15a4fb9f6ecdaf1a5e118518a9bef7bd7ef945db2b92bc17ef92820421af847ac20bdc743e51ea999ee0d156900e86e7c4 SHA512 6a07f7a1a46fdb28cd037c90a2910449c9fb6a5db262fccd4b19009ae3d391a56ba8bacb39bb839a2d14908222348178517430a065c532c2e7a9da4df2861a96
+EBUILD xapian-1.4.8.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
+EBUILD xapian-1.4.9.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
 MISC metadata.xml 932 BLAKE2B 303ba679d42d5917930aa698ca96fa22e2000b4ffbfe3113b67119b61dd51140b1662bc090078027f7b00d0ad04e0e61792e74d1bddfc625e46258568b5c5f57 SHA512 874335952e31a9da1d105b82eac0c209259a85dfcdc8b7171cc1ff7d48694838bf9c3037fc4ff0450298b3c6b6fbb143ecfe7497727e8f18b684ff630caeb49c
diff --git a/dev-libs/xapian/xapian-1.2.24.ebuild b/dev-libs/xapian/xapian-1.2.24.ebuild
index 07d80d1a6c02..ebe151278a9c 100644
--- a/dev-libs/xapian/xapian-1.2.24.ebuild
+++ b/dev-libs/xapian/xapian-1.2.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25.ebuild
index dafcd2e30f62..c83e47724844 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.4.ebuild b/dev-libs/xapian/xapian-1.4.4.ebuild
index 6b1d43a0a015..b9da678788a0 100644
--- a/dev-libs/xapian/xapian-1.4.4.ebuild
+++ b/dev-libs/xapian/xapian-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.5.ebuild b/dev-libs/xapian/xapian-1.4.5.ebuild
index 5b1d30b476f0..fbedbb7f3c9e 100644
--- a/dev-libs/xapian/xapian-1.4.5.ebuild
+++ b/dev-libs/xapian/xapian-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.6.ebuild b/dev-libs/xapian/xapian-1.4.6.ebuild
index 564cf8ba016f..e76f3f7d2225 100644
--- a/dev-libs/xapian/xapian-1.4.6.ebuild
+++ b/dev-libs/xapian/xapian-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.7.ebuild b/dev-libs/xapian/xapian-1.4.7.ebuild
index 5683afa506a2..5cd5a2ee26fa 100644
--- a/dev-libs/xapian/xapian-1.4.7.ebuild
+++ b/dev-libs/xapian/xapian-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.8.ebuild b/dev-libs/xapian/xapian-1.4.8.ebuild
index 311fd46fc567..e76f3f7d2225 100644
--- a/dev-libs/xapian/xapian-1.4.8.ebuild
+++ b/dev-libs/xapian/xapian-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xapian/xapian-1.4.9.ebuild b/dev-libs/xapian/xapian-1.4.9.ebuild
index 311fd46fc567..e76f3f7d2225 100644
--- a/dev-libs/xapian/xapian-1.4.9.ebuild
+++ b/dev-libs/xapian/xapian-1.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 0149e6ca79e4..9b355fb884ba 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,9 +1,11 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.1.4-fix-build-system.patch 2080 BLAKE2B 02e67cf0c737c30405b967619aa8deee0c1f1c8b9635265226b111ca729b23bcc1bb1d094ba3342269051cb9a819b281b0985d2c1785bfa524f3844b29d65636 SHA512 38ec4237425e63aaf00e4b969ad0c478bb788b803272f7406f38ea250e5ed1ba4e78f061959fbe180956058d1d7f3b56d31451450872809999b2c6be29add4dc
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
+AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
+EBUILD xerces-c-3.2.2-r1.ebuild 2966 BLAKE2B c297b66106b056c2b425f28f6e5b57d0ceaa17dd9143ca87fd76d0652a550058a70848230e8d17f8e1de9b18af2cd7719253ce28f6b48427aa79025c66d39a4d SHA512 629fa19814153f784f1dc279434bf968220693261e64decab1852911804c60516908e3083df57fe2f1633a541f87a66476db8ad53ada8fbc1d95752577fcf3aa
 EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
 EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
 MISC metadata.xml 849 BLAKE2B 4d7f00d4864bd2b347723a029ff58cc7c9f84867ebcc45392a94b2d063cdbde84a4290e2302d9fbdabf98c7cf3a3edb04a18ce60d6c5bd9c474a492f5acc4b2f SHA512 e1aaa46f73a6cc929dc87530053ab0f15d632a1998d3ac13991ac94610d578deeeb8e4e786bbe42512c7231d99701c9bf59047cffba0bb48044e80f96f36663b
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch
new file mode 100644
index 000000000000..57dde7220985
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch
@@ -0,0 +1,24 @@
+From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 2 Jan 2019 15:01:21 -0500
+Subject: [PATCH] build: Install XercesMessages_en_US.cat to
+ /usr/share/xerces-c/msg
+
+Fixes XERCESC-2163
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c29aa257b..6f1929d99 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1198,7 +1198,7 @@ if(XERCES_USE_MSGLOADER_ICONV)
+ 
+   install(
+     FILES "${RESTARGET}"
+-    DESTINATION "${CMAKE_INSTALL_PREFIX}/msg"
++    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xerces-c/msg"
+     COMPONENT "runtime")
+ endif()
+ 
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..2c447d12051d
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-utils prefix
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
+
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
+	inherit subversion
+else
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+PATCHES=(
+	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
+	"${FILESDIR}/${P}-fix-XERCESC-2163.patch"
+)
+
+pkg_setup() {
+	export ICUROOT="${EPREFIX}/usr"
+
+	if use iconv && use icu; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU takes precedence."
+	fi
+}
+
+src_configure() {
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor
+	if use curl; then
+		netaccessor="curl"
+	elif use elibc_Darwin; then
+		netaccessor="cfurl"
+	else
+		netaccessor="socket"
+	fi
+
+	local msgloader
+	if use icu; then
+		msgloader="icu"
+	elif use iconv; then
+		msgloader="iconv"
+	else
+		msgloader="inmemory"
+	fi
+
+	local transcoder
+	if use icu; then
+		transcoder="icu"
+	elif use elibc_Darwin; then
+		transcoder="macosunicodeconverter"
+	elif use elibc_FreeBSD; then
+		transcoder="iconv"
+	else
+		transcoder="gnuiconv"
+	fi
+	# for interix maybe: transcoder="windows"
+
+	local mycmakeargs=(
+		-Dnetwork-accessor="${netaccessor}"
+		-Dmessage-loader="${msgloader}"
+		-Dtranscoder="${transcoder}"
+		-Dthreads:BOOL="$(usex threads)"
+		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+}
+
+src_install () {
+	cmake-utils_src_install
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		# clean out object files, executables, Makefiles
+		# and the like before installing examples
+		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
+			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# To make sure an appropriate NLS msg file is around when using
+	# the iconv msgloader ICU has the messages compiled in.
+	if use iconv && ! use icu; then
+		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
+	fi
+}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index d8088f641fd2..a11c4423b03f 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 853 BLAKE2B 219b2d360eaed1e266541b65ff34b4eff68e781836f6dc25db3136f6057c51a90d3f6d772cbde54bfce729a73b44b8ff30b392c5047ea679237ad0a86f862e18 SHA512 83154ea25f4c15c9e4bd760780504f33dafa0db96481404e1e48083a5d8c9ba3e44b1af2e0e5bfbbd2f111cad4b36c4b9b11c4076cd176209379fab7250f2755
+EBUILD xxhash-0.6.5.ebuild 859 BLAKE2B 57fdb9b6582de383c904f8b991015e8c5130cebf5e81f9dbb4ccb2af9386d66298977c637fb3b7f8609c9f1daae8008c23462a099f57787241931222c2e08221 SHA512 e232fe6bbc5dbe1160269de79a472c4a0c0b7ccd09a1038d6d99210abbbccb52a85ca5eac2203f8b7164218ea13d4774a50dc1a1d3ab33950dc7672fca67be6b
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 06493b20df91..41222a340a13 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index d7aa56ba45bb..a51d4a165f8e 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,7 @@
 AUX zziplib-0.13.49-SDL-test.patch 392 BLAKE2B b09eb8e5fa14dd4936e1235ab29e8730182e25b5c2811851a99fbe95c9fcc6a7274bffd41d490bc9c7fece866ded73260d85c94ffbe43c9075a614e038a39d18 SHA512 b5a3e6e7fb4af7ab48a9aa26bdecbde6f3345ee3997c810fafa3d0e348ea0aee9247ae7acab7ccdc3fc1b9ab62daa7f29ac54862013206de8dd094361dd6facf
+AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
 DIST zziplib-0.13.62.tar.bz2 685770 BLAKE2B 24ef46370cd490498cedeea4b83abffd40b4bf7092ca994defb0c7c90a2c6863c56d19933dca1b20700ed9a55369cd1e8d3f6e1c5ed966b966d15eed4e5b75aa SHA512 fd3b9e9015ba7603bdebd8f6a2ac6d11003705bfab22f3a0025f75455042664aea69440845b59e6f389417dff5ac777f49541d8cbacb2a220e67d20bb6973e25
+DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
 EBUILD zziplib-0.13.62-r2.ebuild 2183 BLAKE2B 3d46cdd0afd006f807c8015b93214eec481d120d200a9f92e03176d9ea7d95988fbd10fc6dbdf655c8e73b8f809eeabd39703a9d9cb24261a14ad6f4022fbd53 SHA512 39fc10a12b8374a5b737fa0fbc0c229721ddf3f8a30d3a987633d5890e63a76b4b358a0803517e209365a804a67dcf7af37159c28f8e7f315c6ba1d1d1a0f838
+EBUILD zziplib-0.13.69.ebuild 2326 BLAKE2B bc54cecf24cda0cd1bdd93aaca779f38d61fd114af157c6c8a55cf33d7503144283778e4644556b97ec3659aacd439bb733f52793984f4fea2dd989dfa92319d SHA512 c4e7a37cf2a6350f251f52a5e0589fd94a51b7220166ff83cc8a7a66d143e8c31420ca1d49bc9136878de298d668824bfd1532b92a0e514d173fdd9ce4ef2cc3
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch
new file mode 100644
index 000000000000..7f85b6864696
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.69-SDL-test.patch
@@ -0,0 +1,14 @@
+this test isnt even run automatically and the dependencies are all broken,
+so just disable it and be done
+
+--- zziplib-0.13.69/SDL/Makefile.am
++++ zziplib-0.13.69/SDL/Makefile.am
+@@ -5,7 +5,7 @@
+ zzipsdl_DATA = SDL_rwops_zzip.c SDL_rwops_zzip.h
+ 
+ EXTRA_DIST = $(sdl_DATA)
+-check_PROGRAMS = zzcatsdl
++check_PROGRAMS = 
+ 
+ zzcatsdl_SOURCES = SDL_rwops_zzcat.c SDL_rwops_zzip.c
+ ZZIP_CFLAGS= `export PKG_CONFIG_PATH=../zzip; pkg-config zziplib --cflags` 
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
new file mode 100644
index 000000000000..973505427e73
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools libtool flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc sdl static-libs test"
+
+RDEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	test? ( app-arch/zip )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.69-SDL-test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	python_fix_shebang .
+
+	# workaround AX_CREATE_PKGCONFIG_INFO bug #353195
+	sed -i \
+		-e '/ax_create_pkgconfig_ldflags/s:$LDFLAGS::' \
+		-e '/ax_create_pkgconfig_cppflags/s:$CPPFLAGS::' \
+		configure || die
+
+	# zziplib tries to install backwards compat symlinks we dont want
+	sed -i -e '/^zzip-postinstall:/s|$|\ndisable-this:|' Makefile.in || die
+	sed -i -e '/^install-exec-hook:/s|$|\ndisable-this:|' zzip/Makefile.in || die
+
+	elibtoolize
+
+	# Do an out-of-tree build as their configure will do it automatically
+	# otherwise and that can lead to funky errors. #492816
+	mkdir -p build
+}
+
+src_configure() {
+	cd "${S}"/build
+
+	append-flags -fno-strict-aliasing # bug reported upstream
+	export ac_cv_path_XMLTO= # man pages are bundled in .tar's
+
+	local myeconfargs=(
+		$(use_enable sdl)
+		$(use_enable static-libs static)
+	)
+
+	# Disable aclocal probing as the default path works #449156
+	ECONF_SOURCE=${S} ACLOCAL=true \
+		econf "${myeconfargs[@]}"
+	MAKEOPTS+=' -C build'
+}
+
+src_install() {
+	default
+
+	# fowners fails when we don't have enough permissions (Prefix)
+	if [[ ${EUID} == 0 ]] ; then
+		fowners -R root /usr/share/man #321975
+	fi
+
+	find "${ED}" -name "*.la" -delete || die
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+}
+
+src_test() {
+	# need this because `make test` will always return true
+	# tests fail with -j > 1 (bug #241186)
+	emake -j1 check
+}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 1c698acbb37b..b68188daac8d 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index a574f4706b2f..4a075a3d9474 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -10,6 +10,7 @@ AUX sbcl-1.3.11-config.patch 630 BLAKE2B 7c8abce227890314a8d9a926d33336b670e1238
 AUX sbcl-1.3.19-bsd-sockets-test.patch 14992 BLAKE2B 8363595b4ace41ee1aad359eff61be856dae84fecc4ae7471675bb9b2abb6b80d79b108431faf38816d49a785e093f0c8a8c6f652ff6375755d9921e7e0bf8d4 SHA512 9c1d2558d25aa0bccc7245673a7e85f6b377f4a4e37aaa9417b838c2b602de527de9f1beebd75028d7a3bee2b11ebd6b23dd511436ec6c902c616ca13b502c63
 AUX sbcl-1.4.0-bsd-sockets-test.patch 15625 BLAKE2B 016d9ff9ef952c0b51fc0d03670a352dc12f6d40283bd7cef2110a0c795160b07412ca117e988aad71e19dd2629666aa6b3d6b17cbc123973f33d5d44e70e281 SHA512 59120ce76dd3c24b48edebda4d4536eb570fa7fab67ef8e995d89b72c5702333943ea7f39c674091773996b67add22e6fff7abd041acbb0e83a3e0e002097d74
 AUX sbcl-1.4.0-verbose-build.patch 936 BLAKE2B 2ec498fbe58e5b4ed8786f8554801ef89fa8300db7aeea45b09e1136254ca7cad92aadafa05d3d687c52267f444f7c7d2bd7b1d52ca5d502787f046f33708a4f SHA512 10b9e32a122910cca131bb5b4f1fbc098fa588a77b6cea2086a4f8458bcd70d5a7c2ad25018ac72b417d6fba8769d09e7debaffc23ef8f9a3b184d7f5729ec8d
+AUX sbcl-1.4.15-capstone.patch 739 BLAKE2B c8d298598fabdd0c93c11b639d02db134fff9760177bb4dc1ca7e73aa74ef902a13085451c5a48301f17d871d825b1601d1b0ab3cc8ed999558973f974220ebe SHA512 79d0cc4cfeac53a3784f6a93ac53f2bca62c74c4133abf0848ca269c2cf3613def781c752ba2209386a6c78235fe74e0ee304c3ed043fc35ca9ab2a3386f07bd
 DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 BLAKE2B 4be6831c196cfef505b411fa9ae0b9586f93309ce97fcd2b964abfb4175f00f7437da7859334973f2441592fc1a13cc5557044737659f5ef13998b593d623cda SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a
 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab
 DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 BLAKE2B ca4213ef00447d66406d1c752a1653fd628deba0e112f55a5625dad61da30c0be7c60fe4e84e8dcc9d9946db553ad544dc39b28d62124d8e3d6197943efc944a SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80
@@ -35,6 +36,8 @@ DIST sbcl-1.4.12-source.tar.bz2 6166453 BLAKE2B a85589610b6bad9bd2688c0320f46685
 DIST sbcl-1.4.12-x86-64-linux-binary.tar.bz2 10226228 BLAKE2B da5ab75c4913424774beadd47c0d5a5e1ea2885c0e45891ff9b730ea63a60ae1532e79b74ba1ac4f719447cce02e997ae0c771a0a916de646be1809068b82248 SHA512 6eb8bd4a7a5bddb06d7cc7a3224f2edad7add58c0af88b2d36ef6523a942d30f659189833def36c4688ffaf7046b11c3b4ddca09473af234cab3527ecca96220
 DIST sbcl-1.4.13-source.tar.bz2 6172361 BLAKE2B 7a3ae9fee025b72a5d5efc6c6cb0fbdc094cc8d31dbe0191dd126f2f6a7fd3944c7faa2ae23fab6e584e63760cce2d3e1c516c9b4d91eae9c9f18efdeebf3fa0 SHA512 976336bc5d3477a89afac51c3ee89e4153f0fca923ea477d4b312d8d231bccc215a31956198b2b670d86e17580d874bc964e12aa8207a17f61d20e4be41e4fcd
 DIST sbcl-1.4.13-x86-64-linux-binary.tar.bz2 10157554 BLAKE2B 24954d81149c0c5048c92dec04bf9b8ebbf4e630248a3ae6eed5ed1f8c871a5e428ecdb2142223f2823746480bb5bf0cacbeb98508d64cce5ebed58336022732 SHA512 81832ca6e6763783730c5f85325f5584d1bbb8b9bbd0c83cd0d3cabee2a832ea18409243a7a674a251561f31c2bc8f2b723768ddd8729141261ba0301e357980
+DIST sbcl-1.4.15-source.tar.bz2 6203416 BLAKE2B 181f237bf91c5923a343f8a249af78d6cd8c17b8af5fb93a9045677f1c604367dba5f4eb135dd368da48b55af6dfef8e2ea788c435a0ad787bcb6d4edebd3edf SHA512 9b38549c9a6170616b6966f98240df088f4a7c01d8aa939a8d38e1b2a7fdf5cea02c0346aa64c825949477ba56d57960db69018e31ec8ef6d78c8217a240a8db
+DIST sbcl-1.4.15-x86-64-linux-binary.tar.bz2 10318352 BLAKE2B 2da21f7a72602d461849adbdda2c3149b5bd66c0639964ef0bd78f4095f8caa229f1c3f0247d03c49773f9b716cc92ed760e5ba5c08005f73263a3ceef8d4e42 SHA512 0b07a9625b227537d264263e5cf9a32b6e4a6389bce2a60a7f4569441d0c22d6ec1bacfa4e43952ec766edd1336d1afc00c9da21bd8308c483a46cbe0824e11b
 DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.7-source.tar.bz2 6031614 BLAKE2B b98d8c3891e4f3180624ef0ccc1e81146d97e58c577c9efb2b3ac178f81a836f4019111a6c33ec31edb47d41920249c33a87955303c02ffc608ea42747b7f662 SHA512 b6eb749878920bec90f50f19c8c8700f700677ae1a7f7fb1ba1bbaa37f218d36eeee0dea65eb200f0cd09a9694600969f4c15042faf357395715b5390a6fdb6b
@@ -48,6 +51,7 @@ EBUILD sbcl-1.4.10.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f246
 EBUILD sbcl-1.4.11.ebuild 8670 BLAKE2B ccf4bb9b1568531a51d821827217a8779a42ac6fc9b8e0a967fb6bc5cb6e649473c148c04973ce23fe5fe215da326cfbc4cf37e4be5c79d4fbac0de7cd56e5fb SHA512 7dc95010904e70fd09fc33d6640c9c191cc6f457c4417497827aaaa19d38424632f7b5201a91063850b7a4d5a18d2708712d321214f55373abdf3a6338451c74
 EBUILD sbcl-1.4.12.ebuild 8670 BLAKE2B f753fce6ff0dcb83ae71658b32c794937fa03bf6842f313d712ef35a9d41c05d532244d381f098b9e8d445c647cacf4de675539c280a7b98c2c47bc971ec50b4 SHA512 e57baf5184b43ebb11cdb4f9c8d87dfb608dc998059f3850468f302f37a7459dfd32114a58d811f3b5cfe78de24215a568d02db0c457ff6763c5f756885dc6c2
 EBUILD sbcl-1.4.13.ebuild 8670 BLAKE2B b269554be0b4bdcce808e85d55e7299a044efc7aae94edd1d77397a213243734ffbc23a40d0cc947b43e2e402a5b0f5a86dc7cdb5e0c69539137796a1e02b8bb SHA512 16c2507e834f5f298f476607d1b00b415f93e48114efa9240b385f271c2d4be17aa13dfae5489f7a013bb90714f271d4c72ed90a05aed148b1b804f11fad2dc5
+EBUILD sbcl-1.4.15.ebuild 8712 BLAKE2B 655b61ca34a0511f7231e4f755cdc3ea6c5926a29ab2f38334bc5185bf36409a44305d4cf4192016474300d16d18f3dee91530a91b176e61d3e87246f0be594b SHA512 5a26bfb7ed4d28d7b7c3556b8bf00b11d268a9437cf2323e779dfb5333ecf4a1b06f2cd17f76bd4737ccc95dcc58d4985d8d34edf1383e9e5aa57ef0e267cfd8
 EBUILD sbcl-1.4.7.ebuild 8669 BLAKE2B c8132a464276020c610727546c1508e9d552d524195ee7e82766e732b90869129b7bf483c42f56b195b8a1873679acaf0f9bd2d99a0b36141b96985275dacd63 SHA512 2c20dd0576b2245ab07d41c83512a7d3a45d4c5f566bc1182ebfab1981c41bd4dce8cb82f84a5c0441a461efa337952bf3fcdb44e8635a24eb1daf7795cecf2b
 EBUILD sbcl-1.4.8.ebuild 8669 BLAKE2B 2d4131570d6646076c2404fcbec93c999dc75f24652ed861bf9f981309066c15f16a4a90701ab19522f93157339cd0228daa466acef7424ec490f1a05e4e806a SHA512 3f41a91f91304b76f7503e2f3796a4536442700b94407e2794dc14874a9b72fdde4c3a1ebab245c7f658aee6fced45345eea63b7df4d36e317e3aed36a3a0e7c
 EBUILD sbcl-1.4.9.ebuild 8663 BLAKE2B 1e8a9d0fe96a4640e7b69b55c087884bd084ab2dd1ca2ce57eede21e7c4b0b7ca91174ff1f2ba6abf565bd3c485e06ec0de7678104dd56d72b60eee35bdf5152 SHA512 db38534d9f54e92ae630f87751cbd7150ba1f6dac79df203df432b0edddb61a4ed8096d471e05f011cfc6be68b12777a1cc624927c35e0942c6bea2ce0c10e91
diff --git a/dev-lisp/sbcl/files/sbcl-1.4.15-capstone.patch b/dev-lisp/sbcl/files/sbcl-1.4.15-capstone.patch
new file mode 100644
index 000000000000..057b1c5a3b8d
--- /dev/null
+++ b/dev-lisp/sbcl/files/sbcl-1.4.15-capstone.patch
@@ -0,0 +1,15 @@
+--- a/contrib/sb-capstone/tests.lisp.ORIG	2018-12-04 17:44:02.000000000 +0100
++++ b/contrib/sb-capstone/tests.lisp	2019-01-03 10:22:33.649177090 +0100
+@@ -65,10 +65,10 @@
+                 t)
+ 
+ 
+-(deftest ppc-little-endian (capstone-check '(#x03 #x10 #x40 #x3c #x00 #x81 #x42 #x38)
++(deftest ppc-little-endian (capstone-check '(#x03 #x10 #x40 #x3c #x00 #x71 #x42 #x38)
+                                            '(:ppc64 :little-endian)
+                                            '("LIS R2, 0X1003"
+-                                             "ADDI R2, R2, -0X7F00"))
++                                             "ADDI R2, R2, 0X7100"))
+                            t)
+ 
+ (deftest ppc-big-endian (capstone-check '(#x7c #x08 #x02 #xa6)
diff --git a/dev-lisp/sbcl/sbcl-1.4.15.ebuild b/dev-lisp/sbcl/sbcl-1.4.15.ebuild
new file mode 100644
index 000000000000..381f9f3a3350
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.4.15.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.4.15
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+	eapply "${FILESDIR}"/${P}-capstone.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 2d8929395354..476d495c57d7 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 7aaf5873d669..f56776b59c14 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,3 +1,3 @@
 DIST lua-cjson-2.1.0.tar.gz 86024 BLAKE2B 21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db SHA512 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
-EBUILD lua-cjson-2.1.0.ebuild 765 BLAKE2B ce8e5aa06cceba2be9f4436d5f5f2c3356521fcaa6237fe5cf37035ab37d70ba501d3bfb67bdb546d18559bb0bd53d987cbf3445a438f8622f8ee7c8ac350f33 SHA512 f5cf61e13d1306b058196ae7c87038f19d43c98c53c81f9ab769b728f2af9343829926ba9bf5192fe1a37e0e42659036209c227853d0728e3b9f722a6c6fa41c
+EBUILD lua-cjson-2.1.0.ebuild 784 BLAKE2B 4a64cbd26700a4ad9240862f9c5beb708a97f1a6fa51141f05bd4a1bad80212fd07cc822715b34f6d38f6b6c83b13f366b43bea18f8ef2e8be8065f38eb91a6b SHA512 2b10a5c31ba56e72920049081060433ecb93f0832b795c50ee60e06e44ce4544ea41edad71c9f6418ce89f7b0326a53b676c0ac34c396b2c31ab6e6141aa3b2d
 MISC metadata.xml 250 BLAKE2B b6882e74d55aa6fb27d372e6b27adc8751cd6bcbc6bbddf7b60b8a666d866a9ea95675b1ea1f0ab644eeeef2ca0ca599fadade594d80b649b2914b0581d805c2 SHA512 c9d378944a0bf99a43e176e333e565fe0e7af8000dbeac1b65e5d0f850eba07d88b15917d3b9bcbe05e927a94b36e310aff905e2147707b674a62f67bb048da5
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
index 1dd13c83607d..7070319a3902 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-lang/lua-5.1:0"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
 
 DOCS=( NEWS THANKS )
 
@@ -29,6 +29,6 @@ src_test() {
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( manual.html performance.html )
 	cmake-utils_src_install
-	use doc && dohtml manual.html performance.html
 }
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index fc527a12f5e9..8f742b63b039 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1,5 +1,7 @@
 DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f381496837924ce999a58a4528a46b1b43fdd7b14041bab2a4536c89a37c6f31926f353d1bb1997e9ffd57ab6e2cfb83b6ef SHA512 de565ff7b9ac07493e771045b05902dd64e8b6c458180dd03d08cf900067d1b9cb88385c69dc29fb45774e4ec36b563cab705b34d37cec2f5cc792cf4f7b5049
 DIST luaossl-rel-20180708.tar.gz 455381 BLAKE2B d57e27638e6aee44a94f85094bab9161f0b87bdb379863fdef4517a1cb3415f4ef7e62967ee1e3fa2dde4d5629a24d732dc8ea0fd2ea54ccd84f69c4b18e2c57 SHA512 b2a73a7e7ace9a01c8c5a26603107f7741de88de32c393ed9134b70d55278c81d48e357955e671654825de282449b9570ecdc6a4fbcf4890439c0200ba471338
+DIST luaossl-rel-20181207.tar.gz 472294 BLAKE2B 1dd991cd73a432b7f8918d391bd3cbea98d77d4bd6390815840e3c7f63e98b9bcca6d9a4841da663ba7ecaa19880a4f3db4fce09d47d103cfd85f8d920efe84d SHA512 e5412c115d0dda3b3f2446ffd9a8d9b78be3800e834d7a43ec2cde16e56798fe2467d91add3ab8030321e6bf1a12349ecd5987dd88216ab0d7ba4ff451f0fb91
 EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9
 EBUILD luaossl-20180708.ebuild 921 BLAKE2B 7124683a0b21b71e8785ab8517012a9750a366afcb9eb5f1b82d5917fff5527499369ef7ed4891165e42a18fb09bd83763952d778b92db46838bcdb2dbf5276b SHA512 587d420d87f6b4f27e3267eaa12a96d5993cf557a43ba06f603a9acbe04231837368c6dedf0929d6025cd886981ccc120eab5c86517e509edb312d112ff78e22
+EBUILD luaossl-20181207.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e
 MISC metadata.xml 446 BLAKE2B e11f955abb7417868998af974278f1aeacfcc45c99727f9085958f1947873911a6c52e049782195fcc143336ac4359ac536797f3348df75295b64b48cafe759a SHA512 31b5c084ab50a3864d5bb189e55181a43d7ff2a2ff45738e00d5d863819ad2405b778f93caa12d9f62015e321252bcd1fdd776b7ff3a6299c58fc5cf74f6d547
diff --git a/dev-lua/luaossl/luaossl-20181207.ebuild b/dev-lua/luaossl/luaossl-20181207.ebuild
new file mode 100644
index 000000000000..300a08cda740
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-20181207.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${PN}-rel-${PV}
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
+HOMEPAGE="https://github.com/wahern/luaossl"
+SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	dev-libs/openssl:0[-bindist]
+	!dev-lua/lua-openssl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
+}
diff --git a/dev-perl/B-Debug/B-Debug-1.260.0.ebuild b/dev-perl/B-Debug/B-Debug-1.260.0.ebuild
new file mode 100644
index 000000000000..a36d672cbc42
--- /dev/null
+++ b/dev-perl/B-Debug/B-Debug-1.260.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.26
+inherit perl-module
+
+DESCRIPTION="Walk Perl syntax tree, printing debug info about ops"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test minimal"
+
+PERL_RM_FILES=(
+	"t/pod.t"
+)
+# requires deprecate 0.03 => perl 5.19.2
+RDEPEND="
+	!minimal? (
+		>=dev-perl/B-Flags-0.40.0
+	)
+	>=dev-lang/perl-5.19.2
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/B-Debug/Manifest b/dev-perl/B-Debug/Manifest
new file mode 100644
index 000000000000..3345199f1538
--- /dev/null
+++ b/dev-perl/B-Debug/Manifest
@@ -0,0 +1,3 @@
+DIST B-Debug-1.26.tar.gz 17725 BLAKE2B 5c9fc8e63a6c2511ef8189ea34b66d7795785ee2a71c429487cbd3dbf03aea42e0c1a4e4d15209627d22327ef99d9d193616050102a71d12b6fbb62eba2394a5 SHA512 d15a1b8283a9c9582cebf9d5fdc38289160c601603498eb79d120154c8643a81e256c4afe2ee938c9db04989af0544bdf312d2d0fe5b898b1dcee756d084db6e
+EBUILD B-Debug-1.260.0.ebuild 541 BLAKE2B c34d76a1851720da2e4721bce83bbae107cfdf9af3fa3ace642c7f5b4b1bfab6c2384adbe3a74ebcdce6782c05a18251e1c6f7a8eb7e4262f0c1ecb7e76ade51 SHA512 f1a1cd505f4eb7b8c3996b33ae7a43ad6b687017e4a8abee131f8efc5391fe30d20b6c8a3713bbeadee872619165413a0359c9f26b90356241d9d95cbd523839
+MISC metadata.xml 386 BLAKE2B a0994d30f9faee370442160fa6f47627c50a91a4d8116ce97db833b258f3bada0d0363e867d5604d5a087767aa56def2b1feb30d0900a42af44d6deff3aaee98 SHA512 0a69b28f3856a1017a836fb1ebfd33ac23735145aa4e78026550524143c426f643f721375f7dd4f26a8634fd9f9237108a107c193610ede82cee9af6b95c3023
diff --git a/dev-perl/B-Debug/metadata.xml b/dev-perl/B-Debug/metadata.xml
new file mode 100644
index 000000000000..4a5ed4399b9a
--- /dev/null
+++ b/dev-perl/B-Debug/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">B-Debug</remote-id>
+    <remote-id type="cpan-module">B::Debug</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/B-Flags/B-Flags-0.170.0.ebuild b/dev-perl/B-Flags/B-Flags-0.170.0.ebuild
new file mode 100644
index 000000000000..8f800ff3e3a3
--- /dev/null
+++ b/dev-perl/B-Flags/B-Flags-0.170.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Friendlier flags for B"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/B-Flags/Manifest b/dev-perl/B-Flags/Manifest
new file mode 100644
index 000000000000..d8b757ae1c62
--- /dev/null
+++ b/dev-perl/B-Flags/Manifest
@@ -0,0 +1,3 @@
+DIST B-Flags-0.17.tar.gz 10688 BLAKE2B 584bc1e7f24d163d42f928e25f48c5abac3c79b5a241e4d157801166d4e13d0b05210e2cab5bab2f26cf3fdc2819b3f9098c363bfed97bac5e4c564891edbcc6 SHA512 ada4dc9880ae0fd207c5fd8e0afbd987290c4e3d87c404057af28a8cdb14a1158e37226ab558368a68644b617d908c932e1ef0b7c2fac9bec0107360e31229bd
+EBUILD B-Flags-0.170.0.ebuild 325 BLAKE2B c24c18f064925ffc31aca7688d4d229c41a3345149a5775832dc2650b28768277df450ebf875b8052d203b98c33b7908e355f3ee4cd04537a8422c1b892f8df4 SHA512 6a05609ba0aa4245ca33094786136c9a6c5bd48b73b1393c8cf56c4147c501916c95fc613be8631dfafbab65f8e1dc2d0283dac7a0608145e3d94a95b0739dcf
+MISC metadata.xml 386 BLAKE2B 786974dd7980eb6d81faca07540033cb96ec6278250fa601d4b6719693689259bc99eae4c47948630dde8ba368ed9ee101b12e43b423ef12158a3c6686f605ad SHA512 b750cefda2080a875f4ee778df1f75e21f62eb1c235f55310ec6c26f9f2662e59cc786c4b23ff8e128fc1f94e9b91a1d70a4157d378f6785df0c361f3541a8c0
diff --git a/dev-perl/B-Flags/metadata.xml b/dev-perl/B-Flags/metadata.xml
new file mode 100644
index 000000000000..bfa775cedc10
--- /dev/null
+++ b/dev-perl/B-Flags/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="cpan">B-Flags</remote-id>
+    <remote-id type="cpan-module">B::Flags</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
index eeae1c4d24f8..6fbde34268c7 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index 54d486bc392c..f5c5f6cfc445 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1,3 +1,3 @@
 DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221caca14a0ac560712400632d90505e4fb74c50927cd9ad6453e91687e0b4c4f1fd2b50fa32d6355c7d46518bd63adda82734c SHA512 fee7b52f2bb48a4dc6314da4c274bb3456b6af2a0d891c1125425e5a0898e3115ea486a7dc057c25aaf7fc141bfebb5ea4341b17d00373b68a7388eb75f5bdb0
-EBUILD Cpanel-JSON-XS-3.23.900.ebuild 663 BLAKE2B 0882dfd9f989756b3a3b0d42a153c6ed4f0b64c45ea3742c73542b4b4c8c46f77a309e3091ad60312696e9dcb5c333e7a18fdbd50da4a11ea61cb5934b10d491 SHA512 2ad3b6aec39c0283a86dacdbfe168235aee9b2ad73fb4a20afb56e89a24c864e0152b327dc3940575445b21b35c4ab9544ada423b5f69f51ccd28a030cd6b266
+EBUILD Cpanel-JSON-XS-3.23.900.ebuild 670 BLAKE2B 64721397423c17e718b0d79389203aa1b32430ab83cbe6331d33386967037d1105d9921528be3da99e88705093466e5c0bee16b92d2055142bcc3d22c0b00769 SHA512 f4097c2fdaa5ab099262b75c1a390eb85b4b69de4ea32fe9c952cd0179b99a043523237d1cadc6d95bcbe4ded7f10f2260842a410529b539d5e55bdc6afc2ee2
 MISC metadata.xml 401 BLAKE2B de5ee963566e3471500d6a481445c09715483b7bc913e5a1fbd139de0d3f34e986ceb4cf9966cdaae909027250b76c85f0ea8535ca02ce558b861e055371b05a SHA512 c1ab8b9c9957f6e48f83e6aa82ae0912f3a7db57e34f844b4c9e8c004bbe303e3ab4c5cc865bd9df3b9d5b818fdd2389820ae3ca98da56ee3216fedc8b10a771
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r1.ebuild b/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..fbb5956d64cb
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/Crypt-OpenSSL-ECDSA-0.80.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MIKEM
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+	>=dev-perl/Crypt-OpenSSL-EC-0.50.0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Port-to-OpenSSL-1.1.0.patch"
+)
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
index bc656c429dbd..3cdffadf1825 100644
--- a/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/Manifest
@@ -1,3 +1,5 @@
+AUX Crypt-OpenSSL-ECDSA-0.80.0-0001-Port-to-OpenSSL-1.1.0.patch 5190 BLAKE2B 6c33efc7a74dd044e2edcadaae864d0f9f573740de054a1e8e9a1a589b5d6a460b281bff6bb544c4d32a0de7cb5f02ee73a1532d6be58b413506be28f94f1263 SHA512 243c7c48cf9e734ef4f83da9d7bdf6bdcdc7010aca337a3a8c2f3870cc0168fce860d924d3b722760caba8a5204ec0b292efc6b0393bd659663118cf9bc636db
 DIST Crypt-OpenSSL-ECDSA-0.08.tar.gz 52955 BLAKE2B 014d0d82dde21d8a797f0c498f8534b5c4034c5a5414c358ce5a9da1598fddd4cf03a4187e0acd0272e58d0e21002f426c0e8f41d4f485b7dae168c2facbc24e SHA512 7bccf904819b323ad958dcb59ef3981e3f22813057727cb7d19d4eeab69f57ed7b63e4e586f7494c316e7568d606087099738918eb440947d326ae5a703e9b19
+EBUILD Crypt-OpenSSL-ECDSA-0.80.0-r1.ebuild 543 BLAKE2B 18343e62930ccfb6659f995b33ac68a2e762b83b747080e1c83a46ed95433c8dd96229f45e83f9132f8b1f337871d2edda33fc39e6614d5f205841e7eac42316 SHA512 3df21c5f2bd419562ea530b2f64e491afa3cabdd8ccfd9903e841422f39e85f20faee4edc48e3ee96f8e6f3ec8983c8b290bcd04b8d786bdd9d836614c756673
 EBUILD Crypt-OpenSSL-ECDSA-0.80.0.ebuild 480 BLAKE2B 14bf19458cffb6bf6993007b74123da4e1e06c18e5be483c9a79d303de8544e81116426a29a1cfbafac0d1b66525a2613c1a804001733a2139ba3dfa0be4f899 SHA512 8b89bacd4ec0c6d177ec34fd862a73c31c784e8c50dcde632ce114ca24067928c33dfe5e4419a1a882dab122eef7779bb8c7fe0edbf56658ca5d5a3bef1bfb52
 MISC metadata.xml 411 BLAKE2B 25f4cd25a774a8ca02630c9408e5552ef64c6f20d522d67e5eadf66b633400a01298c149f31243918ce73bea6e7d99c14f22972c2f1c449a2b78ed8148a6a61f SHA512 7dde247b0b93d93f6776cf2570fdd6225d4087183b6c626d950f09648748181dd15d78fc164e8700b245430027bd59a408e6affa7466773b6fd6740c9a1958b8
diff --git a/dev-perl/Crypt-OpenSSL-ECDSA/files/Crypt-OpenSSL-ECDSA-0.80.0-0001-Port-to-OpenSSL-1.1.0.patch b/dev-perl/Crypt-OpenSSL-ECDSA/files/Crypt-OpenSSL-ECDSA-0.80.0-0001-Port-to-OpenSSL-1.1.0.patch
new file mode 100644
index 000000000000..071e60caefda
--- /dev/null
+++ b/dev-perl/Crypt-OpenSSL-ECDSA/files/Crypt-OpenSSL-ECDSA-0.80.0-0001-Port-to-OpenSSL-1.1.0.patch
@@ -0,0 +1,193 @@
+From 7a707a2bb0b0c6de1eb98cef74a5d1016f0e8c9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 11 Oct 2016 16:15:43 +0200
+Subject: [PATCH] Port to OpenSSL 1.1.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+OpenSSL 1.1.0 hid ECDSA structure internals and provided methods
+instead.
+
+This patch uses the methods and provides their copies in the case of
+older OpenSSL. Because the new OpenSSL API, ECDSA_SIG_set0(), cannot
+set curve parameters individually and ECDSA_SIG_get0() returns yet
+another reference, it's necessary to duplicate the other unchanged
+paramater when calling set_r() or set_s().
+
+This patch also stops exporting ECDSA_METHOD functions that were
+removed from the new OpenSSL.
+
+CPAN RT#118330
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ ECDSA.xs | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 61 insertions(+), 17 deletions(-)
+
+diff --git a/ECDSA.xs b/ECDSA.xs
+index 4016368..648303e 100644
+--- a/ECDSA.xs
++++ b/ECDSA.xs
+@@ -7,9 +7,34 @@
+ 
+ #include <openssl/ecdsa.h>
+ #include <openssl/err.h>
++#include <openssl/bn.h>
+ 
+ #include "const-c.inc"
+ 
++
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000fL
++#include <openssl/ec.h>
++#else
++static void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr,
++    const BIGNUM **ps) {
++    if (pr != NULL)
++        *pr = sig->r;
++    if (ps != NULL)
++        *ps = sig->s;
++}
++
++static int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
++{
++    if (r == NULL || s == NULL)
++        return 0;
++    BN_clear_free(sig->r);
++    BN_clear_free(sig->s);
++    sig->r = r;
++    sig->s = s;
++    return 1;
++}
++#endif
++
+ MODULE = Crypt::OpenSSL::ECDSA		PACKAGE = Crypt::OpenSSL::ECDSA
+ 
+ PROTOTYPES: ENABLE
+@@ -17,7 +42,9 @@ INCLUDE: const-xs.inc
+ 
+ BOOT:
+     ERR_load_crypto_strings();
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && OPENSSL_VERSION_NUMBER < 0x10100000L
+     ERR_load_ECDSA_strings();
++#endif
+ 
+ #ECDSA_SIG *
+ #ECDSA_SIG_new()
+@@ -61,10 +88,16 @@ ECDSA_do_verify(const unsigned char *dgst, const ECDSA_SIG *sig, EC_KEY* eckey);
+ 	OUTPUT:
+ 		RETVAL
+ 
+-# These ECDSA_METHOD functions only became available in 1.0.2
++# These ECDSA_METHOD functions only became available in 1.0.2,
++# but some of them removed again in 1.1.0.
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x10002000L
+ 
++int	  
++ECDSA_size(const EC_KEY *eckey)
++
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++
+ const ECDSA_METHOD *
+ ECDSA_OpenSSL()
+ 
+@@ -77,9 +110,6 @@ ECDSA_get_default_method()
+ int 	  
+ ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
+ 
+-int	  
+-ECDSA_size(const EC_KEY *eckey)
+-
+ ECDSA_METHOD *
+ ECDSA_METHOD_new(ECDSA_METHOD *ecdsa_method=0)
+ 
+@@ -95,7 +125,7 @@ ECDSA_METHOD_set_name(ECDSA_METHOD *ecdsa_method, char *name)
+ void 
+ ERR_load_ECDSA_strings()
+ 
+-
++#endif
+ #endif
+ 
+ 
+@@ -135,11 +165,13 @@ SV *
+ get_r(ecdsa_sig)
+         ECDSA_SIG *ecdsa_sig
+     PREINIT:
++        const BIGNUM *r;
+         unsigned char *to;
+         STRLEN len;
+     CODE:
+         to = malloc(sizeof(char) * 128);
+-        len = BN_bn2bin(ecdsa_sig->r, to);
++        ECDSA_SIG_get0(ecdsa_sig, &r, NULL);
++        len = BN_bn2bin(r, to);
+         RETVAL = newSVpvn((const char*)to, len);
+         free(to);
+     OUTPUT:
+@@ -149,11 +181,13 @@ SV *
+ get_s(ecdsa_sig)
+         ECDSA_SIG *ecdsa_sig
+     PREINIT:
++        const BIGNUM *s;
+         unsigned char *to;
+         STRLEN len;
+     CODE:
+         to = malloc(sizeof(char) * 128);
+-        len = BN_bn2bin(ecdsa_sig->s, to);
++        ECDSA_SIG_get0(ecdsa_sig, NULL, &s);
++        len = BN_bn2bin(s, to);
+         RETVAL = newSVpvn((const char*)to, len);
+         free(to);
+     OUTPUT:
+@@ -164,26 +198,36 @@ set_r(ecdsa_sig, r_SV)
+         ECDSA_SIG *ecdsa_sig
+         SV * r_SV
+     PREINIT:
+-	char *s;
++	    char *string;
+         STRLEN len;
++        BIGNUM *r;
++        BIGNUM *s;
+     CODE:
+-        s = SvPV(r_SV, len);
+-        if (ecdsa_sig->r)
+-            BN_free(ecdsa_sig->r);
+-        ecdsa_sig->r = BN_bin2bn((const unsigned char *)s, len, NULL);
++        string = SvPV(r_SV, len);
++        r = BN_bin2bn((const unsigned char *)string, len, NULL);
++        ECDSA_SIG_get0(ecdsa_sig, NULL, (const BIGNUM**)&s);
++        s = BN_dup(s);
++        if (NULL == s)
++            croak("Could not duplicate unchanged ECDSA paramater");
++        ECDSA_SIG_set0(ecdsa_sig, r, s);
+ 
+ void
+ set_s(ecdsa_sig, s_SV)
+         ECDSA_SIG *ecdsa_sig
+         SV * s_SV
+     PREINIT:
+-	char *s;
++	    char *string;
+         STRLEN len;
++        BIGNUM *r;
++        BIGNUM *s;
+     CODE:
+-        s = SvPV(s_SV, len);
+-        if (ecdsa_sig->s)
+-            BN_free(ecdsa_sig->s);
+-        ecdsa_sig->s = BN_bin2bn((const unsigned char *)s, len, NULL);
++        string = SvPV(s_SV, len);
++        s = BN_bin2bn((const unsigned char *)string, len, NULL);
++        ECDSA_SIG_get0(ecdsa_sig, (const BIGNUM**)&r, NULL);
++        r = BN_dup(r);
++        if (NULL == r)
++            croak("Could not duplicate unchanged ECDSA paramater");
++        ECDSA_SIG_set0(ecdsa_sig, r, s);
+ 
+ 
+ 
+-- 
+2.7.4
+
diff --git a/dev-perl/DBI/DBI-1.637.0.ebuild b/dev-perl/DBI/DBI-1.637.0.ebuild
index 70e87656bcea..1676a747a16d 100644
--- a/dev-perl/DBI/DBI-1.637.0.ebuild
+++ b/dev-perl/DBI/DBI-1.637.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	)
 "
 src_test() {
+	if [[ $(makeopts_jobs) -gt 70 ]]; then
+		einfo "Reducing jobs to 70. Bug: https://bugs.gentoo.org/675164"
+		MAKEOPTS="${MAKEOPTS} -j70";
+	fi
 	perl_rm_files t/pod-coverage.t t/pod.t
 	perl-module_src_test
 }
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index 33c0b958f91f..cce77afb34ab 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,3 +1,3 @@
 DIST DBI-1.637.tar.gz 596423 BLAKE2B fbd2100d302f5096d4c4f0808d753c0647504b6d56cae82050e02a3716969d9e5ed8c0a33c58fb860d60e65d164d58b1a81d55dc4e669d5276596b9e1480c7a4 SHA512 48002d77d40c40f0514d464a83f78255dc1a4c5ebb721fc18bcffa06d5f19ad7aec51084d5d8a032e37c6867b5f63176a9b11b5bdf08426f903b841139698240
-EBUILD DBI-1.637.0.ebuild 832 BLAKE2B 7fa5cf251b9275a69f07e0f49c7928af192709b5f8e0386570f70fecaa5f552cc901e27b34ef71544d4d0de82b4934d557064e19113358b6a04f2571725490da SHA512 7ae721e8734eb4f73b5bb17c53e03477f6fa28400e7bbf856781c0c9761a0dd8e8418e300b00be066b2af10b5fda6b1a4f12d57b1f391f6c6cc995e965f311cd
+EBUILD DBI-1.637.0.ebuild 971 BLAKE2B 294afc311cdf9b6e99f6418f1ebf966bf1974fa4542e78299ea2d8ca7243e83359aa4c1706084148a1c31e016991dc5b75e1245ac6b08d7fd45e1c290349561f SHA512 ff226355aeae406296550c3a3707accfacbed6a8594fb63c7b90e954dddde9d1a72bd348b128ce99c1d70d62422877a6a64dc78dcb040242c5d2c53f8c7ca00d
 MISC metadata.xml 6189 BLAKE2B 757acfe005206196a3d5d601d04cd4ffbcd6de7eb35fbf14d3ec08e0adbb6526c51a0f0bd8ecbf3b5d7fcbddcfcf6d3fb3289b0d1ce3c5b346b20b080ed5ac1c SHA512 c6a65731db7bba5615e95729a66f72abfd37eeca78519023695adde39cd2e6ed6ed39cb68496144b0b9ac0919ae86cde1dd9431d82aed5ebcfd29736fd9397a8
diff --git a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.140.0.ebuild b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.140.0.ebuild
index b25978a3e920..a3f66f9b89f6 100644
--- a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.140.0.ebuild
+++ b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Domain and host name validation"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~hppa sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Data-Validate-Domain/Manifest b/dev-perl/Data-Validate-Domain/Manifest
index a47651313878..77b6f3283702 100644
--- a/dev-perl/Data-Validate-Domain/Manifest
+++ b/dev-perl/Data-Validate-Domain/Manifest
@@ -1,5 +1,5 @@
 DIST Data-Validate-Domain-0.11.tar.gz 26678 BLAKE2B 05c43c01c631b0479bf0e53af2f9877c63f328c6f3631493a486b28aa5e2c46406fc5433f73b713745d4fe52e11f81eec38175d2b7949b93913b73ec5e203748 SHA512 871ad620a9c6021bdc25895ca78c12bf6b9f515b3e139864f0c52c9067d65c9f5dad95f21d30d59a57b1a808b373a132cff7f347832705af081d4a435d0872e1
 DIST Data-Validate-Domain-0.14.tar.gz 31962 BLAKE2B 63e2415c96b366197d29d938f14c8c7d5ef06fa31a2ed42edcdcf15fc732c1793b52f486edd23d8a5218a26791e5abc7046801c89cb899eca32d7c710f3f931d SHA512 07cc397559bc412c456e3dbe55d792c4a0e93b3bf297565e26cc9c55919b3f643e8aa2c33a2c418de9264c1305448ffc287776eecfe9d125b3dfe369c4a95ed4
 EBUILD Data-Validate-Domain-0.110.0.ebuild 493 BLAKE2B 7e3918116b79e2601c77de21a253c86f3262ae27ec5a1566b9171a4c6ea79a84e26cc90ab1754b6e0001f702d0482b4b7c32169e9abf2c3d3db15056e018c79d SHA512 415271d3974a27140c332b44740cab4c3cde7b056b297d422c6ee6c99578dc357d843c250209909627302610753c05587b019ce30c34b3a448659b542d357a3e
-EBUILD Data-Validate-Domain-0.140.0.ebuild 503 BLAKE2B 7286cdc33733638f0353c957e0f403b153eb41a2bb5502d1ba9c5526e5bbed2c741a8d8a33f4905ceadff4493b1d63979bfba660bbca970da5ef070cbbd13903 SHA512 08eaa404490ee9e15894eaf54294158ac98d7057b81529e64b1459c1d66569b90470369515aa2ac69ae099d4d7c02b270a60ca5dea40154d95db07a08ebc4ca0
+EBUILD Data-Validate-Domain-0.140.0.ebuild 497 BLAKE2B d68c7475ec5dd5af9cfc6f21620bc8066a9b4f4f62e7d686609bd882ed2e53c04afec9beae8ca92c7259b26ca620f69970ddad6a75702fb449665fae113655d8 SHA512 0ce216c2251afcef1a8bd1ff8bea97c3521e771788ca9d7b801bda5bc1c0fe0f4929260b13dd433a96b72fc401505b796a3fa5a83b9d9d9568e27eaa289b98e2
 MISC metadata.xml 413 BLAKE2B ae739d8caf2bd3f74db8230597351cd1f1d498e8928d1fd601aa17b26061944f162382f0fda0da9536b430cac0a463edbabb560ce86cb3fdd351b32ba6223cd5 SHA512 5e9df0cc461d9a1a048e0a6641a7270198e5f40131bf81d6c2c36a35b07bfdd47090f2fa4065eb33a90433e63b1f8ff207dc82d8f8e64810698cb34edeb68213
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.290.0-r1.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.290.0-r1.ebuild
new file mode 100644
index 000000000000..3d7dc40cff37
--- /dev/null
+++ b/dev-perl/Devel-Cover/Devel-Cover-1.290.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=PJCJ
+DIST_VERSION=1.29
+inherit perl-module
+
+DESCRIPTION="Code coverage metrics for Perl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+
+RDEPEND="
+	dev-perl/B-Debug
+	virtual/perl-Digest-MD5
+	virtual/perl-Storable
+	>=dev-perl/HTML-Parser-3.690.0
+	!minimal? (
+		dev-perl/Browser-Open
+		dev-perl/Capture-Tiny
+		dev-perl/Class-XSAccessor
+		dev-perl/HTML-Parser
+		>=dev-perl/JSON-MaybeXS-1.3.3
+		dev-perl/Moo
+		dev-perl/Parallel-Iterator
+		>=dev-perl/Perl-Tidy-20060719.0.0
+		>=dev-perl/Pod-Coverage-0.220.0
+		dev-perl/Sereal-Decoder
+		dev-perl/Sereal-Encoder
+		>=dev-perl/PPI-HTML-1.70.0
+		>=dev-perl/Template-Toolkit-2.0.0
+		dev-perl/Test-Differences
+		dev-perl/namespace-clean
+	)
+"
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.290.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.290.0.ebuild
deleted file mode 100644
index 15c773daf3e8..000000000000
--- a/dev-perl/Devel-Cover/Devel-Cover-1.290.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PJCJ
-DIST_VERSION=1.29
-inherit perl-module
-
-DESCRIPTION="Code coverage metrics for Perl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal test"
-
-RDEPEND="
-	virtual/perl-B-Debug
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable
-	>=dev-perl/HTML-Parser-3.690.0
-	!minimal? (
-		dev-perl/Browser-Open
-		dev-perl/Capture-Tiny
-		dev-perl/Class-XSAccessor
-		dev-perl/HTML-Parser
-		>=dev-perl/JSON-MaybeXS-1.3.3
-		dev-perl/Moo
-		dev-perl/Parallel-Iterator
-		>=dev-perl/Perl-Tidy-20060719.0.0
-		>=dev-perl/Pod-Coverage-0.220.0
-		dev-perl/Sereal-Decoder
-		dev-perl/Sereal-Encoder
-		>=dev-perl/PPI-HTML-1.70.0
-		>=dev-perl/Template-Toolkit-2.0.0
-		dev-perl/Test-Differences
-		dev-perl/namespace-clean
-	)
-"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-perl/Devel-Cover/Manifest b/dev-perl/Devel-Cover/Manifest
index 724790a94f65..3bbafbedd749 100644
--- a/dev-perl/Devel-Cover/Manifest
+++ b/dev-perl/Devel-Cover/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Cover-1.29.tar.gz 200333 BLAKE2B 78b7ff9f35d0473cb04fa202a23a0f5e03ee182755f69fa765d7bce6cb6bd0d851982247c9f301851697b8ae3ef9571543ffbe5af2ed0406d044d1a8e569386c SHA512 dd2b75a411f67eb054fa16ef0f9d327fe9d41368ef6f0436bfbf13303bf3bc9eb28f6caea101b3b226f7a9d483f2db419a60a39ea8df1733e1e49eb9d39b2c7b
-EBUILD Devel-Cover-1.290.0.ebuild 900 BLAKE2B 333f1395cc33189066490f27a85ee4211b8830f61f3ea6fb6326b2e9b8f8ed2d602ae74f8c7e45c23c7efb8b27e3dd9d54096277624530d941e1fd264e0d1bfa SHA512 cbfb5c1cefdb8b93766d6651eaecc134863130347cbec2629c7871b91ec7e0e0836202620f0179e50a0020df18c189938ff0c88b4cda718733de938d3015494e
+EBUILD Devel-Cover-1.290.0-r1.ebuild 893 BLAKE2B 86e881a471d86ac90373b9c5934f9b355502088806a41a8981364c39a26b9f6bceb2ca4f26fc75f6c5ab9ece26173938d5206cc3f53d2ebb3c1cc4d955c47367 SHA512 35d98b8e2bfa87fdd2a9c756de2014b40adb1adb3a22d29323c6ee27142ce967fc55de3a3a5f07304a765240c2cc52236e32681808f308061ec8e6d3244dc3c5
 MISC metadata.xml 4018 BLAKE2B f8f655f2d3fe0bd9410c7749793750c3aab42eb27b5e008de2b0f794eaa912d32475d568b934aa1956e42e63906dbbd331143ca292fe81affe480bf4b749c673 SHA512 7ee1642d4709ea7e088aef6eb9900a1bee42d9e2d82cd0d10af52baa71bc6099885efe80e2a7c473e853898292d3d5923d166b71990b8985435d6a85d7c789a0
diff --git a/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0.ebuild b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0.ebuild
new file mode 100644
index 000000000000..9c673823809a
--- /dev/null
+++ b/dev-perl/Devel-NYTProf/Devel-NYTProf-6.60.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TIMB
+DIST_VERSION=6.06
+DIST_EXAMPLES=("demo/*")
+inherit perl-module
+
+DESCRIPTION="Powerful feature-rich perl source code profiler"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/File-Which-1.90.0
+	virtual/perl-Getopt-Long
+	dev-perl/JSON-MaybeXS
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-XSLoader
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.840.0
+		>=dev-perl/Test-Differences-0.60.0
+	)
+"
+PERL_RM_FILES=(
+	t/68-hashline.t
+	t/71-moose.t
+	t/72-autodie.t
+	t/90-pod.t
+	t/91-pod_coverage.t
+	t/92-file_port.t
+)
diff --git a/dev-perl/Devel-NYTProf/Manifest b/dev-perl/Devel-NYTProf/Manifest
index f9fdc8afd183..9350086e61a2 100644
--- a/dev-perl/Devel-NYTProf/Manifest
+++ b/dev-perl/Devel-NYTProf/Manifest
@@ -1,4 +1,6 @@
 AUX Devel-NYTProf-6.40.0-perl526.patch 1403 BLAKE2B 34a5a47059f1777bb50a09d774cc3433879e146dd3523c190b46aa63dc93959c7c16034944438d8d6e7dd40e4fb8d865cbb2eae0575708593a8d48f172a3f757 SHA512 ceb987196321b7e08bd8d1b83cff802ae66fc7a82642e9e0a8b578ecc42af7a859da4cc2028112febfbc74b584e3b75f3307be864cc6eacf6fdf9568e574ce42
 DIST Devel-NYTProf-6.04.tar.gz 461716 BLAKE2B 63bc0e46625eeff091deb8339102585997f14c68e453481ebdf546ad5c9a44491bc874967f7cb17c26d1935dc7b1ac18ea84ee1ebe9e8aef0806478e9e7b8335 SHA512 67b5013f4b3e54db743964f91fd8113fbe672be81026aae3375e9bb5376205d735c91ddbde05784a7df235a8e43ef3db2713e396c13e45726ca594e1e76d051c
+DIST Devel-NYTProf-6.06.tar.gz 468188 BLAKE2B bc236838873d1c85263f8e38d499437abf66e92d25ff58c3fc3f522e40c60b469e4b9e9d7ab63229cea84f8e86af7de6873bf76ff06527f72195ff3462344299 SHA512 e1fdab3208646ff9283eb606b856f0c25025479b55eddecadfdb7f9b2a9db144c003713b8abf333d03fb8ba420b7f3fbc885de360cd815d72e73ae3bffc27426
 EBUILD Devel-NYTProf-6.40.0.ebuild 797 BLAKE2B e2dbb2262f3aa1100be2e09a1783afb4b6fcf13d1c53eeee1a971a3d223f678c111ee1df79c5738397c1152dbad2f7b856f0cb21bf056524de017f2d25cff5bc SHA512 28eacaea2abadc026bff1b87863efae458db72a7d6d056617a7ac7cd269e44d5a7aa95e859f45fcc19c49dbf9435fce4ba95d58ad36c0c08d3c9e8cf45db5bdc
+EBUILD Devel-NYTProf-6.60.0.ebuild 719 BLAKE2B 1fa34e743dc85c075dde0984ab95f954d7a8233d88151a4f000d20420b8330e9458c57869c8529c5bc0389de0378eec12e9718510cc2def32edcff1842d2450d SHA512 06ee44dbade33feff5ed13778d903e08bfb0f2105f62bee1a8e44b11a6398b9d4eac679c4e51df92fc58d2a83f4969681b48de45f59c30aded1674fdead9c794
 MISC metadata.xml 1236 BLAKE2B 4e79df0f41de5a49bab1992f6e8db0212b6befe5c91fe4f09dd70400b7fd8548b6130265b6235bc566e09385b7e92aecd7529aef4c14ebe3ba81ec1c9dfaeb9e SHA512 c113998d635e62bd13406b2c8112485f6b3bb0bf7efcf2f60d50eb176ed82fe4ed85263545c7ad5d680b752c12523ee7e1cf30eb4c9d3e20a6c256f89be75361
diff --git a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
index 1cf7a94febb7..b593ce64b458 100644
--- a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
+++ b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Declare version conflicts for your dist"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Dist-CheckConflicts/Manifest b/dev-perl/Dist-CheckConflicts/Manifest
index f5997de44f2c..9d9b0f47f656 100644
--- a/dev-perl/Dist-CheckConflicts/Manifest
+++ b/dev-perl/Dist-CheckConflicts/Manifest
@@ -1,3 +1,3 @@
 DIST Dist-CheckConflicts-0.11.tar.gz 19964 BLAKE2B 372e5d92912711fe87f4a772ed7d6a6613f59451241cb9eb74d277a11953aa8810033fcc639eff71e32afd04dc5b3ae573f7ce28354c9bf8e469994834f3d125 SHA512 6c3f8546c1c7904bbc2a3c1135d145cbff95997c3032e9129afc98bdd98578dd9219af444f357dd8e9b1f08442a2fdd9d6f7fe8768f8ef165e71570f5ae246ad
-EBUILD Dist-CheckConflicts-0.110.0.ebuild 737 BLAKE2B 0a3d6b4cfa7815b277fe4f69bb75dcc5a041f42fa430ac7dc537acb5cede31f738aa3af94b378933d13b868810008c2e09c7b9f4c0118e9ad0332784b204e962 SHA512 bfe0601483cdbee3656565aafe61765dd3cc8608fae20d91c930ee325f2a3db31a7e8fdb5a1bbd903701b7ca1c5ad55ed0894d175ce72fad0e2bc41aa7e28ebb
+EBUILD Dist-CheckConflicts-0.110.0.ebuild 736 BLAKE2B 420d67634707e97578da451b621f86c249c17c6a40338b81ab0e57171542c07f4b50b2345d6b70cc71932caaca59527e77cb65952904e5fb46892af0393cbece SHA512 2e15fd8abcc0d86d43565f88f7c4185356d23bfad5cb84c0fe326651161c7101c96ce66baa241115743e6b8d1b277e3f147292707bcf14fef38988b4d72ccd29
 MISC metadata.xml 410 BLAKE2B d9c593d3bfa19b0cc2221fb0d30936d857aad112bf0634b74efa4ddad89fba026cbbeaef9d5ecef756e81c41e908308c5f9cae6ed7e976c8603e6f23153e3ae5 SHA512 8a5c11c3c5d7da4e903194a7a3689554f02d24d194488639ab185d1e325949422923f5a8be344c9ff6d9797c299c24f8e7f69525e0ded541993114a6fa677f18
diff --git a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
index 11ebabf2c17b..f81b2e6972bc 100644
--- a/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
+++ b/dev-perl/DynaLoader-Functions/DynaLoader-Functions-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Deconstructed Dynamic C Library Loading"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DynaLoader-Functions/Manifest b/dev-perl/DynaLoader-Functions/Manifest
index 4faa801a99b5..40445adbffdd 100644
--- a/dev-perl/DynaLoader-Functions/Manifest
+++ b/dev-perl/DynaLoader-Functions/Manifest
@@ -1,3 +1,3 @@
 DIST DynaLoader-Functions-0.003.tar.gz 9797 BLAKE2B 68e2a194d192adbd9a146a4fc1a06c04c9a7a9fc746573eb14faad2ff7ae16d7f7a71a08f329c29abd6a4dd39c318109455c36281ebcc645a3a05742c5f598bb SHA512 58147714352fbd6e90bb42599e5967c9a93dbb899a587ef8a2a64dd13fc9e24176e17b3c2b870b5fa846b077373ca9ea27bec49b31113a8d9cb7d800f6d29599
-EBUILD DynaLoader-Functions-0.3.0.ebuild 596 BLAKE2B fe762a745549b384f350e5ad11e44e6d9a3186a643f4d1a53898505174013604403b4529b09602253bcc194a24cf799524a4107edc54b0e5ebfc8f44f2d37ec3 SHA512 74f569d7f4de46242474b6713526ce5cd25a0749f7985f22471358f7e94ded95d207e19a5c6475f5fd198e6bc02c128af3aec473045cd9f991b69c90a91d7fdb
+EBUILD DynaLoader-Functions-0.3.0.ebuild 602 BLAKE2B 9eed432a06c94317e334470c6033da2e183e75c488007c5e319279262f3069be287b78e6a31c10c8ff7651e35a6bb2c712d4f69a22593922a29bf3a03dc62c20 SHA512 42dfe971e72f618a4735875b0bdffe94003e564d80ccf687f820fb41cb8cfd850173728c8ad111a3e7d0884dcd36a807c49954267d4654770d6149d8050117e9
 MISC metadata.xml 412 BLAKE2B 8474df2d8a151d3faf87bac779db59929532c6940509f098005e64cdc2afd526bb5d7ac4db02cea96c0e05024b4f3a3bdf80d2c7be552baa088bb2e2a27f5a96 SHA512 cb29e51586e4e26aa422c83314a537015b27129d880825bbcbc6da45075b4d87c6a65383f79a541b426269c94b9aef677ad595b78a9754d158d79e4b084d8536
diff --git a/dev-perl/Importer/Importer-0.24.0.ebuild b/dev-perl/Importer/Importer-0.24.0.ebuild
index 8b9c094535db..d270b63d07cf 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Alternative interface to modules that export symbols"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Importer/Manifest b/dev-perl/Importer/Manifest
index bc2213113248..8113e6cf47fd 100644
--- a/dev-perl/Importer/Manifest
+++ b/dev-perl/Importer/Manifest
@@ -1,3 +1,3 @@
 DIST Importer-0.024.tar.gz 41264 BLAKE2B 21a839e1e3a3d5757d17be05ea6275ad8b9e248debfccacee9551b47f27df81715961fb63be8a28a423041365717d65d9a9c75c6e090fbf7c69a84d50fef762f SHA512 f368f19a63fd52b88886b1ba6d51716050db8f475628238d16d2962ab7d6c21d6818205a82c86cc7f254736eb1c261dd6abd606dfcb16ca675e84898d03cab32
-EBUILD Importer-0.24.0.ebuild 598 BLAKE2B ce96d6cbb7ad464e23e32fe8a0ded5eb693d969c92fa288902dbfcdd612d26e3aadf45eb2488b21baecb65f0d0df338e7093a1c575fe59427f6722ea1502ea71 SHA512 f459ee5c119f09c85601aeb64eca8005d7419f991605b56e6ec721a0a49f11a373a59c00b2972f37ce15fd2d64eae2f3ceab0f828fa169f743698aadc7a20e57
+EBUILD Importer-0.24.0.ebuild 595 BLAKE2B 4d11fa7db0a757197dc1ca7d0e23e132d5164e999efb98aaa46ab610c3b233c83240cbd8ddcc57bee907e64c7c418f7dbf7457b5f1bd2ace5c14aa73160c0ed0 SHA512 f223c8144dfde69ae592e892ff636288baa504bb02b1d0678ca7e86b50e873d1e37fb89f69054fdfc6d63ad1af9e9a985dc907406a8c33e9bdfec086b0438620
 MISC metadata.xml 387 BLAKE2B 097a448901783cc8e799dbb2d9ef53e40656d4f54774fc2bf5c740e394a6be4aae57331a17bac1848fa382c09360d4d416f9da4f5e5204012833e6014e8cdc5f SHA512 6716fc7a7311d4119c708230f4cec828655d122e37f6e70e29d60bf75c370564e72382f474acda87f29ad5660f93413653de31c38908cb19157ec35c5a0670af
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index 661539a63965..843167e55242 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for accessing the GNU locale utilities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-devel/gettext"
diff --git a/dev-perl/Locale-gettext/Manifest b/dev-perl/Locale-gettext/Manifest
index 08f6dc239ed3..a97a5aebf317 100644
--- a/dev-perl/Locale-gettext/Manifest
+++ b/dev-perl/Locale-gettext/Manifest
@@ -1,4 +1,4 @@
 AUX Locale-gettext-1.70.0-no-dot-inc.patch 2576 BLAKE2B 026fe094e7cff34eb0192076a333349f6ec875c59eeca21658a4f16b8817b796b4830d5540ad77d0ca71d47dfbb5a009256bf1d8ccd1d2fb6da91be72ddeddc0 SHA512 af169db6991e968e29dcc760030919cc619e4bd9f13b4f20d707914674aa5c53dabeaec0e9f29254dbf9250fc96e6ace36a86a50b1dc5af0e1573bf4485047d2
 DIST gettext-1.07.tar.gz 8651 BLAKE2B ecdc105303c0b494d53f985ca0d789d75da33abc85e8579a43af1658d6faa18e2564e18fc6613548acc2add4ce847d03769c1fbe29dbb760b9498f4b251cbb1c SHA512 d3716a597d586ee2ff29472ca7b13aaf67770299de31e5f12abafebc879bbe4a1e1dbc0025cf4f3dc29992955f26cffc3be387d974c3911af095d5b49e67a1c6
-EBUILD Locale-gettext-1.70.0.ebuild 646 BLAKE2B 56fab0baf072dc57657dc1ce5115cd8607e3b19cf654fd5ec74ee04d68b30a5b89e727a93b23ec5d206c10005395625948949b6d4911702231ba62655c0999c1 SHA512 f5f6d60625706217648a2430c5a8d074729fd1e68bb3330b5c321b0fd901a9d9a4c8446f337b0858b4b21ef17522a85fae58f0742fac9992030e81a2a56e597b
+EBUILD Locale-gettext-1.70.0.ebuild 655 BLAKE2B b98527e7433c12290382fe36d78fe13e49a260624f3c7f999b32d8dca1ddb6c3124dca9d2621e6aff9eaaa0213827392df4545b0a78117f068a2e64623be9a40 SHA512 73d6e1c9086c6f3b810a185aac0e2cce0100840c4fc547d7852d9a4562f741e18a25c7295d1d7ede5da9c0d962fcdac92e7a699928586d61d4dc94a8c8ec4af0
 MISC metadata.xml 393 BLAKE2B bbff5a6ce4a93c66bbc706cf416835858db71b6ce566478b67af59afe2cf42057ba053ac1d23721dce435c47982437811ebd9cde52f91474116191efab62f316 SHA512 368d7a37c00a186733e33eeaa01c12fdfed50f2f45c66bc88d0dfddcfd063aacb6c0953aa76737d8f9f5c2ed392e0eef41279975cf2cfad7fb423b8ca29592b0
diff --git a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
index e88696e8e1aa..d832dc90655d 100644
--- a/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
+++ b/dev-perl/MIME-tools/MIME-tools-5.509.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,11 @@ DEPEND="${RDEPEND}
 # tests fail when done in parallel
 DIST_TEST="do"
 
-src_test() {
-	perl_rm_files t/02-kwalitee.t t/02-pod-coverage.t t/02-pod.t
-	perl-module_src_test
-}
+PERL_RM_FILES=(
+	# Author tests
+	t/02-kwalitee.t
+	t/02-pod.t
+	t/02-pod-coverage.t
+	# Fails under FEATURES="network-sandbox"
+	t/Smtpsend.t
+)
diff --git a/dev-perl/MIME-tools/Manifest b/dev-perl/MIME-tools/Manifest
index af18bba6dfb2..28b5468c21d0 100644
--- a/dev-perl/MIME-tools/Manifest
+++ b/dev-perl/MIME-tools/Manifest
@@ -1,3 +1,3 @@
 DIST MIME-tools-5.509.tar.gz 423714 BLAKE2B 7e11da6f97468521d2e95b9ed71941d91559844a1775597c27f60288c04daf55607a8d962afd6bdf8521187930908c97815fa5664a448d1ab902e3740197cc69 SHA512 0407b09916144eafbee0c75758306e0f44c27db0e8aabf033267f9903f676f0415de99927dcfdb69f9e9d4123d63c280f526dff92e0d97744761c888df90667a
-EBUILD MIME-tools-5.509.0.ebuild 854 BLAKE2B 9afb293dba43c8206aad355e55c92381649a69bbfea3e914356f4886a19b34c1401aa1dde00230faf705858b0664bced3e562c46a93013d75baeb406f578d9ad SHA512 c88110381095cf0a7f620a5211a93992a04850ee448702abe63cca99631aa7d0163395e84505791dd0c4204a78ad1c201cff98e95b1a6c68cf4daf044da744c6
+EBUILD MIME-tools-5.509.0.ebuild 892 BLAKE2B fe6bf45ce264b5f27ea43bde017c41facf941bd4013e7222b1800057d8f44574a81de5d8cac1b84557a6e143a287ca5faaa9c632eec7646cc5d205840cd64486 SHA512 e4bd64f1807a621cc4890b7e1e3649e790c4dbcf88a467db1aebe1de1d1af9a473ed7d5fbb5514a057b65ccc98a7546913ff2db1e4d077fdc5fc00b24edc41bd
 MISC metadata.xml 2236 BLAKE2B 9950d46423e80c5c4120ae914bb365c69a53c6ca2012530395bbe55234043e91cb532cf0e9235a0e42df0d2483aee932863a7e014a57293b14336a05446d2389 SHA512 b4159779927c61b05f0cccadba0261d2be9566abb6fe102deb1003446a2767dc8abc44093df209e379e7ce4e2b976f7c51e1b04cb59b9d6e3e7c01aba9328384
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 681e6b0d4d29..1e09180c15e0 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Math-BigInt-GMP/Manifest b/dev-perl/Math-BigInt-GMP/Manifest
index 30dc2247396a..a5a0ff8c45fc 100644
--- a/dev-perl/Math-BigInt-GMP/Manifest
+++ b/dev-perl/Math-BigInt-GMP/Manifest
@@ -3,5 +3,5 @@ AUX Math-BigInt-GMP-1.600.200-no-dot-inc.patch 1562 BLAKE2B a85082e9f16166227683
 DIST Math-BigInt-GMP-1.49.tar.gz 59712 BLAKE2B 12270212306b5a62a549607fc972f68a5945c0bf84fe4ed5257e0c381ce47d8c5084bddbb2514e2e430536a5ff6c50df13f945aa9531ca903ce67ea01944cf0f SHA512 bed7b1670de31b40203f2026be7245dc3650f77e12e4803af78751aba95488de5b99f5e23dd59ac7f4ed31687c47a2fb7a8c5aa8ea1355676a5bc5526501bc5e
 DIST Math-BigInt-GMP-1.6002.tar.gz 2286788 BLAKE2B 2538a0466458162bb7cf2f98c6233a7fa97bf30f3c9a92e82e0c266c9b1c6735dfa8a9310bb2009ff942edf2f10918a28484dd32a76f5ef6cbe7bcdb78de007a SHA512 1c3a4a616bfb386e246ca7fd784954c97fa3a20997db0372e7f4691896e5633e2abb9d9ca42fb781a169d10d36dd3a59759399485a1859cc95c4cf7ff4e5ca09
 EBUILD Math-BigInt-GMP-1.490.0.ebuild 553 BLAKE2B e449fbfe488f9b5f1d866804b21d8a4086bbaaf49cc989fc67d344371ddb14030e3b127b76621e084d26dd35034cac24c289ba893155a54093f9f2c95987d161 SHA512 4469bd6109daa16bd6b041ef8c4dfa6df56c619bf93cbf6e8c9824e2b043582fa0f88f19ad966dea7ab11f71c8fdcd863f45d61dcdb17bd9dec174831d69dfeb
-EBUILD Math-BigInt-GMP-1.600.200.ebuild 791 BLAKE2B f217c2a73dba661fdd0e2b58d14d040378383635d81a7e28bacf3a9a91374f8009253546d5f1b7b2f93f9a0fa88804d2248f8b70678fe446edfd8a1137d3be1b SHA512 4f902890ed95f01299163f178365932552c9fb45c751313f3c284d55b991fc388419b4ec074ad26ce7d18b5f1282f78c0875919402aeeba7e76c5b0710e24482
+EBUILD Math-BigInt-GMP-1.600.200.ebuild 786 BLAKE2B 1b19250378d3371aae33659837b61ab7ef234ebff913cdba8501b3ee021fe63f7e59a7b12d5a80147dd07f5a59ac9fb86db75c9720b9850ba8aaa3d062e74216 SHA512 8a5255c9fb8d8841dc29f68705c9baffd7100e8598a510fb9f5c0ebcaa8b8d84aa736ec002c122d3863c5463f8b39f1eeb8951bd327d626a8692bde0ccb8fa1f
 MISC metadata.xml 403 BLAKE2B 0fd58b63e771eabd3c0160a284d950ecc0e4e2adb1a6f11b75e2ce2870c1f7673fb3cba4a3a2dc62ad116d693acb71e5546bda5888577164666ed5edaefa73a1 SHA512 d7e06c54417ec52a2b3763f972e2b204c15582f56cacf182f7c40667802ccaa6f345930cc4568ce51dcbd188a7eb9b4b359d41eee093323e63f95f0fe6c6ba8a
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.200.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.200.ebuild
index 15a6aee6618b..d4f8be9ca801 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.200.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.600.200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the GMP library for Math::BigInt routines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-Domain-TLD/Manifest b/dev-perl/Net-Domain-TLD/Manifest
index 5e7116bb1dcf..0009f58b7ce1 100644
--- a/dev-perl/Net-Domain-TLD/Manifest
+++ b/dev-perl/Net-Domain-TLD/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Domain-TLD-1.74.tar.gz 36300 BLAKE2B 7dc4a302b2ed3002dbc40dc6cd1ad1948a8eb53a246eafe7a06f3e0932b61c6f8dddce20a7c6473a8ff48c230c3e8a2de44f1d24fe40c0e45728797ec3ab548e SHA512 40e9e4776b078c525e886e6f7c5151aee44ce9187bb348128221927c8c92ae72318328d420a3626c0b5a1c05a742e4fefe8ca1d2eb4fac6a2e74c65ebc1c4507
 DIST Net-Domain-TLD-1.75.tar.gz 39719 BLAKE2B c6b68374e7d738d4bb73e0a59e291c9adb612b8c1d3ae25db29563e5ff9566757a1fddeaf5a3973cff4f4d890d0038d56f78c267aaf19eb91e6a2e1fde300123 SHA512 88b090f427e7fccd8394059b643f260a83fe9ec3fd6741972ec388325bb8c178d9d89fc8da9b1338441972e6744117c4effe3551c2c3f95d52022496667fa4f1
 EBUILD Net-Domain-TLD-1.740.0.ebuild 440 BLAKE2B f503def8407e7b5fb4d37136ade6fdc960d047b338f593db5410e5d04f05eb01beb1230d4649050f9f104ef8bf42a4ecf42063c79e11646ec385572a0486d6c1 SHA512 b51396d824c895c27f296be583bafb6ec06bc41f3203cd81a19c2985c04f4fa223d282be4d461c91137a92ced89135b648dc6472a741e30bd6af63855fe3dcbf
-EBUILD Net-Domain-TLD-1.750.0.ebuild 572 BLAKE2B 937b671ac165df1948db2a8aba5e6694c08c3501ed3af110618742a702cc8d15dbb8618d07d0fa212ac4977843e0d1367d8961820b6e06b1bcc6e23e5c8effa6 SHA512 2c307d83f44d22aa7842243545e1691224aa31b2bd6279775551148eddbd4915c94cef4d96f2a5de5950122f9880f8de76dc88d722cff217c019ebcfc694344c
+EBUILD Net-Domain-TLD-1.750.0.ebuild 571 BLAKE2B 80a2a9f9abe4d6cad251a1a8488ef79ab3d0d59a6d6bfb4667f8835ffddb3c574222842c9b34a645ca8505bed86c7cc7101a59ebd9a0748a4bbee6334cac7672 SHA512 a06367a24650439e55edda43b0481055d6f2813f1fbfc4d1c7a056f03dbb249e8035b7b1bc535761e8ea20f599e0d5c89cb8d7e1253b4f0a4005c87ad1b81a38
 MISC metadata.xml 401 BLAKE2B c448963ce478f79c767b536e41758ff64db2d0976c0f2384571c2edbc2a697d0d5add70aae603946823eb9f5fcb6fe9436a6dd5c7e08319b29cc93db9047c21a SHA512 2843912ba604beb75b986da3e4c24ce959db67bcbd069cd47dfb535f3aeefe9209d4381b705bbe1996617fcb438c432699cab9f85336ea65436e78b174ae1a6c
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
index b4b07290e07e..ddd0c83312db 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.750.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Current top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Net-IDN-Encode/Manifest b/dev-perl/Net-IDN-Encode/Manifest
index 16eb93705f76..6ee758a4bc0c 100644
--- a/dev-perl/Net-IDN-Encode/Manifest
+++ b/dev-perl/Net-IDN-Encode/Manifest
@@ -1,5 +1,5 @@
 DIST Net-IDN-Encode-2.303.tar.gz 432454 BLAKE2B 9a5994a17ce5d81b1866db4cce3801698be97436413a28b291796ff68dfb608eaa95415f8e435f4e635da45318746c644ac85f80d1875ab21877c119dace2a6e SHA512 3053792fdba9dfa5239b20f21f8b9922d438a5e247cc3066d5097df588ec3fe2800b013c72dcebaff847468fefeb709fc2f2dbb8c2e984a384a2d66aa318d379
 DIST Net-IDN-Encode-2.400.tar.gz 432177 BLAKE2B 1377340423c72775414fd27d2c140d3eaf231d782f44570998add049f18a7904b0f24514bd1d79b88d0c828fbdc7974e702e33af3a05a5d1c22c00193e5890d1 SHA512 ea58d8825a9552851a0cac898744cdeb0e99e48f76809b58e7586d6992919339cc670506584df2d81c4e98cf7e6cfd1e96330e00f0e216f33033a743cb872d94
 EBUILD Net-IDN-Encode-2.303.0.ebuild 592 BLAKE2B 3c637d4695bb7b2d40d64c7a9ce891de1296d6c65155fb05c25fe0233a7ce2b6c89fb69276cb26b564d080ebdec6c6aa613ca81ced19177b545fd4a958924b4d SHA512 819290b3d217170bdf6d8daca030663b79590164337475dff856db3868302cf7f8211dd493f50870ecf1021412fde46e4ccdf76d1be6dbd105d4c731041fd51d
-EBUILD Net-IDN-Encode-2.400.0.ebuild 678 BLAKE2B d96d072128f70b377adb88b56a65fd5e46178e1c1d5e56ab192bf35bf5f0769e96744a9bc1c61e66b325729e2e744d3800739b3b1c5b3e973e9e2d06dbb64604 SHA512 0117d54a86c3fdb356d13d85fb7faaeba8807fc1482b23e82b11f5b996c5029f605ccb3a14e38788fdcab0469532f8bc84757882860617a479cf918b4a533558
+EBUILD Net-IDN-Encode-2.400.0.ebuild 685 BLAKE2B 84bd008dc0114ff5c999de3b5ff0f79cfc90ab27a0dd86a053df98d21b1cfd28768cd6553e83f473874552041d11c28aa306030c7c811ade4fe6a0a46ebd3c56 SHA512 510fb506e3045ccf54013eaf5fc20668e404a0b9ffcf7b7e2db1fdbd74ae7d64eca6d08868510252cf27ef1341c09c7b9b3a1dc3166b5693f26514ccc36ed0ec
 MISC metadata.xml 597 BLAKE2B 36725313df1fd525773e0b5df39fcfc8674c5d05e4d859c9a11cfae9adbd49c0a3e8a1f670134dda1932c72ce7a9d520f7429f4a24f8e290b851385372902d88 SHA512 d709bc4a5f6c71d2840c8e4c5d765f8d54e6ee1ad635612d1a0074ca8132afb618391f856a709423ccc47ee31608311feb48674dbe7c76a4ea01ceaf4dd15f65
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
index d66b098a95c6..f473fadc8b3f 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.400.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-LibIDN/Manifest b/dev-perl/Net-LibIDN/Manifest
index 9b46ee80dc8e..49b78c666f31 100644
--- a/dev-perl/Net-LibIDN/Manifest
+++ b/dev-perl/Net-LibIDN/Manifest
@@ -1,3 +1,3 @@
 DIST Net-LibIDN-0.12.tar.gz 14262 BLAKE2B aba0a67eba74a103c51ec95a859128e50390b48cf97f4c6828d6ecd869d89ff7dfe37f103053b45f38c2abe3852a7f2a8f63dd1f699b39db4d6129226c4b8e15 SHA512 2c80d0e3d4635e225e8866a1ef6335e3b8642662101e89fde6529aa07acc1eaf8adbe20fadd1d44898651f9d67a3d00c11ff71a22a2aa3027e81643e700d79ee
-EBUILD Net-LibIDN-0.120.0-r1.ebuild 514 BLAKE2B 50369f1124656b558faa42cb9184e29e4db57ca7cfe5d5e3757bca6003a7259a02f580081a96699a2654196d91c3b4d9057dafa730722212848091c89466ec2e SHA512 1eb8b4b42c75a0ea9e1c87c6fe043612aa79627b95051351b29c045876bb204a8441862d9f059dee9eb98adf9180494cf9a9670f5bf3c36aaf8967ffe36c74aa
+EBUILD Net-LibIDN-0.120.0-r1.ebuild 521 BLAKE2B 7a7c0c0c79c0cfce68d63d11afa2f9364c02bf3338e11ca114f30343601f4d76c19463f4538ce921077c39c54e096d92f9cf86d93fd590cffdf0ff0b558e2fb6 SHA512 496200ee3a6a82fe9052837578f15f62def7d07d62c96c6e34b3125b5a3d9c5035e0b697b9bcc27255138fe532876422178397ff4a872558315f583bb199d2f1
 MISC metadata.xml 392 BLAKE2B 7fc5fc36e39da13513bf22ad3a3efacccfd7c919e6dd2c80542c7c2152e981a3a2085793b2f3021464d44a26b63e7cec426aa50688aa16ff4ca4aaa3eafb476d SHA512 af2500d22746fb98a00c8e7d2c83d5c10a2257b18fdc8e7b7f66e302459a660f842c247c4cfdcb9c4bba51a7344f965fb76d3f43af6742c6a7e3bd31caad139f
diff --git a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r1.ebuild b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r1.ebuild
index f0d4bef7d209..335f1341af4c 100644
--- a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r1.ebuild
+++ b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl bindings for GNU Libidn"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="net-dns/libidn"
diff --git a/dev-perl/Net-LibIDN2/Manifest b/dev-perl/Net-LibIDN2/Manifest
index d040e6a91e8b..e370ba6f6c69 100644
--- a/dev-perl/Net-LibIDN2/Manifest
+++ b/dev-perl/Net-LibIDN2/Manifest
@@ -1,3 +1,3 @@
 DIST Net-LibIDN2-1.00.tar.gz 23603 BLAKE2B 61d16265263e934c45cbed9427636e73a2abae8f41f7294d4b682b0129c2a7bb2c316f522b5ee36988a0d860b53514f6c44d360c12479f26887a0d2873741993 SHA512 0b0c3bba9b2c8e748fd416ba465e6b4eb76fbdad1ee2d3459be032b7d5bdb0706da97e8ebb9de57a92acae06ce84aed357f5baa516ad40268797abda6d7fb38e
-EBUILD Net-LibIDN2-1.0.0.ebuild 629 BLAKE2B 2569dffe239fba590918f41ad565e0f08071bf0bad632ecef831984a00b5e9094769b393abe3d6b9fcde61db9e2a80b421c2623f32beb19eb2ce8695e331b59a SHA512 0ee20ba8f901b0bb70367df59489ec5800c8ce41b3733eda006e3f5c38c5b0da3a0dd1852691e67e790c381ed5c68fc9c95e8c63ed5bcce5d94bcab82a147132
+EBUILD Net-LibIDN2-1.0.0.ebuild 631 BLAKE2B 15507fc48940426be2477cb50bd2e195d0261039fcb213c3736c2feca878e10988aab00a58385c1d74ea39a4007486b4d503251c4d3abcc97f26cedc6461fb4f SHA512 eae471c7eec5956e79aa15f7fb26ceb0be0b5f953c74d330ac2e5d52c339adc6c83e6c61b0d8db96e0ae1dda88161b89bdd8b5b18a2ec6b9ff2c3412dc4613aa
 MISC metadata.xml 394 BLAKE2B 0e04894c656ca9bb0623be50369ef992244fd627478f8e23232fe937123df5e8f136247e6d2708dcaa1e9e475e6967466a756dae6c1b39d243b7777a36eaa81d SHA512 66adec760ee1638b405b6f14878ed1239a4efa0dc3708ae88c6a623138bcf765175cfd8a0a2a7a63ad606cf249e35496371a56e1bc257f7325dffc9fa62cd4a0
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
index a0851bad6229..d7df6b24a255 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
-RDEPEND="net-dns/libidn2"
+RDEPEND="net-dns/libidn2:="
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-CBuilder
 	virtual/perl-ExtUtils-ParseXS
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 4c7264343d5c..f290e29123d6 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -2,5 +2,7 @@ AUX Net-SSLeay-1.82-fix-libdir.patch 1060 BLAKE2B d348bc4bbf3b1dcf05b676e3a28c23
 AUX Net-SSLeay-1.82-fix-network-tests.patch 1033 BLAKE2B 88978bf64b1f6e0fef97176253aa8f20187f74611d5e6121b8ce538d99c31516d4855bada6ecebf753906c65bb96a4abf37f9057934cfbe143a8185599ba48cd SHA512 caf76f1173ebc00e7a5edba5fa19ce25fd403dc9a35402fe2d399197805eae8e558b57c2bc313f7f1dee16ece03a3ed9146456f884890587488647f9d7c84673
 AUX Net-SSLeay-1.82-respect-cflags.patch 902 BLAKE2B e95a0c49ba70d820ff419a2ef7fe1d5c23477ef5ad075a03111b3431cf7b3cdc22fb26aefe3af886ce6f7d5b0fc309eb01843c2645b98d854759318ae7912898 SHA512 6db7c6549bce36d6a1d41e31805e387ab871271a843a1146de818c3c417b866c2c3e65f58a0e0af1f8a0e80703df8b15b9822502d03ee9aead49cf5620a43f75
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
+DIST Net-SSLeay-1.85.tar.gz 418349 BLAKE2B 0f639145e5be9406264cc7ef6240a30e0d62e631bfe29b8d1cbc85ab3bf721e8d344a8472faaa87816a5d148cedd7f13faeec925d0632fc1b75ecd1c5c44f6d1 SHA512 74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b
 EBUILD Net-SSLeay-1.820.0.ebuild 1542 BLAKE2B 00b1596f731ce7782aa95a19eb9d7c9467d7dad0db05a1cb85e97391179fa844863ee8cba8117c067ee561fd5e234fb9eeba90b6689d4cccab4deaf315004ec9 SHA512 2492bf29fe40fa770273085042c3cab2110b185eeaf0ca6bf0cf12de1d8aa8c37bd32c221b8c877c628caeb5801c3f7692da01d4db0ab3cda5f279c3ff421659
+EBUILD Net-SSLeay-1.850.0.ebuild 1668 BLAKE2B ba29e687dc06885ee473143c0cd9b60d2cbdc9123b63ad04ecadc80e8e82ce82be380cfb20c94f74874d020ec2768947cc353f475cce9746dba44ea3cb8e7f2c SHA512 82f09f01c6d223ef493170ad3c4393d0d937bfb35b91a753a51d9fab606ffa8f18ddaa1d386c6e1de01ca94914a84245b172f8c70dbe56b7d4a256916f04d7f6
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.850.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.850.0.ebuild
new file mode 100644
index 000000000000..dd754787ef04
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.850.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=MIKEM
+DIST_VERSION=1.85
+DIST_EXAMPLES=("examples/*")
+inherit multilib perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="openssl"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl test minimal examples"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? (
+			dev-perl/Test-Exception
+			dev-perl/Test-Warn
+			dev-perl/Test-NoWarnings
+		)
+		virtual/perl-Test-Simple
+	)
+"
+export OPTIMIZE="$CFLAGS"
+export OPENSSL_PREFIX=${EPREFIX}/usr
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.82-respect-cflags.patch"
+	"${FILESDIR}/${PN}-1.82-fix-libdir.patch"
+	"${FILESDIR}/${PN}-1.82-fix-network-tests.patch"
+)
+PERL_RM_FILES=(
+	# Hateful author tests
+	't/local/01_pod.t'
+	't/local/02_pod_coverage.t'
+	't/local/kwalitee.t'
+	# Broken under FEATURES="network-sandbox"
+	# https://rt.cpan.org/Ticket/Display.html?id=128207
+	't/local/06_tcpecho.t'
+	't/local/07_sslecho.t'
+)
+
+src_configure() {
+	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		export NETWORK_TESTS=yes
+	else
+		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
+		export NETWORK_TESTS=no
+	fi
+	export LIBDIR=$(get_libdir)
+	perl-module_src_configure
+}
diff --git a/dev-perl/Parse-RecDescent/Manifest b/dev-perl/Parse-RecDescent/Manifest
index 2a70e2cf41d0..7a756ce6cb45 100644
--- a/dev-perl/Parse-RecDescent/Manifest
+++ b/dev-perl/Parse-RecDescent/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-RecDescent-1.967015.tar.gz 176996 BLAKE2B 016e65f95aa8e15ebb384005d996909febd0ade6f6f23a13f95d4a5b558261f307f80564c028849d16f10a39b216bfd562c4fd8c220e5cbede165fd4fc1d05e8 SHA512 38adbfc9a88f09d0465d862b845f48c0921ce462ffccaa7ce8b5f1b7090f33f70e7f00f9ee787fd698b5539804412c44f03e7942cf675d53a17a84c3510e5aa4
-EBUILD Parse-RecDescent-1.967.15.ebuild 898 BLAKE2B 851a9fa5fe0a6a4056ce07974f419b8a1bb9c7938ee1670a869d1314d09f7ce9733e6520833fdeec457ebc91116351dc5cb9b90019a62f115c28515ccdfe999c SHA512 8637657faffe6dc3880ba1630fabf183d596e71948f8b147fce6ebaeb1d192313e797253b6014d1126a1971eb09017c214516f6d798e7c055fce20d8b15383f2
+EBUILD Parse-RecDescent-1.967.15.ebuild 897 BLAKE2B a8645be1b4e4828b8ba1e687a94a1da335f4a7e0d2a9000d298621810c9170b4476b9b65318b5d107408694570ff358a3c0bdce110bb6c23907615e59f994568 SHA512 22cfeaf12fed7e9a29b308fe95ed7b35f588f338ede9d6977717cfcaa38bcf49428c1f2c6b7ec40eb3f52c61e568f8352da23191e8f3342db92e33f1780c4443
 MISC metadata.xml 1669 BLAKE2B 4d6de78c4df041e7fb262a850f68c9c3d4a5ac4e30bf98c90b8292743b061a9dca24831ecb3bb6560b79bdf19c362cd6a19e92e8ce487b6565c3202c30c1c7d2 SHA512 5d50c5caa5b710ded5c1655254fd86bd7cc4e8cca9c3b8e8d2cb563028875a7c59955809114daf98c8c5cc34da3c49f67a9b42b591c9b128c929489d7bd1eda6
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index a2ef72e3bb3f..952524e14f7b 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generate Recursive-Descent Parsers"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/Path-Tiny/Manifest b/dev-perl/Path-Tiny/Manifest
index ac4e53e371b7..5e8e6e1b10ca 100644
--- a/dev-perl/Path-Tiny/Manifest
+++ b/dev-perl/Path-Tiny/Manifest
@@ -1,3 +1,3 @@
 DIST Path-Tiny-0.104.tar.gz 93011 BLAKE2B 6492f651d1b5aa82309d0caf32a97bc890d8952b0fb37429babbba4c66beab24dd3e6bb2e36aedd1098b98828b367e43d25b6fc7529ae897358ea60373797200 SHA512 6574e48645ebb4f61d45c1365e8b63cfaac6423394ba08363cfd62d3d98d163bd333d997bf5f7fd0e37ff94fcb3a3e19871eb7499b295399f048fd6a4bd3c78c
-EBUILD Path-Tiny-0.104.0.ebuild 1001 BLAKE2B 86da140da4d924d3e4e89f43eb80d78749b6ac59e3276412fd6f88f5e90ec7aed6584d157763d7384e8737d05f639accf5226fde4af3f80462ac63545d815609 SHA512 5f198650b637bfec041a7069a2b7d56f514ee225a3e2936081d3d91b530dc00d0c280863ccedc1c10d7fc86093f0e1ec6d863c81e07f128615d5df069cf57bfb
+EBUILD Path-Tiny-0.104.0.ebuild 1000 BLAKE2B 6af693932baa8cda72dbc84cf5793d39d0174622cd68f914a9354f692a30aa9d6e444c1973100400969d69c0a0adb0db68af0e650f723659cb6aeba31b7bd620 SHA512 a8811c14508ad353d7f9d7f658f53c595ac601a83a7ec662a01dcc1f3a48b00d699d50cd20a5cb845abcf83a20f01698244cb0cdb143bec86090780979f411eb
 MISC metadata.xml 454 BLAKE2B 14146a711440cfdc26ceda88d069c2cd4a8873fb00cd498c4602221c09acf8b6458e4b58a59ef64a04460fba994193e1e6766f4d1e77e59edc6d5f2c6bac0132 SHA512 95e88429a9f4309e146db578b6be913fe804e18249c10bdafc93d8ea98b50e0aa9106d655f80ed11010769db0c5d579cec164fc3f68adca300a09045f79c159a
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
index f0d1884022de..3f8478bd6c4b 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Info/Manifest b/dev-perl/Sub-Info/Manifest
index ae6d96cb422d..edc505f8264f 100644
--- a/dev-perl/Sub-Info/Manifest
+++ b/dev-perl/Sub-Info/Manifest
@@ -1,3 +1,3 @@
 DIST Sub-Info-0.002.tar.gz 11713 BLAKE2B 0402969bb028cf8f7c0c86c31210811c4f322fcb95fb95deec009dcce62eccd20ad3c6335a5b7847972f9fa4e567486114f68b5f3d0e7097d6c8dd3f5963c3bd SHA512 e3ad2c8b270a44f9de2d5b71845a4a21f363a234edf2ddb9942c2fb2e4d765eedff3653a047f025b9d1dfaeff32ddd58aeff7f81fa42e6f4b57f5ca6311519b3
-EBUILD Sub-Info-0.2.0.ebuild 603 BLAKE2B bc712ea259ee80e51778d0c665b7a882034c599919e272d5157556e76e6eed60e9af6bd43e5a3447c8d713d41997012c54e65859e48784b5328daa8e84cc2e4e SHA512 f1ce2b8bb8bb61c821fba44db68d4b6dac0696597493676c20e52a397269a80e5d23f4d92c4630ddadfa58480f637f198dd332a4a4d4851c5523206c1f90983b
+EBUILD Sub-Info-0.2.0.ebuild 600 BLAKE2B 91520d3ec2b8646c24c3cbb8aa1b7ec506cd049cc60dba67cfb3cc15634a4f13d5384aa84da33ddffee3e90c46d51dc965972a605021d334b9bc842cc6a7c7e4 SHA512 aed6256d22ad7aea95084c49d5281166a453b0027263d4113c2f59515f478f81dbce74755f145cfdb10e666a0321fa11e69f44e84b2009ff40af7204dffe2b8d
 MISC metadata.xml 388 BLAKE2B 5f9c699b651014dd91d2b391af8bd7a54b147d7da23c6d792c804a974e30dd7b353edc800909e58ce235ad911fe023a38fc820fcd6845bb4852b4488a6e37236 SHA512 1d2f67977d3f8dab7858bbff8e524c0a7972b90bef138bcfcd5641b10a4a685c5cedceb7766a57e452b18fa6aa5227d10e9877fa10ab144366e6419fb9358733
diff --git a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
index 0d4f586aa167..d0b9d1f77203 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Tool for inspecting subroutines"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Term-Table/Manifest b/dev-perl/Term-Table/Manifest
index 5013a9e6b488..470663f12792 100644
--- a/dev-perl/Term-Table/Manifest
+++ b/dev-perl/Term-Table/Manifest
@@ -1,3 +1,3 @@
 DIST Term-Table-0.008.tar.gz 24084 BLAKE2B 96c188b2b5ba76815631ee14348baa48c89a71d14c49f473e5d47f174ec9d3bb2ebf76704bd3d97c4ddf37de121b8872653756c0c64c9e3fec48bab5db7f0ebf SHA512 d741313933c8925ca3451056d05172c440ab4a46f5a4cbaeae3c6d4b82d29314e69643e8c3e60dced42768f2102277461b2d2dc4bf945d982df9265f49339d06
-EBUILD Term-Table-0.8.0.ebuild 948 BLAKE2B a1c79063bb9ba3aa330d1e4f4cc5763eab913e59271b46a4c55413924047fb02e2b74ea2299c80fd5dcc818df13e2c9fbf43ddfa4360cdfe533c350d53cd121d SHA512 11504cab79cf21fa261ad89343b1b9626bcfee074944172dd51ad614a7ded030775694ad4c7d168923e006560c3a602a830ecdc8373f7621bad22dd6d5e8fd17
+EBUILD Term-Table-0.8.0.ebuild 945 BLAKE2B 8ccec07a4f2097c57c8bf4055850a9d3d5eb636e1228c68a00b67ffc674dbbeb45c518caf8f6416fa031b8e9372c7bfe8daeb65c7686cd32b8aedb17654f6993 SHA512 aad24a3089c04af7d67d9ea0a0c95491e3399ed4fa73379b2c8c36e33225f17863212d3bb02a332405476f248f796fd4a89c02eed5071e40eafc6173b9c678d9
 MISC metadata.xml 792 BLAKE2B 410a60a67ce675c88998dc5f40d4afda2a44d2e7481265b6c65a13e64f9a2c32dbb580f65642b0f476ee411840e9d79f86872bb734f5848a01c070f28b9a7f5d SHA512 0f55103bb7dfb35ba7913152c3307fc145539ae184e16a72628737caf670da2a3ab85bcf4a9c9d601d09115c6414ab392bcdf5a9a9b5a043366721f0d6e4191e
diff --git a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
index 427196174bc6..a46d7b72bbf4 100644
--- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module eutils
 
 DESCRIPTION="Format a header and rows into a table"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/TermReadKey/Manifest b/dev-perl/TermReadKey/Manifest
index 4979757a9511..b0262eb0b990 100644
--- a/dev-perl/TermReadKey/Manifest
+++ b/dev-perl/TermReadKey/Manifest
@@ -1,5 +1,5 @@
 DIST TermReadKey-2.33.tar.gz 82916 BLAKE2B e8bdd9c78001de3b2060bcf6ed376b8043697b290609f8cdd3b776dc73262c9ff50ca0b9e992869e9675780bf3e434b44468f589d2bbcf2411ed2a570ef31072 SHA512 ecee70695f8d48f8eeeb6916a7f25aac536e8725815e6c22ed01791f152b55a4203460cb090b00b64ed71e093890b9bc096679223cc97bda0c323e61f105a0ee
 DIST TermReadKey-2.37.tar.gz 85082 BLAKE2B 59c999924455b6c4165897c7650209a98b5097c7fffd1044de005b8823d0867f6b16a835d5188c4a671b58109312ac2aa70012edd84d4a485b1534241f9525ab SHA512 b602d612be17ec4a56fe50742728dae17733f251ef399e8fb69cc8eb22885d7e1c1073c735fb23826137e80be8d3597e60f496ac63180739752d070957880eea
 EBUILD TermReadKey-2.330.0.ebuild 558 BLAKE2B 1de342ce521b7d52498cd507bc9762051d82198afe4fe2fba28b7e71fa41d860658585f29261f41930c44d480f42f499af725975f539f4f4a5fcde05f4b8c1c4 SHA512 1637ad059d4829d738bd4bde0925905dd3d90fa2a1c90439ed4f1944094d0bb0c132edeecbd06e2a37b8f54616010fdd920877cad29b20454fc8155f7777bc5b
-EBUILD TermReadKey-2.370.0.ebuild 566 BLAKE2B 86ef781ef93bc600710b74913f470a33fa6299f02d5a0d73352074ac008dea1e3e19ca882143dc89a3cf118c09d17afa5f6d1f19d935bd65cb945cf06c75b62c SHA512 e08721a91b70b8fb47493fc73a3151d128c547c1dc649d8964140c635a53bf776ae67c90049e5d80d33e6b07daafffbcde27e33ce54a94ab14076cf0d31e715d
+EBUILD TermReadKey-2.370.0.ebuild 565 BLAKE2B 5b9db6ffa7e7b8bfc29cd5c24b2ab6c1091e7c760442a98e0a89ef3b95bd52bc667b747d184a7774f05e41c7b03c85093aff1937f0d73ff2f50dd6f8ae22c055 SHA512 d0ed0b9538879470e47316881b065e7cfbdd75b543e239f9c254adefe52868393ce721bbe70c8ef1dce9c27d042d358f95d94acd189b7e2ab195d777be94a3b1
 MISC metadata.xml 395 BLAKE2B f86356973a22082d5ce869e889844d35568085856436b5ab2642f67fc782ff6320b1586040bd3818ae9632f645103ebdec54ded39fbf834ef0b577f0fac16d25 SHA512 0d250d3580f36080ca33e28bdd6335ed060ebd3760247cd84af2557d71e3b510d463617a34657f46748587cda43b38a128b60d806e641f995a191933c6b18ad4
diff --git a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
index 56b401d5f362..f1616c9451bb 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.580.0"
diff --git a/dev-perl/Test-Warn/Manifest b/dev-perl/Test-Warn/Manifest
index 66db4d4cd724..b585b454fe2e 100644
--- a/dev-perl/Test-Warn/Manifest
+++ b/dev-perl/Test-Warn/Manifest
@@ -3,5 +3,5 @@ DIST Test-Warn-0.31.tar.gz 11582 BLAKE2B 7c1bf8fe89a0006a6d5b44c211bc7e7714d278d
 DIST Test-Warn-0.32.tar.gz 11641 BLAKE2B 86c428064b8b0cb3359d7612a32a6f0d3ca7158320e9bcc1081cf001667af9da8a043f309f0197712a60d2e5c9ab4c11e22917629560349a36b0858024404645 SHA512 a14d6a87cfa19d54a3055b3c94143b95788ed2a30b2813d952255891a84165f0baf8b9cad167c8d5c87870220aaeeedcfe48db73246966be6aea41ad26779e6a
 EBUILD Test-Warn-0.300.0-r1.ebuild 602 BLAKE2B c4b803bd492138a75b76c065d7d88ae5a45c3b7215a5ac52648d53af1e5ec63a78884805cde0c2cd1f4933225443631378e17a27cb32a7c2297a73404542a5cb SHA512 6a1bd978b2ee00d0d7e22f020d182d4159cb0f08fa8bc83fbdfac4d2ef8c2503f9f27b499793617b5c13790565001494480bafc5d15b12768ff4bf945147c72b
 EBUILD Test-Warn-0.310.0.ebuild 677 BLAKE2B ddda0fa0c573e08bb118cc1b4668c59b4326fa1fa28f778a51c312d9bf570ce40df3c042b9d00bdf56dca3063000d677befa84599be089eb99e362621bba302d SHA512 092e467a9608df2f6e19bf9580f65d2adc295955e8d126ee6d386c47092ed6e9de6a1a8744c52ad1031bdb15a09aa7847d484005e7b8bb5ccfe4e69325ac1960
-EBUILD Test-Warn-0.320.0.ebuild 741 BLAKE2B 568f9040f1bbf09a112424ec67938d87ef17a99d93a602e66cf089582fa0933240849c79788bc97886653b07bd00ea1e10d4cdd9ef0788efd6f19e6a8fcee9a5 SHA512 08adba0e9295ab821dece2bca5b39307ea3c7bbe7ca50a62eb6165246c1edfa58070f5c35ea0825a70725ad07d70abdb47412799b6c4e3eedf154417e44eb16a
+EBUILD Test-Warn-0.320.0.ebuild 740 BLAKE2B 3d12e535978c106bb45808bd81f8a2b0f7062730cd775dcf238155c33043d33770e9b19b30a1306b389dc3e518fc902bb777bdefff94a16f428419a1fbba6d35 SHA512 7ea760c0dad49dcac1f70ae778872b50d8074427b466aa7c9a143f2f3d498451b040fb31b9970f536c99c4010172b7292573e1d1da116a80214f08f93a5a154d
 MISC metadata.xml 463 BLAKE2B 04fadf933e0d8125facc008c857f45ab7365abed6a529b7b5773b6d000d29a6289c2e3e10443bc16b5a4868cd9938ff1a56c0987d702ed7fde6635aab82dbd2d SHA512 1d17398908154d7dadd842686ab8ed90e45c72a0db6b8305a354b59179114c7c8ab59b502fbee5add6615b007b0a29242aa1b1cd29472e37474495770d0e19da
diff --git a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
index e0731bf7f8ff..e67d10fc5dc4 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-perl/Test2-Suite/Manifest b/dev-perl/Test2-Suite/Manifest
index b131a7b78895..0a1f85550a7b 100644
--- a/dev-perl/Test2-Suite/Manifest
+++ b/dev-perl/Test2-Suite/Manifest
@@ -1,3 +1,3 @@
 DIST Test2-Suite-0.000077.tar.gz 144835 BLAKE2B 5a3db61f48f479f8bd00639a538fada5a917ea054abb8dc22b92b5fb2a73ad2da33776f264b1fe7ec53f1a3786af286bdaada7d611772e56a9f883d91139507e SHA512 e9337fee244f572c5b0af54c78a1be47bf590caf905ef6a40928c6e914a183d3fbc5fa3312a0903f697ef5e44341c5425873ade50aeabb63de3f795902bb0f71
-EBUILD Test2-Suite-0.0.77.ebuild 733 BLAKE2B 19f7350d143a1ee6b0587c30001f437052356311782e9d620940ed712e33a5355a7821f20e8b658dbceb87cfb6630ff2bb85d1e34c96b0b57bc453d895440f02 SHA512 b87f74d1e6b27d94d938f77c786d2a9ab715c67dddc7fe9db1d8e5d0edce8136f959cfd555cf475afef3701375bc9f8bd15b0cad54dad76bbc40907416bfedd8
+EBUILD Test2-Suite-0.0.77.ebuild 730 BLAKE2B 2b346e63a14ac4215db93273e0cd646c68a889f164d287ecf98cfa811c2a3da32b6d8df4805301a8be76f9bc765d568860617f364fd7be8422359db7ef22a33c SHA512 1b0cb8bb14b4263560d27658262220f4de076fbd3bc57bed2cbfca965f3475e377dd11bee1778ef74531a3888a2a45e2bec28c0976abe70b107f0c2c1ba1feed
 MISC metadata.xml 5303 BLAKE2B 7bdfd9b31a45fedd69595fc5da50f93d52865d600c2bf7f480d507f7fece8ebadd02114cd6b000388e2bee479bcd0c243d1a176bb6bf6c911d2499737da9134f SHA512 acc269672170b9427444854bd73769c31e45a5e87ccac7441024b8db93dd1a02b09a9700b6c38f15379981cd34c490a6937cf780c544a245239ac7c1c323de16
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index 20f49d36f7e3..d004d107e1d8 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A rich set of tools built upon the Test2 framework"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Text-CharWidth/Manifest b/dev-perl/Text-CharWidth/Manifest
index 4355a0dd2b26..cf52fd4f5c7b 100644
--- a/dev-perl/Text-CharWidth/Manifest
+++ b/dev-perl/Text-CharWidth/Manifest
@@ -1,3 +1,3 @@
 DIST Text-CharWidth-0.04.tar.gz 8387 BLAKE2B 6d7a75c9a010c6f909a7d34a23d58973afa1b6a53091aaf0cd7ff1fd1f38b87fe2e043498871ecd2ccd3634baeaa03ca4ce0bceb04736e942bd3bca94e17359e SHA512 8ec7898fcd4a3bb6e9e36fbd50c28e023298f830fce33dafd1445de97732b337d3a6f9a075059a56592d0f118ba83c45e61fa4fd4a6d3bfbb2cd25215a061e1c
-EBUILD Text-CharWidth-0.40.0-r1.ebuild 470 BLAKE2B 90c078c23b86a02a1a415fd59a68dfde3fe830fa3fd3cb392a1b55f48334d6c345688951d84b85a5936836f17b746ed5f43fff30c9716dcb676601dc8e804e65 SHA512 520bbd91c5d91277d9de3894c7b1c4786e2405a2400a9c608da6db3d4231a880ed384dcb5f26ba845552481068faa03fd5f264515441ec1c4c0cd371d688264e
+EBUILD Text-CharWidth-0.40.0-r1.ebuild 479 BLAKE2B 0033c5bd770fa03349726a5572955e625f625868b631e1eb2f2975625e9e7aa02e89deadb73a46ea75ae395578b71474d8c88228f4d5bc5cc4c934976d88919e SHA512 dd60615da1039f68671904959c6f43f6f4832cbbbcdc0d4d8f23d6cd50bcaf7428e5d7dabc6d652870a1a6f4c331358a06884dd435883267dc9aa5228f0c2326
 MISC metadata.xml 400 BLAKE2B 94cc58a7229eff59f4621c9b3c9bc9d90aa55ed66dfc6259b828f5846ef3ce0854026292c6d0c6acacf80da9494733a311bef955146cc21f9536347b78a5cb7d SHA512 9df4dbe1befbc2095aef448e21fede21930bcb5474c7221045471e959dfcd1de9001b24d6c6fddd9fd8b0621cd637dc4cdb8917f219a077d106cebe52cd7073d
diff --git a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
index eeaf2cf12924..14dc352d47ae 100644
--- a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
+++ b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get number of occupied columns of a string on terminal"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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 m68k ~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=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Text-Template/Manifest b/dev-perl/Text-Template/Manifest
index 0cb870aa1b52..91e3fbfdc580 100644
--- a/dev-perl/Text-Template/Manifest
+++ b/dev-perl/Text-Template/Manifest
@@ -5,5 +5,5 @@ DIST Text-Template-1.53.tar.gz 48863 BLAKE2B 1b054122fb9b17e36304f51888b8c284a2c
 EBUILD Text-Template-1.460.0-r1.ebuild 366 BLAKE2B 25da60c3ba6ba0af9f1546bcd68327c0ee377407ba88c1cd7ff89c8d4e44d637fc308ed2d380c1c26adf4f2471d8711178fc30804f5d34c79d5bb423df112c18 SHA512 b6b8887fc32b70d2077099f82835c1bd0d978057c6c0f6d68de25e99971b5f45df366a85cc5bec7758755b1f8eccf75ac219bac925ea7a667868f6c1002f3e56
 EBUILD Text-Template-1.470.0.ebuild 473 BLAKE2B 82ad1b6a36022259a3dfc6aa4281329ff31f8912a0095e6b66a74a6f46e95ac3ec834b4c7739d0474f1e5cd05c7d02684a4ca015be265f79ab808824aa2ff78d SHA512 fa67511fe1eec79474667c7335cd511a19004704fde8982a0af9526968772a9f0be9e21360ad63089b4f16faa78851251088562ad693079a2dae2065b2d8d693
 EBUILD Text-Template-1.510.0.ebuild 581 BLAKE2B c614beac5866353d2afa6806f3ae30a99b2998266ac945ac2c4bbc5638480399657db6e5e32bd664be235b5271772f15c31255f8e49ebd6ceb880e44a97c044b SHA512 b81ebed880a6b455bad5508549fed45d8f68190ef649938ae16b6bf6aa04868228b76c2aa7270758a1487236517cb3f1afc7d04386566756854eee9e6715f107
-EBUILD Text-Template-1.530.0.ebuild 600 BLAKE2B 4d3dfae679cf40368c1ba675039544f527609bf64a4a2229aa5c02e596c2148c879bdb4dee455a89398add87bd9590c51e0761e6e963d23458c88a89a5369e98 SHA512 cf25ea4c037e7cdde316040d51c26f7114515cc90ed5cfa6a33b1a9db069ea48a235aac43b73ac5727b50b50dea4ba3472c2ae756dcc8c5dd0f23b61d1e4c451
+EBUILD Text-Template-1.530.0.ebuild 612 BLAKE2B af8fecbcefceedb77cf5e13ff70b4d99c614948326ae1b64317ad4cbf88347381a98730e5fcef232ecdc47e454f56bc9f05ff39e167388726820f5494d87d0b8 SHA512 68b667b833eef93ad32b4d6656b7c08a4333d48f2d4cf8a66e528ef15ce85bccc4aad6940444cc392f41661b2cc4541a8eec7d02e6753e4cca056816f3c0f565
 MISC metadata.xml 471 BLAKE2B 34a7f4c825805b440f083215b5eda70efc7f23001c99725f770d2b7dc8b088b3782a396ea1ef3bb97680b678fbda70bff3dddd8e730cb517af1c561ace452dd0 SHA512 eea7eedb6e98248bba90735f8ec239b419b83f45d5693a885c60ddaf9a04bacae82e14cd0c2912bc173c20adc33b6f7139491cfd813d6a0ada72ffd7dc856b87
diff --git a/dev-perl/Text-Template/Text-Template-1.530.0.ebuild b/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
index e55f695eb9b0..6a9bfdea8ed2 100644
--- a/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
+++ b/dev-perl/Text-Template/Text-Template-1.530.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Expand template text with embedded Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Carp
diff --git a/dev-perl/Text-WrapI18N/Manifest b/dev-perl/Text-WrapI18N/Manifest
index 17ba096c1c30..7f7774ab8ddf 100644
--- a/dev-perl/Text-WrapI18N/Manifest
+++ b/dev-perl/Text-WrapI18N/Manifest
@@ -1,3 +1,3 @@
 DIST Text-WrapI18N-0.06.tar.gz 3812 BLAKE2B 9e85b6afb81dfd5b568722986613150b3cd913ab9efee5907be08f57464b6a58ba58051695e933c7584d9849ab83e659f9814dd48719b6f7b91df08936ae7c36 SHA512 14ff46154f198ae743f1bf354d6bb020968b1e3c3996e882c871e0a0067ad1d6b50911e69aec31380200d64bc4ab46ca1829cce1206ad43406fab89fa7e6c0af
-EBUILD Text-WrapI18N-0.60.0-r1.ebuild 513 BLAKE2B 1554b1beb40acc34b91f7122a2494e237406508ec563a354dab1078c888137edc82531295ef7019553c2c95acd10dbb5bc2395d19882220f70064f19877aa91a SHA512 cf97731d5b79459c75d87b4a0186b60538cba7b1443cbf7fb619835f43db4d782cccaf66af58ea0d5d1563741bc0dfbda4096e7454b77c30f8b5c11d37dd6be3
+EBUILD Text-WrapI18N-0.60.0-r1.ebuild 522 BLAKE2B eaa27ae453727c0384dad6cb6417f48686c3380ab09aa6042a6d5e803f233a1f8fb7f358c4588bf433d21eba08f76326ca9d2dcd620950d248d82837ff4739f2 SHA512 49c3074e69199aeaaace302afd8951a3e9953c17d03f7bb353c6d51f70a8b2bdafe510ec97eb5dd760090bc4b018bd469c3d628e92fcaa777ee2720c34af6e27
 MISC metadata.xml 398 BLAKE2B e326cc4f2d50d8a998aa8dc10513ae0bcae46f8631a4e5533448d8efd0863617183b8d0f52dfbc0a77ce47c0eaf44ad240367fc0d64c6f8a45c0611bb0af984c SHA512 bbd38546e5ec5579855fef2089a589b0d00636774244cd1b9a3b7ff5b4b139bd5df3acddd2ab12d6d4b9bfb26298ce3e14b57b3327e0b3086fc05b3d0d4e9021
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
index 676e6879c6bf..f75af9f0a8fe 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Internationalized substitute of Text::Wrap"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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 m68k ~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=""
 
 RDEPEND="dev-perl/Text-CharWidth"
diff --git a/dev-perl/YAML-Tiny/Manifest b/dev-perl/YAML-Tiny/Manifest
index ca27b1cf2a3c..2ebf7ad5d898 100644
--- a/dev-perl/YAML-Tiny/Manifest
+++ b/dev-perl/YAML-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST YAML-Tiny-1.69.tar.gz 71513 BLAKE2B e765df404b786a3cc22927ca47b1706ceb5e6d2518aaf313342987839c4ab5158b7d4bf4d553f91803b9ed5072efbd580ffffe2e92fd1c6ae0958b851530da0f SHA512 64c3428691f78d94bedf7f3b3276f7868d7280ca6d3c9a7a2e8137568d0da2fc94c766f9873f2796898386d6e7d3d1010c790fcc119f3d4d743becfa39d56a2c
 DIST YAML-Tiny-1.73.tar.gz 73708 BLAKE2B 42e9c5cffa2b9babb0dd1453af69866405fd7273c2b340ceb010d78d8fe28db61268b6bb5ad1840b1aa72819ae048150bf5c416bed1b2e518b28f77b2ba978be SHA512 5999e220025aa8076e5e0e9e73e80c2da21660e77f6744d73e8e29962221d02d33a36e9829c44abf7d4f45abae069d8e121c8019bd1600b7e64db5e54efd9987
 EBUILD YAML-Tiny-1.690.0.ebuild 831 BLAKE2B d589617b4ccd42980fc0ca4072f733f6fdc51d852efe3aa673e510d0fb3f4c4d63ddf946762223459304e06e9779d51b75f54b4787019f0a4d448bdb2c2dc002 SHA512 f6b1251028c0970a445468747b8c4141a356b0afe4b528eb6b173ab79757dc5016c4d31ecd733af233aead9239c5ebefac243721d09d9b5508d585449212b361
-EBUILD YAML-Tiny-1.730.0.ebuild 927 BLAKE2B 07fb22448f17267d9e7d0869ff63002b8de6e6d0892b4481aeda11f7f053985a676fa8cdcd8d018df74a32e77dc259fc99259142152209abb238749c6c73bb2e SHA512 d34e595ca7892c72c31603bc66081bc325624c22d3aa719a580f079f515252cbf7f6b5a219ce499c1399b847283a8bdf8bf495378b3c2c469897c055e5a010ef
+EBUILD YAML-Tiny-1.730.0.ebuild 936 BLAKE2B a4a4bdca46d3230563094d77fdf1a5b47522b569ab52d02fcd22c7d5682de0b6f35ddd33ad69f358ba723a92abbb354bf949d9a563c570205ca73f6906af8827 SHA512 5347e092a53cb25fd7862fd1d5f3576a78b824c99263a90e41cea13572a41bf7acd74e9119a55af79868516f063a89de002583ce720369d9be886b7db7b22bab
 MISC metadata.xml 390 BLAKE2B 43f06ee024367997900aeccd745e3477442ef332475b5f80330487525939f91f40a799539806dd249d6ff4028e2ce2e046cb26511ce464d0389c4410d326924a SHA512 52c36ed90d2421c9bbdca2eaf494b8e46cf61ef567ed52ebd8f28ad20eb5ff8b9217ee20b4865621d79b9df0694ac848311a7c7ad62b267c7ed95467ef1112d4
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
index 2cdf4b725ec1..6d8c0fda3318 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Read/Write YAML files with as little code as possible"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/libxml-perl/Manifest b/dev-perl/libxml-perl/Manifest
index d5e94a70b35b..5a0c38a2c584 100644
--- a/dev-perl/libxml-perl/Manifest
+++ b/dev-perl/libxml-perl/Manifest
@@ -1,4 +1,4 @@
 DIST libxml-perl-0.08.tar.gz 64335 BLAKE2B edfbe3705872e6267a3e578df2721184de14eafb8e8801d0d21dc577b7bee69829aa13873c10df2c871575280a798282924e241090682f3724b3facedd1df87f SHA512 66c1874a04b746334d4324ab37ee057c6da7fa7191dffae2900e0832dab3b2ededc5cbdc5e838c0d57c22161c9cf196ab40b62f61338d4c994bda9fa7b1a7702
-EBUILD libxml-perl-0.80.0-r1.ebuild 489 BLAKE2B 0bb072866d250d33ac13445311ba58ab08b0c6ca6e777da5dee6e9199116b8acbdd396e6fc34d78421527d27e9d23121c54d9146a3d259683e74b82c18c9b81d SHA512 1ed392b9e1f9474b03ce784bb98be24bde079cae3ffc4d6e9079d9c5d069d07bf5ff4831e3e6099c8291efcceb354c098a5482a17b7c770e8eb5f0544ca2ab92
-EBUILD libxml-perl-0.80.0-r2.ebuild 538 BLAKE2B 60913b36d1fb368daa1a2a25b218464c16cd374c3d267662ffb84534d6d634491d1913664b0527db181326c9c5731b0f1585fccbf116d34efcf4a9aebd35008d SHA512 ef2fd028442dc336851692118d8b7b6480497bf073f207e7dad7a7fa27e827b275534172e46b022fa80fe8e9edb1ef7e54305752875d21284769d40010ced59a
+EBUILD libxml-perl-0.80.0-r1.ebuild 491 BLAKE2B a511d962987ec338b08806fccad05082b38c594635a2e400343d4d7c71210141f9f7369dbf748f00f6a3015e8aae86ec62fba24ba94187824dac89d514406ddb SHA512 5e8d50f96d335f01e3e978b31ea876ef0da01e055bf56cf7010835909c184b9a9c2160237ec2ad946b2215481ef37ffb399e66b6987d67535150bdc1743107e6
+EBUILD libxml-perl-0.80.0-r2.ebuild 543 BLAKE2B 3613cd9637542aef4c8fd83bc97d96d4cc706df199bf2fc620a2cc6aa8c3357e96d7fa9f085667e60dd1bc8a9cd144e274285d283f9d505863f5010b9b2f0c95 SHA512 5e09267ac54344c6a908162d2c9a9df64e204c6cabc4dbf5c4f04a4f8f936d7290bcb2c697d1ed54155c58d5e2c6c356be04f5ee3b820c8a8396eb6ecc378283
 MISC metadata.xml 1532 BLAKE2B 214a72ad7c670ec630a8d69b090c1b88929e8be703383963e8f9a9bf89c6a31b4077a1b071ddd0fe5cc0a59904bc77fd815391be9bf0b8fc5fa38472d6462252 SHA512 c21fb26c6f87f6c5610641c32c54ba3663aedfbe3eba485a9c861eb58bbc9ebcb869389f0e75f4e24db0af0d07ba6fcc016953e1ab22c83a6f99e87a4b64b749
diff --git a/dev-perl/libxml-perl/libxml-perl-0.80.0-r1.ebuild b/dev-perl/libxml-perl/libxml-perl-0.80.0-r1.ebuild
index adaaa8eacefc..5abd094c9d60 100644
--- a/dev-perl/libxml-perl/libxml-perl-0.80.0-r1.ebuild
+++ b/dev-perl/libxml-perl/libxml-perl-0.80.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl modules for working with XML"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
index 0c9a120a2b47..d191c868f23e 100644
--- a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
+++ b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Collection of Perl modules for working with XML"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8e50fd9852c2..88c63f519281 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 5abcdd36603c..14433e365408 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 606 BLAKE2B 78d5be009491f3a3f7112237e258231d48cc0e0203276c20fea8f82a84ccdc01fab3beb4a1065a77c59560614a2639fa949211cb0c4a26e301d3a46c81636001 SHA512 8ed3fc7e6615d33588ca1962aecbc0fa8c6b76081f7b8868cc9c834eb01782b9650ded7898b229daed1e989e546df88be9ca68722e5d2353a269cedc789deaae
-EBUILD asn1crypto-0.24.0.ebuild 808 BLAKE2B 8d87330b83be97dc80bce708f3244c1b9161a5104a026dc0f245bfc92ad9b0046c0e062816201de13487aa74e94cd506e29da87cbe9f6fc7e49f108b62321e85 SHA512 6e08f5c226b15d2d45c452f72c320423ddbb21b8504c183c41cabf51a1db26c40151f6c6126d36aaa4514f78554dc3b54f824b9030fdab772ff68ec3e50aea52
+EBUILD asn1crypto-0.24.0.ebuild 832 BLAKE2B 35c052c114b58324d200869bfc07df3f4c04fd5e919c98db95c566a7f92045b6c2f013f2772c442b90410e867af823e3c3bd3035530831e90799ad8a9c6c2775 SHA512 07b86f6b65e3ebf8d5e80a27bb3a05f3dd22b178e91d711d8bd1f7c40a819ec28c387211a95ddf523e061f005487bbca542fd7e5162cd410066444d81dc44f81
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 8cd070fe4479..d17ae8363436 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index da5008ed2891..b13d4205823e 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,6 +1,8 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
 DIST bottle-0.12.12.tar.gz 71554 BLAKE2B 4b0d0d77c5ebaddcafd44e16a052535ded566245324d39e97a39dd20a193360487f9489e8e89471dd92ca35d6c5b2e8cbe1572a958db31b69d32d3e32f1b6403 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31
 DIST bottle-0.12.13.tar.gz 70870 BLAKE2B d8bdef473181ce1cf6c0d1ea3537c407e68d23c1c44ca33e26c647d3b3783040d466b594c56c10cdd007d23bdf1708412d3e3ff108effa9e8a92e1b22f7a6c69 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b
+DIST bottle-0.12.16.tar.gz 72248 BLAKE2B 21b5bc376648baec74577ac5b57fcacc58899babe07a034a436d5e2bde75a9e2e48b2569c5caf1478e77790c5fa327114ab9b084f014cc1ba97637d9ddfec659 SHA512 3c167f95902522c8f264e8478403da8e9b8cd84594318c4a773d38b7548b5ba95c99ef922033f6885cdc044b31f9c2e2f7ed263886637ce2a048e99c0c6e1403
 EBUILD bottle-0.12.12.ebuild 1436 BLAKE2B 1f9e88d48d449c2754dbc0fd53910ed082e60ec8d73b0ed07e2c1562a9149cf331b72193e9a6803247181460c1ed4305b7af52278603df6c6e6cd414501bd38d SHA512 bfa08b0c9e6826f11e2a3d4818205d3ad1a193cb3838eb777e2e397c69ba4f3763da3b71233d091b347329ba95673d2d8ba2f7105cafa8c712cf1124a2ea951e
 EBUILD bottle-0.12.13.ebuild 1459 BLAKE2B 55b14207cf3b0e0f1e59c9149308494ff22181cfb163811e60bafa185f96d7c854fc9bc3e682e3a1688ebfd41dd8935656f762ca2df247575a7e4c912ebb5db2 SHA512 f135aacec7b08d9daa733f8ba36993b4fbb7e84a57cda28bdc18d642f0b8019d2f1fd494875715a9e8ee25f32cd7da5448f159571a4170c415a0a81161df5ea1
+EBUILD bottle-0.12.16.ebuild 1456 BLAKE2B cc124e6b0993953b6a48722a18a673f90526f1f1494d0f7cf13d7cc501c47b0832a289486ff755856544b2f5d489b316bca1181809488bb191f38cd6bfc1d4b6 SHA512 3bac778ecdbf033524e968447c6cfe5059b719f5679519ab4856f44017b75b7b3c46d52f6f4165bb4da351683b87586d6a179e0fd1cd3dc453ca6bb0db0eb21b
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.16.ebuild b/dev-python/bottle/bottle-0.12.16.ebuild
new file mode 100644
index 000000000000..db42adc4ec38
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# A few odd fails in the suite under pypy
+	# https://github.com/bottlepy/bottle/issues/714
+	"${PYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index f3c0822d14dd..b0a65dce2e06 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -4,6 +4,6 @@ DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f
 DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
 EBUILD cffi-1.11.2.ebuild 1476 BLAKE2B 25125ac60f6f4c5d9ff2ef82ba26e125153898a82f4e3320dd0593fc40c7ac8baac95961cdd8fdf1d905608a94f4d90ea72eaae54cafe27effa3f18234937223 SHA512 2b7462558ee2126c40966b17de05010b66b9b2535fa6e31fdc3f1f55527944529d79c6b7404dddc7cafdbffe3058f43493aee5f0651eda693768989ce27c947f
 EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B 8908398c5a76403e7b7157852374d29f287310b11d5afe6164d540d034b50374f497ff3a86118079ca8987117862789aa9822a517c23d77763ceb6b8cc74de6c SHA512 af4121b4931e23497f2593a1265543f61bff092f56e3296121c3b1d4740f86748e8bf3736d4d9aa371b82eeb775aa377ceb8c9bdd80f5afd00cee92bea42b429
-EBUILD cffi-1.11.5.ebuild 1520 BLAKE2B ed422a877aedcb8e4f46b92df0a0b161d20c184191c5d04aaec1c0aa35c6268d73606cefe61b532d6c3ab3aeb7f8c08044c1acb8626a48f9430ebfb86f2b8fb0 SHA512 a25db796de4627c4df52337face49143b0bf31f169d5372090c306bd7ff4c343565c287d4b6153efdd1c821061d62dacda8eabbb063f45b29a2590a12b5b1fb1
+EBUILD cffi-1.11.5.ebuild 1579 BLAKE2B 9763e00bfda6509a14cac4b2f6576e99a432f4995fa6568e40dc0bce3d5ec89f44e926d748426a3fc03803ceec76de06cf9da31e4a7ac923c4a36360aa4ddc5e SHA512 12be405a1ade74113581a92f031f42feac962752ca5969d7bc3e6dfa41662a4608f08bf18edadc8423c99ff309b4bf656481639b2ae02e7ade2d11a0cc9439d1
 EBUILD cffi-1.9.1.ebuild 1466 BLAKE2B 439b6504bdb7b2b6b84dd5580ec4a155361d453ee5de5133102826ff6ac9b42a169c55e3952677f438b3b3087b2cccf57cee785d357c9f7d706db8d9481994ad SHA512 40d33d6e223d157a7e20f9ea96133fbf1d6d49060d9cb8bdb80188075918e864c64cf34062fca7a8ea909b0a6a65f39b8b1a6b6f1aea0f741d7ca779fd466aa5
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.5.ebuild b/dev-python/cffi/cffi-1.11.5.ebuild
index 9cd44285b9ce..20a17f5c3fcf 100644
--- a/dev-python/cffi/cffi-1.11.5.ebuild
+++ b/dev-python/cffi/cffi-1.11.5.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Foreign Function Interface for Python calling C code"
 HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
 DISTUTILS_IN_SOURCE_BUILD=1
 
+src_configure() {
+	tc-export PKG_CONFIG
+}
+
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index c0c76caae4ab..0674bfd6f76d 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,6 +1,8 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
+DIST CherryPy-18.1.0.tar.gz 682792 BLAKE2B 0e072bf21656778ff8d64e87a6b19c8c5e9a3057312ebd3155b3b876432709f6f205f267cd9a105727153d458daab3e7113ffe9b3c49f911bd956bf72a19086c SHA512 58ae40ef62efeda051bf5dd35768a599094792d06a0e7c6e34c21cc5b003b700f43a02460d38a00067d255939e341fc438d248e3499fad76ccc8100f8eac94d3
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1310 BLAKE2B 1619274c955202e6c22dbba3cbaf3bdd6c3736063b9e4659b393906d24debbbdebf548b9592c719b46c70392f09694a7b0dd4a09b0bacf3b87cdf40966e933c8 SHA512 939e7f71d2cbbd383d0cdcdee07f3fbf1ac8a4c5197985cc4bb5c80cfd7e999cad28682146e1a0ceb858fab1f7188585603521fe7e9d9e9436ff85bfd0b3d029
 EBUILD cherrypy-13.1.0.ebuild 1315 BLAKE2B cda7c4bb1e448d6c3b90f29fdc2b922948f11f95093802a619c7cefa4c2801cbee43c68d84cad05b12df58595980c8ee577828215cc782259ba617f74822886c SHA512 838c526451084177255f3aebc423de00a97daa670b88ab3dc6e69441d05be5757f1211d02a3dbf7c312ddb250815e2fdd9d7f991120b96eba3852d492bf08a7a
+EBUILD cherrypy-18.1.0.ebuild 1310 BLAKE2B 155155231d8e63548e5edbf7473bf9a1e9c0ff48afa5cd26af1ba40834594b9f875818e80ec832ed1da7f6637e5c9414bd5be2bceed46a528c39ad0b2957b4bb SHA512 7c0e6d698b4418a165ab0b1c986f07130d3dce8529b0b503459f34dab4ea3eb21fe11159feaa7d4c56b6e2f737b7874c761cd40acd21a0b7543ba22384e0f4d6
 EBUILD cherrypy-3.8.0.ebuild 1658 BLAKE2B 089308d96b63adf0e0563f0d4648290ab16998b0359c6802c803f85e147e604aebbe379884eebfec859035d54a96df57ff96967f73ad41929eb6088373237898 SHA512 04ab8e0a5b192bb61f926e9a0eb1bf1f52444f4899b963c21b6557abd79740766ff60510bc51292e614700893298d7989eb3e05fe85377a090d3651ffa04e3d7
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-18.1.0.ebuild b/dev-python/cherrypy/cherrypy-18.1.0.ebuild
new file mode 100644
index 000000000000..db0bd2c75f89
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy3 )
+
+inherit distutils-r1
+
+MY_P="CherryPy-${PV}"
+
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="https://www.cherrypy.org https://pypi.org/project/CherryPy/"
+SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)
+	sed -e 's|@pytest.mark.xfail(py27_on_windows|@pytest.mark.xfail(sys.version_info < (3,)|' \
+		-i cherrypy/test/test_static.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "tests failed under ${EPTYHON}"
+}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 959ba51ee783..9b01e2d787cf 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -8,5 +8,5 @@ EBUILD click-5.1.ebuild 1205 BLAKE2B bd6d5fb8ca349249840a8db62756295ce6d79d214d9
 EBUILD click-6.6.ebuild 1192 BLAKE2B 6506d88b1792f1a1f5107537a8ed73c34bb4b8dd87b27036df1fa6945f0359ec3482d4a7f33f2c78f3bc438bd534d4483079d1eacdc274f9f64bcde43ac8e91e SHA512 9523bcfd4ac931ab76891ed4a7409bc1f9df8a78a5f180aa26e47fdbcf23989f5854534c0440ae1aabfa07f0186236001f3a5c40e997d8582283990369d75272
 EBUILD click-6.7-r1.ebuild 1411 BLAKE2B a3a7ddead3e59990b4816ff70a2b21f54f1365ad8894da5577eb312ecf9f2d187ff6184176064d04d19ffcfda50a36dc850b066ba0c9de91d5d42b3378a5203b SHA512 626698fd9c56d08591dee76d8b5f525e16ae8bc708ec460b1a24782ec7e7442b35a1ed1d4f78a6598829e296fb312535715395991a0c9021b76b75343fd29575
 EBUILD click-6.7.ebuild 1299 BLAKE2B b06ef47d14e3fa73a2392febdfce4b1de139a7c26262122bea89e402e0a4c8a8c861a6190ca852e4b721bc97b772a760a5583c91f4625c2bc40ec7ed1989d429 SHA512 347af3d728b0ae9c766880daf863eb2da95d6c94aa71cb93fc3402aa4e77105cee2841d8f1d5c769379c22dc351238f827c36c3728125515a4194adae474bf0f
-EBUILD click-7.0.ebuild 1099 BLAKE2B f57b6d75aa96047e17450d66326eb9c9c71c00b3a39426abfe7a0d49851f4f6fe130bdf317a9ef37208d70008205e5deb191c38484ff311d8070ebbc10887d4b SHA512 d17d5419cc675aacdd25f8b0a0c351dbb7922a3e55a0f43b6da788ec40a6e715a3795d149dd2defdfbd21a757828c999dbf3c82cafc6db3cfbf3f20630e35468
+EBUILD click-7.0.ebuild 1110 BLAKE2B 39748ae61c77d5540e4b936aa6d04269f1540c2d5b7cc79f2aed9bd4e26e97bfd5dea48f097da83779646b473f454f4c810390a70af9b8544626f56579aed213 SHA512 2e5ff6dfb259e49566430c8ffaec437ade444a5f47db36e716fc0e4e09a39d973672b6e4e6d1d31bdf18b377ac6667a6eb7bc9e91f4a8ffe80d44f6a21c7ce45
 MISC metadata.xml 308 BLAKE2B 813de6efdb1f5f1c8f59f403d8d7d46a4f75bd7b135a46714aba69ac841e12d650ac0c0bc53af62e3c240998fcbdc11a12cde34397af99e7483b29a7b701f1a7 SHA512 6dd2c4334b6ad8b0942f5cbd443e7bd5cefdcadf2541d341f46fa153a28a6ab5f074270638796efe6a7df48a20be9abcb3f41bfa19c58b1e30ed13fe56b1d6d1
diff --git a/dev-python/click/click-7.0.ebuild b/dev-python/click/click-7.0.ebuild
index c8abb01039a3..5a40e81b391f 100644
--- a/dev-python/click/click-7.0.ebuild
+++ b/dev-python/click/click-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index e21b6c7cf615..294f1d32adb5 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,15 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.17.tar.gz 7853439 BLAKE2B f6218ee690e505921d229193540b4166771465213aee3a3b239da6a88c1a7e166d182750192f984be7369e82c3ae172a9d858d7d30e9eb7cff4a467b543372e2 SHA512 ecf798ce8037d79dbbe673ad583e6414c9a24b807442feb967927b78cacb467f7f5c20e938116829d9b0df0563ee110a8d07294fd40b99dbd6356c8bae151bd6
+DIST Django-1.11.18.tar.gz 7847617 BLAKE2B e5c97a370c47caba2aea53245fdd8d11218c91d8fba230f2e2e9ab8068fbb7ebce6c7a969016d62a08a8226e13664b54202073b7726b7d6091d1f45dccde9ca1 SHA512 35c885e835c5e85257774c65c11bf851e710c745df3366487159f21f90e092236dd8d2cee86e8165945e57fc710989b0ea2747682fa4ce37d5e93d4f664b76c1
+DIST Django-2.0.10.tar.gz 7992290 BLAKE2B af4ee0841e01911c987128f70c0a3570951fc57cbd75165c8b81a4b6847a29fdff7de4f17f5f80e2f4e6b8e87aee017b256f45380fbea931e257f2a999175d78 SHA512 aee171bc10387b2685930887ed9e86564fba273210cd9d7929b7a97eb913ab537408a779bd06c37be63b3b9ecd3e48398e92de33e1a634521872dadf9a3e16f6
 DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
 DIST Django-2.1.4.tar.gz 8611886 BLAKE2B 1deedd3c13c65a7f6ae2262ef1e894046e3151dc7bcd6da274d6e87e60db326cc28a51c62627d00c6feee3807ff8dd13823edf8b4494f0d1499272998f350748 SHA512 a2dc6fb7514f8d79aff98aeb0bd0edb1ede36ed2368e553fded8b58765092d6a2efcf2e9429bb9c7d2c16d466e46a9ff18aaf5911a7dd868f42569c1e82831aa
+DIST Django-2.1.5.tar.gz 8612384 BLAKE2B 71396905dd4524f4ec8112d6c36967fcb381514eba6231b02bedf0f0a7cf9a164bb5d7df30bb4ae0dd8e77c4acd34ecd83d237713fbf58ca8b0db32446986044 SHA512 0a8c72e131867787d475feb0ccd7896fe2aefbbda60d85450fc5ce336eb1f1b7c77d7a17ba0a89e4bac84b7fc87f6c22d7afa356443958e30e958eeec7d3ee6d
 EBUILD django-1.11.17.ebuild 3225 BLAKE2B a47970628dd96cb4001881c57f061752f0484cd6c74cb0800c1eb405d09e0d5e723b609fcd32e702a107d2eefc17877f898f3d049b3933384752e37589938311 SHA512 a0b5e1141cc0f66f9936183a03201cb66e5e76899e255a74dd655ff8a1df9a42a17dfcb963ad3326d9398e94462226f0b5c3ac328590784008be39dbf7aa5e7f
+EBUILD django-1.11.18.ebuild 3227 BLAKE2B 18eb4aad39840e8f36acb32d2c0329d83b741f940b9c41b91571c365b2ec91355651b942741d8056c5e2936478f770d6e2210d3d69acdab98772e6f5f1015db1 SHA512 c4691add4998e9b144cc086d9908d76e354d51a1445ca91c311e05784c59c84e05a80dd34ed91e694ae5195cecc5d04de9ba68982d1ecafeb31db4ffbe17f90b
+EBUILD django-2.0.10.ebuild 3056 BLAKE2B aa41de26e621ab1d328877d2ed1a4c96826d829f96b6a382b376641c6a2154765b8d733a50822e98dfe76f2ebf9814e74c6ac97cea60965f1592c9368ded379e SHA512 d8acbef54ed9bd97ce85c0ca1b94307ecfe6a55522debb19605fd017dba9999685c3ac376d4220d19d12d11a10b88c5f25b0b6b086f7da6e4c75b8de8cd086fc
 EBUILD django-2.0.9.ebuild 3054 BLAKE2B df9058fcbf257e52709db580b2000fe5189432745582c782574ad562993c2848f33a7d15fcaf79487281509c6c20a1e903acdded0b7bd4e2aef0061759532b46 SHA512 0367e645c71e7dfc51308b3c7a9e4d211f8591bd82557a5fa61715219ab5573e804a046b212d7c89d3848a574823c1de16d7d08bbc77264d4bcfc967ae4e95fc
 EBUILD django-2.1.4.ebuild 2481 BLAKE2B 12716c330cc37493aa852f18930e7fb825b3c672cb4257d001b2e6886bca863b6fccde4435b86967b0acea56f2a0c9af2c9859677730e4cc017467a91a617e82 SHA512 efc649f1bf67e8376c6cee59b7c4ef16219df9d835e36ee7f070fad5e6502c413b56fbdd1095ae0d702cdad0b93196252e3801ee6d8d57d92698897ada81b7dc
+EBUILD django-2.1.5.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.18.ebuild b/dev-python/django/django-1.11.18.ebuild
new file mode 100644
index 000000000000..e6b8db11ff63
--- /dev/null
+++ b/dev-python/django/django-1.11.18.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.0.10.ebuild b/dev-python/django/django-2.0.10.ebuild
new file mode 100644
index 000000000000..0761bad51346
--- /dev/null
+++ b/dev-python/django/django-2.0.10.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.1.5.ebuild b/dev-python/django/django-2.1.5.ebuild
new file mode 100644
index 000000000000..fa8668065c0d
--- /dev/null
+++ b/dev-python/django/django-2.1.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 7d17d24c6adb..9cd6e42c549d 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.tar.gz 25901 BLAKE2B b44308bb4a6571ddd092de63401d16e31a9d9b93be9b132fb45503eb9d84273d7c1f20bc5b2e3e2d969506fcf760fff142c37197e0b92dc9e7f6f431fb0abcc0 SHA512 af138feccf8c37b374ee44fcda4938a88107d434df13c173214021b1a3348b152a595095a86982b66ac03a11db8e0f1e9e6a3a65c98deea92330311daeb831a3
-EBUILD docopt-0.6.2-r2.ebuild 781 BLAKE2B b935fcfe2a63e30506dbc2b53546b82b782732f1b1f5d5137eaca7530ba0e5a71c9d4a35a2fb0c4c414ec84420e15cc953894bf9b960250097db8274469bc740 SHA512 b7f6c7da122c533a319d3ce084ef15aabf370b67b15cabeb4bb97f8a25ebd2162d03aaa982cb71fdd8e3a6a2b7453262b2ead1f92cc3536a371f9fab2727e82e
+EBUILD docopt-0.6.2-r2.ebuild 787 BLAKE2B be754d7b76ee6011bf5401066ae9fab36778cb98526f2e3f754e1366e11794c134e93055c4af6dd50c4013600e9927bb517cd7b683cd0e4fc2a413f9451f8e9e SHA512 566eee5cd47e331c021ccfb1f36c0ec035bb71803a67df271c8e91ff60359f100686f403e220d25c980e9084a2f27b9b70651a4c29b8bca58409edf29830dffe
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index f9d51fef540e..151938bc847d 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/gitlabform/Manifest b/dev-python/gitlabform/Manifest
index 2c06062e92f3..5ddba67f1f32 100644
--- a/dev-python/gitlabform/Manifest
+++ b/dev-python/gitlabform/Manifest
@@ -1,3 +1,5 @@
 DIST gitlabform-1.0.3.tar.gz 19248 BLAKE2B 6ed3c38173e6202b5c76061416e5e4508be91ee8efebbe9af0d3131d3500fdcf79fab5caadca07076cb24a69fe3d5ac796418a31f00dd9b8de2c4de9b2340bd1 SHA512 8e79f584af9c5dadba0c1b92cf44214695f07e8e2e4eb1c81632c2aadfee7849d5e65c8a0f8f358864a34dce4f059570eda378db8700fae2c3b443d1af785c21
+DIST gitlabform-1.0.4.tar.gz 19396 BLAKE2B ef4b10e2d8ed7cc58c51c21a8ebbbf86fce4e29c2bfd6b7723f1d8f3cc6f1b873abaa73b5cdfd4ab8beb91c5d65b0a58463fb1b2865b9870511adc643a118fd0 SHA512 26e1038c53f6da871464c1e81b834742a8b83d042e9dc42829fb1633106a7ca400971df8a9e24697cfcca9097c57478a9b97421ca5013d3565c33330d9c8637e
 EBUILD gitlabform-1.0.3.ebuild 846 BLAKE2B dd63ba6969847c97c133e15dc42f376598b9f0e7b4a89fbc352054ed608ebaa7492be91032fcadc7be089627c2c0bc688b9b3393863990a4d7cf6111f88d2cf3 SHA512 7bbe48ffc9956dd36c9d37599b253f1f7607bc1345dffe39192c5972dfd0677686bd3cc01fc9a3161a28492d9959cc7b197bb28c7104b276f019b300b1a96096
+EBUILD gitlabform-1.0.4.ebuild 846 BLAKE2B dd63ba6969847c97c133e15dc42f376598b9f0e7b4a89fbc352054ed608ebaa7492be91032fcadc7be089627c2c0bc688b9b3393863990a4d7cf6111f88d2cf3 SHA512 7bbe48ffc9956dd36c9d37599b253f1f7607bc1345dffe39192c5972dfd0677686bd3cc01fc9a3161a28492d9959cc7b197bb28c7104b276f019b300b1a96096
 MISC metadata.xml 300 BLAKE2B 8f67fcdb13c36ed0169762cba3ac1cb5bd5d090f784f8a535e34f9d62774790dcdecf18f93a70829c6d70ba22b3061e7c9764afe34755474302c0df85eb16cde SHA512 0f23dd252dc9da695e45a9ad35d01029b71d658e9802f46744a65dd21195a95d3af5987721de65f198a8c7c5bbdfcccbd48216c674d25fa24aa581552b426126
diff --git a/dev-python/gitlabform/gitlabform-1.0.4.ebuild b/dev-python/gitlabform/gitlabform-1.0.4.ebuild
new file mode 100644
index 000000000000..a3edec3e8a46
--- /dev/null
+++ b/dev-python/gitlabform/gitlabform-1.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy configuration as code tool for GitLab using config in plain YAML"
+HOMEPAGE="https://github.com/egnyte/gitlabform"
+SRC_URI="https://github.com/egnyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "/pypandoc/d" -e "/long_description/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 1a83d54e14ac..6d19148bba31 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,7 +1,7 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.12.ebuild 1078 BLAKE2B 458d9db8a53c1ff0d076f4ec9b189ef0dbe73c2b2261c347200825df8a63ade022181b80590ece02fce1548f8aa9e24e282ff4dd412eaf319fe54a00c7528eb3 SHA512 94b4be233d2fbd8f88155165673e303ae92ccd1fb33fd9a0be98338dd39871183f1ea12b75ec2765a380fa9af6a34827bbc91745558ca76ac6497d750c96ec75
-EBUILD greenlet-0.4.13.ebuild 1086 BLAKE2B b83981cb8992091fee5df423f5434d5afdbd06ef0c1f8f9f329e2396807d30cc39acd804a5f427ea1c3e5acd0546953c36638fa86219c7e459bb69ac8d09eea4 SHA512 3dc08375923c4e114d6680e9ae9e86623508176c8ea2d349cce535f9f5a5f7b01dd86c5c047548ff5a329ecf77cbe8e5e4bba14c1f330dfdf50085ebba00dffa
-EBUILD greenlet-0.4.15.ebuild 1083 BLAKE2B a665d6bd1e0f18f0ba037c0187cf76e1261e8290e75d98e0aa5ef494560b5b59c39542e5d71b32b670eecd83349df16cea1eaba888f04a77686a92c3cc2d63c6 SHA512 05043a4f4205ccceebbf83ae4ac5bdd4cb89cea93057689f7430930ec5eca4fee62ad65e294e225a0a92243c4cf4374425a83a6071d8a68333422a3d42eb03e9
+EBUILD greenlet-0.4.12.ebuild 1081 BLAKE2B a44f6300782684c246198cd08e402da31ce12c5985e5ceec15a6eceb400a7debfe086ac8247742fcb32126ff23ffd557907e9d792e2b34b603c2a2f2273fbaf2 SHA512 2e8d55611fe7557649612cd79e793a7c4163fc2c11c8a8006c7132e284d0ff35a0a824bd512e96101a9d7c3e21686eff6b5e87e216a1e5db84088e34ca5260bf
+EBUILD greenlet-0.4.13.ebuild 1089 BLAKE2B e77763d69c718a05b57c8d0608ef6ee10a280bd47d193396e6ed22a0e54b53fe6f1582b91a2e31611f9484c241ab5742a6c326bc574564de53ddaa8c50e38e09 SHA512 fc07f61fca7406ba03b813f1b2d6596824f9442e2ab79b3f54de95e7b7bb4a9f57dd45624e8d544ff0c4a20ac885c37dceb787bc38a3db67df475e1517d36055
+EBUILD greenlet-0.4.15.ebuild 1089 BLAKE2B e77763d69c718a05b57c8d0608ef6ee10a280bd47d193396e6ed22a0e54b53fe6f1582b91a2e31611f9484c241ab5742a6c326bc574564de53ddaa8c50e38e09 SHA512 fc07f61fca7406ba03b813f1b2d6596824f9442e2ab79b3f54de95e7b7bb4a9f57dd45624e8d544ff0c4a20ac885c37dceb787bc38a3db67df475e1517d36055
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
index 44d1e86edce4..6ace647d1690 100644
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/greenlet/greenlet-0.4.13.ebuild b/dev-python/greenlet/greenlet-0.4.13.ebuild
index 83376ef6a4fd..ae6f89b2b6cb 100644
--- a/dev-python/greenlet/greenlet-0.4.13.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/greenlet/greenlet-0.4.15.ebuild b/dev-python/greenlet/greenlet-0.4.15.ebuild
index 31c49398afe7..ae6f89b2b6cb 100644
--- a/dev-python/greenlet/greenlet-0.4.15.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 128e14c9d2d5..30ea08c00452 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,5 @@
 DIST html5-parser-0.4.4.tar.gz 267787 BLAKE2B 9fcaec9faa906914d43f2b19381fe3095d4cd009bfb534537d2eabb420195276b3690d760c1defc92ad00e4965b3eb34ce4700d54f4f0291dff88026d890c90d SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4
+DIST html5-parser-0.4.5.tar.gz 275587 BLAKE2B e26db3b6c55d43e26eb08076c59012814c2dd8739d6cba591e34cf8e304aa78bdf3440405668875acece2c21425f26ed9a0edbc5bb1da55da09c17eb52fa74aa SHA512 3c0421dd228ba5f3544f188fde5391d6be0fe92b879cf1e7697b5e5612a9e5bf08863bcb76f4297a59bfbfc69010a95f5d97fff78a7e6d26c889e173b07e4ae5
 EBUILD html5-parser-0.4.4-r1.ebuild 781 BLAKE2B fb3b90ff9be74f83720840b7047c7abb26f748ca93c995a133790e09e5babddbe11e1feb5d0f3882e246b8f9d35ec84aea659031538447a135b929803812329d SHA512 b6601a36c802d85d205885ce269ec52d39b2fc8d657aa16b27b754fa75e2c0926b4d03d96d7d2f35e444fe95c556193b394ce562880e35d863cd9f484a9a9bdf
+EBUILD html5-parser-0.4.5.ebuild 870 BLAKE2B 8a5bd6e9529fe46e55477a81fa20a6e5ab12deaeec856e43a97f5f8d2eba1afdbacdf88ec1cdd43d2b018af1974717126d2c8c9ceca8df327179a69897e9cb13 SHA512 e83d145ef01809e19a2a99108ac1f8ade406b331587b9815f83b8d2e92e3c628facfebf1dbb3dee70114175ca83234767c413bca1a9a47b79581d5e369fa7471
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.5.ebuild b/dev-python/html5-parser/html5-parser-0.4.5.ebuild
new file mode 100644
index 000000000000..7ca21bb61c3c
--- /dev/null
+++ b/dev-python/html5-parser/html5-parser-0.4.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Fast C based HTML 5 parsing for python"
+HOMEPAGE="https://github.com/kovidgoyal/html5-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-libs/libxml2:="
+RDEPEND="${DEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	# Soup is not used when lxml is available.
+	rm test/soup.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+}
+
+python_test() {
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 72f2ab1dd41e..cfd42044ef4d 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
-EBUILD hyperframe-4.0.1.ebuild 493 BLAKE2B 03ff8465655caa23e221271680f43422d4db8b47cec2a252c506cabe956c79e6719a3d7614fe162e863db371ecd6cb3f8f0b971a2e964eb3ef18e93c28d2d9ed SHA512 da202b6a9adc5fed4d472b02444ad41c5aa8fd7c617dc03bb0b703ed11f659ea7109c690ba98f1cc7f5e482947dabd799782e58837fabcbc49936ac0880749ba
-EBUILD hyperframe-5.1.0.ebuild 663 BLAKE2B 83dc32e5acb06c47d554537950ac5d572e7c2e2ee1eae454c014962d5d70777780227e6a36285aba4c68739ff10cd9c57b6264903755988bc104cf6224d0cbab SHA512 28f3faf902942b3a0b489f68b5e13b0d05e0d3b07deac5e8be9cdd01e1a84ae208c36deae36222d326cb55b5aa5beb7822728273ab3e3fe9bf071c68290102d3
+EBUILD hyperframe-4.0.1.ebuild 495 BLAKE2B 4fde18e35e0d7fe8b29bd6be5b57e1be307f3c2b4b407be7ef12360fafa73faf7f13a8dedc13635c9b0298f3b22c8068d8a9f0a7af35d29bfe35ba9e673e018f SHA512 53a0d42f712a8fd89909e66dd5d91b8e4584278f273debf5d9f63487fb18f30988d5193b1f82c001276bf39c91d3690796f61008b26fe48d1f2461e5e530fae6
+EBUILD hyperframe-5.1.0.ebuild 666 BLAKE2B c57a300f628f3df8ca2ae7c73221491c13acf88c75390eee825d17fcce7cd4ed800b2880d7070fe53336b526664677e7f8495d406a7c0428e671b9f56be85e2a SHA512 01e4aa5d7a649e18cb4388f91c061d9b41669aae3cb675e38f2cbb080be97aadd53dd138d13c975ee2bb50e7ebfa1b2d588d5fbd525672800f1a6650458ca450
 MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 62c5de5a7f17..d2278b8750bf 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 4dcc777c6061..2720b56d114e 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 9381095fba0a..f4a0430c0c22 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -3,6 +3,6 @@ DIST libvirt-python-4.5.0.tar.gz 190016 BLAKE2B ba3aa68b2de6179cfddaff54bf96fa87
 DIST libvirt-python-4.9.0.tar.gz 191922 BLAKE2B 272f0827faa7083e4896b34cea81554505e38733313df556d608fbf0e2ab935088ec5d57e9678c7679e172ff99a619939abe8cbd828b49655de70daf11d20efe SHA512 7d1345693c87f11be9dc751212820f4c4a519a467703f0ea2fcafd0e66d39941686cf7c84c2c68e8639889da1bfbc9176a72cf1059c87d76a49b2c74a7b05c0e
 EBUILD libvirt-python-4.10.0.ebuild 976 BLAKE2B 94acfe059fcf5e53a03fcf74b9832fc43a568f11ddf1f053a34995d72d2bf55b16749c77916a4f14874eb42403d00e879c49043a72fec71190c025ce0bdf8421 SHA512 c0750a64152833580e078d931e37d91f671781fdbc3d4b4091937735b2788c72c49ec0371d4b1e39888bf4f3e720d8061b1fb5002d62b017daf5e7caf2554d13
 EBUILD libvirt-python-4.5.0.ebuild 982 BLAKE2B 4becbf00df8460246d3e933df6b701c95a616ac6f26878acd29200e5d12101fa94edf59ccfd9847d2ee03e94aacc1df78cfcf2da66973021a181962c885a84fb SHA512 c1c53e1a5d7fe3e71a7d5f99d943c1da3e118151fe158ecd0c50f8f0d40a9ddad370759cd65bd32453d0ba2d4a2f31b7b4a25718f530e784e56b39919345f574
-EBUILD libvirt-python-4.9.0.ebuild 978 BLAKE2B 77d08a5550dbcdf299b20a2340504cb01d81f15fc9c8cb18e7470455bdcd87faf738b5faa0b1a6e4f66b7aacce0c0abfda32ab680d3792fc441b30b870697e74 SHA512 a95b3c7e70f3bcffa8f8a8d740fe2f227089bbe41b18bfaebee13429877c1af355b0e9bb5098f0dc364a1d8068b24930f8d5020d26943ee15c2f7a50af8031d1
+EBUILD libvirt-python-4.9.0.ebuild 983 BLAKE2B 17ef41fea1af1a1abc363f31e4d69e7f720d06e4461daf5d27daf51dd769e3b114de403cb2ed76cc35b8990c949640dac49ebfeed9953fb836975120c11a05f0 SHA512 01a2bb6bf834d53d030cd0bbe1023a7a170e3476da923171d3266ac217fe11a2c7eac836a129524f4a487fd4c7d77a424efb6ae1f222923644e733660067af8d
 EBUILD libvirt-python-9999.ebuild 976 BLAKE2B a427ecbeaff49398f9e9ac09674e881c143bd5e966b6b90d0d998c70dcffbf64419d651556e954694fca4807e42e7b1f84ab34f91d9618a93e1c6d106c65cd3d SHA512 6d7e5753d16cb3402475086d4ce4ce5d95984c2cdef6444d6ed1662fe6c24950826daf892e5360e0bd208ae1c3457b7986b51ebb877a401897e7e032e1f5ca27
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
index c3935e1caeea..e071f09b538f 100644
--- a/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS="x86"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://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/lxml/Manifest b/dev-python/lxml/Manifest
index 78cc3664dd6f..fb543505572e 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,6 @@
 AUX lxml-3.5.0-cross-compile.patch 1518 BLAKE2B 70907747332021789933759d3e2620d7b70a223664608680663472b648e2da103362bcbba6ee025375579cc2699432a44fc9b44169ba9c830ad546ebd3abd451 SHA512 b53925979e554552e72e58e06df579d2eb0190cadc304d13766852eaaeec78641deb1ef10700a0b52aebbdc998979830413a76a56cf221bce2e9a24926e1680b
-AUX lxml-3.6.4-fix-test_xmlschema.patch 1483 BLAKE2B 95c7610f2626471ca76946993463eb243501916788f4812f4489ab86f3b49494298bfa780b4d06ff8fc75d46ecf969ae389e4e418631250b5c610225f46a11d9 SHA512 5ea10849df7966b8e1c55a699c1489f72714449de3564ee13b5d9410877db3691e82c1d37cb6ea60c30c2deac33bb839583f0bb81a3551baac39bf14ca066229
-DIST lxml-4.1.1.tar.gz 2380804 BLAKE2B 4d3c4ef0472c7af7bb4185142a8274b596dd55a908d41f5295d0a78031a7efb3aef8893ca739f8db0675e44d4b0c346746a2758d31a54825c06a153203599ab9 SHA512 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
 DIST lxml-4.2.5.tar.gz 4414081 BLAKE2B c1c75a0a0c33011e2becb729de2c15dd786dd12bddeba4f2f26032d0d17104f258b471f5f961cbf96340df66cbce3e874d7a16c59731af280a309132b669d1b9 SHA512 4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe
-EBUILD lxml-4.1.1.ebuild 2255 BLAKE2B ac130330e175fc5639729716306218108619bf2e681e4f9338f08fee19a8687c76918a6cedfb967ba5279db1dd351b882c61a8785595e857eecfac7d4130211f SHA512 d46331d190b2a450a25f8049513b4eb949cefc664a432be3dbb3e9d1760706ce18ad3d6f59b858211be96cd022c1c31d5f434db5f34b8f20206403e41e2fbe1e
-EBUILD lxml-4.2.5.ebuild 2353 BLAKE2B 5ac6a995b3fed4b292a529f8d112f6c212dbdf4d5aba3c7c6d05da720c1b79a78919e9f3919e793440b280df4f5947dcf00d88946152da1b681466ad6bc803fc SHA512 96c71b0b55be968fe85765f9043e44bb517e4cd7e420e45dbb3fbd269cdf390fb60ec588873498d63bb07977206534c6d9bb2b787e68955f7da6b6469391642f
+DIST lxml-4.3.0.tar.gz 2483162 BLAKE2B 3f3646a47a0344af22bfb567a0985a27e8a46051850e99b5e82d0bc59c94c0e9b19ca93cf6d5d790599e81c9513686c3462ad6544ad658d0efd77ad431b07014 SHA512 49d122c8a6dafe50195bc8cfb3ea52780054a57762132c000cd976fdbdbabaab6bc8b95b77d124ae144f33c24d71793a2debbebf789d5ca866734a984edac8bb
+EBUILD lxml-4.2.5.ebuild 2350 BLAKE2B 9dae62d57ba95ad0ddc7358552fe2160fcfc70292b0a91d98d7b75fe4bd72b7638ce9febdf64bf504ff4709241f4054052792f05d90a969730ddc02739a8a811 SHA512 f8320c3324b14db07b442074734363744239b3f69e555b2d6a7cf6beb50349fda22992353923d5e142f04e00e6b5f257d1d9f84999fc5d1e6fe649414e2c6d7b
+EBUILD lxml-4.3.0.ebuild 2444 BLAKE2B 63e3cee7de3363d948a5bd34e50a0d90d771b94895e18a7249c66ed60b19ffa4703af30d0390bf21bd9f6af581db463d617e0477959f7c6a5115d6b2bc538062 SHA512 0c0fef86e16ec497f4a42f7aac2e53979ea5098131eee87912788f64716d118267baf8e29096df27096ae412c098128e2a9c629866c607f8d089ae9b207705bf
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch b/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
deleted file mode 100644
index 13f963ab2e2f..000000000000
--- a/dev-python/lxml/files/lxml-3.6.4-fix-test_xmlschema.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/lxml/tests/test_xmlschema.py b/src/lxml/tests/test_xmlschema.py
-index 26d8432..b41c097 100644
---- a/src/lxml/tests/test_xmlschema.py
-+++ b/src/lxml/tests/test_xmlschema.py
-@@ -168,31 +168,6 @@ class ETreeXMLSchemaTestCase(HelperTestCase):
-         self.assertEqual('ho', root[2].get('hardy'))
-         self.assertEqual('hey', root[3].get('hardy'))
- 
--    def test_xmlschema_parse_fixed_attributes(self):
--        # does not work as of libxml2 2.7.3
--        schema = self.parse('''
--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
--  <xsd:element name="a" type="AType"/>
--  <xsd:complexType name="AType">
--    <xsd:sequence minOccurs="3" maxOccurs="3">
--      <xsd:element name="b" type="BType" />
--    </xsd:sequence>
--  </xsd:complexType>
--  <xsd:complexType name="BType">
--    <xsd:attribute name="hardy" type="xsd:string" fixed="hey" />
--  </xsd:complexType>
--</xsd:schema>
--''')
--        schema = etree.XMLSchema(schema)
--        parser = etree.XMLParser(schema=schema, attribute_defaults=True)
--
--        tree_valid = self.parse('<a><b/><b hardy="hey"/><b/></a>',
--                                parser=parser)
--        root = tree_valid.getroot()
--        self.assertEqual('hey', root[0].get('hardy'))
--        self.assertEqual('hey', root[1].get('hardy'))
--        self.assertEqual('hey', root[2].get('hardy'))
--
-     def test_xmlschema_stringio(self):
-         schema_file = BytesIO('''
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
diff --git a/dev-python/lxml/lxml-4.1.1.ebuild b/dev-python/lxml/lxml-4.1.1.ebuild
deleted file mode 100644
index c2534ff1fe52..000000000000
--- a/dev-python/lxml/lxml-4.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1 eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.2
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
-
-	# This patch removes a testcase that fails because of issues
-	# in libxml2.
-	#
-	# Upstream bug: https://bugs.launchpad.net/lxml/+bug/1608479
-	"${FILESDIR}"/${PN}-3.6.4-fix-test_xmlschema.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i '/sys\.path/d' test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if [[ ${EPYTHON} != python3* ]]; then
-		local -x CFLAGS="${CFLAGS}"
-		append-cflags -fno-strict-aliasing
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.2.5.ebuild b/dev-python/lxml/lxml-4.2.5.ebuild
index 83887cb6fdc8..db70a534b3aa 100644
--- a/dev-python/lxml/lxml-4.2.5.ebuild
+++ b/dev-python/lxml/lxml-4.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/lxml/lxml-4.3.0.ebuild b/dev-python/lxml/lxml-4.3.0.ebuild
new file mode 100644
index 000000000000..38415295fbb3
--- /dev/null
+++ b/dev-python/lxml/lxml-4.3.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1 eutils toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# apparently logs have changed with libxslt upgrade
+	# https://bugs.launchpad.net/lxml/+bug/1782078
+	sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 57c8a8ebe443..a943fb9aa02c 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,7 +1,5 @@
-DIST mysqlclient-1.3.12.tar.gz 89793 BLAKE2B 7dbd582b72b27a71a4fa7a6fd9f051eee7f1d820d447cd5463d4060725f3f779e5bb91500aeaf9d11460f0d72c76732fc610dbd1555c6eb5a0ba55ca3e870c03 SHA512 fa267ad14ee98cd994c0c80b8a84b592e71f80008348d67a9c970c84930504a02034e4cd2903f0acc7dce416c485d5629be6e6e9dc52de1774dec7345d5d64ee
 DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
 DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
-EBUILD mysqlclient-1.3.12.ebuild 833 BLAKE2B ee12396fa34929fca62f8fe1d02529290e92e7e5c0ab7b9e78ced3880c5c60a159a2c2e758b57939acc1b20f9b7c08e817892fbd325d5a3eb2ec78e26fec46e4 SHA512 3356f451c6da3cbea73616333ee40756068f9d5eb310f152ee4f17f5939d24c0f30ab6ef1042744204b51ee4be5b2cab0a3485eaf1b50bc4589ca8eae0bb84bf
 EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
-EBUILD mysqlclient-1.3.14.ebuild 834 BLAKE2B 6afa9194eae36397406181bc83203fef7a24d4dabaa31b12977fa4df17b64752a3d3aedbba4625c8102186cc9be06bc0f67749193f456760b4c870ede08f2926 SHA512 eaa182e6d070f73b246989836c80a312d1c393cfd40fed1d17cfb581b1b443ddf874a79bf26432231e3ead14a4e239f42b09ad2f5e293eb025dd1236604d95fa
+EBUILD mysqlclient-1.3.14.ebuild 832 BLAKE2B 71d30ed916d8f5ce442d26aa7f0ca559c083fdd2e81c8fbb64fa9e42d6c7b4d5d31cc11ae6bfb21769ec19f2aea827b75e655269d90741686ef1b4a14e3b23de SHA512 6339636e0fbf4b2b5ac9731e01153abd9ecd17a4e444c6bd10b7d603d03e77201fbc9d6f8fb02e27da1e0d9920b84c78cdbb97290fe07b6d4ea84ff3469e9991
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.12.ebuild
deleted file mode 100644
index 90e4ee18eb5c..000000000000
--- a/dev-python/mysqlclient/mysqlclient-1.3.12.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of MySQL-python"
-HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	!dev-python/mysql-python
-	virtual/mysql"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
-
-python_compile_all() {
-	use doc && sphinx-build -b html doc doc/_build/
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
index fbc34295c8e5..8bf135f8422a 100644
--- a/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # 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="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 87b87ad13a6a..2a72cb4f7fc1 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,32 +2,38 @@ AUX numpy-1.10.2-no-hardcode-blas.patch 3295 BLAKE2B 300b64a2867cb55fef23aff5806
 AUX numpy-1.12.1-no-hardcode-blas.patch 3473 BLAKE2B 442b505aa6a09aece4e3e48c43fffcbb35e129f99097233d7387ea41bf3926ed72be4666025d4c4bbac7a5e9e557e54cc0c439d748cbbbff6ca075e7a1969c56 SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a
 AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
 AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
+AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
 AUX numpy-1.8.0-no-hardcode-blas.patch 1153 BLAKE2B d812ddc3069d23f211026c14ca36aa907c254b5e5305e720bc87bb5fbd51dd032f93eecd245c222ae8fa81dbe1541a2ffb1524e685a05f238758b4487e3532b9 SHA512 baa29a0c981ede608d890e776026961fb71156eb7804f702623bce775e3b6ce3bb28ced252d9c6fe991429b690b3eef8468d703f79247820527648d6484d23f3
 AUX numpy-1.9.2-no-hardcode-blas.patch 1821 BLAKE2B bba698b76576a29c24f69a5aaf92173065d11d2e01ae8e76a66650484f18761b62cb49d348e97a62350cf74d9c728f2d26e94b903b62c59c903e7022c31fefc5 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6
 DIST numpy-1.10.4.tar.gz 4069996 BLAKE2B 9f315d1fca4415b148d4b3bff6f223930bab3d0cb9e19fc5790d71218549c9f0031355e8a95eae9c866ceaf6391a3aa41206bf3f48477b6cabbbc52e0287c246 SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79
 DIST numpy-1.13.3.zip 5021189 BLAKE2B 5a2890a8e08425a2d537667cb2c621a57e1d442951d0b06aee2a9a153bf76652e9c4cbaa11716697a85c580e1f30043d5eef10fc24245074e6431a873ff80c34 SHA512 b77969372c8463879b452dc54830afabb719e6814a2bb1ee0062b463155ac709d1cd48839b28b74aacaee8aced7ee35870ba43d59293ff54f90bc0f717ca7737
 DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
+DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
 DIST numpy-1.8.2.tar.gz 3792998 BLAKE2B 00d22c72ab6f919626d3fba0edc477fb9c19f9c299f78cff6102e1860e3d1baec8f3b17aa23be797e9a34630428174de3f3b630c3f05c5340024dc6314fad8cd SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c
 DIST numpy-1.9.2.tar.gz 3986067 BLAKE2B e5ae6717badac01186a5b0f36729c1c01dda1fb4238978858c778f08f17512c5d1f3902d551cb0c67a77c1246ce238e588556188e7e6466c27ebdde09879782d SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9
 DIST numpy-html-1.10.1.zip 9663942 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
 DIST numpy-html-1.13.0.zip 10324817 BLAKE2B e16357e615b30249a4c41582b46b194e2c3113996260f0ff60e5b64ce9b344a05a5f372095a9f1187e8474bda4078f41ad8372c801637278d3478176de455eaa SHA512 2dd769ec0d4967ba1797339170b0f9bf694a0a304cffb8482a037ba043a3bd3a9207e63a1ffed2d7ae96205d3a1a72fa1b15eeac4bd2e565544363dd9742f542
 DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
+DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
 DIST numpy-html-1.8.1.zip 9703711 BLAKE2B 1f9d9cb4e65fc2f03d07da9bc34de9c8c4f93f5267689abccb0e2383b23babfed52ae6c3969738e78eeca7b32f49c90f9f7bb92dd432a6b87e082b67c1f214a5 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071
 DIST numpy-html-1.9.1.zip 9839137 BLAKE2B 84b4c15ee20d8a1e6514baf47b96ac770690357278ff22b48c427509534c41df9e14165483f625955a7c6c087b0b5e13e68bf3d06951352a8511d6e03cc65d9f SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4
 DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
 DIST numpy-ref-1.13.0.pdf 5047809 BLAKE2B c7e2734311918c6faa46b008c4802bb090a728ca22337695755e885a7d7d341ba76d5e489c9c56cf89a9d0545bc9b24787e193c4bc1af2631a368b812fe74083 SHA512 0fe28be029602f8b8dc12987da273581b42f123a9d605321084d4c05233cd31ccff0efb17b99c3e8cbfec5f8de11252a99c1ee5c43d37aa5fa57d712f4bb4aca
 DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
+DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
 DIST numpy-ref-1.8.1.pdf 5348248 BLAKE2B f087fbbd3c789adebd2902db0a2acc8a8748ccbb5a1e7e064effdc91e92c7dcf087ae36436fc52d7afa12a12ca2fc0f5f5617177bcd8b9745a7155acd10d71fc SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5
 DIST numpy-ref-1.9.1.pdf 5318122 BLAKE2B a893be075c823ab1a6ad3b2e38e8c05aad20cc2abf9307af9dac87b12f029fe07b535b1f385a4315bcc9590fedb79e25bc5e1659885ad61cf010d2f45ae6edf5 SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba
 DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
 DIST numpy-user-1.13.0.pdf 580593 BLAKE2B dcf86d0a87ceb7062b8fb339d37bfe3c3fd5e166f3079a079d50f6afb51bde9754d050c97b3e4aec237aaf797d70a2458fe0f26beeeeaf1594330e08c07e181a SHA512 d3891d449b72c2d97af28182e0bcb12559abc114f8dbf0e0c68362c1af50e6aeab565b31b4aa44ab079e8d47f550081a79a4066c37fc52a1c70c05be45eb5c11
 DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
+DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
 DIST numpy-user-1.8.1.pdf 408305 BLAKE2B 2956e42ebad45b021f72c7e71d357d953ea8a26639b4c6e81dbe1718052304ac5ce1a7f96646d94ad48bf737ddc6962fcbc304e31dfce32b85cb8165b0ada6e0 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c
 DIST numpy-user-1.9.1.pdf 418111 BLAKE2B 683ed35ca9e123387a08a88047ad0cfd8bf3698efee7c17c3b57941f57f86297798787f13b142a1bf806f775e70bc116109decb281ab82959c08932c06aa1f3d SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45
 EBUILD numpy-1.10.4.ebuild 4094 BLAKE2B a20c04c9445b3b13d30706b2fa26633541722175c4f2797777cd90c5c5d1a7af5079009bbdee026b0b437e6e82ece7efa60f16d59a09e7c39b2139162c76bd86 SHA512 f0817e879689c05b76cfb921db376828227f947fec740126e59969bf75933d5b0bd969f5dd836c7060a4bcf079ab7174db33e0388629d8f323585d7e31ce9d18
 EBUILD numpy-1.13.3.ebuild 4646 BLAKE2B 717d5acd1683ef3f5d7ea07475b7d3a5555991aa2240c5cade1170f01092e12e315ba99d408f2f04e8e998d5c0820bbc2034ef177375d729d19280e6940c6f66 SHA512 2eccdcda9e51aeda860a1cc02538708709687a202a8d0ed9cba6ab6fa45ce80153b118bda265944235040027d7b15f36c281d130e2e6a59a66d9ecec046240b8
 EBUILD numpy-1.14.5.ebuild 4065 BLAKE2B 42f9c13392d122e0aa3fa01d2a55d370b4d37a1f932cb860b1f9d81c551632f3778a4ab94fa911f7a9db6a9686d1541d54f450cd9e78fc9168b2cb00bf9c15a2 SHA512 915326a6ccbf196e98e3061a4abc8817246cd6b46cdeaafb7d93dc577358da626334563398def155de38fd090a75c3c9e4b45753c231851ffe6774755e5e74d5
+EBUILD numpy-1.15.4.ebuild 3870 BLAKE2B 037ed926b7d3c12a494c7f18fdc2ac4d58ddee86419b29b189ec3009d418bc3bf821b78e4cfe55edda602b804d0b6516acb7e81961a530466d4ab327f77b19da SHA512 19ecefb564f0e6b787d37f591f373800eb30328e90740c8c29964f8d0331fa8cbfcab8c0fca427a2dbb5beb239eba21e3955c7830e633760ad97fd829d72eecb
 EBUILD numpy-1.8.2.ebuild 3945 BLAKE2B dd27488a9771219b8df7c8546067ec710168d39a7675c963846197aac6959907d402269efdee44d9e2a42edcfe6a3f27e9e360604df77d620f8f39f96427201e SHA512 3086b989bd9ac6f8b07839afaabcd8f683888ac5f0b2e1fdeb951ac49c79af4585be7984775af8d3a03b89957792ffeb065b54c624d00050bb389aac67f0fed6
 EBUILD numpy-1.9.2.ebuild 3958 BLAKE2B e05e749e5f0c4b3f0346cf0dc78531421ab081bcea12ecef30219d0504a77c0f99ccacfaf355bbf008c2af07434d7989e4b2c4417e91ad48e70407535a23a1be SHA512 04f442c6a363caad3313418f681e264a7e680c19d235aa132b27f2d0caac8495bcda7c75ea9904ad0096e844beda1ccb15dd2f4562e632a1576918279569cfe4
-EBUILD numpy-9999.ebuild 3355 BLAKE2B 09f61bae65c20b5736f5375c2ce6c04670f43f953b820ce30c329c8053f1b151490c53d00209fb84b2167ff11d3b2901dcbf5780ea1d057787f0218f8a9a322e SHA512 9ec2ffc43301df0664b7448ea3d094c8fa6fd587c087c95e0ad91f9cda780ff605653ff6e003234d8e4091ed30973ba13265dab882d1f4e854090958c2ff35ba
+EBUILD numpy-9999.ebuild 3340 BLAKE2B b0a52f63d54bc0cfb926dc42a64d08fe36112a7080f84a37dbb08d8723bfb84c9cf6d676fe9d440a0f22fe1fef25ef43cfe5dedca8d214a6fb81425485cba06a SHA512 4175996a62f791e1893d5e56b469c4db365f613b051a0bb08be679cb26515a96364e0a4922631db4417eda7137d218e169563aa23f5d575983f6a9e08a5d032a
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
new file mode 100644
index 000000000000..979b56bd6dc5
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.15.4-no-hardcode-blas.patch
@@ -0,0 +1,76 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index 65d7de316..a85640d30 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -364,29 +364,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'accelerate': accelerate_info,      # use blas_opt instead
+-          'x11': x11_info,
++    cl = {'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+           'fftw2': fftw2_info,
+@@ -731,10 +709,7 @@ class system_info(object):
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         c = customized_ccompiler()
+@@ -1685,7 +1660,7 @@ class blas_info(system_info):
+             lib = self.has_cblas(info)
+             if lib is not None:
+                 info['language'] = 'c'
+-                info['libraries'] = [lib]
++                info['libraries'] = lib
+                 info['define_macros'] = [('HAVE_CBLAS', None)]
+         self.set_info(**info)
+ 
+@@ -1717,16 +1692,16 @@ class blas_info(system_info):
+                 # check for cblas lib, and if not present check for blas lib.
+                 try:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+-                                      libraries=["cblas"],
++                                      libraries=info["libraries"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "cblas"
++                    res = info["libraries"]
+                 except distutils.ccompiler.LinkError:
+                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+                                       libraries=["blas"],
+                                       library_dirs=info['library_dirs'],
+                                       extra_postargs=info.get('extra_link_args', []))
+-                    res = "blas"
++                    res = ["blas"]
+             except distutils.ccompiler.CompileError:
+                 res = None
+         finally:
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
new file mode 100644
index 000000000000..9bc29bd049be
--- /dev/null
+++ b/dev-python/numpy/numpy-1.15.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV="${PV}"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://www.numpy.org"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+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"
+IUSE="doc lapack test"
+
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
+)
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	if use lapack; then
+		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
+			[lapack]
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 # bug #660754
+
+	local python_makeopts_jobs=""
+	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
+	distutils-r1_python_compile \
+		${python_makeopts_jobs} \
+		${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TMPDIR}" || die
+
+	${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+	local DOCS=( THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-9999.ebuild b/dev-python/numpy/numpy-9999.ebuild
index dd08eecdb020..b2a2c5ad27e4 100644
--- a/dev-python/numpy/numpy-9999.ebuild
+++ b/dev-python/numpy/numpy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 999296c69700..96ba3f69986a 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.44.ebuild 673 BLAKE2B 0064dca7e792d7c31e961678463ea800e3eb80cc0872e81f5b1ee2a74aec8816638d79c86ce6890085c617566197734e0021efeeb1201bb4a6e50f0f4854a668 SHA512 48ec67dbb3d4c1edf906a2d80d0045271a82e4e671dcfb3751bca236a0bc45e7c391f76a69446444eef8166bce2e4205d8e4798234ef5c358cd67c5dcdbfbc97
-EBUILD olefile-0.46.ebuild 680 BLAKE2B 0aa0eefdf4a23d7b21244354eb579cd0a9ed1368e9a5f3a04a2bd083c8407ee3b735e01f4b97e55b6a50bee29ead4a99ee4b0fd025812f07b3e67f642f1aeb83 SHA512 81a90a1d88b695561ec6edb6ffab4c5870ce41602bd2648bc9f90b82f4d84b10c1c6083d666260ee8582d802f7d47ce53d057f618337e842cce19e5d26ca341d
+EBUILD olefile-0.46.ebuild 687 BLAKE2B cba198a0dc51318dd9a57f0552c8a43d5a2543f8e3e48d011a62d195f5520ece56b410ef1022cd02fb781a35ad91e589672baa94c2815e06eedd9b406b61027d SHA512 ff9a91f5189b75604657de610b85e9b19d9f5ff64e7f4be324cf3a68a15cf5f97e91eea6cab66aa4c356229fee1429988c737e5894fb6b3a7b4fc1209e3b404c
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild
index e879ea93c7fa..5ed10fe73173 100644
--- a/dev-python/olefile/olefile-0.46.ebuild
+++ b/dev-python/olefile/olefile-0.46.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index a2dff6632531..287f81dd0782 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 629 BLAKE2B b9feb9194e33bb22e9d9a3d702c52e84aed9637cb7b544ef44cf9ed37647d0995458c00890d8f9b46963e95525562ee5e171bf14e2855fe0a96f3afa49c274e2 SHA512 18dcb324dadc53182a0d6f87edddc8d5e8d86fa869da830d6d061125b94c31828f605cfe6540765dce43f054f322ec0fd30a621bd0f6318cd7be1a4a62a68aa9
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 640 BLAKE2B 4612d417ee6d549b6bd4dea7d72354ae6ff01cb4eb69a01d62a6c1e8e80bc1a5bdc29c0216bd6d10c1e6b660c2d2d4abd96afa6597acb3bf2c4ea6ac34a29952 SHA512 08abc84eb287043bda7f649476fb6651ce6b942bb4484619749902af2cf13b0d660e60937c07d2c3e15de6beed56fbfd8303df1bb933b602f90bda9cd199c682
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 17d0fb32dc57..1e57f03e52d8 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index b53a2a37fa57..6e9f90661485 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,9 +1,13 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
 AUX pillow-5.2.0-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3
+AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56c1b1dc6bc65227aeb55c9074b2318462ff1447597b75a269107ccf223363054b310ede3771448e813589b71a220eed SHA512 a53a5ed25c18f1c5a8db01dde5d2c51dd34387d66c4cdbdb624454d0a2a19f4e09a771490114744de0299231d95ed02360223db5c227cdc540752a1c60bccc92
+AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
+DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-5.2.0.ebuild 2720 BLAKE2B ee848a4cfcfc58f3d58c12c94ade4f07e4f11de712dc48ff7b7a1bbc64d9fb757c5bd8af36444353f2a8aa6b8927d8fe9d0f1d08d59dad2abd6a2ed1e50a192d SHA512 3d9829a9111a6f4aa81032e09358312386920c10b2f1e71b4e0fdafaa8f376b917013e52e2303f5b01f19c3da0da06844fce40cb9b4d9a54fd9444c2e8e94cfb
-EBUILD pillow-5.3.0.ebuild 2331 BLAKE2B d453688d152bd345242abd0bc55f51e35ebf8be5fc623cb121287b4ade989021deb10c226a77cfb4dea439df040d1befff2ef176d2ab3511485630d42d640cea SHA512 2799810b31ebf952d513221f81e169b797d774944a539f4a52104e855f3ec9714f7fc1004f6c080664ee26aa0e19ccfb4d459d9277e3bcf172e0936a12613df5
+EBUILD pillow-5.2.0.ebuild 2726 BLAKE2B b1348ed1e9fcf05a440283451ebef5424101e3481d15493e3f6e35349dfa1948aae274eab8dcd82b6ddc79fded4d473f77cd79efda76cf0328586071f4dad333 SHA512 bfb638325d369e0f3aa018fcadc5ae8d56f5cb14fcfa0a97a105c6086c5fdd073afa3867f4bea58b85303bb94d0b41450f971e7d321c2a107a02d4f0cdb615bb
+EBUILD pillow-5.3.0.ebuild 2313 BLAKE2B fe5bf8d779a8b9c329a341f0c5530f1bd750c73bfdc35eb36e33fdf5245c3c58c09fe2b2e20649275ee0dcb483e7e2d7219557c7ae95c94564a3d7ac4f3ca3c8 SHA512 b44f5ebce53f79980627b1bc2bec30766c2375ee7524113c91176bfb013a217a2f7ab1888d7eb2d82fe15871b6d351a91e643c53ca1564bf910b55a6ec2a5eef
+EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B afa6d46629d173a37de60a50bc4e0942cd07a502c728d39d260cec21b21877605c1d802e05e8a2ecb9be40793d235824bf9ce12f8da6af454162f6bf79890818 SHA512 6e28e2c71b65f7c0d715817d852d9e5dcf89d97fb7a51199dd71d38f3959f4444cdf7ee890a06796f581c5406959dc189015e5e4eadac45a7a7aa0af7a848f61
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
new file mode 100644
index 000000000000..ec227b3f80a7
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch
@@ -0,0 +1,28 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2019-01-06 12:12:16.000000000 +0000
++++ b/setup.py	2019-01-08 23:04:45.574698210 +0000
+@@ -197,12 +197,13 @@
+ 
+ def _pkg_config(name):
+     try:
++        command = os.environ.get('PKG_CONFIG', 'pkg-config')
+         command_libs = [
+-            'pkg-config',
++            command,
+             '--libs-only-L', name,
+         ]
+         command_cflags = [
+-            'pkg-config',
++            command,
+             '--cflags-only-I', name,
+         ]
+         if not DEBUG:
+@@ -298,7 +299,7 @@
+         _add_directory(include_dirs, "src/libImaging")
+ 
+         pkg_config = None
+-        if _cmd_exists('pkg-config'):
++        if _cmd_exists(os.environ.get('PKG_CONFIG', 'pkg-config')):
+             pkg_config = _pkg_config
+ 
+         #
diff --git a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
new file mode 100644
index 000000000000..d3e95eef5164
--- /dev/null
+++ b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch
@@ -0,0 +1,12 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2019-01-08 23:06:33.082873069 +0000
++++ b/setup.py	2019-01-08 23:06:47.707165225 +0000
+@@ -356,7 +356,7 @@
+                 for d in os.environ[k].split(os.path.pathsep):
+                     _add_directory(library_dirs, d)
+ 
+-        prefix = sysconfig.get_config_var("prefix")
++        prefix = None
+         if prefix:
+             _add_directory(library_dirs, os.path.join(prefix, "lib"))
+             _add_directory(include_dirs, os.path.join(prefix, "include"))
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index 5099bb0a2777..8a22a6354a30 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	)
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
+		<dev-python/pytest-3.10[${PYTHON_USEDEP}]
 		media-gfx/imagemagick[png]
 	)
 "
diff --git a/dev-python/pillow/pillow-5.3.0.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild
index d05df3d9e900..2f99b2249374 100644
--- a/dev-python/pillow/pillow-5.3.0.ebuild
+++ b/dev-python/pillow/pillow-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
@@ -75,7 +75,7 @@ python_compile_all() {
 python_test() {
 	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
 	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx pytest -vx Tests/test_*.py -p no:relaxed
+	virtx pytest -vv -p no:relaxed
 }
 
 python_install() {
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
new file mode 100644
index 000000000000..75df944128fb
--- /dev/null
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch
+)
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	virtx pytest -vv -p no:relaxed
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index ab6cc5f56190..9cd528d63ac9 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,7 +1,9 @@
 DIST psutil-5.4.1.tar.gz 408489 BLAKE2B 867dd9b535134ff2ef5960f774891eb4743afc5857c4e0ba7306bd4feb42f3b255a6174a092eff2814f3e2ec9d29179d23ffe495ca85dba56fc42616e67c9a8b SHA512 84d9f61cc6c51798d98ac2f727a50d85de32171645d01abf85d4f8c58bdb3b40997ab717f859de3ea21cf5b24867e1a416ee3036d6167d3fe735eca4607a110f
 DIST psutil-5.4.3.tar.gz 412550 BLAKE2B c12a8418e7a7573d23a2599c6a4df9a3aa3bbe6b9cbef9e0f48b0379944e2aa06ed498adfddc30e8d9ba8e02a08f79d4867dc1e313a62040ad3550d69d62664f SHA512 f2a0f3089c3436df52d509576795e1de14c4127918fbe63b8f116f7c097ba4d67e3b55a8da167a88c6ffd340bb443109d4887c03371810997ced4478b295f960
 DIST psutil-5.4.7.tar.gz 420300 BLAKE2B e096997d22577f90cd6fc6019f2bde8855abda0eb67b496dfb8cc8dbce769e0c7da66524ac6d0c059e7a2d074a1675187af3177d904feab5a76b9b8a72c63853 SHA512 553c6de601d4c4d0c6a9dccc3eb8a449f1b3a18cd71648395ea3b43da3c92aef1565f6ce763872855d68b3de190dbd04c7f5be5ed4a79b0167d737c1825c0e2c
+DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a
 EBUILD psutil-5.4.1.ebuild 785 BLAKE2B cde5934a3398e2fccbc88f3001d7506a4ed0e6065c92a6d9dae96c54f6e27f93d455725504cec0a9f062f83f5e4d345873616588e5a3291dbf0f03b1fa13c154 SHA512 19a1193a10f25eb496e70d04f187d27af5260f7ca40316b1318c88133cd43bc05ccdacf45e424c167ae0fcb3543402ba15dd7a586444c62b1277e894e1925b7c
 EBUILD psutil-5.4.3.ebuild 804 BLAKE2B 06d1cf8df49604b223464f3caf62a74f507841219da4a41d5af24d5706a26fe7cb507cb9ec54b08e734df916f29734de21b07d92eb7131907dfbce131e11f6da SHA512 886c24ac8a0ea53c096f09050d0e390fb88fe6687e98b0a91bbd795b9f5dd1ecc707a8316ffc5c903dafbb876f546fac71c995621430f3637a60dbbaf22cb78e
 EBUILD psutil-5.4.7.ebuild 912 BLAKE2B be8379bec2e2984efbc9d5e0a40eea1209a89aa60802c070336c59c6f4f5d3f6c2f53ce9df54a730848d394797152600288a582e017924fe9f2c0f9e3c67b890 SHA512 14457bc0841f227f69740a26f0530b2e3e26bc7224a91739264d634fe6c5eaa80798a399fc42c32f7f733fe1b122707b15099bb0f1b4b7360ec78c008281164c
+EBUILD psutil-5.4.8.ebuild 926 BLAKE2B af378e9bd77a89c73c86c6620909d1d5e979bd319f9b10c5ee92cbe3236d6b44088d42824853f3191660a948a5772e0e5b60d61deb027fa44b9da82df5ea10c8 SHA512 9d9aed52731abc80df66cd4e4b4e77646f1e77659e3894af998b0210764da3971262032508b4ab9d3dee5e7f6d8fd15f3a161b462379d1bd1ff5410ffca8220b
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.4.8.ebuild b/dev-python/psutil/psutil-5.4.8.ebuild
new file mode 100644
index 000000000000..3eb377238a7b
--- /dev/null
+++ b/dev-python/psutil/psutil-5.4.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	)
+"
+
+# Many tests fail, even on a regular tox run on a upstream clone
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} psutil/tests/__main__.py || die
+}
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index fc11689df24b..1cfe99eee614 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -9,5 +9,5 @@ EBUILD py-1.4.30.ebuild 1274 BLAKE2B d1caf17f0e92b002bc8626b9aef00a0b6e60c9172b6
 EBUILD py-1.4.34.ebuild 1342 BLAKE2B a10c42e96d96e05c966e438d4c34d1ee1958e4f1480762b4046a56da6838a11787b6600198967adadafd0a88d1d7cf5d07b8d42a38741320ac074b9c4a3dbafa SHA512 2ec30f5f6b4db6abedd335511154dde8f57a3530628bf515e18c0e9f12e0de91cd2efab6a6a25065c4694e649c6551d38df00e7fa1f4f510952533bc6c6ad4ac
 EBUILD py-1.5.2.ebuild 1347 BLAKE2B 1ae248e72c3a599004712f0dc6f91553d5fd22b9d0e62f79459a2dd0ca557fd1aef853c7c3c56f10cfe5761e6d9d99bff9a00d4983e125f34f96cb7394311dff SHA512 be0354d8358ed8f05725c475426c9c94772e089d293c88c541b8403c754a9b8942b189b5b51836711a8ef235fab79e38103bb61b422fb4d000ee5f41f9c18df7
 EBUILD py-1.5.3.ebuild 1356 BLAKE2B 3c8ec2d4c181f2a09e56e3bb2d31a95b79bf2ecfb7f173ea20627224b4409175ecaaace93e9d126083e83a1136e32cf74d9774682e012296dcc19b4884b71f42 SHA512 9ee8c305b5b36781d2ac28456cc7cc24949ace90901cac9b04b087c78a414db662b623a16c9893f70ce9553a91560d01a52b6fd11f9f0ac11fd29bf5dc4fae79
-EBUILD py-1.5.4.ebuild 1409 BLAKE2B b9cfb79270483f0a8b226a92056603876811d871fbe86f213409068dca7ee72e6612b949b0535f248571fd529018bca2c5ac3b3133344a75e6aa3b25ce34f3d0 SHA512 2d73c87c5a248f4bd54c4b8fb5be0cde735e5d6f6bdfe7bd85f7472937b0e3016df9f0d867c52b855c0dde56e678f3fb3ba3b3f076d603bbbbc0856fbf7d35f0
+EBUILD py-1.5.4.ebuild 1454 BLAKE2B 1c52045ba0bcb15edadb9af87294e913abe83a0159d99a8f462e9096ab125265bf6bf9c2d99ccc71cfb6d0e84b1f83f2ed42243b3bac085f2fbbf60314f4c454 SHA512 eb3fa2294ebb5fc5472ca71f07950dc8be72d001c1fd8e393826d662d01e099ea937ecd3e6636c2b5ec5b37bcfa730e439061c4e72913ddcc115d6ea83fb701a
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.5.4.ebuild b/dev-python/py/py-1.5.4.ebuild
index 7c66f0c5e3c8..bb1ec2404073 100644
--- a/dev-python/py/py-1.5.4.ebuild
+++ b/dev-python/py/py-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ IUSE="doc test"
 RDEPEND=""
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index caf8dac98440..c539fba9fc51 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.9.18.tar.gz 32879 BLAKE2B 769b3347bae3f7dfb47c0335015cc898ec851a3d45f774a4e21aeaf9b8d7937331bc69aa5bcbb298e76e7e51ffc2e55f049336fd90f6b08fc3bba87089f2205d SHA512 59c8750c9ba8d601eca485079c04d4153bba92531dbd30fba0104694e4435d76e65b762b76ef89a6a6f8908dd6054d1d95fe4be74825ac1c5a56e473370dfa41
 EBUILD pychroot-0.9.18.ebuild 1149 BLAKE2B 3a77de87563d777b6fb44603de847a5a8637949c10050d74e0217e76b045b59509a814df9c8585bde111a07930c92c79d2b9507ba8acc3002851689bb8f7164a SHA512 c019b5e5d73cec26a74cd363c2784a4ccb3e8bda0aa5ae472e60f6165b533ead1ad54a67740c3021c17980d11729b66460f7a0ca244eec62c576ba649ab3bd97
-EBUILD pychroot-9999.ebuild 1071 BLAKE2B 8634887e73de39ac708432b0f0a96e613325f938d68ae82a361e6f56a9eb50db4d7722f7e068379d768e92ddc5ba69e1b58008a2ce0ffa3386b827af42b0eafd SHA512 2009fd14e347b0f543b239568b7a3775bbd9fa3e1b70510cd45d43c4c687cf4c5af5c551e23a141a8bd2e716480a59937b6a050508e76a80ebb9a007a2a5f957
+EBUILD pychroot-9999.ebuild 1066 BLAKE2B 3efb60e1c7cfc0885e30d30d73a4f8fc59487c310dbe22e2a7f753836d612b0bea47f3777e4f15547e38bd2c649adbb1477de9f895d0c7696edaf3b6072df9c5 SHA512 50e807c9169144bfd70b4894b860f8c814a0e8bfdea82df4754922b671803beb791d98ce30067738d50e04e8a6901cde0b720fe0761086f7e248dd7d4657c9c8
 MISC metadata.xml 337 BLAKE2B 3c60605dbe9296fe7f6c285123fa649b47c4997af6f715cefcb5047817ddff55f15c4813c2c33dcffa4e771ab3d0afb83bd88506d915e313b237e51ca4729c70 SHA512 4b0da70f35cd4983f6f5cd8aa02e5555b770d3bc2b7e90a8e8287c64593fadf1fe532cef6becce24de96766f94d24d8ec731ac3acff6f42a2c7b06c3e1e1e4d0
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 57a2af631a20..a59532024a50 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="test"
 
 if [[ ${PV} == *9999 ]]; then
-	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+	RDEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND=">=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
 fi
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 349c83b87930..ffff364632aa 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -3,10 +3,12 @@ DIST pycuda-2013.1.1.tar.gz 1586425 BLAKE2B 2d566de0bf5ee5d231f8f7089bd2921f6790
 DIST pycuda-2014.1.tar.gz 1588986 BLAKE2B 70baa81e8d1b77bcab73eeccf4d38dbe7cea1a8dcd73da4363eaecb87b68eb72b5c96733637eb5082ae81bff2aa264427c1415b9660df5cd95693d1eedc6250a SHA512 57e333941c472feea6974e583f9d27f7f5083011bd8a7cc0bc31d27032885a130f1f57a16b0730696c607b9dca32ad84b96c984cd82351800ec854acdfa8fe9f
 DIST pycuda-2016.1.2.tar.gz 1603373 BLAKE2B 35a5972cd4280cace9375314635131b4e8f0f397f0a3f799fd537c13fc2190ee183ab3b2248487f0c79a15a06031776b9c3bbff9ce2545090590d004ff97f0a4 SHA512 7a1a9d6723651bdc6f584de884c46bbaa17970e622b4d800c7f36ff57817807a51c7e4aa0a40872e46fc1243087af6dda07489bb60b6a33f52740a4d7a9e69a7
 DIST pycuda-2017.1.tar.gz 1608187 BLAKE2B 483bfd8e2da6d1c2dee9f1b5512e3f8120b29aa87d5fab49d7b1b738e9949aba14f87b102c5ff04cd2f2061c6c64c5036fdea71129e35505cce00ce76b6943aa SHA512 ce3de28de613352bec4efb86ffaa055f92ccd0c758b903aecc60af5b84f0f0643d04a869d6a23ce329c3d33670cfb266ad69c784ba917a190a11bdfea1fe6690
+DIST pycuda-2018.1.1.tar.gz 1612853 BLAKE2B 7afbcc33891da96d726f07f1686bfb9a28b4a5ce3dfc754707166556153f91a0fbc3454d50ca678ac56b71e8dc15e8f7b797e8ff025e42aa9eed2eaaa797d952 SHA512 cb93855cf3cee6650ba0564bccce73c2f59ecbd579235eb3623ec32dde8d9247216e756b1342a876fc7d37c0159e741f5f626a86f2e7ab11c4b03c7a4e581a28
 EBUILD pycuda-2012.1.ebuild 2368 BLAKE2B 6f46d40b6cd9c3b8e4c95eaf4e512c0afa9e7a74af66d928b25ebf4fe4ce20d3cc47c8726729da32e887bfc0cc4825123399600c7bfc3a2375fb83a71255f947 SHA512 2ac7e75e34cb6d4f9b15195afe499676af6dbb04aea63f88d8d62f3cab250247ec252a24bcb59d5b10fa04c700d97f0f19b7edc3aef28ab7d33355a321d93f59
 EBUILD pycuda-2013.1.1.ebuild 2366 BLAKE2B b199685e82e06c7e8bc90b45a365ac7947f80ad686c88f960d17c71b9a98885ccdc5c1e40c17d335fc0974d077134e44431d71e1fdec67257bfc53d6c62e4e5c SHA512 c8d49d6cc2e988a15ba5868f38c244e636c2ec21a0f0e3249067780602b3c4bf9a006ec41b1f516739ff4e0ea1c02cf2a598b4ee5189ec86ab7957bedb9b77f6
 EBUILD pycuda-2014.1.ebuild 2403 BLAKE2B 80bd52ac38b25ec40cadbb2977b7b08ced07fd35cf89fedc6dc3738d6dc5f299babd518e15e517a06ba77241ec0a10500b62dbf93d256264f2e94551bf4052a3 SHA512 4f51e33de8ec2d16acf85f2642f37963962046bd5b155f989c6fa614294f1c97a04861c925ff331524e98da953c8bc1c9d459d3dd51a05d52bbd37c8ff313731
 EBUILD pycuda-2016.1.2.ebuild 2317 BLAKE2B 9aa5f89746570bb4b23fb37486cfe885210e872f6e27ad5dcf5f8dc729244b8bbe8638e0561769c31cb3335e08f23f31ee1be695df09255af87f4576141b52f8 SHA512 e6fc762525a864ddef50bafcc9f8d82d066c51a53d14743bfbcf421031871c1bb87fbd959fc4d5bb888f740a82e4c8b3f2ee87547416f2d8a9e4ae8e204a3e81
 EBUILD pycuda-2017.1.ebuild 2328 BLAKE2B 04b2ff89246ccaef86143db74f337b6fbcb77e51d6ec7b54aa6f7976186b4100010561460027f2ff7625b701421a2b17566d6b532877597019fc640f068156f7 SHA512 4a66b1fcd0546b46b5b92a6b4b68f089a5420e3abe12ac52a67df4768e0ee76515cc6f696f2f1de0934d578065181d24c0ff016fac77e01bbfcc0677078963c2
+EBUILD pycuda-2018.1.1.ebuild 2341 BLAKE2B bb5594311454e5da361f8365e4b9db0aacc0c5fc65c06c9381e473f417cf513fec827628b05809db74f72a7fbd131eb4c23101461b7fde7f8840caacc5151158 SHA512 15c9c3d40e204d89886cba7361bc7bcc630fef1122c464e61b7628ec41981807716084bb8bcdb0dec383c0179102a8b9b029ca0cd2b9114ff152db241c98075a
 EBUILD pycuda-9999.ebuild 2392 BLAKE2B b0fe54752d25c71d38c286c7933d3d0be2865de65cd00d1dafdc1a8a105f3d77cb853a3cd9e4fbf22ead6270a0d401b0cfef0937ae3377ca70d08ce0cdf8ee88 SHA512 23445c9ac98a6a37e1a5f2c24dd80a2c80d50ba37e56aab7b157bb392efcef08efaa563545c9cdecd885f52ec38e4031a8ff782028e2e86cbf1382aa574ab19f
 MISC metadata.xml 332 BLAKE2B f880a8d2cdbe4271dc2f1e91c32419420b22e00c0d358832614aa970e95d979b10661953b35dda0b30a23d36b995364464ebd3bb1a862a34f33e7a84fa9b8e84 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c
diff --git a/dev-python/pycuda/pycuda-2018.1.1.ebuild b/dev-python/pycuda/pycuda-2018.1.1.ebuild
new file mode 100644
index 000000000000..db9fad22bfa6
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2018.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cuda distutils-r1
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="userpriv"
+
+python_prepare_all() {
+	cuda_sanitize
+	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
+		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
+		-i pycuda/compiler.py || die
+
+	touch siteconf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	"${EPYTHON}" "${S}"/configure.py \
+		--boost-inc-dir="${EPREFIX}/usr/include" \
+		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
+		--boost-thread-libname=boost_thread-mt \
+		--cuda-root="${EPREFIX}/opt/cuda" \
+		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
+		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
+		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--no-use-shipped-boost \
+		$(usex opengl --cuda-enable-gl "") || die
+}
+
+src_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia-uvm
+	addwrite /dev/nvidia-uvm-tools
+	python_test() {
+		pytest -vv || die "Tests fail with ${EPYTHON}"
+	}
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+
+	fi
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index dc9e8db5eaa1..8354d9477d93 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -3,5 +3,5 @@ DIST pyftpdlib-1.5.3.tar.gz 183189 BLAKE2B dd563f59ff21b2059e1c6d6ac6015561d5e0d
 DIST pyftpdlib-1.5.4.tar.gz 184986 BLAKE2B 6973b1f7e0fc0c89eb5d79e082690a706b56553ad4b2ece68a8216bb99c185d770475e349402ec71baf1bb06e5ecca5be2a3c52512f0d8283c4cc249bc28a949 SHA512 6eb308021dad28c1c51a88b366947a71b7bc1802571dc14cedf3a264bd0cb8504ef990d7e3110d10709f971d4d5b0001bee859b58fb4d02a1b0d46532acc9295
 EBUILD pyftpdlib-1.5.1.ebuild 1298 BLAKE2B 2b6ff8c9de74fc7e94720c6deecc32ac2303674f80230b7b2823f43c84755153f69d6c3254264a5b1f41ead167227b71fabca1341549765b045679686d9df1f8 SHA512 5c44d3dcb62a9b72e4773bb5eef46b69576924367db85de5a73977f187d0cf5c8023c0756b913dcc238d6e3ba16f62a06355fd74463bfbe716a900aa3eb86468
 EBUILD pyftpdlib-1.5.3.ebuild 1556 BLAKE2B 06acd30f37ed3409d5919bdb11cd0b85a38714ccc2c1cf87ec9af1565f848a80f7fe0bba91529b0719a19303073c75fd855e48e66ba46bc8eb704599225f9cd1 SHA512 dcc8187355c079c8d6f6e9ba485b2b07a4f1f0e0f6ff8bb22e0932d953b55b7c01f2dfde5f815dc868fe8e826c163a72d2c300d9cbb0c1aa48b39cc175a399d2
-EBUILD pyftpdlib-1.5.4.ebuild 2534 BLAKE2B c9a4c4af1f93785f783aac18c7aa6ebbc5863b4abbe73b598b10e445071c5e06f28e6a3acdd950238cb1014fabc5fe8f8c9250018bc978412843bfd5ce337601 SHA512 bd4c8b4ed194bde8aea8252adfb1c713832e307776e7ccdc08ac5af825d0083e3862f5c30d4a19854bf83364389ff4a06f3cc85cb00f7c9714be39831b2d7489
+EBUILD pyftpdlib-1.5.4.ebuild 2536 BLAKE2B d1e034f8751a3e5670bbb0f2fb8f403cec1730d4aec0edd6a886cfecb6017856764158fd2ae5432d86439af575f8d6f6f8c29348b2a635c8089adabfce4f603a SHA512 4bc9e1132aab0f2fd26034f825f521845e6dfd78f47345f9622448ae8540cd14458fd47198d176df2cf037a74010d1efff6ae44557ad9629348cb4973e39e0d1
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
index a570f1156c63..ffcb5fad156c 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index aa8741e4c0aa..bc4f7ce5a6d9 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,5 +1,7 @@
+AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
+EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 1003 BLAKE2B cfae12900716b4436ee5796f13e0d2baa1c68a40bf6e50375e86652053e0abbe3a7a511a072b5a77585a3a5defc09a70bcae89a835a0db9272f841e970a635cb SHA512 8b86785132dc2917e0066fe856f36a26455c18c35a97a73abecb31c7dd6a37d1e23b423d9f2228001fc94dcc7773e7549a2bfb7bfc644031e70f4057b82aebe6
 EBUILD pygame_sdl2-6.99.12.4.ebuild 922 BLAKE2B 061dbbc2ba3326df51f69df941fb63e8c7960bd03739c827c8f0e1f5f0047fe6424e755677146e7801c286f0cde09ead812eb0328ee1e5780dee475f3502b678 SHA512 1069188bb58137dbac5e78f62eeff2228e34508434450dc6971bb3d52a92be2677f793c8e9af18951e96b5c5f0ffbdfcf1685ad62dadc3424da164ac86e1ab2a
 EBUILD pygame_sdl2-6.99.6-r1.ebuild 729 BLAKE2B 363c8b22b45dfcb7546618a54c47e18ed89c0416cd500285b84f8e8d0a94f981ac9e6b21266df4fcca7b02a7d56c4440d8947bb6c467decd0f1758ca90b6c391 SHA512 c72b4c6c9be055a6e4301796d123b61bea2a498b7be7644a9b3b166a8425d0668f181dc83ef6956c2829e7ded467e9326bda11b2f07f615539cc5cbf4c0d1db9
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
new file mode 100644
index 000000000000..1c3964afaa9a
--- /dev/null
+++ b/dev-python/pygame_sdl2/files/pygame_sdl2-6.99.12.4-mixer.patch
@@ -0,0 +1,43 @@
+From ced6051f4a4559a725804cc58c079e1efea0a573 Mon Sep 17 00:00:00 2001
+From: Markus Koschany <apo@debian.org>
+Date: Sat, 11 Nov 2017 23:00:25 +0100
+Subject: [PATCH] Fix build failure due to the removal of MIX_INIT_MODPLUG and
+ the replacement of
+
+MIX_INIT_FLUIDSYNTH with MIX_INIT_MID.
+---
+ include/sdl2_mixer.pxd    | 3 +--
+ src/pygame_sdl2/mixer.pyx | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/include/sdl2_mixer.pxd b/include/sdl2_mixer.pxd
+index 0cea395..4bb0187 100644
+--- a/include/sdl2_mixer.pxd
++++ b/include/sdl2_mixer.pxd
+@@ -18,10 +18,9 @@ cdef extern from "SDL_mixer.h" nogil:
+     ctypedef enum MIX_InitFlags:
+         MIX_INIT_FLAC
+         MIX_INIT_MOD
+-        MIX_INIT_MODPLUG
+         MIX_INIT_MP3
+         MIX_INIT_OGG
+-        MIX_INIT_FLUIDSYNTH
++        MIX_INIT_MID
+ 
+     int Mix_Init(int flags)
+     void Mix_Quit()
+diff --git a/src/pygame_sdl2/mixer.pyx b/src/pygame_sdl2/mixer.pyx
+index 3c5e185..bea5cbf 100644
+--- a/src/pygame_sdl2/mixer.pyx
++++ b/src/pygame_sdl2/mixer.pyx
+@@ -81,8 +81,8 @@ def init(frequency=22050, size=MIX_DEFAULT_FORMAT, channels=2, buffer=4096):
+     if get_init() is not None:
+         return
+ 
+-    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD, MIX_INIT_MODPLUG,
+-                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_FLUIDSYNTH):
++    for flag in (MIX_INIT_FLAC, MIX_INIT_MOD,
++                 MIX_INIT_MP3, MIX_INIT_OGG, MIX_INIT_MID):
+ 
+         if Mix_Init(flag) != flag:
+             errors.append("{}\n".format(SDL_GetError()))
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
new file mode 100644
index 000000000000..2f5df88d3689
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0
+	media-libs/libsdl2[video]
+	media-libs/sdl2-image[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2
+	media-libs/sdl2-ttf
+	virtual/jpeg:62
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+	rm -r "${S}"/gen{,3} || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index cca7490ed708..49940b049ebc 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -8,7 +8,7 @@ AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625
 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4
 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
 DIST pygobject-3.28.3.tar.xz 1005368 BLAKE2B 5c24fd25fa20dbdbd3ad18d7e2eafd8f47f5e28903d9f8dab6110f09ccfc13f865149f0d4bd84bc755bc6e4191b903646930e818d85382dfaf4e05f7107b3ecf SHA512 0abda393dd774f9cea04f883eab53f5ebde81d2439ed18cfe08ef39a1996054ab34bf4e770f70116a4485fb4f9970464b9a950ffa4af76cfa21ecc8d4dff968d
-EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
+EBUILD pygobject-2.28.6-r55.ebuild 3537 BLAKE2B a5b8ed9f09176314ffd8584203f5688399c9aa4320379765c0867c4605e38d2fdfc51986b58960465506e36b70260afdf48e68d4de385b4ce0d0113a20309d40 SHA512 c605ab80a65d3a8e71669c22675b4cf54cb94fefad28126df05504e84b0d867bb5608952c0b0e161df4c8895c159159035622919b9321d81b1f26b34ea677b0a
 EBUILD pygobject-3.28.3-r1.ebuild 2810 BLAKE2B 6f26b9498fef402192c97b90a5e6116800952029cfa1935d4b7dc62ef7338d925d4b53de17f891dd9e1dc792bf4cc60c0c1d14ddd05c4e755d8ea87437ab5f3f SHA512 b91c5bc78371ebffa96889507012238d33983c65f5d874cdca43a176fd3c70c826d601cee4d6b7ccf293fbad3a95db94c3f5f733db51e96933a4ea56660a9854
-EBUILD pygobject-3.28.3.ebuild 2785 BLAKE2B cc3a1ec9a89d543ae4c71ffd7ab25c04f2b94fe2afba0288554a44baef188024de3d6cf4f4246bb7583116c5c004e27068f252bfdfb6e940dcad51fa545c183b SHA512 cbfb3526e69866d257d638a4b40a84a8cd9c6de049532b517e6e59bc5121b61b005d2c30969d1e5ce690adbdb27c6e1e7e42d7f1cb0304a6ac767a55b4a72262
+EBUILD pygobject-3.28.3.ebuild 2784 BLAKE2B 8b54aeafc713570ead6f752cefc903b9bd50c5d16652ea7ef7bc66cfc9dab2956f1cc1010530b9a69b9fb2c6afcaeda3e13d3269f07bd3e8451cc8858313fbb1 SHA512 5cbdb3ec07708673452a053f425d626d277a4eec9b9650336ff1161cace4ff613025fbe08fb2e6f8cbfbcf92b29a927095b8a72f58656811d1e4ae602751b3c1
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
index df30d8f21b53..140aef62039f 100644
--- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
+++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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="examples libffi test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild
index 3114a0537f76..0fbc16c24323 100644
--- a/dev-python/pygobject/pygobject-3.28.3.ebuild
+++ b/dev-python/pygobject/pygobject-3.28.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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="+cairo examples test"
 
 REQUIRED_USE="
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index e00678a9a733..82c3f3eedc97 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,7 +1,9 @@
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
 DIST PyICU-2.0.3.tar.gz 201076 BLAKE2B cb388e4e6d6df2417312820cbe8482a8b02c5cfd639950b32d5ab5e1b1815f85e8fc870a2808042f085bee6ec93c6cb6dbea4466e745e93166714421d7d4ef25 SHA512 a08a34772fc8205660320d7ea1bea52cd9c21ff9edf0aef1059c9439406d4b69ab434b35347dce8928cff8051600d55cb71bcc74eb89f203037be629d83e044e
 DIST PyICU-2.1.tar.gz 203402 BLAKE2B 47541bd2f59553cc577b726b41585df6a639deff79c0c48d9ec2388bc8c9d69b9eef2cad642418961c255a36c7b43e255c5487a9dcac2a695267f29a790bb630 SHA512 35477cd960828d6ce853286e2de8e14a3b4cdc8d6975fd7eaf7e262f252c298f235d569d02a3844432e19dccffed13395c80074623ad196fab6c87f55f3d560d
+DIST PyICU-2.2.tar.gz 211135 BLAKE2B f56e590ec4aefb61b6d3b37c807a018698ee97a632ccdd08f5f879cdccc576a6da1d31bb0ede54813be640ebdf600fe522a5c35ff417ac8e157c516a1b3bd7cc SHA512 30cce676fa502040e20fd4303baeebf0d83730abfedf79fdf3b69c1a3b52032a3337168b6e8902286dd4b46dda5bf894795995c6f1ef2a237fdabc374bb5ffcf
 EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
 EBUILD pyicu-2.0.3.ebuild 959 BLAKE2B 5422bd0c7b7dc745d04ce2f4c0a8e0f2aa71bbd9a8d51b7668059f06c0f42b63d40a5c49703b476e74b0b353e828968847dc2508a0b9a58cf62d82875d20fa28 SHA512 2da88e36f83fc4189805a3289343af886736fbb68373da0a3f2979c33b61e13176c2b75c39d00a9d8dc5cac1d46ce67096886c10b674dcdee3f408f88b588a0e
 EBUILD pyicu-2.1.ebuild 959 BLAKE2B 5422bd0c7b7dc745d04ce2f4c0a8e0f2aa71bbd9a8d51b7668059f06c0f42b63d40a5c49703b476e74b0b353e828968847dc2508a0b9a58cf62d82875d20fa28 SHA512 2da88e36f83fc4189805a3289343af886736fbb68373da0a3f2979c33b61e13176c2b75c39d00a9d8dc5cac1d46ce67096886c10b674dcdee3f408f88b588a0e
+EBUILD pyicu-2.2.ebuild 817 BLAKE2B 19e8d15f8ee1b972416b523bbdfdcf95802585c6fb60f7f01b491be3103d2328a1fac9f06db3c92381806930d6dc2d78162e36bc60b86ce248b7e916a12e37c5 SHA512 9e8f9e57318b4b4035f1dd1f4c299dd3beaeb79dbead2429dfe5dd7fd6204fd7a326f3662b04f47726b5872042260405972ad3b4de7f22496c1f2fadb375f04b
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.2.ebuild b/dev-python/pyicu/pyicu-2.2.ebuild
new file mode 100644
index 000000000000..87d2e2a78e39
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="https://github.com/ovalhub/pyicu"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/icu"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest
+		dev-python/six )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+python_test() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		# See Bug #644226
+		ewarn "Skipping tests for ${EPYTHON} because they are known to fail"
+	else
+		esetup.py test
+	fi
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index c093db630e2a..45133a4f2ec4 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,4 +1,6 @@
 AUX pyparsing-2.2.0-distutils.patch 496 BLAKE2B 7bd4f362839ed9fa61eebbad786c9b373b8a6f7c762e6b63a44ab4ec7295a7925a15bb66a003259d3c608b763445680b9466a0bfc88818cc2c78d232829f897e SHA512 0fa30bfa6fbf08b4723e80d4f688daea62589c1aaf6ced8bbe56c1edfb438882a7b0e68969b69e5d2da59b0bbd5f2eba051423b011c1bb01c1d74e2254e66090
 DIST pyparsing-2.2.0.tar.gz 1232522 BLAKE2B 59420548fcee047e2b385d76b8ce034807eb3ac0fcdc9929f656cf4b81436c96c37d206b5d6b90ee6892e402df6b939fe9e793384d4cbe0618c8d06d5197586d SHA512 6a409f429d40a5ac202d144e4150de2c80d7c7120147f603f72a4a99797d48c50822a6437f590ec5ae4418d51aa1f6b1d4e5d95a57e19bec0a127b04e4937008
+DIST pyparsing_2.3.0.tar.gz 624393 BLAKE2B 9fd9bee7742953d455ea34310ef1668df0a7633642deb4eeff507439228ae018e4ba99d3476c5cfe374a908b58b0311527ae5f04ddec8eb7e219a2a9d4cbc8ce SHA512 2a4de9b208ee3c557fb6d050d5c3c20e35a11b21d35996fce5a0876d4f52952072bed7ae2ed157ae0ba388543dc554f4828a1da22712ae7d9f0d38a16b0a546e
 EBUILD pyparsing-2.2.0.ebuild 1327 BLAKE2B 3d0ebd9515c50ddeb36275a1d68b2598e16f05cd375774483746f2a67b5f5d9cd466d821aad9e10e6b17cc0d9d610935d5d4d6470a0e307169f868c25a4a453b SHA512 b06c25f684600d222beb8cb7ab095c778833d8ea81dec25a6cea511252ce12992c3141b6521d858f10901fc02a48ece807e0096eccf1fe1d6dfeca1574376f9e
+EBUILD pyparsing-2.3.0.ebuild 1254 BLAKE2B 5d5f57fdf6f3c1cf3e731954731a972303ac2518edd1170d70cecc384be72839d59f6e7ac919206d0f2656d6833d19f1287fd0c4db5d162ac5b98485c990c714 SHA512 9d09c7a3df3780e04501e210a5fe25914ff17558d206ef5df4280e2958b8790c760dae9e3220885b7be8fc6607861bfa0042590f4ceb0346c94b5f81dc35b7f2
 MISC metadata.xml 737 BLAKE2B 4b4199e79bc2e92c175ce249cc395d2324cdc3a3df25bb36db5884b79057ec04c63b2cef7ef27e9f656a58e0fd5aa162b8eebe076f6e673b227659a3e013df08 SHA512 2cab4251c3444c6479b4d5ff92221399e01ea5e4a6af96631ccf81cdce5f3f9cc2ab06993c9636f36469acb5b28660c41e594d0d7315c6cd9b5dbaec0deda7cf
diff --git a/dev-python/pyparsing/pyparsing-2.3.0.ebuild b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
new file mode 100644
index 000000000000..1817465ad323
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+# pypi releases and generated github tarballs lack tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+# setuptools currently vendors its own copy of pyparsing to avoid bootstrapping
+# issues so depend on it here for consistency
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+python_test() {
+	"${PYTHON}" unitTests.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypodman/Manifest b/dev-python/pypodman/Manifest
new file mode 100644
index 000000000000..8244fc1430aa
--- /dev/null
+++ b/dev-python/pypodman/Manifest
@@ -0,0 +1,3 @@
+DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
+EBUILD pypodman-0.12.1.2.ebuild 817 BLAKE2B ada434ab24d7384ab155563944f3a26a942ef6da6dec8ba2314a9c2dd8e9b2be95b913f739898cc2f0f253b66a35ef5373832f81337e8e3ac117d64a37d455c5 SHA512 d7bb69892c6fdf94543913c62dd270190759c558b57f3c84f7ac66ca0a5d20992938cfeacb748e3381d86daba1bae9c7c827b35d260f6cf0f245bbef1222f250
+MISC metadata.xml 326 BLAKE2B 77218bd50d76e0dd8ffbeb168b7e08d7cea7f8768f9d552865fa85f7ae78b9e4654fcb672320776b28b013e592117a4289522bdb0a62f03f40523b78d36f6171 SHA512 2d777f25c03c813cd1ec96215d91dd793350d48ba396de9c544a53412401b313ee5270311612e4a13a2b1a318591ba7fd96db686d639e241c13ac432808f219e
diff --git a/dev-python/pypodman/metadata.xml b/dev-python/pypodman/metadata.xml
new file mode 100644
index 000000000000..7d1075feff13
--- /dev/null
+++ b/dev-python/pypodman/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">containers/libpod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pypodman/pypodman-0.12.1.2.ebuild b/dev-python/pypodman/pypodman-0.12.1.2.ebuild
new file mode 100644
index 000000000000..b3798f5924a9
--- /dev/null
+++ b/dev-python/pypodman/pypodman-0.12.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="CLI for podman written in python"
+HOMEPAGE="https://github.com/containers/libpod/tree/master/contrib/python/pypodman/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> libpod-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/python-podman[${PYTHON_USEDEP}]
+	dev-python/pytoml[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-39[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+S="${WORKDIR}/libpod-${PV}/contrib/python/pypodman"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index fe1111d61e79..5178197f6b5b 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,40 +1,34 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
-DIST pypy-bin-5.10.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12749801 BLAKE2B 7fa3ef4f1b5dd155fae35a840ea037039e8fe3255c83ede6024e9cbe8684ea4c66fc2281983315a812decd5ef130939621a497eea4e1cbc2751b251d03c9f86c SHA512 21a6df3f03194759ee24fac026942df1c8013cee7eaf0e97c717df2631e4e0579406eb8c45c451e45d89acd5cef0c6176b34070bbaa2b0a4cc130bbc4aa2de18
-DIST pypy-bin-5.10.0-amd64+bzip2+jit+ncurses.tar.lz 12926081 BLAKE2B ca5277804b218043c25a95f3e45e67a0a3f99aaea582c1fcae093f6bbe3ffd061aaae86855388dced3f8a62e37bd7fb692801cbe88b1e5f6e4233feebf063322 SHA512 426040e5b1baa8a2029da85a02fc9de225d07666889f1721b99618ba1e81f1f841292e8ba43b02138a39bb5a53ae31264ab6ccfca864da89fc98856e9ecc1237
-DIST pypy-bin-5.10.0-amd64+bzip2+libressl+ncurses.tar.lz 7406840 BLAKE2B 9626651ebff3a470f3172d34891ca65cf7b4c1c58879532e7b6b5665af56b2c8e92f79c63503c09f2bd97d7ba8d18507204edbd6a8e8ded086fc2a6165103f58 SHA512 8713d148ee7c417ad26c5681adaa1e7569c29f3924188f2e7a63a142b924f81224ab2f228a96f1fdc062f386c94e0fc29f69d6b1cb1fdb8bc33902eaa03fde1a
-DIST pypy-bin-5.10.0-amd64+bzip2+ncurses.tar.lz 7496681 BLAKE2B 2b8bea302ff2fd45a0b02600ae922063f4e5928df293af60df7512b2b5399da3f453d5a2f01d2ea7e2337984523e27582b09b8c174828019fd01432aa25cb9ec SHA512 9befa9a5225fb520609504520fb59d6eaf387d9115edfdaf68b13fbebfa9b85f755cc96e78fb4ca72c2b7af5c2abae95ef35c6e82cb991ed6f4442a12d30d9a8
-DIST pypy-bin-5.10.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10334239 BLAKE2B 84f88b4d3c214d5f6f05c353e92e57fcc563d55c849ffcb4d0539ff4cfa215abbe63a6e187d219ccc75a9e3d32108b3abf7601b88b1d3a5c393bf51e787ecf03 SHA512 948477992673a5928cd9171f274dce7a180d5129ae6395ae9f4a4cdf5bf16b1fba80211a479cb4f5c093a13b82ca9b12a761c1f33526ca2ddffcafad5739d58c
-DIST pypy-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9700133 BLAKE2B a57ec7bd7c6a1db61b0001ecf821271d9e8c69bf803a8c20577cdeca83bd7cce9a49dcd587453d543bec6835c31e63f4151fea15fe39b2f0400435af14f2b601 SHA512 92ce40203365e5321c6b4ea641a77c6b4367466f9c02efdf9382c8bb7c93968c114e04e6586a9a26511cd3218863e62d0a583610e8a73d1b68b6979853a4345c
-DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6264162 BLAKE2B 67bb6849c8c35c31c453452e3dc8c5d268e5921a69de72ba46694c9324c270a866f263f723edd30a31c6fab7c259c78bcfcadbb694e9761aaa83e9d4057e3c2f SHA512 aaba99aca142395b80cc3d7a28d86c02cedbcdb5842db2676a4b8b2c655d0b4503529febe27ecf9b4ebb5fc9a13f693e8647ca526a52e2431fd3baa977c7dfb2
-DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz 6252626 BLAKE2B 6f036b0a526a2ef2c6ea0d559baaae13d4ec0da2d4705c959ec84c85fdde171319da9be1a2d859ebf2c7d6168464dccb057904596a64c0ddc33724a706e699da SHA512 5f284ae0230b22775978525d2f53b57f5c808b6a47b783b6bdccbb9727af412f640abe79e7c05792acdda861719ed9a0c392a9c906237514ad4285f50e283ff0
-DIST pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5912628 BLAKE2B 5859cb60c9cc68cba1bf3e1f3f58ff8e86d352aef990a837baf5a1802116dda4bc9e550a3c38163d7a165efc65ff26fc1c004dbb845a4df401ca6c986866a658 SHA512 d2aee265718cd75e02ad4e8dc7cedcf006180960128a10cc4b3b1920092860a1d1a110c27b60d45b88ef99822e0a2e9c74c2c7d3c899ef049adc9916ea5fefb4
-DIST pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5912272 BLAKE2B e50e3f5cc2c8411700f00009bfb6d9fe0c06b32faed6fc5b94dfd3eeb404e37fe353741aeb0851a4e42dc86e2bed524750cfe527bfc005abbec4cfa6e65444e1 SHA512 ea63b7ff20633bcec55258cf02d0035e213e94595032cf7a43342292cbdd4bf4276ea36d299bb3342e6de8919dadb338f879393950770473329ed6a0fd982897
+DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
+DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz 12981891 BLAKE2B b098e2ee15bbdfbeab5b9ab0b2b818f24160badadc8d7e3e8921eca85251a2246a595964ec491e1d23f84150253f2db23642038b476ebe930129d1b9ad170ff8 SHA512 65202d2970e52df83e206068d66079e7fd3254c9d6fa3e410f23f379b3accf324af09fd3da4c13a483c00b9de523485b8f3008f4160f134b5935948f05028c80
+DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
 DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
+DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
 DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
+DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz 7525252 BLAKE2B ccb34328f579a61070d6021f59fb948a80cb11803479a7960d6459cd4df861f125057982c4b051b7e9825ce3eb4c6ae3308b9639c9ed91dac1e042c76af1bd68 SHA512 a2439faae18ed12e1c8d2693471f665c08c29163957f94fe1daf240844e932b012d6cec6d1e70c9b14837ddb800359dacde44ac1444af56b296ab913fd541d44
+DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
 DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
-DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz 13018301 BLAKE2B b851ec3e73d4203a4c1eece2cf81dada7cc2b8f7047c9f4e06bd4f24008c1650d95fbd29697fafbdbed953d19595c8e77143a7bd9c8306ab3a15b2c62be48bcf SHA512 8edaf5fdad14886f4120358066fbb09be17d2b7f10dd7600f256a3f3d4b66c90502b85e8a500a70113135ce408ae2877296e1a9cb82d06ae0d031db26e09066c
-DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 12916168 BLAKE2B f23aa0800c48d976f60d6826a424703fed1e1a00b0eb1fa09adce609cd1379f47e42df4669dad6edb59270d708f145049a7342ed73971d33183fef80dbd00539 SHA512 0ec4acf8fa2fb4b7ea409eb21a5dc0dcf14fb5616b8cb11d7892fd99aea6aa0984d0951ac474fd1469fe362e841a684d2292cafe6f69c078d003b90f224f2780
-DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+libressl+ncurses.tar.lz 7546991 BLAKE2B d4e84d839dfa106a4e9b3a60327bae1fa96c326bf219b4f8dddc9dc968412b4be67e80ed1009120cf6a8b14aeede83ebb863bee1296eeafdae95a01ef0efd1eb SHA512 e3775fbf8e2a28d30a90f5bbde84bb03007aa00a6b778834db067d470d97b87c6e15ae792996d801b96d1486aecceff124854f0bd2d2bd8e353c0ee1c12662d4
-DIST pypy-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 7558174 BLAKE2B 62dc408c958c18d9751466b24c5dde46bc8705634e7312593c996c9517cc36bbaad7278aa09b179bbcb962c4124399d27647b82356c79e20e13434153b8c79b9 SHA512 8c232c7852f3e8d9e3b5bfcc3785e171ea64c63d3e1658662d9eb0340a21efecd4fa037b15ede155015b262e2f60e4fa0e80d72beb18d5e4b01dcb3e003a516f
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
-DIST pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
+DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz 9857459 BLAKE2B a125f68fe7ca8259d614c1d375029df776944a8f14960528d5b96125a1b46c7c014894ca3f952157957cca654dc8143033d04f4db0fdef182a6915304b630dcb SHA512 4fa02202d2ceee6cdbd2473e8f3028695a73577504053eafd87464dd75116028a3b2129be16d422fbac5372cd7623c0ee4d9ab75b87a1423dac9470eecda1227
 DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
+DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz 9877659 BLAKE2B fb017132e28f9249b4cf1878694cde812fb53c26e58e66156d0c7512a66baa8c4961d7aaf5358d3f2acdac9aa41c6abfd9432d9c7e6fc199cd80ade911db3790 SHA512 516f7290ea2f36c9fa6c62464c32bf80f6f15b4d94dee50d1f153400f0b1fe9c12afef517cedee014d8e88f254985c70cba08a0da29250d78057d222b4e529f2
+DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 9859596 BLAKE2B e76d456b931bb9ffd5f5140cf4125ed1446ec81432785a97f7a631adb3b97c7184d174ef928df0089e6327a1818ce70072e6835561877a6a6398bc6c6ab6705d SHA512 80895434011f8ba14cf04cd060e6b022f8f7a92fc11b3005bf92b20c267200aafa98f114eaa7b473ce2a27a44f22882ed20b59b7bff4d1b1eef3540b9154e1e5
 DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
+DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz 5940394 BLAKE2B 4f83e1bd745e686999c39fc8976c204a95b1e2e2f6a4ec23020e136f0c1046eed4ba4e8327c7bd6c2f11d80abb398fa46fd57ea18f9e9a7ed24577c67e274e7c SHA512 7007867780b9dd8f0501d278a651e0e6e82bdfcf40e66344a4d194ea71d311e0efdb8ac00a7bc413d796cadcbbe10b603707c371bec4fe12f1b090da81e11226
 DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
+DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz 5938624 BLAKE2B 218e2a75d601cad1346d4513f01e8b9544cf2d8e0de68e43e6645758efa94e8f770e06c73be16e53964752e2a747414141a99137e7f6820f33ea1d7f3463736b SHA512 c2d17b21de8fc2658c4ffca3ca02138d2446503427c7fb4d488a2a58e1e0b0bcc1eaa0548dbe176cd7a668cdf296ffdb3a0356b27dbfbd7b6be44d2224779358
 DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9cdf7e2b9194e00ec9480cef3668e7c1fa7e632eaff0b7f1ba415096bdb2a2a4322ae25b611e4ffab28f00d15a4429142bf7a62bf0d32ba4a157ed79 SHA512 258404258f7bb96fc55cf4bd8a086d598e0b583a62b282ed6809af740c09792dd854efe4a3780b85d7b84ff1c8b0169875dae38f271f95db76db494d63f0774b
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz 5947112 BLAKE2B 9153940c44f99fa0c9e911e3a815679f93413fa4be46cbd965b48e8ffe68a1e7ebfc6e872bd7d59e4d0e0ff9d02fbd5c30b1e0d9db1521448c0b0ffb89cbee7c SHA512 435d33f8ff36f424c162a450f3a9c8419bb46280b34b9d2370bc18f961a78f144128aa712dba094755e7d350cee97f395a9b61fdcc6f0d4054703dbd01d29c3e
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5943737 BLAKE2B ba39bff2fcccebed496c12ff85d95ea6f7d6092661b251673b53c061fba831eeab74b1286d4fb3873bbd5daa6f4ad5af2cef2c9db561afecd34285b806e0b794 SHA512 8c6a6dd5adb6a0b80c1ea3cc461ff2316084319e26b3f0c531ccf67bf518f603156624596d94f65a2b307e462cc97cef39dff33d662f847a20620103b78fcc5e
 DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz 5940234 BLAKE2B ba4133f9c261c7b8d7c3a5c04de61398f48c1d34d146009535c5445dd8abab17e914fa675c6c9f4717cafb1be5ee8defcb6d1ecb20cda60223677bf5c2b22db9 SHA512 afe12fcac3a93b8b139a0cbbc5475edd23eceddf3b6e58e5d425459dbc51056ad10459133adee3f7d282c403e881fa0d4d1f9c30955163e580c87be7e1b7825a
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
 DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
-DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
-EBUILD pypy-bin-5.10.0.ebuild 5951 BLAKE2B 08ab9100162de3469727fb08a057d209e3809432e1fde15487f66f97073eff91145da0adeb961f5efb0e045b12a7af892966a121294f0ed6ae4119fedf5ff314 SHA512 9a6672f5702b3858353ed6c53222f427962754d72293f87e0e768806d2624539b48957c02e68cedb292de93e337721deffe2cba121f720ba0a6fde8c6e0bf92e
-EBUILD pypy-bin-6.0.0-r100.ebuild 6332 BLAKE2B 7fb9c4b8870fe696cea77c78ba5d3c6dda2fcfc5eb075ca2054790a0974f539d170a0284188f26dd784911e744a9e9ae029e629de71ea994aab2f5965a01f3d5 SHA512 3127ef12add95a2145afcb08ccc1758833acdf1144d66e240db941d9a2a611716b6b3040e2de8fc3de1bc9958a5f81418cdd69d80cabeb5ea374f004e4fbd833
+EBUILD pypy-bin-6.0.0-r100.ebuild 6329 BLAKE2B c2533c30797562a60c8db615279cbf110c3b7756a8ea772da095936fd6125da948d4fe625fb9edccd5c255610287b09280059d3b3c5a324de6030f4dab1b0dab SHA512 644af55ab278e7b4d5441f5dc8adc1b0b91e9b5a901aa32c2eb0979ad290ea5164844e78bb073aa303d9c90847352f158aa9b53da6fac7e39fefbebb79a84356
+EBUILD pypy-bin-6.0.0-r200.ebuild 6493 BLAKE2B 2b6bbfd1ec9f0828ef30765a6e8b1c5f3ac59a296f1b3174136ba74b3010a1727a5032f9ab27d282e453dbdfa9ff8d377d26f7248a1e1b6204dcce43538a58ee SHA512 69d360de30278f0d4048ccd66c604b005a1174b8d46d98c5ebc6782cdc5cc65ece9ee913046230e58ed85f9433a8fd6a8c152f30190bd40f85bf7c3339e25cc6
 EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
deleted file mode 100644
index ef34c44ba088..000000000000
--- a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils python-utils-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="Pre-built version of PyPy"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
-	amd64? (
-		!libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-		)
-		libressl? (
-			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
-		)
-	)
-	x86? (
-		!libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-			)
-		)
-		libressl? (
-			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
-			)
-			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
-			)
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0/0[-bindist] )
-	libressl? ( dev-libs/libressl:0/44 )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy/pypy-c
-	usr/lib*/pypy/libpypy-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop curses syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
index 82d0da2ce0ab..66d1c991e75a 100644
--- a/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0-r100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit pax-utils python-utils-r1 unpacker versionator
 
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}-ffi7"
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
 CPY_PATCHSET_VERSION="2.7.14-0"
 MY_P=pypy2-v${PV}
 
@@ -15,31 +15,31 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
 	amd64? (
 		!libressl? (
-			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
 		)
 		libressl? (
-			jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz )
-			!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+libressl+ncurses.tar.lz )
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
 		)
 	)
 	x86? (
 		!libressl? (
 			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
 			)
 			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
 			)
 		)
 		libressl? (
 			cpu_flags_x86_sse2? (
-				jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
-				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
 			)
 			!cpu_flags_x86_sse2? (
-				!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+libressl+ncurses.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
 			)
 		)
 	)"
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
new file mode 100644
index 000000000000..b36272792bac
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0-r200.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils python-utils-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7.ossl11"
+BINHOST_LIBRESSL="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}.ffi7"
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz )
+			!jit? ( ${BINHOST_LIBRESSL}/${P}-amd64+bzip2+libressl+ncurses.ffi7.tar.lz )
+		)
+	)
+	x86? (
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.ossl11.tar.lz )
+			)
+		)
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz )
+				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST_LIBRESSL}/${P}-x86+bzip2+libressl+ncurses.ffi7.tar.lz )
+			)
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/7
+	sys-devel/gcc:*
+	sys-libs/glibc
+	sys-libs/ncurses:0/6
+	sys-libs/zlib:0/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/1.1[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy-c libpypy-c.so
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 45c10665579f..8659d9950308 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -2,10 +2,8 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
-DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
-EBUILD pypy-5.10.0.ebuild 7860 BLAKE2B aef28d2f43bb879586b3988345e58d04bc624d6134491787809fd34bd35bd004ed5589684adf428601fb885879da72fd4991e82bd8b57730c67a13b5c25040e3 SHA512 7b67815c1efe03ab475d25e685c0ecf4408873986a99b9bba3d7cc067e5bbffde32b5af8ea13c3e2c2d12351fbc88123ba706cf8b49d40178cb672335f1a2b9e
 EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
 EBUILD pypy-9999.ebuild 8196 BLAKE2B aad05ace0ebe6cfd5bf8227febd78e0f84447890310d8127e27d11d77a97180dfffc1783bc635ccf08d7df278e338ccb08fa1f7ba4b2ac0cf88019c42a1fc18f SHA512 1e30f0f9f8e2879687922c16a433bf9a27eae88e804c725eebbdad8e531956f5a938d00e178de0de31ff5ae2e25360ffee1a9e260f0f3874bafe5032311ab1e7
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild
deleted file mode 100644
index 286b7be69e1d..000000000000
--- a/dev-python/pypy/pypy-5.10.0.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy-bin:0"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			dev-python/pypy-bin
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy-c libpypy-c.so
-	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x PYTHON=${ED%/}${dest}/pypy-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
-	python_export pypy EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 273f17e22cd4..6c8de7ebf00c 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -2,24 +2,17 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-bin-5.10.1-amd64+bzip2+jit+ncurses.tar.lz 10635227 BLAKE2B 242509202f5dcc644043ecf69cc50006462146f443ce833d895661545f3270a70f7ddcd7f352084fd3ca71547b548a4b9102f198bf37fa9ed341b70a7e725a1a SHA512 9cb7a4ba15f9608b7925f5110262de2b8a06f05f8619d268d6aad4e492e942b8ecd3626dcb12b77fd4ab3f2742b4887d247e4126d2d5c4b55b765e92c3c3d159
-DIST pypy3-bin-5.10.1-amd64+bzip2+ncurses.tar.lz 6648051 BLAKE2B d97d306076e293f9a1c4d2e413bd6d72811a93f7eee17a87622e809cd24994d039a23e8ba720d7d941791f4fbb4f1d47431bd477b76e9aadcade56163483b985 SHA512 9b1e9fe8f06dea1ed008992f7e3f0858a5c65d86cab2d6fe6736a0f4a9c0bb9e42adf609436e9aca4a363c297b4054a376360e1842c68b5d15728b651c1bd884
-DIST pypy3-bin-5.10.1-x86+bzip2+jit+ncurses+sse2.tar.lz 8244224 BLAKE2B 3ad4a63cab485f151fbd2bd49c55fcc084ff51e50a7ac5fa00ead3e6867794b35f37b7ceb060e85eaecb2a6b2a6fc62dc5a3df832e72cdcb5baa49140e9770e8 SHA512 6f8bb0f575cfe29afcec4d75331ec78516167e6ea345eebdcb7b73c48e9ecf0431433e23b54d2b0fcc16e7e7bc0e6ebfa14b0748a0e4f6b558f6fb20411ca769
-DIST pypy3-bin-5.10.1-x86+bzip2+ncurses+sse2.tar.lz 5351320 BLAKE2B e45ede827a98f6b1e6c00bc1bbeb2a422b53bb68efe9708235be034fe02e90f97352f04e1ab77dc56030942a407887542cf0308c3e4da41f55dcc0d3d251b0ac SHA512 71ba8ababf0ef380adf538989829e068b4353195f796d6d06c128803757d9e41b2e3fe5e96b7029494beb96f83bb8943158541ada7b4c27e46d0511ca62f6a89
-DIST pypy3-bin-5.10.1-x86+bzip2+ncurses.tar.lz 5343927 BLAKE2B 27c5842a1f00ff9b56c1417c290ab677bc8e1cff36ce5d226f1e3e262b14c0f0e8a5f3d474e23bcaef467b8210357d0724e752d9249f275c16cc645e59cd1530 SHA512 6f7ff616d6d0532ce4919d5e6cd69a46fd81c548efda2869653ce07d736d83f256f302040726931d85c83a297ab4c7f6e15675a17576fbffa4313a48435e182e
+DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
+DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
 DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
-DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
-DIST pypy3-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz 6710567 BLAKE2B 239badab3e3f4cb17116f2d2b3cbf58f7a481bdbc78d813563f5a7c2c67002cce598de70ebdbdd8d5dc348ec5db07559a2f35e712ebe46d1f472f2b2ccb9fa05 SHA512 ae3e76c2df50a2ec39e8f447fcacf913a1e9a3cf1268324ddc303b35e8a7a07413278e313e92579c311238ec185cb61d3d97fcbf6e972846859dc423792f55f0
-DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
-DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
-DIST pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
+DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz 8253376 BLAKE2B 6ea95d691a5ccbb89bfd5f9351199f3d3cd4cb855d44937db58ac6327b80b71ed5d15f5dcbdc961ccf5ea1fa945ba31917716a3b9ff79327f4db3a99961569c2 SHA512 e68722eb0004680df884ff98bda906e94a5252c4e6b3ca55fe2df48a5a18d9dccc0218906c6b71a579a7a97da3a4633bb42317a276ee2640a16a9d31c1939f8e
 DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
+DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1ec9c71b5ec477011ec4c5020512508f7c40009d8715972726469319bccb30546105dd68be22a02572f6646f06057495442da12d889ac9695a1b14537 SHA512 c4b4289b9348ad35f79f0581e2d3a8cf1109a3edfb52cccf8e04a0089c706ae12de819d901f875bff3a439680694a98c85605c1b9abfd7fd4ff825846c2c89e3
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
+DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
-DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-EBUILD pypy3-bin-5.10.1.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
-EBUILD pypy3-bin-6.0.0-r100.ebuild 5577 BLAKE2B dffe4b3f16d9af33ac5b7cf651a5147ba284dace9b906e62bd3779c5b6d4ca3e8fb9d2363448598edc120dc95d88df5d32de2f2b52337cc6966faf894f30cb41 SHA512 6b3dfde01104e0ea5e471db9308088adeaae2729f02e8b4271a826efc848d1e6e585b9caad721b2a06a5aaf29210be1cbfeb6ccad68b0bc179f54187d99e0fe7
+EBUILD pypy3-bin-6.0.0-r100.ebuild 5574 BLAKE2B 8cfade201d213feccfd71ba3ea86afe43c7a659a9fc3a2fab7f584f5e05052a4bf07ba8539484bf135daa96623a816ec704420aa305fafcf803655ef07eaa425 SHA512 7b5fb47a68cf3b9c64ae0cc6ae5309b671dea4d8fce026c16240652d0778ebe0bc76f2fce34686c0a29f9c91f8b3e6aa9c5a864b4d9273a864fbf98805a45894
 EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.10.1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.10.1.ebuild
deleted file mode 100644
index 2457cda763f7..000000000000
--- a/dev-python/pypy3-bin/pypy3-bin-5.10.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Test runner needs Python 2.
-PYTHON_COMPAT=( python2_7 pypy )
-inherit pax-utils python-any-r1 unpacker versionator
-
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
-	amd64? (
-		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
-	)
-	x86? (
-		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
-		)
-		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
-		)
-	)"
-
-# Supported variants
-REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/510"
-KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
-
-RDEPEND="
-	app-arch/bzip2:0/1
-	dev-libs/expat:0/0
-	dev-libs/libffi:0/0
-	sys-devel/gcc:*
-	sys-libs/glibc
-	sys-libs/ncurses:0/6
-	sys-libs/zlib:0/1
-	gdbm? ( sys-libs/gdbm:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3:0"
-DEPEND="${RDEPEND}
-	app-arch/lzip
-	app-arch/xz-utils
-	test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}-src
-
-QA_PREBUILT="
-	usr/lib*/pypy3/pypy3-c
-	usr/lib*/pypy3/libpypy3-c.so"
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_compile() {
-	# Tadaam! PyPy compiled!
-	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
-	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-	mv pypy/module/cpyext/include/*.h include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_build.py",
-	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
index d98c618d9ebf..6a1c7f4db7b8 100644
--- a/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-6.0.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,23 +7,23 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 pypy )
 inherit pax-utils python-any-r1 unpacker versionator
 
-BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}-ffi7"
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}.ffi7"
 MY_P=pypy3-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
 HOMEPAGE="http://pypy.org/"
 SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
 	amd64? (
-		jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+jit+ncurses.tar.lz )
-		!jit? ( ${BINHOST}/${P}-ffi7-amd64+bzip2+ncurses.tar.lz )
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.ffi7.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.ffi7.tar.lz )
 	)
 	x86? (
 		cpu_flags_x86_sse2? (
-			jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz )
-			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses+sse2.tar.lz )
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.ffi7.tar.lz )
 		)
 		!cpu_flags_x86_sse2? (
-			!jit? ( ${BINHOST}/${P}-ffi7-x86+bzip2+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.ffi7.tar.lz )
 		)
 	)"
 
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 8facf122eaf0..7e5d5687acbf 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -3,9 +3,7 @@ AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4ada
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
-DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
-EBUILD pypy3-5.10.1.ebuild 6917 BLAKE2B 18198e6dd1b66a2631dc32192af024a16b5bff8c6aceac84c2d36ad92eef7e20be35a53223cdf57e3bfc37fbdf4381b7e274dced1fe245e30999e3685dbc6e85 SHA512 4babcc4db87573e392298486c5aa10193812f1a95655bdcb17e9f652a8c576ccf33fabdffa191f20e8296c21f1634a409abffbe189bb5947cc1b1d152344488f
 EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
 EBUILD pypy3-9999.ebuild 7510 BLAKE2B f76a8d31d84391fbd6026bf57c2e7d9b75a33ea5bd8096db3935d03483acd1f41461d0da131497ea574d6ff64538311bf514ee7de9d1fa686bd4a76b934d9de2 SHA512 4c25f0cc9e328fc28cb4e9e4acfecc2e33b1bb7366c10dfb1ce9b7a9d405982ebe03ff7c05f6458550d460ab5b73d3c60c8f44b96257218cc7ecdc9955691cb5
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/pypy3-5.10.1.ebuild b/dev-python/pypy3/pypy3-5.10.1.ebuild
deleted file mode 100644
index dcef9d5439d2..000000000000
--- a/dev-python/pypy3/pypy3-5.10.1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy3-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/510"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	bzip2? ( app-arch/bzip2:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!dev-python/pypy3-bin:0"
-DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy )
-	!low-memory? (
-		|| (
-			virtual/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-S="${WORKDIR}/${MY_P}-src"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && local EPYTHON=
-		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
-			einfo "Using PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
-		fi
-
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		--jit-backend=auto
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
-	pax-mark m pypy3-c libpypy3-c.so
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_ssl": "_ssl_build.py",
-	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
-}
-
-src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
-	einfo "Installing PyPy ..."
-	exeinto "${dest}"
-	doexe pypy3-c libpypy3-c.so
-	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
-			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
-			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED%/}${dest}"/lib_pypy/_tkinter \
-			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	einfo "Generating caches and byte-compiling ..."
-
-	local -x PYTHON=${ED%/}${dest}/pypy3-c
-	# we can't use eclass function since PyPy is dumb and always gives
-	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
-	python_export pypy3 EPYTHON
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-
-	# compile the installed modules
-	python_optimize "${ED%/}${dest}"
-}
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 7f3f42d3e68b..09b3d004d5f0 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,7 +1,9 @@
 DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
 DIST pysnmp-4.4.5.tar.gz 438424 BLAKE2B db989eb9faa0d548c7e58a5e9b7127824f2798c116d27b8885b4920f5e0acf9068ea5ad88e13e8e913e24c0d21d414026f6d733cf680b41e59370c960d856197 SHA512 3164e93a8623512d903c86eebdb6f9fa5ffee29309747df4a836e257e87dc5480cf706ab527e1a8966e80c0626961f6f1b68b60cf07df2ddece305706f5445f2
 DIST pysnmp-4.4.6.tar.gz 434508 BLAKE2B 0613cd115d9b52b12a9e4ca45c0dc6b51a6e8506f5fe4d93641dd53ce61e88f4ed89783692c4220008c345179808bb4a79d4aaf1d828e072d822a0d131204fa1 SHA512 0b53fcb7d266a861b3f8dca228371a7430b5513506b4b7083e112916730cc25311cdef549373271c2da62441a603d3f33e6a1e9417dec3aac074db25fb2be7c8
+DIST pysnmp-4.4.8.tar.gz 435494 BLAKE2B 801d52660af23f9db9fd6e4fbd7b93f06db65d1c4987d44239da0927a116559ba502f295a5ba345529f15a41971a0f407b60266ef0cbcb328476e7e58e3646e0 SHA512 a4b0954a65818e49ce76455ef48c7c363bbc69031b699b303e8e301e7aa5db10ac5042557cc1727e885b200672ba35aef995baadb989cd95aa90e528c7e97e04
 EBUILD pysnmp-4.4.4.ebuild 1247 BLAKE2B 4335ac075030075f0651ad238ed7561ff1048e37d43605fb891fcc7e3252a3dba9fff254299e1c86063539fa84c6dcdafc46ea4c3cec59ed4e8bfc03617c42f9 SHA512 4f7b1edb9039b4d3c25fdb590e92658b58bfb3d13147208897fb621bd80f0f2d185aa0d5b126da637fa8046a3a480f3232dec5da6b79addfbcf39d9d55b35114
 EBUILD pysnmp-4.4.5.ebuild 1250 BLAKE2B d29142f5288f773e13b5df43f9442799eebe134d1160ba1e90ef614bbcf9d30af8b3c384bf20fc49b1a0de6493fb56eeff9be9c9bdc55fe1fa8934cd213bff29 SHA512 29af54adf7e4769075772dd06ee3919519aff1afe28ec3c5e8102f01508afc2b3dbe28d78981d867fa1c3256a1e3b9fd1af5ed09bf8edca382cfd394183501b3
 EBUILD pysnmp-4.4.6.ebuild 1250 BLAKE2B d29142f5288f773e13b5df43f9442799eebe134d1160ba1e90ef614bbcf9d30af8b3c384bf20fc49b1a0de6493fb56eeff9be9c9bdc55fe1fa8934cd213bff29 SHA512 29af54adf7e4769075772dd06ee3919519aff1afe28ec3c5e8102f01508afc2b3dbe28d78981d867fa1c3256a1e3b9fd1af5ed09bf8edca382cfd394183501b3
+EBUILD pysnmp-4.4.8.ebuild 1247 BLAKE2B b5428d3ca11e85c91ac206c27430fb5e905e928b69a70479468dcb88f1832b5f5b2c204d4e6b6fcf2f0e5ae48f8dabc230bf3ca124ce34a7f579003d0c0fcbbf SHA512 55864eaa1ca2a56d4443c6f3e3aa62eb79f29b92336a5acf5211dd82affde2f76ff96e2f73601852dbb0b886ee00cd4ef50e7f547cca5fb2d54c8ecdac4490d4
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.8.ebuild b/dev-python/pysnmp/pysnmp-4.4.8.ebuild
new file mode 100644
index 000000000000..242ffd41f3a6
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.4.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	>=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+	dev-python/pysmi[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	default
+
+	if use doc; then
+		touch docs/source/conf.py
+		emake -C docs html
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/* )
+	docinto examples
+	use examples && dodoc -r examples/* docs/mibs
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "You may also be interested in the following packages: "
+	elog "dev-python/pysnmp-apps - example programs using pysnmp"
+	elog "dev-python/pysnmp-mibs - IETF and other mibs"
+	elog "dev-python/pysmi - to dump MIBs in python format"
+}
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index fde961becb55..3f0cbf1f5f22 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -3,5 +3,5 @@ DIST tables-3.4.2.tar.gz 7593471 BLAKE2B 1a011a2a910a25d4e7cad68b5a1a267482f5ed9
 DIST tables-3.4.4.tar.gz 4626053 BLAKE2B cca4f87aa62db16bb47e131bf670e1013d363dea9c807f399688e184610f682c49b00b686d8e28a03caf94a98e51b11bf646df66f4e3db66f481751f096906f8 SHA512 2d0cdd36a6f14702f424773b64187d1980d73a72525ead43b272776bb32b2ebc4c6ea0b7e3343c8600d7f62c42d008b5e835439af30e76ea11c7504666631ddf
 EBUILD pytables-3.3.0.ebuild 1576 BLAKE2B 284a5c4a14d6705f464ae82943e15ffd2abfae5a607651c0e4fcfe2d4bede9b4e672636a8e92b849b2fc69777b8e395b7f3f3d163b13fe1ebf57b6b2c4e5df6b SHA512 245b0b83df781420beb759ffcd1e66106739e4a56fdc524f1f9ddb0a65c5c91442b17775e123ec474f55a5ad7d6b26993dc4453c2afb8522507f0ec2f66997f6
 EBUILD pytables-3.4.2.ebuild 1699 BLAKE2B f9ec49367b093596e1938c64b5f9d225ac4905ff26e6392fc4f4a8bcd9944cf170fc5a149cceb3f33d947460363b63ca959e2034ee417097a329876f97b373f0 SHA512 8d437757049016b98bdd8e67c296ec1e5aa484012f50338e9d4e1416f9cc51a3a9631b15bfa7b5f1931d24a03f40a6eec4c4dca2a2d49764a406fcc14003653f
-EBUILD pytables-3.4.4.ebuild 1700 BLAKE2B 7124df86eabd1f75b4873c94f9c76c985c8a5617338a3db4bbb1fd045fd359b9ed75c00bfa526b26bd1f3670bd75649349145b8281ab0d4cfc6f2611d11241a4 SHA512 28de9973eb58780e66aa9766d641b8b15b39c1ce3eaf71775fbfba9a6b6283f1e9a52a98e29238badd7fae701c91723a0f6006d45c1efefb2d9698f33e1d1a4b
+EBUILD pytables-3.4.4.ebuild 1749 BLAKE2B 9f707f73eaf5958be941552666d6c2e3fe8f9fa3a906df586dbd090c2f9542fadab20990e84ada157f3c4bd2b6876b5ac484de204766baed2c5933ad0d7c0b82 SHA512 ac2a713ae7eb8906ac6bad70f19f882136e9bd832ac46d99e3d256c63957ea35d13fb273400a97594c9e5d83cdee1eb833c3041b41fdfab4c3e8d5917f7255c4
 MISC metadata.xml 894 BLAKE2B 279b64a5124a6471b3ea6ed8d2f82b8d62e5d8bc809168fb2ae1c3bfd8cfa07428c2ff7f07deb5042a6ccb5ba7af43bc45d0db82b9cfc79fa5d19c090d0500a3 SHA512 88dd752e6014f6f133b5df7db6c2aafce0b9da8cdbc057493916dbfbe1da4bf52e0ed43d570d68035fc8f12302794a381a54f5b07b9726b52601724163bc672c
diff --git a/dev-python/pytables/pytables-3.4.4.ebuild b/dev-python/pytables/pytables-3.4.4.ebuild
index 9995427aed4c..265889bd4b0c 100644
--- a/dev-python/pytables/pytables-3.4.4.ebuild
+++ b/dev-python/pytables/pytables-3.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,9 @@ HOMEPAGE="https://www.pytables.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD"
-IUSE="doc examples"
+IUSE="doc examples test"
 
 RDEPEND="
 	app-arch/bzip2:0=
@@ -33,6 +33,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index 7c538b094ff2..47c39d8621a7 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0.ebuild 702 BLAKE2B ecf2d298a80633d92f103dfdfacd8de0843323cf5d55eee4d0954395edf6ebb7fc98edfd40226c6d6d80929909cb06db6c7a71bc537b8e82d31b7a31031f472c SHA512 1114d34b201df94d6247c62fef6a3f67f2424dddcae4b4e7874a135d11a3d900f7ef9f3c1b03c160429e7282ccd23528889fe5d1d7af952f222bb31a824dca6d
+EBUILD pytest-expect-1.1.0.ebuild 704 BLAKE2B c64daa025ef425b5f6819862c1bf41448cbf4bc4265d104aad856c9ef40af5a8b5dfb156085214147617d6b8f2a8a5a1e0b1c6b41124a626fb6d540174e61af7 SHA512 06df586530ca079e042c9d05b7fa855da690af1ec466b684d0b5a8b49eee755368d3ea9f56baeaa04b400016b495d2be9c223a4e960707187b81e85c80fb8852
 MISC metadata.xml 357 BLAKE2B 29b8df313fa5bb9f7666ba95df518d3ada2f9bf783c2e14cde2f404cf10504e5631ad2a512303acfdd0a4ffdad845fe482082d5234e6b54818f38c83c07391f9 SHA512 6c6151ca1a141fdbecdb4eae172cf6d21bd41f2827db435f8d1a6a4dd95743fc291f302848b9afad0e1fdb9e7bb8030bf0f8e46a69e8d4ad9ed0d648b1aef870
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
index 6ddb7b912de4..028f106b7ec6 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 300894a20b21..141dc96b9d8e 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -3,5 +3,5 @@ DIST pytest-mock-1.6.0.tar.gz 17780 BLAKE2B 4fbc0cbd951668eb2ce427496c54e958591f
 DIST pytest-mock-1.6.3.tar.gz 18482 BLAKE2B 1c0d366e5afd1b247ff454716b6d96d9d68846adfff81adc0ea079a72d3e7710fd9385122723cfee69965588235ec2deb1e0b52328ace5c967652c93b404cea3 SHA512 6857f373728d3f2c6b152d4f89da3590e2e74795695dc9f4f3704a4e0250e49d705ce0de4121a801ac35c83217678a95a5023338124293ca74db406941f5072a
 EBUILD pytest-mock-1.10.0.ebuild 1055 BLAKE2B c8f4b3e9c626527e2182a56883a3a6353857e6a441044d4c8b70e027f7abbac2cdce0fb79c76dbc425ad556c00cab28a2c1edb7969bf468be28dfa0eabd0c9ab SHA512 8b1a6eaab12269205fad2e5eb9e8743cea98bcef7c81640661f20befe9eb93a6f172cc4bc492e62d80c437190763affc0454959e6a84cc2e9fc5fdbfd0495960
 EBUILD pytest-mock-1.6.0.ebuild 1084 BLAKE2B bec8d4ea680db36cfc84747e495cbe72ab29dcfe59d9fbba0255fddd993b2bd1fc096bb1e0dfa8c5a3d0a84af7c30f6a3ea2fef13f37f3c99a4df53844185eeb SHA512 1d177ed2bc845b7dc9806b2c2e7028a6225f4fa4ae6a1d6e09b1081a068e8cfa06f31dd723fef4e4f85925818c89c9eaa78c27c699629e1bd28200c018117ae9
-EBUILD pytest-mock-1.6.3.ebuild 1037 BLAKE2B 62b295089473cda2d16e3fc4ec7fdd2b883197251e431e06649accb7b2be71636f192ab8a661376ae5f4284ccd3f061e49ecdcab51945ee7ef9af540ea9477c3 SHA512 7048e15c77f47c44f85a005d0901dd225f6dba220b3fa72f27bcdebfb3b9ad317615d4a333e9045c44b2d31317cc7a60548f63f2a8995a1f50b27021cf7c8ac1
+EBUILD pytest-mock-1.6.3.ebuild 1043 BLAKE2B 91c59156450004ad46e3843160a17e46718634d4967cefbd175d75e4c61f0d0b738180dd0ddfda8ddeb852e0fb2708a49db87a624626cacf45cc5273e30156e9 SHA512 b9fa11994191bd41a7b57d80ed0fac7514da6698d08b46934de52d63b615ce8050b1ed0af9ab36e458dbacce63ab8841340a66489a9792eb2ce615dd24be59c0
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
index 8eef9f69c7af..b52233568a88 100644
--- a/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # 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="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 729abfbe1b6a..096602fea807 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,15 +1,10 @@
 AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956e1aee4c2bc596e3d8e3347da3624dfd3cbfdd1eabd8872058737e8f9b558f3570878756c7b87a65514956b1e81235c2727e8ff2fc63 SHA512 4a28ddc07389aac79e46528e85229aba126a89c27b7bec73b406766be49f5c8be9bdc2cb3158bfb475b4d6371e2f33960e1ed154e3b9eda15aeb8b151f3d2148
-AUX pytest-3.6.3-pypy-syntaxerror-offset.patch 1055 BLAKE2B 8a92e1300052ed7f178252489d4b687d9d58d5fa9067a1f17a20ddbd698843a5614e7dd729670920a447e189b0e40ed2ae26fd13ad7d9cfebc59889c8cc50d87 SHA512 fa2600e320a74eca59004953aea0ac7607e6b7fcbcb702a5ac709dfcf73d036f47c5a79b01e56061ed6776ccaddd7a261162848218969fd1b462c5e1dd615ad3
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-3.6.3.tar.gz 830949 BLAKE2B 4c0df5d157b8bb0ac6261a793aac2a8074c869b1a7cbda3eda600c79648b3722eaf2a57514c1fece60e0aac324b8ed09e8e889dda268619204e9e1f1637e1c9b SHA512 e18d8e972cb1b05b037b9441eea5981ce036d8e2c2bab80f6e50f283df9bd08740296133990424cf78449f6d3d2fbd1d59709770aa972af99fe061583f2d79a7
-DIST pytest-3.8.2.tar.gz 869668 BLAKE2B 91d75481e4ef36ab06654b340751a33a96b9f6187cdfc65694973e2d4d7ddc5806fe673c87f0aa442c6c657a953b36c22d288eee8f61cc002be4be803bc98111 SHA512 5420de07ff741f64bcb7fce7bf3b5097cf63be2539c2e694c168bd824ba468ca87cb17be801b72b972ab417da98d1b5473f319afd642bf5c6c0270e3a697d016
-DIST pytest-4.0.2.tar.gz 904958 BLAKE2B ea245fab1363350d6e9aa0eab4aa5cd732561c6f4192e90f2fdc68b1a31941b91bde23b9840c3df7804a4712b8d26bd3b65d2789988e2994ad7c61a272184804 SHA512 6c77024cdd0a14ad417d7acece89e6b06530ceec1d6950a7cae265bddff44182d1839ced59c34ed9add8eb55214d69f01bd77499b8d3b483ada5ba47bca28802
+DIST pytest-4.1.0.tar.gz 902235 BLAKE2B 6289d13f6d81130fe4a1ea25dbe93c76206cd61c11e3c18bb5febd92539f37f45144565680a6df097667a5e940e545e7973193abd214bff7b9287d9b42b00e56 SHA512 30cbefa066728b72063b21190df74b7cbf56d045e87307915af45e3ff5cdbb76c79dd0c2428425c2db9f8f0ba99a116d787526dc806801787b89a7862dd9e56e
 EBUILD pytest-3.10.1.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
 EBUILD pytest-3.2.2.ebuild 2113 BLAKE2B 1789686fa508f9629adc37e7fcd26e8a4426214b6335922927bcd8bb37c336792b564ce505c122a729edfaa53af604e4fd1be31f45c5251f0008e14c8cefb06c SHA512 1384082815df0f30e50881c89d81822575509f1333c2d3713b69ff7e3a9113c1a70fa5220d0e10bae0b5f17d844a14501e59af8c944ca4006dfeb9cd0e8616b1
 EBUILD pytest-3.4.2.ebuild 2509 BLAKE2B 23b2f34e9f2923a0eb143a341f4dff40e88d4ff1bf52cd7637d9354192ebadb58c39050feb00911993f0067d60571598864e5a85644b0adb33cab722594f9ebc SHA512 1958df6b0567c547bf70789836e12929caf3e1f17ac16ebad88aac081dce949888a08efceaba04649feb8098d4373548a5d4de511a8b94d6f50eebbd1d5d7b64
-EBUILD pytest-3.6.3.ebuild 2423 BLAKE2B 0440c961c535989ba617678c98e34986f856eb04069095f27c8cb6a0d4e4ec85cb32364e2ecad52f8f3b89e41f78a88b02eb9606f9bfe48c94c2e48644410652 SHA512 bf354801416969801698e10dd53c8c9d67d3c4947c072b9e5d99dd762de5214040fad2d150f603ce8e7b9ccec092786133de5dcd697ce60a99e8e79d1adfdfca
-EBUILD pytest-3.8.2.ebuild 2534 BLAKE2B 8efa6c48c3c959ba5930070a2fe0308b1225bb9b1fe14c2f8ce026c7de5ad27e9a2f2ecaf44a9e5daaa718d1d7620a0b374e4addc47e95b35022921d792b3356 SHA512 754577850c79bc0e4e484d1c19fc96e380700d0b07fc2a2e79cb2fdc9b6db51181ad3a918102a7a2198d130d08e6bc7fe3104cc7048376813e14c0f4563edede
-EBUILD pytest-4.0.2.ebuild 2190 BLAKE2B 51f2eae063abe8a901283deb9914a18258efa71084ab117bade90c9a945e203346ae2863571f5e786ab49450d9d171fd6d6a9ba3df2a0e3d23700548c010e73e SHA512 c422d28c466fd0771c70d33be2984b5e1c4c1e9142a341ab4207b62d52d98fa308ba28872685ff0b6a5cdb889745960b60a960ab4a527bad8fc8c8cba7f46487
+EBUILD pytest-4.1.0.ebuild 2190 BLAKE2B 11afe662abfeccadfb9ed37678095c6e41939af9800cc07c736b256c062c71479469e35675d1c3ffb31f4b274159a7f769d22ea72f9fbbc44c3f5bd27dfb1849 SHA512 e8acb146b426f456540f6d0c33b552f19544677542e980af5a9647cc837466e8ec295c233da1cdb447e441ccef4e077cf048cd567418b4bd0cbf428956d0c81b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
deleted file mode 100644
index 31dd00546761..000000000000
--- a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
-
-(updated by mgorny for 3.6.3 -- upstream quoting changes)
-
-From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
-Date: Thu, 10 May 2018 11:42:56 +0200
-Subject: [PATCH] Fix PyPy SyntaxError offset in tests
-
----
- testing/code/test_source.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/code/test_source.py b/testing/code/test_source.py
-index fcce3fa..22278d8 100644
---- a/testing/code/test_source.py
-+++ b/testing/code/test_source.py
-@@ -117,7 +117,7 @@ def test_source_strip_multiline():
- def test_syntaxerror_rerepresentation():
-     ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz")
-     assert ex.value.lineno == 1
--    assert ex.value.offset in (4, 7)  # XXX pypy/jython versus cpython?
-+    assert ex.value.offset in (4, 5, 7)  # XXX pypy/jython versus cpython?
-     assert ex.value.text.strip(), "x x"
- 
- 
--- 
-2.18.0
-
diff --git a/dev-python/pytest/pytest-3.6.3.ebuild b/dev-python/pytest/pytest-3.6.3.ebuild
deleted file mode 100644
index 24cb5009b0b1..000000000000
--- a/dev-python/pytest/pytest-3.6.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-# doc apparently requires sphinxcontrib_trio, not yet packaged
-IUSE="test" # doc
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-COMMON_DEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-#	doc? (
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/sphinx[${PYTHON_USEDEP}]
-#	)"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!<dev-python/logilab-common-1.3.0"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/pytest-3.6.3-pypy-syntaxerror-offset.patch
-	)
-
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
-
-#python_compile_all() {
-#	use doc && emake -C doc/en html
-#}
-#
-#python_install_all() {
-#	use doc && HTML_DOCS=( doc/en/_build/html/. )
-#	distutils-r1_python_install_all
-#}
diff --git a/dev-python/pytest/pytest-3.8.2.ebuild b/dev-python/pytest/pytest-3.8.2.ebuild
deleted file mode 100644
index dca19e60080c..000000000000
--- a/dev-python/pytest/pytest-3.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# doc apparently requires sphinxcontrib_trio, not yet packaged
-IUSE="test" # doc
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
-	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-#	doc? (
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/sphinx[${PYTHON_USEDEP}]
-#	)"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.22.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-	)"
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
-
-#python_compile_all() {
-#	use doc && emake -C doc/en html
-#}
-#
-#python_install_all() {
-#	use doc && HTML_DOCS=( doc/en/_build/html/. )
-#	distutils-r1_python_install_all
-#}
diff --git a/dev-python/pytest/pytest-4.0.2.ebuild b/dev-python/pytest/pytest-4.0.2.ebuild
deleted file mode 100644
index 7419f06cfccb..000000000000
--- a/dev-python/pytest/pytest-4.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
-	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]"
-
-# flake & pytest-capturelog cause a number of tests to fail
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-capturelog
-	)"
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	# those tests appear to hang with python3.5+;  TODO: investigate why
-	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
-		testing/test_terminal.py || die
-	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		-vv testing || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-4.1.0.ebuild b/dev-python/pytest/pytest-4.1.0.ebuild
new file mode 100644
index 000000000000..35286e06a77f
--- /dev/null
+++ b/dev-python/pytest/pytest-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.5.0"
+
+# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
+# support, which only came in py3.6.
+RDEPEND="
+	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7 python3_{4,5} )
+	>=dev-python/pluggy-0.7[${PYTHON_USEDEP}]
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]"
+
+# flake & pytest-capturelog cause a number of tests to fail
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+		dev-python/requests[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+		!!dev-python/pytest-capturelog
+	)"
+
+python_prepare_all() {
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	# Something in the ebuild environment causes this to hang/error.
+	# https://bugs.gentoo.org/598442
+	rm testing/test_pdb.py || die
+
+	# those tests appear to hang with python3.5+;  TODO: investigate why
+	sed -i -e 's:test_runtest_location_shown_before_test_starts:_&:' \
+		testing/test_terminal.py || die
+	sed -i -e 's:test_trial_pdb:_&:' testing/test_unittest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
+		-vv testing || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 5e12a015c685..1e4db0e4ca61 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -4,6 +4,6 @@ AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f
 DIST python-magic-0.4.10.tar.gz 3950 BLAKE2B f672b95082a68ff8fb2c4b50da0d22316456cda4b72b92d4244fdcd47c43bf599821a9577c76d99bc2a3ae578f4ff05aa76efcfcde684f27a06b90e28d58235e SHA512 8dadfd069bbca574a159dc034fca84fb110a3015ba54fa62c715006b586a5fd10373a5108a4847887bd86c6b7f2c4da90dfb7041cd5e4d51829ac1b94b8e1a03
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
 EBUILD python-magic-0.4.10.ebuild 610 BLAKE2B 091ab80438f8026e27a429a92a784455448332bae07ab2a30ca2a368ef196569ac8d75165b32caa12514685f85b6d9282cad4788ccd04499bbbc33efe72ecca6 SHA512 58275f8d490033b415fd2e95caeffbe04ea76bcf39186d33ea830e1f7c8a42bc7996286d7ce4cc8b2f18198325603b3c9f429d2ba91ee0c5041f099384177efb
-EBUILD python-magic-0.4.15-r1.ebuild 1031 BLAKE2B 63b57f9fa50765b4bb6716d42dd52c8dd7b0fd80d5680e74c4767b8c8f85298471c49fbfbb465cc0fed94607aa4cc394ed8d8f8a1f4f3275d663270423089226 SHA512 51f6db84e0242e20935beccdd3f1a380616f3cdedc3c0bc80c9b4017e8c9f1218cab257d67d8efdcf855aa440023e6c543fe79183b21c8cb2f1f00efdef9f054
+EBUILD python-magic-0.4.15-r1.ebuild 1041 BLAKE2B 22e9e0f1672391084950e910bc365e7e9021aa6077fff7deaffdeb417866c9ab8731b66b3bd4381e0658ac0dc7abb02e9828d0c193426ed5e9d3c4ce33c2f905 SHA512 f31cf993c76551fb32b1846ff703f2677578648418c122f3baaea20fa5f77eb2426300373ef54a7bb83d6affa82e8179af049fe017498dd11988134869cc5e53
 EBUILD python-magic-0.4.15.ebuild 629 BLAKE2B 3a38065ed1794fd461531a44929040290a0709cff97649ee0de85fa43c7222381a5bd4169eaa775c3f4f50f5977dfd7c6993ab2f56f12c76082da2380ec336b0 SHA512 6ecb50b3293079258c4678e1d8bc315be14d35610b984ae2abc662fe067285fd2f3be75bd5b8a06cb29788b053bbe0abd168d06e17026e4658160f9588857761
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index 5a23238beb2f..6ed33e199408 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~x86 ~amd64-linux"
 IUSE="test"
 
 RDEPEND="sys-apps/file[-python]"
diff --git a/dev-python/python-podman/Manifest b/dev-python/python-podman/Manifest
new file mode 100644
index 000000000000..488518ac1560
--- /dev/null
+++ b/dev-python/python-podman/Manifest
@@ -0,0 +1,3 @@
+DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
+EBUILD python-podman-0.12.1.2.ebuild 799 BLAKE2B cb47bbd38f2650769ae850a31afcd8a84e9da1e77981d9946780efd61afd30c389be9105e25b31516d62846897cce25087424881d08b7c9124c6825a30aac53b SHA512 496121f68acc1ab9de5b99d4a63a8b3dff4c91c4195a0564270ecac1f7641577cb3b5ba190a6798280da3a886f420b9417fd6aff47da3557651c1674779424df
+MISC metadata.xml 326 BLAKE2B 77218bd50d76e0dd8ffbeb168b7e08d7cea7f8768f9d552865fa85f7ae78b9e4654fcb672320776b28b013e592117a4289522bdb0a62f03f40523b78d36f6171 SHA512 2d777f25c03c813cd1ec96215d91dd793350d48ba396de9c544a53412401b313ee5270311612e4a13a2b1a318591ba7fd96db686d639e241c13ac432808f219e
diff --git a/dev-python/python-podman/metadata.xml b/dev-python/python-podman/metadata.xml
new file mode 100644
index 000000000000..7d1075feff13
--- /dev/null
+++ b/dev-python/python-podman/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>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">containers/libpod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-podman/python-podman-0.12.1.2.ebuild b/dev-python/python-podman/python-podman-0.12.1.2.ebuild
new file mode 100644
index 000000000000..d99498b3177d
--- /dev/null
+++ b/dev-python/python-podman/python-podman-0.12.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for communicating with a Podman server"
+HOMEPAGE="https://github.com/containers/libpod/tree/master/contrib/python/podman/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> libpod-${PV}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-varlink[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-39[${PYTHON_USEDEP}]"
+RESTRICT="test"
+S="${WORKDIR}/libpod-${PV}/contrib/python/podman"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
new file mode 100644
index 000000000000..29e19b8bf818
--- /dev/null
+++ b/dev-python/python-varlink/Manifest
@@ -0,0 +1,3 @@
+DIST python-varlink-29.0.2.tar.gz 34254 BLAKE2B f0970c3395872ba10bdc3a1f26942a17a75944a5139f731bb1f481016ff73473aec7d7b6103f127d63dc93394fc53b56d036293d6c8b5d2bc708effb6efdd1c9 SHA512 c6e77b3179c6dac2a90becf92ba651b007ada2bd79caab63521a5732cf524118f927ef85aab9df3a27d2c0f66b1ba2c31cd76399266d31ab28f39c3392481108
+EBUILD python-varlink-29.0.2.ebuild 640 BLAKE2B 31a8ee7cb4794edd1fa0091a9406b1ce21c02a379cf7283b71a455c66d8a5076481b160aeca259ac7699df7a3d989a836d11e7fe16e8bdc55fd8899b4af06155 SHA512 8ca9deec96febe76b3cf00f8d7b6c0da6f8f06ff0491d7fe2d5bb80052900408df618bc1bf47a06843eebcd74025124c032c953062fdbb19176ad035b1c5acc0
+MISC metadata.xml 368 BLAKE2B 4af59ab1c33a904380f1c2cebd76618b9286ac076024008bf60961eda1a4895fab7c577fe8ae342238ad65d26cb21ba8e76ad9752e76313ca9e0460fd7b04a95 SHA512 3aa1f68a1ec8a06b0506e3b9500095c18b892225906ee57318182a1590e494c404d5ccde60af935e742683374fdf7a1a1db1c5746debd5be5af94bc940038388
diff --git a/dev-python/python-varlink/metadata.xml b/dev-python/python-varlink/metadata.xml
new file mode 100644
index 000000000000..19f62fbd6c65
--- /dev/null
+++ b/dev-python/python-varlink/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">varlink</remote-id>
+		<remote-id type="github">varlink/python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-varlink/python-varlink-29.0.2.ebuild b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
new file mode 100644
index 000000000000..1aa35e6e32b0
--- /dev/null
+++ b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Varlink protocol"
+HOMEPAGE="https://github.com/varlink/python"
+SRC_URI="https://github.com/varlink/python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+RESTRICT="test"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/python-${PV}"
+
+python_test() {
+	esetup.py test || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index d21b6865e3bc..01a41a0ae4d2 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 45e4c6320d385e1653b710bfff8e085db962365615f5fdd297fa1fde160e8467b47bf5e4fef379094fe2515f885581393c7b6945795e7928e56061e68f2c4601 SHA512 47d56ca71160e66b44e6dd4ffc37cd368b97e1216703fddc30a2628dd03ca89a0507376bf9c566fd71b13f074093ef8c38501827d3cfbf947d042c05e4faa4ed
-EBUILD qscintilla-python-2.10.8.ebuild 1554 BLAKE2B 7f9deeb5af6be0886856eadc4237b5ef9f43730aa0918c58fe12eccbfbc77291e271efbd71f3cbc58b79991abffa1f7a1b47a9b7b53b10ef7da1d11d5721eb8b SHA512 bc893f2bb847a67075b21712fc22709761e825a3b91e0d72994d047bc584bb8835df9abacf0b3a5ca4de84736ad1e7009e60ce4c2ae5d44e8bb8e3dd016b58ce
+EBUILD qscintilla-python-2.10.8.ebuild 1553 BLAKE2B 210cad565973dfaecd9e2affebb750b112edef43551847206639228ff2f4d7be21b28e964cc3d4e5491c4cb7979774f7f86893f8cb8c7312755dcf647ba235af SHA512 a5f467336e07bff0b6bc6375e263169ff27febc274fdbc4d202667ed1e4a5bdf7aa6f8bf5adcb2574426a45650041bf606c041ae976d195c069c9084a97242b7
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
deleted file mode 100644
index dbc23b01d914..000000000000
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.4.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
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="Python bindings for QScintilla"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,printsupport,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_configure() {
-	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--pyqt=PyQt5
-			--qmake="$(qt5_get_bindir)"/qmake
-			--sip-incdir="$(python_get_includedir)"
-			$(usex debug '--debug --trace' '')
-			--verbose
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain, build flags, and prevent stripping
-		eqmake5 -recursive
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
index ac68fb127b2f..a03ddc26eb02 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 37728fc83b9f..5642098c9a15 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,5 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
+DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
 EBUILD rfc3987-1.3.7.ebuild 789 BLAKE2B 9605f6c0d582efab70d22495d49c5a44b2ed84491020a1a89b552717961af9fd211c95f686626e0cf2f2b92628b4c35f14333d316f56048d7d6bf22e9ba9b819 SHA512 2577bf9cdce3a2538e4fbf73007f7c5d04f53e9c3f97e4a8c97083e8349fb906dd411f2880f5e1402833bface2043dc97c6d88caf8a90f53e52e3f087eef13fe
+EBUILD rfc3987-1.3.8.ebuild 796 BLAKE2B 150d4813d5bdce12e11a2bf2aeb54f241f3305e8f102e966eeb598794dc009b4a481958ca8d5372c83c15d2665d829fa300de3b056fd833398dfe506861a2495 SHA512 a7e462503168f667d34d55535e0ed6a23153b72882b042cace327b7e9729a6ab900f9507aba8611eec961a540970046ef950b6cd4a281b21560ca0e87653d05d
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.8.ebuild b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
new file mode 100644
index 000000000000..7e5f142779dc
--- /dev/null
+++ b/dev-python/rfc3987/rfc3987-1.3.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
+HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/"
+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-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="$(python_gen_cond_dep \
+	'dev-python/regex[${PYTHON_USEDEP}]' python2_7 'python3*' pypy)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
+}
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 3b85ab9b492b..dd08e3a3ae0c 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,6 +1,8 @@
 DIST rosdistro-0.6.8.tar.gz 59771 BLAKE2B 5610ef992824104570abc8c5cc0224838ee1442d942f8f317b20b300831f7536649b47360e7f542e484d75eac29af71ce9e82fadf91b540f4671478039776921 SHA512 57db65b7cba29e41c14ea4e45f951a410e6152ce4247afd1b15df51cd79e50bdbc95151eac02acc666f8bc3c2658695600ad1b4fc0f4152d71901685c9e8f558
 DIST rosdistro-0.6.9.tar.gz 59831 BLAKE2B 4a576efce73cceb68496f2ba7a52e9e09c92aaf0c54ed9693e067e1ea7dcc0b53362a42524dad92b1e68acb22b88c7a92427b8962dbdec781cac5972e251ee9c SHA512 351653c95803dce034074a357f4ca878688ca3e640983cb380840b1bb898f1b8e827210620ba31261fa76edb306908e489e0b8504a6fd8c651c83fbfb8774bd2
+DIST rosdistro-0.7.0.tar.gz 60092 BLAKE2B f68dde51a3e6b5efe26608130d3a69536803baad92565c7d7cb25b22f71be4cc8bb3869d72abefa7e4de4446ff7f3f49037e789c39d9ac401fff30dd8d9fc082 SHA512 8def3e3d405483f9cd51dbe82bfbb7605a50d2d14dcd9712e3e93c5c091953df430203b2383d46c1db2248678fbf2b84638328f47a256296c78229b7783e724e
 EBUILD rosdistro-0.6.8.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
 EBUILD rosdistro-0.6.9.ebuild 1041 BLAKE2B 20b6315393af48a04bd289c3627d52ecf126e522dc9b6efed1cad61464f9eee6dfd1da64acff5d7e110bf17666656f3fd4514e5029a953a2bb86829b33ea06a8 SHA512 a73a13b78e9b27103b3efe59c32d64e865a493154b64d76ec0fe916e816755a8215ed22e7acc64f09518f8fb9b2f6051338c487b92e68069dfeec0019a20663d
+EBUILD rosdistro-0.7.0.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
 EBUILD rosdistro-9999.ebuild 1041 BLAKE2B 20b6315393af48a04bd289c3627d52ecf126e522dc9b6efed1cad61464f9eee6dfd1da64acff5d7e110bf17666656f3fd4514e5029a953a2bb86829b33ea06a8 SHA512 a73a13b78e9b27103b3efe59c32d64e865a493154b64d76ec0fe916e816755a8215ed22e7acc64f09518f8fb9b2f6051338c487b92e68069dfeec0019a20663d
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.0.ebuild b/dev-python/rosdistro/rosdistro-0.7.0.ebuild
new file mode 100644
index 000000000000..df8542c9a22e
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/rosdistro/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/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 7e12f89491b7..a4dc8eb56f24 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +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 554 BLAKE2B 705aeed736588543d8428a6412d8995183f56eff73e760810f1ce28652ad56543027abec01d46a87262af7e22857d7c9eefb856e2dc71f0a2676dc2e1a0e2b50 SHA512 2e6a0d0796a2a6bc1a79ce80c715b5434a750cc447b07b84880ed29a0f495280fcb9030f39549aed13128bb93dd66bbaac28f5590aa00adbfa66ee6f4ddd2ca2
+EBUILD scrypt-0.8.0.ebuild 619 BLAKE2B e561c198c2e8361233364897d880ce9342031ac6f271ec37e42a1c32060482346e3f8e8f455bcb2c2c8a9f1e0e113b75364f5e8e38889148c9409338958d2b2b SHA512 122618f8838b217e349cb96c483d1cfd75e67d54408e2020d941ad5f5daaa9c1794cc618553bd2839e3a4f0c4e76b8974df389fea66459f3a18abc3639834142
+EBUILD scrypt-0.8.6.ebuild 575 BLAKE2B bb3da32e3bc6b6a2c49cbba78153b543cb9bc94e3ab20979afce8465ee8b5d07c9fba947e0d8481312700db5a07c626f253ac660096f20dcc8cc065036e990c0 SHA512 2f93e369b9dc3428bde394490654e6b657c7db1bfb33e49d8d51c446a4df4b885fe7a2b2f6807d2cc411f996846635a0c2b9bbc0409820206ac05f3c1e1f96b3
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.0.ebuild b/dev-python/scrypt/scrypt-0.8.0.ebuild
index e8a275ed3604..76f189daa364 100644
--- a/dev-python/scrypt/scrypt-0.8.0.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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
@@ -15,6 +16,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 SLOT="0"
 IUSE="test doc"
 
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
@@ -22,5 +24,5 @@ DEPEND="${RDEPEND}
 RESTRICT=test
 
 python_test() {
-	esetup.py test || die "tests failed"
+	esetup.py test
 }
diff --git a/dev-python/scrypt/scrypt-0.8.6.ebuild b/dev-python/scrypt/scrypt-0.8.6.ebuild
index aa80ad170313..c886c88b999c 100644
--- a/dev-python/scrypt/scrypt-0.8.6.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
@@ -15,8 +16,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 SLOT="0"
 IUSE="test doc"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die "tests failed"
+	esetup.py test
 }
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index a9080359f893..dd011e587162 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,9 +1,12 @@
+AUX setuptools_scm-3.1.0-test-failures.patch 4040 BLAKE2B c256db00c9e98623d5274a1815cc86abef6c42fd501bf58675a1982ded7305500777595ff8df3099d5ac1608f987d3a415a3aa964178a6946b11ead720f4ddf8 SHA512 e8901a796dd54ae51d11dfb47f389d098d68adc6551789bb893034c6e264d91c9fc8af1f9f2b394d229051f2fda25f79e81b95734d93b7083dc2c6914c218d65
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 DIST setuptools_scm-1.15.7.tar.gz 15426 BLAKE2B 6c23f2bd74f51ec8633a814ce22e63e5afb9953244659833a61e810c9029227e1cc25a067a59cec5666add76863070ae5b7dc2600953a45def886e52378a3399 SHA512 0aa6056c03fe100cdaa7b11c9d2073431bb5c3904a80a994a8263c0ccac81f7a2c0b6c7e6dfd09ad605c5ff0e86981b894b42920cb69d1ef1d43ea08b2ddd4a0
 DIST setuptools_scm-1.16.1.tar.gz 28956 BLAKE2B 6721830e9ef171768afb94e6d6aacb829665658599409880e87c58e1bf2c6366d04a666ff60ed5d689bf376c258eda93367a4c52fe28ec694a3a93ac109db1fb SHA512 fd5017648c4a8af696e8528eab37061776e8495e2de3640f726e5e4347836eca5a13cbe54fc0c2223c3ae80ede1a81a6f3d9c0910a417545b9f9f206e5177a13
 DIST setuptools_scm-2.1.0.tar.gz 32776 BLAKE2B 7a141f3fa826a82931b6c33afd19d3185f98b735451c03651b875051e514eab287b20ee382a9576841b6f1283b9d1bf3dcbd0aabc41d2f1143cf960b856c8492 SHA512 69ce171aa4d3b576883efffb350c59f38bfe8b35bd8e4e8fa1128d9f8a3e6cfaab832633e91fada36126f8e7e2c18663fad621d62c9834be1b5d36c58ae1d1c8
+DIST setuptools_scm-3.1.0.tar.gz 35585 BLAKE2B 7ecbdf325467cb3e5217150c548b99603e1bb851a3bc8c694acf3aeb0da798ec853d13b29ad0537bdf5c1010834576786e0dde3965d61991554a12cf206ba7e0 SHA512 bd84bb02900ddc7de2f02dd7cb62bafdea7040ebdc2506b72d05f2c6a6d16be903321e576f63a04f2aa13d8c75b1834dec7d9ea8444e8330281f8e586a3d6426
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1359 BLAKE2B 17342f793101a84d1b931b31a7e3e0a24f55efd7f19cfbe1a2eee899ee6771a729ad38f1b5c5b2c90548bd2fc9680bbc12c783553a9df629da158b41785bb937 SHA512 d68a939338f4a84bfd4638f3d48e93ec0462e996c473637e125911b512f2710f73850d69141f6c59431cbab77d51fcb6f61dc0952df81e6b08d60d21d3af4fd0
 EBUILD setuptools_scm-1.15.7.ebuild 1483 BLAKE2B f64003059ecd5ef861c7f8cec1429b877771f294daacda979cbaf42b5370a07a3453a9d59337c4656f319ee73ae090eed1bb6eafdb817d6ed0a53d7af97dff11 SHA512 8ba4dd34a36d82ebbb3ab3cbc62e35e6fbe6a7129723335d14d28aa0132101e715b4c9d07ec7f5093bfd8b8e3878e75b775ed24e963485b78b2b3011c418b69e
 EBUILD setuptools_scm-1.16.1.ebuild 1372 BLAKE2B f5503bb6c971ba9790136baa90cf49830be228a37a018f170ff92e464a65f135c76f15eeaeebe09c055b63166c2eb27bd87653de67939dd2d6a11fc487dafad1 SHA512 0943416aea652899892f6aef88ffc2db6828d41f2c647a3251960fe60126689e26f5b9b829ba50dc7a4829acb3eb929885d705fae19ac88ba8e083e7300151dc
 EBUILD setuptools_scm-2.1.0.ebuild 1073 BLAKE2B d7809dff4fbfed38ea8802e06ba5b262e41fdde30f3880c64374a40336b5efa4e6073814e5e66629c507bf8b07f0865b133c1244eac8ecba3121f66cfa5ed83c SHA512 e3bf8a2e849e49806405fe5c1688403581db804b51ba0ffac15b27bd4bcb5aa47577094a8c023b8238e643b0511c089d319107a0aa0396eab12a55e01075d421
+EBUILD setuptools_scm-3.1.0.ebuild 1175 BLAKE2B 94c27c4da2a127ff35ec649e80afea8150fc8621ded4db38e750954c4d3473e51f92d27ed16b062ec88700d3405eccbd8374845906078e2de615724f196b01d7 SHA512 eb0c03ec77fd44f0b00286e691ce82e723951e4b4c3a738b894c1fd2aed290f1391cf247028adde5336bee23b46f09c0f1da823f9fe30ae5965ff200ef59cc91
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
new file mode 100644
index 000000000000..420bd6828b42
--- /dev/null
+++ b/dev-python/setuptools_scm/files/setuptools_scm-3.1.0-test-failures.patch
@@ -0,0 +1,105 @@
+diff --git a/src/setuptools_scm/hg.py b/src/setuptools_scm/hg.py
+index 972f493..8fedd68 100644
+--- a/src/setuptools_scm/hg.py
++++ b/src/setuptools_scm/hg.py
+@@ -13,7 +13,7 @@ def _hg_tagdist_normalize_tagcommit(config, tag, dist, node, branch):
+         "(branch(.)"  # look for revisions in this branch only
+         " and tag({tag!r})::."  # after the last tag
+         # ignore commits that only modify .hgtags and nothing else:
+-        " and (merge() or file('re:^(?!\.hgtags).*$'))"
++        " and (merge() or file('re:^(?!\\.hgtags).*$'))"
+         " and not tag({tag!r}))"  # ignore the tagged commit itself
+     ).format(
+         tag=tag
+@@ -70,7 +70,9 @@ def parse(root, config=None):
+ 
+ def get_latest_normalizable_tag(root):
+     # Gets all tags containing a '.' (see #229) from oldest to newest
+-    cmd = ["hg", "log", "-r", "ancestors(.) and tag('re:\.')", "--template", "{tags}\n"]
++    cmd = [
++        "hg", "log", "-r", "ancestors(.) and tag('re:\\.')", "--template", "{tags}\n"
++    ]
+     outlines = do(cmd, root).split()
+     if not outlines:
+         return "null"
+diff --git a/testing/test_functions.py b/testing/test_functions.py
+index 14d8961..c3d78b6 100644
+--- a/testing/test_functions.py
++++ b/testing/test_functions.py
+@@ -8,6 +8,8 @@ from setuptools_scm.version import (
+     format_version,
+     tag_to_version,
+ )
++
++from setuptools_scm.config import Configuration
+ from setuptools_scm.utils import has_command
+ 
+ PY3 = sys.version_info > (2,)
+@@ -33,12 +35,14 @@ def test_next_tag(tag, expected):
+     assert guess_next_version(version) == expected
+ 
+ 
++c = Configuration()
++
+ VERSIONS = {
+-    "exact": meta("1.1", distance=None, dirty=False),
+-    "zerodistance": meta("1.1", distance=0, dirty=False),
+-    "dirty": meta("1.1", distance=None, dirty=True),
+-    "distance": meta("1.1", distance=3, dirty=False),
+-    "distancedirty": meta("1.1", distance=3, dirty=True),
++    "exact": meta("1.1", distance=None, dirty=False, config=c),
++    "zerodistance": meta("1.1", distance=0, dirty=False, config=c),
++    "dirty": meta("1.1", distance=None, dirty=True, config=c),
++    "distance": meta("1.1", distance=3, dirty=False, config=c),
++    "distancedirty": meta("1.1", distance=3, dirty=True, config=c),
+ }
+ 
+ 
+diff --git a/testing/test_version.py b/testing/test_version.py
+index be940ef..a287a0d 100644
+--- a/testing/test_version.py
++++ b/testing/test_version.py
+@@ -3,33 +3,36 @@ from setuptools_scm.config import Configuration
+ from setuptools_scm.version import meta, simplified_semver_version, tags_to_versions
+ 
+ 
++c = Configuration()
++
++
+ @pytest.mark.parametrize(
+     "version, expected_next",
+     [
+-        pytest.param(meta("1.0.0"), "1.0.0", id="exact"),
+-        pytest.param(meta("1.0"), "1.0.0", id="short_tag"),
++        pytest.param(meta("1.0.0", config=c), "1.0.0", id="exact"),
++        pytest.param(meta("1.0", config=c), "1.0.0", id="short_tag"),
+         pytest.param(
+-            meta("1.0.0", distance=2, branch="default"),
++            meta("1.0.0", distance=2, branch="default", config=c),
+             "1.0.1.dev2",
+             id="normal_branch",
+         ),
+         pytest.param(
+-            meta("1.0", distance=2, branch="default"),
++            meta("1.0", distance=2, branch="default", config=c),
+             "1.0.1.dev2",
+             id="normal_branch_short_tag",
+         ),
+         pytest.param(
+-            meta("1.0.0", distance=2, branch="feature"),
++            meta("1.0.0", distance=2, branch="feature", config=c),
+             "1.1.0.dev2",
+             id="feature_branch",
+         ),
+         pytest.param(
+-            meta("1.0", distance=2, branch="feature"),
++            meta("1.0", distance=2, branch="feature", config=c),
+             "1.1.0.dev2",
+             id="feature_branch_short_tag",
+         ),
+         pytest.param(
+-            meta("1.0.0", distance=2, branch="features/test"),
++            meta("1.0.0", distance=2, branch="features/test", config=c),
+             "1.1.0.dev2",
+             id="feature_in_branch",
+         ),
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild
new file mode 100644
index 000000000000..6756febef567
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-3.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/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-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/setuptools_scm-3.1.0-test-failures.patch
+	)
+
+	# network access
+	sed -i -e 's:test_pip_download:_&:' testing/test_regressions.py || die
+	# all fetch specific setuptools versions
+	rm testing/test_setuptools_support.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 686d883c99e9..7afa5b6cda44 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,7 +1,9 @@
 DIST simplekv-0.11.10.tar.gz 19711 BLAKE2B 9de8e7be32bf5322a93a49240b4ad99e294d3296af4ba67454805e1a4dcf2dd6c0f5afa092949d7061003c8c877c153502db714de310d06eee10d6530e2485af SHA512 96936bcd6c2717412f5076326a87be1a37bf8cc7cf95adf412bf3a1874edaacb7b3a86759c2729a2fb2d126735fb87cbb569d42a015c0b5c697a09dd362f413b
+DIST simplekv-0.11.11.tar.gz 19708 BLAKE2B 558475867f2a023af9cb6c1cfc7a161107db7ab6550d19bc4f9ab126c586808b15378a11f23966e2026ae142764533d7efa3960c4e929ea87edac48c52635434 SHA512 8b44e817213b90c05979ac0d4b2a7444a415eca6b4a1b565c41826f3c42370ec844ffef6c35d097de4349747b9d669ec7a8e57093685222709e228f1bc083505
 DIST simplekv-0.11.8.tar.gz 19387 BLAKE2B 6df2a6288173e6e0faf4081e0e8f1ff7453bf8348e9a6525729c4f0536b6043047a1743f01a0485f1a893b22888c981ca0bcf859aa1aa6d24456c35ac4ee651f SHA512 df3a02752c796d8567937701b39a3747e042260744d92c985bf84885147800a1a9aed7615c3f29b807717be15f838498a23c730804cd4bcf4ddca56ead57923e
 DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
 EBUILD simplekv-0.11.10.ebuild 465 BLAKE2B b91cf3f94a680d5666bef2a36fb036d79e39ec53a345c5bb43614fedd8f6946bb40a27fdc23bed0ebe58abc383c40f160ba5e44fe932f46167d96b9e9ca247ec SHA512 d4fa14680273e2295b93c0fff18c6f7bae7dd8787641312e94e0b271d52d127855f4ae8e0ebd20ee18032e6f1be2355fb1050fbda1b3d5fa6d7073b0705583b4
+EBUILD simplekv-0.11.11.ebuild 462 BLAKE2B 9b5ca470ca182bbfab9785798b0524f87fe91c5f498048d7d9788ea698c12ac6b4b698cf3c6f672c2ddcd34bbb9933f9427a1aa6abd381bfc99936f0199a4398 SHA512 0b3e58f196df158fca804da4c4588c5da37ba60e8759a3e6c62076980d034486906f4f82c3eaf9080a5f11d1aec7bdb2346f99fc25dc8ea0f9819097047515bf
 EBUILD simplekv-0.11.8.ebuild 467 BLAKE2B fa741bf309b24427588da282869ee676f1f4477e22ccd92441b09e575809af0c8745e22c5569bbfe34cb284072bf627a47f83e45b074774a5369cecac50e67d7 SHA512 b39a83f5105d1b0714ea7653e6f11d880009b1b377b8cc3a253591da01c263e7881352353118e6285e7608053d6bfbf662f4b2887d2245e8ab263734e8e4a97e
 EBUILD simplekv-0.9.2.ebuild 443 BLAKE2B 59f5f15afcbda168898aacb1ca94b24ac3c7c4585f908c9dd53ba8a97d35371fc206e183689644ee67cf3ee1b82566b0559ef2b761f6378ffe7b5f6345814f32 SHA512 2fa65c4e2bd44404c5b094d7a681077aea5a194e829146b303aef86dc58398580ce6c8f26bb4c05046d9a2421d4201dd8c6b8800b43da5832776cda3df1d4ff1
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.11.ebuild b/dev-python/simplekv/simplekv-0.11.11.ebuild
new file mode 100644
index 000000000000..cf286bf9d6cf
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.11.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 75372eb2513a..d433418f35b6 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -2,7 +2,7 @@ AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3b
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
 DIST sip-4.19.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
-EBUILD sip-4.19.13.ebuild 2858 BLAKE2B a9f0cd4edc7e2a9e287a0b7762985ee21dfad17eca813cc12c5266cbe0ac9be01aac63676952048552202d76faf6e49f9a2b77b2b88c8868be0d48c5b6a2f292 SHA512 be40e5200dba5920ef234363cfa01728652228bb23e4e9715691a7faf55026b142a7d29f39bb7a549fa1c56812cb21832be2d2986fecc7a97577c4e706fd71cb
-EBUILD sip-4.19.14_pre1812231555.ebuild 2360 BLAKE2B 8d00c681dc40c1e28100c798bb6f25117d6875914bfcdb347d5c4f6a1ec372e99520680ae8059a07fceb247018ae60143d7e1980920d0d13a0614953479fa355 SHA512 1ede6d67eb419644ee2af81766f071d2651ffab06f6e0c1ae8c0c67e7ee2632609e83b07f0ea513787032b1a0f23eb596242ca09aec24f9b43d452c2f766ccf4
+EBUILD sip-4.19.13.ebuild 2857 BLAKE2B 29f8ccf65d249299ea58b5e61a01aa2f53255ca62b005d1726cd4308f94c6d9011fade27e14771f09ffc665555959b3287b3b50876d8c10d6dcec024ea2508c6 SHA512 054f478a056e17726615e0711a2256107f6b18460862a75da3b3f765ed5d172bd077da7cc21f34459de40808f9574f90e60a99cd2bafbd46df07ff6b61185d69
+EBUILD sip-4.19.14_pre1812231555.ebuild 2428 BLAKE2B 4c90ed65cda608b72309fa750ed40b9caef6be7e1fd45dc015f1c141491b962dd2c3d03c62be727bd49adddc2787a1ba4a09cacabb8e84c9f10aed1d3a3fc84c SHA512 97f55007a9bb8b11271a836a0267a24f906e0a87af0b4a2515d6726e6c0270e5ebf996c4a4ee7b2023a8cf1b61d19de67dd2e548fe209835cee725e781a6dfd6
 EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.13.ebuild b/dev-python/sip/sip-4.19.13.ebuild
index 4dc04120bc73..71c1d16da312 100644
--- a/dev-python/sip/sip-4.19.13.ebuild
+++ b/dev-python/sip/sip-4.19.13.ebuild
@@ -24,7 +24,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild b/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
index 294e56df9f49..47ab306936cb 100644
--- a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
+++ b/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
@@ -49,6 +49,8 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
+		local incdir=$(python_get_includedir)
+
 		if ! python_is_python3; then
 			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		fi
@@ -56,9 +58,10 @@ src_configure() {
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
+			--sysroot="${ESYSROOT}/usr"
 			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
+			--incdir="${incdir#${SYSROOT}}"
 			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 4975b60b19ce..af0a14291377 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,4 @@
-DIST snakeoil-0.7.4.tar.gz 301878 BLAKE2B ec40ba5921e6edd33cb9dd80a284dee0cc8940dbb71f7bb6390d7008c0ca3a657b70be225955d7d6b99aa9e8c9d16dc926560bab17ac917ea8f71f97a1cf4644 SHA512 b3ae2223a267fa74699664470a4c4f6888cf2b68e688fe61d3acca85e00a138c3a037482ef304ee26f326cba252b473d265dcd72d0e0ab5723f4b0ed6e5e04ce
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
-EBUILD snakeoil-0.7.4.ebuild 937 BLAKE2B a69adf1930195a590dd831129b17f20cb80584772bec618793af405bd2e7f1d13f267db3e6634846d5d88db1692e77e3bf5d4c9dba08e5845d9ce228ee501894 SHA512 f47c6e9dc49a0221c082da07d2e69e00bf1a3ddf3ad59afbe82087369bd9e3e9bb4ef0b99c5871d9af6a122ca3b7ee24b10ad8d1f31c52bdb5c356960c65c76f
-EBUILD snakeoil-0.7.5.ebuild 958 BLAKE2B 16ad949d88e495d4d799109be349b684667ac1958d446e6b9236aa55c6a3b79f5edc283fba4b9bad25c8ada74157b7a56e64c9ec584f262b46aeeb8e0ae4f8b4 SHA512 1d525eb13cbe602ae69c865f7c8c3c856eeb22faa88faf7602a951f5cd0265f3e1ed5c974a121f51c889bf2a1d7dcaf10c9c20740a9b12093ea390c323d808fb
-EBUILD snakeoil-9999.ebuild 892 BLAKE2B 0e8f5d786e969ea26cda8eeb261af331aee3a085791fa62bca0d4fc44a4da430a754ad7e6ef6a5247f7788701152483ecbd6c18ff11e23cf2671d5b7303cb785 SHA512 e97711f75b09c5e4fce4e9549bb17256e43b5a0c7d13001d13b2b9d79218bc18b9dcd719f6b24b152115bb5668d83c1dda9ed9f02178bc74a2a93d822e806b63
+EBUILD snakeoil-0.7.5.ebuild 954 BLAKE2B 5f148c21fcf22e6ef894021067e6042f77f0aa7e9844dd24ec43ba8d6e607738fcd0df53650cb61fab3213187774c7725abe3c9c9e000f9383654d7878cb1d4f SHA512 9a5010e2b754aac9c3a54ffdf87b62b8558bdac2a9bd3854022d29edded81c13407ba2f2a5445f5f479d90838bb9aae07a686793e4e18b0e28c4a0f1bbaf1c9c
+EBUILD snakeoil-9999.ebuild 887 BLAKE2B 3cf0ae954a3e6276120ff1b1060f374838f1bd043e02976cc2ed7d5fdbff097a68511ca45be7e2916a2a9ae4bcd4273aaa77a0321207cf9acf90056d389f6263 SHA512 0b9a4bfcb4f976b7f06f016d0dfb63a909d30ec8fcffd7d4a21907d281078b7ec8bccb0ec2115ec1b5f2cd542390e2e34828cc7724c59fefd77e9c4d16a6493e
 MISC metadata.xml 385 BLAKE2B 7e7195d4876c5cb5db98288566121559c8bd9208138fbd211edea15b324acb11d09a2bdd96c0200554d7e9c734202c7fd341f0d134f271c82dbfdfe75e5774f5 SHA512 32645380ddb0bd1edca1895714aeaef3e0c61c04cbacb50a414c2fd26b6978c8ea83b3c420538cadebf3a631b5aec2e9e3fc0dab98d1e1a99cfbad33b8d58715
diff --git a/dev-python/snakeoil/snakeoil-0.7.4.ebuild b/dev-python/snakeoil/snakeoil-0.7.4.ebuild
deleted file mode 100644
index c037456a6ebe..000000000000
--- a/dev-python/snakeoil/snakeoil-0.7.4.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-[[ ${PV} == 9999 ]] && DEPEND+=" $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')"
-
-python_configure_all() {
-	# disable snakeoil 2to3 caching
-	unset PY2TO3_CACHEDIR
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/snakeoil/snakeoil-0.7.5.ebuild b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
index 037bd7f2bf6a..62fae67a7787 100644
--- a/dev-python/snakeoil/snakeoil-0.7.5.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.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="https://github.com/pkgcore/snakeoil/releases/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 431ad815edf4..e0674ca106ee 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index d86c56216961..ce412eec70c3 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,3 +1,3 @@
-DIST toml-0.9.6.tar.gz 14074 BLAKE2B 758dbde35e1afacad8456cfac42354f3205d2d1ae79ceeea1803fe253472e3299ba171ce9435529f64fd8a31adc7cc1c05282a76a47118b7aa0e3ed61ccacc25 SHA512 9f2804daebae0744c3a00bfb27b2f1efd73c96e7e5a14316d492200d63ba546167f669a187297c76daca5ef35b7adb6f309c1f6129302b6f41e6b7673bdb43b6
-EBUILD toml-0.9.6.ebuild 442 BLAKE2B c0dfa1119e97513090f868d568cd22a920367aadf36b471e9e4ed4de74a6718884900cfe1a19fdc81fc2c3d9f8ae3b52866e2de0204752f482d139a2659481cf SHA512 10751337398519aa902f4ca940dda7ce7486f235cd86a35200320b61405e4e0327c892aabdd97a7878be508a8c753d59378d98291d0cf5f25e80f171a5baa689
+DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
+EBUILD toml-0.10.0.ebuild 561 BLAKE2B 92759db3c40ad29d9755545404670d8ba92bd848a76fb4789d7de9380afe968f86bd949ce1ed22afa38e04b7fecb3c5af2544aa46207277d278220aa5895689b SHA512 d548e324cb4b79a613dac267f6554f4a900a58676fb79a627fb36ae5f59dac5b60d4646da74bf76744b548997301931619a45f97c174abaf4bb4a85887538caa
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0.ebuild b/dev-python/toml/toml-0.10.0.ebuild
new file mode 100644
index 000000000000..d50fd3ab181f
--- /dev/null
+++ b/dev-python/toml/toml-0.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for handling TOML files"
+HOMEPAGE="https://github.com/uiri/toml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
+# particularly worth the trouble.
+RESTRICT="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/toml/toml-0.9.6.ebuild b/dev-python/toml/toml-0.9.6.ebuild
deleted file mode 100644
index 528467cd42e5..000000000000
--- a/dev-python/toml/toml-0.9.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 166ce717886a..f474db80a4bc 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,8 @@
 AUX tox-3.6.0-skip-broken-tests.patch 1579 BLAKE2B 1de72f080eaab2b3da17dc5e2edfd5297072fc3cf03015113f633cfdf3596993197a75aab507b5c3b055bc7cc746093a1d0a5e95146d7a9ef562991c516eef07 SHA512 4f731f456bcf941f0120586d486c826970fdf9d28f475eba9e55d561a48c38ee43c4bb7551de636ea2f5f17c7267be3bacc949b1a5230c7c35f800efe2b398c7
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-DIST tox-3.6.0.tar.gz 257255 BLAKE2B fc61eb9c3c7eaca483c5de99b72562fb936447534cc1c08e70e8ed376fe70e0467d07168cb518f097002ea96ebbd709364236af49307c3c4c84f58feafba6bd7 SHA512 fcee3d78f266ebe036931589a68b51e111ba34cbe3fae6ee9241b4e98433ca75c59261ccaef014e00b3bfd678d10624c72c45146d594a7d25d6f437101f4c93d
+DIST tox-3.6.1.tar.gz 257471 BLAKE2B ab09a6e5f3a0de343dcea05008f6bfddc2be1e8949c5529c2a030dd4be32eb541a9d55037602efa58345210f34fa4d3f246d1a4260f7a9b77c0d473d8649673c SHA512 81edb0fc489731eb815f46cfa30677b077d4bb58d4e3e8bd7f887eaed3a2a950f7b49368af2bcb51ea07ca1821ff67145d543b8a370d642dd87d93952734249a
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B 1250817a04c4eccd2471adb950ce316092b95b0d8c015a606dac2f0854ee48e32de220a5171b36e56c240a67766e6e929d8e8052a069be3651fff04d0d0ca014 SHA512 672f5fb09123ca77fc4ff93da6c00a82b02e1119ea9dcf5858792ca01b07a17ff5d0137174dbce0ffbe75b15e5c2aaf26811f412a258da6c0c22b9101202c077
 EBUILD tox-3.2.1.ebuild 1940 BLAKE2B a8998a74cd660ccbe8ef03d079dc54c0126aad2451cad7403c4848c32d0ba80db99bffbbe66bab215b10b7165db82b7c4d4a50159cd8c0adc6b7adc99d922958 SHA512 3eb02da7e9481434cb64c3b4218037bc58d4c1b15177f37d7ff236b9daf0f097ee94e6f6bcbc0c6f9ad03f1a31d8c8c4a090003b9b1cd789ca5b3d8ff6c48c18
-EBUILD tox-3.6.0.ebuild 1210 BLAKE2B 2dea69c67b0bc271a48f54f6bb0f87679440bb2130976b06ed22c3864c049dec39c9811c3c623ce27d06f18681a3ac98c6550f9d5e070f47ef6838d27c3d4ca9 SHA512 7f6f70cd049db646b2dfb535a19686649fa54fd8e8392c861dfbc26d0f30f52e056b822739982185d1fbace07ad5a6b9664276915f5263e0e829b3cba637b132
+EBUILD tox-3.6.1.ebuild 1216 BLAKE2B ce2e7c74af062bb7d2722252ae2fc538ad3ba2f7f1860131d2206b41c280e7529dbf06222694113265a3462e41445d709ecb2249a8d9f9ed267dbc9c2b62fae7 SHA512 74ab5fa44208967d5422ace3d3d4dffd2a28dc65fea349c7d66fdae778e3bcd80896afc7aabe88beae170d5b143f2ffe644247fef6984d6b5709d70c979487a0
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/tox-3.6.0.ebuild b/dev-python/tox/tox-3.6.0.ebuild
deleted file mode 100644
index 46fa53e8f938..000000000000
--- a/dev-python/tox/tox-3.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# doc disabled because of missing deps in tree
-IUSE="test"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-4.0
-		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
-	)"
-
-# for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.6.0-skip-broken-tests.patch" )
-
-python_test() {
-	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/tox/tox-3.6.1.ebuild b/dev-python/tox/tox-3.6.1.ebuild
new file mode 100644
index 000000000000..f50b9bdddb5e
--- /dev/null
+++ b/dev-python/tox/tox-3.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+		<dev-python/pytest-4.0
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+	)"
+
+# for some reason, --deselect doesn't work in tox's tests
+PATCHES=( "${FILESDIR}/${PN}-3.6.0-skip-broken-tests.patch" )
+
+python_test() {
+	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index 4a03699f9c41..274b5196a66e 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -1,8 +1,6 @@
 AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be8281110bbca5abd39b78807fe67317052579efa0498bc8a321d09fc953c9358dfb963ed210451549d14d6f58ac4a94cc3e9a5d1 SHA512 a7007c74a2e46e281dc0db6fcc45475e36f3a261445c2162fe0a548e577cd7cc344957e3284c52fffdd21cf223e91ab5b4fc1936b6893de614c4143cd1b40419
-DIST uranium-3.3.0.tar.gz 906093 BLAKE2B d41608170da64f93d6149e76cc28fa476e439f6b291bc667f8b562dbcde047f234aa77cfa52b73420f286b926ef05ef50df8fd74722fc81dd3fe94b407bee7f4 SHA512 48de8ecf100f6bfbaa6b3bc6562fef25991ad07375f3d8f752f130b44c2e4728b2979f99de23570cd46367d868bb7139dfd9d73a7d3755d2141edc1fd46939b3
 DIST uranium-3.4.1.tar.gz 646742 BLAKE2B eb65d5a35b3c63cfb069f6c1077a91b7aa10517dd7fe6938b639f1229e61c5c6aa892447cd9d5851df46808f01f237820811b4358a235c50a89f2333df3418ef SHA512 59e0a605f3d898765bb670104cabb7fb1471061934900e63b54c1a07219970e07414a3983e96a577f5986302779b7acedc8e0ef0da3756dceefc0170ec80645b
-DIST uranium-3.5.1.tar.gz 664431 BLAKE2B aa7a5241672316ae63cc2e55bb0986cd3bbba3c82cf90334efd7d097b714eb574f0caebec571beab6a3f78c08ab9a7c1699842031c5bcd074ebb0d9008e05784 SHA512 2924721f5308eb8f27826316a705a12f0768889a4a6c9de431d6827a98036b664497c12ef1dd42e47f67e566fe169d7b5941b62426952c9bec1797933bfc62ce
-EBUILD uranium-3.3.0.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
+DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
 EBUILD uranium-3.4.1.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
-EBUILD uranium-3.5.1.ebuild 1386 BLAKE2B edfd604861aadc381f2b921a80b73a637c619e951aea9002ab5e8cf42a3aa1e0ebc239cd697992ecc2f575484e5fd0ca2b2bae7848b791a93606fbc415f8d068 SHA512 1107c60e0eee9920beafe186f6a745b104fb0968c0dc80939901e5fcb51fe0487228c5f3b7b0e08491e5b75c6d1356381ad949889d961c906e1cad656c6f812a
+EBUILD uranium-3.6.0-r1.ebuild 1416 BLAKE2B 3ea73653aa36adc305b81759ded97af57a2a5bd901a73815a8d0372ebc8fd5d1565626016f5b4a9d7556817e376ff696cfc84049201a570cf58b6dffe383bf6b SHA512 2716709771e66c3d2de8912c5fe4c5ad8f5bcc453575a1045c9e44225e5cb52fdb06240457ef8bf1c193f5b141f76c8ed912393e7fbfb555c5a48c64f0970979
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.3.0.ebuild b/dev-python/uranium/uranium-3.3.0.ebuild
deleted file mode 100644
index cd83c93f844d..000000000000
--- a/dev-python/uranium/uranium-3.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	<dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}usr/$(get_libdir)"
-}
diff --git a/dev-python/uranium/uranium-3.5.1.ebuild b/dev-python/uranium/uranium-3.5.1.ebuild
deleted file mode 100644
index cd83c93f844d..000000000000
--- a/dev-python/uranium/uranium-3.5.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit cmake-utils python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	<dev-python/PyQt5-5.10[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" tests
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_optimize "${D}usr/$(get_libdir)"
-}
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..e1473dfc7e25
--- /dev/null
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit cmake-utils python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	sci-libs/Shapely[${PYTHON_USEDEP}]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" tests
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${D}usr/$(get_libdir)"
+}
diff --git a/dev-python/vertex/Manifest b/dev-python/vertex/Manifest
index a91cd896e34b..431c9bbb7862 100644
--- a/dev-python/vertex/Manifest
+++ b/dev-python/vertex/Manifest
@@ -1,5 +1,5 @@
 DIST Vertex-0.3.0.tar.gz 84997 BLAKE2B 8f6a2955c4674888f7608590390f4cfbf5063e08281fc2a49a4cf9543a7b769df6e355bd87044f6eb23009ab50e7efbbbf5d0a471627780e9869008c764f0e8b SHA512 206d142cc72b2d77ed8c8fe222770eabc1a8c179238f46554abc5d833669f27bd286565e20ccaf5594d456b23b54455b23ab0eca5b8b4f72a7961924e7167676
 DIST Vertex-0.3.1.tar.gz 89909 BLAKE2B d26b73c5079f0401185e534aa9c35f7fd490eae9b27cd36915e3f2508b1ff6feda3a900bc3230d7f24f563546d6a966441b8618d066f28f647878597df4b9df7 SHA512 7e9b96a7ba493254ff58e8f75da6517c09c4502c21702a96c29525a78569ff7d988cd7278dd87983485b6da30a607820a7edb28375e37d5e059d6f0638a1b1c9
-EBUILD vertex-0.3.0-r1.ebuild 667 BLAKE2B a9094bc4de473ad53c71ad9683dd33c1c2c89663136dd4d89881c83f99d48af5c0e203f47b9d94e0f67b4720a5810ac25a7d1905a5b3a02628b804f0786aaed0 SHA512 5e3d2fe7386f1bcc038432966fa011fd856eae71d1e099099cb8de238ccaf667e7feef3a59ce46275f9a40da03bb9f1bf6110baf5adc1aee766d7468d3509439
+EBUILD vertex-0.3.0-r1.ebuild 666 BLAKE2B edb58633a503f0b69d1c1e3367a660584c9316f46e2a82f42d87b163b285cc9f57e4d11e6ff1cfc41bc864c95fc4dc8b4d81ffd449982149b754a84b1b51ff88 SHA512 ee5e703ccc514d8d9dfd42db074ca471f3974c867058f4e6a6403dee85ad6c0fb38c5e6da4888e2313d8e622d3de37c40cf2b082c9e56a50f13fdeb79decb030
 EBUILD vertex-0.3.1-r1.ebuild 832 BLAKE2B 906120c24aa43b8282a30502c34db88865296dba064ae1bcf72e0f32fa140fae77a71c3d979424ab9f68f36c74fa524cbe3c23b9c675eadc7ec8c230bf9d4d96 SHA512 8d0505dad7db50fa9abb09e5dfc519d66e759628c857fc2227565db2ca51d75581b57f4bff87b7b7337811cc3e8a63d1e0a26bab2800c47a7021d51b27ad96dc
 MISC metadata.xml 896 BLAKE2B f97fc09b3dcb3c78d457127762d33c2822c91ef1e8ac5e7bc254452ac443e8cd8bc01d3e90dc90de4060c426f2f8238ea9423dec9532d2d52200ec0953938252 SHA512 71c0e6e5ab8584a10daf920a7cf7d2b1a05ca6c6ec8c8b82bf589897fe85ebd652ad41e4b2b44f0ce345111b83c44f263ffc7eec93225cd96b0479b7548255e3
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
index 1cee997855be..b550fbcaed83 100644
--- a/dev-python/vertex/vertex-0.3.0-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0
 	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 05d84bddd052..b5aef64f7cf7 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1.ebuild 849 BLAKE2B 21c01bea62f47c3bceb5d3b72f12b31dd23ecf32255d7485ce1d1ea157456df54b40da8caa6455995e080713a9e87a32ba249280f54cbfc9a294bf62ad8f2f7a SHA512 e33cfd2ef62c9b53e9178981506c5ea68b7621714ca913637a723ad60408fbb6b6e46dbe4506cae588c418b70662f2436f08107aac9b9b2327d108665bcaa8ae
+EBUILD webencodings-0.5.1.ebuild 851 BLAKE2B 12a4ad6d34ec25a5e57e05780ee73bf048cc05e4cae5060ac4ecda9a782706863b3afafc22a1166bf52ffa0a0adf9e190a68480cb9fb3680c88ac06ef8156b5a SHA512 a4234b093b8a7913ffc3f86481412acecba2c6094268f68c8e3f3a025e9de7ad038084cb45e6365c1f66fcdedce45ae00ba73f22e8ce63222de0cd4a0890b181
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index eb789be99690..e9998e3da705 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 07643bd62026..0c585ecf6bc3 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 387852622b7b..cc31ac1e1ce5 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD assistant-5.11.1.ebuild 1199 BLAKE2B 4a6f39fa05a11d658396d185f1fe58b78b3ff39cf6924c2142ed6cda3474fb7f633747323502d168119b3b8201a9a16301ef95a5fe2702bab80f205b6a81854f SHA512 73a3d7bd27d51920436c5160438f0330553ba97e50569e036d612287dcc2bfe7ed836a7fa30fafd87fbc94f61d1d2ba0e54c296e7b6bfd2089684cbb20c72224
-EBUILD assistant-5.11.3.ebuild 1202 BLAKE2B cc09614074320f1227ac9293a25ef81af2996e6335e92c0ca850541b5892cfb391dd0ddc8c3ba800fe64f88fcb8590800457c1dda9faf58084356ce3fada5e50 SHA512 ca60d6235038386dd13708b38915081314f4c7e03de290690ce2870a57da9fd75fa8c9f63b0b88b9a3244378e8cc2d0f19d15d6afcd934d81599ee2fc6fc8661
+EBUILD assistant-5.11.3.ebuild 1199 BLAKE2B d0d2c32af3904215f9c1bb9cc1b3fd916e6fa55a1707a0d6959816faafaced118ac30b946df5fe8250ce19058a9b66ba0ecdd37adb3a5d11640ad9be397bc187 SHA512 f675d5c910754521aafcca73d44645f4e45948a8f9ce13689d7fa558c270383b493b2d42ba8fad4d78bb65e3dbf6e8115980a3d677c641671959e25832303f06
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.11.3.ebuild b/dev-qt/assistant/assistant-5.11.3.ebuild
index dc410213c523..5ce8021e2ec8 100644
--- a/dev-qt/assistant/assistant-5.11.3.ebuild
+++ b/dev-qt/assistant/assistant-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 2de5fd30228e..eec92c50461e 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD designer-5.11.1.ebuild 1237 BLAKE2B 78fafc4bf17f03f904161e0db22f1a0821adf3f7326997f1126824325d60951504613fa6be16885ec1600f65b1e6d4df7844961fa4020987aa6a40a247bea4a6 SHA512 379e29b9a3d2339a9c63728ac7870837e7fbaeee52207b1eab0e683ca5ab47d8465b3ff4e3ca3ccd028fc682b29095c0e14b7def40e1d212afb4bb61230b5e48
-EBUILD designer-5.11.3.ebuild 1241 BLAKE2B ea4b6bc4dfffeeb4daa6f183e603cc6451f3c701c2c02be5557367a5f6b203d3afb353e8b75bd5fa0c0282b992017754286f2a39f0e3015d40a2420f6156848b SHA512 f41e4e42ec895afc898822ae247896bf92ede969b596af6606204e475790160f615b462aff04f4e1dbe2017d4c1986b0ab9955da45cc318be30b8b21a6d89720
+EBUILD designer-5.11.3.ebuild 1238 BLAKE2B d0c429e259df4fad6ea7c351bd07737de5cbb64d2a565a3781963f07bc51c39dc97d742eaf15ffdf27487296687cd7fe328b59b48fbe3f362184003b77052f9a SHA512 c3e6ec16ccc8ff5cfa47ff98ddcb6591292d26baa9ad5304ec26dd91a7d61b4c0e4448354f3ec8eda74ba5155e5e03b5e14236fcfd676c65b67baab19b07f439
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.11.3.ebuild b/dev-qt/designer/designer-5.11.3.ebuild
index 96c6447229bb..dee05be1b36b 100644
--- a/dev-qt/designer/designer-5.11.3.ebuild
+++ b/dev-qt/designer/designer-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 711e9c4c6000..9f9d7621f873 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD linguist-tools-5.11.1.ebuild 686 BLAKE2B 0c074d8adee642f3ca40db27ae772ec0f057b68358d9ad8c3803c988fdc19e4d6fcd6fb303fb60df60ddd25eadd9044763099b750891110f64deae372ca065b7 SHA512 8060eeb217c514a041da421cf229504e30b823e528be998f734062bec5e10fa5418b949389ef045d72575c92fc896da3f11335cd59b07fdc2de7ae7dca0e035a
-EBUILD linguist-tools-5.11.3.ebuild 697 BLAKE2B 95462622ae0c5a074d51ca3b50ab0d318390b907a62cd61705fccb55279a3bcfbc984b1a1b3448d4d769214c59d456b6d96f22170d83a4ae7faf97b3ee0676c7 SHA512 843407575222ef5961b85e62b47407991bc836052175539427f10ab23a69234f1dbfdbda2538e80be09a222123bf18526fe1dd1ebe5d41ddac5f4dc08cfcbd80
+EBUILD linguist-tools-5.11.3.ebuild 694 BLAKE2B 2e317f8b9ad1bf02ce68a1ee570c6d68d8f042e380df0cbfc0dab76f7f526f978f2a0708d99e9a7e34614463776ffe9d7e3deb0c3105f6bb4d9303e39d88d0c2 SHA512 6f324dec37934e0a5b6f2fb04237ac7f9c8b98264ba6282d7dfab699497ec577bb71c93e3f7bfa773ab08bd6ba72d343a2f181af73090d5f8c13dd6f25f3dd7c
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
index 99c80456d4b6..e1802e12f98c 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index b9340f1e866b..c69c2787b9f0 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD linguist-5.11.1.ebuild 986 BLAKE2B eb757ff71a0c0501e36b50c252ba9e18ba7029e489af2a7e2b766fff5f4623a08e90016478bb5bd6681278a879a2b6e56ed5882aac929bdfa11e64a32f8476d4 SHA512 563d8364aa2c8415094d175592a0266c0845a5c83d1920ca9fcdcc23d3dc5fd07537ba06108f478da9bb1d2ab1071ed7d3bbb7f949418c60eb5c9348e7b94117
-EBUILD linguist-5.11.3.ebuild 989 BLAKE2B 6f6e3671da1f4481e040aa42a134dc9389467eaa165f419e128ec4a66f0b5fbbd9bd42bb648caae8a45c1d286dfe1533b45f5b8460c5cbdf9d0006eabefb68a0 SHA512 4fc12d99f2b6845b10354e33b03d98e6c7de69a5be465fbc2feabaaf8013dc9f1888164c9adad4cb8e4900242cf7acb90b4fe969e5578b4b441cce9c65415a26
+EBUILD linguist-5.11.3.ebuild 986 BLAKE2B 54982f6360b53d293e40d34896a7776cf170f57736a08582f49e1d6807e5ecc024abc95eaef7f66b5c2293cc016679946d9b350fced9ad76d68a9d56c2da201f SHA512 de7b35827fc28c919c160078666956708f23459f36a412ed437db0ddc1d1aa3e767b532f4f6d5b2420c1bb590a03a9cb65e03fbc73cece9938a5a91e0d8db1ab
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.11.3.ebuild b/dev-qt/linguist/linguist-5.11.3.ebuild
index 4b9deba71e31..0151fbe7420e 100644
--- a/dev-qt/linguist/linguist-5.11.3.ebuild
+++ b/dev-qt/linguist/linguist-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 7f54af5bdfa2..4aa9aa3e9b67 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD pixeltool-5.11.1.ebuild 428 BLAKE2B ed2167af73fb9eae2ed5b19f7f313449b026f2ee025b4694a800fe697a5a3d448733b3981bfaecefd72f4167855797d98936528397d98fbba6621de420c85c77 SHA512 2b753cd79eb42bee31114ce6b541a9bcf33fd81bc9eb0719983184e2f3be069d0847984447b0a57163b9bb7e467b1e82ca8d49185010633defb783f79fd452d6
-EBUILD pixeltool-5.11.3.ebuild 431 BLAKE2B 3c46935beebc3ad40e22c4f30b4fa04f72cfa6bc18d98ee66525a25042285eb3de9b9c4acca49a6295e2c64918469a3153e2203df8a5a88b45ce51b388a49a73 SHA512 c113bf27d7e155232ef941d3adf7969db1d6bf69643f16e9c90671ba4c40a0c57777f3640927521446f312088b5e8922d6d90112bdd54a1fe1120c38a306724e
+EBUILD pixeltool-5.11.3.ebuild 428 BLAKE2B 1e35b6315507d84814796595c57a29ff051741098784b0f6a4429b9ad971f5356d14b061d64d628553a0b7f773b7e3792b488f9889a5de65e0b18fd866bea1a5 SHA512 3e5a94fce4c66749c840d47f750cbb2a47e982bdf8aa0010e05547cbd42995c0068ddb3a5380fec6b174904e5bd0ae97e97baeb6c22c1107fcd2de502e77819f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.11.3.ebuild b/dev-qt/pixeltool/pixeltool-5.11.3.ebuild
index 96e86adc7ff1..8aec78550e2a 100644
--- a/dev-qt/pixeltool/pixeltool-5.11.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index df93008572ce..e795cbd998eb 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qdbus-5.11.1.ebuild 472 BLAKE2B 83dac03c954255a98ef7a7865f54b86fc9a407155f987390f3be6171dd029521c105e772414f3b47af751031e7edbc52eafb27a21d78ae9b6a3ec5524cda87b8 SHA512 105cd084d6980ea574e3276898a8d1d64d9fac33a50c78503064828e06e5ae430639aea0d3d58437437413dc6a0c6a34cf0744ac16a37d68ad3ffcfea733540b
-EBUILD qdbus-5.11.3.ebuild 476 BLAKE2B 98c9ca7b44d275962102406f06d9876e214d1b15e35ab3417c7224a494d0c1560f1663f0143c60bc9ad02eb3767b9ae5b2d69e0a57d9425c19e76096b78c099c SHA512 4477d873ae267d67af06b2edb8093f703b817da33c40d4beefd12d19c1554b1b11561de9003128f771e492c63b636dbbf43b96195ffc8d671413226b9a088964
+EBUILD qdbus-5.11.3.ebuild 473 BLAKE2B d597ca6040b952544e1698802df218fab44c617dfbd335533d3c7e243c2f7579858ad7d601c83748eb2bd59a6fb0a82c81e863f4c111ba18beec39e3003e67ab SHA512 f2807ebb1fbfb49bed27e4de17f76361f2f702f75a55825b13e14ac5cee74c84da0a24f9cd4ff2e44a55f2675be2793ee577c3e685c17613cc3a94fed96c9b43
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.11.3.ebuild b/dev-qt/qdbus/qdbus-5.11.3.ebuild
index 154680d242f4..987a154dac7b 100644
--- a/dev-qt/qdbus/qdbus-5.11.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 14a44c79e6d9..54c1534d0491 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qdbusviewer-5.11.1.ebuild 974 BLAKE2B 40a1b55d7dd289837746148770da2f8616f796311d0219dfe844135559bc5454d19dd604f5adfeb559933304fc78dc5b900ab39270510963e6bb9fc298e09175 SHA512 8fb4d50175478957008670adb21e1458c0ea831ebb65f2030a7a192cea28630952143c7b171bb6418371e558f9ebd3a81ac6ea22aadce236a90b3b7b6d63b9c1
-EBUILD qdbusviewer-5.11.3.ebuild 977 BLAKE2B 92e399fbec282973b01f57a26ef735095035489b2edad7db43fad47d143a4e88a5f6e977054a676b5a3b9fc91ab41654889293d82d860523da5bb6125228ce2f SHA512 114fb481bd3558fbc087f3aa9a8381cf168894e485c6a3f8acfca4384f274ea11ad45f4e47e8736a443e0b81f5019a51e1e3836d5757cc90280a202582c83055
+EBUILD qdbusviewer-5.11.3.ebuild 974 BLAKE2B e09257a50b04104b7df3faa6af15cdfa1890ea647bfd3bf56fc0b774a5953c374eb25733fb33ce3f3d8f51330dce1e22db874f77eb3165366b700dd26859d642 SHA512 cc669f6430835675d12801a10627c6a273b2e06d213d2f2337e32b1571e71c97f99c6cd3e48551d828c8dac63973aa2a574a6d95ca3d07972b6ffce722d30882
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild
index 8b6f42e2e593..7382a9dec21b 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index dc74ec148f8e..4ad8b0379456 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qdoc-5.11.1.ebuild 760 BLAKE2B 2a20cbbdf7fe7dc786dfabd71638bb9058a8b5c40760099b063491b3131bc0f306acf7549f6e6236d4dcf2bcd4d56896baadb6161b8e5ce7fdab30e1b6520cc5 SHA512 33f0140c4a8252338650348e801029e01f20632ac9346537739dbf77c1e51a4b535ccd0979c63bc3cd49b8cc685454000e9f271bde3fc4c0e6f3579c39bc7e07
-EBUILD qdoc-5.11.3.ebuild 762 BLAKE2B ef7d4635d97db4faed376bc23f3b9e84d430c4eba2bc3e9b4a233c55dd8bd2ff2f372f88be6cfac629ac9d29e47e296ac40757ed3542d478f2f3e122cb7e5f42 SHA512 193712a5940aa2cc3e671395646ba879fac0999bd36349d46631a653b981f0813b1bb18276f57410ee83bb38f43e9cec16092b45507dcdf21e9be873e52b88f9
+EBUILD qdoc-5.11.3.ebuild 760 BLAKE2B 830ed12c105003967539020517cfc00eb24ff96166ac431963ac0e359da435a743fc152f3ff1864b266cdfc3eada6e1a6f4e98fb84dbe6af675100b4d15df0f2 SHA512 b2d4025624b5980faff4fbcb294e241b9f7a48625796d31dc2cc94e907351b84d259b6dea3637ae3bb93419313495fed6bd55fa04c80b9ba1eaabefb34ea9efd
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.11.3.ebuild b/dev-qt/qdoc/qdoc-5.11.3.ebuild
index 5e1e6d058c6a..4cc9dbbea6bc 100644
--- a/dev-qt/qdoc/qdoc-5.11.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index ca49d9b956d6..6b555c3da6ca 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -15,5 +15,5 @@ DIST 5.11.3-0-201811291914qtscripttools-documentation.7z 88994 BLAKE2B 10d3593bd
 DIST 5.11.3-0-201811291914qtvirtualkeyboard-documentation.7z 1637961 BLAKE2B a4c46e635563a6f37c6184a93f8eb1aaa345052873a43bfaf805e3790847324298161229c07420e8665347b45797455cb6ef56cbfdf8240840ccf9e1e8e2982a SHA512 fc48123592a7502abc05f5c8ecfb33d12e041f3f278a1dbc27d3bc8653bb3e2464da89a8f14ef4bf07f786b80c26104dfcc89034a44f62a5810d4a01bf578c88
 DIST 5.11.3-0-201811291914qtwebengine-documentation.7z 3654309 BLAKE2B abd0799f31f0f00af0faaa335ae821e68cbf7f90d0e2027c866bcf2a397fc57efa8a12556eb685d09cc4e65653af1e15946d7f9530b82de10bbe1c2d6ee5c606 SHA512 e61e3d410e39e78b02c7afd86877e7b3d3f18102d7cf07adecf420f84a991ee28edb98b5413b03f3f5248edd68eba33d4273630abd8f8c915c9761f7e8c9da3f
 EBUILD qt-docs-5.11.1_p201806180847.ebuild 2024 BLAKE2B 2c4bf3175b42df76156adc97f9478624f8b3c3d20dbc994d613952150f42b29e651f76f693729f338802cd92956c0706f19d968271515b57b1eebd8071559cdb SHA512 d6da3044733f2e66c341aecb4f6031ac8964bee37211914bffe3479d49c87b0f98c0289cd84927c6159b7bcb4a092a19ff34eea765ab0b9f44fe41bfc2bc7218
-EBUILD qt-docs-5.11.3_p201811291914.ebuild 1937 BLAKE2B 6c556a214244799b15b8d67ea6d75a8d00121d0bdbd92e3aa2793802839de29ce285577816963c4b6567270f374af29b0feac6b5f95b1b003cb5ab54248b5e1c SHA512 3354ab5e5e729574fe0881ed1796aab6be4ef42769a79417fdd914e601444903268b90dcaa537ca8c5d8500120ea63a23586dbc644650cd6782e280f64b0d2fe
+EBUILD qt-docs-5.11.3_p201811291914.ebuild 1935 BLAKE2B ebc4b6a01d96ca7537acb4230b45804cce6fef838aec8b222052657cfb48a95032e269363d138e2e6f981ed48b4b4ac6d2449283c9a253c710951cf30fec01d9 SHA512 83663ab9abeac780df98fd0f5f975705a267efddb5c3780c2b9200d89099be83d615c5fbde3ddd315e56de751337e1cd1c558ec3719d555fcc2c63e2c2cd49c2
 MISC metadata.xml 1716 BLAKE2B 1a50a8c7b4b2125df82206b03fad6e9721495a0748bbb98ccf059628b03c19dc2e180fe92dd2ce71195357dde2df8717726721afbc6c3cb53687384d13c931fa SHA512 6f7b54859302dd8f7364e7be60e7750286c0326d22debc6488029e4c144d8935dd1c6042d28d31c41cd67b3ab83cbfcd9cc3f9a1d5d0bed66d65a42de61bada5
diff --git a/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
index d252c8f53b43..f1a705750fbe 100644
--- a/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.11.3_p201811291914.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 89cf9a81703e..3fcb31af2a8a 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,5 @@
 DIST qt3d-everywhere-src-5.11.1.tar.xz 84763568 BLAKE2B 92510ae0cbc4627a9d0517bfe3a17c4efc6538cd04787b3fcbf5b0f381558deecb96a70f488d797719852b625bb47827ad630692934aad5574865e63f77f589a SHA512 d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a
 DIST qt3d-everywhere-src-5.11.3.tar.xz 84944236 BLAKE2B f1db5cdb569777603868081bd97b0c1b4e68bdb4ec51e133d1078e23796eadd25ecef73caa23872f264aab51ec4b7cfd1d2af087445a8f826c2659fdec5e1a5d SHA512 d75d9b9ddb456d8a0163b35e9417c313c56ca1332fd742cb9a682d3e9d6c68e8cc6603bd900f8c634baf79522a00c0ba9aa82ce3db3b65c4656fef2c71c908af
 EBUILD qt3d-5.11.1.ebuild 636 BLAKE2B 488a2a0915778d7ea337d1d54ce058dd61a94c21d52a48cf1177b1fca282ad43ab1ab20f9c668cf0d6b2d2700dd35554ba35a082377f8f35f72ec1385b0cffa3 SHA512 bedf4da6c6a3ec4e1365042416dacdbe9727679bdbefe122478e33a629f061392d3722bb75e18b6b8021ec353e0de94583af74be24c24c294aba282eb4db0ace
-EBUILD qt3d-5.11.3.ebuild 638 BLAKE2B 5fc0319b01a260a284446d58155f556dfadd8493b7d7f5323ba7a99708ca25f666a0febf16754c4564a5aa5db16726b2f13eb4cab3f72a328457301b6c2c1135 SHA512 fe935e4bc6fa461e5ec41c1c7e3819e909ad7614d1a24dc70ec258e98373454908cc9a740dca3c92704e771de3a70fe164c1b04cde2ab3c0ad8c18eee29a34f4
+EBUILD qt3d-5.11.3.ebuild 636 BLAKE2B d8b9ed4a9f9805f1e1f312ec700c2f28206bc06d72a10c1354ad900a64c974d5aa48ca621bcd41f727b7978cbdfae2ddbe88082092856b332a5150a338861077 SHA512 c7a749e2bafed72cd7adf42274dace66ce32dafdb26c0acf313ca57d249123c5c9fc9a1182724f978687e6998282c8469a6934f4be68c2d80cb9b246e4582a0b
 MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
diff --git a/dev-qt/qt3d/qt3d-5.11.3.ebuild b/dev-qt/qt3d/qt3d-5.11.3.ebuild
index 40cf9458acc8..e2e0a30cccc0 100644
--- a/dev-qt/qt3d/qt3d-5.11.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="The 3D module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: gamepad, tools
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 42a82058097b..a686d711565f 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,5 @@
 DIST qtconnectivity-everywhere-src-5.11.1.tar.xz 2734864 BLAKE2B 7bd22542f06f6a46689b176181e83a315569690e3e5ce20f95d473af6d8513c03d47f2c7801cfbce522f49e25e1183e7553e104c7aaa7d071b86719236847438 SHA512 3533b117a6d028ef7bf4fe89b9ee42409b7a6eb62e60bca84e5f1323f6cd9892234d2c9b213ac806cda29cf36c8c6c646dec145933534664d376cda5bff94d8d
 DIST qtconnectivity-everywhere-src-5.11.3.tar.xz 2729800 BLAKE2B 30c86277eb6f997b52bd6ee42d1c420bba88b78bd65e4bab6fb6c38b8d9d61e14da3ca0148f364b981636920452915dd4889a528276c711eeedea507ebfeb7e7 SHA512 e44f2438792733f633c2788e7bc1910e7fdd72af660137cba8aff37deb92c01253b3f4b5663e1bc381e63bcf7a4b469f2682f8c85e6885af423df3d4a5fb055a
 EBUILD qtbluetooth-5.11.1.ebuild 636 BLAKE2B b4f9856710aec096d0b61ad5c7be8da02af6a4ba87b0629de39e056e185d8c046081a65b35cdcf506092807220e4664a183143696fbc32a73ad1e56d04deda0e SHA512 79b6162387e3b3f052d3ac4bb4aaba5453b1e4803cf2bf5276653d025b14070469ebbd1870fd638bb9d8171dde751c51b6f2e6b20d29baeec3fdf42618568127
-EBUILD qtbluetooth-5.11.3.ebuild 638 BLAKE2B 101107b56b9c9e1374aebcc4b8916ffc2977bf443c359dcba798171978516f16353a7ceeb64d5c808b19b7acb4a3d0c51f2284267e34aba1b2b81474321d334d SHA512 9f67b9d1d42075fe0a4e8fb09bd2b09af12c09d6944783c058eb05415c52772edd71d8c8159a38cbdc8e4de3243dd6e1f6e6bb310962dc4437031ff881032656
+EBUILD qtbluetooth-5.11.3.ebuild 636 BLAKE2B a4fd115127c1203cf775fda4d01d3ab8b5998b70bd3b208b172e5a256db77e82f1a449eb4146cc8b14d8c7d96464059cf55389064af7d3b0a422ac8d9f1c0325 SHA512 10690f04f72baf9a37f666f906fe2e5d292ef509fb31b33239e99675649c0213840b399f0d12d7a13d091ca4097f4f59a7655661afdc12613472e4f050bf190e
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild
index b6610fe444f8..530491649d5e 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 22d04a67cc52..3cde63de20db 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtconcurrent-5.11.1.ebuild 451 BLAKE2B cff081ac274936eae9ed8ad606fd373702ea62064965abd6bccfbec9f1fed503ec7edbc9822f52a7ca3c6b23a72247e06962a877bb1ae9d928bb5c5c2323f11e SHA512 22e66c97f254ab35b7d5d42f393f52789eda739acde574ae016d20e7929f7389b49d93feedecfcf371f2d0973b80701c429c62a464350d73d0722fd1ad4ad325
-EBUILD qtconcurrent-5.11.3.ebuild 455 BLAKE2B 436a0f43e4e0a1107173c34d5ecaf573b9166727b95398f5677a6df87273d3d58abdea70a721e3850bfbcdfedfdfb9e0e9f0e046ddd4faa8fa7b496ec66d5a32 SHA512 509fcfc01daa203d0f3f882adb4dea59af534f123d23e7b74fa4b81a930e8b92bdd2f71459a0de42f4534ef2d943b1df14a513e312a29ec0aa7eb4bc60cb40c5
+EBUILD qtconcurrent-5.11.3.ebuild 452 BLAKE2B 5af2bdbf0b8ea5cb4af7e748490bd18b1a8e5a754c1ad738621dbeeb0d0baa7e14682b5e6ccaaf874251bfbfff3bec18f6f4bc5d88ffc7df059161783e5fc768 SHA512 a0c303f5bdf6df9164184f29a6891f8d3628214f9ffcd45d0da455bd4b6af9ef7b6c64ef823064c0fc299f35f0b0ed730a283c4891feb3fb04dfb12af6a3e1b3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
index 098a3a793986..55cb5002b58a 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index cc92bc476790..9a06e66de19d 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtcore-5.11.1-r1.ebuild 1497 BLAKE2B dc8c05202166bc739f802e189ab1a65fdec5b5efb25481747f58bdb1ae233801518d9fbf1ce79ca9c225bf0ea4c934e24fa7476eafaa62155489b7c1912c6617 SHA512 24ffe80cff087a3d004a2708b9c7db1e3e62cbb962c658ed6130475c0e9639f69867d7ff96116c6d44f10ed7e2b6ca93a8651db99efbd89b47ec84b9d18b382c
-EBUILD qtcore-5.11.3.ebuild 1501 BLAKE2B cda3a9e84e0f6ee662512105ae86b05addc30e97923dd0721b7fe13009a0963b1e1a7655b418bb0c82bf029e760c45cfaab9493d85c607301203985ce6100493 SHA512 e5937c66ed4409b571eaa908d835fb857b3944568fe857fcbe90d46367f3033e4ec0eda59500bef2e3fe3cc53b5bdd3a1dfac74c23fd07a4e52146102a6868eb
+EBUILD qtcore-5.11.3-r2.ebuild 1697 BLAKE2B d933c25ad2f388c0ecae65bf2aac313a9f40a1af196cf9895a19387e9dbbab161cda0b427fcb923077c26713469ac9868266095dd41c0aaacb9414bee9d91667 SHA512 de29c5729bc097f5338913193bd1593122081aa686c8e3c84e159f5ff0548a0018022b0947573cf653ce46a006d6c7aa33f16759e69395104dee5c013348f287
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild
new file mode 100644
index 000000000000..c8a30f8a58a5
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.11.3-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_prepare() {
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		-no-feature-statx	# bug 672856
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
+		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
+		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
+		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtcore/qtcore-5.11.3.ebuild b/dev-qt/qtcore/qtcore-5.11.3.ebuild
deleted file mode 100644
index 8ebee8177121..000000000000
--- a/dev-qt/qtcore/qtcore-5.11.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE
-		HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM
-		OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB WIDGETS
-		XCURSOR	XFIXES XKB XRANDR XSYNC ZLIB
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 5274813b20dc..8bc2ed68e8c7 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtdbus-5.11.1.ebuild 695 BLAKE2B 71e305ae9a3c723d9976ad754ef735b3d6a9c0ac1cffaf7dd8448384fad40a402e19b475709d6852a8d25d4dcb9ff2e36d2a824a20cbe2e6a8802c5ec97afcc7 SHA512 f2bb5c95fddab0b186b27e1ef20c00942b288028d56649a4797bff15e6e25b58a6e5815e9917ee79d34f8f65127a84b6ea0fd2a5fa37e8000ac16a92ec17f2d3
-EBUILD qtdbus-5.11.3.ebuild 699 BLAKE2B 0e6c2d9c831ffebbe0b4c441438252c847a1a3144473987864d252d4cb3d5167c924756a116f540c07d5656a1989304dbe6932869a2a1c89de803a1dc8a018d0 SHA512 61059da5b1d5be1b5188061fe45a8f5a35d4c95715287ae45fb513a9d159c5199239bfa5ae14e48135770cbb0253f7d94cc084a36a0e64296095683db692d606
+EBUILD qtdbus-5.11.3.ebuild 696 BLAKE2B a4a092012e79a59e3c30f38d63f27f187e72dae6b11821b3c51ec2bead480513bb26ef1434d5cc5ff988901307ac6b1505db3b005c107eb4f9f93b4fac41a8b8 SHA512 ffa3cdd0dc25bd1298e51782512581a1674d269d8b1754c4656a02c190cf7dcf067a631b8ecc0d29e8af52189885a7f42ac89885c7ddf061363e395630313691
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.11.3.ebuild b/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
index d5a040659786..e62d638a12e6 100644
--- a/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index b7fe05689d89..19a33e943d11 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,5 +2,5 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbf
 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053
 DIST qtdeclarative-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0
 EBUILD qtdeclarative-5.11.1.ebuild 1408 BLAKE2B 4eada134a4434034fa24aff60d0f3fbcc50e7fb9b5573420acfe38d611fc14fcea58790d3deb568b5ab262b16d97ebc9d24f6c0a3c60037e5a168e4276b3ad33 SHA512 2b0568144286812f6b7ac1a9267c1f2e946c0adb35ac74562333189ee8cce34435481a0e5def6e4d17a93257b26c71057cb38efb6fcd3e1e67de363d54557c78
-EBUILD qtdeclarative-5.11.3.ebuild 1414 BLAKE2B 41c13dbd30089ce055583b5c4f1efa404eb6be11faf288b7e12d6bbcf53b98dfc592ee3f2e5db670105536bf5d2be4d1c74aedbdbee18e948f826e5534a1e4a7 SHA512 7558d871cc6cb9316d7bed96192ce0a02618411a8e7bb96014c639ffbe2022ef0d619bc4f31a3dcf6fa023c8cc92857e8c203317649495042efffe8840b88aad
+EBUILD qtdeclarative-5.11.3.ebuild 1411 BLAKE2B 7d3ddb1af71c8db62f2aea722f30fc98eeacfbd8724a10a3ba2bdef1b9dac7f519b64193b27fb00cfd827045dacdb1c2053a7da8e9a80ed284750daa37329ec6 SHA512 c0f0ab0df1c3441e3aaa52f74b46c9987074ca94dac02b206ea51e02868cf99d315f8d20d43a8aaec9d1d43ef00b316a80202a01bbb030c6de80cdb510870141
 MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
index 8876b08e5c0c..379bc78a5168 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 2cfe8d4785ff..82aef3c79486 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,5 @@
 DIST qtgraphicaleffects-everywhere-src-5.11.1.tar.xz 14272760 BLAKE2B 079c4c22d222c8aae3e16a9b818ed792652692a6dce4c56afe404ba53a777e6d32afca00b2b03fee84010714d4a94dfa3ff257ab2fbb649fde4ba4a605cd72b0 SHA512 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297
 DIST qtgraphicaleffects-everywhere-src-5.11.3.tar.xz 14267588 BLAKE2B 7f64c33505681de524af4dd97707ace7cbb371b15a500516afbabb4e61a13008b2e1c418f2500539ded2dcb4cea8e625c1fc029d92568e3c85aaad5562fe046d SHA512 c07072f7b32fd4e25f80318c48ae5a7dde82a0524ab37b174a5abeb36362e9e493570e2477c11bc4184ecf668a3879df8355fa0693a709f0a06224b41c144502
 EBUILD qtgraphicaleffects-5.11.1.ebuild 444 BLAKE2B b01a46e6de70bb4ac7ca686556c4ee621bf9eeb86817ad71b13194289532003281858be26b43a9be7e6ec64b67642952599140ce74fc8681ddc31b9c4df2feba SHA512 518ccba62859a6c390d03739d58e42d036ad4b11618d3a94c89a81c04dceaae23364ec342ad321399ffa4f0cc0abef60397ed3ab84764ebd824f14d33f10fb4d
-EBUILD qtgraphicaleffects-5.11.3.ebuild 448 BLAKE2B d73f17137a3f3bfe9a659397b612fdbeb03649758349dfd62c24c0a8d81733912ab5772aaee5aa893fb69bb4974f3ca89b8142411bac715c2f1f0168f88b0b77 SHA512 993675a828f4db55cf7a8ba30e983fcac4962b63ba1d115fd99927702b467cdc2c93eb5840db72d0b65bb5eb975a2e2702abf9be173628afad550e07f99a884f
+EBUILD qtgraphicaleffects-5.11.3.ebuild 445 BLAKE2B 1a8c69e18afbb8dc84fa53d2b119b98350f13a761d487f042e7e14244b28f4584bc3f9e3331952e06e78cdfcc6afcfd63f622f70635bf511131102c4308bf0d1 SHA512 3651a209b3021cf10fe2dd431ffce312fb932b918cbd28bd41e9471cf6a0d6c8d17c6f25a7400a5cbad929ebe30de9e34d0dc264881af5267569d57f9a4bdf19
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
index 66e01da425ab..3b39ae44f171 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index a3c582a91fb7..8d25e4502600 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 47bff9fe61825a476b46b734c2156b05afb81a798e5e381a9dec306f98e0c37726d868d0512ecfb80dc1842ef2c2c8dc3af3ec895d8f0cd0c78098eb75487f0f SHA512 1a014dc31300db62f18ad8a67a508576bd1f141355a12dd46927e26de9fcf9adb09261ecfff4099dbac182bb0aaf14ca3f79de40d4f7ed6c83b9a21341a37282
-EBUILD qtgui-5.11.3.ebuild 3579 BLAKE2B 8a184cab738d654a19c9a0b05133bd1682fb7eb5ed7b71fce057d3268d5fb9efa9f3f523213d6f7092b62c5ba5aa4315848a5d2015d2343a5e610d52c32f224f SHA512 60523f34083f85a9f6cc9f1e7544f8c755c71e622c330e071ef110bf00086235c39c38ef7b63f68b7feb18d326269683372df46507f3b64f5fae6bed3beb7edf
+EBUILD qtgui-5.11.3.ebuild 3576 BLAKE2B d988bee3611871ed434803a791f1782d38e0caf17cb5bb0c6cafb59f0cf265dc9cf708dc5a08ab5a6c825d53c95328f846095f9f88ba9bf2e98e2d8091e37de2 SHA512 fc46b37fc011833607bbb8d13125568457166b9b35e0f087975a87d192e86cd4e0bf6411ee423e18d082c89e586f4b64149e3f3e0d2b814d9b3df0d4034576d6
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/qtgui-5.11.3.ebuild b/dev-qt/qtgui/qtgui-5.11.3.ebuild
index 8495f8faffad..dd51c4a18ca7 100644
--- a/dev-qt/qtgui/qtgui-5.11.3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 23ca23adc93f..1e7d4b8f2602 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qthelp-5.11.1.ebuild 652 BLAKE2B 07c0b114cb4a842a2db8b2a977b6f7c5ea7bbb23eee9362fe685eb8963c8737a3620cf305eb53e16f04b362505d9d3642cc6c6147d197f7b586969a150f0295d SHA512 82637bf23d27cf1f3f34e4518de3f30668cb6653ec7be9e9ba724609ce98814680de9a2f6092d34ffdd70a7669ca2b3351b15dc0ba2c4607308111bb49c5cfcb
-EBUILD qthelp-5.11.3.ebuild 656 BLAKE2B a4a0f91c8abf515a84c1898167a66fe7b99da75545244cbbee727860b893d3c2335dc5e3c51f5fabfcef354bddd8ee7c1fc4778533d2fbf28276b3a70f2ec9e1 SHA512 e99c4a76a774d8c487359a5f0946eea232c73609cd88620b45ea98fca7948b592f745c8d8ef73cea294ddac0c3f1ed8459e94e2c6fdd0a9788993434f34d0869
+EBUILD qthelp-5.11.3.ebuild 653 BLAKE2B eb850bef6700089d0de198e763bd937bf08b6b93509136aad18727614ba0e5994e8cdcd89ee3cdcbd5b41cef26efefb5e4192e17754840ccccf2957cb5329d18 SHA512 ada24fd683e39aeb22d1127a24afc56fbc4f18dbe42256a4dcc34800cf1c77fdb3cbc72e127278cea4f78a500105ab50cc47e4299adfde0d69521c014e8051c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.11.3.ebuild b/dev-qt/qthelp/qthelp-5.11.3.ebuild
index f010bb274dfa..a1aa8122d141 100644
--- a/dev-qt/qthelp/qthelp-5.11.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 25ac4ba9efcd..bb186236c158 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST qtimageformats-everywhere-src-5.11.1.tar.xz 2191408 BLAKE2B 7a01c6c607cdb02471c289b71151d8fcba2047778c6d499a54dd66d125a7dac29b944b2b722aa8bf8667f453e92edba20adf10cfe6c580af7ac42c41aebd3a8c SHA512 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d
 DIST qtimageformats-everywhere-src-5.11.3.tar.xz 2197304 BLAKE2B 9041260c26b2ec5085a10c05a76dcab59941ae3d18475b93286028b9a4bbafc923795f6f0ec7a0e6b45cf95c21a37fbc76d0868cdbb6ed8891360310cce868b4 SHA512 5e2b83c2a7cc337ca0cc80e348ee41cfead3429245ec0aa18bdef945c85aa878ba684f5d410bca04d0183e0f6032a78b976ba89346043c0a49816c306d0235f7
 EBUILD qtimageformats-5.11.1.ebuild 604 BLAKE2B cbf2b5c20d8e504e2385902fc915e7beb77c82c042235bcb0c20f72e3dce463acc89e02611c6730ba3a86568f95c4adf446b932256ab128747e3a1001e583de5 SHA512 855a327ac234fe3b1eb359ada6062ef48e7f6f8f635ce6d5ced9086f283b10d54e9465e3666279d9c213953a6b022ef9e70fb26e5660548181aca736d061e605
-EBUILD qtimageformats-5.11.3.ebuild 607 BLAKE2B 0f80de2b7fdc1a3fb490527b757c3bae55d7dd93eee05d0e5875610367d5464fffc12c07dd1a6731dca0d6ad5f1da1127cac36ecbbea118f0bdff24196d02a41 SHA512 0765f575f36491d783607a7ab44a4692c645aa9e85e2864a5418eda74d16a74ca9ce39fa7df4e6b0977e3f024c815979e7edb15e7b1612bc90095b11e07a2962
+EBUILD qtimageformats-5.11.3.ebuild 604 BLAKE2B 7c45447e5e3bb32ab169001cb87497bf3b46b47fe3b16eb192f3836a6f0bf005571bc6422966835b06182fd1856bfccb3e40dd7c39633f72e8d7a2925b7f64de SHA512 5695724e7476fff4f2fbfd10632df877d6d53e4abf8b310905a5c6f48ca9c5d2d247b9afee3370aa4d54b96cdcc6c2ceb1add55063374ac0e6c5d227a5e0bf44
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
index 89acfc3bcfa8..8b3e2075d25b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index ba8215ffe086..563b4a37ddb4 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,5 @@
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 EBUILD qtlocation-5.11.1.ebuild 919 BLAKE2B 2cac5157ba1cd250468e115409174f7698e677b3155be082389d391b823fde5ca828d8eb92efe1e5337a91397068fdb427035247042ce6cc8cb5734583d34440 SHA512 088d1ddc83eadfc286b904b2e0177dfb1cf119bcfce3044de97a781c6639baa427c154caffaf11d2d44d7246b029b8fb1c4af5d8a9dda4fdeeffb0f4a702ee7a
-EBUILD qtlocation-5.11.3-r1.ebuild 926 BLAKE2B fefdaca7b335b060c6bbc98a60af6c29f468534d8b4f28dd23cd992fc8ec85f9387a0f6a1523f16b4beb517db8204097bb9785863cc4fee03ddf7ddc070ace56 SHA512 c767af68fd05173833241ee41e0fa4b9a801755fc1d6760907d9064baef1f5c71e100909e0a8eea7f09e454016532f95e27bb7fbd6caf1f84abc172279a2458c
+EBUILD qtlocation-5.11.3-r1.ebuild 924 BLAKE2B 0608a37072401e2d5b4872976abc693f040c81cf8baa71dc1e7be5d3b229b44a4c794f36731a7885c297d4531f35aa057889da32f02f1c7575df1a315b5b32e1 SHA512 85a0f48a04d7dea9d07715599d21d7b1c2a334d2b338082296787f15fdc9b8654a11992ee1ee612e1d5cce2befe3dd267efd2efc28d69ba339eb4b6296a4774f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
index 78057b719907..5042b971dafe 100644
--- a/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.11.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="The Location module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 13bce144acdc..298f600a82ae 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,5 @@
 DIST qtmultimedia-everywhere-src-5.11.1.tar.xz 3711548 BLAKE2B 93d282725293c0750803e4cf00dfd4fdd2ceb23b5105eb339c60416cddcca2e39a51277ff60ad524b6225cfb6c2177fd52015bb7d10521a04973a4d24188fe0f SHA512 cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c
 DIST qtmultimedia-everywhere-src-5.11.3.tar.xz 3710012 BLAKE2B b1757e80914a41913846dcb890fd56706b402aa0498cfa3e58277e8ab50e95c597df1b32dae11f146283d42c874ec03d8d33374447fc71f529c30d0e465c14cc SHA512 1c9b8f3392ac0c7e63a05d57fb74473a89edc9f2e482d8df97761ca20efd13bca2c1c68907ab4b4af71a109a783a641c2faaf72e7df90fcbed6bcd6e13350567
 EBUILD qtmultimedia-5.11.1.ebuild 1443 BLAKE2B ddb6f0ec27097e57174187a1cce1fdc007a3c7a81ea0a74cdff3d126ae8ae2af69b8ffec9815ac50332ef6b6020a37af9c6b6b7b2f48f67525740a52366f89cc SHA512 c812b0a72e508b4548b1d0addd13143d5e149aacdab73068c37f4d9be7dd3afdaca30e8553940924a75a7c02ea45ac06daac0ac0b4edd751ec3de3308e7bffb2
-EBUILD qtmultimedia-5.11.3.ebuild 1454 BLAKE2B c47b367d595b0ae14e242b3486ec9f565c75281113cf95fdb744430af7364e31b1a1ed204fd08b17817b8c02638f52da54f265b9e2d3eda8b16c1adbfe0f62e1 SHA512 8abfc47068c92c057e8fc2d54875b40329ce12f433e1483a4d1b4d2795fa163aeb8053ef4d924612533b319157dd196cd1036d31eb25fc34bacc81fc066ed621
+EBUILD qtmultimedia-5.11.3.ebuild 1451 BLAKE2B daf9c6029f91bdd7a654034c7d7d19dc4827de26507d2d4331709d398c9c5cfc74d0cf13af56edc9ea968a17d73ba6c8269e1b1cedba7cfd66f52abf703c7cac SHA512 ba3f754e1c95b3dcd773a464c96bdb2eb7930184e5227446e3eaf324619e0a9487c67b0a5e859d46810822c857bf842d68843dd73fbccca684aefd9bfd1934ed
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
index aaac7463ffcd..3baf64bca048 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 13e111293404..13e3fc3c6990 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtnetwork-5.11.1.ebuild 1227 BLAKE2B 37b6daccdee21d56752486e8ec31294d01346be42751afb6f3484f6549c60158e694f0ce4105643e4fbb78143857388ad85aa51739e32a71cce41f49f51b3511 SHA512 e76ad2e4120cb4eb28efd1a12ea2a84e8503d3d7a484e9208c7a11610033ae51f9c43c90e41da156c8a054ad81a53b6bb3d6c7eec97399948bec94aab3bf42cf
-EBUILD qtnetwork-5.11.3.ebuild 1231 BLAKE2B e9ca316106941bd7c530220118190cc86970d6c619586df2d6fbd4e98d047c0276635ad860b88b3705c21c94b8fea3e19ed4bdff54c43d34abdc438ce1e3be91 SHA512 c67fc0bbba64519cb71232be5cddb1b5bb1a20520a381f6172aaaa3773d46f0e196e025446116a3a8cac70f6b17cc151d52e22cbad792c9c7952aaf1a687d9fe
+EBUILD qtnetwork-5.11.3.ebuild 1228 BLAKE2B e914d81cba62eb99ac113488a0f2e26ec07fadb2b7c7afd17bc2e4c007fbc607d07390147db2a4124e23ef56270f63ce3b6d5ca86c6f89887c188d2bd6ea0219 SHA512 4595953168e8cab73245edb31eae4a5d9d4e6b2606e95a0c8d45e381a486bd3982faeb769ab77b446b5a6e579470aa04812b9f58f85a45287256212f0acf43a8
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
index d462c11f736f..885278b0ad73 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 6ad51e82404a..1c1b33a5173a 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtopengl-5.11.1.ebuild 648 BLAKE2B 29ad8b6f8a55384ce7d705381958bda385f75e38842d3106f60e1f91a7aeeae23be06d237c8101c2965e34120998c002f450a14e0c36bf73e1a42df0773d7a9c SHA512 1377840f6635c1b882f860c35603881934a8a9d317ca488f4efb8cb2616231ec02f396dd37fc2553910db9e41a9162821bdef927acec8f4d27007287c3083ea5
-EBUILD qtopengl-5.11.3.ebuild 652 BLAKE2B 03aafd597eb70c2bac25a7a94af3e68ca9a1ce6f7ddd48502f51606cac3f93573cbf70363de05dc2ace19a1210ac3d6a5e1dd3d69a614bce05c09971acd3a991 SHA512 274faed5132683be0bf18e03d0fb2583dc5bba6f3eefdc14f2ab84dcb8eaf6875321aee9ef5db579143d7bdfd3be1dcdab9d19d788f0b685b146c06556a079ee
+EBUILD qtopengl-5.11.3.ebuild 649 BLAKE2B c65905e74c8d295fd84fb36bb51f33011a478ec7b7ce54dd8c978b958ed6ebd11200c5bc1cab555046cad0273baee30c381cc738ee851fa2a7f86d7e422d9d66 SHA512 24bac4b4af06cc31ee3ca23c4e475ddcfaa384406b764738efa9aee4d303e6443efb29dce056b4187f8096375e39bff68278193d0868a55f8698e6fb6a7c4aa9
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.11.3.ebuild b/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
index b6ad72a02f2d..b2b041559326 100644
--- a/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index f4c3e8eb9801..7edb155e257d 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,5 @@
 DIST qttools-everywhere-src-5.11.1.tar.xz 9720996 BLAKE2B 5c7ca72ea6933e13eb07bafbd594db1dbde820c060d18cd26e30421b359633641a12834b0e9f0a94fac6c9df3d0d1e699a1bcb2d4831515509593813b021ad0f SHA512 cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482
 DIST qttools-everywhere-src-5.11.3.tar.xz 9705920 BLAKE2B 1c44d914463cd2bb2e61652debbd4661822442e0fc02569d98c17e3898d6acdd7546fb978af4a3dfe4fd00d66cbd4424b794ee7e7a26460465503b03b5f9957a SHA512 f9604ef4c33892a429c4f7252892271888b64e087ce8e943308680628b8c3a033aa2ea6659e6210ac90e3404120f458c77f650f20fed13f4723ed3c03a598eaf
 EBUILD qtpaths-5.11.1.ebuild 409 BLAKE2B 309efa6b311d563f113fee2568e3f63d3ea0f5d3bf2cbf87a686b3a3a261840f02b03f3b1cd40650e008fe95b74a1d4144ee57590c669ab11a5e9c4f8f244153 SHA512 475dd23f8856dc2da125998b5be0481a27b20e3e1be131464bdfedcdee5063e13d66026b903eed9c6b5b822c978005a60b5a63992e8dad320840085d3495572c
-EBUILD qtpaths-5.11.3.ebuild 413 BLAKE2B 4227ccfb463dcdedec3569d32634a7a7c0d49d25081e5fa2aa12537c1e9d624a3031be39705ca985af928457629db68f62c2ea57d657758037fc97f97aa926fa SHA512 1c98c705b9ea43af3b23023ba6534e38a96df5f6767c1a74dcaa745018af445a5313b4403ee7fad75989fe416c4fa40110e1c19b10972249db87547d578527c2
+EBUILD qtpaths-5.11.3.ebuild 410 BLAKE2B 826bec44cafc609c8a13decaefb36f7b432be922e331d8a9c6d42e10100a39695eaf86a63b1141fd58143eb63ad08ae5bf0f733f147fdddbaa7c1998b37844b8 SHA512 621f4d900af702f38e231ed44c2fada35164d469acc116a28b2557c71d8d2cb4f8c698dc07747562c3362a69f0baef883ee4659cd3b46d97d43b1ad2aaf643a4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.11.3.ebuild b/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
index 3e622fbb156e..c4bb438a6013 100644
--- a/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 454ef18c16af..6f0cb18e3770 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -2,5 +2,5 @@ DIST qtlocation-5.11.3-geoclue2.tar.xz 7556 BLAKE2B 2648b2e8aa8dadad467c7a3ea352
 DIST qtlocation-everywhere-src-5.11.1.tar.xz 5593144 BLAKE2B cd9fe409ecc3f3dde665f4bb77f93d515b88bce382655adcbfc9f60b7f7446abe800a91d612fa4b379efa9a783a4158ed34ff1ce11b3ea929e087062d0fa6f1a SHA512 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 DIST qtlocation-everywhere-src-5.11.3.tar.xz 5589440 BLAKE2B 544d90151fcbaf8a75d374e4acec9bbd78b63c2dee0258f1e08e18ffb94a86c91f63dd8c9215af96e3648d50a40fe6b66c105abec0ab6dd4473903a06f2d0253 SHA512 880cd6983bc0b4c5ac5a1edb2b3ffbe89f133bd819e4bea4fb8e91ba8d847ab80572743e3994145ee6697cb2fc24c393ac3c4ead847a022d848799eaa4982716
 EBUILD qtpositioning-5.11.1.ebuild 836 BLAKE2B 470c9b44e443dd990566d62cc182ee2f8e73a5d0f7a925e0049bdfd2078375ff33a5566e145af630bfb35477c4eeedb050e7339dd269cb4e2aa8d2c6485ca832 SHA512 dd3aff4b9153299744e2d77c49cedd5b6e108980a161c4e21bb8b60e84446b48f3a7b42c2a3e97d084fa6db2fca578cc7c9c6f174e3a05ec98c2f0efcfe2fdf4
-EBUILD qtpositioning-5.11.3.ebuild 1072 BLAKE2B 90569f5f267251c26cc9bca9aaa30fe408490fc66ad9e949579d2a847f27519aa2f23b163188377ea8a4ac17775181a3790f40d70271bd9566b77811b393b9cd SHA512 6840f358e5cb6fd54f4a539495646377cd769cc9d7dd206ef8b440c8bdffeae3ef38fb997aeaf1002b08287237f2f2a3d4c2b1c3e623200457cfb39a42645941
+EBUILD qtpositioning-5.11.3.ebuild 1069 BLAKE2B 57491cb531e81a9435f0d3c0e0d8cadc5431097e1c1d94902c73c93d39c8d5114bcb1cd323fec6e78949dad88c3f8e1356ff120375919a71cf95d169eef47588 SHA512 991d6836f9403cadb1dc8de9ca4161970e838d5a6bbcfe682d6744c17dc9b9bd0040412670151736c49234cf6fdffa1fce845bd0b352b4a532072805b5d19b75
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
index 2b26569aab74..31c6fb8b3b8e 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Physical position determination library for the Qt5 framework"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${QT5_MODULE}-${PV}-geoclue2.tar.xz"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 75ba8f949c9c..a7510ee1b94f 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtprintsupport-5.11.1.ebuild 773 BLAKE2B 81a9e6d9b64142e9983ff20396a347c4556f9ba232021a70d2d10d7e896ed2ba90ad7bb20b381ef776d6ba55545d5fac62a9c91547b464b80be1eeb0276ae688 SHA512 7cc39b7c8dd450fbecb0afb210f78569bdde73af3044a155b09dfa6387c84582e234c21879a8bc36e58523bc21526cb74e7a4852332a082dc7b0551a4c994896
-EBUILD qtprintsupport-5.11.3.ebuild 777 BLAKE2B ea90c13d7ceecd077bb6fac0e410a5b992ef8993fbbb9b0c998dafa1255242850c20dfe3b240bb68e32bd0a10862d000894201c31548a50d24d6072b6c89fdb1 SHA512 0928447c4f6e434701cf7327900259e613c7faf6618c444ff6d7a5be6a7cf4cc49a90c884de9d32ffc6479cdcad2b6f9f93989e4523e1288344abc2e6eac1a5d
+EBUILD qtprintsupport-5.11.3.ebuild 774 BLAKE2B ad5156df8b02d202e789dedc075e57aa38270dd3a8c136bb91071c4862b381d894b8c2e805ebf3d68453658ac305f1a0851e69c9e95ca67de3d25e4a8984dd27 SHA512 0cbe6840873b6b61c9bc2ff16bc66a3a983a728c8d1f964d41b983a5947b6b08fe985f53db7eb01eeb7c6c536ebd2b7454f040050d24fda0482d4fad250b6875
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
index 1d457318cd9c..8e16869817a8 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 3fcc05f02376..1e998ddb2007 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols-everywhere-src-5.11.1.tar.xz 6058072 BLAKE2B f49b51c72486a5d514d16faf78ffad883e3597f6337d4103bc4b93d9cbce681853c38563a2f237308f8ea2362d8486284da308d4d815388457b429f3a3eeead0 SHA512 d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c
 DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
 EBUILD qtquickcontrols-5.11.1.ebuild 744 BLAKE2B e5b372e09066019828e73cf2d883e5073e1225cbf129ed0ce5a35665c83bb8a7d9ec29e347ce72c549d25362dd23034143240830d9291ca92713c9521daccb20 SHA512 cf556d46fb810c10b0d2a9502d5e8634c8cb202adedfbe8568465937297e2d1d79bafd2fca358a760799f2d90e5c93235aeb208652df34412f7f247355efbd24
-EBUILD qtquickcontrols-5.11.3.ebuild 748 BLAKE2B a749502ff9aa641bc4bdc079b929c66bd54ebead51c3b053374888c05eabae87f3470ebdc4c4495e4a434a2ea8b9273dfffd2b25efe580d0876a5991248f40a6 SHA512 ffa6719e63d04d37585da6d1571a7849ceaef277176fbaa91c3abd86cfe8115d0953bcc4d0e7a6068fda0d029b32b4c264c2d0ae804bb9f2464f2f24fdf02c48
+EBUILD qtquickcontrols-5.11.3.ebuild 745 BLAKE2B 5ff3fc7f2cb1c6642636fde02187495ee5e9e3292269f516c5a30838c0264563f33ccf6b553bad17da40ea157dce3fa3d1b093c2a556f70a510bb0e073435c37 SHA512 74e759b6e404d010eddfaf83fd4ec628cffaa49e9be05430293bf935d0316a3053dae6504a035048046630b27daa0cd130166d633e3a28c1457ba42f91b8c1b5
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
index 9c557760e183..d907c114366e 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index d50a62b0df89..c0fb08824b7f 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,5 @@
 DIST qtquickcontrols2-everywhere-src-5.11.1.tar.xz 9032192 BLAKE2B 42ee81bad1cd3888c770d559ad91fa38e8ae57a72a5b6a1faced4cd8c6292e89392ea1fab14f821ed04aae5b7ac997b111f64b9725f0b35bd3b685605d367e61 SHA512 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68
 DIST qtquickcontrols2-everywhere-src-5.11.3.tar.xz 9042632 BLAKE2B fa057831927bc429f2f3b906165d8fb4299d8fc260f35578c7ab5e68a99056a50848d110f337cd2440d443f123c7aff779a57990bb8232319eb1e9c8b1e91dba SHA512 b0591ac1f6948dfea2b43691f8dc5187a4d68142c61279fcc4387e7e9ea9ac1f4062d93d4adc4f8de28a39ab86a5d035f72f0c7eacb93050f2c002d7a0fc2caa
 EBUILD qtquickcontrols2-5.11.1.ebuild 600 BLAKE2B e7054d07d92b1b6e28e724cbe49523ab80fd8bbe56f02a3e8809d41c0c7de7837a5e3e9c59e2a6fd3d74e0fe57f09937451f57599b2eb9c52ee283ea6b819e55 SHA512 a7d0276b34bcc3115a56b3e63546dfe40d1216ef7b7de8a93dde85d3acaf9308d1d72fff92536cd1b3347e956de6c71f990a67a3934007854fe7de93f3f103cb
-EBUILD qtquickcontrols2-5.11.3.ebuild 602 BLAKE2B e71ab8708061c407032b8c4bfc5d8dffb331c2b2a597a9f798f0aeaad4e077e9d653a278ad7c7a35e91a3fb412750ac53989d3b4743207257c9ba7797d54d1b5 SHA512 9b7c5a6e7387a598bc535b75f2fcf3d89fb523ff14f6fdb33efc1b69d280f2ba7cc4bdd5a9f16258019a40c542701df526c5eb992e108c068fab05343bb45fb9
+EBUILD qtquickcontrols2-5.11.3.ebuild 600 BLAKE2B 9a7767dd29d2dee265782b08d341b7c113d0cbd3843b0dc3bbef865f91f3b2d66c0beb1b67115bd753b23e70b7b9b22a656092870a863caf1b98cbd809c62814 SHA512 83527f3763478a3f65b085b90002d04d34be9f93c82b490e44860def7a73eca94e93632ab70a561b423c62a8686c429c37353f0f09347ea20a2d82cafd5aa99d
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild
index d8c91c45bf14..c23225e3ef8b 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 3faa41dc7a89..341c7814410f 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,5 @@
 DIST qtscript-everywhere-src-5.11.1.tar.xz 2671428 BLAKE2B 8cc74db4f5b33e299964f81b00e634965f7471d191726521726a5f2556a8eccf344e7277071f817a9fa0c40856acdb955258e9491966b6f773701e809b73982d SHA512 609ac6675341fb2707ad3b91e955a430846253741931ada2343ab2d1ad27169a60548b1a2621369384043a4c5b983e392c3fafcffd50237563b9f4204123e411
 DIST qtscript-everywhere-src-5.11.3.tar.xz 2674692 BLAKE2B d209df1f632b9a00973eb043660c8a4a5e5c178fabd3bc715f91b37b781ea3567ea6fd7a2a12d462a63fb858c98a2e3ae703e8d7297a37c5d0dcc81d2f972d9e SHA512 987f9a13a698e3f498ea7408f4a9b2379969e901aa6b672ab2733af9d65fe79dd27af5f67aff5d7ab1903b5889c82359970ac81cf27f1eb2bad1e36eaa376b30
 EBUILD qtscript-5.11.1.ebuild 686 BLAKE2B 49dbad48bf8a63577e7cdfd6a4d8025a64ee33b7dcf84cb34119f5a000df0c9e2ad0e5a34ae9cffa9a1df949a18ae0158b969c6eed61507f62f670b8fef2c339 SHA512 ab55353c86929c1d9be2105e3d1fc495c406fd8c704217869d943c96396309393c8718173423c9a6afd1a338426d8fcfcca98e9d322858a22f9cad29a928146b
-EBUILD qtscript-5.11.3.ebuild 690 BLAKE2B 33a02e3ce082f083108327860947f4dd5083b8ffcc92d97a3d9de0d8fea8dd281334dccd6d52a1fed39f90d48188002bed2c2bc7ef2b2571bd65a57224c17000 SHA512 4a87beefabae87f1c774941c7f3da0f510b2280c621a7b56968cb0867453858c89fcbcb36bb14d71a80dd4a58e9aec935579ea26d4acb6079ae4add8b35dd805
+EBUILD qtscript-5.11.3.ebuild 687 BLAKE2B c624eeaf0ffb01c704d1a4e8bf039729c8990a533b4111b9fd20efd8b6c2b116b115c2a61346887bfd882d1a3f39ce5176b3cd7ae7d3b404a8f8c3c09bb27c5b SHA512 f6ffa490ef7f7c37e8f3c949d5b20d4762294506e474a5f19e2e684fc686025aa0dc42ed85d3fc5b23e31b68e1fc6e7b2da1e7a4598a26e1698d65f1e4ebf5b9
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.11.3.ebuild b/dev-qt/qtscript/qtscript-5.11.3.ebuild
index bcf1380a584b..e139a2f6f447 100644
--- a/dev-qt/qtscript/qtscript-5.11.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 78bffeca6c4c..90ba19d42143 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,5 @@
 DIST qtscxml-everywhere-src-5.11.1.tar.xz 436148 BLAKE2B d26d8e54bc89685110168043ec876fa8bb34c0c23ed31c625d26f71e82283716ed70e3fd71ad02233bd69546ace02cb87549ef3270e3bd43c0758db480db3639 SHA512 d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689
 DIST qtscxml-everywhere-src-5.11.3.tar.xz 433500 BLAKE2B 7d7d961d2ec8e91dfb6e359ee3cde840094ac22f71745998b262e5a1d489f38f561ad163e36173c7758618213970bcc80a2f327cccb7e80d9b89dbf7ee0d8ecf SHA512 d162da8c11a24b764b793e446a9c1ce91068296e8f79525a874420fc97f0a9748ebef84f0fc0d615b6603025a3d8897f0ef14bcdcd95209f518d691dd457a93e
 EBUILD qtscxml-5.11.1.ebuild 369 BLAKE2B 7f37bc1afa67f7b17232814322013ed3f7c35f0427b490c00ed0d719d1489b9c9a7c3b4ec83c17688c6fe769fe1ccf608f918cbca4692f199c2aba236fc55939 SHA512 e0f7f54fe57ccf4b339bc7981dd321fe991aa48f8b3a4da081a6f60a9de52bbaf329dcf3886b53914878a801673fed5f7c132bfb05945089c5b87725df0e5b9d
-EBUILD qtscxml-5.11.3.ebuild 371 BLAKE2B 4ca727220d9f994410618f6fd83b309a4cc29404f50d63ee30468370e3ac5e122b748103eff82ff45540b93c06d5bd403f726f0a2a21877e2786554ea4ba1724 SHA512 fb150fb168b3630b421899caf5cbb7b44b39210f7c7647327b2f3f5835538007854e0db624e3b0248a1eb4a2e264f5f87395740fa0bf788dece24088953a1279
+EBUILD qtscxml-5.11.3.ebuild 369 BLAKE2B bc24e3bbc9353ffe7deb038410700c21bd8a4592c6f60d36400c7026bba0073c0ae61a4fdc805cb065e486059dec6c720c1220cd8cfcb74fd26212add21bdbc6 SHA512 5ae35dd30a95e8e93fed6b502d801f32a7253be91363e4eece69f9cee6d01afb687c04a84a58f7ebdc1ecc9c8389f4ac2dcccf052b72d97df721e4ba33df6c54
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.11.3.ebuild b/dev-qt/qtscxml/qtscxml-5.11.3.ebuild
index 3a0e878ad0e3..067b60bd6b00 100644
--- a/dev-qt/qtscxml/qtscxml-5.11.3.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index e0dba2f517d8..b7e23e4228f5 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,5 @@
 DIST qtsensors-everywhere-src-5.11.1.tar.xz 2033508 BLAKE2B b0b99adafdb96835a019c915f57bdbdc76dd965d32081a2b8d4f1ce60a06fb9d1c450a2949a1ca2475aa303514e99ebe695dbbd0395140c7edba863731b8b32c SHA512 5da90766ec979ee51b3df97f794b1661a1103b80cc57941516171d5102b54c15bdf1cfabde21e5b94ddad324686a6a92171193312e7c6791d5de63832452010d
 DIST qtsensors-everywhere-src-5.11.3.tar.xz 2031168 BLAKE2B 089c77403a615dc1448646c5ef73807ad78242840569dc20367afc379aeff6aa8d925896c549568a3af913c5458a0b9e05245fa45523cccf1c89d6e3675edf90 SHA512 b0eae65b31be1c96870d29066c79b170f1f825615a78de902173f64a6d0f132678c5bf26d0033e110dce3ed3f2b99750a3b4cf23e1c13f799a9e51a6cacab10b
 EBUILD qtsensors-5.11.1.ebuild 531 BLAKE2B 2bd520d3491ea15d55955baea1d0bdd9491332dc7bcb391999455b16b94904c6affc104a02453f7b6d2f2332fb05b7e6c61e4b64578930e28f8933caf3a040d2 SHA512 205a4e7ba2c2f1e78fd612909dbc4651b4fb20837940da51673a56f71cf18ba1977ae0e93c0b98faf34ab01dac990b868df20666b76bbffaa4aacb8b78367905
-EBUILD qtsensors-5.11.3.ebuild 541 BLAKE2B 54aee1b9adfcfafe7333d5515875576bcfae3423cfa7011fbd9b1256502f861331c669b9a0ca9c5f024e81126358788257847d24bf159d9feaaa92e95fb0dde6 SHA512 4a7e4d53313c891e747fe86f90d9e53f2911bb33493f6075bf2daa0fcefd7ff414ba4ec17ecb979019192616278fc6b5abda00fcc4ebb2bd9664243617fd9f2e
+EBUILD qtsensors-5.11.3.ebuild 538 BLAKE2B 6e539621dce97d8fdbf23eefdd1cb49c9ec0e7ef80edf9dfdcbfde3fab5bb58921d12053f1ef81856de5649023f49f06a396522250a1df7bf230ea81ace59339 SHA512 80ea7ebbf72b8baabfabda6d5c814a3eb80240264d344817afb0b6c0e9c2e3bdd8987ffec836681e85cec34e3e2fc0a800189862f216899e5313854d89244b01
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.11.3.ebuild b/dev-qt/qtsensors/qtsensors-5.11.3.ebuild
index 2e43bc457f32..aeff6a10bcca 100644
--- a/dev-qt/qtsensors/qtsensors-5.11.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index eb4ceb3e7f2b..5372d5926d6f 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,5 @@
 DIST qtserialport-everywhere-src-5.11.1.tar.xz 301692 BLAKE2B 8d57503dbd16d142ac72dbc496218d57ff92212b44e8a504f3b6ba27b2bdb295061705c1318000d50c2383ce815c8420b056ea66720f62338a1b98785d37c5f4 SHA512 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404
 DIST qtserialport-everywhere-src-5.11.3.tar.xz 299140 BLAKE2B a10c24eedc425262145b705b7a264732db6a47d1bc080f2544bdb6873b1e7f6d1c25e9b27a3dbb5fd3eb697f06c4b057c072112090ce5f769f765d858f41860c SHA512 2c09a0e47bfebb494cdc767c5268bde77ef7dcbc665cfdaa0b17468a0cebea0208ea8019d0387622d2db63387557699fa30e043f3478dbddfd6b8fe909a7add6
 EBUILD qtserialport-5.11.1.ebuild 547 BLAKE2B 253f9918699b2c0a847d218288d3960016928901a2f591d491c807b168e78e637139a9e0fd2fee14d19b2869fc03cb1f9b6894f0a010a570022c9b54149e5ac0 SHA512 be65297a14a40d0f1679eddad08158d8eb1f339804f717e4a03f5c6b245f28d4ac9b341d0d9543a680b684fb2d227ac661b011d610122c3f13c787fec2bb7654
-EBUILD qtserialport-5.11.3.ebuild 551 BLAKE2B 06cb5c41e8342a618f275352267dd3f521868043a2d8ed32dbb2327270b04c9a152af086ef33a70ef3cb8a564be34079417e6f7a81039629f34f1e0ef9dc0f82 SHA512 8689337c5e2a3ee2e90cceb811a82efe233b0dcec11b17c2200b8bdd5803e3e9cebd5131a6d028de4d62d4dfb38b07c60817666f4db0cafde4d4494803c76a4f
+EBUILD qtserialport-5.11.3.ebuild 548 BLAKE2B 2e65a4c343362a52fde649d73d15f1d45bba18da223add202ad227b39c73377cb8f1a153a3fbfaae52c2996ba525ad4dd81e7af8b676f6bd43abdc4c420a1ea1 SHA512 e2e7c381e6f7a30b28efd59702c4a11156531b88d1ea111580c3ff70c039b2e5e2cba9733108ee55a914369d088fd46f0e86bacf5309402fbd3d60bdd2098e8f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.11.3.ebuild b/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
index 67478a8b8170..f999ffd45cdc 100644
--- a/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 4d3178ff8f02..669ebcbd233e 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -2,5 +2,5 @@ AUX qtspeech-5.9.4-nogui.patch 321 BLAKE2B 0b97c282f271a1ba1d7cfa2ba15f75bb2964c
 DIST qtspeech-everywhere-src-5.11.1.tar.xz 101732 BLAKE2B 2201a78f27851c4ec1d2a7056c6b0b620ff77b73be626940f6fe296baa677c5ee4a8098390be48620af77db10b75b777214b41c8dc3fd9b54f3a3cdf8f613345 SHA512 d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51
 DIST qtspeech-everywhere-src-5.11.3.tar.xz 99516 BLAKE2B cceff35946e7e8012d628b5d1093256bf68d512c750b4f5613456e225090a3108264046963ca97aeac160293d5d814db9f5286126797f22437f6fdc0e233ebdd SHA512 f4465b0eac4690fe576c098704d992fee884ede3219a6b032608b877748dc670cec6dc592aaccedaa62a0b2c9d552b9e1284bbac44af6e4cf074bd00918284be
 EBUILD qtspeech-5.11.1.ebuild 473 BLAKE2B 22ee317b691e239705c117a4bc8ead93995e7124d9e0d2400f1c6650bae61c386e09011c5ffc24006a57cba0c460522735f9ec9ebb19a1b4d0a6e7dc54a94f8e SHA512 150110b763642f1ac1a1468cf3e838b4d180f1c3d531dd2ebb79a51fc968688d6a281fc8b143aa7b4dc2f56d3e93c80fb177d1603266d4c200af2d0de11fa0ac
-EBUILD qtspeech-5.11.3.ebuild 475 BLAKE2B 3ddaf11247791abf816972351621425da73804c93130c391c469e37e8be490e0b571fcd48776be35f373f0fcf858a3e59379bed97dae94044ac9ced6fe10ca0b SHA512 1d4fde9ba6306dd994e51be814eb978f04b993844f0956245abad9c935f9ec2f4b6abd6c4503b0859a3f03b40eccee03384b1669f8ef6f532a8e7d7c1a694392
+EBUILD qtspeech-5.11.3.ebuild 473 BLAKE2B c9853f6f33d29449a864cc183a7aaa51c48b72062cb44331460b1b602ec2df616794dca0bb2d32ad2e014241d9c54178c936b665e1d168e9e597254b696d3d2b SHA512 ee7813a376d775866fabb6cad08bd9f2c179f596f95bda3e671b6c62b6eb02e5efa3f5d76fc729f86a9f17deec0461375b0f8ac429c574d354faebeb89261394
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.11.3.ebuild b/dev-qt/qtspeech/qtspeech-5.11.3.ebuild
index 690b4281a2a8..0047b2bd351b 100644
--- a/dev-qt/qtspeech/qtspeech-5.11.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index d60540a4a9a8..d69697d4ebf8 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtsql-5.11.1-r1.ebuild 1504 BLAKE2B 3c202a8d83c7cca11a939e91b11dd906004a0267e8c29b0a04f118912b67001a3e35f78c246b467df2417225995bfa8b954faf6174554cd77bef4cbf8854611a SHA512 580bc985a9bc13b9d7cdf4ce2de19c6db967e1aef2e00e0066c791a7bfc6338c843a472bf7c906f9473530e79b0ff0bd97ad1f443b928d0186c28308560cdeee
-EBUILD qtsql-5.11.3.ebuild 1508 BLAKE2B 4190f03f7b604221262e4bb0ded1a7afc3059305acf7c9c7b1560ce7448d870c0f9dc62358e98df69478ff861569d1605ce9906e1adf6ba524d61f474454da2d SHA512 c58b32fd78e9837d632bfe499f43bfd876e83634d0d9a5911a54ba0a71f148a6f835d680d5055889de4a44f108d979443d8a9ce9b7e6176467bb83ed6fad7da7
+EBUILD qtsql-5.11.3.ebuild 1505 BLAKE2B 10ee353e0422eec86a407388ac09d037bf5cb00fa35b21cada2f9aaf785cd2ced1904157952e0516e41b665bf66c3890ac768240c2d8946ba0ec01e4a0eb0788 SHA512 b3e41f361a0aa307a9916b988e673782ac6101627c784981fd61e612fccfa738c84f4d0403abc4663dc7a51c9c204e0adb4d8cdf871eb08d97e6b96d10abe9e5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.11.3.ebuild b/dev-qt/qtsql/qtsql-5.11.3.ebuild
index 09b2d08531db..666f6b31816d 100644
--- a/dev-qt/qtsql/qtsql-5.11.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index f6c6978aa805..60b6af78d840 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,5 @@
 DIST qtsvg-everywhere-src-5.11.1.tar.xz 1843216 BLAKE2B 8e5e94e706872f65189a51f0ea19a69d409de4d60c8cedd376e8e5efe74513370cc0add47d7d158ee386ce96455af27bef6ac3e29efdfc392d00dc7f5e3e7221 SHA512 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39
 DIST qtsvg-everywhere-src-5.11.3.tar.xz 1845004 BLAKE2B 2e091a4803fca45923df3ce61890e9dffe4b90c4118c7bf95263698f8c5f9d6260c350c3ec40d53de0fbd4e7dc7b742fda6f6693b338d446326bd740c43573ad SHA512 1ad20b3b59e6802f960fc95421b7f4d67460fae91219316bbced0ae225ab5d0066322a49cceaa7a86a981e9e56741724bbe323ac76d3478fc1f5d0d04fdb9722
 EBUILD qtsvg-5.11.1.ebuild 471 BLAKE2B 9c70ec4988e8e64134486844a39b46480d3ef4f75f1aa3867e1bc7d373243970afa9ba74e6cab19cb6c0d35bfb751af30a83933fead7b60feb88ca812329c501 SHA512 3a97938d47438a3dbd58c01414126662370e8d0856c30cf32e48ec279695afaf7aae8aa29ba278725c5a8e8f820665dd7185ca9389ce6cd1d9041be50163b357
-EBUILD qtsvg-5.11.3.ebuild 475 BLAKE2B b34bc24dae3d91410b8ffbea1ccdc7d88aea2791a622705882514566984a9e6772ac4c5ace1fe7aae13c881d22b0caf81bff1807cdccac597fb6c0c2260ff0e2 SHA512 480196ea541a23a3791637c021d1982009d1d329ce14acf7ba7ac1c4b84eaee3516748b62b652c50fad0ea9aedabce66a8aa58c394b557d47da424f70a6a7096
+EBUILD qtsvg-5.11.3.ebuild 472 BLAKE2B e9cc423a53df9570009b6f111767a09ebace20ebaa10ee98268ff7a13dd83abc65c1680d69e47f1931d826cf203195b3112525ca0a95e7a5d080601384b873ec SHA512 1f3cf90d7d9b1837652c8e48d4a2b36b5e9a38aeb086d5f4810b3c3d34b7773a11592a25a8587921f9ddf23801bb81cc6911d12da2a022733cc3fef05a0a37f8
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.11.3.ebuild b/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
index 69df6267c770..850a21d5d89f 100644
--- a/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 52bcacc799c8..563b11786ca0 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qttest-5.11.1.ebuild 549 BLAKE2B 01c80ef279cd93f1c03511d2f662cb9da1202272b536263c2e05bf1565e241831697897100d39946b8f67963e525e6d4fb0798c8b435c9c323106f6a035c0ef9 SHA512 9253c373ce486df63732f1a1437fbd65581f41cdd181f8471abc17a4bfa9b3a114c39ad7c12fe74840654ea5300bbfd2299b4215ce209d399d63e6e2890564ff
-EBUILD qttest-5.11.3.ebuild 553 BLAKE2B a01fc5af90ccc8489d58a08e8033fbf6498ffb1aa06b0cedfa2766de13f866850167158d3a02b2dc0e2958e80f901333c36cc66d13d5ae33b0c8ed6214644960 SHA512 776cba34039c9b13bfaf313876249e7fa50d9bfc9e01dec22d729830c7c37092079ddb990ae1b2abf15f14433e4bb232b4fab96f0152175eecb04f1a9459ade5
+EBUILD qttest-5.11.3.ebuild 550 BLAKE2B 290f550f75c31ee8ffbeb2284616be230828ccd5413c8ffe93a6b738da69962364a8ce02adbba69b1b59f83c7dd6d301a70156c675dff321a584923b6fc0020b SHA512 4c6aa61fb61d815b5bd741b4d75ced066b3158a3fb3d16f5dcf6766f58903efcf6a30f5511028289224dfb051dbf3d900f0340ad2fd81b26230f091d3f25a3e7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.11.3.ebuild b/dev-qt/qttest/qttest-5.11.3.ebuild
index 320e8ceede8d..e552027c5d04 100644
--- a/dev-qt/qttest/qttest-5.11.3.ebuild
+++ b/dev-qt/qttest/qttest-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 71326f8a9cad..3983d6379766 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,5 @@
 DIST qttranslations-everywhere-src-5.11.1.tar.xz 1428808 BLAKE2B 55a8813a471ab14f885f95df6a2205c50424c8892d060f3dfb4123d281e55a1a8f0829ad3b8f1b713bac11a1160fc22a977269bcaae877b80c985c4b2c9232ff SHA512 b817b7be585413e352271204e88730c873e0701f65dbba9f5b331f0c3e0ddc1bd2446f038991bf9eabdd79ba440ea0172d0342b5b0d8b1593d9f55ad2a0ebcc0
 DIST qttranslations-everywhere-src-5.11.3.tar.xz 1424160 BLAKE2B a6ee17064d4fe8d3611e04883cbcc9d69bcf872ca4144605da20d6787c051606afdaac771716bb55f1a970dd8468b8e2aa0602d926d8757b2f9faa58db3f6f61 SHA512 eced9516f3e0ecfd11ddd99b7b0f80c47014110af1c43008c764971929405ee7f5194c3390fe07bc4be9a9ead04e7c06c62584475dbe93c96118eaa16cd542a0
 EBUILD qttranslations-5.11.1.ebuild 372 BLAKE2B cd9c27d53b422e2134f05ebcabf006bfe808ad9c3b1673e0594f689cf2af1f4684e10a775ea3689a78886c40070c0eadcb22ca6d52534e85e3d68fa38b4b5d08 SHA512 2d5cb83a699ca0eea504db8097ba274abe6e3f0252a800bab3e9a3a37175071fea0719ede79167ac8603bf60e64742bdee95bc36c970527afa5095310f8b55f0
-EBUILD qttranslations-5.11.3.ebuild 383 BLAKE2B bc1d6fc91611d3c2bcbdcc68b95b20188638b405414392e99b4d265b7fb148a8f599bc6803e635fc33a5674111ee584a4e1bb42a256c003c9bbadbb8c520946c SHA512 51a970036f4bdf74e6f05b62da5d494514f7f2206646a336202db1c8404a07127b64afef9a7cfae3073baed3b38b165573a250605805f773217d6e046e6396fe
+EBUILD qttranslations-5.11.3.ebuild 380 BLAKE2B 98a1486b103c38606d63b90c3a07d7b27b756fac99fa17a95711f306349bf37fa58fa7a7872f482218dd5e696bd4a6b6436d1897ce08719d9a0024a943181bd3 SHA512 c31d5956536aadf3e691f59e568f72c5dc0a31418d3c3dbda40827890d99c182c8dbe6aa5a17ee69c0c4fa80b30dafdd9a99aea21ba04941985c61236debe1e8
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.11.3.ebuild b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
index 94155ba10dfe..ea82948c511b 100644
--- a/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index f09b4ac812db..796e30c1d1b8 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,5 @@
 DIST qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz 10648700 BLAKE2B 32ee4cff4951347d8cc6ca9bf34a983017520acd5692322e3409db27fa08aeef2784302eb326b95bb55ea9f23a113f20370bd2d2fc64496919205eb6d9511c13 SHA512 e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0
 DIST qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz 10698520 BLAKE2B bf4800c07e1f0f1649f81d21192bde613b20b54fd80b4d49136e7cc052f7f60d410f3014c3066e3f5c83b6a6d838f50f73a78bcd1a8df5e3d5e24fdb5875280e SHA512 cd3ce039382efca26842b8a413995d8b6bc26184e6161e8c3cad9ed326381a3f6d29798a9a42a52875886a23aa6a74bf831d70a62a7d12f852b640dd6854d2e3
 EBUILD qtvirtualkeyboard-5.11.1.ebuild 950 BLAKE2B 1f76495c7a076aba6c712baa9fc8767b76c296a9e348f624aa1143fbf24578ae0f97898ec21ccbce16f6c12297ba4e8b3bb75d770bbb383d40c8a7fb64be7c51 SHA512 5e91cabab67c114e797e6a34fbe61579a3dfe5ced0a00034b82c15ef1c70075125e4e4aeef874edeb1aad02493924c9f232765ab9aaa0f346bf404f2d30e6923
-EBUILD qtvirtualkeyboard-5.11.3.ebuild 952 BLAKE2B 9795f871c66f3668e75cf02fe68ec3ac5589467c79fc723dfdb984a75f50fcbe883f291d55de7bc7a5fb81e573972fa256f1e9094299c4789434d20adab815de SHA512 3865b0c516d9359ac9b998b514c73876fa220aa7d49c3a76b2e6bd0df7cead97e2c126f3d4cf1b4241fd6ca41c214ad5c6b988381965c134bbd8c2855f8daf66
+EBUILD qtvirtualkeyboard-5.11.3.ebuild 950 BLAKE2B ca0f8b17d29994560b0e1064447710a752028b6ceec0192ca41a1f0e4c5d9564ac46638810c9d87ea3419c7f38cf20be78ae6909e3436d35694c5420271507d6 SHA512 d13ab77891f16720e9db29554b85092e8dc94851ce12d71d9caf34d97ab0bf8b14e52c38a843fb548c1dabbaaec9639eff5f9a582155bac7a3f3cc678ed0d21a
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild
index abf6c549bd0f..d510b54c8510 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index c37c15c20405..9a2d56ded07a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,5 @@
 DIST qtwayland-everywhere-src-5.11.1.tar.xz 392200 BLAKE2B 2e65c6bd8c9ea44ae84f608312db6983d540382bfb2a22412fe054f4e7253d70e21f4d0577653b246de5b0266271e40911a7c79fc28b266cc29ff30669df280e SHA512 dc1327ef8cdc9ed9521e9db316da0bcdbe9639b714a2dda7a792c52ba5897ddb75deba1ab89e010bc05cc2a96ede781b9990f5449ce4a2f85e15466a4d6d82ad
 DIST qtwayland-everywhere-src-5.11.3.tar.xz 391124 BLAKE2B 2bc90c7a6f6769bcae7e52072d71f38ad984cc931767613e7972373131c9d58c145e9882c29163190257f07a205bdda63f78833859d2be6d6478126c301b70a1 SHA512 e442a13c61a508d6021fb15a0917b7861faf139fb7dca41ac1a3967f4b8dc82da5095029e4c6120464bd36ecf559547fe2f42935d9980f19298f5875cfb5e62e
 EBUILD qtwayland-5.11.1.ebuild 900 BLAKE2B 81edc7e804f70e0ab5b126d4128e7796794ba303802414c72c35bdc36e0489c9136294c1b4d4874c597f8bd387f84d4d16f0a109a9ee4449ea398086e16b2d11 SHA512 225ccb256c0df03fe9e17ecc5091ba4fa9435f09df0d57e6dd3da8a7d27c69f7b2eb39a84410a2d0d3a12524165412456e823184b8f65dca460e1c4d2dcb79d8
-EBUILD qtwayland-5.11.3.ebuild 904 BLAKE2B 71131a4e76fca477c65bba332aefaa6d95ce749b4134cd593d34ae715898b223e56aed820239a8f32d41eccafb70ddb0191519c1c074db83fba359282de61634 SHA512 1f0127f61fdf8dec0256c0b05b5383db0715ee459a60262d2e91ac40843a869b5f5563a53ed1198e7da5423b638cbc8737b53bc0820806eac23b1cd7444765ae
+EBUILD qtwayland-5.11.3.ebuild 901 BLAKE2B c9ec2030cfd5ff2c7885870cedf30fbc809cd615370127a6bb18bd72d4b51c6fe6c39131b9cedc5c5f2ff698e61680c657731129e94fd061fec4a2f0f01d70e8 SHA512 cef9477b7940a2c40885f57ed3d5fd7a77cd1d187d44a0956c845d720afdbfd300dc2d7f28993d7160da3c30786153da17f01d6f722d5def3bfd9c0f9e81d081
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.11.3.ebuild b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
index 1379e01ee01b..b750c12f0af6 100644
--- a/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 72f78c00a79e..d29f26976aa8 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,5 @@
 DIST qtwebchannel-everywhere-src-5.11.1.tar.xz 179700 BLAKE2B 05f945110ec743aee4357ee696bee4ac230489c816b8cc630c6cd1344b5c385412470e2d4c6c7ddb2f044a17e2fce70f62d4244accac0e394a97a8ce638f3c72 SHA512 e0a18919cc4fe858eb1a623fc4e79c2936b4ea390d23611a708dd8fc26aac4ecbc262a5b0194f0a4df1fbe69c53568a62183e5847e0bf4c73cbce2122170e0a9
 DIST qtwebchannel-everywhere-src-5.11.3.tar.xz 177328 BLAKE2B a3ea3c535e466629e5bf2f864967b5878e4e092d614ce05984af81ce979c5866e225d30399a0eb81f9b4b0d44c88646b1b6de2f1be524b5af5b61e995ba780ad SHA512 560d79ba00bebfd5afc238ff486ad1691eea8a1702f565cd838b07419f6fcd1f028ab5b204b32fff6a3c40c3dd13d89e3cce205076a074eebe7b1c111c669d2c
 EBUILD qtwebchannel-5.11.1.ebuild 566 BLAKE2B a9eb2f03320b17f01819381621511d7b55ae390ca174d47b06a0d1f9b3a75de34779c2c64128e19267e5c41419e5381bc9716b833dcf76d6987528d47b52f19e SHA512 a9802c600918271d0cb380109eaa3375fdc68d57ff234850226f61e2183e2169195de9007eaba2cbe622c130fcf92b716ff66c9c4681b1ac5c0d022ae7d574b5
-EBUILD qtwebchannel-5.11.3.ebuild 569 BLAKE2B 88348471bb15e24e17aa03085db485fcef9c55e434d1e36a49948761885fdb7d30ca319bbb5c681dacde1dbb510e39d908da40c00b419abd4a006dc5b1682e17 SHA512 c2847d58ab9a0219c8a5fefbcbb0577ef36ff4c3438a6a64f6c5943fcf4b16a2b28fe2dbbb5930f586ffcdf3b6ced29655149a962451f326fc69174c05e11304
+EBUILD qtwebchannel-5.11.3.ebuild 566 BLAKE2B c7c779aecf92cfa4dc6f1daebea899a2da5595d5bd06e18dfa5100969f32521598a251efb851a725513f79660cec7e69137280335e7672c519231ba5579b374b SHA512 dd8af79dfdcd8489c82f9245b5fd86d9a13db732c9eefc5de5f0a7564c338d16cbd509caa32d04669ebc73bee829c339d36149be3e01168ce6e1da6f028c68a9
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild
index d08439f261fa..a8058df12d97 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 37ce0c000b27..132dc4b05602 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -8,5 +8,5 @@ AUX qtwebengine-5.9.6-gcc8.patch 1184 BLAKE2B aea72fb7563517f6c1f0f1330bad21ae71
 DIST qtwebengine-everywhere-src-5.11.1.tar.xz 233633572 BLAKE2B 06fb9d490377ebb4af937e0fa1688cdfeb9bfdadf6c80afeef609d20a76bdb7c4fed6c1042405b762e59b11d7b16369990c66a395ec1b6b48bbb1ea5b8cd47f2 SHA512 3e17f88b690c06f6d28c30d8d43588eaad9b0b214434b219c3d8fe11969cca515a68c731d176cf640940fd3db12e95de8f723d3717555504c5b95d135fa4a596
 DIST qtwebengine-everywhere-src-5.11.3.tar.xz 233678844 BLAKE2B 451a2f8361b158835f7f565aea9e7e372ea5670f56a5eef918d0340857e1b336d7147c5f87417a21ea225c248cfda8248869c2023b2e359aa9216ec472dea4b9 SHA512 323179244187b075836101eec15fc96569e31dee7ca0b28d51833cf02a55439ca0ab8e3e14acf970eb0258e1f5187b6b33fc1a35bf9056e4941a2b20be9b0431
 EBUILD qtwebengine-5.11.1.ebuild 3535 BLAKE2B e806536baec3071808ff3c0a7f5f0d7f287b1c4489bd51f76fdc5d3eb5951c047199660c5daddec7f75dee50f1d7fdfbe2e6e6859d89979e1b28c8bdb79ad686 SHA512 9fb74dedea97963bd8363c6861e92395c0a4d9152dfe1ef26f8df7ad9e55ae4c6f60858c52fc6a9df90a3c96460230fbda099fd22dbb6c2eef7899963e7c1daa
-EBUILD qtwebengine-5.11.3.ebuild 3546 BLAKE2B 792ebcd946de8cae3fabfcd191f4281887bfc93237cbc5aff4ceacadf69427ef2dabb099ccd4c4dc66c0349925a4d1f896eec88c3e0ce09117f1fc423d0b61e3 SHA512 e2706cc7a24bea4d883dd67a9022a603916fa8a7dd039fb694414b59446029d52f1fd9318f277a5ed01631826e8847490f6e9213066bd19f7ac32f1099b55bc3
+EBUILD qtwebengine-5.11.3.ebuild 3544 BLAKE2B 382c76fc2a7b2f43be68049375e4fd5683033991396469450a2863fa83bd7622645cd68fbfbe014dd06d68898936867d71321899afabfee713303e098ec41e8d SHA512 9b8b726e68eb159c1d9a460595a9234d0c172a6e3d0fcd8421edb9c8f1b57ebff310a07d6ba05dc3d3e039994daf57190de07e13c427d8ba22d7fd665aaaf618
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index ea4481da33d1..d61f504ee127 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 6708d4e48bff..1955f9c47f1b 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,5 @@
 DIST qtwebsockets-everywhere-src-5.11.1.tar.xz 231468 BLAKE2B d115bd37e1223fd1333515c7abdacb01a9d2e38c847eb3b655b584ec8ea833634549c74c0483bcca25a5807c650c250301b02bb6b7d05e61bdef44062d95831a SHA512 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc
 DIST qtwebsockets-everywhere-src-5.11.3.tar.xz 229368 BLAKE2B 4308395634f0cb2fed711e5c55cdf0b035f59704178297cdefbabbfc1c59fc4561e5603d44e637b445dabd83555ddd473f705d47fb25be7ad0e8f0aa21feab72 SHA512 8a1ddb2c9ee09018e8dacb5105e24863eb52a84d69ee9792e77c1c6a498634314b24bf3e946f682c23dfe045150898a1c1124bc08416f3560223459b8d1abbfb
 EBUILD qtwebsockets-5.11.1.ebuild 533 BLAKE2B f9bae734df7ec3d4fb2e7744f79300bb9e2a4788fdf3ede3913088061c889a62588051ddbca5c2da743afc41e513279822a69dec508ecdf26e60f7c6050cc775 SHA512 4ea488787b504677055bf75501af035286c9ddb27768d75677e4bd986e1532a7a6613396eafa1241e7ca021b7d751af1de20fab772679a671dd992bb2b1dc39f
-EBUILD qtwebsockets-5.11.3.ebuild 543 BLAKE2B fac202d2fce0176d645b7f7a2d3c30ed278b0ae0924ffe6f39f15b4a6a5d09afc236b226bdd8ae67e71703e4f13abde22b31f30d8e90cb67c2c2f1bfad3af502 SHA512 85e082df9e435fdd9cb56e2aed4f7d01c86e508e1c6a0359a9b2d99316a962b07495d1442610fb0403a493036a4bb9e154cc92f3ce2206583280b11cb047cf94
+EBUILD qtwebsockets-5.11.3.ebuild 540 BLAKE2B ee59b1e1a8a424c5c26515d77e40ef0b6da7c648c00d35c60820e17c0f3fab7202fbf8a4d827b4040aa14294b8b77559806acff89840f662ba087473a7bad6a7 SHA512 ba6e1e77835966fd2cb8f673d46fb7ad6e13a3d77c851a9ba57ccbeb6a340d3935fdf32cc4c8df04c95e7b760d1f3e141265bf233a311903eefd7d539bb1c89d
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild
index 5c34f7a37258..29590b631e19 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 4cbe0cc6ea0d..0840cddde8f1 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,5 +2,5 @@ AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 1e2277078f4c37102be7dfc2bb9a99263285730f1b18f4f57cd7d71558f47244a36f86ab5ba40084585f6f2f326a03f10ff3cb7a1535b6513e5538175b505797 SHA512 014c8736803cb064cd7e3840cf2b4f69b1f44ec85f166c3d7f3824bfc38beff471ef9f6e31887b7242dfb7534fa5fc71ef4982d00a6e867dd5f38ae257985796
-EBUILD qtwidgets-5.11.3.ebuild 1067 BLAKE2B 27b34b38540cfeaa4d2db254872cf17623a4eddf5a82f13eba0975a3ea60623f371628bb56da1b29e9a6a2732b1fdde2da35c5b1e9c05f04242b5fa028f609d6 SHA512 5f55a1d3bf881049845f6bc07031c691861714dff9d27ed985ea3e4ad55be5a1e6f1b433a3bfa42f35815fda22aa5d739ddadd3ee631dc1987799b165b75df45
+EBUILD qtwidgets-5.11.3.ebuild 1064 BLAKE2B 09024fcb7fccd3400844e55b7cd52bb5536ab4b46c66d6cc99f28f0f8db0d57e127f5e05fa0c484fd1738c0f8a8172ba381df2e2ac1f67d18fa36e13872aef56 SHA512 f181b872568a05979a0fe6d4bdfea1b8f3f808c707e5ef7b913f63572e9a5a9a2e007a8b730bfd80cd34b35e74317587534e7a886ddddb336315c1d12d6222a1
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
index 94499ea10ec4..ae7ab906d497 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 50035a7bb44e..07b2efd1f03e 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,5 @@
 DIST qtx11extras-everywhere-src-5.11.1.tar.xz 116368 BLAKE2B 49cc0cbc73719186d812b376b0ae02abf68bee2f22b03ca003761681af4585243c9388d13b3ce8a1257ced8b2a0db7b71188ef10925d123327606f2fad94b335 SHA512 a5acd182e06ced304bdb9d86982c3cdb826411ed4c888dfc530e5bf005f34ac9c58812bda3c98dde66eea372c7075f9eedd62a6e36cb8b549a56b8dc7a9b19af
 DIST qtx11extras-everywhere-src-5.11.3.tar.xz 109496 BLAKE2B b95f2d14207a0a87d6ef95de45908351ba2171bee696cb55a9fce334e5d1525c9af968591f03d9b2a40ca1088ee626f81e15b54ef2972da68ee4e22030e16bfa SHA512 8aeae9a567d6a50071c239796e7916b22235b6e51dc56ade7914be85db610bb51fb3cc8a7d863b72ae8c9385498afb8533d3933e780fc8c764ec91dcb3de04f8
 EBUILD qtx11extras-5.11.1.ebuild 445 BLAKE2B de13c5977287b972fad0a88b857b1e80175048d4f3b98a9d2f7f5b77880806f0d28886b6d7b9847c2f881fd79980216abd4d3dab98f9275945d27f43c88d0b68 SHA512 0a37b03f66dfc3d82a80d5be6b797f3689c26b87212772ea958e44b24ae630ea6bf39f1820adedb8e49076efffedf9b3c57901dc1fc5511371ccc18dacb3fb0c
-EBUILD qtx11extras-5.11.3.ebuild 449 BLAKE2B 5a97daf7b680d785d0bf9c868c8c244072e70a75ab283cfa2e8f0d3dc2c904d7b4bd47a5db6b5431f629dbb4ec51b4a1f098c3ca51d4fd3aff9edbecde75a399 SHA512 af62d5a9d555095caeac03a839c47f47276f53da9105b40419c5d75c7c5ac2e6e1fafac172bdb59c0bad431e3fec8bd1e4031347fa33cd85f37d350ed58730e1
+EBUILD qtx11extras-5.11.3.ebuild 446 BLAKE2B b8e712b4a7d260b2b0a39b41997a20b931a2db9a671c7da7a3dcc6dd1554eaa01209335a3224afa0497261b46c92fed0bea2d0187ae611298708c785e15749d1 SHA512 02b3bfec7e6c60213b6684efc6c93eb0159c99020687e10fc7bb8476063b7745d973a574c7b9f43e998d204a7523bc303a7cee5a637658e35fc1bf32bd2cdd5d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
index bd545d306b29..0a69183fe631 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index ee8990076401..6dec8e34865d 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,5 @@
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.3.tar.xz 46997676 BLAKE2B a70089be5530dec0eedcd5ba990140b375261dea5c85ea7d1dbb5b0bd09ee23edbb4917851127686b5f3cac6969a284eb91ab075ebe53326e69e99e81b257da0 SHA512 93865e41c994211456a575b085c2e7491b7975a1c3b4deb48e9616b51104eb990c1fcfd53d5fb2146ba22457cb134e6254e9077ba73c8b4c4b4d1d525e66fb65
 EBUILD qtxml-5.11.1.ebuild 504 BLAKE2B 3f430e3ff500f3e9571be91ce742ffafedc5a1bae783e6a89ed47d9eca4dccbe27c20c94c5c03fd9ad5f93dc28f878d577c7c0d27518a6d62cc136324c201cbb SHA512 0c7bc6d04ca187973b15a0e49dfda308f7b7f57aa56c1048c6812c7e6dc930f55d350a73f910db264f2d4a765b99c270de031bd2ef5c507cb6e022369ca9eb24
-EBUILD qtxml-5.11.3.ebuild 508 BLAKE2B 6a98b92f5c929641f1c86646c13e283dd676653cd66bb7d01444bd9b3f46e2e87870827707c2ad500a65b6f406f59004b356068aec4878b731f781ded0b8c225 SHA512 615135d1fb97e190294c9fb8dc312cb73b2cc7002d2ed8e2dee0a32a1f2df0071f1df4c658932780f727dde4a3b23ffa09159eb982509cdc72cb6c465390b40a
+EBUILD qtxml-5.11.3.ebuild 505 BLAKE2B 9a72e044e58fd627fab4309b8078783d78c9db056197d94e593fed1584f1e70910b8bb0e84b3b8104f1c4c924c93ce5a437cdd28c77f115b79eadd62af9f49b1 SHA512 403e452993062d084ea772e3533e3627e7f615aadc8644cb3105022dd1a7f84bb8fcbcc9dc49ab2b50ba469c331ab55e9206e2a76cf4d69fb17dd5683baf3d12
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.11.3.ebuild b/dev-qt/qtxml/qtxml-5.11.3.ebuild
index 409b8fee4ece..26ba50d539d8 100644
--- a/dev-qt/qtxml/qtxml-5.11.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 0636d0d9478c..7fc36c2c4db5 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,5 @@
 DIST qtxmlpatterns-everywhere-src-5.11.1.tar.xz 1378340 BLAKE2B 53675d44da768d322bd6ba8de30d4ad00f370c79aa871e1a80184df4cc9ce8d45c13f6fb3a808660a42a44c034b14929fa7dbac52878642057a49a4a778d20c9 SHA512 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066
 DIST qtxmlpatterns-everywhere-src-5.11.3.tar.xz 1373016 BLAKE2B 6ab881ca138aa5f65aab09ff499181758c1702cd1f3dc1232f12efb756f5efd9a68dec5bce5fc812dde9d4818d0129694a26e364b2d84d9ac6fa5bbc4d089bc7 SHA512 a7a8dcd1ef0bae811f3efbbbf6bb5705b3e75c468106cf7532dde86740240cb3f1f55142706abc1ba309dfdab5edf3dcb12923f75e26c8dd43ffee22bfb73cb2
 EBUILD qtxmlpatterns-5.11.1.ebuild 427 BLAKE2B 3ce80672dcf091f381b9f6ef7e35c8121b6d076f7364a9b58120582be4ae9ccb18ee825f0b89d0f2c8138af1b96ff3283d39d18025a6f40248c15109e5ec7ea3 SHA512 0f3c4e67dad213cea731a920e72b24180386b6da34a20b7384960171226844c8c213a6ff1d6006a9aa32b90e3f17f52a5c4ece4457b9afbe7e9d0b1603a90e67
-EBUILD qtxmlpatterns-5.11.3.ebuild 431 BLAKE2B 46e600148b8fed6de9ae51db40c78b125ccfe6f2b9e286157f44eacb741a96ca1e8c2667f321e9fdef1132e98748b4a0756f7a84dbcbbad08d07fe7a9e72efc2 SHA512 5893a02063dff70b1b0ce327e6bc91108c7024aa67fb45e58fd21e8c12f9bd9a757aa09dd268b71916f3934e635de7b5bf602a847232141b16529af8ee573ab4
+EBUILD qtxmlpatterns-5.11.3.ebuild 428 BLAKE2B c4596c1c7a3b549fa362819352df29f11cc864d7c6874b1886c938f372704bcd562c4cf28e1d91f5de25e201c878439301c89be76a4c419377b3d38427ffa41d SHA512 4ea77ed2f23ec3e8fd03c5905baffe4dfc613563c7f0e60fe9bf3de5405601c71256427d60e8ab66f3ab98d622ef2c7dea08514445dfb68fedfaa22455354e02
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
index cdc8ca0fcc4b..bde30b1851d8 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 19769edab67f..6065e084660a 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index ba6e68791abe..df0f4f9190ee 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,6 +1,8 @@
 DIST dynamic_reconfigure-1.5.48.tar.gz 38764 BLAKE2B 740500b05274c1ebe8423f3061f73fa54bec422b96598d3867b49b5b6d7d3f9d68172d796b49ee4a1b6d6f0c411d3ddd0b9b664cc8fdcef22bd9700f6dfb5111 SHA512 f4bdc00b580c56feaf3e076540d669923e1330c862fef3518774f43c57212dcbf28bb848f61e7196294d4e7439b4d06c33351aa8d133b71042b739ac59e105a6
 DIST dynamic_reconfigure-1.5.49.tar.gz 38883 BLAKE2B 499fc907c6015941caf151dd8b8f84ff90b1a9abb08d499be00ce4281957045cd50900eecc79be21c77dede125f2e5c03c2bbd7ebae0dc4b62637923dea0e0aa SHA512 c8cba24424142333df4d66c013915526573c791a4ef97e51baffe8040293dce67d313c57036807c308fe4ca17af92f277e467cde6494f166f6e4ec4aa34050cf
+DIST dynamic_reconfigure-1.6.0.tar.gz 40026 BLAKE2B f08be83ac741b70af7b516623afaca494cf22d9d90e568e7f63599709ef48402dc17adfa25678f5c8388d3cbb85d1532a445f1f624946ea9590d92ee842de907 SHA512 3a43780af28597d5761264b09b26a9c82fefcdc33d9b08ad46a6b0ddeb23bd06d0ab6436bfbc546a8c626eff21fddac453e42eec7369b22e19f2f9c9178b0d4b
 EBUILD dynamic_reconfigure-1.5.48.ebuild 574 BLAKE2B b980c9a1eaec8427203b150628f390c37f3791ebefd356c0468d8f2c8780b428019f2bf333c90a6a15dea133f28e944f1eb8450085b0e6d743a9327e15e2036e SHA512 234041e10b2dcc1ce0bfa6785cb200e5f480102382b04bd361c7ac565b197328c86a009ba19243699841309978301821a30153b1a0dffce6a2520fc9bcaa7238
 EBUILD dynamic_reconfigure-1.5.49.ebuild 574 BLAKE2B b980c9a1eaec8427203b150628f390c37f3791ebefd356c0468d8f2c8780b428019f2bf333c90a6a15dea133f28e944f1eb8450085b0e6d743a9327e15e2036e SHA512 234041e10b2dcc1ce0bfa6785cb200e5f480102382b04bd361c7ac565b197328c86a009ba19243699841309978301821a30153b1a0dffce6a2520fc9bcaa7238
+EBUILD dynamic_reconfigure-1.6.0.ebuild 571 BLAKE2B 5b0aaf364c71459a09872a749136b3db0a7aba58252c18ca6316b7c6c5841d10fec09012e087c7027b024325f8b423ede26081432844a97109e7f0ab7b2bdf07 SHA512 16f94828a49599d595c9ca6e1a06a7c3bedc4ff53e185240a25e81a3d1ad8fb601d8820c667f09775e7bdc27dbf91481b339d5b672feb3ff1b7940a68294c817
 EBUILD dynamic_reconfigure-9999.ebuild 574 BLAKE2B b980c9a1eaec8427203b150628f390c37f3791ebefd356c0468d8f2c8780b428019f2bf333c90a6a15dea133f28e944f1eb8450085b0e6d743a9327e15e2036e SHA512 234041e10b2dcc1ce0bfa6785cb200e5f480102382b04bd361c7ac565b197328c86a009ba19243699841309978301821a30153b1a0dffce6a2520fc9bcaa7238
 MISC metadata.xml 337 BLAKE2B c2b63166315cf868635f9abe7b49158c32f30d031cfd454ef9ebfb16fe7fc96c00cecc77c59bb3f91d4f07c77783bb2e1750d24f87da0507106355401ffe069b SHA512 19705df6cde1a0ae66f58cccc95a96e26302960f7e055a8c2b5fc15f0d995b2adaf0ac61c87470f7562e2ad03012845fd3abac6b4a081c1d6e01e9b91d53e561
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
new file mode 100644
index 000000000000..a6bb2ae12003
--- /dev/null
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/ivcon/Manifest b/dev-ros/ivcon/Manifest
index 9aa349c31932..ef8589f78f43 100644
--- a/dev-ros/ivcon/Manifest
+++ b/dev-ros/ivcon/Manifest
@@ -1,6 +1,8 @@
 DIST ivcon-0.1.5.tar.gz 137970 BLAKE2B b99fcb17cbc6ba4bb4d076156dbb3dc5e2869b92dd919ec8ae1eec83bf55e58ec8d460c9cd2833f9648d57c9e4476b53658c0cd224d34d3cf794b241e1054c9d SHA512 943f1eecf06e90300ecc0c33f91b076a22adc04ec04414d8deb213fee69b2cf13f41844d4ded7a0befabac15bf51352b61c667fb3fad8478784d0825c7e1a268
 DIST ivcon-0.1.6.tar.gz 137996 BLAKE2B 36d0d785d833263642bf307467cddb7ba224b9ea3e118c345c5d77ced6f2e3af86111203f87cfce7d8f0d767cc47dbdc88fbecd4b1d6dd8646cee576c209e2f6 SHA512 ecfae9eb69f62a70131281e8b1b485a5e95e166b5b24d3c313c220f10e746db15a644a6747debcde5b983f2c743ca8d5b3f8bcd2ef963290f8122bbb66e23aea
+DIST ivcon-0.1.7.tar.gz 139018 BLAKE2B 780a0438bf9d9c14714e91639e8c24624d4a3d7dfc0f4ea8ebfea0d42a4e75cce9559642afdc1cabc9b2fcddfac57fecdcbf350d1947d3ab9bbe93c19736d9d1 SHA512 d533c4ab3a708411283b7bd03e6aefb3337edbf50b15b6be56f1aa5df803a0406b52663eee154007eb8980dcff60794206865f62e1910e0239afbd0d328a7c18
 EBUILD ivcon-0.1.5.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
 EBUILD ivcon-0.1.6.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
+EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 8e30b7c03c139699c26f81b9a33da0307d5a38316b278be9bec2c61bc091ef928a09afecc0c9a6dbf0b3e4493573d9041e663a5df7761522f77eb621f7f6b204 SHA512 368f36dc19f8b6dc67ae13e3732b7b5b098c5174ac8f2854215395c90b5e9e1795031db71985931b9346fda9a18216f5cb7dc0155c6589a2a20816c691827763
 EBUILD ivcon-9999.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
 MISC metadata.xml 323 BLAKE2B faf34557869bd07626814c86cfbc6508b774aea2ef8cc89c70462c4bf7071159528a95778ec18131f001168f035fe2c20948612b6a0562573eeba4077aa81b0a SHA512 ace865326c08cdc06844cb56696bb5b3332a196816c9a29329b39adb3d4e864e527fda5729ee1386f44b24eed39f3e131e979dac3dd1370792fb4b6839154d64
diff --git a/dev-ros/ivcon/ivcon-0.1.7.ebuild b/dev-ros/ivcon/ivcon-0.1.7.ebuild
new file mode 100644
index 000000000000..2ae89be1b536
--- /dev/null
+++ b/dev-ros/ivcon/ivcon-0.1.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/ivcon"
+KEYWORDS="~amd64"
+
+inherit ros-catkin
+
+DESCRIPTION="Mesh Conversion Utility"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
index 2f33b30cdffc..ed2fbf5726ce 100644
--- a/dev-ros/laser_assembler/Manifest
+++ b/dev-ros/laser_assembler/Manifest
@@ -1,6 +1,8 @@
 DIST laser_assembler-1.7.4.tar.gz 22113 BLAKE2B b0b6c7252151fa06a22b55dc62a040b229eb3d55549233931b5d8947629aca91b611c282cfe03b032a4fe718c09c4ecf5a5fa92f1536773dc2b58f8d7e72cc60 SHA512 e6b5c529f3d3c62462da7c319d71ea6ce799af05c09118fddfde7aa0928bff9fdf3237527aa66f33b248be1c35a124d794b7a0ffea920b7e62855c12be91b8ba
 DIST laser_assembler-1.7.5.tar.gz 22140 BLAKE2B 0f9667ac1b2b902e10a36e0b468c7c5ff36b1db7435d70187f53d36ce14cedf261ea03fc61ba465c4dcb170ab2b4b546acdc1055e6045df8333e18886868130f SHA512 822b83ec8eb52c13fd8931108beb22c53c27cdaabce1668a18e7b40805b232575375161f10ebe489a6752d82e81b160070ef027a52f1883e2a558ebf22eb76be
+DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb
 EBUILD laser_assembler-1.7.4-r1.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
 EBUILD laser_assembler-1.7.5.ebuild 776 BLAKE2B d2e1adab41eacac6f3adcc8005a95d83271c9033738d0ced2def3e25526a8a756ce62ab4ad8049ef9b13d5218fb54b981af44d1c41be32cb6ec33c0b513b8963 SHA512 73e1eeaf600c1083b84c52cf57c250848298c5095e8e2774d8cd6ed67644a02c97580f269488aa6654ff5ed8d999a880e978fc0d8459fab2a36a846177fdf793
+EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
 EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
 MISC metadata.xml 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
new file mode 100644
index 000000000000..903bdb286b20
--- /dev/null
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-libs/boost:=
+	dev-ros/tf
+	dev-ros/laser_geometry[${PYTHON_USEDEP}]
+	dev-ros/pluginlib
+	dev-libs/tinyxml2:=
+	dev-libs/console_bridge:=
+	dev-ros/message_filters[${PYTHON_USEDEP}]
+	dev-ros/filters
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
+"
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 19f782058701..6eccb08b0f2c 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1,6 +1,8 @@
 DIST openni2_camera-0.3.0.tar.gz 36450 BLAKE2B 3b292a4012371d8020f945828a61dd6757eda0d4df51ad72eb3a7930142f6e9d5821c5c838296fdf8f291c0f4c9c878c1c5878ce2c731a2efc3ba2e47375bcd3 SHA512 0e5737e8ea06fb0c73b2a99905e472f6634f024f5a50de9b94761ae3ca9879cf47a029b1906d01b31cb8081b73292af871eff581aeddb56584951824edd0007c
 DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
+DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
 EBUILD openni2_camera-0.3.0-r1.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
 EBUILD openni2_camera-0.4.0.ebuild 679 BLAKE2B dc18fceea88e2f73fbf9eaaf3e9fbab14064d7004eb4dd3874c9262b48830c2c2ec635cfb26b9e3032b32838d6747451a6afafdb46b25cfea3799855d6e80992 SHA512 876b7948f602672931f8eeabd98cbe7527dbecd54761acdc8664e14ad10fdc7ce8b3a5c14ee7ddf38337082aa5c82945a7e09890650c1a1571d73123bc65ea06
+EBUILD openni2_camera-0.4.2.ebuild 676 BLAKE2B 8a299680aa6489137d149b708dd2a3e9227515e3928e9165e638ebfbe6312ae1dcfd64c64937eee45dfd1e7313dc3008a9b72aeee1e2f01dab4a776ff00bae4f SHA512 d6ffdfe0a8ef5809be0bbd6d1bebb31c64b6c438475a79e1157ec621d5930b3740f581e6c99e6728e80ba3cf6b69b53fddf3e3db5413db5f6394ee42324d4ea5
 EBUILD openni2_camera-9999.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
 MISC metadata.xml 340 BLAKE2B a66fd18f61874c90197221e853b05c28502cf38118807b51616c9feb0db670945ffe31bd325aa9092dc22c226f214ec2259276c7bc11ee731a694fa200cdfd03 SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064
diff --git a/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild b/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
new file mode 100644
index 000000000000..73dbd592b198
--- /dev/null
+++ b/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/camera_info_manager
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/OpenNI2
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 9d8631eb1da9..18b57fd39b2d 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,4 +1,6 @@
 DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
+DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
 EBUILD openni2_launch-0.4.0.ebuild 502 BLAKE2B 1697ab43d42574d640ee7e11fc322b23a59cea09744cf3bfa9abdbf5d754789a589c5a7a7ac8434d4d11ed8a2b25f3332fac670d3386447d22347d6c43dfa394 SHA512 8eaca9a985a54e894ca848861f21cf119d17d08b13d43b152a7da009415c30d6b783057ed45c7f0b628d4b46944ad2287a1980635188b609113c02e990f6cc33
-EBUILD openni2_launch-9999.ebuild 502 BLAKE2B ea3dac5e1ca80f0d15d967e65fc3491f202f7b48a5404093a6f77fdf0f4021deef9fd8b86eca02d80ff6840258f0b3f4cb14eae36ff434dfe90cac9a8b86bb6e SHA512 10b613a07459d95b8709e4a9ca60649784f6bd428542fbd279ce338b1abb58579923b1c049eb7d0fe6ef68333a982dfeb1d400a20b503ae6aa48071eecc90007
+EBUILD openni2_launch-0.4.2.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
+EBUILD openni2_launch-9999.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
 MISC metadata.xml 340 BLAKE2B 666c2530cabfb6d86f6fb1e45072133c9a3826254a42b7713ca3b0506b09adb38be616e281a8e19fab3f6540133a9eee6c9605accbc7b7444715faf38e199b97 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa
diff --git a/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
new file mode 100644
index 000000000000..491eb3e16541
--- /dev/null
+++ b/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+	dev-ros/roslaunch
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	sys-apps/usbutils"
diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
index 938586d80cc3..491eb3e16541 100644
--- a/dev-ros/openni2_launch/openni2_launch-9999.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,5 +20,8 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-ros/openni2_camera
 	dev-ros/tf
+	dev-ros/roslaunch
 "
 DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	sys-apps/usbutils"
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index fa64ddc08a68..7de5c949560f 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,6 +1,6 @@
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
 EBUILD rosbag_storage-1.14.2-r1.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
-EBUILD rosbag_storage-1.14.3-r1.ebuild 615 BLAKE2B 1be29c1c1dd330e9787f9cf3f4d78b9d6a9fc549d78146ce47db6a56ad8c5511697fb5153d82cff515de73598f3bdd99182f7ac33853f86cf183958196508912 SHA512 a7b610b29d049cb17df75ec504282fc8e69efff8ae4df26ec68ae63d53c4925a9f09f7270253fd275ce516ec15a6c675c65a9c084948a74bc50b50d9074fd22a
-EBUILD rosbag_storage-9999.ebuild 615 BLAKE2B 1be29c1c1dd330e9787f9cf3f4d78b9d6a9fc549d78146ce47db6a56ad8c5511697fb5153d82cff515de73598f3bdd99182f7ac33853f86cf183958196508912 SHA512 a7b610b29d049cb17df75ec504282fc8e69efff8ae4df26ec68ae63d53c4925a9f09f7270253fd275ce516ec15a6c675c65a9c084948a74bc50b50d9074fd22a
+EBUILD rosbag_storage-1.14.3-r2.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
+EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r1.ebuild
deleted file mode 100644
index 8cd7afb67508..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	app-crypt/gpgme
-	dev-ros/pluginlib
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-	dev-libs/console_bridge:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
new file mode 100644
index 000000000000..d2265060d274
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.14.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+	app-crypt/gpgme
+	dev-ros/pluginlib
+	dev-ros/cpp_common
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
index 8cd7afb67508..d2265060d274 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,5 +27,8 @@ RDEPEND="
 	app-arch/bzip2
 	dev-libs/console_bridge:=
 	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index 1b27df3fb126..34e451b49802 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -1,6 +1,6 @@
-DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST rosconsole-1.13.7.tar.gz 24202 BLAKE2B bee6d4a9a682fe045a233989373e8a283c26d85bd4d746c2363798cd61f168e368afef81872437363b55a44080e6c926b4f3fd9c66fa9e2bf078454a675336ea SHA512 e0e17641011de5a3b58ddc7ac984042463f375f76174ff6bfa8a6c95d7889e33e702156f7ec0d7628f9f37a1d062f0291367ee81025dd9989320d5d24c35b387
-EBUILD rosconsole-1.13.6.ebuild 789 BLAKE2B f7e1468717fd6c8cf1829fcdc53838807478f0a3c3d3dcbd465e6d73aadb31aa5c48d7137cb29cdf2b6b91d8194a6ffab1c3fef094547290ad4270e4a7c12425 SHA512 0979b156f8a4a0458064a0cf9c92d01603a455d4f56d863603bcb863ec7c81aea317dbc71c6cfb64b02e16d6369e3ca635ab20deeaaa924bc835a5915a129fa0
+DIST rosconsole-1.13.9.tar.gz 24798 BLAKE2B 1f6d86775affaaf889d51ae27673b3de826cf16a535867e90373d450d82d3e0ae8d1488fd2b4321462070bdf547f23d9ae464ebd2070c5a448e5b15548179d12 SHA512 cb2c47551c210f8d4b9d41f4b33a27599b5a22dff84344d0d564a5b9b2088cb2da8cc3afce97058a456c1dc4b7b8127fcaa8344f6110a40586d60f16278fd1ff
 EBUILD rosconsole-1.13.7.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
+EBUILD rosconsole-1.13.9.ebuild 765 BLAKE2B 3a862dbf876368500eafc18e965366c8fc17132d8549fd1af8f38c51e1034ec2c0d56cc01e9761800c995a93dba598d91ab76aaff7f1b17955034df1dbc4f8b7 SHA512 4c6ea3799ea92954adabae76ca629488d4284b17a114659f341287ee08e82f3a4144dc3ec892fb74afa1748ef598302c792d22d21ed92e7156da14b6835cd3b6
 EBUILD rosconsole-9999.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
 MISC metadata.xml 508 BLAKE2B 5641aa17bb1302f29cbbe3015007bcbff004d8681223ab9140296209f1ea7995340b3a21890dcaacb3f15020b3431660bf1124fdccc5697bd9222f6b7ebf2d76 SHA512 cc34b9588999d9e10ee8537f509b7ae72b100e477b9f545fad31043eabf0a9f27913b608e4d198ca4b99d5fc1643332fe28ea065181fb3a195472a6726c272a2
diff --git a/dev-ros/rosconsole/rosconsole-1.13.6.ebuild b/dev-ros/rosconsole/rosconsole-1.13.6.ebuild
deleted file mode 100644
index 146fbb09651d..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
-	dev-ros/cpp_common
-	dev-ros/rostime
-	dev-ros/rosunit
-	dev-libs/boost:=[threads]
-	log4cxx? ( dev-libs/log4cxx )
-	!log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ROSCONSOLE_BACKEND=""
-	if use log4cxx; then
-		ROSCONSOLE_BACKEND="log4cxx"
-	elif use glog; then
-		ROSCONSOLE_BACKEND="glog"
-	else
-		ROSCONSOLE_BACKEND="print"
-	fi
-	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
-	ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.9.ebuild b/dev-ros/rosconsole/rosconsole-1.13.9.ebuild
new file mode 100644
index 000000000000..247659b7d3ab
--- /dev/null
+++ b/dev-ros/rosconsole/rosconsole-1.13.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/rosconsole"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS console output library"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+log4cxx glog"
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rostime
+	dev-ros/rosunit
+	dev-libs/boost:=[threads]
+	log4cxx? ( dev-libs/log4cxx )
+	!log4cxx? ( glog? ( dev-cpp/glog ) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local ROSCONSOLE_BACKEND=""
+	if use log4cxx; then
+		ROSCONSOLE_BACKEND="log4cxx"
+	elif use glog; then
+		ROSCONSOLE_BACKEND="glog"
+	else
+		ROSCONSOLE_BACKEND="print"
+	fi
+	local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index b93dd6531478..a8675b13f1cd 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,8 +1,6 @@
-DIST xacro-1.13.0.tar.gz 80831 BLAKE2B e7d522879998c0d98bd6a45c409949b93392fa6cc2593c9796d68ed51aef37f82a3b15346c3a15e72c7724564b722f3a5b944f7ded62e720b6ab8c54dc74721b SHA512 f2eaa6f6eb7249ce1da84660d9f10ff83002c69e3d8ead5c4bfcad194052e6a059fa6dfcc261e199bfcb686a9801e810db4923b137530ad7df9572faad34a9aa
-DIST xacro-1.13.1.tar.gz 81091 BLAKE2B 40c48e63f288285a786fc3d6f3624940d25ec1bf78d92c05a6a40efa0db1ee0b3b63533f912459dbb59540ed8c1d266ae07a4df6e837a04232de6fa83b5bc10b SHA512 04732f1e77bf37268fc3e43ea6f888d17dcadab5f1869525f9f2237e893bc2eb7004ab730892ed6fa98d81706ff32e240b0bae0445791f6c1f1f8098effb4f95
 DIST xacro-1.13.2.tar.gz 81163 BLAKE2B 3c4319ee0b0ad14f6310d8ce9ead7cf18c71285b5c601282b9951173eb2d7bbf0e9752d813b478bd340de29bacfd25e57166c018d7dd703377198773c3326203 SHA512 10a8498c48aa52b4b4930e2b59a3ad8be32b1b974ca5cb1c56f06ce5cb7866473a7f3d29cf37ffc0681c54f4377edcab327a302225429d32eb3cd26bdd322198
-EBUILD xacro-1.13.0.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
-EBUILD xacro-1.13.1.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
+DIST xacro-1.13.3.tar.gz 81173 BLAKE2B 19cbc50a9d57d41c1189e52c24dbc8bbf89b66a910ea646be44b6394c93961c87f0c697da1a1edd715809adf58db27a7e7b74101e005514844388cb57cb9920a SHA512 8ca12483d55d338289f42bfbaefcca8f4f95da3b884e29532c8a32f3d43f98d78150e4cc2683e6bd976d38d22ff37ffccdba0790b5a74b846a9068a7254bcc02
 EBUILD xacro-1.13.2.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
+EBUILD xacro-1.13.3.ebuild 491 BLAKE2B 63657342deb47d05f3af899cfdb93481fa0688b1b069dc0abcead6c9a340289ce731e6d3fcc7ed3304469a312d665ba890a0ca6707a44939404248a31bf49a99 SHA512 849a8d758025598a78d9e8e6d106b160782d33ac497c31a6ff0c0c76b974f68311d8729d2a8bc05270551ad2796ab036a788d371f807d926c064df84b2087f98
 EBUILD xacro-9999.ebuild 494 BLAKE2B 6d35cfe8f1b31cd28a38bc06c462267cdadc569afab8fea4234e79aa3aa273b3508058b159276ac44cebbe5fb55de4fbd9749f25aeee4c4705f05938f7118229 SHA512 8d869a3a6a2b070affb22353d619d4ca8fb00ad7a7c1ecee3c908d82580a9bc71fb9066171cf88a4098d17a0296c304d925919aa7af2618c7ab762ae90eb49a1
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.13.0.ebuild b/dev-ros/xacro/xacro-1.13.0.ebuild
deleted file mode 100644
index a7b93c3df7f6..000000000000
--- a/dev-ros/xacro/xacro-1.13.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=5
-
-ROS_REPO_URI="https://github.com/ros/xacro"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_USEDEP}]"
diff --git a/dev-ros/xacro/xacro-1.13.1.ebuild b/dev-ros/xacro/xacro-1.13.1.ebuild
deleted file mode 100644
index a7b93c3df7f6..000000000000
--- a/dev-ros/xacro/xacro-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/xacro"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="XML macro language"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
-	dev-ros/roslaunch[${PYTHON_USEDEP}]"
diff --git a/dev-ros/xacro/xacro-1.13.3.ebuild b/dev-ros/xacro/xacro-1.13.3.ebuild
new file mode 100644
index 000000000000..f3ebf72d0a8a
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.13.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/xacro"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="XML macro language"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="${RDEPEND}
+	dev-ros/roslaunch[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b6966c304987..b748d6f9ee09 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index 2f7cdae42e07..0efc916ccf59 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r3.ebuild 655 BLAKE2B 49af30c7ff35c544f52271c976038dce773a69fd174313506e317fac8f61eae29ad72676d57dd78eba88ca2b6ae886cc73b87d4082327a481baf46071e1bad7d SHA512 8ec7004e26d2ce4c931f6f1c8262dfcb22c679aab275d0dfbb5e0eca9494219fff52ac481240647f3573ca987c8da7ce756ad394733faec132ca67b88e7ec3e0
+EBUILD abstract-1.0.0-r3.ebuild 652 BLAKE2B 0157c56bad5282a0ad85fefa8b0f09a1b68ba54e8995179bb74b1847fdcff56144d3725f7191e01c3531baa61a56366ddc8476b7c76a716439d3662a94565861 SHA512 41ac0e4e3851820c7c39fb694126e1d7832d8d87eca8c99e6a947dac767d60a29f2e2f90681fd3455a9bbc38490b02cc28c7dbd3453a74c6e5453bf35a2d5559
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index af811fb4244b..1c3dccd24aea 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 15357ca90138..b24f2d98f270 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -2,8 +2,8 @@ DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
-EBUILD activestorage-5.2.0.ebuild 1840 BLAKE2B 95a4e7830b313dd7903c803dda9d85186b53c3ed8c9cddb6ae6a3dfd6066f0271fd85f567cb33ae1dd78b713529d432039a6580fbc0c1e01a76a2137ecd8c65d SHA512 cbefb090bd5ab10aee09ba5156a955c9038458a098fe32a717a6b4cb7edaa62eb19133c908e3b38c2ee2455a3f7f021d80a91071a54f68ce81bf71014495bf00
+EBUILD activestorage-5.2.0.ebuild 1842 BLAKE2B 43b1538f64ecd6ccb0d419dbd727e5de7c7d4eed74a89d67bba425631abd6a0293f4058aebafaa999da5fbbdd737c0679233861fc5ae62a8a76df878127f8802 SHA512 0221281b1287bd9480dd4097ae4a6824055c32f51df9e68dbf52ffdf666ae83acf6fec645a46918f61d659e8e30db237124b4e2754d503d8292a9683eaa538b9
 EBUILD activestorage-5.2.1.1.ebuild 1815 BLAKE2B 5d6596f33cde4708a0b34ac32564666774f75556c9af8d18cfa948ed4d897bed705293bc858b8591e402215ae437bef79995c289279d1bdc68ef5e501387ac95 SHA512 d71fb62b9b37d15bdd491b1b35ee014ac4b26d3771d11f6624121418c40956de1dfc6c8491132d81f62be36d9bb99790ed153144c1e4cfa0106fd08e1dd3bb26
 EBUILD activestorage-5.2.1.ebuild 1818 BLAKE2B 31f6ea8367af2acdd8391fe9c3b356ec737e9799a6b373534baf58bd6729e0538009dc8bf9cb52ccd477fc0eb0105c976972c5a6097780dad872de54ac8ff2eb SHA512 7128d5708748e2cec4912fae33b6daf2509e3eab7ca260b0402c809ed4d61b767dde4fe2301e1895289c234fb7637f247a4cc201ecf78bf63a048497ce7d06da
-EBUILD activestorage-5.2.2.ebuild 1815 BLAKE2B 5d6596f33cde4708a0b34ac32564666774f75556c9af8d18cfa948ed4d897bed705293bc858b8591e402215ae437bef79995c289279d1bdc68ef5e501387ac95 SHA512 d71fb62b9b37d15bdd491b1b35ee014ac4b26d3771d11f6624121418c40956de1dfc6c8491132d81f62be36d9bb99790ed153144c1e4cfa0106fd08e1dd3bb26
+EBUILD activestorage-5.2.2.ebuild 1820 BLAKE2B 02c931b7c7b8bd87005ec1b75b410b82f072f836c8f931208cd119e167b4516a05f5b8e4ed1cd5ca7b0fdb6dd6c0800c3ddb1f252aabbc8dacea72d7e5985079 SHA512 8cc6ff0fa7625323f72efcf587f715273c23d6318fda49233d9a2bcfea24fccbe2fbbb5e6302e6b1328b6b7b2ad554773d228ca7e5d32dc56c73725cccc2b122
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.0.ebuild b/dev-ruby/activestorage/activestorage-5.2.0.ebuild
index 2276e3a7be0b..fe2105d6a97c 100644
--- a/dev-ruby/activestorage/activestorage-5.2.0.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activestorage/activestorage-5.2.2.ebuild b/dev-ruby/activestorage/activestorage-5.2.2.ebuild
index 73eab3a2fa78..fc1d90b6c73e 100644
--- a/dev-ruby/activestorage/activestorage-5.2.2.ebuild
+++ b/dev-ruby/activestorage/activestorage-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 60c3978b1a89..456dffd3adcb 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,3 +1,3 @@
 DIST addressable-2.5.2.gem 103936 BLAKE2B c6677a2b5e9a7a1b279b2e3f1816cda40c0797254970ecaed2350d4d4739dee5a51580a8e2f94fc6bb87b9fe2a535d0a68b62eb672f8e91ff4da02e15e8dffcc SHA512 ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
-EBUILD addressable-2.5.2.ebuild 1350 BLAKE2B 7eefb341d4d789de27ac8d9711813764c2c733b8861d8a47a203cdee967281f3f359ee54c9ef612bb3b9b56640dc1cf3f4b1d056982a8ca34f1258872eb5beb9 SHA512 d996e82ed00fb02c139ca3ddba53f54c018568716d3cf9cdc8648028e9ae988efef15c2f4bf33e29069987170f281b395c3b3aa2a424b75c5e6ba1b1c70ab604
+EBUILD addressable-2.5.2.ebuild 1347 BLAKE2B 47366e6bb02d08ae0a11c5d1caca5a735f94f202d59db87baf16b60b7df3c1645413d51a974af58f885a4bf49b239545b40567efe208099506687b7cc664c135 SHA512 10785d672738cc5f039b13f823a3cddcbd40911d044fe42053d1cf8e30c80e322dc4953dfe8cfa91c22b18ab04e886209fb1784331929ab1a1eb61ed8271c317
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.5.2.ebuild b/dev-ruby/addressable/addressable-2.5.2.ebuild
index 38a23114a753..8dd64c71c341 100644
--- a/dev-ruby/addressable/addressable-2.5.2.ebuild
+++ b/dev-ruby/addressable/addressable-2.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/archive-tar-minitar/Manifest b/dev-ruby/archive-tar-minitar/Manifest
index 7fa7ae1cb324..6fc6ff431c18 100644
--- a/dev-ruby/archive-tar-minitar/Manifest
+++ b/dev-ruby/archive-tar-minitar/Manifest
@@ -1,7 +1,9 @@
 DIST archive-tar-minitar-0.6.1.tar.gz 29972 BLAKE2B 8881480aeb6fa8ea52dea22d6dd8fd51180c5224220b52336f54c7e68a0ed53709c28f671221c2e02141cf2918f862509815d649c9fc1def9d0f0c030c1064f1 SHA512 67b4636fc8d1651b90621a5e836b6e2912109dd90ec03ac86c9856abe544f55276c6aa520640b8a25e7f74c2619b77798aacfe1e10795da20f9fa78b7c3d5a07
 DIST archive-tar-minitar-0.7.tar.gz 31722 BLAKE2B 2cbf24f28558e3c253f963f049644f3924ad46e5227f9a85d786e682fe10693639a5768562774de981678c90d776227fb6833e863389a2d1c1a7ebc467cc3235 SHA512 754c66c4730f5205afced8b53dd83b9426c9a854e7607eb2f9395523bf45780b60428ce77bc09d102c45bef980ef97605de94c0b75611cd9bd32167f929e2003
+DIST archive-tar-minitar-0.8.tar.gz 33632 BLAKE2B b576c74cfd59893d4c0c935703453551f9a0ca6258bc6a2b1ecb3151a44ff166607931e554c811fffb489b6398123cd9e8e58372a94b303df45d88ef903868ad SHA512 cab4798b98d91a17dd5ce4aed3f6fd166dab61e8c9e3bef3df218944fe1657a9ec9d40a52ab2773430070e50410c401da799469b096dcc2b22d6466da1e50b8d
 DIST minitar-0.6.1.gem 29184 BLAKE2B ff6ff432a669e1244d785ef26bd56ea0631573c0efd84fd64b51758815362fcb001f11dd21486d155b366bafc05d8f30f24ef3ac7bb205d9a03568128a354333 SHA512 e8a4acd8c831ef587d9571376ae111454faba1d6d4db5c88f2087c84d3dbb5487cdcac8ad47c5f717e195262b95040a9ee72cdaeaad23715b8a1270baec6ec70
 EBUILD archive-tar-minitar-0.6.1-r1.ebuild 876 BLAKE2B d1b0801611a84142d9fc8a908a9dd0a1e173c41d6f1aff8e38c7e81eb334a66cba393fbe18094fa21e1f9d8e8e438a04251e25959fe4d66cfc04762371475487 SHA512 7bd448e47ab6f5a9374a94b2248def43c806a1b69d4512c4da274c517d9d96de48e49f7a9c7b5d850002450d0d9b815df4b1b6a382b90c6c6b909b6508f0bbd3
 EBUILD archive-tar-minitar-0.6.1.ebuild 867 BLAKE2B c37e78186e3d02653671772ab399cfa025a376b1efcbd0267c075eb3d8743cb8182c02a4a417ae1b3f03751f8969e0959a51d9f56e7d8a096498d1aa1019951c SHA512 060d20fa3f3a6b541781cbcffce5fef9dbb21e44a18faf33051cfa07a5a9735d2f5233dcd0900ec60847062c30992e92208b974af7d6d328ba07c0cf2fb7e77c
 EBUILD archive-tar-minitar-0.7.ebuild 866 BLAKE2B d0b4c12a477dbbbea4fb7648a6dda6f10ee9493ad58399e08d99c9836832e4a40c78458beac00defc5fd44641ce66af41c4c05f3dfe003d2131af7c86a420cf1 SHA512 9e944df12a37ec71beee207c58a641ec522122a94677261be5b8594ddc7c97465d179a7f916c78b0788c42121c0b1362cef4ea95bcf9ea96727c281866129280
+EBUILD archive-tar-minitar-0.8.ebuild 873 BLAKE2B 65b320695d729dc602c5d96b98f7d981cecc9cdcf61b99797b37f49fc25b858f5cbb08add27f5550d9713325ecd29bc4ffbb05781c0b463887f83d6562255d90 SHA512 fa05e0b4d174873069725b7c1fbf59ccb7015a4c4c3c46913357635bcfe6e487db9da37723182c1c7d062bbb3bc1ea803659f495bb77faa34b180fa49b61c3ba
 MISC metadata.xml 344 BLAKE2B 859b7af9a7a2a07b43cc2625a5ac93a91aa9f16041a1f179654e126ab4f78d347a7816098bb6cc559fc1bc004f27156a06a83581ffdf143d86c15d8fa2a3fbc8 SHA512 fe6d4710ed497c7b81b336533868f760892f8946f766a2749349ffc105e33309abcfd7473bc940ef0cd0cada97965d4cc9504b53a76b9cb9b846c64244e2896c
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
new file mode 100644
index 000000000000..e54bb4702ce9
--- /dev/null
+++ b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+RUBY_FAKEGEM_GEMNAME=minitar
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
+HOMEPAGE="https://github.com/halostatue/minitar"
+SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minitar-${PV}"
+
+LICENSE="|| ( BSD-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 49c73a18fdc3..db6f8d9087c5 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -2,7 +2,9 @@ AUX asciimath-1.0.4-backslashes.patch 1246 BLAKE2B b34cfc0ac9fc57780ce24e6aec242
 DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c216fad62ecd23b5f3eebe9590ead519df86cdaf99246dcfee4c18bab67176a0d47a1b864de6e44bdb4b90b70c SHA512 e99e6f869dda3e0236392039e6dccf5912b095e32ee7acbfb4684a5d723d05f4d3c9961554d5beab2a3d703b1ef50c45ed15c0dbda2179ab35d3b1b6b8759b49
 DIST asciimath-1.0.5.gem 17920 BLAKE2B 119a4c8639a3fa1d67ba745a988fa2c3e5bb1290c2fa5237e9ee4f4945e1ac57cd3789a7131ef1d95ef1f30c3155820187a358d842e3e27788854f70bed89c42 SHA512 7353d052b80825ea5944de7fed67acc02eedbc78c112e1252d49993eb454f59180076b75d92f259c0c1c51bd63436c4aa9b6eefa2e8e6cf70b1de4ab941b43dc
 DIST asciimath-1.0.6.gem 17920 BLAKE2B ccd35f77f7ff9312baf1de81d9c1c15009e9efea7be000ed2afad86b06697bb967980baab1f04a73503cd374c062d68ba99d6e42528ffe3d1c16a8f768813f7f SHA512 cecfdeb063e0dd2da9c92ec4ac51d30334d19f10ca2cde9380c740e61a1be435793bd5e6ae7795d1c4147056faaef0d44ea422b6ff8207cb11c8125422872f24
+DIST asciimath-1.0.7.gem 18432 BLAKE2B 9f1b959d594987f049f3e17394a305e037cbf4aa86c7c21324cb5f1f7a2a06c361fbf56cee5488ab0c8bbbac8f3a581f11a5e5a2407b36d28c4b4a106051df3c SHA512 3b2e5894fed09919e2576054dceecd70fc255bf414dbd826ccdda71cd69875c204c4d4d2ed85777612a4919a975b1a2427ff83cacb2720dee1d6f53c1f8fd079
 EBUILD asciimath-1.0.4.ebuild 532 BLAKE2B bfbcb5e1e5913beb328aebbd24cfbff7878e8020c284c9486adc39c0ac26a23a61baec00ad40de4308a3d4f48ff7e7ffdef52d3a19a7ae9095759e9dbdbe04b3 SHA512 ad5633bc2670e4f824c309f316df11f6b6c1b5a63a9ed81f444789e86d69f5adbe28754d032ea3442a113284cd4b5905ad79089f30c174a14a26f64002a494d6
 EBUILD asciimath-1.0.5.ebuild 538 BLAKE2B d10fab4ecbe6dc13e07d5e170f40feb3bf19ef5d70abff187a38ce662b0575e8f1058e29f242f9c576adebec0bf23b9839d6bb2d8d3b65234c8ed8436043c2c5 SHA512 a7846d336be425006dab8be82ae5f1d3aae62b5cead1abfe98ff0e6ce9337b73d3d5b9b63e6b9e3734cdb48236ce8710780dfb32bf298910856642f7f494a576
 EBUILD asciimath-1.0.6.ebuild 496 BLAKE2B 77a342935dff525e8309bfda153d3835483dea93d0f35fde5f67f231e052073727e62aaf99dfd14edda490e5560d3b5c374653eeef98fb6db13a826d697b8eca SHA512 cb236c68178e7c672576a1f622d1df9b7dc7dd4b43a7fd4758299aca6478afbaf7a41ea4ea650507b3fd2f3b7439ed8de2336932fd90852cae5e3a629c676e5d
+EBUILD asciimath-1.0.7.ebuild 500 BLAKE2B 6c7b042d2d6177fb19b906556b31a3d2ed3c819668419beeb4c946ef3acda2ece233806ed48e3a6bbec0160d093cf7b07406b6ab1aa869a204bc932b765132e9 SHA512 2d88022e1eda61ef0f846d4015e506487cce101a54b51809e7e20b8fd831df48f9c46ec154c981bb84639506b6683afbaace52c5af40bda7f3777610fac53a23
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.7.ebuild b/dev-ruby/asciimath/asciimath-1.0.7.ebuild
new file mode 100644
index 000000000000..2d1cf1b320b9
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index de184358304a..9116894cc6ef 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,7 +1,3 @@
-DIST atomic-1.1.100.gem 17920 BLAKE2B 47c96c49a572a6d6705b952e419e1a07f3b06de4e0235a4d9d98e6ff546c96aa9af69c39864107c6bec1ba7b92ca2a9ceef2cb5d5938c1c82f40973376920d6e SHA512 64c374b69b7ea8b7fc6aa3e189cb6ae3d4a9a214d410a83fa0ef464a55624792055c5e3e61adda3eff039aba604a0c1b710ba5304d33f27ae9cc6e421e8e1892
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
-DIST atomic-1.1.99.gem 17920 BLAKE2B 814406dc3e38a3ec882eb47e20e6153da9f68c4dd6ba3bc3d3869c0542754ba38678512872b25379b12d902ad6f740b1da974680867d492d2c4620091c5a32c9 SHA512 9c7762f6c32d11b2c5b45be68954ca12c753d2b4683167158a037ce791d72b13d940beef5bf6dd445c8b12e358c62d2a9f43a609fb3b7c7357fea4f66316063c
-EBUILD atomic-1.1.100.ebuild 772 BLAKE2B 20b30483123fe5e082f7f6e373e40b04693a5d4f232f956e186559c7fde98d9793ef8b6e293b924e324cc7a0c5370f16c767e056249681b1f75d9a7dfb7a79dd SHA512 7bd017d22401a6c9f5b56943bd9cb5fcb2e175d1f7d4bbb6ac997347c9bad88eba9e587a82d3f48b40030d1680fb47aa5ca763dedffe50b7a7c64362422330a7
-EBUILD atomic-1.1.101.ebuild 759 BLAKE2B 5f193c3e7baaad5b96b6db0ac81021a8fa3d782939e340e15f452266c75ab7d38207bf94949889d691e6d2dba6f9d2350c34306067533e67c42a620e56fa7af7 SHA512 c1bbbcfa0aab2fb49a685191680d5923b93e2385b168d3a62dac9a26022c547602c69e82ddf9fd0d64399a905ffa3699246aeffcfddf9be1cc2becdafb875b71
-EBUILD atomic-1.1.99.ebuild 769 BLAKE2B 72539198e33799e07965a974e4e96afe6494e749380fa0fd3b9f34b4eae5bbf440b001087c58fc11c9dc222f3427e639e1bbf4afece065f8521fb3577e7d3b51 SHA512 6e33377ff01b28431bdac42ab33a879ef4bb894ede658e4525439dd32031f1594d4b719cf170a35ac153837fe47f083a116a5eecf911352a8c96ca73043f7e2d
+EBUILD atomic-1.1.101.ebuild 763 BLAKE2B 5dd0c011c12ab2651dd4ddb10a737c19751fdb061159fbfb38397273c65124c1247e6b0a3ad9b5b4de1995f0872847443ff567e035d64e3e16874eccc131540d SHA512 2d409b29f9f49c202b4d7bb622eec5593953f03b03e8d6b7bc4487d3824a8205747ad40be61fb17cd69e08fd88099ac64e0b32d6b3214f97cb9a251ab5c82f1e
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.100.ebuild b/dev-ruby/atomic/atomic-1.1.100.ebuild
deleted file mode 100644
index 811158c883e2..000000000000
--- a/dev-ruby/atomic/atomic-1.1.100.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI"
-HOMEPAGE="https://github.com/headius/ruby-atomic"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid compilation dependencies since we compile directly.
-	sed -i -e '/:test => :compile/ s:^:#:' \
-		-e '/extensiontask/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/atomic_reference$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
index 29991cd53744..0d8b2bf69aa2 100644
--- a/dev-ruby/atomic/atomic-1.1.101.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/atomic/atomic-1.1.99.ebuild b/dev-ruby/atomic/atomic-1.1.99.ebuild
deleted file mode 100644
index b70c62957f02..000000000000
--- a/dev-ruby/atomic/atomic-1.1.99.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An atomic reference implementation for JRuby, Rubinius, and MRI"
-HOMEPAGE="https://github.com/headius/ruby-atomic"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid compilation dependencies since we compile directly.
-	sed -i -e '/:test => :compile/ s:^:#:' \
-		-e '/extensiontask/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/atomic_reference$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/bacon/Manifest b/dev-ruby/bacon/Manifest
index d5114c23e386..36430c553e74 100644
--- a/dev-ruby/bacon/Manifest
+++ b/dev-ruby/bacon/Manifest
@@ -1,3 +1,3 @@
 DIST bacon-1.2.0.gem 18432 BLAKE2B 7b5870a4cb2b4340eb16dfde4649049def3f19e9a3202a6040c26fe0b3ad82b04e14d47380f9d08d1a8640e38244e7ca89f897a12b382cbb2cf368e414d5af41 SHA512 ce7a9171be67b872c8a95dbf93a45fd79574796c694769e9c87a35257e85eff98187c8ee76429124ab475e90fc619eebd30e672f3dcd4f8280e139ecc469f907
-EBUILD bacon-1.2.0-r2.ebuild 577 BLAKE2B d10244bd75ea24725ed4c7d880626e5fda1548850314c95873c3280763fe1c32ca043b1c75b02ccf517a146aeb14302dbd28c900c2fea5a0039b618f3c6d9dde SHA512 df6ffddbad20c4583a11179b8fd97c08a6932c3843fbd1b286755570cd461b7a90f5efb9a38dd5d4f38ee6ded0e4da3072c929321ba583f241ab087e7a4508e9
+EBUILD bacon-1.2.0-r2.ebuild 574 BLAKE2B c079e9ae8bba86cda12d0c926e0d96d23a35d9c55045362c047f4180d4831091b11b6735948d55e92f441ad9ae1bb1f111be04b0f61d0acc3b3671e4a294caf6 SHA512 9ae0a917a37e86e42916e2b51ef0bd872de5f7dfae71001f0a5b86f1c3c9ee609a0b158a4ef015b20ffe7882ce65d3a34010f49179566e16c35782845367ffd1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 71d9b7579983..5d7b82570889 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
diff --git a/dev-ruby/blankslate/Manifest b/dev-ruby/blankslate/Manifest
index f215e0cf5c01..5d236eea656f 100644
--- a/dev-ruby/blankslate/Manifest
+++ b/dev-ruby/blankslate/Manifest
@@ -1,3 +1,3 @@
 DIST blankslate-3.1.3.gem 8192 BLAKE2B ff5494661e875290a354089efbd79ba8f7af50ff261d56f99201c9a11162fe7d61c0089c0c9e4839523a7f95e3a2cf8e79cbd5db14be3530f1a86ac696deaa42 SHA512 4164c2e9ecb6a294fbd0d25f70bae36ee9277da3a75aae6c99d37147f8111c40a6cfb85ddc3819e45c361c49fd9c3fc724ecea201763f7f9891b96589226f245
-EBUILD blankslate-3.1.3.ebuild 651 BLAKE2B 295bdf13bc304ebc79d4d463bbee175e623cece770b50303a6643c70a1dd5838886d35fc6f9d0191e28c7a86a372780841e02fc8c6664322188e8d2a7aa99c77 SHA512 1c4945529b1b8c31b161fd7536bcc0df9a5fc06e1b1b126ee33e779a07019d9c05cf80428befb7390d00548c6353890d9aeb2e0b5e8821dffe7c9a89005f8dd7
+EBUILD blankslate-3.1.3.ebuild 648 BLAKE2B d0c4d6cb32d2e6dc27cf7c56e4fe97147c7863e8e5d8addf319882d0592e33bbe7c59c2e6ab402ae7f2848004435d34a05e4106f468cfa8758845a4c5e79702b SHA512 b1958605bdb59aad3029359fa281c69bf39ba0ccc59e51b2fa756023d4fe93524eff51af44a04b4b241ad3a0c2feaabc17ff278cd24778cf9e3d4832bcd3d963
 MISC metadata.xml 328 BLAKE2B e6d8ca7038f3a6e6c026955eb0a1880d8ee08580141b438e74797d58bcc122d2d6258bce5ebb3547220d688ac0cac36fd7d5803ad28cad1db80f5694f6cbfe92 SHA512 d75ff746d7d11a9caf17f1b09d0b8edafc405e345591cd5c7046074f9ca80b0cd3fe59bb9d9c1647b264f5df6366b4ea99b0bb90c31343fd4dc6df6d8bd9612a
diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
index 323eb70a154a..be7987a480b2 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index ddb14d01c311..943dbc3effc7 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,3 +1,3 @@
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
-EBUILD builder-3.2.3.ebuild 894 BLAKE2B c5bf4ca58139fe6cc3660707688a233283539e358ef055b2f5b47659cfa0320c61a869cfc82abc237268c543064d4430ae3a99a2408af970c5922e547c81244a SHA512 5c33498b22d5dd62c2879d5419dffdd206476bfa11d0ebbc86f7aa7e143fbc796daaed0867344a707a2092669e7cde7552371ee79fc0fd06be3be335c7fa2c63
+EBUILD builder-3.2.3.ebuild 891 BLAKE2B 7405c366ca625de6d8dffb0d265ff19a2ded95e0ffe69a011690226d350fc8d0782b68dc795e2dd3ad64d34221795fee392efed52cd647aef4b29093757bfd83 SHA512 678b431de10426fabe11ec36028918664ddc266f8fd88f7d69d2edc6b56a0ea99af70a435eb75ced3ef5e0bb0f185e5b0a28518dfc441a300a169ebfa504d551
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 5a1f97cac8f7..b5f36f46dc1b 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
diff --git a/dev-ruby/celluloid/Manifest b/dev-ruby/celluloid/Manifest
index 417c09c1e0a4..2c106c297b1d 100644
--- a/dev-ruby/celluloid/Manifest
+++ b/dev-ruby/celluloid/Manifest
@@ -1,3 +1,5 @@
 DIST celluloid-0.17.3.gem 61952 BLAKE2B 5b64b67dea84261706acaf2612c23cb0b82d6af7fe0eece9d9e17e5d948d83a81b0de7598a1709fb5e1073f3632c7df6d6730c4797e0a4da593795b85c3bf9e1 SHA512 bb5005452ef7a2da1fb6b6515a6ad9df992dfd043caa605d1282a24b874c1f0798da0d19ee00f434486f9ef2c9467b1d6d2cadaa7883db98b885eeb842f1b94c
+DIST celluloid-0.17.4.gem 61952 BLAKE2B e6432f76aa2548f9b734502954cae7aaaa2cc6658ae644591fe22bd25e53e4eb88ef81f41416162c7478a77622f400040695861f9557578c029c3860cdb800b5 SHA512 ab876a12db908d0b14b9a701bbf7c2530188559cb60b1832e76642fae843f4eca9f4790a60ff88dda8ff92f7051f2df222c19cdec77666fc2e8d6d15adbba793
 EBUILD celluloid-0.17.3.ebuild 1362 BLAKE2B e7e598970366e98ef310f219650f12d35e4c90b7544ebb2a18fa9d6b44c9c139473fbd45370097130dd9d15694286114c269fbfc54e93fc29d4485ba764bd309 SHA512 0c142ee124f005db429dc76f4177ddb808237edb59c2491b8ba7dac0d1033ca5b74ff91fbf218d994ec90c6f915243da8fdb92b07ad67b1dba64fa363ac75887
+EBUILD celluloid-0.17.4.ebuild 1382 BLAKE2B ffb0be693c6df756d028f6cb17f4087a0dd26ee4d57be1a5b0d60a9ffd940aa94d30ab0383419b9883f779b98cae7d99ec69af4c0bcf3568840e5ff9d69f31d5 SHA512 a740490273f3e1b012cd6b7a9c68a1aae5d19edd480d9a2d66556852c8cd7f1dc7611ce1da83bacc541b493ec1ef031614aca3617536f90a120e58fed36abde1
 MISC metadata.xml 345 BLAKE2B 57803cd94baa4d58e4c4c418834347d84a4e8bd5b4ae5019dd71797ace22f508b601bbe62221df4a2fab04eff1fa1aa43d78d98462d189ba13b9bcdf70375f44 SHA512 e07f38e8feadf085f1adeb737ff56aeb9cc4c79a3b7702f9c018544bebcc14646be394aa32ff5502c37ef0fb8968707b7f8d9a6fdaeff23cac5b71fabae46aa8
diff --git a/dev-ruby/celluloid/celluloid-0.17.4.ebuild b/dev-ruby/celluloid/celluloid-0.17.4.ebuild
new file mode 100644
index 000000000000..0d7dae6155c5
--- /dev/null
+++ b/dev-ruby/celluloid/celluloid-0.17.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ruby25: fails tests
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+# Needed by packages writing specs for celluloid
+RUBY_FAKEGEM_EXTRAINSTALL="spec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a simple and natural way to build fault-tolerant concurrent programs"
+HOMEPAGE="https://github.com/celluloid/celluloid"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+ruby_add_rdepend "
+	dev-ruby/celluloid-essentials
+	dev-ruby/celluloid-extras
+	dev-ruby/celluloid-fsm
+	dev-ruby/celluloid-pool
+	dev-ruby/celluloid-supervision
+	>=dev-ruby/timers-4.1.1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/dotenv
+	dev-ruby/nenv
+	dev-ruby/rspec-retry
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e '1irequire "spec_helper"' spec/celluloid/actor/system_spec.rb || die
+
+	sed -i -e '1irequire "pathname"' spec/spec_helper.rb || die
+	mkdir log || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby24)
+			sed -i -e '/String expected, but Fixnum received/ s/Fixnum/Integer/' spec/shared/actor_examples.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index f0fd402cabb0..68ff2b3cab20 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-EBUILD coffee-script-source-1.12.2.ebuild 459 BLAKE2B d8000e2b1535fceccdad40775c73109a8645282a8258189505e8402f807543065c5ae17f53011c639fe6edb2df2063b41524b05c725c1eadf037a7e7fb0f86f0 SHA512 49a8ec3cc2d953545fa404f361aa7ca3cdce897a765e2012390e7bb2df15365eca6e55b004b52af293b5d5bb7a475c88d3e645a7775d2452413e32313447703c
+EBUILD coffee-script-source-1.12.2.ebuild 456 BLAKE2B fba651e153076353a4aaba689cc9a658f74be2c451b8545802a93d60a2815409d3f0277dd798183fbcc376a041673c48d0c9cae1a237f1c9f14b7593d71b2032 SHA512 2135c5518b086e006ce92fe38183780d74d9469a0dfb08832a2d0e4913ee827f82ee7d04e497ebe2b81850e405ccd6224453d9d1f376029cbf34304d459f335c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
index 52de0176ef89..030c6453c5ee 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/coffee-script/Manifest b/dev-ruby/coffee-script/Manifest
index d2ab2e2e6dbd..4e4e5e380bba 100644
--- a/dev-ruby/coffee-script/Manifest
+++ b/dev-ruby/coffee-script/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-2.4.1.gem 6656 BLAKE2B d670da7888dfc576f7bc07f1d46e82c954d784ae9fb5c3aa094a9d58a74e4e6b12af5b0ab16940de9c8867871dae425cbcf14f1a36d4753367b28785e8c7a1da SHA512 5f19e3dd099408c633243d110fb6a3aece7753eed398c6568388b943a4a068fd5c2085f4e5408ebb7ea7eef529154995fe6e8ca4d437d491ec728a876bfd6492
-EBUILD coffee-script-2.4.1.ebuild 605 BLAKE2B 3ae09e8b8cf178930e75e2f73dfeb74d98b4b55dee97d1a75b7082670743df5db799188ec106232a91fd751fc4804c1c2f6600b5f5be43669df7632b3be225f2 SHA512 f1601452cac873960d62331f3500e6805c8b52b415396915068e707823ef905043896c850fa0b5ea48cae15bc77cb947ef6e8b22c4495beae7099032b8035b84
+EBUILD coffee-script-2.4.1.ebuild 602 BLAKE2B 4dba72e1d6519ac7c5a993f6fe5c9c196a8720f230b9b6f92865104039c07b0e1b0a2b46d920cf035e45d6bb6e4557808039eaa591b385bc33ab7c8ac91e616b SHA512 3b24ddf32d96b78181ddd129483b2a1b92c48305419d0827a7dd8551ad846b28928b10bd6e078d60542ca109523bcc9f450ed4f10bdd08ae53cf134d38e42b37
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
index 074e53ba2342..ebb172961af7 100644
--- a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
+++ b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index a121a1eca5f3..be3d67083b88 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
-EBUILD concurrent-ruby-1.0.5.ebuild 1253 BLAKE2B 7cb48779211578ed4e708a4521dc80f89455851d30614baf020cac5dcb7dbd1af39a1c8cf3e28702fcfb091e6b00aaf1c82c70c99bdb82aa9e97769735626372 SHA512 ac0080d25d78f6ce6a2bbfd6eeea430db970bd3ecf7396cdfa2fc578ebd76302ac6fcd0f3c540f81f4de75412147bf805d2702036469bd93c2594f75cfa35f85
+EBUILD concurrent-ruby-1.0.5.ebuild 1250 BLAKE2B 968453b57482dbabf2867abb9d103f61fec41f2d81fa5c46c265a97e561df6b55b1ec01c035681bcd351352b09d419910390719df3ee6a90ffc2e807332b2c52 SHA512 0d31e635b9fdf106e5da860d873e66b83d2fbdde194005e984261099e6e3aa0e12de394b2ef7fca70deb35d64a73e2551a6cfcdab0545ef1632b8a81e7590f2b
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index 584bb9c543d7..27e77e014d51 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 1e69a6312cab..eb981c52679a 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,5 +1,5 @@
 DIST connection_pool-2.2.1.gem 13824 BLAKE2B 2328a86f9d625d245f3e74d41fd615d95ea68a6fb8b1d17a9a0f9dc4ff8b772eb2942fd9103b12875a4ea2f3b6d922227a4da79fc61bd348d4bae5aa50b442a2 SHA512 74167b200fcc02d3a60fdc0e71b44c80f1c72db75b5f604a442bd5fb55138fe1750a2db095e0283104fda35fd9024cb71c7ddb614c3d472f814d686b686b6ef0
 DIST connection_pool-2.2.2.gem 13824 BLAKE2B 2f52bb3451dec5916d5797596f7bc3dbf39845321ee83736d679c433e96f154db852469b1f6d0d3b7c7f48262f7840087d89cdd40ece22b67a29c20ff77274dd SHA512 74cb64aa3f183ee4e41f438133f60581e9f99a1d5b5daf61607cff2329bfb1fbd8810d87c35d709418a22ad925049e3e9403a602107452414a67aee1c6eecfe9
 EBUILD connection_pool-2.2.1.ebuild 735 BLAKE2B 1efc20a9184b374fce25b62928a1aedd3ad6cde7ee066507d5c8c98293973abc99658d5ff9621c97c6da8dfa0ad6e93e675977950e3a86096fc43b814bca47d5 SHA512 245fc30a43eade01a1f72701a7f55ad33c98d92a0dd43018289f7ef6ff511818ff3490e2560bb64e0952a2acf864737bd8ede8566fa3185e2f5ee11d222a7763
-EBUILD connection_pool-2.2.2.ebuild 729 BLAKE2B 4e6937573dfd1fa17d4bf7e7ccf17eab67a0d3a6e69a980ef539aed26eff70684680de678f5aeee7b677f51783e9620494fa8372e36ed7890dc21febed675695 SHA512 9c641bdadafbc297c7f7fabb0589ab45ff9a02198002ab27401c64cd313bcc2cecef6b56f7ecdbf5b3c190274f423a08f930c5aba4023e77ad0c53b7f08408a6
+EBUILD connection_pool-2.2.2.ebuild 733 BLAKE2B 87975a7714e2d112f2f1e9079aa4a5c130bf60c399b787153cbf4d8b15a783f77e6511f6cfd2103845ace02cdc0b9106f019d24489f658130893f0956acd543b SHA512 138a40c892a19d69c7781ce24db861e4326b0f83229287053e284fb88e08ac3900780cdbca03b7d3b3ea43437b61a7677f5a4b292c025547970388c399aec198
 MISC metadata.xml 349 BLAKE2B 7ffc13174f2f47522a66c48922952798d03fbbb15419d9a52e183c633b56d863e85fab4682420aa9fffeb16d474f52de30799489a99221f25438524dbc569303 SHA512 18245f101f862c5880a42121eac9947a22fac206823d85ba650f5766af334208a64f97e7ea44e298f4f3c1191eb6bbf0e37949974c737060dd66434e1963b41c
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
index 97a8f019f2a1..0d64f0dc249a 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 62bef7c7849e..8a90f2bdaa3e 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,3 @@
 DIST cool.io-1.5.3.gem 112128 BLAKE2B f343ee73e3796744ec21d3af13e92a0a462e10b262543c2d77ab0dd6c5250bbd6cf0d6579646d146983df1c2b288717f3d4e9f1d5d0cded58a9b1422e497dee5 SHA512 6ef61713acdccf951ebd64018a3d9ec83e2655895994fe23842e18cd2556f4d35ec42144577a83b30ef369a9047a58d1bba2224145653db0b7c203dfdca6c3c3
-EBUILD coolio-1.5.3.ebuild 1449 BLAKE2B fba86e6887dae5d42868a371c1268a3a55f519eb240cc6f49a5a2518d056e953817fc9a3e5ac6951ee5ee18351e87ab9614c02aa5982a77259ff18c421dcf94e SHA512 e9cdebbb5f1e0a5718102e0d6218f83ce09584b2f19a843566dbe7c74da7c2a4762c82880ac9d8820751c1a5262c36f52b65b4c50bbf5b6756b90d878a469083
+EBUILD coolio-1.5.3.ebuild 1446 BLAKE2B ef4f22668b4adcbe9b16a542b94723501cd4c13d42c0b819e9b36a33f9a57c0a3980df68c11889ab5629ccfbd5659b556fb0ed61764e3d950fb588b7b73b2764 SHA512 31b73ed4644895c34a11b9926aa96a5c1fbe462de16b13a8d1fb47e26bb5055a25fef293e33b8a036e959a4162fd027d04ea43177477da198aa80a34e6f700ba
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coolio/coolio-1.5.3.ebuild b/dev-ruby/coolio/coolio-1.5.3.ebuild
index 67d0237c3382..b0718cda696c 100644
--- a/dev-ruby/coolio/coolio-1.5.3.ebuild
+++ b/dev-ruby/coolio/coolio-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 88e7a1bf5638..e276d7262d31 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,5 +1,9 @@
 DIST curses-1.2.4.gem 35328 BLAKE2B ba84d733a663c27a89be200b95c1e7a72063389190b2f90f0fc1b3a2af60025d926c348a08116734b15c2d494a4431c6e2be78e1f5982c03ee13d69bf7edb96e SHA512 bece3833be353ef8db51717dcdbf060667be5d33d00ce78952c44b3a8c3df082c11649b0a2a30072ce99c6578ffde7dce0c0108e109e55022703cfa1c1861bb9
 DIST curses-1.2.5.gem 35840 BLAKE2B 4c45f0ff81b4e4a6e9a305567b57536ae89cd3ced400066b27530461e91f1d1d4e4c30ebb5af67137a831c38bc6bad8f56e86c647abe246a189102f9e6649933 SHA512 eb1d56ecb8f1d55488a9a46d66193efaed1f85c16d0bfe43102d12f6b2e6e8ffe10f1c714d74f31cef4bac1158790764f5da9ca4b60740d3c7a2d2135f1536e4
+DIST curses-1.2.6.gem 38912 BLAKE2B 599233b8e9a80056ed404704ba81b671fc11ee997a5e1235e655d1f957fedbc6fe6e38a0463a5141ecac0cbd071d5c0ac02b1db2fab98ab0967c846ca54c2a67 SHA512 dbf3fe0b0567f35de5dd61c61e9d149038fddf4d79ac3a45c3fd7e5c0878ed74de6e31b24ecf625c0c03b2ae79b7b05fe418f63ce1064e270806648a0a9453af
+DIST curses-1.2.7.gem 38912 BLAKE2B 8cf1b908aea6f2f0edccd26f4aa240d31ef7e0cce533e75d8ddb90e021672e73426f826373418e4a5e5348204833898143b8a6923e28c23e2362be8e64c78f25 SHA512 258fd46104fecf68c0a4f2ea6c7755ba6b0abcd1faf3853209b4587ee8694228611ba1194de5b05b3e8607503223bc675bbeb19677382b2ef630b4d0882cd32c
 EBUILD curses-1.2.4.ebuild 664 BLAKE2B 59cba296e8e3b7eb8ea4b48a8240c5585ccb71d9fddfe316be56115b43b6221880aad309469d11b500b72a8959d1f031358d3983bd5acedb03cebc06316f9fb4 SHA512 1f0a3db6d6614a4d0fd9db72c3de74a2b9e5dc5d63a89c0e880520f7564efe899a6665e6142e0621107caea3182c09730bb6bd16b4dc2e07bbad1c9308257914
 EBUILD curses-1.2.5.ebuild 654 BLAKE2B 69385fe6648e48d26f3aa12cba91b43e2ca6d3b46818596186ead3d909c37c644bd689c055c67a0400b2e14e3ae86cb31dfb2fcd4faaebc86b39ea47087e994d SHA512 6beae7956a45509c364106ad54acd3e44318bcef732e34eafbdaf8e0bdc9fe3d31045275d4cb86224f39ab11d2067314d2dda7e5ca4e179df91fc49f7b81f5a5
+EBUILD curses-1.2.6.ebuild 661 BLAKE2B 7ddcbbad6b903b9acc9976c358793045b4ea6de3dd563c5f395038796ac8b74b92ed0a9916066ff49d88fac7abc57985e1196d71ffb9b831b29870b9f91b5aeb SHA512 9f29128960f141ce81bd0398633a400f2707f47eda65730e801d5af153a27a3ee905a5cf95461ed812882b405bcb99ddd2d52039fbfac4ef1662d9dd9706c478
+EBUILD curses-1.2.7.ebuild 661 BLAKE2B 7ddcbbad6b903b9acc9976c358793045b4ea6de3dd563c5f395038796ac8b74b92ed0a9916066ff49d88fac7abc57985e1196d71ffb9b831b29870b9f91b5aeb SHA512 9f29128960f141ce81bd0398633a400f2707f47eda65730e801d5af153a27a3ee905a5cf95461ed812882b405bcb99ddd2d52039fbfac4ef1662d9dd9706c478
 MISC metadata.xml 337 BLAKE2B f68ad5630ff84b55238f101e480a86102303dceaf6b05716d38966d567dfb894f668acdd0f1178ee61ae550e829c053868867d73e9935cde24677b3e14735277 SHA512 3f64366e00d412b476b81e46f0d9d4144d6f698fdc277f59cbefacbce8d9e35bf9fcd2d45dcfd5ba8a386e5972492004f693976f85a90ad69ebbbcf46542971a
diff --git a/dev-ruby/curses/curses-1.2.6.ebuild b/dev-ruby/curses/curses-1.2.6.ebuild
new file mode 100644
index 000000000000..d02da1d76f63
--- /dev/null
+++ b/dev-ruby/curses/curses-1.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="1"
+IUSE=""
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
+
+each_ruby_configure() {
+	${RUBY} -Cext/curses extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/curses
+	cp ext/curses/curses.so lib/ || die
+}
diff --git a/dev-ruby/curses/curses-1.2.7.ebuild b/dev-ruby/curses/curses-1.2.7.ebuild
new file mode 100644
index 000000000000..d02da1d76f63
--- /dev/null
+++ b/dev-ruby/curses/curses-1.2.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="1"
+IUSE=""
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
+
+each_ruby_configure() {
+	${RUBY} -Cext/curses extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/curses
+	cp ext/curses/curses.so lib/ || die
+}
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index e811b2b72154..fe67fa167e58 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,7 +1,9 @@
 DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
 DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
 DIST dbf-3.1.3.gem 127488 BLAKE2B 6c75d901b0d694266cfe2441567bf5684e5845a95b3c68eaf7bcbd5bc7b9b4748412740d8afce1015d5a84b26fcc30656a7f6dfc57c8a11055ac657b28cd034d SHA512 222957472dede8cfee42971ad9e7de4a08a7fb0ed017930027d4203da75298ce4eb9d222b841c4b051cf54c772b9799b2ee78cd5308452672142303bdf60c9f9
+DIST dbf-4.0.1.gem 127488 BLAKE2B 60fbd21d8a5caf14480ccf03aaf9ae6b9917d8537b3437a6831c4e69f878fc17a8ac70344dbfb9a459aca88f0000ec7ea89110dd489a802079bd8171f36f36c8 SHA512 cc678bfc7faf1e24b35053a77e91f203228a715a357d0c8e075998be27f19f2db2e6aa9e51d700842e81ca47f9ac5ab68cde1241e59d951ba82a1a7a020d0d0d
 EBUILD dbf-3.1.1.ebuild 482 BLAKE2B 738e98ccb96a7a99f2debb2dcb04095da1d6358793b6606c30c3e1af9d9b9f2f537e493840eb173700407ce65552b174a1f452cfeb0a90ee1bad11177f8c5b41 SHA512 13bd7c11b6223c133c0081e1dc8b856051cfd8b8faa8952cc6942585238364e1d007fbc27f01635608527b0ae9fdcd903bbcb5ec8c0fcd7d438212d3741af882
 EBUILD dbf-3.1.2.ebuild 491 BLAKE2B 99af868e61c34c2025a82e6b751888cf31505c892804b1f3af8e3675fb37fb57a84bd91ff2132d6cfe54db426299541186d65cc8b28df1f4675a660468605030 SHA512 ffe6b107766e9abfe7eb4cc705836ba3e42d85e7c6d1c54e631b4cb82131026ceee3cc1dfe38ed8f50fd4cd5af7d73872a4229cb7688e704f30f894343ffeb56
 EBUILD dbf-3.1.3.ebuild 481 BLAKE2B edf2f9b62f9b42de84c52500e2ce6dff386b5427923edc9d10d55eab9266ded02b99367000c3f5686b2eb88bf9d01bb566244e67ad7aec6310bfb21f631cb9bc SHA512 47986acc778cc81e1c5921636bdcae7970cc8e7deccd6b7620ece6b49b8f5a159fb1647e056bf0edc61d74d3841cf8e4356fa93241a9ae6b2c16108cd673bb10
+EBUILD dbf-4.0.1.ebuild 481 BLAKE2B e5b317cd0c666a53b32120f954bc089595ce6870755db13d9ea9682e1e20d7f5771546f74223293f05fb38b9c543a46ce00a5fa026ba9d8d320fc93399b0b13e SHA512 a21c9e341b3b4250687191328a0c9b30ef186afc4c86fdd69b8040cd42ea17572d8db0b36ea1420a63115218bf7e7314701497588a8f56d131d69bc0300d78bc
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-4.0.1.ebuild b/dev-ruby/dbf/dbf-4.0.1.ebuild
new file mode 100644
index 000000000000..ac660bd38e68
--- /dev/null
+++ b/dev-ruby/dbf/dbf-4.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index fcb85ed82cde..34ac42875790 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,5 +1,5 @@
 DIST diff-lcs-1.2.5.gem 49152 BLAKE2B 994649af94c61d9dc4d696b1b690535ddcb5fc024018de73b41a91ac47a09d4c48bc012def92f3f16cc7f60d9bb3fa3d9fcfa7ceacbb6a2cc47e906d907172bc SHA512 ce15cb794a97f9af8585c46b7a2404e1ad6e24e4910b6aa6c5126ef5996d86700979a54a154bab1c0602f19021b287dc865db3eebdc901fb42056f1e2180d0fe
 DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d38964f08ef80c14a4fb6176504a39c2e074fb58fc5456214555461a18ae42dc04f371d85dd335b1cbc3dc SHA512 b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078
 EBUILD diff-lcs-1.2.5-r1.ebuild 647 BLAKE2B 92fc9687490181899a5dde92a544faa7632e0b81eb3ccc8cfb1e6ba1ebb285258018d820d53e6b43d439d049eaeadfcb45143323658a8d4648e0c62b224cc0da SHA512 3dfb5b44013a7db042cb3192445a567b0f752fd27c168438f5c3e66785575cebca77be7fdeb07dbf9f7797acfb83d2000ac401f5aa3c711f635b529241518f60
-EBUILD diff-lcs-1.3.ebuild 660 BLAKE2B 3fa54fe7fb0a8c2831ec6881ab06de7915abdfaa41a0fdb0a41c8019425f47841049847d8c0cc0c1f2c0c613ba62c98481710d54aa314a60936b21429108be14 SHA512 7d4bf04955a8b038284849b3673fa23821e19668b5bb8c09bff41ad499afb91c54539c9ce58e02d8d4913c39456535e3ad75dcd9fbfb2a33aa167fd57558f591
+EBUILD diff-lcs-1.3.ebuild 657 BLAKE2B 8dd498ad46ad7c7c5c5d080e2a1c6d71d4c38c5dd11a29fdacce514c603f18c0c6783b7729ca9dbff7ab92b364b8d92484d0ddbe148c0e46f7c37f8f59ce8ed7 SHA512 73647521dbff5b274740d02c8759a252587930464cda0b51d2527a5ef5412aef8408fd0cfe3aa96383b072cffd9236021325c82bd67a0638e84f9b1ebb4f9821
 MISC metadata.xml 345 BLAKE2B 99a21f71cd3b7984131e3b43a14297bdfa3cb4238833deade649c4afb880ce6fca1bf4c3dfbd2fc75f68f42d5b7fcf97b1cc85a416da75490266a8bd57a36846 SHA512 b96c7243c3d4a6a3fb41e63d8dae54dc233e20b98698636d6d7f30f2c00bae3af9a01df68fa9c38aa0baa0b1bb3c267775dd8a5db539db3d8b46c497e85e860b
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index fdd7b63ef6aa..66cea85043f6 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/dotenv/Manifest b/dev-ruby/dotenv/Manifest
index 3dd4ed5537e8..67188552cf85 100644
--- a/dev-ruby/dotenv/Manifest
+++ b/dev-ruby/dotenv/Manifest
@@ -1,3 +1,4 @@
 DIST dotenv-2.5.0.tar.gz 17188 BLAKE2B 8d6adc9c137cef5f60462167b995e89f341c6d4d384cbf84c51eceb930f29e72da6e1c57044cd1a11c3043b829b75d9dd20d883ea13f4ecdff7a4c18ec17d4d9 SHA512 cea71aa801f6e79aaeb2cd6f33af16d3b548c97112a13f5638acf6eb12c73a434c4c3d89a08d074ffc589d6fa4e77534feb6c1cee9b7290b2acc6520637ccf18
+EBUILD dotenv-2.5.0-r1.ebuild 1007 BLAKE2B ea1e6bdab2393146d01cf83db283410f8f1136854d31691b98af2a2e1d9ed2cafb1bfe03aa851f4c11c1b65f5f3b2e4a5cf90576d117003b1ecd5019e4b08540 SHA512 222ca6bc3007685985d6c4155e4752dc4d3fef77db5b00324f2a29425184ebd1cf98a2af4afb442b517b100895cdfb8033a5334ebdb07de0b1de50337e83fd51
 EBUILD dotenv-2.5.0.ebuild 1008 BLAKE2B f4f71c5940bf4cb741a68c5b38bba968efd233fc99b172946de7408109ad83a8613232aaf72ddd444aeea158c240ec0f41a1d7fe19709da6a600646b4a856731 SHA512 0f1c522703367e99d056135d6eca401e26093367f2653742c5cfc17826a5ced7cd193b9ea404cfe174586ce6cd1e3c5cfca70a8ebc7acd64668b30307543703a
 MISC metadata.xml 341 BLAKE2B 4cc2ed329e48853a5939f5f7e41d2b6544d3d7d967563da065633826c3fb9d999815e8604fe4a897606f4ffe7be53f3e87c925120961050ce77f1fa573847f5a SHA512 72e21e93099953f1946b486fa8acdbd0b85ed139ef34d4ad9c7e3e89e2924ec598a662f72210d52efdb4cc2ed676962fc6d50c560b4b9c8a4ec849d75d5be2dc
diff --git a/dev-ruby/dotenv/dotenv-2.5.0-r1.ebuild b/dev-ruby/dotenv/dotenv-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..f4d2a225eb25
--- /dev/null
+++ b/dev-ruby/dotenv/dotenv-2.5.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Loads environment variables from .env into ENV"
+HOMEPAGE="https://github.com/bkeepers/dotenv"
+SRC_URI="https://github.com/bkeepers/dotenv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/spring dev-ruby/rails )"
+
+all_ruby_prepare() {
+	sed -i -e '/:guard/,/end/ s:^:#:' \
+		-e '5igem "rspec", "~> 3.0"' Gemfile || die
+
+	sed -i -e '/rubocop/ s:^:#:' -e 's/git ls-files/find/' dotenv.gemspec || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby -v:${RUBY} -v:g" spec/dotenv/parser_spec.rb || die
+}
diff --git a/dev-ruby/ecma-re-validator/Manifest b/dev-ruby/ecma-re-validator/Manifest
index e5ecc1ff7174..b5b19e5170e5 100644
--- a/dev-ruby/ecma-re-validator/Manifest
+++ b/dev-ruby/ecma-re-validator/Manifest
@@ -1,5 +1,5 @@
 DIST ecma-re-validator-0.1.2.gem 824832 BLAKE2B 0ccc81114611b85bf799644dd6f28f75397c3f4223a4eed03206e75b0478a9c4d6ea8807e5b8bc9f06771d51543210fa93fc355d791f7d91bce0f255860bd353 SHA512 4f00dcc940dc13f91b823ce9538239c3d545e79027f8ebc45b258fc807d1dcedeaa128070f666c6c57d50715d76908f45ca7bd639ee5a7bfdd6617f713f2c0fb
 DIST ecma-re-validator-0.2.0.gem 865792 BLAKE2B c41b01dc36f3000331085666f235b0adc749516b19028ee78ef56c68c00b7ab9105d4bfcfa9b061cd1f63987054a33a7e31cc3957be17182245120d679f5b6f3 SHA512 5e2ff7c2e8b8d5a8749d87f1678b235e69f197b9af95787f59cfff492ff3d8b8e2bc45a0e3da83d92ffa646e9b1b12ef5c4cab324d6e29a0c1f53e211d00aba9
 EBUILD ecma-re-validator-0.1.2.ebuild 598 BLAKE2B 3d107472310ce99bcac039993a9b28ccfa7de5c79e2bf1494ed1dd10e1765cbced83dea050f8909997533e2a14006b628840918a0909a40188d7f04f7d9c0db6 SHA512 3199d326f74cff278224939be7717b75c27209dfc16ef3ce716f16f995d0c41e73fba837942c596fb240b56043fb05944d180280448f0f715bd8ba2d0c8f6687
-EBUILD ecma-re-validator-0.2.0.ebuild 598 BLAKE2B 614966302b8f59adc3e50a63c966cc62ef02d333e2e8d5bbd0a44e78ba003d9691ea43b424c5837c2d7094d4c2c7b79c7c500b66d4a2798a36f0b1bdf4d0150c SHA512 f21f733db7a200dd2a83ca4fb30f64ab81881024f685e2f1b895abb6ff25ed992a8a819203f5eeea69430aabe24e9d7b3b9f86745eb0d50c1d75152e0dcba0da
+EBUILD ecma-re-validator-0.2.0.ebuild 605 BLAKE2B 5b94225ef94af96a3f7dabed777dff4bfe39bdf8e3a61018f78134707e3ca58ea4a74c8e228bca3e7ff4ce244ad60fedcd48f217a4f6e3ba5898ae39621899ce SHA512 e22cc8b435c5e1ac70116f3d41283be134cc94067732907c7d170a9238a1e6535e0860ea30708a9c88de6fe9e3037b1ded4b962803373cbfae9cc2cb9cf74af0
 MISC metadata.xml 335 BLAKE2B 35e81faf43eed5db18d046798d4a20e63363f829379c1706f29ec2e62f32972ce6de98a580697e6f7a7077aee14bdeeb52abd7172d78557a215c36be78ff1daf SHA512 14e2cf3112c5b046847c542192d8260c69f66057e15d791eeec9297b0ef94c036883bcdc3273a08fcdd91836a3f39d5aa651d2fd3db8a09f905e3ec54e185ad8
diff --git a/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild b/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild
index 906fde0d3ab6..ba652900a528 100644
--- a/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild
+++ b/dev-ruby/ecma-re-validator/ecma-re-validator-0.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 4218265ba23d..c8fe3355233c 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1101 BLAKE2B 491231e1e2649124355061a44a8dc22aea4007cf795d6571e7269c72f49ab71af272cf17c080a4e28de6c675aef689f02c8d9d0a5361cb2f6803ec1818dd1d12 SHA512 b72d11a705861e7983003ede1e7ef5752cf01e8d7fe5977274997f0578254af6caeeaf8e216d057a78693a4d46a15d54d92cd10b5a2ff5dd87c15325369f0143
+EBUILD erubis-2.7.0-r2.ebuild 1098 BLAKE2B efe018ec7e987f0765c63349b1b2f11e780eb897d2a7b6a3fa3504693176b5999f1d5196278192dc488f3d681d44e27cb0cf6f19d04a4bc59eb678484f91ff1d SHA512 c8ae3413fdf90bd4df9e0fe94757d16adaee5ec4fb3b98ec342335f32824949b107fc744c8d17b124813ccb096f7e7a720fa56fe7b7909f6d8811d1a55ad0cc6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index 5e31d51fbaaa..d137c82f6553 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index 92ee8d57f083..a79947fe7ad0 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,3 +1,5 @@
 DIST ethon-0.11.0.gem 56832 BLAKE2B 64f184e3dbedf6fc05cb97d7e642366b45b9493ccd79ba1dd9f4ddafea695bc8d5e72bc5a305e192ad6f78d55704319316a13ced61c14aef7d3e41936ec69a78 SHA512 271ff2ce5578352722bab318ad40f06d9c76fdbdead573a015fed0a38f3fd6341bcf70acedaa9470fe97f47069977b09ac9f71d8dacb21b67aad917c2a078c72
+DIST ethon-0.12.0.gem 56832 BLAKE2B 04765dcb9599e7435c3f71b1e8c35b815123ec460dbb761360146b24acaff1aeb52a75efe5dbbacdbd11e7247743988629ce965604cdfd15cdd75ef03301d9da SHA512 5fea666efdd5e2d568d0e074f205525656e202ecea3bb5ff8a8ab838a596cab349b869baffb7926227d6cfdae5b9c1cb86bb201b4c9585056c6671ab4feee596
 EBUILD ethon-0.11.0.ebuild 701 BLAKE2B a3cd34d28732a2199081d8359d15ff41839d9142d4de251aa546da8e41390d362582e2c7feffb5b2ba5b9e04bff6d23e4006646c3f1cd50d7158f97be1ab9269 SHA512 cbd782908c739af30179b8bf6220ac99c44f4c5cf1571b8cbac4f7aacd550a2aec72d8e71393fe09dd7b0b002fefb7c0c43f9017f3c7137f7b8a1a9bb3baf567
+EBUILD ethon-0.12.0.ebuild 698 BLAKE2B f05d91d2811105f848d9021acb29e84a93082e73cc01578b326884ed5e3e620ce4b5d1db2c4d91c3fb69a2e007eaddc10067034c3910cecf6aa5facb02cf33b6 SHA512 93bb1d4817aaefe719c8222b66712521381c333a0f59241234d02c460f60e058e647c4e89ed8e3b9b3c630feb753ce6d603794cc0950811cc007063c34e10ab2
 MISC metadata.xml 340 BLAKE2B e49ffc5833004b5841c276ab1d712c48f8682d73aaa58e0910aead01698be2aaab88f4cde7ebc0d49ed34d177a3477ecbe99928c1924ddce664e2d4523b06210 SHA512 d6fddbbfe4745ef287bfb946576e68e72f135dd9664ad8add271f0d1724b0da518472a7bb26caeff0d62b5a720a2bff223a33b7488c15f5d09668b66ca40cbe5
diff --git a/dev-ruby/ethon/ethon-0.12.0.ebuild b/dev-ruby/ethon/ethon-0.12.0.ebuild
new file mode 100644
index 000000000000..db60b0e0dec1
--- /dev/null
+++ b/dev-ruby/ethon/ethon-0.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Very lightweight libcurl wrapper"
+HOMEPAGE="https://github.com/typhoeus/ethon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND+=" net-misc/curl"
+
+ruby_add_rdepend ">=dev-ruby/ffi-1.3.0"
+
+ruby_add_bdepend "test? ( dev-ruby/sinatra dev-ruby/mime-types )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '1igem "sinatra"' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
index 3275503c75fe..dceccfd8d42b 100644
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@@ -1,3 +1,3 @@
 DIST execjs-2.7.0.tar.gz 425361 BLAKE2B 8dd3bb5557a6993667abfa6c424cbea6377c1ea7b3928b9b60a6ba084f1df8a109d10d1a616c9d302e1b98a2031ece9e710d7dd933791cbfb3eaa48e45b9a595 SHA512 9627f466e8a363404c940b29227d08a8ad067b53383989a3d8f4f902e8c050c0e81facdbdafbb660c41f7c8dc2fbdd3bd357ca708e612af4d223b5412c6c1fb7
-EBUILD execjs-2.7.0.ebuild 1168 BLAKE2B 5e9b233eaa8f317a61565a89903f6d14a91b02965d81cb458d2586f3b788320c82b5be9d1b11ea6ffe56ed1531c7024c217164cb4305fc3938f294701529c7c1 SHA512 90378fe036dc70f8f7e316e01b4d88d7bc2f4c340529365478a7ce396b59b06b7d0dd6c0d5f5ddb10ee5418f8781462abbed47285d30dfbad4643781ea6a9d19
+EBUILD execjs-2.7.0.ebuild 1165 BLAKE2B d27a1e7159d9e9b79ed7d2f3a687d8d609fe1c73940db4a6a2601ad8fd984baef55a04512492429f6cda0a82019e989e05349f942e8936a2d3686d0c125c1973 SHA512 51f21d63c1a24cfcc1368ec9d07926b757662bbd1d031a98676f0930abc5ca41f1bd87f4e9bf51efe82ed94c5c3e4af6dabb1638842271b390057e71f32642f1
 MISC metadata.xml 338 BLAKE2B deb976ed7b368fddcb7e6b7b553ff8fc748f90c61d23f84cc251e7154f6f5f5c79c7d3d962dd2bc8061df7be36dc719ffb2c247c759e6fc7e4e4ff211eba6e16 SHA512 34e46d203d186a98cb50f83fc6508457a8ec536920b9640b7c0ce2f6f00e96643f1265c750a0f8555e57eb14ac1d19f0487bbe6e7fe5afe0870d8ecb162e2f27
diff --git a/dev-ruby/execjs/execjs-2.7.0.ebuild b/dev-ruby/execjs/execjs-2.7.0.ebuild
index be4e765acb02..94bc8336ca81 100644
--- a/dev-ruby/execjs/execjs-2.7.0.ebuild
+++ b/dev-ruby/execjs/execjs-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 4aca217b7c27..8a9011b8b90a 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,8 +1,10 @@
+DIST ffi-git-1.10.0.tgz 166192 BLAKE2B a663da1272a41464bcc3fd6a69055615beaa75aca09da60a4459034230ddb7768573e6a91e75b0e768f16333f23e55e045b6cff3be63c5138c85070903cea869 SHA512 f4a7faa02eda8e67b4c05ecc93ed1848daa9d55ec2eaf367947dbb4cf6b0edd76db1e8232db0a17828df40c3cdabb9f7edac11b44f9de00bdb69d0c9a84d4409
 DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
 DIST ffi-git-1.9.21.tgz 161824 BLAKE2B f31f9caca1c6f90d7f6bee7756630fdfaff527a96735b3a80ac1f5f0c1a860d6ac6500da06c96e99527a2e75de0a839067d1171cdbefdf9401df101d59b38d4d SHA512 c3049baa2aada3deb1d5a029ce659f802cb0533e2fa6ab6ccc3a45abda4a97fde7964dde314f45e93e4ec3e73f66aa53ff8f7a397a12c70e191f4ddd0b3ed063
 DIST ffi-git-1.9.22.tgz 159304 BLAKE2B 096f625d6f1b162cc99f70b9d0783f1176e0d9faa65dcf06c346ef0b78c495a85c50dc728b302bbd9a8648d4d589eea56c0e9791f6065bc5a87331bba92e9656 SHA512 0e2159133629f505de233fa44a004ec74196488540552c8036640c7dd770fadf2b90987096a48ca796ad98436dd63998bd4c7f8b01c871755be49b1ef6045642
 DIST ffi-git-1.9.23.tgz 159194 BLAKE2B 70b651825962c81c82795bcac1c116ef6792d1c2e75e93459d600d1633bb127a9693b58226c7a4fd60a5e57bb2bf9df95d5cee9ef32b9a1eba214a8932bb8802 SHA512 39f862b8f946e67f84f915e015b895d137d68d50b90585c0ce9d4bb9dbcb5c714653c454635ac10b3a71290811f1afb32da90bbeb430dd589245e592fe55c70e
 DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
+EBUILD ffi-1.10.0.ebuild 1552 BLAKE2B 585d5be6c8ee4c59ce19767a43bc7c0fedc0dc27c9c94076d49e84156b3b0cfb17d2277cd31be1dad0be399b30fe8c7ecafb72b166bee4e61a8e498561422f97 SHA512 167427710f3068457893e51a677c1b6041cd56ef70afbf45988aa762fa4f729360858b6ea3b26958eb364973d80109f57b84da6edb707703f66272060bebf877
 EBUILD ffi-1.9.18.ebuild 1539 BLAKE2B f8a42a2d72c94d76b9f9c4178c212b429cf799ee912a7905e806a3aa14e16b361efa873feb00ce1aed50b9e8e0357029fbc805db2596720dcf6c4cfeeda1f168 SHA512 9bb9f63adea8e800990926785cb52853e5f3bfe8cf658381dd87da9eba60051d9d344b53c420816a5e31c29b0d0de88d70542041211118da7a2637d50a8b6bb2
 EBUILD ffi-1.9.21.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
 EBUILD ffi-1.9.22.ebuild 1548 BLAKE2B 4ac2b2687b8f12bfdcadfd59d1a46627cade30ad709306ac542a52e011272930286ef0916ca05717a631df5b25fcda56f729f13ea2050b14029070ead013d4ea SHA512 26ae06b0189c80063ab90673538c282fe0a6dbdc58caca86ce606a8606692c21d8a13d12ed0c4814e0215ec07e74956dddb8192157b0705e3485155978181c3f
diff --git a/dev-ruby/ffi/ffi-1.10.0.ebuild b/dev-ruby/ffi/ffi-1.10.0.ebuild
new file mode 100644
index 000000000000..44bdff1ecb43
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.10.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 2227d985c590..4ccb76b8858b 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,3 +1,5 @@
 DIST globalid-0.4.1.tar.gz 17924 BLAKE2B 6657c916049f841f472f6320868287451d061f96501f5a2b4df8fd71512f5752d5568185c8166344494fa3f6829ec0047f54235c8ea4e01b040653b8699d0484 SHA512 da484c6c7e8155416d008d650929c6b72981d2ae2d1654eb02e414838a065dad9b4ba3c6e275abb008a0d9cad1e2d4d5295d90807c7d7fc73e55b7071c0fd657
+DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
 EBUILD globalid-0.4.1.ebuild 703 BLAKE2B 2a4db72f156d3db701b0317b817ae68032f0b7671d36f6a9dbc04e8db749d11f938fbb588b4dd9359c08a4d9ffc7e1f02e83a309ae996a74bae126830dd77b62 SHA512 816a6e0b113f66b3ef3d3424dbcbd1e1d36f40bc219e754c37f978d0967154d948f82403ebfb9ee63ed9924b2ddbb63b2faaf0c94a4aa691f4e815d0c9fbb0c9
+EBUILD globalid-0.4.2.ebuild 700 BLAKE2B 659d6780ea4cb67b7f90c5e253d5925428ae831f68d8ced852ea88aee419a7d5151626f386d56154c961dd91dbf030898ecdc596da71822c80d45ee74f684bfa SHA512 327d866ef1a37f2cb63f5b138b1703152d75e2b3c47da94eea94104b8b88c42fa33fbb510b20054bf1b1599ea0d184614439fcb23df039f8214d435b0f68cbd5
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.2.ebuild b/dev-ruby/globalid/globalid-0.4.2.ebuild
new file mode 100644
index 000000000000..e4d0332567fa
--- /dev/null
+++ b/dev-ruby/globalid/globalid-0.4.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Reference models by URI"
+HOMEPAGE="https://github.com/rails/globalid"
+SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+}
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index d4da864388f1..f6a113e6f47f 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,5 +1,5 @@
 DIST hashdiff-0.3.7.gem 18944 BLAKE2B b7d39375a0c688e4fe2672701d87148b6ff6ee18fcc58b68f71a4c449613c124022538a04ae9a995d2d20e9d40e0ab263664f1085dc205286a3bd3595c83c760 SHA512 62cbbd1631127f98be214ab5c849d4a78c9f9aa762e372412a68f843df09caa9bb3b8ff096952ff4fe5b401dc8fefff7e42c2d1beb7e647ed9216550ecd06d93
 DIST hashdiff-0.3.8.gem 18944 BLAKE2B e248384076cf73db84095060578fcf3f458eaccfee8bdf4645c98c9fe51c67fe1fe1b9affeb485880433acb52d41f5c23f8a9d1bfb4397a820dfad01dd7f9092 SHA512 d58b9a07db1044e9b9b61cf1eb9515ff5a8426f0d59484c132c2c498591c9dd73cebda8a98b180d05228fe8e1e610d0dddb3a63ea38981f6609ecdf239339a83
 EBUILD hashdiff-0.3.7.ebuild 655 BLAKE2B 78853182de5010cf0d0de76a5b447f3978d2239111a31cab13326b92cc3dd9b9e00fc2bab8d6c24d859512c3deddf70f5480d183595d7007247debd48bcee308 SHA512 fb59040ce490c67e868d9e5b7c09a4cce2d2c8797fa45e5c04818fc76581e693eb7c868277a127da61d03c6b6b2e0b7591f7f38554718986fe77a3d2ef5a1fc6
-EBUILD hashdiff-0.3.8.ebuild 656 BLAKE2B dd05acd9012ba4c55442704b3afbe6d8dd4b0399f73cc50d070fe259e87757897ce4fa62cd95f6e1eac93463ad87bccd71a535c7bc25b4cbbcc3158cf1d799f4 SHA512 d700569e82d15cc0c4d7451dc37ab6b7c62a3652d091068d02d11a81d3fb905df4133c2093a9a40a55038fa8d24fcf89b80d5fd5801f4f01c39d6742e016a108
+EBUILD hashdiff-0.3.8.ebuild 663 BLAKE2B 59830a50b34ae9895f8ea757de0f0543afd5e71ec577efea0980397fdb2ac1d119bf6376b52bfc7f818fb9f019b38f1def577c8ba7ef676f4c5c37ce99183d27 SHA512 b8756cfd4061dc97a25a653b1344fea5a00875020d6c58ae82518a822a34c9818e24632c230de223e8992494dae32f852115d3026327e7e9753be2205f62734c
 MISC metadata.xml 345 BLAKE2B 32c55c352e09a4cee12f02ca321e7581b56faf759bd3cf95afc684633c7324bd10c19fb832a1d7cb3e96787721eae0f0bd85428fccead003ba72fca53882ba65 SHA512 f241e4bd08fb29d4a2538d5b548597c5869c0bdf332e3453e55c625093bde7c52b35e7a7bcd691b9f5b2bf2cd1c90ef244d23e343cf7800f9fda4de73f6a4cbd
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.8.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.8.ebuild
index 873e64ffba48..f216f8aff5fa 100644
--- a/dev-ruby/hashdiff/hashdiff-0.3.8.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-0.3.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/http-form_data/Manifest b/dev-ruby/http-form_data/Manifest
index 8533a584a2e5..2741f48da2da 100644
--- a/dev-ruby/http-form_data/Manifest
+++ b/dev-ruby/http-form_data/Manifest
@@ -1,5 +1,5 @@
 DIST http-form_data-1.0.3.gem 14336 BLAKE2B f58410dfa309fbec55e97f5bd10e56a7be0d915a0e87d4873c66a2d0f112552450424fe3a54529bc77e8bfbd5ac019f9ec231881d48942eaf55725d618203d56 SHA512 6e438a1c0c56116555737785d9b0b624f2cbee010146d0683c94e72473ed6f8a872c2ecbd878bc71f4aa378ebcd820d2743e0f6236778b65aad99c14e9c79fdf
 DIST http-form_data-2.1.1.gem 16896 BLAKE2B b19507dddf5c072b5a190bff98c61b94209652445ba995c3834bdf47faa515cc3877afcb46ef4946b4b6ad265d917cfc0fcdba2ee98c440c134343883740917e SHA512 43e1d9a522a748ab5d1633392225d87b5b178f6ae46a9bc4296b2a71b95b54d0a0c5fa1c3d8a8f48134df7c8c5893bfd7a5db060da275f49a147385cb4d04627
 EBUILD http-form_data-1.0.3.ebuild 587 BLAKE2B 0f26ea6405c3af943933299ffce66cc16b2399e56ab9d115c218bbdc2ef8b0376db47226012de4c944fdc72e14e5dd962d4e123a4f821e961e502449f83f504b SHA512 329f084345e69ba9f2418d0781886e9823cef5521757f082c00531e459ac8364828d735345016ed0ab70f5dffd9569ce2ecb403cd0618e32eb4d2094ce567dcb
-EBUILD http-form_data-2.1.1.ebuild 594 BLAKE2B 85fa85d239039892a5bc075c78726ab6d2b5c2d389fb5a1681f4c2ee68715f1ccc85177a57a665eca17c137b930fa014fd1dd236d56919dfdc262fbf12aff2fc SHA512 23b4cc1c9eb2efb32e9dcc0eafc7a4ddafa1b183525df68524a9c04c78bde95d02a4ec8e20f5fca1bc0c16134fd17ff82162173f876eb9c2585acfdaa5fe16e4
+EBUILD http-form_data-2.1.1.ebuild 601 BLAKE2B df2b9092478268d20c60296ba4ce3d7a7c843ed8b16e9fcd09f4fe18be59a93509f7a41202883bb2773ec913a71f893b2934971971ce2ee2c7688f9c87970f31 SHA512 164d892e8aa2d9cc5350dafefc8d63ffb56c15eeffaf77ae24672b85a664006e9c645a9e9d076e162934a5f98f640e1f4d0658e6e36158032018c6efaf8aa0d2
 MISC metadata.xml 345 BLAKE2B 6301add67db13bd0df4d236cfa4042737f0216c1255a92b10ee272a3b4bfeeaeb0d9541013a460a3be689058ba31683854b3f0308232cfeae7f4d560d207c10f SHA512 6d157ee3fe1a775733ea0a808a81d68c0061319b30c6062e181cc4a19d1a5142027ddb2145fcb78c44feddd4e36682ce39306f0ade0fb5c13436cd9351e45bd8
diff --git a/dev-ruby/http-form_data/http-form_data-2.1.1.ebuild b/dev-ruby/http-form_data/http-form_data-2.1.1.ebuild
index ad9ba34aa31b..142f5221b32e 100644
--- a/dev-ruby/http-form_data/http-form_data-2.1.1.ebuild
+++ b/dev-ruby/http-form_data/http-form_data-2.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/introspection/Manifest b/dev-ruby/introspection/Manifest
index 9b3eee57dcd8..ca98e2618cd3 100644
--- a/dev-ruby/introspection/Manifest
+++ b/dev-ruby/introspection/Manifest
@@ -1,3 +1,3 @@
 DIST introspection-0.0.4.gem 9216 BLAKE2B c97279576a60dfd74453d16a6eb0885326dad18748bd182fe3b5c2a73121553cd3ea66690841df6554fd105e50f5f6df075afb94795b94dbd7caf4615ca67764 SHA512 c228827ac9d8a82a104e78daadf038c674cd464bf726fc3bd1efa82e9d9cab37f6ee909f578585e7846378f0b755ed4d60fa119fd699f6c40188ea2de4ac7084
-EBUILD introspection-0.0.4.ebuild 670 BLAKE2B 7bc257a8ef2aefc8391a3a8dafe6a5c56f39f3bbf8dec89ee5f9c26f7dda3b17befd78f619f8206b8c62cca53704626e36cab8972148b2d125a35aecf56a16b0 SHA512 73d6ed4900fbb66c532fa11dbb391aa87005fcd9d3a0cbbfdaa9d5f9169cfec4f2f33d811c5f68c88784ebca4a969d1b163e450b624164cc51a3ece35fe16b34
+EBUILD introspection-0.0.4.ebuild 667 BLAKE2B d9bd914c5f9cca3e87778d1084eb5676ad4aa975f6ae678e4d99807fa5713bf4169a423bbc82efbe8248547da774f4943266a6102f2f3ea06abcf97bbab2e17a SHA512 9972b15bc3f50a0a208dff928ce86bc453f25b514a0da9b3dce80aaf3e4662cc135a12898c517e0854b9a52ba3bf30b978d4b5892c09ae6f0db2c96acb60713d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index 3cf0c087661b..c21dbe8adfbb 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # No documentation task
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
index 34a8e1bf45a9..b41fd79e90b4 100644
--- a/dev-ruby/iobuffer/Manifest
+++ b/dev-ruby/iobuffer/Manifest
@@ -1,3 +1,3 @@
 DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
-EBUILD iobuffer-1.1.2-r3.ebuild 937 BLAKE2B 77e2f5da3ff30426f36960121dcd6e6ecd7da665fa1b04c88a33a9edb58485fe9c42ab0dc8cfd405493c932a81dd3424b409164cb83627ed4a8e5d8913029b1a SHA512 2a12ac0a29c1fba99810660e666e06832c37d0aa034b44075fdaccb717d9f085fe06d814b6b07830a7ceab71bbb8f2b92a8a3ead5e26b1e7b08c8fc5a8bf3472
+EBUILD iobuffer-1.1.2-r3.ebuild 935 BLAKE2B 2a9b307442aae36a009601eb508440b818dc5f89af317b5190de71a411a3debfb0e676552cb98c16acd787e47453984901e6eef87c48ad3f88489a491320b7a5 SHA512 77f5f5fc218da416aae5a7b8988f4fabb84c1ea8b69e03355a6d280cfc0db07228edcd29f67f3ca374caa98acc1672688f8c5c4ddad3bb6ea291fea386f4d90f
 MISC metadata.xml 343 BLAKE2B 51e97a0c05cb72583d5bf370939a36d0e5b263f3cfb5bea00545260992d6f216ea15fae876a767d7f91c4732b930cad86c0bca8d95d435c7209763c3d8b0307e SHA512 2dd75710c00d7a9984d85393bf831ac8de6e891799f9d0b7414f87f7d89e6b0e149e25b1061ddc92f7a3d941691b5b7d6edaee4f0ea168d36e9d0ef5d25aa606
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
index 836cf7725013..67c984fc720a 100644
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
+++ b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 inherit multilib ruby-fakegem
 
diff --git a/dev-ruby/json_schema/Manifest b/dev-ruby/json_schema/Manifest
index a7494f897076..3b2bec11869e 100644
--- a/dev-ruby/json_schema/Manifest
+++ b/dev-ruby/json_schema/Manifest
@@ -1,3 +1,5 @@
 DIST json_schema-0.19.1.tar.gz 34501 BLAKE2B a8467a439a05bee01a8588baf77bdf2c58f29a0a4c54cab8be248760192ca473bf24bd56859c1c36779b2ebf85744947db3c9278b64cf93fd66f1792924e2c08 SHA512 db2cc70737cba7266cadc7fa747779fdedbe94ed7d8c8e97df302daed68f0c4cc3e4f31c513870eef481b7906720cee1626513520a3c9ee152a570a05dab210b
+DIST json_schema-0.20.1.tar.gz 34615 BLAKE2B b08b580dd55e5c2daba9e434f1deccb41ea3e65e791b885287ffee2a9c0c6e5d4ea40698514c69f0d3f59eb305e0509e3d82ef7919fd8c0a4bc0117cec74e104 SHA512 9e5bbd554bf60def870260f3672283d4208224c90057d908a30ce4a3e334a0d529e155265fddcc0e4c009a021c7d77cb51a3bce816dea2cfe852617ce15f64fa
 EBUILD json_schema-0.19.1.ebuild 629 BLAKE2B 9b905724e4e6486e06cc3177631349dba1a8638b161ad12a58860e61e7ad9f6e3aa41e621ce6fe7a978865497d4c14385c2ffcba2e62b0ac93cd44881af595bd SHA512 d7dce71826a63eebae826051bd2f45aec5442b7b1acb2cc52f49eaab1b77eccd8940e86c9f5b9d1507cb758ccbc308e968cfca6b7eed07daee7b7ef5ff7daf3b
+EBUILD json_schema-0.20.1.ebuild 636 BLAKE2B 243729de2633be8dd7c81bc1633e1ef2527de390941bc6e5b6648c8ef3e3fc89ebc9617dccbf420056fa4c1da1208cc4d85188467c18f62bb0c20157ffbf8c70 SHA512 33cfc58b33b561084dad948cc376003ec52f3365695ff6f819e665aad0042264c6b99e964f192cf77bdd31f004236c9e617678a28e9ebfcc07f57f04e44a31e3
 MISC metadata.xml 329 BLAKE2B 336543b59af2964b8644691469c9ebdb21eac3b524a7602e656ab8a2bb184341ba9de381ae8220cc24dd0dbc8fd7ac70e9e6206a1cfb1a143d5273d305411a05 SHA512 4908f24aa2bd471d2a8257b32e8a320b3040e4bb2e6a516666544184890d57c1151b029935dc1ba6df774a1d2bc963a5601749a569c270812374e744ff55617f
diff --git a/dev-ruby/json_schema/json_schema-0.20.1.ebuild b/dev-ruby/json_schema/json_schema-0.20.1.ebuild
new file mode 100644
index 000000000000..ac2d6dac495c
--- /dev/null
+++ b/dev-ruby/json_schema/json_schema-0.20.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="schemas"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON Schema V4 and Hyperschema V4 parser and validator"
+HOMEPAGE="https://github.com/brandur/json_schema"
+SRC_URI="https://github.com/brandur/json_schema/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/^if/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 434e504141b0..f57a361373a7 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,6 +1,6 @@
 DIST marcel-0.3.2.gem 7839232 BLAKE2B 001e03b109617f7804e1e8f77d65eaec81544040a13e1d18ef197fed1caa5a26dfc69e1796632a3ec29c3778eef9458a6f701bbefb2f30c89d77fb22622cdb0f SHA512 0e27c5c36f219e30ad41aa87a94e559ecc0185319ab33fbff2cc54656c5ec378c9f8ebd8d8d28a644c9b64cd7106aa2b235b893c5871ddda9db3596d8b8847bb
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-EBUILD marcel-0.3.2-r1.ebuild 566 BLAKE2B 63aaafb9f2fdb29710922c3e1154566bc2ddc88726aff217d7e5aafeaafa280bc5b00617e9647e863d1c2ea2d432da084aca8452268657534c63f51e459eb1b6 SHA512 5461968cb3bea1a500d24d257b7a5948099b0b5b71822360f0ceb0219a64ab348998ea5c5da4f6d49634bcb0b65bae1801aa58185ce0a013f2c2d8edd516feae
-EBUILD marcel-0.3.3-r1.ebuild 683 BLAKE2B f3b0d82f1ef1756e04ebea68307b907d2fb4cc0be1f74b2227c732bc9d95096dcafc7251f7609dd7bb79566824c028f609dca6c2087152234b35eb54d665643d SHA512 c56158288fa14550f4a4dcd0ac01286ce817e43da7979578c11aba9a6c8c59e9737a0ca500c60aba5ab37fe03cba3d0d31a31a6bf97bdc65be8b74085f0a2a32
+EBUILD marcel-0.3.2-r1.ebuild 568 BLAKE2B 895a429a33047899c4151357f77857c48c06b34afff4b6660daa235c081dcf605a79d1919fa99d188fe58271f1177f2600ac3a8aa96c8737a2ffee3064ceec77 SHA512 43eabf53b7f06471980fcce147644f1a11612eaa385c616b01fd8cb8e906426f187f1415ee3c2065a345dab81ffab61fdd759fe1264145cdba06f13d30c185c8
+EBUILD marcel-0.3.3-r1.ebuild 688 BLAKE2B 17c6b346b25e9512f209a98ea20c9e42af3895527ab78b1f43266f3fa4efb7ed46b9cf0f4618b503e33aab2f774bc375555e5b90173084d8fd6ae2503be77671 SHA512 73c3b43daee2a90055496965dc58155c733eb4b0452cca9d5995f4433d7c8cc39ae887f5a222fe08cfa7cb9a34b7bce8cad5274fa2d28d8af8a072dcb5af8a9a
 EBUILD marcel-0.3.3.ebuild 648 BLAKE2B 13ac4ca605f00dcfb023b5df9c624438603519e0be775e2a92be3bfa55df7190dab5141abb6adf82fc67f322fb20583a4ccbd08970a20e26d01b79ca0863e3bd SHA512 7ccf6205e2a978f58f731c24024301e026c1c3d6d391d90362c49d267f1d05a6e7ab366628d6d8c0038491334c1e24fc03c1f93c6bdddfcfca0af04c9640e970
 MISC metadata.xml 341 BLAKE2B f284cd2a1df740c004e9af77a1aaea9254ddb1672b567faff9c65be99171a69abeedbc229a05db711d2f91f5f8bca0f7e2e6c5442a81b1776ba299db47ebc281 SHA512 1c71acef93507dc8305c65be9fd3e90978f6a2a14781b019f06762aa6159539596404afc32c0d9c718b361ecf90cb4e93b0b0186e7b110d895a14216d25b3360
diff --git a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
index b6e40ae0998a..30c7c7144c23 100644
--- a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/basecamp/marcel"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
index 151ea3bdb352..74d267954bc5 100644
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 50ef998e8760..1d3c61d6b7ec 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,5 +1,5 @@
 DIST mime-types-data-3.2016.0521.gem 101888 BLAKE2B 7711f4154936c200d678c8a94f2bdff8a2fc2a9abb54918563d4c9018c77330f94d4f6b3eb5a64acf7a85c7a27dcc41ba14f1d9e8cb5dcb238b7a1b6b9e70655 SHA512 3eb23e446f25a1b058408bec4f4867177ce42f579d188e3f8f1f31d8268e6566309e7439cdcafec214e54e3b22b7c29896c859bac26556b5573fc149eefeebc5
 DIST mime-types-data-3.2018.0812.gem 157184 BLAKE2B b43b7bd6200182c402fe74f9a3f8cb1bc39a643b1de098ec6427ec66e62b6f28732032f4d6305f1ff267a61f60a12d759950b1a8f25c396bb2a7a6acc27b88f5 SHA512 8c60151f044a03dbb28da231994e4d5e1961839774791ac9caf3332353000c7ab12671960f791a03417b4236b9b6c9f690a5d228b7c5ec0d2a19b1a8e59eadb1
 EBUILD mime-types-data-3.2016.0521.ebuild 642 BLAKE2B 1a8bd47ba1e3717b7833df7751184ad1447328fe5e70e6fdd433d72353ae8d0c1fb7a24bc1a12de52a0287d44ed87f40f8b0162622754d0157fef20559d48572 SHA512 5d57294dc65788b911c3e0cb15f761770606f3ef6f84f370b4e5333efbbf43483e906af79ed2d051ccc35e4f630b9373c6e77d23de19d480205285f9ae9e6716
-EBUILD mime-types-data-3.2018.0812.ebuild 635 BLAKE2B 907968e7db7ec0c47fdd3567a7e6b7a88a7e15ee47058702ea035b8efce84d5c2fcc0d06a4e1137f936c3ef494185e0e2b60a0f9128d50718262b2938b1c9370 SHA512 77fb664a0b015851dc40e32ac26d8822a2825d558854c764c5dc222a95774d7564725cc46d7fa802b13f4723bd6d9f2fdceca3250f1b0cd51c277977912fd29f
+EBUILD mime-types-data-3.2018.0812.ebuild 672 BLAKE2B f3c49ab29b7f388a91d7020de08364c14f7ce646776a6c1c7446c63b0ba33c29142c39defc2d1b7df9255647a9846afe6b4a1ba9d488c8f81348933c847867c9 SHA512 9e803e81ee162d6271ae7f40b4d27456b8cb0cea2cd6f3e4f32b92bbe98a752ccc9bf2e1c8a596cc31a19b9a62dbe4f4ebd911fa4e7522eeeeaf7a19ebec85f0
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
index efda391d4421..0aad44fdff45 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2018.0812.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index 761a3a840053..432544d7d785 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -3,5 +3,5 @@ DIST mime-types-2.99.2.gem 149504 BLAKE2B d2088d606b0210a8607d351ce7b7e3b7f25c3d
 DIST mime-types-3.2.2.gem 35840 BLAKE2B dd77473793d68007a3f096971366b5c2120391f3bdd5c758d8e4fac2c1df509a9e367766ac8f1dd292e9b000beb6346d22f2e21c599d2d9117cee84ae7fee864 SHA512 e098df6001ddb53225cf2f48df4e13f2cb9c5e86f64dfaebfba82ed9f1d60149b05069800ea14d1d76554d760169f3c3cb506cc3c789c74da7e1c8df61d67b7c
 EBUILD mime-types-1.25.1.ebuild 930 BLAKE2B 89306f2bc2bdc4acfa22985d105956a9cc446cd49f8ef3efcc8d6df307958e5e6dbd27192fd914799adecef52003c8dda784025a454a0b7c2b8e7ec994bf7aaa SHA512 38aef1f501418bce5c169ddc81c669bae21359c458e1c78d61a669c25d4fdeedb032631733191721b8b93a0b5f887f695d3e8c243f867d95af9a241d9f7c08cc
 EBUILD mime-types-2.99.2.ebuild 976 BLAKE2B 5882d6adf5ca0ab24aaae566f75382cde94d8dce011e15796ed1b0e1922ea187b7c60a78ccd7b6a24ec28fc54b6fcabae16873afc8dc61c971b673a866f3f3b8 SHA512 293cf6a57db6df47523557235520aeb0dbfa95cb9dc904516a49971a6dd490c5293d108ad135bd5da98c6d05460c2c31e6e8a357d063a733870cf1753c767bd9
-EBUILD mime-types-3.2.2.ebuild 904 BLAKE2B d8eeae6d5b2f44358a660ab305047d1b43d6ebac72026bac0967648975d6e059e86cc46253ee3b39c1c0db3073e5ab0bd6975430401189a4107c616c9a882dfc SHA512 60155673e561aeeeacf2c5dcf57266943f4c8769a5aa29baf29b87e55df38b19765f9bc4e5fa574b1912ea6ba073eff1772e8e6f32806288e07bfb12180c4f0c
+EBUILD mime-types-3.2.2.ebuild 908 BLAKE2B 3c57b3bebdb3fe7e9a7aaed32fc722522635c223b24bfedf597709192a0f2dd9b019d6af22ad203eef46db80d4395108792a7590ed7bcfeb6ba7872255cbefa1 SHA512 dee5ff83f48a108b40b497c9cbed47c931542de941f1071e34e24e1fedfddffbf2a7d731495de7535c0e73eab1d13e498289e835ec68a3087ca54ea97a5842f3
 MISC metadata.xml 352 BLAKE2B 6edd7bc99a1f3c2522e87695e078800275b4e9301597961b8e9ba3b920f7b75c92c8133860be4642995d2501e9bcc6f8f7cdbf611d85aa8ea23dfeda9353011c SHA512 01ae71ee2d991c0669ce4f9ac252f8edcdbe1df3f2510e5497f9a0fd0bcc1dc10a10259dc1b3dd14b73edd58895911d363b6a60105b619033a2bf09f987f4b5b
diff --git a/dev-ruby/mime-types/mime-types-3.2.2.ebuild b/dev-ruby/mime-types/mime-types-3.2.2.ebuild
index cb6a7ae60f35..d077525073dd 100644
--- a/dev-ruby/mime-types/mime-types-3.2.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
diff --git a/dev-ruby/mimemagic/Manifest b/dev-ruby/mimemagic/Manifest
index de2e88beac2e..e1d37010012d 100644
--- a/dev-ruby/mimemagic/Manifest
+++ b/dev-ruby/mimemagic/Manifest
@@ -1,5 +1,5 @@
 DIST mimemagic-0.3.2.gem 366080 BLAKE2B a99db4fee3a41da872a95dcd31126a497ab47cf990d3c390ca1552f632d1dba5abf86378f2500b285f1cf9f78a56040ee6ee501f641de788e11fd693a655d839 SHA512 0d919ecf7f787c1b72ea337945089070db3647976192adeb510985542962a9efc9a2dc62c51024a9a32afbebf804c21745cc06d6d4738f570f1d2eee0b1ae181
 DIST mimemagic-0.3.3.gem 402944 BLAKE2B 422dd8bcadb2f04fcad2956339cf66a9b5c256462775be9c222b1be968ebde185e15c1fc0107d495dcad6dde59b7a35910d0139740d96a474ec037ccf181f2cc SHA512 ea62cf519af76324ed62863142422a4b5546927b243a9ac45c37ae0b8bfc97813b2276a1fd898bce470b091b1818190a0dc1637d167233a2e187d78e27bb8b77
-EBUILD mimemagic-0.3.2.ebuild 524 BLAKE2B a25c1ab0695c538c5230a99a1d3020bb3ed9dd434d7ac01ba0bc722d0378ad362ff8ae7f185939970886d3e31060fdd29be59a3cd876eb19dfb7b494ba09e124 SHA512 724c0fc871c29ab56751db9969cfa68790e5b40f0f26ed5b9e714d99b1805a39871a554e4c9f15c7354c79a8910bfdde22c7c959b59b14f1a6ff66ff59b1eeb8
-EBUILD mimemagic-0.3.3.ebuild 447 BLAKE2B b9f1987f128e16f14d579840e206453060e9256febc5319941b5e4b0c06df44ffb7fa94be7f02fd12cfdc0fa8734a02cf733bd7570541ed901ad046e74e5c849 SHA512 9faae4e86518d14b6cd776057f27c848a8771c34698103cd98755cdd0b02ad921f453a549341244db66969f5e9fe145f33a58642b6a73ff82cc94d9c4c42598b
+EBUILD mimemagic-0.3.2.ebuild 526 BLAKE2B 0c8c32a616b98e0e2917dc488c38809bdaf9134f193d745ec6fe2e93daad6d4a4dc1e991d07a18c0e17ae82991d9baa5f3485a5297eed12eaf61c1725863e3c2 SHA512 be261d80dbd1245d94ea003c8bb771de037115d2b28ff0e2e960717fcddc9eaff2a80995f543e54eea2a0092b5d79a4758c2c041cb054f1627566507583bf29e
+EBUILD mimemagic-0.3.3.ebuild 452 BLAKE2B 608a00e39a53a1883875ddf914f91b4f6248cea2ca32bca6a75df80562a15a67071fb907a12eb5abfa326be34c4399133637b1ed563a84625f0a673cd91ddd62 SHA512 e741cf4a46f613c9dd5ed0941b072257552000b3847f9370ed2f4532dcfd359ac60373980f99648d3ec14b19b507836d1b9797e50818e87695ad56a44e59ae62
 MISC metadata.xml 341 BLAKE2B 6d21edf9da7e6ae6913d3101cb96b5e82376e080baed3c07b9d4a9259eb0c097522b35807a89e4b9b32fbc6a6288dba17be7912bef5654dbdf32c9b34da567db SHA512 601856326d3da975f418b59996f89c68b33d089d662b684b9db13ea79481f34706fd4726a531f7f2fee55f25e2c7b3d1ecc69cedab1ff627109c80effa7bc406
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
index cae92781843a..0509dd0afdc0 100644
--- a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minad/mimemagic"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bacon )"
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.3.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.3.ebuild
index f396c7444a18..3105ddf86286 100644
--- a/dev-ruby/mimemagic/mimemagic-0.3.3.ebuild
+++ b/dev-ruby/mimemagic/mimemagic-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/minad/mimemagic"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index e5655f2e748b..a788ecf20cb9 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,5 +1,5 @@
 DIST mini_magick-4.8.0.tar.gz 1184374 BLAKE2B 9949cb8b668d5b31c8a9b19ac1b68147e4865cebb2d51b75c01dad11bf98a64609acb90a08f08867f173424bfa720f83e475ab08853c11fff29e86e7af5bcba2 SHA512 7c582c967480f51114c42eec2f8c260713755fa3e6078eaf5a296b0cb4502f2edd1dd65d5ef46409226943913b81e8818fc3066a09879e9da7dcb0f9f732f6d4
 DIST mini_magick-4.9.2.tar.gz 1187916 BLAKE2B f619bc6fd559f76ecd45b91bce4ef8e75ec67e65f0e1a8c00d785e49491b9de81e320a3496f3ab5729f0ffe33e18afbaab762767b0835dc0af8bee0ec55cbd28 SHA512 c0747ddfdd304f9f9a820dd45e27d09ce723689dd989f036194c9177c7f9fe746dc85c2fc97a858c679a1cdf31d0fbacd50f6f927fd0d1905f5edbe3df2972ff
-EBUILD mini_magick-4.8.0.ebuild 2289 BLAKE2B f57f049bf7d9ae968cd7d2200dcc7cb22ee67af9a777ee66c1135bd2e1529ec695edec4b18ff7c11dafdc18be95ea58beb0008ec7bb36b1c56f59a6a92532e9e SHA512 9cd11f65288c59b3ffacb48d1955f1ac094c3591030dc3d139b697f011762062f5c3470f424e3284a2f7183d34d8218b0f23e3d0299ce5c04b60e84836365873
-EBUILD mini_magick-4.9.2.ebuild 2304 BLAKE2B ce52a173da14dc959a48df7344dc66f94e7ec7155045e0d2617e72cce11ea376c65c7cc3905e080931c6be3fa2ba503f117d2096c3cc6ff608255a4a00a19a83 SHA512 834e37dd02ea24fa979364e6f6e30390cc69eb153ff26b0b2be0b0623eb5f6dfe39c6464479a719c63b4b4712d05215b6b2ff2348a0970aac49f85041aaf54c2
+EBUILD mini_magick-4.8.0.ebuild 2291 BLAKE2B bd44f370e06142e2bed83a2711888b57bab438571a387182d0a08624a58ba307eda656aaa0fef0225b065eb94c3e729a2832791e16f334eae1fdb5a4f45ec9b2 SHA512 1f7ed9186ff8c24834da747a18616208f2dbe1dfa3d3e4b516bf1c19e0ac8744946315be274d8b2a40f889b456db6efdfb063fc28d6cade04d18916c904a61c5
+EBUILD mini_magick-4.9.2.ebuild 2306 BLAKE2B b91827fa58d1bec840fa5170853b3d6c1554253ec192b5d38b30d9a436dd265cf9b558781228c24ce69bbf098263766205124e46121597ef9a6534870a3fcc95 SHA512 14f541d18465afef9f7f1171ea60d509594103f158dfc9fcfbcb93897c5dcdf9532a76940398147faacd285887b0264933b1d8c021b9fd47d18e6445f6396411
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
index d6c5777d3499..233f046eeffa 100644
--- a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RUBY_S="minimagick-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # It's only used at runtime in this case because this extension only
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild b/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
index c08a0f9de12f..719b20c834f7 100644
--- a/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RUBY_S="minimagick-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # It's only used at runtime in this case because this extension only
diff --git a/dev-ruby/minitest-bonus-assertions/Manifest b/dev-ruby/minitest-bonus-assertions/Manifest
index fb2303436f58..ff5178ed128b 100644
--- a/dev-ruby/minitest-bonus-assertions/Manifest
+++ b/dev-ruby/minitest-bonus-assertions/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-bonus-assertions-3.0.gem 13824 BLAKE2B 415f8b48875b8335ded9fc21b5430b575d3d104179066de19aa58d1602da7ff9994c8ceb49b1cf34fd4c8553c76999bf1b638d2c44761af84d510ca1e276cec1 SHA512 8b07e5d3be7cf68be53b06f6b545445efd9021ff5423bb67c4b0e8e40aa004d75f34eef3fc23ebe83bceaaa064c57a5ac1b9969a28f48203a6ae4c34092c5621
-EBUILD minitest-bonus-assertions-3.0.ebuild 860 BLAKE2B 0fe39a421c8cdb77e64f021fc4de9c9d2a8f36a9c603d3bb813f8eeca1ab918820bb1f8527f8964d2b25c71c1a3361f0eb87347bd2fba4e7d2c5e3c94a72b937 SHA512 c0008ea9464daf3bb4aeed77d7a39888acd926f1504d05f566a80e6f4e4bf375aadc269a50b4d4b8b606a10323e37f5f7a33059bedc33fff2825141d4448030f
+EBUILD minitest-bonus-assertions-3.0.ebuild 857 BLAKE2B e538055e2276257a073dc7f3bf00d618dfd5424471a0ebf01822ad759ee906f3e21e0b1aefb0e78ab2e87f3ddc1dd33349c724a414352b9b44503c7267a5f942 SHA512 2a515f7edc0a95be6e29b945a3ecccbae5cfa976ce22ec6df9c36bcb12a5fe910212a5a3d03430c544149a6d3cc642abedf8f8f695118c68fdb50ecee65c38c7
 MISC metadata.xml 362 BLAKE2B 95200bd3aaad44ff65f068e52fada9744ce88f2f07fa11c4da2ccd1b02f769255b42dfed8ac92dee531a8c736439cf9806e3ce68153d6197e484178a252a083e SHA512 271ca99c64e529107a901b00168c4b8f2039d7410166b6e2fa75be591bb889d30d693c345161c71b4484d188683328b4656eac3859ec90900fde35c31be14018
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
index 3329c231d2ae..36c0fda53e28 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/minitest-hooks/Manifest b/dev-ruby/minitest-hooks/Manifest
index db90d44a3095..46a6df7f11d7 100644
--- a/dev-ruby/minitest-hooks/Manifest
+++ b/dev-ruby/minitest-hooks/Manifest
@@ -1,5 +1,5 @@
 DIST minitest-hooks-1.4.2.gem 10752 BLAKE2B fa02dd6885acb285bfa45bb3a1a7cdafa136c916ef794935d0439e4e1f13748a0f17d1081c1d3c963a0b1c9936b055079bfb1b53c466a0f5daf5c04563b6969b SHA512 f6f5a96bc2cbb581b5b6a8cab507da8c560b853ff722fcafba45d08fde1e75a41da5bffe0287bbb5a861eef84145a38a6b25d3e671fdccfb15c0fce3bce85804
 DIST minitest-hooks-1.5.0.gem 11264 BLAKE2B 740df3b75ade3372fbf75ed7bd861c70af6f11d8cd1f37819272b98bc8cd1fad6ea09375856cd48a75499e0a692411c6da4f5aec212ebae91b47531c4bedda54 SHA512 4e7c969485c6e8d3414710b787c8880ad26b71de9f0b4a93ca1bf343deba426feee1cc06fcc51eee05c4880d851664fff045026d44728e217607e4cb32aa8f4b
 EBUILD minitest-hooks-1.4.2.ebuild 527 BLAKE2B f4bd8df3359ddfe4881d83851c4ca26e2b1ecbfac7d967cd5da9f1ca7f2d6d5e9d77ccfed7ffc7ce096bac48ad3e2512b7100de5f44c709fb22db48682e167a9 SHA512 f72b349c9ca1cf323eec8ebe6e910a6edc970559491d29a681667d4aded5d0b7b2a26f85148d910d84fa876d6540ec90ed3ef4e76ea2d81546ded4b6d972f55d
-EBUILD minitest-hooks-1.5.0.ebuild 520 BLAKE2B bc99be74e84a328ded88a8857da7dccdac16b8244c2acca4a248abcb614af20f5aef70e15cc6693dd4540ee84925ac1da98d1f82286589681f1aac03340aec60 SHA512 6647aba29e7aded969f006c4c636f9ffaa37576f36b1c52f9cd999b81ff02527d31a175a3e7ef709719259414ff4600442805c974e0ceec019838d7c2b625fdf
+EBUILD minitest-hooks-1.5.0.ebuild 524 BLAKE2B 0bd1067fa36e9b0636f7cbd7037889328cef52b44fa9a7bdd7db8c1601895aeb3a6c3c6761a5af0444efde7f04a846c048e4c41230a4b2d529894dc5a1459e29 SHA512 db96997aac2f12aed4a1138c8b98b08b8ad33d1943f195860437599a186d04ac0987ac41c97d4cbf8c485dcef4d6b83525fc6204bd0d426730a1d5a40bc68775
 MISC metadata.xml 352 BLAKE2B 539e21ac97fc133fce76db269b77e686bdd01610202402e26cf6d32b67cf02641e0093b5fdda5af861c2cdc2223c36e24806bbf7770b9066f09373596fc7e9b6 SHA512 f4f19a80cbd7f0c0c2465bfd1b86ae33d77dbbe5555f25eb0602b6f21d80b6160cf7d7a9f6b863440b6cc728283d75c60cd1e16e5b496eef34d72e6e5ec1b0da
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index fe7525d34772..31a276775c63 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # Skip tests since they require unpackaged sequel
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/minitest-pretty_diff/Manifest b/dev-ruby/minitest-pretty_diff/Manifest
index 483432c7c30c..bb73f22e199a 100644
--- a/dev-ruby/minitest-pretty_diff/Manifest
+++ b/dev-ruby/minitest-pretty_diff/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-pretty_diff-0.1.gem 4608 BLAKE2B 4002f4f2df03885a0c1f13c5561bbf48ccd707f44af44f4e91d4f6337a31791754b3e38160f088abb7aee8ec6d9abb6734d3305dec808033697611864559efa1 SHA512 e04cbbdb9cd12f2b60824dc0e20f5f3ee3e97b6cf3c8b290da941f26af120fd8eb47e33cb501380954ebfd84db817095f2f8a205ea8ee2095868befd443172b6
-EBUILD minitest-pretty_diff-0.1.ebuild 680 BLAKE2B 81b965d7a4bddaaa3598d8b74a9e4692e45b2fab423dd162f9151d7c478ac159ea620d44dca79474523f5524833419d4f25fbdc42ecd3b0e3d95d063867d9cf2 SHA512 87ba86fb9c5c164910d195da2dffdf88ce6b341ffd4d11b0898171e5d216a1b1b14f788c1dfda44afaef82766ab176acfe41f85e2e90f9cf53075f9f53bf67d7
+EBUILD minitest-pretty_diff-0.1.ebuild 677 BLAKE2B 871e2a3faf3f4f0510323c372b83bb775f866f54bd37f069dde21d9d2f3cb474bc20bc794772934578f5b59957d804dec046cb958e59694eb8d8d2ef34f9b7da SHA512 9b4ccafb2fd9c0eae235f6f0c57ec246bc91eec127338d6104e6487d8dc83b1533bde461b647496dca4813a0f286b8a79c6c3d941e59ad5a5a78375106ec4504
 MISC metadata.xml 354 BLAKE2B 2e5c062ea73990a1eaf3b5f4bd4f4cd1171e4590f0065dee618eeb46e796d75d8c6c9f7a54f7fbc384a8c4ea8a3d3c9071a48a1483b5cda277177430d06d9a5f SHA512 88eab741974382c3cc5fa28e639b0c5d8cc5f74d9e6135348e9ad663ada2ff2b882dfdc99472bf47586db537fcc1c05939b2c7bca6ddfaece511c58ef810348a
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
index a805716920df..7889250ca547 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index c57917c192fe..cf0d4fe7788d 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -5,5 +5,5 @@ DIST mocha-1.7.0.gem 96768 BLAKE2B d6b2f14bb1277473c3393b06e2f4830331bcf4f2d02fa
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B b985c2344c88447f1ea966e5ba5d979acfb23bf754565476709b8ae2c46400d3f7beb86f6feaf05d8ce21d3e5577702bdc86c6ea762b5799e461f3822f0217c5 SHA512 d6020b9bd76a59d65d517a5abb52bf1502f05528255905c4d7ab29c544399f03efbc0365ac2ffb9b2801be579892f3e434242738487cf1d1c7cfcf5f861ad8d9
 EBUILD mocha-1.4.0.ebuild 861 BLAKE2B 577b11e5c25898995a4c746eafd1ee94759441a4a8a587294bc4e6dcaa47e124e880cbfc111cac87090d92a6158830245c41bb0e1d76fec24bdfebab1d472a53 SHA512 8a5b83231eb7e8d1a77eb4257121ef157b86c7fd08801d97f6ff483e03735f0179ce51e73a74b8ea232f037bcb711143cb663779358a616c89cba7bf608bb156
-EBUILD mocha-1.7.0.ebuild 861 BLAKE2B 0b13752935b297a680adf8554cd03d043cbb2d981e495a3657bf2b32dc48562270bec4942dc71c3fba3e34f368f8b87c8e95897d986adc42ae822b3bedbba58a SHA512 73daa47410d4144d686a8c1723645867f96658f5c609b44f24b73884e1591b541fc60482cd84da2edfb5fc0086e63623f5cedfef37f187f7f007c32b96f8b188
+EBUILD mocha-1.7.0.ebuild 881 BLAKE2B 6c4a23c2fde8e6ba217d09aeff94837bec6a2b8d2199d7e08e4f98f7ecc87167d2115b3aa42cd1092739e873cd054fc7bbcfef3516d0e26be4fd972e98a6b620 SHA512 eab51b5cb550081d3f2c9077a3a6f3e02372a0d8303c90642a443763a776a748dd17e6508d03b089e98a9e2a113ad5026b5d60d26d826883ae42900948a898bb
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.7.0.ebuild b/dev-ruby/mocha/mocha-1.7.0.ebuild
index 7522eb9038e2..6c4f2f0231e0 100644
--- a/dev-ruby/mocha/mocha-1.7.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.7.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_TASK_TEST="test:units"
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 38a094deeaa3..93c3d16087f2 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,5 +1,7 @@
 DIST msgpack-1.2.2.gem 78848 BLAKE2B b3ae75ebd6159a78c6a31ecc45bfe0474d5fe91672b6c9dfe96a561b07ebb5bc9ebf91477bc370fba199c5a8c187faa4995a90aa0209b8af81e6d06cd2e58b7b SHA512 7f7fa3350485c3888a42a78fc53f91029208bc6ee483b4c1a082dfa515d435295b6d2f57e9c4cc3f7805349e4a21854585997075d2535c0343af4ae1ec66a802
 DIST msgpack-1.2.4.gem 78848 BLAKE2B 5e4c0f75e051bd1da800257600a44a712a18430b77b1c6ceebf1b6452bda0169fa7fdbd3dc5230b76da226965b32e1581ab3c27be8416c00bd90e827b22bce51 SHA512 dc2267a8c2f673ce6c8910e09841ec01bd84f06baf68b9c9ba2c0acb905d197ca82f481748ceb7edb7dff5359c4d983f381882923a1d935bd5bc536bd2fa60be
+DIST msgpack-1.2.6.gem 78848 BLAKE2B 06d0125f773d3fb8a15808e84a4661f51b0bf4c3951922697ae1bcb658eecc8e81eeb99ee10e23722b878a4be48c88ce8dc439fadf9f1a59f22bb5a1fdf93db7 SHA512 cbd28125826a2cb2db1fd6869443671da3093b8c834949741257abe69d763d1296f97d155f9a0d2bee53424b9a68c2b78ff8e8b00bb5f95dc1e6a34ad51981d1
 EBUILD msgpack-1.2.2.ebuild 1134 BLAKE2B c96c7d377e63ae95ffd1916ba016489b38c9c34387fc5b9dd52a9730e633f3b3b661f1d8d8b21f7f66fcd962a525d8ecb28ec6af509e44a0605eba96d5231601 SHA512 2345264a73acd9e213d5dc5d62843b83e06bc6d813bd843519b1483366c0a42c3168997329d71b90304f9d2d67f53ef74196ba6525a9b9d0247a10c66820476a
 EBUILD msgpack-1.2.4.ebuild 1101 BLAKE2B 0582ac0dea935e463e500f1a164a40e185df13360197aafd89b374c08adfde0c84854fbfb543bbd870d4cfe5b80a55e1069f271dab42024721cb9f3fd5e5772b SHA512 fae3728d285f338c8b00d6f4765ccfca17c8bcbe298352ebe05b2b1115fb1cd5eac15d0d51140d81e29c6d20a59e8ba14f8454cd45fbbdae5d8f8c9d287effc7
+EBUILD msgpack-1.2.6.ebuild 1098 BLAKE2B 15e20d0635952c64a67b8f53c89a825a7a2a7b06331c302e97152845cf186bef83288998935863ca90de5a4ba7a3a6098a89cdb25761ac800ddb80e94ad255eb SHA512 ac5727d9d74b398355b4585cc8f69b5c2d3e5a71aa56a45cedf5b7271ba93e4412511bd7e4644ab63903d04d540beda8d89b0cbb68be97526788714a8b80c0d9
 MISC metadata.xml 331 BLAKE2B c964da6cce4e1e413377a6bf37282aa6ba207c33f3682ca5738361bb0df8c45dec063abe22f3183354b79b70707f897382a3412de1f6b185460a26ac2006f082 SHA512 5cff44a3b9425bbdccb3b682a26355c9526931b2826d7ff91da0d6db5e0dd139ae556a47dd06757b5cd209413b67181483189ba2dae819f70ffa58a46751c4c0
diff --git a/dev-ruby/msgpack/msgpack-1.2.6.ebuild b/dev-ruby/msgpack/msgpack-1.2.6.ebuild
new file mode 100644
index 000000000000..2fb63620569b
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 1afa8ba3cf09..47c16add2809 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,5 +1,5 @@
 DIST mustermann-1.0.2.gem 51712 BLAKE2B dedfd8c4f5a2819ffbf3a7f5462e656d7e50e28e773abbd391bf01c984eb0a25274ee1c5080da0ec5c2f9ac88294be4975ab4310502dd83ac74010443ac582a6 SHA512 89f27ebdcb6df3eac82159b77d6fb6b87fe3c0409e14975abbbca01675eb84c6b49c52ccf75ffa779ff0b476b904834eb349ecb416324e6c61a360d583aa16dc
 DIST mustermann-1.0.3.gem 51712 BLAKE2B 03672295ec33dd5320a40a2c5e5f78ca83a055f73e1f2f8b127f13cd04e0ce5f7bf34eba68f49e253c209db4e169b2a51dd21541d86debca0797b3dc2b3670d9 SHA512 776ad3f24e1165155def04a6e1ff18ccaf536606dafc3fa19b8b2c2576cd316eaa9b72cac37bc6ede3c48c7ed6c90e99a4388f60cdeaef0bca461e9caa4bb4f5
 EBUILD mustermann-1.0.2.ebuild 534 BLAKE2B 6a5bff5ae07062702aaa74ef0ea40b370a107782d678c6394fb92d34d66f8d7e233311fe95dccf14f4221d85a156bdcf5be352a0acbf19ca1e68a0e70913bf12 SHA512 2fb1737b3b5d4db3b192859af706cced0e0c4f9fde974b06bc952134693fb67d4eced5d3d9b67840dcf56278b845cbffd53f8af3fff8c2a04195519dcc4411c6
-EBUILD mustermann-1.0.3.ebuild 527 BLAKE2B 6e68f9724a03222f2a4533d2920b50126c3703539ee009b68c223d15d54c7ef23a530dc8e643d07183d64a98fd69af3c9f9f3f6784f9f562ccf46cbff0d4f3ca SHA512 8ff348415a25907783a57b29265baeeb34128bd8b0f46cc5e2d750e5f418bb72b43bb3113c1ae2f56945c4ffc3b2e3070f87763789e607a7e9519fb54590f639
+EBUILD mustermann-1.0.3.ebuild 534 BLAKE2B 759d5c84a596663825e5ac3482c366814c31755440d4234a3d09385ac9acc3351c3ea2c61818512d47da40ebfd1891e5adae803071fa2ce1ab6b6f3eb6090dba SHA512 74b63509d66996becbc857126e55b3c893400f1f0ad4f7057f20d30107dac670e35fdb01611f07fcf7be767abfab0c8cfdefc9d5753abffa486c19d1b647372c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/mustermann/mustermann-1.0.3.ebuild b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
index ab69d4d64065..f9c833d1ab34 100644
--- a/dev-ruby/mustermann/mustermann-1.0.3.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/nenv/Manifest b/dev-ruby/nenv/Manifest
index 5d89e958525f..7acdb9321b46 100644
--- a/dev-ruby/nenv/Manifest
+++ b/dev-ruby/nenv/Manifest
@@ -1,3 +1,3 @@
 DIST nenv-0.3.0.tar.gz 9773 BLAKE2B e3b53fd60ec89e8c068f47321880189750311192b33658ef61120390f4254a3194a8afc3c67acc0e9a2601f64e93cbe02f004c1c345f378f0f80fca3b3a9e778 SHA512 f0a50d7c78573802849b383351f3d099e55c67b935933bc00d55b752c1af944a4b7a8054b2cd41b238b192587f5bcca5de9d5c577764502300d571446de24228
-EBUILD nenv-0.3.0.ebuild 668 BLAKE2B f0dcdc27039f8399dcc416777620fdbd1cf9bcf4bede1b2ab5a3598097f2762bf55527f6b13b5aad9757bae0501d43f380000a58c843762bd93d98ea76a1497a SHA512 5f62082008b0dedd20dae231e694834927afeb412b03e766cb36032eb4fc4d095921964f393a59343add0138345624b5cc614bf22ef17dc2992995a8e0c10023
+EBUILD nenv-0.3.0.ebuild 672 BLAKE2B b46bbcecc92d55b1bd81fa09d62f3843e2bef41be456b594dcd70afdb906fe4792ddc46ebfef9730b4f50588f27aa77bf7c47e0267bd602b6d6f07f05fd174a6 SHA512 d8fa0ab35812218606e016c5e7ad16203b5bc0aac662aa6da3deb679cb5f35d3a328096bd825a10ad84ebd4ea3be84a22df141e8b9ff78969cd1b3c457cf26cc
 MISC metadata.xml 333 BLAKE2B 0351956feec9471995daa30673bc189441a7b89449915909aabc270089117ed9149a390f05262d09465d602fb7dbd31dd40ba3b30f4340c68cb9340ca7f9ec1d SHA512 84633eb2251bd7e09096d8adbced6c2d351e1d47ec1ce0c57fb953565b33c515896e4c0fe4828d3ea530e6f8ce44d5d5b8d54c5cb0d0d4777c29ac480309bf72
diff --git a/dev-ruby/nenv/nenv-0.3.0.ebuild b/dev-ruby/nenv/nenv-0.3.0.ebuild
index cd33a9945bb1..702d96607518 100644
--- a/dev-ruby/nenv/nenv-0.3.0.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 11ca70df796d..60a9497e5f51 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -5,5 +5,5 @@ DIST nokogiri-1.9.1-git.tgz 5784212 BLAKE2B 9055a954a52deb10e2a937267d7b382dd235
 EBUILD nokogiri-1.8.1.ebuild 2723 BLAKE2B fcbf50d99b8f9d291f06a54c81769f204ae40c0ddc12ffbd2fae56492ccbbc6e9d418cab04d397b37192f981bd3668ba72cc5a99e62ad486b1db7916c3db7794 SHA512 0b9afd7dfc9accefc1d426b14776ba56675d8272e1ece8ca4acb63866672a5a5613630f488e1d87a9ef04e73fa418ea30865202a5f27c1e124f83baa3a98191a
 EBUILD nokogiri-1.8.2.ebuild 2732 BLAKE2B c9daa660aca193ad32773a78dfe58bf43c40d04f64fb79909d58e81515eb50e2f2a8cb85040204512e6a5f85f6f101cb8cf9e3a30d3041c1354e30a1bdbb81ba SHA512 c95f2468c3ebf8d07dcc8daf485a070b8179312926bee6ed6a6b47494b1125228f96a9359b5707d979752a3f463cf713d63f119f0716209717279da5e971d843
 EBUILD nokogiri-1.8.4.ebuild 2725 BLAKE2B 76369d03a97c7bcf4d040a4f61ef731da24915ea37cf8c74975cb2088e761e4686f64f2dbf8a6ef38bf977acc4de4cea6e36071561887dae295b60b761f6427f SHA512 09316e636a3420aebe2d00fef7289ac04bf4e6f2d77aeb1a24a1b814f6f8de922c89c9cda110aaec9ba850a3d12e50a8831e58db2594f2b6738078645671849c
-EBUILD nokogiri-1.9.1.ebuild 2722 BLAKE2B 627426ebad86fe9fcae9015ae0cd12906fae6eb0d1ae8723bb945579a211f80b23bba85d0a1a17eaa4e23591f2b183fef925ff8d1022443f9ad2c2c6c940599e SHA512 c78d433ca57891310c7365c9eb6715d264f20a6c7976305b33dfb0173ad6fd46418e8445f6ab21bd867a34e34810a1e865339959b9120bdb3171e65f490a21bd
+EBUILD nokogiri-1.9.1.ebuild 2715 BLAKE2B e19bf8793e2dd24d6344ac2dba39cf62503a0c5602c55bc54b1ef51663b38b9bd0f2b06fe138561e65b4cf5ff6a34b2250e0e6d443136905bfbe20e1a7909730 SHA512 87e25d5e7d5b0d5a8843fcb6d1b890dcd03806b1c10b334f11149985618475de8f03e9292382a8cd16c3a8f5847bf71102a7f2ca305426e0c5984c5ef69290ca
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
index aaa2eebed44b..c94e4fe91596 100644
--- a/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
@@ -31,7 +31,6 @@ DEPEND="${DEPEND}
 	virtual/libiconv"
 
 ruby_add_bdepend "
-	dev-ruby/hoe
 	>=dev-ruby/pkg-config-1.1.7
 	dev-ruby/rexical
 	dev-ruby/rdoc
diff --git a/dev-ruby/openssl-ccm/Manifest b/dev-ruby/openssl-ccm/Manifest
index 83d30b59de9d..49a4f5663115 100644
--- a/dev-ruby/openssl-ccm/Manifest
+++ b/dev-ruby/openssl-ccm/Manifest
@@ -1,3 +1,5 @@
 DIST openssl-ccm-1.2.1.gem 24576 BLAKE2B 8fa23198b9c4c324e6306382b4e5eaefcec33ca34cf4177faad5b10ff17111864a08ca77bfc3e1f10c71b4888bcbc2ec788120b1c1a4428ced0b03a7554bdde7 SHA512 9cb2d7d0bc97b41f217f79b8488c5b4381754cf429dc07fe89bd51aea432c5eb19a1992b7bf9c7a402308949a734599f07dbf818e72550cbd584849946e4b0ba
+DIST openssl-ccm-1.2.2.gem 24576 BLAKE2B b94a205ce3b9d557ad649c0391428526339b050dd7a85633ee955b3532a94637e7c40a7cbb9bd739ff50f2922c97721e4dadf7e392c2aaaa38f35123858c01f2 SHA512 5f04af1ac65608e519fcf68259b2690f12882781cdba411939f809e1a6cb602723bf23d9cb920949e8eb7c4bfddb3e65446ae16d0276af78992de21cbfcdfc49
 EBUILD openssl-ccm-1.2.1.ebuild 496 BLAKE2B 6c692c5cded7a26a368c05450cc901aecd21583c940826f1dd27bdf117088dbe8ba6761de8a20f61810f485e90b13754f7c965a6f9370e337ff951bf6f93c83f SHA512 18e89d96765039bbd6ddbdb49bea44adc3e3784b59572d6fe243b3680360957f2b082f3f9c0bde5ee90ce3bbc3cf1a288a916fff1fe989a8ab482e8a6db18854
+EBUILD openssl-ccm-1.2.2.ebuild 493 BLAKE2B 868f0d295b031c78ebeccf47c71e99be7e7c944ce619ffd26774ea3ce646aeb901b1e223aa0ac5a5dc4d93f6c7084a010528e02b59a10c90906d17e0f1f854f9 SHA512 a3730e2b52128162e52c535c624f0e150cad68474ec1409f111caa15a1bae6033a672cd7e288d10f50980485f8a740c1058c7c29ea1f9c3f91b444a51eb8eb6d
 MISC metadata.xml 343 BLAKE2B 90d082dcbeb73687e10afe1c34641d34b6a2cf7a12b7c83daa0eef04b5e9a010096c5e63b26630a3ca8ad9c539453dedc29f0c9e8ec72c1c0b6ba13594174066 SHA512 0c3c88702d11fa68c1b3840f782559c074444a8fcc0ebf4ccf80c6014a68ee6c11431e076516bbf6df1a4364903f9c818abd38a7aebee9574c73a7c644e29ce3
diff --git a/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
new file mode 100644
index 000000000000..388921ca3c8e
--- /dev/null
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
+HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
+}
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index e32d862e4478..a1256d1cdf9c 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,5 +1,5 @@
 AUX posix-spawn-0.3.13-x86.patch 713 BLAKE2B 0c10ac73b938fe985d6c3f3f084c4f96d19293610254029267cd5b16111acbb5792de7cc5dd5195f79d5f957206140bcc7a7c47b171bd565f9eee5350352bcb6 SHA512 33f5ee510fdeb7b8b150aa61e9d3044a1571470e1187d4dd0483e700c09bfb4bfba9a52c2cde723ed568ac3d2d1cb27855a4ef09826b902946138055d4b04774
 DIST posix-spawn-0.3.13.gem 28160 BLAKE2B 68b1c241310c7b35bf8bea055e63a60320ae3fc877f9bc9f4e2dc0d30c1484eb5081be8c7d60309ed04900c410d52624dae6e37a0f134993f334526f2d9de98d SHA512 a9cd878571440cc0aaee541cbb97b6f4dcb03e48a8ef8588693f4c68990eb530e3b1685d615546763c9bba5d3109134442285023938eb2f116e9749f0da12bb9
-EBUILD posix-spawn-0.3.13-r1.ebuild 748 BLAKE2B 6fcf2461aaadafdb6bce57d5bc114e69beecf4c9c113673b920da5afb54bd8328c1b0fc6b2978d34c61ede6f7c72d3664818d99903f9ceaba17c92b045812e45 SHA512 93b48f94349cdb3938ad9b64a59dc85badd13d81c0f8c6298dd713ec4c56c573af158342561338e3deac4fcd96aa75314486dbd441caf852d5bf8cc2b8fd271b
+EBUILD posix-spawn-0.3.13-r1.ebuild 750 BLAKE2B 6713fe271a346ee38fc35d8d7c831dfb3ba8bc15989c1ae93fe3cecf32356a5c43a9bf2451f84f69d0887948c9864c9e138fd2e3eef6220c8d3de1dce42feb22 SHA512 91ee800b746f0eaff88a04e539f574ea98fb3ad56ea5b5264977082fdcab0ded3cc9d227bf3a194133720cae7c7438c9cafb54daa275fec3540416c321eaf3fb
 EBUILD posix-spawn-0.3.13.ebuild 681 BLAKE2B e8c61d27ff00d42aca97ce70ff3e30a23fb073596bd02b4b3831ed84ec9003e80f3704908eeb563d551cc6575e92c348d40b801b710d49fbebde3ff36efc5f5d SHA512 489ecafe543fef55d3b819468e92e0b9dbd931461551ce686339187487d9ca325c1eb5ee584755b96f27f340b7c9f5f04ae018444b5254502eddfa2b577de906
 MISC metadata.xml 346 BLAKE2B cb818c5b61108ddb5acfcf890d8ba737a8cc949fe607d02a5cc7dd1d264ecc7d73a096d8d40b65872fddb0791d63aefbdd774906da4b65122cd1087e040c4cd3 SHA512 208a7646bd550d2ecd50aecda3f1891b46cc586f74479eb6a72be27c985bf2ef1f411b609e54e73f418c1653a205e1ecedcfe3f2c2ebdb719e56c60f7b1b48a7
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
index 171406823c83..48cfdbac5d56 100644
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ inherit ruby-fakegem
 DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
 HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 LICENSE="MIT LGPL-2.1"
 SLOT="0"
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 1382f580789c..fc5703b8a2f0 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,5 +1,5 @@
 DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 DIST public_suffix-3.0.3.gem 96768 BLAKE2B 0ef8da7c32a2a1268d45a03a46f9a7de9da312fae2b2461692b1eefca09075029972ef196ae5c531d85140cc5da4107ff47abb16129b19e995357d04cfd852b4 SHA512 8d80d126bb91162d9228dd515c2e5cee466134493e874c136831eda11293477a035ec05436a16dc0bf720b7b38b15664e8c1d9b5f4f140f4054fc387565ea275
 EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
-EBUILD public_suffix-3.0.3.ebuild 829 BLAKE2B ceed0f9ca69723da1ec895cb677bc2a0267a1c81615e6eaf0fde12f86d8fabacefd332dd948727fd14effe4ec02b896875fe5e4e5e06e4e37708178e511318b3 SHA512 383d3266b1553e2d03ba478f16f2f764731a6785413fc8eaca932de55af2171fef344f16bc0416098dc1defb2a62cba385876f7b7f22cc8aeafd890166058ff4
+EBUILD public_suffix-3.0.3.ebuild 833 BLAKE2B 2713eb35bd37ba741ef662270006c25737018922449a89f6e99ab39ac96a8cb4e3eb0c709cc8d74944c9a3c41cfd2763f3001e6d05d5ea1c3bf81085ffeeb4e9 SHA512 a5ddb4b4d9a4177b695fb358115e711c4a73f823028006d77f4427614873f8d72bec6e09ec7843cdaab4c02f5f043317b21cd742141de6c2ee5ce06511c2639c
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild
index c4206c610353..ee89d0a15f54 100644
--- a/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRAINSTALL="data"
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 7d62560cf99a..bd87025a0114 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -7,5 +7,5 @@ EBUILD rack-protection-1.5.5.ebuild 690 BLAKE2B 00837887ebd9fd360b9be647ecb2850d
 EBUILD rack-protection-2.0.2.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
 EBUILD rack-protection-2.0.3.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
 EBUILD rack-protection-2.0.4.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
-EBUILD rack-protection-2.0.5.ebuild 764 BLAKE2B 6845d80a622f3b0efe288232cae5d944fc2fbffe91e2ff7d7fd14e8c9a10078f1b5fd7b6c823e3ed7dd9c7fdf4bdc6cfb08f608b6a0b5e05e7b12a4f300ca1c3 SHA512 4f679e240189de97841ce13f3c89d9acb13b850c2c92e5794269daa1ddc5582b120f8e3bc04a4b4e36adee0e9947ce959a68160294ed3c9889d70553825b9c23
+EBUILD rack-protection-2.0.5.ebuild 771 BLAKE2B d3c9493d4ffc95c47d1540f88eaa6d02fab0de4183baacd705004c8b4ef73a4f402a7a7dc4bdc8802d4924067887c88ee31a56a7a5311ac8cfc47bd2c0464dab SHA512 1435ecd644b1e2a914e75a21c0ae13f660010e1b8d4be3f0a71f64f261b8c2b27b7512c2a5f759d79384334c5982b7e4d8f9e95ca567b6f4b71de5f7c50fef20
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.5.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.5.ebuild
index 7128d3fd8e4a..fefd162a4f32 100644
--- a/dev-ruby/rack-protection/rack-protection-2.0.5.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # There are no specs in the gem and the source cannot be downloaded separately.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 2577a3be46ab..785dcd43d91a 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -3,5 +3,5 @@ AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec
 DIST rack-1.6.11.gem 230400 BLAKE2B 923a0a1ee7c3ea86c76e632764a678d47be4d4d953d3166488fdea6c198a64603017ff0bd21597dc633dbcb1f108363c52480a98ac0b80991fc4a759dd374f6f SHA512 f54d9c4d72d22c57624bb745399ac0d4f155185d01f956ad395bee2a0add6f11e8d9d25fcd330ec6aa97409ba10c2246424d067999b86f2e5cb1fd74a43c6529
 DIST rack-2.0.6.gem 255488 BLAKE2B 7b23ad825e3e82f5010e810acde5eb6f3696489a78c3c67d7ac6cd73574236f83107b8a5fc0dbd4c932e2bf866c03208933d4e5bd78bf8d57aff02f96bccf6e8 SHA512 f1b93bbd16b7e44423c0977444183d9685e3c82e806304f304620731e5b4590920dcc363026277aa4b9ee0a2151c54570be341dcb9265517c7315ca4a504ef22
 EBUILD rack-1.6.11.ebuild 1806 BLAKE2B af8c46c14194da266f352e3a4cb585bb92b7427a6ab7ab9c1b3edbd01565e3846e768a806409ebc6a2dac3edb8f1fe287647e203d562deee65c357faa32a73ce SHA512 b09e0daed61d68aa94fdfc849723102d243f1fb3dcd60fce366d0c08f3943edfe1fa6a5c487465e43c146bc6f7e98fa7c5466ef6b25fbc4435604d1b5db1bd72
-EBUILD rack-2.0.6.ebuild 1426 BLAKE2B 171d02790efec49527a65976d89ebb0a4e145c42a07e8342e92dbed8b1f7304a3f3d8f754b537be39968838b6f910eac78c674a2784378a145ee7f0667e5fe26 SHA512 215e32f5e31bef462f350dd66a7c01c8729b5a182139293696d40a7900f50475269bab50d02fa19494e4e08cb0fe451ec489554b731c8f1d111652505d03379f
+EBUILD rack-2.0.6.ebuild 1433 BLAKE2B bcf58be4033781371278c20ac1b002189cc6b6615c71cb83321da3320004b51e1c016b45d2d2475ea011682eaa6a9778cb2c91b8013218b5a8c0f1f0be876e46 SHA512 c6822eccbf21be1927613dd7ec7d4c0dde4dec743b0be4230be64f5ee5fe92d267083c1136d5763f6352c961cbf47773130042afa54b2bea303b9541e06fc8b6
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.6.ebuild b/dev-ruby/rack/rack-2.0.6.ebuild
index 6d59ebf24678..6e4cb7682a2a 100644
--- a/dev-ruby/rack/rack-2.0.6.ebuild
+++ b/dev-ruby/rack/rack-2.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 8a42cd62a55a..d5d0f8710286 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -8,8 +8,8 @@ DIST rails-5.2.2.gem 6656 BLAKE2B dca2be740c34c679ec18be460e78516391f91fa3c0cf34
 EBUILD rails-4.2.11.ebuild 1107 BLAKE2B b4f93f2ac7fbb95c2bf3d1530692ef07e81e07cce05872e9d11d63655de8411bf413daf5c906fd1cc4fd22a040df834d265ac60cfcbd657115e833278ca8b824 SHA512 3d87448452d0d70122e847f1c59f880f54e52fd35882a0ca73825c511121d70f4bcba104179849b979e74a943c1ca59eaa73c3414102f5cf7243c8cefa67bda6
 EBUILD rails-5.0.7.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.6.1.ebuild 1068 BLAKE2B 6d9717910eb65eb4ad98d45a8af392ebad1344468a434e81202b4bef685c6cf1854ef84a3cd74ea0ec64d9a538fd02b22a5fa796c42cab7e95d7179d5ddc2e07 SHA512 6c5329b9c29469714c093db46bf72ee6a1c837b9ac183792cd0eb71d2db83c6988b266058130b65c03950a44a724ec1fedb4aaab71fd5270b95dbe6ad01dd42d
-EBUILD rails-5.2.0.ebuild 1091 BLAKE2B 5eaa9813c65d4adb4531a6e7fa939c5d9480273fd0dae095091b1fb099fa0d5d6dca140cc05e688d0222ed8afec3aaf91702d354d587b3f9d17d936aad09dcc1 SHA512 be8551dac238d06670c6423ac04abde0148911095576062cf7464329a7af3d881cdf5c39afca00918a255b8136ab9a30cadc107e69e544608c8b6b905fc2dce6
+EBUILD rails-5.2.0.ebuild 1093 BLAKE2B 565cdf5ba187f011d2745d4a457c9199537b554547f0e99a1a20ebfdbd43123de7c7109bc3211e2ae912a08c3fb57a50da3697d230d96255059442386fe2cfb6 SHA512 3446b65c0940e5499760a5c08467ef709ea309ba6343e6d02bb42ac5fc139a8c204c0c41b6ecd7b09740c30e9ea27c750892b860f3c4750ece4511691a3112ef
 EBUILD rails-5.2.1.1.ebuild 1066 BLAKE2B 93c95f0f1e77d2d822a2ee8d624b0fc203dd4d7d9a4951d64b88adeafb775c93e329ed82f90f4c83a102eea4f1d2b79c8bec73f9274b61a0145c52adb26b6be3 SHA512 a29170896a3a67e4cf04e11d895efad7b1e2da256353bae71ce6b4fef6dff3d32c25d52bb4150c19e8a56d62cd0d7c0557de6e45b5faaa6bb0c6d290b2375cc1
 EBUILD rails-5.2.1.ebuild 1069 BLAKE2B 374f347debd93fe329da39e4e648b782a8e2228211275dc2a6cb4d89e79e8922c2100d9bb355bbe6a65d70b0ea0005796cb91a75fa33e8350cb7537bce64caff SHA512 aa2cbcbb0c7ef0b0629ad308c40d769e56c8fc9dfcfb3ba9d40860f4ab38c370f65ea2321a6ff7fd9df78b4fd7027869bfa3687bad67f5faf64a67f0f274ed72
-EBUILD rails-5.2.2.ebuild 1063 BLAKE2B 305b56d7919fc095b5497b1a0d7ab7fe7d98699bdcd43db1a89fa6bd54708a10502a9dae74c4f281bd787c501506c0204470a9dc4036a1011bd62c0141729265 SHA512 13ac2468d374bf38694cb43fafe99f5deb16ffdd348e7cf5ef594483e70d0462be5460ec616f2cbee215e703501fb41c05e9d0dd414342718705c4dd33948839
+EBUILD rails-5.2.2.ebuild 1068 BLAKE2B 3dcd45c7296f058a6f1f3d2a53c0bfe568bf5b3408d616528314685bb27b3cbbbd47522ec43fbac26c3fe52096d1abb0a8bd066bd52787cac6420f4265d79f60 SHA512 066522dfbbc4ec070de91ae7139d78f742a65c9b5b01abbd8aca4e3364954fac32be0699c687f29cc04c7018b258bbcba098efbf039ba5fdd9b139843518a2a7
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.2.0.ebuild b/dev-ruby/rails/rails-5.2.0.ebuild
index 51d72efca6a9..00a92ecb97cc 100644
--- a/dev-ruby/rails/rails-5.2.0.ebuild
+++ b/dev-ruby/rails/rails-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/rails/rails-5.2.2.ebuild b/dev-ruby/rails/rails-5.2.2.ebuild
index 093714f39b1f..3eb7023e417b 100644
--- a/dev-ruby/rails/rails-5.2.2.ebuild
+++ b/dev-ruby/rails/rails-5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="+asset-pipeline"
 
diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index 276fd9424815..5d88ba8cdd1d 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -2,6 +2,6 @@ DIST rainbow-git-1.1.4.tgz 10301 BLAKE2B db89785e5147148a91dfed4dedbadf96bd9912b
 DIST rainbow-git-2.2.2.tgz 14295 BLAKE2B e89cb8d72d8b90f71967ee714098a133244673f00af39d7202d2a7fa1aa92c55af307d08417f83f63c967e568e9e9a15e47cc9dfd672dd8e6974e3eb4b630a4e SHA512 fac9a8cc39f23a1b268f3a01d755a5ccb79f8ee11a28228d958a5b77472c5b3fbaac748c917f7d4afebb911cbef0e0242c5224c8df29672073c1f54bf44c9307
 DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
 EBUILD rainbow-1.1.4-r1.ebuild 569 BLAKE2B 4d4d43552d21ecf981a73674fab86d0fcdfb3747d6adb8e07d86b0172c027a9685e3361ff0564838edd413a86e0fc5dccae3bc8f2bfb4f7fc5c34caab565a02e SHA512 682044fc0d352633c894da5f81ac5d9f01cf0919f61a82c81eb4e1590f1fee280643a7c941546ebe9444c35b286ebedc434033b1341e9adeefd1a4fb731561b6
-EBUILD rainbow-2.2.2.ebuild 583 BLAKE2B 81c03f55af70fa4536a9852c887a4c2aab609ed4d0a99d3406e7c9ab9ced393a26f1a2c3f0cbebf58954263ee7d307ca9f62d5e8179141108a3859b689f25115 SHA512 ffa85090092d2abaf74b128d713d72cb7d1ce69845b16833e25f548b0b8fcbb3c1ce2176df6af1edd514af85b3efa95bc45b0a595e42214a06cee08172aff94a
-EBUILD rainbow-3.0.0.ebuild 584 BLAKE2B aef77e75adbfede0a0cc787fc32671125898f08ee7b6daff89d953726bc055279b4c177e757154cc4074618d7afccab15709c7c96613652ff05b756ae9e8b686 SHA512 25deb42d359523aa5a703517888d3b956be5c669e69e4b8e3fbb5b15b2e156991aaca2fc1e6bef37569b02b84afb7ca1d264139910fcbe0f4161af269ed8bee3
+EBUILD rainbow-2.2.2.ebuild 581 BLAKE2B f5e4f6ee6f59348193034fa2e42cc8b91bbbd71cf7da8cbf962e5ff4bc089d5ff8a7ff5a418e8b69af37271a8ceb6d4e9d2e888728b033c05285303fcab44ae8 SHA512 eb80d0007ce5104cf0e89f839de04449891f3e176da17617e629a6a2cf5f0d9f34ab599da08ff8a0b905917eef4ca3c5f05b39cb9e5157a2ae494d9dccdeefb2
+EBUILD rainbow-3.0.0.ebuild 581 BLAKE2B 754ffe141ed0dfb8410d58aa104fc98b97976208ad120a0657eaa3d2c00cfbe27f060e98d374dc957e778f3d50b3513c5d6c4921e8ab7e1d132cdd51695fc6b9 SHA512 4881cbba09f33df2bbe371b35500702c908dfac0115766ec02bc52b644470f684679580f70462f1ea3ae2607b842c12e737900160ed1f660348f27abb54d7253
 MISC metadata.xml 341 BLAKE2B ac36a2d34fa9a3fc33e7e0e8f32652ef92c26924ceba4ca13529a0f4bef493a524eba45cea38cf81fdd28988566344545295b96c3e86089b262fbac519644d74 SHA512 b85bd3a7b023aaa019689a9e8caaa2c1d920d35ceb3b7af8ae249d9ce42c15d73d466d926561b160bc18ed9acd2ffec6fb169a625c46c37abb5de356eb4ab067
diff --git a/dev-ruby/rainbow/rainbow-2.2.2.ebuild b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
index d5390e4ec1b2..e12e259e0565 100644
--- a/dev-ruby/rainbow/rainbow-2.2.2.ebuild
+++ b/dev-ruby/rainbow/rainbow-2.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
diff --git a/dev-ruby/rainbow/rainbow-3.0.0.ebuild b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
index 1965a591b369..526c6a811f5b 100644
--- a/dev-ruby/rainbow/rainbow-3.0.0.ebuild
+++ b/dev-ruby/rainbow/rainbow-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 4255c7d72637..3e58b96457f3 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,7 +1,9 @@
 DIST rake-compiler-1.0.2.tar.gz 32823 BLAKE2B 0751435c46a881b0501bcb6c4e1e29abe8a156f02aca79ccd4a6cf472ff696f8be89c4e8f860dc74e27a093a586b10c9a59e1df7b496ef3f530ab07dd84e8dcd SHA512 ef7132eff3afb29e98ce21facfd663cfe495053ca98d54b26275ee8e186c91f81f0450e52bf282bfad64e1443f6e065aefa62a30692895648a89966a8a0f0ebe
 DIST rake-compiler-1.0.5.tar.gz 33910 BLAKE2B 887cce374f25c82c2904b98ccce321054dc994eb0067dace1eb2a4212ac9abe9b5409caa7df13217c32e8f76b4b29b86cff538f0293da2e1a23a885091cc7e05 SHA512 e1d7016600d2acf0203891c52d836b85b835ddd5eff58b4b6679440d467a100f2d9ea35dc58bde0bcd03852790d439d3c8e44111a66640e85b11ae95c896e6b9
 DIST rake-compiler-1.0.6.tar.gz 33158 BLAKE2B c8a73cade0f73c3823632cc24dd7f8afeb1b739dd1ae231f1b1cca4eeb749c01ca0833b7b88ee4be879cc0cfdacf260c02cd5dfb1ccf955c753616961a63017a SHA512 cdbc335e40018caa0eb082c30044eb7fbb67ee4e7bab656035730c81761bd2badda7f77514385c1c1d0a6be14450b0bd78ce98113e62ec3a9068d66e2f0b309d
+DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
 EBUILD rake-compiler-1.0.2.ebuild 1223 BLAKE2B ad478e67dbc11a60b59fac6586611302bb638c2b6bc1a84b257de5a5998f4a2e3aed686e53f9c33ceec859685a5ae7cf1faf11123d1a764514cb6a87f19f7304 SHA512 c319bdd8c839fe97371dd862f6f0aede3d1b0d6d7e55200fbf9b7cab85628bae5e8fe52b02359b6e93d36494b2ce80fc64a0fb8885ba9edc7dfd8e9860cf7c0d
 EBUILD rake-compiler-1.0.5.ebuild 1434 BLAKE2B 82affed5d19a10b20db002add8159bc0e57dc163cf69d4935b12b54f3f2db9b04beb929bf2bd2c64a76c0d3518893407087c8fa6d494db72ff7391b95a3f44b5 SHA512 37992351307dea06cc670248d42098232c697c4f0458b23c87524497570b7f8385ec529026c6191624a2923b150b2664030accffe26f1d841ccd6c69143bd95a
 EBUILD rake-compiler-1.0.6.ebuild 1432 BLAKE2B 8ca07574fab8ac3d9bbf798a32a94ce151765de75b1b8752e42368dc3faab8a2eb10937316c2afe3c1613d10e2be603235cace9a7117e61110e60923dc08706a SHA512 fe2a4523caf30a4f5b28ceeffacc742421e4d908bd6196354a1a02d70005c453a3442352f67c54554c581affc882e0fdb960c1516b2c3449009a6de05ad85f06
+EBUILD rake-compiler-1.0.7.ebuild 1446 BLAKE2B 1261e1baf4b724229386a7f9f013d392a60dca002c3b56dac7b2ab31eceda5a41c3033415054ebd736efc549abdc84f25efa7a729c781fb497b13737fc5f065b SHA512 6d2f8e1b5eef956bd5ae39463376456e9586cfa57908456e61eacc887117b78f9921db696c40c459d67f3f0f67f75b037088d0da1cc313d45d46ab5c61f4a29c
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
new file mode 100644
index 000000000000..6b088e4f164a
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-1.0.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
+
+all_ruby_prepare() {
+	# Make sure the right rspec version is used in cucumber.
+	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
+
+	# Avoid failing features for native gems, this also fails with rubygems
+	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
+}
+
+each_ruby_test() {
+	# Skip cucumber for new ruby versions (not ready yet)
+	case ${RUBY} in
+		*ruby23|*ruby24|*ruby25)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			ruby-ng_cucumber
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec
+			;;
+	esac
+}
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 69232f794133..24543a42377c 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,8 +1,6 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
-DIST rake-10.5.0.gem 130560 BLAKE2B 05ae87d68641d5afbdc16c36d33c5cef626c8290abe5131f93f84e85861f0175f0b72a62f1b42076dd42a546a08c6efaa9400cf46707a2d4adca6bbff407b769 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf
 DIST rake-12.3.1.tar.gz 120170 BLAKE2B c0d087911f33ccd5256462501d175e1f92fa104a3c89b62a5bc434836d5abb277a61fb12269778d0a6e3b9b831e78c0a94d9d1cd885906980fdb55e0402e398b SHA512 49736059713d609b0786d4ea89866fd5d58076977aabeda3eeee0440f10edad708cc10ba91b5224f59a8ab87ee2ab8e2674e9115f90f035c16e1fa8cba3f7649
 DIST rake-12.3.2.tar.gz 121854 BLAKE2B 76d52fbb08f626232bb829da5d125236f99ade886e26a65c8faa7126cb0a902659160971520b1106064371b55f1bf3f27f77ad10c6879200bfbc8e724d57874f SHA512 ed96decf4414eeee0ea79726a5862c8850cbf4db56702a6a7326784249efe432b37f16d4d96ef2c2886fdd693966f5770838802f1bc3446b0724617b8d0869a4
-EBUILD rake-10.5.0.ebuild 1195 BLAKE2B 21a3d9d9d09fc565347694c84799dcdc6a8f53348b5e90c97382d7c595d6231a2b45db9158db84f37a3d9db44bdb950b3343fa79ce0dba82ef76b1a8c8dc1549 SHA512 4e689f4db52872206700137ccdc3dbfbfa882d0371724cf5468b3f51559c08a0e3011d7aad68ad638448096da2bdb69530225f7aeab08e85cd33dba419ef2ad7
 EBUILD rake-12.3.1.ebuild 1389 BLAKE2B fe9d821acf795993bd6c1b9de20856b4f5bca8a787f4b260099f246a262a290d0abaaf18dfe36f810686a8a967e25022bbf88ea4b7c83b57f7b12fdd16c5c364 SHA512 a40b1f039a009297fe50b0d0825668e1bafcfdef63f164fa5bb184998110cbb4b29b55962b9c196e2d542e7deb76c796fd5957788e3da3404cc08483f7279b75
 EBUILD rake-12.3.2.ebuild 1321 BLAKE2B e80e9d71abcb77b0cb2afbe9a417799374750bfb824aedbf1bfcdd6258ca8e57b5f3f34286bd42f0b7c08afb62573c0b4d4139655583b925cf694f4e002c2bac SHA512 a657ad0ab3249fbfcd6bbbbb495ceb5cade2b266820bd40c10a93c10c9de5e0fd7d13b4d9a9cc4452ad1ecbddbe2500dcca28abf018a7994d7811f2792646797
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-10.5.0.ebuild b/dev-ruby/rake/rake-10.5.0.ebuild
deleted file mode 100644
index 791f4798e9fe..000000000000
--- a/dev-ruby/rake/rake-10.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/jimweirich/rake"
-
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )"
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dohtml -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 285a083be811..b77f03250e77 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,6 +1,6 @@
 DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.9.10.gem 14848 BLAKE2B 35eb00dfe1e7e76fddda080499275c053e82431af520170362354984cb2af3c90e3ba803ef82fe50f1451d3fdb0ddb7ef9c1dc648836403a6865396987d6d9c2 SHA512 ee1aecfebea11655450776013d8d2fa3fb2af784285db3c32b5a452241f9cd48a8f9a10cb2f1ff96b191c0dcd43ec4f78e8a363447abf97a8cd4ccb778de4889
-EBUILD rb-inotify-0.10.0.ebuild 985 BLAKE2B 6d77fce2741d6fb10da2cd927fec01e7f26f6841e5fbd2a1f18b37236885ab314f67b520346f83993cfcf2fee145b0d4e9b1c2d75d7d315191994da2d5f9e11e SHA512 d049886f3d76bddb3dd3ce515f38b9fe6d779cfc66569d43b01b59b42e6542b87a4d2bf024cee04467e7ce4a243d51c97a0f0d09a6eadbfeb7b8784f50fbbcbb
+EBUILD rb-inotify-0.10.0.ebuild 992 BLAKE2B d2ad181b1526389ab4f3a0c7b9fb6dc68f923193be061c3918ffc4b432fecba0d4977b75c1fe2ee02f96713f735c84d5bc006d73605fd426a61204c0b30e3ce4 SHA512 3792974d070d958f313ade6a488cacd24f8e83890710795ae037be211766d19234b0af478ded5c3c240a30638892dd32bb66e15c73b3c120dab6e1b2732f49f0
 EBUILD rb-inotify-0.9.10-r1.ebuild 962 BLAKE2B f3af41066b3479cf6fbea4cd76a8afc60f5406bb27ab65278bdf8bce20a9baa904a20443b57c0026371e95241c1af55be887a1f9901fb0320cb4b061f5adaac9 SHA512 2548a6d1d7dc72c286fcda9bfb311a90209fbe254a97b096611b18cedbc7da2f7bd51ef6db837a16ee84b02180421a94e5b060cb62d144f7e28ed301cd1c057d
 EBUILD rb-inotify-0.9.10.ebuild 966 BLAKE2B 4659394c98f68f370bdace6336139828619748a16daa6cb503ee508040779a3816be32772d435647695692900e5999b0d005a0d726e4bf426d6e57929a3bc17a SHA512 32667f3dcdcbf6e7fdc8f890ca623a6d6be9474df27862d08d3e34323a1814753834e9595c795f2923a5bc4647d3d2ae4f7a4b55d20aa2586aa1eaa184276e24
 MISC metadata.xml 341 BLAKE2B 9b7d043d113a1bfd0bb07588615f04762e5d4334763055dcf818969aa98c543c19b1e1005d3f8e0ad5d6c0dfed342b3ee8f2bfd9a49eb133b34f5cafd6f7f91d SHA512 0449efdf61caad416c9b68e1b5de20c46d29a8961f462dd7f1971e3723b8b0b3567507cc99cfeb2151e0c8c14caa28947dc23906281b20771251b3b47823b4a4
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
index 05e307428f60..b210ddcbfc3f 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 4ac0f808bd56..3cfdf63345d8 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,10 +1,8 @@
 AUX rdoc-3.0.1-bin-require.patch 632 BLAKE2B 9835233574b78ddf5c9e1d60aa4a755928854ade5076141696ebc046ecbfb0ed1a83754454e7cdd6accd42a49bad6cbd23258cd8e4e14a280463fa0e368d62ed SHA512 d8840d320582f1b744597a4a48008508dfcfe7537b24570e977f7e10f1bc6e5955cf9319182d2546db23d96fa31a55320bf54f49d127623c9d9cac9d639c572f
-DIST rdoc-4.3.0.gem 738816 BLAKE2B f705b4fed5a9a7e3a850cacc17b7df3f8fdeb163938ed7d2d29979337cb24bca4a66695643ecc62f811d8e49a931296e1972d5d13366685315649e0ec44ebef7 SHA512 7ec5c8055262300c159ff2dbca3bcd09e169002acad8602db89086d2b9409a096209a1152dca68c79dcd1b5e3c1fdf55e7f89d82b33fa2ce65c816695350b029
 DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2ca371d38236e4c85a1c409699e35dd3f5bc8bc48551b399603bb0a747cb3c5f7f1fbf4765aabffaad575aa SHA512 cd2ed37e8502a3e9093c88c258ac5e39542a23c3dcaedb9b5eb48ce391a694e5b35fbcfd62f01ec6353ac9c40a4b7043b2ff11bbc403d2e03de9a84c52bcefe7
 DIST rdoc-6.0.4.tar.gz 699314 BLAKE2B 37b9c65a55357b9edbf85889c086948a6e80094846434d46e6ffbf17e16eba9e964dc09721f921d5042d6e0c72619fc59d87c8d969490e6af50fddaf49d36556 SHA512 8bf61bda88ea1a85178f5fdd62e87c79c5efd6d6f64d9d8651bbbc37e02da02b7189c7e60e4853a962507cc2ee4c703b6532f28db763202fa24c4b364cee8e28
 DIST rdoc-6.1.0.tar.gz 701204 BLAKE2B 5228f7af6b890aa09ddeee899955dada94768a4a4fe6c30ccfabb810dc90420f5a83e1a485b80ddfa81c6eeca9440109a82a3287eb445c28e1c4f30b3cea76bf SHA512 084c6bf8819664ab5f80d3678dbc8936da30f19f8603767d3678b7d504069395c8e074d09b4a188231784fb99213ee0cb2e289632de4126276ddb0233fbcd600
 DIST rdoc-6.1.1.tar.gz 701297 BLAKE2B cd1494303d5bf4f81804e40a43252a589a6fa141316a573c1e321bf2dbd71330fabd547e09f5c84937cc45b3f79e2936d90813c29fc11b4a514a9cb498b9c98d SHA512 01e32d6e7ffcb5c0e138068867e6d995210d0123cb87c2754994be1a5e0aede0e05114746e6bd788fd0b4299e9a005dcfc863ef07000f1f9fcbf6ed11e44947b
-EBUILD rdoc-4.3.0.ebuild 2695 BLAKE2B 49ec379de4d303a230b37e7194d07f44c2036d1ffd612f0eee8c5e9877d1023eead430aea666f193509b87d675c89447948d9334c587c8169274ecc164ac56f3 SHA512 24aeb3c3ed906dab7d3c570cc825d1152a769f24c775e529c3ed66160f6a36f211e581dd86aa3efcad5c209e50263a536c0d84067e23e65057f38f975ee5c907
 EBUILD rdoc-5.1.0.ebuild 2574 BLAKE2B 5b7e917ceff3f3e15d7fbd0d43134a55cf44283346f7c5d23bb384811527673a089f0c3112500977352b771f1ec0de161129f308fc9db248086d971dd88cae7c SHA512 ec16721b1fef523282533bdbdf09edbd6c447b0ce4c065e00b3cf484d0c2476613b441e0f429ff6e9d2cde7872a4041ae4910862df2cda5418de19f4b84c65ee
 EBUILD rdoc-6.0.4.ebuild 2561 BLAKE2B ebffcb449dc097f3c2d0d46d56e4d95565f2a088124c858b30881e2b01b02762e628a7345918a5c9f6ed5b869c70ef546270e73ecf2ffca1a714fb9c34b1d30f SHA512 27ca6b208c38c08027b7083cf4db6eca4fe814734fb7c3167d13a06a9bea44c4e9477c870b7b6785c9c165730e5c4d50a45b21e8c728c1fbf37c0406e7a7d870
 EBUILD rdoc-6.1.0.ebuild 2629 BLAKE2B 3faf93e3c8c8ac966f14493812117c92904220b0bf2fc0a5f7ab96f443c165f648adaba08d97e998195ed8be96f770bafa5c0ccd77aa67a662f5bedd3e7a2bee SHA512 27a3cb258c55217a8b78a295fd7671c8e0a2964d6282c7b9c8ec6a959815602b337679fdd1df60cadd301b68d611f62c54ac7974b67a19ec663436e3149fe68f
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
deleted file mode 100644
index 88259c168764..000000000000
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
-HOMEPAGE="https://github.com/rdoc/rdoc/"
-
-LICENSE="Ruby 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/racc
-	test? (
-		>=dev-ruby/minitest-5.8:5
-	)"
-
-ruby_add_rdepend ">=dev-ruby/json-1.4:0"
-
-all_ruby_prepare() {
-	# Other packages also have use for a nonexistent directory, bug 321059
-	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
-
-	# Remove unavailable and unneeded isolate plugin for Hoe
-	sed -i -e '/isolate/d' Rakefile || die
-
-	# Remove licenses line from Hoe definitions so we also use older versions.
-	sed -i -e '/licenses/ s:^:#:' Rakefile || die
-
-	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
-
-	# Remove test that is depending on the locale, which we can't garantuee.
-	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove test depending on FEATURES=userpriv, bug 361959
-	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
-
-	# Remove tests for code that is not included and not listed in Manifest.txt
-	rm -f test/test_rdoc_i18n_{locale,text}.rb \
-	   test/test_rdoc_generator_pot* || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc ; then
-		ruby -Ilib -S bin/rdoc || die
-	fi
-}
-
-each_ruby_compile() {
-	# Generate the file inline here since the Rakefile confuses jruby
-	# into a circular dependency.
-	for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
-		${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
-	done
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'gem "json", "~>1.4"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for bin in rdoc ri; do
-		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
-
-		for version in 23; do
-			if use ruby_targets_ruby${version}; then
-				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
-				sed -i -e "1s/env ruby/ruby${version}/" \
-					"${ED}/usr/bin/${bin}${version}" || die
-			fi
-		done
-	done
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index ce90fae02678..c13695daf22d 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -5,5 +5,5 @@ DIST regexp_parser-1.3.0.tar.gz 82564 BLAKE2B 4b35174893fe3af4d4c2f65625c8920ed4
 EBUILD regexp_parser-0.4.13.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
 EBUILD regexp_parser-0.5.0.ebuild 874 BLAKE2B 3b5f06c9ecbaf5f8cf271834c4faa3838d30364619cfe3794c4bb1ac00e6495b06918dd54d451d3bf1a6edd0d358eb96c48b3cb647750e4e4a63ce42a971d4ee SHA512 ce7521f4dd924ac5ae9c8af6b2e8f72d34162c63d0b99e35f440c771bb74279a78fddcd21a597405c94ac10bcf0f311b253585753667e4e7da7a0bfd7096b975
 EBUILD regexp_parser-1.2.0.ebuild 916 BLAKE2B 72cf3f24127a66491f515a4d4f9ab99626042589f683cf85e2f7fe8345241f29e9230a398d08728e05c85abe88af5b61837dacff65adb7ea78fa0599e03b70ce SHA512 cf53ea1355ba844599800a2a69b3eab119579f7327c177eebbe4300d9539a74b9e8ef0a65131585606fd4e74ebdb9d7f905e1005004f2bf6344fb97efa4c6361
-EBUILD regexp_parser-1.3.0.ebuild 916 BLAKE2B 72cf3f24127a66491f515a4d4f9ab99626042589f683cf85e2f7fe8345241f29e9230a398d08728e05c85abe88af5b61837dacff65adb7ea78fa0599e03b70ce SHA512 cf53ea1355ba844599800a2a69b3eab119579f7327c177eebbe4300d9539a74b9e8ef0a65131585606fd4e74ebdb9d7f905e1005004f2bf6344fb97efa4c6361
+EBUILD regexp_parser-1.3.0.ebuild 923 BLAKE2B 5e9186256f6aefc91bdce5132f7ea5db25519839f6a6f2ef48e4fcbec5232bda6680ae846e691ccccce01c6796c55067f5106a94a614d4fe49f9f7452d4b4085 SHA512 5a37ac3193aa6b0cd59184efbbc4e6c4689874441657e19820190755643ffd3f73013b0cb37ff2cd915cd360bb455240d1cd244fdedaa2e78f2e23309ecfb618
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
index 913ee35af706..c7be5088b5dd 100644
--- a/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index a281567208d8..f0d7ddbbbaef 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,3 +1,3 @@
 DIST regexp_property_values-0.3.4.tar.gz 11273 BLAKE2B a52ab11676b58a752741240912da5fa312661a583dd74a4321f8184fef2864c74e0d5f709cb68e3ce64a3e19e9320305e80bf7614a40142c4855ccec1c40b5a5 SHA512 01ca50f831bf3364e38559e06cb54faef59fdb0b995a6bfa0aaa3943591d98f97939a47911bf8b075b34b3c401b5de51e42a71088400112ee8afd8d39f164465
-EBUILD regexp_property_values-0.3.4.ebuild 1248 BLAKE2B c6e5b84c66f1dd8ec6eb2a690a9e4f9c83799fffa482e5a44cba7a49291ae5e34f72522fceff650e314a14b15b115cac14cafcc4c576885c179a8a669e6fd887 SHA512 53c59e11f77708b678dac69f7d74c9e2c5452e1a8d5bada720ca579f38335d0193c2b6c857b650fb98109ceed2282fd77b3e6894cbc6bc93341c764cd07cef2b
+EBUILD regexp_property_values-0.3.4.ebuild 1255 BLAKE2B e60ad015ed6c39b53e1551e0463dc17de1bbf9907db8df1367a2efd6b9b66a85a441f3e7e6007d9443d5d00b92187ebbb897de6b4a787d86f537766f5f2a0c74 SHA512 12b6fc84b84e9f8156ee025ed024751355faf2e3f6adba9acd9e39cd3aa773499f8f730f953c28eb76522624c7cbce7fc8c39f4689e20d0dffb6055689f033f0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild
index 07b173fbfa63..63a944fef5e8 100644
--- a/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild
+++ b/dev-ruby/regexp_property_values/regexp_property_values-0.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index b5241ae7cfee..2c8bde29b8bf 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,3 +1,4 @@
 DIST rexical-1.0.5.gem 20480 BLAKE2B 6ed81f9247410aa68cec1ad02a49774da839679fa3f535691f79da42144fbcda4b0f0dac74c7c02bb08d262b66bd543a8bde05ac5871454b96a7582c228e5fff SHA512 6cf5eac36953203a2de66eccbbc8679a4d695c3f0540ab8adf7a3db37eb4e94889c64c3ce4e4e88ea52738a6733680be2105e0604d01a2e07bae10939deb03c1
 EBUILD rexical-1.0.5-r3.ebuild 1068 BLAKE2B add15c13dc5362ea53856c9c286406d9bd19da53b489de72625c975192d4ced671e2b5d5cee28580b918a20971c22d4497bc18c6b808df29f1d2725944b244c3 SHA512 8f60b1b2780bd24429b1a7fd2862c483a644f3ce7e15d44849d14b2b94226e9c4fa6a21a9f590fe171182e93ebb7418073ff8296964eaf6216e8593621b239fc
+EBUILD rexical-1.0.5-r4.ebuild 1033 BLAKE2B a00b85bf1f59564d8787255494f2bdb9cd17af02c256f533b8e46ebd61582ae18dc0a865c1196901d12f097ae393d221f23081433b7ca395e287b77212032402 SHA512 aac05e16069b2d04b99797ee0425dbf0f0cf8fc99c85c2caf1c55098dead543bf3f3d69b1032182f21e671a351b605d7cdf539d9df1cd2fee8299e8c88626096
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.5-r4.ebuild b/dev-ruby/rexical/rexical-1.0.5-r4.ebuild
new file mode 100644
index 000000000000..250d7adfdeeb
--- /dev/null
+++ b/dev-ruby/rexical/rexical-1.0.5-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc	DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Rexical is a lexical scanner generator"
+HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
+LICENSE="LGPL-2" # plus exception
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+# File collision, bug 459116
+RDEPEND+=" !!app-admin/rex"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "test-unit"' test/test_generator.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc sample/* || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 002f27b23faa..31ebe92c85db 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,7 +1,9 @@
+AUX rspec-core-3.8.0-ruby26.patch 894 BLAKE2B 7639c2836caa1602320288ff7662a40e3074aa82ffd9bc56639b1db9d618a81b6ad78bea5dbed09fe68455a446f06f2cc2276f3313650f9d8b58b2c5db01b4f3 SHA512 8aca41f68b16a8790c71e618e0ab18dc7e55651e4df91a92ba9089498c5995c36fefa09cd9532186882dd6a4194a21f7bb5f25e180151fde26c4616f60b5712f
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
 EBUILD rspec-core-3.7.1.ebuild 3402 BLAKE2B d3ebf847041e8de5c38b7aae8be737bebfd0657a4871cf3c64c1e959e8626836da02b03d66d8bd63f90b6796253a5f33477fce89a69f2110576450d696a2d217 SHA512 2049e15d68ef34b2512daca6f8bcdca929a066cb186ff5ab8e9c84c2a8d82596a89eed13568b6be55f47f67c8dbc11b8e695eea6537d30745e64dea1f050df7d
+EBUILD rspec-core-3.8.0-r1.ebuild 3226 BLAKE2B 2fa01c60ed69e102482822ab0f5eedffc4758e2b8ee1cf8752139d217c305827500c5d63b0fa4c81a25ea15cb91affc204f38ccfe7403b71a7acbd6213a76d9b SHA512 2481f89ccc98aa346a45f38063f938ef7b7f5526ed87e9157730bc3c9d8424b95a92521472f419dba3dda51476eafa45ca10fa55aa551e9693ae2e425e90d9ed
 EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch b/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch
new file mode 100644
index 000000000000..7c4bc9f7e50d
--- /dev/null
+++ b/dev-ruby/rspec-core/files/rspec-core-3.8.0-ruby26.patch
@@ -0,0 +1,23 @@
+From 5e6171ee7dadd520991153009eb01d7be3c82e7e Mon Sep 17 00:00:00 2001
+From: "Keiji, Yoshimi" <walf443@gmail.com>
+Date: Mon, 10 Dec 2018 22:40:16 +0900
+Subject: [PATCH] Fixed warnings: lib/rspec/core/metadata.rb:172: warning:
+ Object#=~ is deprecated; it always returns nil (#2582)
+
+---
+ lib/rspec/core/metadata.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rspec/core/metadata.rb b/lib/rspec/core/metadata.rb
+index 094a7a3b3..c68627ac5 100644
+--- a/lib/rspec/core/metadata.rb
++++ b/lib/rspec/core/metadata.rb
+@@ -169,7 +169,7 @@ def file_path_and_line_number_from(backtrace)
+         end
+ 
+         def description_separator(parent_part, child_part)
+-          if parent_part.is_a?(Module) && child_part =~ /^(#|::|\.)/
++          if parent_part.is_a?(Module) && /^(?:#|::|\.)/.match(child_part.to_s)
+             ''.freeze
+           else
+             ' '.freeze
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..37a30a9087f9
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.8.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.1.1
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.8.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-ruby26.patch" )
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
+	# dependencies, bug 662328
+	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a 
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 6bfb154341e5..be9cb53a061a 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -4,5 +4,5 @@ DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb993
 DIST rspec-expectations-3.8.2-git.tgz 198952 BLAKE2B 6952f895251f26f8a1b7746b277fc92b296e78fb23b8f581e90f649ccc28e21e0a695f87b012b4925becfcda8f8876414f74a826c75bdfa5114092849bbfe525 SHA512 d374f7add45d2b6ce607c1a068e3e0970f902a0edf96ec891bd618dd17253878c1e0b625296ff12a6dc35103651bbfbcfd1a1b444f94e08eae2680e32853a198
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
 EBUILD rspec-expectations-3.7.0.ebuild 1371 BLAKE2B 4343334ff467a0a79d36a649b8779e677745705909e17c9986c3bc06b8bc03ea618623da46e199d33be8dc31d4209871ed3afe63c068cfe786faec99eac79d96 SHA512 b45ebb2596e1c5a5cc4220877c9fa3ec111c711096ad8dcbab58f8c4532c28e32b25f5eda5bff8a88c6a77319444f25820420aabc9af105b1889cf73c4f8f2e7
-EBUILD rspec-expectations-3.8.2.ebuild 1318 BLAKE2B f9ff54fc06a9198c48b0692491b197968b661b4da0d3cd72cd387bf6f27cdffd8640333175a188d2fe8cce47b5d59d1459743c0e8bf0af64294d79df3b07f3e2 SHA512 dfa87a38a039130a47741c61bb7959a35e5ed1db17eb65708422a3a549cb52199ac5dca54bf1a9db15687edc5b04c219aadd77a52bb1b1c7212e2c1d4955a6a5
+EBUILD rspec-expectations-3.8.2.ebuild 1325 BLAKE2B 744952cc9a2702ac4b9394b62901ea96bbfc88811591bc4184b2ba4997f0ba751e0730c3acda89748564f55699c888b1db2814669c9880f34be10fc7a81452a7 SHA512 243865703c5cce1a134b556109cbe1682c85a69e35f64e0ed4fa348be7f39f8b20ed0e1a2a26024b77b438b6f4bfda08981f4cd17a93a2e6c21798f6c0a9925d
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
index f172e8ea6684..248a6e5cf4be 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-its/Manifest b/dev-ruby/rspec-its/Manifest
index b4d951ef81c3..a9752e814861 100644
--- a/dev-ruby/rspec-its/Manifest
+++ b/dev-ruby/rspec-its/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-its-1.2.0.gem 12800 BLAKE2B ac9cb1899c2c1c88ab61617bb4fb30fffba572623dede0c6bbecebb12f36d12d7e7aa94ebe584333228d63fe3332ea978a8b8b95489cc7530942d3ec33c12faa SHA512 6b390f92654f8e6482f0da30d4e721ee127f628eb305268e474d4c9fb14fca1d0fb8922cabc9a8c1372976b5a52349c5a5a774e3026f32d8050c5aea2bc9ccae
-EBUILD rspec-its-1.2.0-r1.ebuild 722 BLAKE2B 9ec14d35752c0083556afb7ca9b69e5dbcb65c4c8d07d28ed8624265025c2d4ad6de73170ad54cbc46e29aa131032e339ef5d856a817d4e768ebfa00a1a8dab2 SHA512 1937c53dc818a8604f48c9f310fad24e1f2aeda9727e45cf407895382088500fa6008cd573a52399cc6105d32d21c85b82ce7ec474f9ec93ddb02d6163387ee7
+EBUILD rspec-its-1.2.0-r1.ebuild 727 BLAKE2B 5ce2961ce037b01931c1d35eb780270ceb2c3b1cdec0a9f1684f9bab526eb698b12977b004f79413fb5d2bf7ec8459b52c7453e80490e87b0b83c233493360e9 SHA512 fc7ff7edcc8f71eeb25d36b5550872f9a8305a80f32f4a82e310cdab27353ff1c94361f64c692105246e731d1ce3397804bc798f33e8ce23b218e0403c9f9b6d
 MISC metadata.xml 341 BLAKE2B 2d94ba5cc1c27593199becf0754c35ed399d908b21a2165a2c40fef13e609d321484653a6b32b73778091f9be7734654534a8d2a2b4583e5df86f5713d0003e9 SHA512 5433a1938d9094ff13d5473895758e44814d6eb241c523fd21bc2ad9854c6eb4be2a88364b0dff3a6625eb85c4302d969f64e6b834aca8a354e57f0288a2a6b1
diff --git a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
index b85a6501ac5b..266cad6ecefb 100644
--- a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -23,7 +23,7 @@ ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.
 
 each_ruby_prepare() {
 	case ${RUBY} in
-		*ruby24|*ruby25)
+		*ruby24|*ruby25|*ruby26)
 			sed -i -e 's/Fixnum/Integer/' spec/rspec/its_spec.rb || die
 			;;
 	esac
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 38e925f7c0c4..594105b062b6 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -5,5 +5,5 @@ DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac
 DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
 EBUILD rspec-mocks-3.7.0.ebuild 1431 BLAKE2B 2856371fdb0f9bbc3dfb45a9e064c96b0811ad357afe9423a55072d568687f750515409c96a55ff6f04b3e69fb33e346a7a2f8e3f8d97c9485e019351560fbba SHA512 92435f4b915785212754b088c288651be5a3f9d71b694349c55d5497c9ea051968a392eb4054deadff1c325025885edb29983c6080a0fdf9d2fc8d719dcc642c
-EBUILD rspec-mocks-3.8.0.ebuild 1345 BLAKE2B 3ac475af432a4af5e352ca2be716ee4ce46618ca921728c138f5ac935dacff07f072430adef1c8e84de6425b71b881f89f96446b3d15e0a5745fb84a2a2d5cd7 SHA512 5f4b3415624b24f2ba4ccc969056f2d4d5c7893a40b9cd6abc72be0dc9dc4a2f462932f45ebfeecc9241305c93fcda6ddda0b25aae8a60a7765d1dfac7440f56
+EBUILD rspec-mocks-3.8.0.ebuild 1349 BLAKE2B 8e92c068819bdf97e873876b14bc4a357882c052c4aa00ed8cc7f263833a287261a190b3779f833bf0fb3a06381c63ef3b64bd90134bafe49508ddf2e7034dff SHA512 73b4febf9f7d0b88f05fc0939b76802eda5ea8258c779dc39e7e376e7affe9a9b73963066e3e5d6592fe958471574ddfd72584e0e897830305134f80aee4d5dd
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
index 624868e81bb6..d8fb39966696 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 78789aa19161..6ed0585bb239 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,5 @@
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
 EBUILD rspec-support-3.7.1.ebuild 1338 BLAKE2B 6351c97df0b5f3e550ce631758a809e010e025504e6c6487c5927c5644b1f9dca1732b7b37321486c809946c73bf3053fa25ce51cc2df4b6940b2d5fbca0b3b5 SHA512 fcc33d32798d509eb81b83b2713fdff45f9dd59fdd8742a075320b376867c9284f421639d26db14dac45a9f9a00536e74ce52ab6501332372cf2b0299d4ba734
-EBUILD rspec-support-3.8.0.ebuild 1351 BLAKE2B 36e3b765c3ffc5a12d2bb2c76754255e19cff7595ac8624ea755fdc13f4a4df1a0c6ef66c4b7ad56feaed83181f4112c14d1b2f8a1dac34cbb8f1bc827a20351 SHA512 5020cfcfd026a57fbfb79bf1856bd9ddaa905381f24701788e3c12a33d66d42f6ad32350189180bcee6ba7da39ee3edd9ceaa342b367d2f39d1e55de27520893
+EBUILD rspec-support-3.8.0.ebuild 1588 BLAKE2B c2de6ccb1d9072a03fe9c972dbf0097e0a21de82787ac702856a7d6fbc0a2bd5eb28c619dae20d8c1345ccee0a576c7c7d768e815215ebc0cf34851f4c391b0f SHA512 5690a80daaac0acfc008724c77a8971af0f9f5bce4ff9c5162913a502b9d6735426a2baaf0f0d6e5f71d810cab1938837fcacff8b04b35786158995a9b096d38
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
index e84bff1cedb7..49f58a42c922 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -36,4 +36,8 @@ all_ruby_prepare() {
 
 	# Avoid a spec requiring a specific locale
 	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 96c8ea4c555f..61b307ba96c1 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -3,5 +3,5 @@ DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a5
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
 EBUILD rspec-3.7.0.ebuild 671 BLAKE2B 570d72981155373748f36c517a3b2b17bebb5243ff7c284d772b905d6e7fb67e1efefc2bdf1db80878a16a7dc12424d58d6be0e1de8c9e9d46e636f736aa5c24 SHA512 df109bdb896c308383c6423e09775db7f82746f813e6574f0c56db76a8bbfb377139cab64d8b99aa778d0c9c84823ec4580b43af297568fa20dd8abc0a2e83f1
-EBUILD rspec-3.8.0.ebuild 654 BLAKE2B 6f47fa6866e3093488c36d7755a1a32be9ef1fdd2b8b0ac05163b2cd19561d604a5b3ecee868029b3dae4f17e261223fe2fc019401d214f07659e70749ba4054 SHA512 3675490d5c2b0cb218d0edf63c5a104a2baed1b11ff31ad7e0a03aa0b2529ec77dc5db1846b36b44d4a307fa0cd8170c2957325e2e01cb710c4cbbdd12081e23
+EBUILD rspec-3.8.0.ebuild 658 BLAKE2B c188c0bd8b8bcfc17294c90e7009e8d10f9fb4caf7ea823c0e023b138752a0b8bec936c5da513be6ae31ad21a70420819a39a128f887a360041dc299e3f23eeb SHA512 dc96bb16c4b0eff921ffca66276415be3dfd5f24e0dcc32cf03cd1c4553b1568a10f7cdbd9fa90dccf388d0dc73bf72b74f863b677ad2b70d7168e9f71e9a142
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 963b933d86bd..34b33dba47ac 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/ruby_dep/Manifest b/dev-ruby/ruby_dep/Manifest
index 5dbc41d7d03e..bcd4e1006296 100644
--- a/dev-ruby/ruby_dep/Manifest
+++ b/dev-ruby/ruby_dep/Manifest
@@ -1,3 +1,3 @@
 DIST ruby_dep-1.5.0.gem 11776 BLAKE2B 0883eb6908c4e0aeec3bb88eaa2a3fd526ce6f16f4b9feb3b817ea32f40f86967c3e9f60791f8bd83e52b108bf748784c98d07d5d121ccf884ed19f76fa8266f SHA512 f12b589262d84525b301370845840221f0d204b0cfee66fbbbee62eb61e817c46590e87f70318f8d14d000da20280182448d129b685468701ff7ffa8e6965377
-EBUILD ruby_dep-1.5.0.ebuild 493 BLAKE2B 3e11ec57286249184f66bc0b55a73a056e2a6035a9c4645818af6acb458794821bbbe7d382dcf46df314762ad38e3c1aa23a320503aa296dd7a8eaa0c19f1237 SHA512 4efef5546daf527c789b1fa561a62c0ba570f52e3cdfa7bb6492548eb608da86e7590ff9fad84a430e8cd4f559828a0faff36c65e331a7d2e746ac4e27c0f464
+EBUILD ruby_dep-1.5.0.ebuild 490 BLAKE2B 6b1e76dba6a442321c4e1eae653296c4afdacf5c64a671a2c03c4a63422230adc10e7765940179cbf252f1f44b9808559ac579423c23ef38d39319c695563af6 SHA512 fd4fb7d3d83ae612ba5c6db686b454f91b7ff0d593e27d75c4aeae5ee0d9df92f077ee2ec0deea13aa0258aadcdf7598de8f50948decd0e37dde721e2d479a55
 MISC metadata.xml 327 BLAKE2B 5708c74c786998a5e5c9d5e14c9890cd5271e73f0469cf60e3a657facefed7e1326b1a270f7f67f0767664a1936c20c3e2650ae9930b680e61d3f86302b3b962 SHA512 be034c994d4c7eebe730b0b3cdea143d872b8519d99fcde3e49776c7b729a5f1d5b9a3acb411850d7ea518018e9d645820297afbdff11d5f4d3554d649f4e01e
diff --git a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
index d4fac76eabc1..d9ac4f179a2a 100644
--- a/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
+++ b/dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 12e099a4059e..a1abedffc437 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,5 +1,3 @@
-DIST test_declarative-0.0.5.tgz 2114 BLAKE2B 6856e3bb734354f75298107e243bc461143176797e98d69f5c67a6d121a6556310d46d4676d32bbc5317d39e0c48fa4f4cff1cbeb3e31ec5834ed406d7cba33b SHA512 69641a56c38403a86a8562910aa5ab433476351cc0e5a1f2a640030bfb4f82b96bf724d911ce46ff75dfe934de50d6549304088ee85d5689990e0ce5d263c160
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.5-r2.ebuild 865 BLAKE2B 4555627506c9e5be4f5cd85999074f300f78f6f1306897ea25cd8f91fb7b528931f3c89fe7a9fa4cd4157861635dab5b99ca8366bf20c372943b736d1cba0f71 SHA512 d3799f44dc81cd34373daa9504f4f971c774432042776310a4c3170d2cb2d1fe955614d53661646557b99da6dc5af4e7937dddf822b2c34e9afd6dfb6a39da33
-EBUILD test_declarative-0.0.6.ebuild 1006 BLAKE2B 1bcc24dd0cefd80f9435a860e5367a0f493756611231bc72ff0658c1e9d82dd548b559f4883beec715a042e01f0bdaf18a7c7c174645bd07e2621706340201df SHA512 119c71a8c7f2793d00c5dba0080cc196abefeed5338aa95b1c60ef53350c8d5eee5658273355d7f4617332423ba2deb5275295f831b1e6059a9bcbe7b0b6af52
+EBUILD test_declarative-0.0.6.ebuild 1010 BLAKE2B dbdff961028571c2efe32fd0008911d48da1fe36b599ca071d6ea2d754305952f84f0c10ac7c0b6325e7176bac7327ee7836780c1ee0c06a8e326ee1d005dfc2 SHA512 330691a271f489c19ce5ec0a53b289a8a14c15bbbd0a8e460b277f35ec2ffee40571bb2a83b57d9003f1c72215d94fa2e64b6a4821a4488b7f3c8ad526df0779
 MISC metadata.xml 352 BLAKE2B 16e19458cea4c942f4676b8a345f5f4bcdd56bf265cc1408c4cc46210530cc12798b8f30065c054f7ca03b308d545d1aa41e682818aaaaca94912c2c47fb64b6 SHA512 dd27572c54207401b8dbcac74242521733d31f6c7e3822b1ecb4809047a067a58cc8bd654f146d10e3f7c9e01c130d56af039c9c91da298942a6fce02c994a12
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.5-r2.ebuild
deleted file mode 100644
index 338f473cbc6a..000000000000
--- a/dev-ruby/test_declarative/test_declarative-0.0.5-r2.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
-
-# ruby22, ruby23: fails due to minitest incompatabilities.
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.textile"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simply adds a declarative test method syntax to test/unit"
-HOMEPAGE="https://github.com/svenfuchs/test_declarative"
-SRC_URI="https://github.com/svenfuchs/test_declarative/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="svenfuchs-test_declarative-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23|*ruby24)
-			einfo "Tests do not work with ${RUBY}"
-			;;
-		*)
-			${RUBY} test/test_declarative_test.rb || die "Tests failed."
-			;;
-	esac
-}
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
index eb7b4886f5a5..77ad94130e8e 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest
index bc9f123e4433..f6bbe9dfa8f7 100644
--- a/dev-ruby/text/Manifest
+++ b/dev-ruby/text/Manifest
@@ -1,3 +1,3 @@
 DIST text-1.3.1.gem 138752 BLAKE2B 19c837d83f72787ef1a70eca74d9b2d2e8336d60eb2dc07578f07fa446919984946b1c2431efcb4a3b29770f77f9eb0ea9a40c8d74dd07972786066b67aa3e2e SHA512 0380fc77e2f0d427afd9015ed904947311139e52adf3d49b748d0e6ee32c579073ec979f0cdbc117b53e3d841f25ce9f271637dd7edb5f6e124e369cca788eb8
-EBUILD text-1.3.1.ebuild 437 BLAKE2B 0b33cb635cebd1eeab68f9fdbc483c992ef9d42c0e2d88e0822bc607b3d8a51677cbb255d11ae7835b8b0acc663a28972bc1edb705161616a46a5ff45f7f7f7d SHA512 5c201fbeaf51be95c197d5708dc79b575f797ec969471e26a532f5f9ac661d434348b9848b184f9b1f8680da98e5b9c16f6fa4cce5f9a569be1c3228ca3fc84e
+EBUILD text-1.3.1.ebuild 434 BLAKE2B b2421ea25d85c65229666e6d05df8c3ec344b3bc314a1793fa44a6747639856c53a6e721eda82b4600ec8421d996aff496dba18ab099e61b85278819fb6a3bc0 SHA512 1acc25da6a28114e6b592607e4627fb31ad69e70be640ed1ba642a7c56501411542ed94408276a30e00dfac30da1f5f6f475a178bee3a34b27672d3927e0dc74
 MISC metadata.xml 343 BLAKE2B 91551aa0c1cc6f29cecfa2861bfd81de4a807b0611051c48695ff417fa32d67af93d1b5b28fc0653d1723886eed0c4b3f818fa5adb55fa43ecf479b21bcad398 SHA512 892628e73011329fa421c9237bd6525b90f548ef98b297b8ca9d2394f6c11f1c2a235b4676fd126722a5381484e8f278f42a8f045e79f6ab251e2dbb16eaba7d
diff --git a/dev-ruby/text/text-1.3.1.ebuild b/dev-ruby/text/text-1.3.1.ebuild
index 40c54b324472..076341161feb 100644
--- a/dev-ruby/text/text-1.3.1.ebuild
+++ b/dev-ruby/text/text-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 83617dc2642a..19a4fa5ecce2 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -3,5 +3,5 @@ DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe552251
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
 EBUILD thor-0.19.4.ebuild 1155 BLAKE2B db1b5e8f9f73f8638aea3ead1a1cc7e754a829c8be39d8179aa5a7b9af1ce50349191bff14e2a8c52d0f3e54e64cd60d7eb486c55b6316f951e4660c3f7826e9 SHA512 74b73fbce42e3fc78572b5d9723fdeb6d00fea7544583540bce034265ce27744c4cfa86b346331d1db051c6858a420afcac5ca027ed9d4fc987d7e9a424c47b6
 EBUILD thor-0.20.0.ebuild 1437 BLAKE2B 2402abd3eb5b17bbd577f0a77df7d95b51a38e023555b0f39136cc9e3d3a0e53b80ba375a3851c4ffd037d5341f1d6606583c7339429a436df2c140ca9b6d990 SHA512 90e2e05922022ed356d7c81812cfadef0ec1fff1f0f9680edf9c039d33cdebc44128f31408df83e1eee7cd1696cfa267ec239bfd9dd0941dd16d7daeb299fda6
-EBUILD thor-0.20.3.ebuild 1420 BLAKE2B 525b9a0be3cc7c53245e945bde6e4f84f11c337a10e450c2deb3f7329d2ea20777af43321fb5fb83ae4df95877c967ee5fbf4eb716c1ead28430f853d2dc72b3 SHA512 6abbc470ad09433b6194048864ac107bc5f8964023949cc1f23b517601a8cb946dd63b65cb454331796b230e40dd9c74b3b048ccf1404c79fca35dbf343e1b5c
+EBUILD thor-0.20.3.ebuild 1434 BLAKE2B 4195ce295cb435a9c627d99a5293d4e473947650659cfe48759ada070537465bb4008faf05f77fd7f2d33acfc162f45f655fd36bd37dbd865ce6cca550bf16a6 SHA512 bed3115b8a2689a73451dc6940d4ec2044a7677d1d1b91233d191d21dc86788951f4aca1a359b505bb201185ccbeaf5b40e45ab82b69a93c918976f265d7da67
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
index d80e48320449..1b44a1408aae 100644
--- a/dev-ruby/thor/thor-0.20.3.ebuild
+++ b/dev-ruby/thor/thor-0.20.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="doc"
 
-USE_RUBY="ruby23 ruby24" ruby_add_bdepend "
+USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "
 	test? (
 		dev-ruby/childlabor
 		dev-ruby/webmock
@@ -48,7 +48,7 @@ all_ruby_prepare() {
 
 each_ruby_test() {
 	case ${RUBY} in
-		*ruby25)
+		*ruby26)
 			einfo "Skipping tests due to circular dependencies"
 			;;
 		*)
diff --git a/dev-ruby/thread_order/Manifest b/dev-ruby/thread_order/Manifest
index cef321385819..3381bcffe75d 100644
--- a/dev-ruby/thread_order/Manifest
+++ b/dev-ruby/thread_order/Manifest
@@ -1,5 +1,5 @@
 DIST thread_order-1.1.0.gem 10752 BLAKE2B ff212d2a2b441f4100980ff0a02c444230cd88a1b0ca22b358b882248f8fed9a25a7d074523ef21247bcab6a89e352831aa4e742f9d4f801833bbe0a2622d6f5 SHA512 e460d23fb33e8254c389d94ae17c4c2bba8f9aeeb7987d479f31c3e334a7e87b919f3f74abd51181072c7eeb48ec2f1d222e2c1a4025f2d7a05016ac93ca80c0
 DIST thread_order-1.1.1.gem 10752 BLAKE2B 2d4677fa1f58cad02697d7946ec57080622deea6853b24d176cd3d77d857275d0f7b97a8701620e4afc7c4658de51a889b72fd7755c8edae03e00bf9b9b560ab SHA512 6c6ab86f7d0472d503107a7c58f84f24948e9418b00ad0076be40ac667f97f1cac78b1cc23692e73e37e2b3ebe1e2ea96c1b95c08d97984944860522d278ef25
 EBUILD thread_order-1.1.0.ebuild 817 BLAKE2B e4c76460df8a60e17ff8d8a04f16f0ffe50af336270efe496d638e4c380fc7430607dc43432fc2ba3d30feeb069ce4728da8fa631efd9fd1f596a997ba319117 SHA512 c7076f7caa85f8026a96e21c953f94e38cd697bfc02b107b96bbe13355e79fed49f6275571f0fe788b93c211aa9e1d67c084a43f0fec8969f0dac89f771ca602
-EBUILD thread_order-1.1.1.ebuild 819 BLAKE2B ca877a9e98f20942dffa053335b8846d92fb2cbaa35b480ba66391aabe936de12180a9f2943761c909e3284bc118b0650872fbc45eefbb3074f54b7a8f64b7eb SHA512 d3c226003193354772ec44625742d3d3b934de8df8d12211708a61752c0fb316dc7dc055ae86566128e0d56246b2f4f427d46f666298b071ce280dc331f96ba9
+EBUILD thread_order-1.1.1.ebuild 823 BLAKE2B 320db5b94c0741501471b954e23e992773a870b65121d6238d3d68d1a65244908257d6bdbb6f60c27814487edf77944b244e3fdff965dba4ff53771934a64e1c SHA512 e29a8c881aec276e0883be5e8a8857100588d6a989fe178775f704b597e608686f8f745a562d837825c8fdac62848b869e3d5afe5bfd7d8ad5a5c1d69a5f98b3
 MISC metadata.xml 348 BLAKE2B 7921753d82a3bf12a78fd7e3d648800083c61fa6297bdb5a415cc7275ac01d14f1ea1ac6b4c470463b30b728f6867a8402f6d0536f439b6caccb6052c423253a SHA512 63fbdf51c3331bbc7294d04f9e2d397791abdbcfb3f193d28824cab257f19db0685f1ea696791f82fa56b3ae76b03dff65d558d0b884d0b8c07d375dadc4a38a
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 2508265e0f6f..e0fedff8f6d9 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index ede380b6652c..679654c5c9f9 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6.ebuild 1085 BLAKE2B 0d8ab40cbe0e821ab6e8f9198ae87dc6b4ce6953c540477f328654f7aa014b195d27e3d69677ea6601b9b24ded4ed198bd74b3d38cdbca77a8b059202c0d9321 SHA512 382945eb6df104807e199073f147874c0e25435407d7cf8841b4539d39d89f7bb72c975aa49b5ba7b0edba3ab0527952f15953dcad54f2ad9f3696363971f5ae
+EBUILD thread_safe-0.3.6.ebuild 1082 BLAKE2B 7c0072f1b681564a241b0830bee15aacea19f0975288fe913ead205564fa493dea3625067b74e7b71063c552c561c79d9ee0e0fb6183058aec8e693169a978ee SHA512 3aa302d8b83a015e70606b1d8577de3e19f4fb04d48f510852a78128105d66f76d236a2a95bc4e56124267dab04a0c4af00cdd6a2788448bc24fd23975322e1b
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index 9ef7ed5d214e..05146d90aaa0 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 41ab42a46b59..c1836f8eb5d8 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,5 +1,5 @@
 DIST timecop-0.8.1.gem 16384 BLAKE2B ca3aa8422841b83f4631afa102c4475f4df73c3968eb9ec17d2159a41ed976330ac9c078970f3ed2a504146ae0f4d88650892c314c92da6dab0f8a0ff0a24a35 SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
 EBUILD timecop-0.8.1.ebuild 988 BLAKE2B b5be0df15ca2ffd2da8aacdd985cbf3c217838501a918c2a0285c2a72c2d32b823c20857dda6069c1682e419c20a3d01c91fcf3841290ff70f9dd9a035099ee3 SHA512 f79e770940c1f377d09732436b6ea504781daba58d0dfdfd6f806e7d2bf6757fa6d4abf84905013fd9aafc3c2047378dc8baad4e1e75dc8017de6b0a2f646cc6
-EBUILD timecop-0.9.1.ebuild 1013 BLAKE2B 6f03832ad734d4342133f4a37b2ef18448158b2dcea6ba341516ab402afde4c0a09e9788b52ab078f94c0ae0f8348c3ebbcd1f7adeed2ebb7dd1a2f3fc3a4da5 SHA512 a71cd543d182e4e894b9bfadbf19f02c59fbc4e455ff5bcc1cfb303cacd38b77b5e3b14d88cf6108bc06ee09a7f5572843530b5ec0b1e81b98b64f8b9562623d
+EBUILD timecop-0.9.1.ebuild 1010 BLAKE2B edc87f939620ae495f43449069714bddf4aa97982acfef422b55c3bc8f7c03113bf729405689fecd8df672b0b35fcdc29464c23e99c466847792458f67a19cd1 SHA512 303334114a3fb6a07c69453860a607aba84c324b59720b3bc1c261a17604e2f33c3ed3b75a2126e8f6b82eb785fe3c56c738c7511f3efa5895f0d0bf6719e9fa
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 28bef5c64449..5069f74afef7 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index e2f1ef3105ae..546d9c8902f1 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,5 +1,5 @@
 DIST tzinfo-1.2.4.gem 152576 BLAKE2B c6815fc7277153c5e00ea2359845df25affab5a08f9274729254662e056de702613f4b8ca5b4f2ddcd756d86ae12e534a4e2a5a4661f361ef1d59cb3d7f07bfa SHA512 0b983aa6b4fdbb3c49329bb51394f1edbeb6f4d216d108448aa9dce751dbc2e348d58032cb41df78a3d249611770e9e345a4d0041597ceadf052b863c3e6d1ab
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
 EBUILD tzinfo-1.2.4.ebuild 908 BLAKE2B 0486b70c633ef9b0f28b7040f7aa67d4b4cfd6ce127a57aaa0ff7ef2300680781fe6d46c6c2dc8c9b6f335a195731b4d630617fc422adf2291cb6f8956516d20 SHA512 679353489084cb2e4fc00d6a69eaf62763c976d113c9f5b1135040dfa98b57e1ce85208ad2b63d71a09593fda13c1c07aff67b938c2d25b4d2e35fd723bfe3bc
-EBUILD tzinfo-1.2.5.ebuild 919 BLAKE2B 7467074806aefab30b16f6adf11a4f88baa34f1fede9af1d3f9111b7eb518f473c866976a63a98e871a7355feb963ec4b781d5643c58ff0e3d3d9aae42e4baa8 SHA512 8c1a91ea92bb1451d99fdf4978069acc0f688f7e4e55f13811cd2896972063298bf42139cea70ff3174ce572f69e4404dc708bdcf7ae14792228940be8583204
+EBUILD tzinfo-1.2.5.ebuild 916 BLAKE2B dc8e045c1decb8a66c64c52a19f5508b36201d0cdfd41208df883b3856c93bce12abc4825bcbc72cdf60e194daebc85472777cc297419c745bd0f875f92f44e3 SHA512 bacfeb0a77e800aca9e0524b73156d26858da630cc50f86c2175ec0114f626d58cde8f71672ca1c997092707ee3c176e34bb042b7fda7a357752752be682eb2a
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
index d0d98be91102..e8bcd1790f86 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
 
diff --git a/dev-ruby/vagrant_cloud/Manifest b/dev-ruby/vagrant_cloud/Manifest
index 855d7ab55ce6..48e02df79f28 100644
--- a/dev-ruby/vagrant_cloud/Manifest
+++ b/dev-ruby/vagrant_cloud/Manifest
@@ -1,3 +1,5 @@
 DIST vagrant_cloud-2.0.1.tar.gz 12278 BLAKE2B 9d8bf72809af21e55a6fbfa4c41098a5164c5426ac1d75243f45ed71cc0be8790e06a6b512188683ef1acf2b39faf9d2d72619605ed90c2529eb69b36f4b804a SHA512 98a84200e8e34d0678be6a67872411308c32a8112b1788574baa24bb4bf2e5fd8eab4727f3e2ca56cd8251ff54d14f009145ded8d30a353a581997673a9269cc
+DIST vagrant_cloud-2.0.2.tar.gz 13515 BLAKE2B 3014effb70df8aa7aa793cc75e92e46ceec406e3ad1c30f4cd40e1f05075e3e3b399d5d89424920c7312189b4f48cff82bb8e02f4c30b33a7194c973c365ed79 SHA512 13d56c3090092c6e1b6d47a98e8c21afabfe9fc28ee75b402b91e58869c221821141c4fdba3aaceca8970ae5474fe9a8109513f8dd525fab2cfa3623042d01c8
 EBUILD vagrant_cloud-2.0.1.ebuild 727 BLAKE2B 72394b791ad3ddb2174b73fd5a67ef7e99c115cb35b99361797dadaef0d635713cced5391366b0cfbd7b1a93a6814c88fd5faf098d41f84ba9dcc166be4e431a SHA512 76cb776a3d90b7fbaf9b718f7f99e2a580c3a3f93f50eb9b7bf6dd39bdfc64aa0ba6ccee882b89f6ea7d3e2e3f6f7c579b6cc2c3314a63b1877d9b9e08be8525
+EBUILD vagrant_cloud-2.0.2.ebuild 732 BLAKE2B 559ab9e669192fda9ee63c945129e95a042a2499bb4033100f52eec5f6b2f8a64a7efc2ac92c46647053084a5342c2fe443dab38e8a9ec5da627ce38c8c66511 SHA512 6ebb813d5cc2f0e8db838906a1994ffefce83e757128836c40913432c9570b46e25aa985219eb00d217a123f6e662eaa2c88dfbda0a0051bcc7c855a43c0ece7
 MISC metadata.xml 339 BLAKE2B 1b57cdf6e4d8901fcad56c7083bf38440bb7ab26cfdb629ae4f77cd0f68dad37497ed7a1bcdb74378bafea1122122443685a23834382c6030b7a71f8400aa9bc SHA512 c85b172d220ce7a3742bf021789ec5e2dc2d2d0630f30dd033062588179002e4101f0deda913aa8727486f412ddda3560353bbd56b77e7ddbcfc370c9fbf0c37
diff --git a/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.2.ebuild b/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.2.ebuild
new file mode 100644
index 000000000000..933e6187e6d2
--- /dev/null
+++ b/dev-ruby/vagrant_cloud/vagrant_cloud-2.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vagrant Cloud API Library"
+HOMEPAGE="https://github.com/hashicorp/vagrant_cloud"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rest-client-2.0.2"
+ruby_add_bdepend ">=dev-ruby/rake-10.4
+	test? ( >=dev-ruby/webmock-3.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 8d5f4a5d04c3..65ea6781474e 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -2,7 +2,7 @@ DIST vcr-1.11.3.gem 87552 BLAKE2B 296651072c30cbba3bf329a9cf2d5eb743f8250fe250ee
 DIST vcr-2.9.3.gem 152576 BLAKE2B 130f5c5eddc2324d3c64df894fd2614fa81dc5ddfe12677c5042ef3206ac5e97cbe8f5286bc4782c2d4cafd0544839fd2a58b001ff0e75baf55feb163609e6f2 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7
 DIST vcr-3.0.3.tar.gz 152446 BLAKE2B 3db2be6b485176dea995938a1696bce31e21633dde13fc13d5eed737b68b09b09ce2c543fbe9abe0f1c9fdf1b41621be02a8c7b1e4050503976a07d1bf83a7e7 SHA512 7f523f0dd5e8227b41230708912e4ca085350bf521c4e6007d2e555593979c4a80c683511c838e727b14497e641c351580899fd17c6d2cf6c73ed5144f68c597
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
-EBUILD vcr-1.11.3.ebuild 599 BLAKE2B 91c5e8fb63a6cafb7f0faba63b329f6997a8a28af039aebf5070731684a6bb42e1dd0de51cf98d6641d064d5922b527be42cc185277d633da8f9ce05bec7950f SHA512 eea36f7f059b46974f58b5524d6b6c94dc735c941c7bdc5355b9ebdba37c3ad5beaf2ce4076118ae7d5ee49370a7c133be2fa7109e6d20e6b2459a3fa13d82be
+EBUILD vcr-1.11.3.ebuild 616 BLAKE2B 43e01aefa94e61ac8dcbcf7a8d09a69accac5d03528de23a2d0b6b73e2f5e015da18439fe3d4ed4fb777e31a57a93fcd69f08d5d40c2abc3d6f85fa42fcd4694 SHA512 124cb0aa340da7f76522502030eb3449da6bd013d641c23b455775f2f54f58fcfa10342d4b6edabe0d522e8447d402009d0215f20ffa9e79763f1234c2876bec
 EBUILD vcr-2.9.3.ebuild 631 BLAKE2B 15bcde636a07ecc0725c6582b31896512ea37ebce07b0fe2b02fd7b30ddd9e8d2b5e9463857394eae7675a2107cc74957fd5fb0b719f5b669f0c09a491065e6f SHA512 b648d60625ce195d6e3e95b58c1becdc81cf8144148c0cb0d1f01f95b533aef22516a1eacd3b9eb5cccb83137c0d1011a87303503c218741275f58f1a9fc4b1b
 EBUILD vcr-3.0.3.ebuild 713 BLAKE2B 8308b73a4e404b767aa093836994b5631b3206c36a24a9739132395649e2bbcecdcf8755ab3864c1d3afaccdfb63f15d0f56d547ee5785544814fe75017c5a91 SHA512 236142cc12ef0d95ef4c975cf9118edda3b9ab06b5eb71a67ff3466497129682fd3225d1aee64b394248f581f43124f65fc6ac04f674878463a939bd3217ef6a
 EBUILD vcr-4.0.0.ebuild 713 BLAKE2B ac3afa4b4af4a0653f536c8e58bebcd794387763c5ab7fa0e23a14a3e071757260f0142676bb94f446d50c8ac12ed82bc3dec8c4b8fa00b1582a15e171a14e02 SHA512 c14a662b9be71ff2dd84545f637f34c468d929aabbe6f03be7298a9bba8119622a9b4ee823c0f237ce804aa9c1322284d53bfac37d2dd2c8bb6971f8e246666c
diff --git a/dev-ruby/vcr/vcr-1.11.3.ebuild b/dev-ruby/vcr/vcr-1.11.3.ebuild
index 11db1db41888..6801924a8456 100644
--- a/dev-ruby/vcr/vcr-1.11.3.ebuild
+++ b/dev-ruby/vcr/vcr-1.11.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+# ruby25: code is not compatible
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 535becad4993..3f124b3565d8 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -3,5 +3,5 @@ DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 8eea447ef98cdd9b48fe6c91f2a385740339e78e
 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
 EBUILD yajl-ruby-1.3.1.ebuild 1254 BLAKE2B 6e0f05e289dd8f888945c247769d2bb689b0f12eea1df3d31263866e5d6fc721f8541f36f8358f780f8ba1f7cd12ed27fda1fede45cba0cf36cd53dcc4a99a22 SHA512 3786c6ce1bb8a0c19404f882ce7478e45b431c9b8513a53673aac6e2692510c0df53d5de7a33129f56c9520840b189b8ef8b688e9d608ae13e68f22aebeba826
 EBUILD yajl-ruby-1.4.0.ebuild 1255 BLAKE2B 2f66ab1a7fb94845f198ea123a9d1a7ea2cfc31e799f91de946e393055d7ae5ebd5b392cc3563e5bd57165d170dcb1f09a6688554ff2de48649884d833e3c595 SHA512 280f9865f087d58d5d8249daea0abb924cdb8c708e6c1b067764ba1b08131b6c96f8421b68adebd100631adb3a599e7984493922488c655b2fe0434f2534b4af
-EBUILD yajl-ruby-1.4.1.ebuild 1255 BLAKE2B 2f66ab1a7fb94845f198ea123a9d1a7ea2cfc31e799f91de946e393055d7ae5ebd5b392cc3563e5bd57165d170dcb1f09a6688554ff2de48649884d833e3c595 SHA512 280f9865f087d58d5d8249daea0abb924cdb8c708e6c1b067764ba1b08131b6c96f8421b68adebd100631adb3a599e7984493922488c655b2fe0434f2534b4af
+EBUILD yajl-ruby-1.4.1.ebuild 1259 BLAKE2B a694bc32028cf9032c54ebf1ab719b7ed5ce4148c75f97387dd8a43b118bc7278ba9aade355fbe38967ac8f9385a9a203ea7d2e40fe1deb9135c6236011982f8 SHA512 15b4a9a5c5e482e4db9d0dcb7b987aef5c50debba4ff4a0dc0e477b49a460a418cfd36fd9fc3e9393e6a0aa0e48b169187f8cd00e529ae36e364d4615a4a3d9b
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index d9cb6a9d9beb..984b8f365735 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 1c376bcab116..6db93b8f7e06 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,3 +1,5 @@
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
+DIST ZenTest-4.11.2.gem 71680 BLAKE2B a5d608bb789d1f0932bf823166fe6ddef7565e7f6c68fdcec1be47dbffd2e026fdf20ba8be64bee46e932a6542e3d45cc6fe7cccfb0257020f9ace7d59767960 SHA512 6596d49fe3f3a05db69fe81ff0825b3158a30a54c63e2794e0c09a4abb51b60fc612765dd811a9ad99db0390904ca59f4afd4fe780dfaeddb3cb6623184228e8
 EBUILD zentest-4.11.1.ebuild 802 BLAKE2B 1f43da0be5ac4497a647e799de76cf5364bf9c8a557291798dac4ce01eb3776f925983e2ae705a4e2e5b78cbc941105f2f614aa6248efcbd2d3e1528a46efca3 SHA512 776b7d1876e2bbf24e5937fbad393a34b685a28f3b5ad944bddc15552efe08fe28ddb0b1d476eb2efb437c29b367f08b09bd43edaf9aacb2fbd41a9040879f4d
+EBUILD zentest-4.11.2.ebuild 801 BLAKE2B 396f58b0492209760e0d4d7fcdeab33bc82ec971f2ae12877fa998a5e1c2ea5b2cf0736616b4dd6982a03f7de8d92fe1887184fbee96a1d2fe87af4a0cdca116 SHA512 cc38bfee13df45891f0a6e2d40649356ccc989b2dbec7b72824ebba80900afd100c486bcc7d70fec66cd6e3b5e328b916a790184e9db1503d24f92b677f14eb7
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.2.ebuild b/dev-ruby/zentest/zentest-4.11.2.ebuild
new file mode 100644
index 000000000000..73989549488a
--- /dev/null
+++ b/dev-ruby/zentest/zentest-4.11.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_NAME=ZenTest
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb example_dot_autotest.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
+HOMEPAGE="https://github.com/seattlerb/zentest"
+LICENSE="Ruby"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/hoe-2.10
+		dev-ruby/hoe-seattlerb
+		dev-ruby/minitest:5
+	)"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 5c126c920a5d..8956b9e46d29 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 6bfc737b45fb..30457cd25fe9 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -5,5 +5,5 @@ DIST tcllib-1.16-patchset.tar.xz 5484 BLAKE2B b7dc4cd1045cc88e7cc85412734cd036a7
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 EBUILD tcllib-1.15-r2.ebuild 1126 BLAKE2B 4230c77b24b9aa9a22c1bfca957622c1b1bdf987f41e704cac8ab9b71edb046b5c27837619b6e9440dc296abb43d15f3646b047ed812c52ec478384ee28b7d76 SHA512 8e3318997ebf7a07181d76fef022febf286ad44ea92b2a9b411a15e9e73154598d90c7a763f576e9f0afbe9ac95419aea6c568c037e0aa0321d87fa96d437201
 EBUILD tcllib-1.16.ebuild 1168 BLAKE2B a33d8cfcf72e090d0901880ffd238d67ad7e200027f10e2d3a6f4d4f259a1d23ed5bd923510380e753781d42166f1e67bfe174001d7d801d14c7b4aeb3a8eee6 SHA512 8b958fe27a58258235a5f2b80f74a1bb8ac6dd795326d116947579d1940834ea5d1d0f993acae89909e4adde31b6e874ed733f0275fe149a2cedcba3078d115d
-EBUILD tcllib-1.19.ebuild 918 BLAKE2B 3511591acb338d35aee8044c586a45b29e22a2a74e952145ac6092ca75a51447d3af43f38c8844e5ba7a13fbb0493941332b5ca31854bc83cfc5a7247182e4fd SHA512 6b4e80506fbeb22a02fbc94d563f6f7ad9e4a286325972b28d0213b20317ae5da9cdc00604a22e822161598faa09493790feb2644ece798a8b52dad67225a5a0
+EBUILD tcllib-1.19.ebuild 917 BLAKE2B 4cc5df4ba69561d6832076eb7e78082aafdb1ec8f8546c38891b7cf21768189ac9ce3751663da124989b8c9ec9216857858e0e1d66393cbe591e5e30af0b1c1d SHA512 df994820ef7c338e97ca84200c9ba9fc557f9a0c54c4b29376ea797a0d87d365952014a499a79cc6e8b341e9780b5a875f956663a8656c0582fc375b0fe2615f
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index b18d7ecbb42e..eff1e236c477 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-lang/tcl:0=
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 83a2ca66820f..bd6d54c9b2d6 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -7,6 +7,6 @@ AUX tdom-0.9.1-tnc.patch 2429 BLAKE2B 5ceb9f3a28df5436019f2ee8fb542eda7e4d93c79c
 AUX tdom-0.9.1.patch 2328 BLAKE2B df4952d6c660426e24f8bcbde225f42fb005dcaccc9ee456fa00588e00eba523bff20de4fb78fa5f5168561803e52c020d9379c041f0ebcd78b0ea231da14048 SHA512 e39e0c7d2285a325423cf1da268cbc66ab5e1ead67a0b5d8fb8311e6eb02dc905fc87a54b101396c69bad8dbca58fb0c1ee4d91fd7db825eff32c6fef6efa559
 DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
 DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
-EBUILD tdom-0.8.3-r4.ebuild 1937 BLAKE2B 668e585c4b8d86c31ea6736782499cbba33a109ee935957c2ab1527f606bb7cf374d31fa4885c48a37d77c50aed8945f706d50e61144eab5903a18b7f8829c9e SHA512 ee1d221a980999e3266dc58ca70dbf76beb3235f938afbeb7956fd483b23512744e46959a779d6b8e9a1b649d570a575da07e7d685c26a1e3bddf1bcc085704f
+EBUILD tdom-0.8.3-r4.ebuild 1936 BLAKE2B 3899989ecac572e48aa29d5b3d2741f3dbd6936c36fa87b52603b6763e6e0fe79e329780392a67153b1e1c2f552bae5f38493d92a5b41bc0087801b4de2d3aa6 SHA512 264f28dad59e75ef0d7888c5c5fe661406db250f329434aac5679d92ceccee85079ed829f860ee4ff5080fff104d0fca6181ed78b3cf72c02d73c24797366583
 EBUILD tdom-0.9.1.ebuild 1768 BLAKE2B 7ae602d221f213165e00ff2d1e0be96727622a070dc207ddcdead1d7c86bb5fed1afa7d43c5e14ed971141fe9a59125ade5690d9c458ed12b1cf4862b9adcaca SHA512 af97d245727b3d676fda98f082a91296053258262c4e7e73617c16f0a1316cd035d4ae9261d4f6aef65e8168957866a0529b1c5ed258814e103e4674d7b61fc6
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index ca54981c32c1..833bac790009 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 3898ede9b159..9f07671a478c 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index f6a12c10ef83..08b7a72dbc4c 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -6,5 +6,5 @@ DIST biber-2.5.tar.gz 1247783 BLAKE2B 9e20195cab8ca2cf0c84026ddd66c6012c9d362b0f
 DIST biber-2.7.tar.gz 1274716 BLAKE2B 216ad69cf536a79e3a8c46d945fee76bf0532097b5e269bf9318709e3bb2f11732c9fe0700115cb5a8e4f66d325b4938cc274f7c5c2c0450894e26447c015987 SHA512 a62c116d4278b177c9e05a1cac857358dd0ebc6283465e74bb557d13fa343843d8b84050a466b2308a309345309bd584ccd2e90ccbbefbd01f2203a8eea77609
 EBUILD biber-2.10.ebuild 1715 BLAKE2B 3b4b0534bb34abf448550d1ca0858b7305905d8fe444f27ea9ea6b3ce2240b1e77cabd3e401653191089b526d8cc618fb5aec4f1087c359ef578bf8e882dc993 SHA512 002f535723dd728e6f39cc98b39a520fffc7f16fab9b17262de8e533939d53f7d641c89c1b74f866c1f6dabbe6c4e24930a59375a46e5b5f383311a207fcaf91
 EBUILD biber-2.5-r1.ebuild 1874 BLAKE2B c5d0089dd1f86ea21ccc0aff2d21182ca53962111e0ea29c3635c1ef9155b6cfbcf61ec91904e38e8e5ae5a9eb233ed9ca1b454b76ac0b519a984b98791b2968 SHA512 11509cae5190e7acb7512fdfb11b18409158359e9c2912784deb8fb0d5da4f2767e8c4b845b18462c1a6badbcbc4d4b4ca0e80e91b67bd7145c6ed4797171db3
-EBUILD biber-2.7.ebuild 1739 BLAKE2B 586d97e3afcacd373124910914e1e1a0d7de36387df562ccee835f20abae73efa8c57b6e0dcef359a5578d87445a0a556d323db18ee518d9c70398f8da72a10f SHA512 03d03bf2908dc4787c5ded403e6c2d03c2b6accbf7f625749897a3b0fc54343eb43509ef318ba4be5295197af9d2bd2b6d03c2c388dae184b2b1f980a5c2bd3c
+EBUILD biber-2.7.ebuild 1735 BLAKE2B faf031a9dc400583fd14fb12734394728a5399df26e77e320706a3f2122e0836125952948ccb884f64ecc4efad9dfd9d6446c95b643e53c8a144ae8657af6364 SHA512 5cc1cc0bbb9f717e1d9cf201228f8b397004c9039acb5e79a597c5c9bbecfbc122857fa7a1fad6e564749a1bedc4b7e9ce928750949517993e755d355385200d
 MISC metadata.xml 517 BLAKE2B d9b10c6ee36cbd1f0d5ddd33d0944b4ba73b31c8dd7bb0537285bd2c0656d12f74f90524f3688d4d9b20c9bca2d3b3bad02be473ec1a87c4a8d66791fd77dcf2 SHA512 5b580b01df44df89406b9e845416ce043bc5ede5239c9024380348a7aa43f4c436485619e73fd12b4f0b5ea0628b9f8ab55142b5861e2a227fac02385c179533
diff --git a/dev-tex/biber/biber-2.7.ebuild b/dev-tex/biber/biber-2.7.ebuild
index f74084ea47c0..5a2aaf1c1a1b 100644
--- a/dev-tex/biber/biber-2.7.ebuild
+++ b/dev-tex/biber/biber-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/plk/biber/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-lang/perl-5.24
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index a1a4e3501179..35b62e7e8a11 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -3,5 +3,5 @@ DIST biblatex-3.4.tds.tgz 19279991 BLAKE2B f387b43f0a3b40dbbeff82bc5523fccf6d329
 DIST biblatex-3.7.tds.tgz 19378703 BLAKE2B 1265c73689c803944cfb54ba69918d7076370bb8edd81b9735bb316bd726f33243867e1092b8fb7e339d1614fd0dc05c09b2058d3b29739d7661f0845714f02e SHA512 d81a67b2b29e86e7017919ae1836da7b55da56698fd38f56cfc9377e6c15a8dff6ac28288c6b98a70b570f7db25504f18064093d6e21816c161dba155b6cc8f4
 EBUILD biblatex-3.10.ebuild 945 BLAKE2B a526271f85d64ab5ae4d25e868cac47882b3884e4d2af7cdfb4c3489932be86c7ce6bf3537e3449d810836ea5254d650152244de5b88b6128f972493cb37f8e6 SHA512 577aaca4ecd44338e2db8e1e3cb0473f28ffc2022e6f74270bc23c68a42d3d7f16af8a71fd513b26ced8d5b17acada0101f19ef7d5770da1e7440d2a44ce53d2
 EBUILD biblatex-3.4-r2.ebuild 883 BLAKE2B 25d05a799152bb0b4f9cba53b48f14661647dc12838c3d818baba87606e7a334751bf7045071a831272a1ed54cac4b8e0144c6c5d8bfb74c1332e90b2ad780c5 SHA512 d610e13174042af49a68fa97de275b6684088366e1c10dd0efd08bf656d08d564977db2711671553f7c0958319f98cdc23bce8fe98ee6dd6dc0005e29dd691a4
-EBUILD biblatex-3.7-r1.ebuild 938 BLAKE2B 19fdf92634342dd321c07a6a4ba6783402d7b7d2fd61d0af11b52510aacefb97e8ff5577d9b5b86c7a7cc7ce06f2dc237197bfd3ad45d3d7d40d68aa9a842b13 SHA512 ec823586dc0775327839ad0c5ef61198d6fd2fdfd7d8e2d7572e21350e487287025fa4e2280be365d6e46e6f2979c129387bdc6b51bc2a5e287f5158f3c923ae
+EBUILD biblatex-3.7-r1.ebuild 934 BLAKE2B 9334dff047fe02dffc0ab124699b2329f2130fecd268ec2f28293696c6161bba4cf89cc367e2aa2152a495784843a66e984f40a5ea0d6967046bc4a5c183b5af SHA512 142f1a6877a71fac8db83c2f9f357377b1bcc8f084913244e1f677280fcfc92a7afeaeea46227ca3dcb269e6f38d7840703c51f90dfd2192bc91be783ad3b904
 MISC metadata.xml 716 BLAKE2B 6e420e4597f650ed11755b5d08ee8d248be5bcb2d8845a4a13994b34f8cd8e16e229b5ae5291f04a0cf51483c1ae8b1f01c1f15eb3eb175f2962fe01bbf0dd3f SHA512 0ee786fb0f7579efd62c9fae58e9454812aa75636de55d9b9df24503b9ebef2108e625e9ad2cd1f301c34b5379b8e9ee6babed0ab8b1a03193b587935ba28bc3
diff --git a/dev-tex/biblatex/biblatex-3.7-r1.ebuild b/dev-tex/biblatex/biblatex-3.7-r1.ebuild
index f7e711e1dcd8..5e2dcfae5cb9 100644
--- a/dev-tex/biblatex/biblatex-3.7-r1.ebuild
+++ b/dev-tex/biblatex/biblatex-3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
 
 LICENSE="LPPL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+biber doc examples"
 
 DEPEND="dev-texlive/texlive-bibtexextra
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b2aaf2f5f39c..6bd9f1294ec4 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
new file mode 100644
index 000000000000..65fce7d98cb2
--- /dev/null
+++ b/dev-util/bingrep/Manifest
@@ -0,0 +1,76 @@
+DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
+DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST bingrep-0.6.1.tar.gz 614424 BLAKE2B 5a7f8378f8508a455ae6a877dbb2e2645ee605225e2ae6e7718da19fd5827155e9d101fc585c4ea54abd59cb22e936208f065f63467072eb693dfdb780651924 SHA512 919302a95003094da872eee89e4e142ed6f3edae593cb69ca85c3f0b61afd5cbf09479e84271457594fbbeee7042138039be21298f0b1ec7fbfc1c83c7f3ee1e
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
+DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST cpp_demangle-0.2.12.crate 67328 BLAKE2B 21147d1c7a2214e501b676e3a8c86cdabf5366539df2f8306e1c15cdf52cff1280946a7b073ed8c043d6157a6ff1cd790abeb3f28a23d935a7b25462af7b803f SHA512 0e2d3cb4cb90e156e02db6b09c26cc51eda999b6badda4095bb1be5cde2e144abfeb2ec85aa911650e6385eb9920b83c091c51aeb32770103a475c514c2e96b5
+DIST csv-1.0.2.crate 888793 BLAKE2B 12dcb63b31e8bbff21120288b1f8db8c036e83a9f82b0a317def7916797712390cbc44c36ad55b42c13fa7980dd3c66e2d7ef883ef6dfecbe6ffe8aec6766320 SHA512 37ed9432d7362374648cd0cf3470cebf7baad57400f56635e68c28c576f7a8fcb8350a3e420079df329e4c290e816f181712f04dd09e5101600dd4615b4e0afd
+DIST csv-core-0.1.4.crate 25406 BLAKE2B 10c6493da7d9adf53fdfb44b7e8b229a40beb9dbb882053d778ef8b54d90001b7592fe6b9e9dc5e48e3f113e55ec01fb05d1399b133d9fd99078b8154ba7fbe0 SHA512 c2e5291489eb1d1c192c7d94cbe8be3c6bcf0a5d8ef2bb525ccdc20a9c512e3a42946241457de7ba219b59d330d87a2ce51995782621e6c1d4192e2a71e888f6
+DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
+DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
+DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST goblin-0.0.19.crate 125517 BLAKE2B b66a5a7b85b544d73450f223a3ef74809989dd9bd278bdcd671ca59cc3226b23247654fb781bfa6ecabd53a72598ba2b1e49080e71d2ec583b313532fdb34295 SHA512 50758bd04e31fee5023fde437833ff59a55d717a79a447190b114bdd81794664b3d4be948b62cf5c6243a3d02b28c54f82d6e3da4ee021fb76e6626ebc29d8fd
+DIST hexplay-0.2.1.crate 10043 BLAKE2B 37251bd8ae4c5775b4671266b21441d9a21fa30dcfe95d6d0cec606bb114b5fde9ca25c8d1e5f316f1960b2e5e888c60bcd519811d7543b40a1fd0830ce01af0 SHA512 0c5097c05eb99f4cac11cba11143ade1446035d771104a676860773914f5d1cdbf921d56eb7ac15f00ba63233df03d6c64ae7823891ffc77bf268f6042671e5c
+DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
+DIST memchr-2.1.0.crate 21479 BLAKE2B ca97d105cc780f2a22eb1eb7d6bf6755f012b1d15b5c55cffb9a63f3faaf48b5285cc7b4edbdb933c4e81565da163b325a4d570aee5cb479496d8b74c3d52d8e SHA512 6de3056b5fcdf08fcfda34be710d2f4ea326f056450a78a4fd096e5742cc40662d3003f3ef6ced26687dcee7591f5a8323d14df2cc286d732b1b22f05424c476
+DIST memrange-0.1.3.crate 14013 BLAKE2B 61a6dd89d36cc88bd79d225f1ebd37a906ffe6710e7f93467307b8f42c638642903ad3469fda94166a2d4ddbab59378787c04098748aa40f811947b12581b35e SHA512 343c006c52c6679099b41d0debb42e1241a1b4790ac3b606d90809bc4515dcea5e7759db97e486de191955fda7801ef70c1db5daf5348c219948d21e139c9811
+DIST metagoblin-0.1.1.crate 3107 BLAKE2B 5251d61e7fe7014f414d7829012bf8580c4279de7e5ff940d30544e6db8fc9390218b93783ff65a365172e4c47c1dd2c797ff3df23809cf20e84b3154bceeb1e SHA512 a5c6a36afc4ea52894fed09295f9bbac9be02288091859e6a35bfac849c12adc5485d80ebc58ae4be225d80495503af716276f1e9d9377ce6822178f4dfc294e
+DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
+DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
+DIST proc-macro2-0.4.20.crate 30516 BLAKE2B c292c4a88dd1c8d998cd683ed6e341fb98e334e481ab91dcb5ef69fd1b83e0d5cd294a3b1221787b641a8f1bb5f51090f87cbc20944af1c41c8ab902840dd5db SHA512 40c3bc5c147325523f02832db015925b7fdbbc7c430be39c8829bf8f7e9bae33fbb3313328daa1dc7d791545df5af76d27f1ec9f44943db91bee8c729a02df79
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
+DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST scroll-0.9.2.crate 23522 BLAKE2B 48de922d9348708c63c8d83f1849aa903ca78b5988b6bb5ff56ccc1e28677922bd2eac2a7cdf1bafd5eda9b1d460d89c3f732d4b4dbd5696eff9a91df9efb7d0 SHA512 6fd5d72267b1b2840a524f2177f92d240b05b35bc345f2018569c692af8c1deda35fae25230d4652132b3003d740abb4d395aa26cabf958c9544cc5118e335fe
+DIST scroll_derive-0.9.5.crate 4314 BLAKE2B eae8b18aa6e35cc1c003870974b64114817415a4d1e45da6068e11c5132003cc9eb2ce9b538d02709fcc7f137a6c6b1058e4d5f2cdf5b443127eddc55523a81b SHA512 8db648782f4235a0eba142d37e5b60a999874b74c57009e10f4f3bca2a4f26d8eaa0cae4202b1613a98d6e70830b6d2827fb5aa6cd08c510c78079e8eb6b8ccd
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST structopt-0.2.12.crate 21942 BLAKE2B dcb8a53114184bffb3782e7a896f7549a89c27a7446f5d6238a7838f51e51029bb44d60e9900906537685d41cafebba6165ed7a244a6c3b97bdb2173cf70e98a SHA512 36d24a7780332d9a6bf55f329f73b88800dcffc3e74a0c50978d223074e884f9934b8effc38bb67de747fd60fb415035cbfeb84820ecf184ba8aa00290670f7a
+DIST structopt-derive-0.2.12.crate 11213 BLAKE2B 0fd8db15e6d8fc2ebfe93f7e71a6f7a70ee7e3273800c965fa744bcae3a7ebfab226ee2e82259104e3400a5fc7f0f738971dd6dcfd1425795b5bf16af4752242 SHA512 705c0d14cd07b7d6ddf3757f4cfb4e943f9a81513f7db035c14201905be5d245834e9bdeca001b7f5ed3f3c15930c40892b0f539ab44d1139a530c0fba0a62f7
+DIST syn-0.15.13.crate 144437 BLAKE2B 260294de8d28d1fa758013b84a9a811b1e449933dfa773a8f041898c662b8776473d0e73b0042b20ed00906a2db6b801236e457b44d2d6f856ad391af4950328 SHA512 c8d837f4a3f52a527cf7d4f8b5d96bda20e28a0893cb385fedc4672e64fda5dcd8d96338aa58a06d156f8cdc54e0ffd6f999157997b857bbf28d1bdba245be4d
+DIST synstructure-0.10.0.crate 17344 BLAKE2B 6a5d2e54ff1f801858d2c034bdfad85330dae0aad0b3940d41c8b334aedd929b9679f1e0f6d4042756cb37592950c12487993e27301e6371c720a27115c6261d SHA512 573212bfba512225dadf7928172489c7d9f74baa23779831eb1f4fc042f7f79a42d78eacc467e220914885cb3b0329e3cb7b65629f60d59bf1d1e1786c2c7963
+DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
+DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST theban_interval_tree-0.7.1.crate 22912 BLAKE2B a7f1a90a8a1f76808f64c013a0603f8b5f2811623511bc636f453a44b2d446bfe1d3f1257c1e20c0901b44b79c76f55145783f3d092fac947e48c909b4c0e135 SHA512 62ec06e13430c5828337300e8d25010b5a262d6359f33c689ea211798e1ba6103d144838ebf77d718e25360763f47265764e49d3332cbb05e91f4be159337f5d
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
+DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
+EBUILD bingrep-0.6.1.ebuild 1830 BLAKE2B 5cf7fe1eb18af77bcf40b1f10fcceaba97aae5ae748f4dd1ecf6cf6aee122b828bf82fb7556d23195fb8e06e1934d8103ecc69fc1d8d02218779f8d135814a66 SHA512 863d188121d89238c68ce88c70f8f099c3574727a3f57f95a946d633f6f7fa9c4a1ed4f582e5426951d8967cc118028e4119b7d503a771bd55ac77624dd5278d
+MISC metadata.xml 721 BLAKE2B 1033916ecf17446ce916c89c370bb7784c0547427b14f7cde6288f1de1bc883d04ca19bd31170308c8046d236ddacecf933b44f4cb33709327a6f2e4fe122aef SHA512 14014259f5ae3080b1362d2f73c7216bbe03321d01ba228c38e81262e9678b1056a13926515ec9f27a892335975eb7e591e851c03832a31f46449a5edb380ada
diff --git a/dev-util/bingrep/bingrep-0.6.1.ebuild b/dev-util/bingrep/bingrep-0.6.1.ebuild
new file mode 100644
index 000000000000..fde58d07e7ac
--- /dev/null
+++ b/dev-util/bingrep/bingrep-0.6.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.8
+ansi_term-0.11.0
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+bitflags-1.0.4
+byteorder-1.2.6
+cc-1.0.25
+cfg-if-0.1.6
+clap-2.32.0
+cpp_demangle-0.2.12
+csv-1.0.2
+csv-core-0.1.4
+encode_unicode-0.3.5
+env_logger-0.5.13
+failure-0.1.3
+failure_derive-0.1.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+goblin-0.0.19
+hexplay-0.2.1
+humantime-1.1.1
+lazy_static-1.1.0
+libc-0.2.43
+log-0.4.5
+memchr-2.1.0
+memrange-0.1.3
+metagoblin-0.1.1
+plain-0.2.3
+prettytable-rs-0.8.0
+proc-macro2-0.4.20
+quick-error-1.2.2
+quote-0.6.8
+rand-0.3.22
+rand-0.4.3
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.5
+regex-syntax-0.6.2
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+scroll-0.9.2
+scroll_derive-0.9.5
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+strsim-0.7.0
+structopt-0.2.12
+structopt-derive-0.2.12
+syn-0.15.13
+synstructure-0.10.0
+term-0.5.1
+termcolor-0.3.6
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+theban_interval_tree-0.7.1
+thread_local-0.3.6
+time-0.1.40
+ucd-util-0.1.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+utf8-ranges-1.0.1
+vec_map-0.8.1
+version_check-0.1.5
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-0.1.6
+wincolor-1.0.1
+"
+
+inherit cargo
+
+EGIT_COMMIT="d61355612f914200d422fe0fceff918b45d4bdfb"
+
+DESCRIPTION="Binary file analysis tool"
+HOMEPAGE="https://github.com/m4b/bingrep"
+SRC_URI="https://github.com/m4b/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+QA_FLAGS_IGNORED="/usr/bin/bingrep"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/bingrep/metadata.xml b/dev-util/bingrep/metadata.xml
new file mode 100644
index 000000000000..e34bbaa45a07
--- /dev/null
+++ b/dev-util/bingrep/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Greps through binaries from various OSs and architectures, and colors them.
+		Current backends:
+
+			- ELF 32/64, arm, x86, openrisc - all others will parse and color, but relocations won't show properly
+			- Mach 32/64, arm, x86
+			- Unix and BSD archive printer
+			- PE (debug only)
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/m4b/bingrep/issues</bugs-to>
+		<remote-id type="github">m4b/bingrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 30b216926f30..55222c82e824 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
+EBUILD bitcoin-tx-0.17.1.ebuild 2423 BLAKE2B 78ef2d3ae7facad5d3f7130ce7051e9167f74805b2f6774b1d4bfaee918540336a0ae849ca1506674ede327b8dd0e7ec35b30a573e90b97be6d743c3b8437df9 SHA512 138de5a0154dd1f198c82d7476f3d858e6391522633d8ce044ddac9797a3224949e05b074ddfc4076ff4202b4e95928b22e4e16295a6bf17e98e2a35b11a0690
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
new file mode 100644
index 000000000000..a431bbafab73
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 9fce47190030..197eaef59a32 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,10 +5,10 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
+DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
-EBUILD ccache-3.4.3.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
+EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.4.3.ebuild b/dev-util/ccache/ccache-3.4.3.ebuild
deleted file mode 100644
index 25d07d629e1f..000000000000
--- a/dev-util/ccache/ccache-3.4.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
-)
-
-src_prepare() {
-	default
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/usr/lib/ccache/bin'
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.5.1a.ebuild b/dev-util/ccache/ccache-3.5.1a.ebuild
new file mode 100644
index 000000000000..7491315da2e2
--- /dev/null
+++ b/dev-util/ccache/ccache-3.5.1a.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 64ee02976017..b1185c81e99b 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,6 +5,6 @@ DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a586356
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
 EBUILD cppcheck-1.85.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
-EBUILD cppcheck-1.86.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-1.86.ebuild 2339 BLAKE2B 453ea3e5775928f7919e3528f9b4d15ebee3e91d20c6d0322c686205ce47f724ee02be5ea91c6b4a2c8b08cd3cd4c47c60c268898f7b2676ee8f095ebc1c0fc1 SHA512 6f8f66ceaa041b1bd722d133504a814ebfeea6c5217ae3faaa1a2d17f0e023c36b776e8651ea9a57f2016e8650c0fa7d7382f6cf692d0bf60d0f84f455f4457a
 EBUILD cppcheck-9999.ebuild 2276 BLAKE2B fae2869f37c66579e943a6d9ba6cf76fe8cee7fff3da469b0a56b2bcd04d36fe1fbc9054642f2e3cfd5f2a4cba6de8fc9fe1000bacd327e27d8909fe1396d2b9 SHA512 71f7c9dc55fda1199755f4826c4d070abb52b4e9f7bb090fbb9801dfaf37d3c54fb480e32e674b67dc6089a4a6a0f58df00cd26c2447f57787fee3f912fe92d3
 MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index 87931e60c7b6..1bdbc10acd3f 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/cpptest/Manifest b/dev-util/cpptest/Manifest
index b13a56b51dd4..09c40eff2a65 100644
--- a/dev-util/cpptest/Manifest
+++ b/dev-util/cpptest/Manifest
@@ -1,3 +1,5 @@
 DIST cpptest-1.1.2.tar.gz 458982 BLAKE2B dbb144196ec5726822f859397f5429e743bdc9bd840c2dab198f19512d2d0ff66b33e8b1018be2616944e300b0bc0e2fd247b7c7a5a290096f8d402592f1441b SHA512 da1030c69a5886e752b9ae08b65c501334c7d2d4abd2174190209ce11ed351239a615b9f7c5019ee601289523b2c21a1205d2042e59aea6c2882d77d636fc57a
+DIST cpptest-2.0.0.tar.bz2 440323 BLAKE2B 7d703a9a41c6fc355f97d2074b71fc5c700ee2483386984147c399c096eebeec7f2a980f0678e1a4d9979a7795d3f7ff7d70cbf8b483e055a420de985aa40f2e SHA512 41b5f7989198a79dca29f7d579c4d3918e5c3bbc0f91f77317ae074af8daaa8e5ee8add7c29c8e345cb95b08524839cecc7659a8d95ee95712e205b8838c5029
 EBUILD cpptest-1.1.2.ebuild 585 BLAKE2B 88751b5235040b917f4c0b84064c3e6db41cba60c4daca8405140874359906c8c623008ae88b337e57c27f4e213ba00fd3c56df9819821f5e8c28adb93452763 SHA512 52b488314d202a8e067fa7dc0c6e67c7ff70981109031795288e21aec233c38d5531d79a1ab7b17ca40667b4bbfbb5e5dac11a729e092d1662ef5040b2f5a60d
+EBUILD cpptest-2.0.0.ebuild 669 BLAKE2B bfc57524c0fa7474f796a75fd507072344feb0438b68584d6874d73bebc71da8c1055a5139a24b3e5b18ccf14655974175a0f547b50e177ed6f8f1e21d21b7ab SHA512 a6d9d1ed8a8544e3f258ead5a53d21cc51ab3e2ae53153867361db033e758cc3ace48363796bfd0880156f2880dbba611a9837727b5632b7c1b41be2b60e08b4
 MISC metadata.xml 604 BLAKE2B 2d0f5d155ead0d2035142bd395d1d057a4473d6d724b287bf6429a0c120eb340c16e5626929400acde2377b4c34de6fbb3016021f0b759b6fd16265ed67be017 SHA512 7df99419d82f5c714e2c941f810e3a930569045299b63dd9c2eb851628124c410afd30cc1aeac52ddb651e1e48ae8f41727f02c856b0f5a01d16aec318aa82dd
diff --git a/dev-util/cpptest/cpptest-2.0.0.ebuild b/dev-util/cpptest/cpptest-2.0.0.ebuild
new file mode 100644
index 000000000000..8369dad2328c
--- /dev/null
+++ b/dev-util/cpptest/cpptest-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Simple but powerful unit testing framework for C++"
+HOMEPAGE="https://github.com/cpptest/cpptest"
+SRC_URI="https://github.com/cpptest/cpptest/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1"  # for soversion 1.x.x
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="!dev-util/cpptest:0"
+
+DOCS=( AUTHORS BUGS NEWS README )
+
+src_configure() {
+	econf \
+		$(use_enable doc) \
+		--htmldir=/usr/share/doc/${PF}/html/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9a4a7a12f2a2..ea6e8d9ea7e4 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,7 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
-EBUILD gdbus-codegen-2.56.2-r1.ebuild 1309 BLAKE2B 7a02615b7a8cc26cd9be1b2452800628152914ce889ee676df75f245784f03aa0ce6a4a45bcd73f13e3976fc0ff762e18e360e2f06b2b63fbdc9580e3674ce08 SHA512 d9e16e1b9c6f9075bff59b0b8210d94ff67090be24824bef8bdb5305221fcaf486d3b74f36c2541674c40c5cbddcf5af120b6c30255677201c281e7b7b35750b
-EBUILD gdbus-codegen-2.56.4.ebuild 1308 BLAKE2B 3403601f6a6d85176202a1d9a7bfdd27d4d1f3594c40283c7fd4ff8cca417f8e0fc3f6caaa6c4e80b11b6823d121d44e3fb8d988adcab7ee87fe65552d4137fb SHA512 6433269396322e2bab671ae69d08c1fdded1edc7d351bd0ffd31d20f8547cf6a821242e102fa020218edec469cf622c68c8eacc11752f88714b137b771bc98ea
+EBUILD gdbus-codegen-2.56.4.ebuild 1306 BLAKE2B 0822701e68416ff599d2e5980ca176a10841b74a99f036bc4e4fb187cfcb865b99cbe312af75ba208e959d3a765d0d8beb7ad620475fead87087cfb6a5e51b56 SHA512 f671799d602017a6df349a00711edd80136021041e08c5349844ac94c2b6e759ea3160d2b72ed3a1cbc866d2549cc8fbbfe2bad3053804affd8276aaad225015
 EBUILD gdbus-codegen-2.58.2.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
deleted file mode 100644
index 91798e300e68..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
index b1373d2fdc64..cfa3d789588f 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~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 ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index aa0598ff8ecc..b9e28d35aa34 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,10 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
 DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
+DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.34.tar.bz2 4474601 BLAKE2B 92a2b8343512317ad90cd10bd58b2aca77d7f58dff3548cfdbdab121343b67dcaa7a9d5b57cafd196d599d8bb6a121fa5e49d65a69fa7fd87fe7703be6b8d5fc SHA512 ef506880fbba9acbd2003b207c9897e115d398e716631bc1e164e3455aa9172f34b9955c627fb2f2dd3a3cba0926cce0a774d641517bc94b700d866be00db1a7
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
 EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
+EBUILD geany-1.34.1.ebuild 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
 EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
new file mode 100644
index 000000000000..416007a6e5ed
--- /dev/null
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="+gtk3 +vte"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	default
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable gtk3)
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index ec8f0a35c68d..03f61925114e 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
-EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
 EBUILD glade-3.20.4.ebuild 2387 BLAKE2B 003c02a10279cb52ddc2ff94a990bc126439f7ef5f8fda5033a05587701d4b6de31b661cb6c417ec1b8aff5c55da73e7a4609df693951be702d39a7854a8446f SHA512 2619096c3f62994aff9022a68987f09c409c213e6cf076328d805915fcb183283c2fad7de4c5c4091573c4417fc94607c32f7e7013041a8582b45b304effb6a8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.2.ebuild b/dev-util/glade/glade-3.20.2.ebuild
deleted file mode 100644
index fcb9aec14d78..000000000000
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 01b52dbcad32..00f59ac37071 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,5 @@
-DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
-EBUILD glib-utils-2.56.2.ebuild 1412 BLAKE2B 19d1c079c16b76facbd3e3660257c407b5e199a34699f2cdb8ce96994a2583dfd711e4645cb2dc7105fd93144a4a45c8549ac6c79b0b60f38412485219b776a1 SHA512 6877ea1e614ba2f94cae7f70793813a1e43195723cf469e936278996b9039f4890520c9df6f57297015f6cd07d1ea58ab248a4835edca66857938fc8f2dfcf97
-EBUILD glib-utils-2.56.4.ebuild 1411 BLAKE2B d0cf30d9beb3e100198a7898fe52111feeb6220e04b168667e4353d91f68b5dd26f5239dab6e594d1588426a62f6c9dd1c2a887d239756f8a5afd322ed17966e SHA512 53054e7cc6cb8bc04e2b6354b7e0fe791cbab45d824914880eebb385641d3b9f8ab69b3fe6d822694cbada77181d7b1706eec0207c0b9612dc7a92ad5f31e5bc
+EBUILD glib-utils-2.56.4.ebuild 1409 BLAKE2B faac06d9c04b56b3566a3227a3b8cbe8170c3aced4cf1ab2fb2fde119e2423cf81fe6a06c5b147f4154f44ea17bf4d1b2149dc9e5580dfb4dc13b59e35ed0020 SHA512 8f6a3b9b1d9bd0f7d1b393122545a0922b699a7c5a43a3c4a1d14390b92e2a7bbd584eb4970f8554c38827585b1d6ae0220b7f67f712105cdaacf87f03d0472f
 EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.56.2.ebuild b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
deleted file mode 100644
index fb0510c85f1f..000000000000
--- a/dev-util/glib-utils/glib-utils-2.56.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}"
-
-src_configure() { :; }
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.56.4.ebuild b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
index 337ac0b5df29..7fbd4e170b8e 100644
--- a/dev-util/glib-utils/glib-utils-2.56.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 1f4c845607b7..394e5b39852f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,7 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
 DIST meld-3.18.3.tar.xz 564660 BLAKE2B 2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b SHA512 7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c
+DIST meld-3.20.0.tar.xz 591956 BLAKE2B cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8 SHA512 33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798
 EBUILD meld-3.18.2.ebuild 898 BLAKE2B 8e4fafffdc83112a8012662e3b26a3e506599fbcfcc385572939cbe8f33852acd5e6077beda2e186cc06174ed25a62099dfc1ec59122b229c1787442355a8d62 SHA512 78ce7d28f88129ae9b461c9bd6240f39beb68e9d472368042e37a77e3cb9a64bdd5e5fa6f7eb26677f107b8f67298ec253428e56b75987c5891644b5f6c0b0c9
 EBUILD meld-3.18.3.ebuild 897 BLAKE2B 029ccd55648cd6ef13cee50448dc0b04faf39f4dd2fca4d80253282803311699b6d22a6026252edea18083618a9723fbd2bf5f1324668f81dc44ab5051f3c3ba SHA512 dbcb138264995d9e8beceb420ba1b447efc57fa123ceafff32ae3c86bf800cb9542ff95ad3c3ec3942efee9e1364f2f90d5f00ba5a842e2ec8c180df45cbf606
+EBUILD meld-3.20.0.ebuild 901 BLAKE2B d6b875a25f7c430de3b47bb858b79ac271da6206fbdf32a43e46e3021319c92ef77befc525c2877fe52764b20203945bf023c2e05c9846ada0ccad16c41dc60b SHA512 8e11722dfa2dc80c11533d8f10d2606f0b952606d91f96a7baa39f7eb15b06f49c0f9e05d72216cfc19c24e430c7dea879539e0aa3e3fb4340c08a6861c00d29
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.0.ebuild b/dev-util/meld/meld-3.20.0.ebuild
new file mode 100644
index 000000000000..5620f4667736
--- /dev/null
+++ b/dev-util/meld/meld-3.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ec6b61ab55dc..3f9ac150ce7c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -11,7 +11,7 @@ EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152e
 EBUILD meson-0.47.1.ebuild 924 BLAKE2B 8d581fd6b067bac2f1df75966404c52965200621efaf1e9c2ba49f66370c19bc28808c7bfd1e8f425f8a3417f140a906bd1e4705e64bd3dd220e18768e37ee76 SHA512 d4f8e48e3cec8dd09663ddf9a85bfa4b2e4882633d68f0a4f2766938da90aed1bcf84cc4a167fe56782258f9d5162f0eb6d24a59af311daeebe9913d18b1a61c
 EBUILD meson-0.48.0-r2.ebuild 1205 BLAKE2B 6b7b273e23e9e28e8fe78d20948802ed6834d017930bd8ddb286a0c01af68fb9d91443bbebbf8c1a82433759a6b74be85c744fb1fd812d3e2b2b8e3bdefe2105 SHA512 f107c74333c075cccae7e91afb465ced0c7f8d21b5c13849b425c6581567d854a663f0f452efb7ba7ad6bc145c2d8c8e5bdef80a12770c46fc7fd9e038646420
 EBUILD meson-0.48.1.ebuild 1139 BLAKE2B 813a717e745a1adf42be7e66a7fda714b9244a80859b8983470ae34abaeb4c1e09c28d8538ca7a9560131609ed5408c7f9699f92200847341d06ec86b6e02882 SHA512 ca5ce3d1069263b4b4a88535c15e768ee7131e0a8a1155c39c614dee20a8eac7f598ce7daa270853fa968ad0e2ab84078bcbff251d4744c0de7e9f91c433ba96
-EBUILD meson-0.48.2.ebuild 1743 BLAKE2B 70620f06993a47ea4ba4753f50a96d8d2923fc201e2142acedd03928639a14b36130442cf4a8fba05b0e1d9a78f7a2ee41679ea70b41da0aee92016d348495e4 SHA512 bd44ceb5b712fa9a0f9ed7166d16a4e183ad085e13101448ea27dba89510b9c8ee63c86486a7705a9be1f6fa750adc0d80fd1dc4548fb73ffc66d097f20a1e7c
-EBUILD meson-0.49.0.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
+EBUILD meson-0.48.2.ebuild 1740 BLAKE2B f5796ae34849fa395b91ebd0d8b7c539a5373ac0e1a541a4bdc8c40ae5bf5f858a5d8799cd3e284bdcf34e30015e36174840772c3da327dd2abc9bb9b2e92b9e SHA512 8a95f4befb2a9a36e878f43be64cdbf12773419008ff351d4da908bca91d3da2c1c24325187613d695379eb704b43b1249549f283efdf59eef62f9999e4b6e6b
+EBUILD meson-0.49.0.ebuild 1774 BLAKE2B 81bac0aa7f60dc7a2313b3dce5a9cc76c82cfbb08c63a2ad0f42df52fc2489a39360d6c7ad46ea5d3344b7777823bcc8cc20626feeb6cda8059d260e65eccad0 SHA512 d7b8bff503a98b4d6123435384a5326b4b5b5ea53762fd65982682901ac9be12dcf85e2769a47fc72d331d6f44bbb47393176b72edec60336e4a25d3c39a820e
 EBUILD meson-9999.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
index 89e757ea3551..faf11d7681c0 100644
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ b/dev-util/meson/meson-0.48.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.49.0.ebuild b/dev-util/meson/meson-0.49.0.ebuild
index 31b02901a507..6149ebc1ee51 100644
--- a/dev-util/meson/meson-0.49.0.ebuild
+++ b/dev-util/meson/meson-0.49.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 17ec74303364..898ee5834578 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,5 +1,5 @@
 DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
-EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
-EBUILD ostree-2018.9.ebuild 3219 BLAKE2B cfb584f4e3e8e38eb9df1016aaf7778eade21b6570d39c399c22facfd5dbce1c9d7e5e0db920820c645e0d9c2c04ca4b9c22668fa39bb0e499ad1e176592903d SHA512 8f32a3f915b1222850b3c1cbe75af5dff6013a38b6c8c3510aa4e5b27f8553fc9122c7df164bd30c96be832c00c695ab5dc7d8a0c881c96fbba077efc693257b
+EBUILD ostree-2018.5.ebuild 1181 BLAKE2B cf819151f25f2a120dc83de957e7d60ec96eaeb95fc0dbfac7b8a86f374acda1e84c23f76156a9a60808a5a45ba99a27ffe5439900d630b1b2f9f213ba3f51f2 SHA512 1a6c195dfdf50bbd810c44b725bf74339bf82e3beec9dbda68d01ad0cb08064b0e0955985149242711015cac7553fa5d31b176db9255124af9237ca2712ca2ca
+EBUILD ostree-2018.9.ebuild 3273 BLAKE2B aa9248a88fa9cdf9a3e8bc9ca9094c14414e5e89eb1da4417cd4aa8b2ff4f1b4f8e524f9d8622f528ff3fe5a08077258af41963ef9566d3a231e44880374218f SHA512 a615a7e34213dd06c1f8bb65c2e2d26f070609c7a3b607c29f02d892650a99ece6b196893983276a12e4ba657a6acb5b247ac5faf692f88ef9d2c8f860040535
 MISC metadata.xml 1733 BLAKE2B 81ec9a732f50e49d589e385e6f88a99a629098d2f172aa398ac819fb4e343d2c172c86f92c778d402623f8b7b1143ca8f19f3f3c9ff30fab7fe89dd20ce1428f SHA512 56f083cd71d111275d59dc2759da9ec7685deb01890476da499b56ed82d873bdbe0a0e76f5c07a8c9f2efc3219c34884df2fe4c6b7407363abcc2b6ce066ddbd
diff --git a/dev-util/ostree/ostree-2018.5.ebuild b/dev-util/ostree/ostree-2018.5.ebuild
index 3c2aec24a4af..a625a9af6c8f 100644
--- a/dev-util/ostree/ostree-2018.5.ebuild
+++ b/dev-util/ostree/ostree-2018.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ COMMON_DEPEND="
 	dev-libs/glib:=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	net-misc/curl:=
 	sys-apps/util-linux:=
 	sys-fs/fuse:=
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
index 495e21ac476f..a0ebb8afb288 100644
--- a/dev-util/ostree/ostree-2018.9.ebuild
+++ b/dev-util/ostree/ostree-2018.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,10 +17,10 @@ S="${WORKDIR}/lib${P}"
 COMMON_DEPEND="
 	app-arch/xz-utils:=
 	app-crypt/gpgme:=
-	dev-libs/glib:=
+	dev-libs/glib:2=
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	sys-apps/util-linux:=
 	sys-fs/fuse:=
 	sys-libs/zlib:=
@@ -42,6 +42,7 @@ DEPEND="
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
 	dev-libs/libxslt
+	|| ( dev-util/glib-utils <dev-libs/glib-2.56.2:2 )
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
new file mode 100644
index 000000000000..6be5fc118308
--- /dev/null
+++ b/dev-util/packer/Manifest
@@ -0,0 +1,3 @@
+DIST packer-1.3.3.tar.gz 8988302 BLAKE2B d6357624f7aa8af73961be9b8f75ec36650d3ccbf299ccdb85776699332fcaa90ff38349837f17962b9587cbbd051a75b0f3429b4459ee9aa46f2a897a3511ed SHA512 fc8965fc4c71d12e2d4bf0c2c7cb565834205749390cdbb879acb23143d4b7f4c566b6513afbec61ad73bf3e08a551ce001367ffad105dba68b72f2092d4bb97
+EBUILD packer-1.3.3.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
+MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
new file mode 100644
index 000000000000..bda27c75a682
--- /dev/null
+++ b/dev-util/packer/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dan@danmolik.com</email>
+		<name>Dan Molik</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Packer is an open source tool for creating identical machine images for
+		multiple platforms from a single source configuration. Packer is lightweight,
+		runs on every major operating system, and is highly performant, creating
+		machine images for multiple platforms in parallel. Packer does not replace
+		configuration management like Chef or Puppet. In fact, when building images,
+		Packer is able to use tools like Chef or Puppet to install software onto the
+		image.
+
+		A machine image is a single static unit that contains a pre-configured
+		operating system and installed software which is used to quickly create new
+		running machines. Machine image formats change for each platform. Some
+		examples include AMIs for EC2, VMDK/VMX files for VMware, OVF exports for
+		VirtualBox, etc.
+	</longdescription>
+	<upstream>
+		<changelog>https://github.com/hashicorp/packer/blob/master/CHANGELOG.md</changelog>
+		<remote-id type="github">hashicorp/packer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/packer/packer-1.3.3.ebuild b/dev-util/packer/packer-1.3.3.ebuild
new file mode 100644
index 000000000000..8cae3f47d007
--- /dev/null
+++ b/dev-util/packer/packer-1.3.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+
+EGO_PN="github.com/hashicorp/packer"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+DOCS="README.md CHANGELOG.md"
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+		-v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+	dobin packer
+
+	pushd "src/${EGO_PN}" || die
+	einstalldocs
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+	popd || die
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 0d353b8d1bde..61923b5a3c37 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67116c081818ae8d769ca492f201a1da206d9ea4d0011e01790ce54a1d0c0e174de966938adea46ad526652f766 SHA512 39804112b70bb90b655754b78d87a23906b749622083534dda1cb7b7e381c61f95c41c02fbfc6f8dea075bd3665cfda93f565c5d896779d5746ac71b74878df9
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
 EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
+EBUILD pkgcheck-9999.ebuild 1308 BLAKE2B a9c60ed56de7e719a3accb8919d854a300b3fd04a058e7d76fe51fce5a41e10dc751fe896ee33713620b0e787c7e9f1bc56b1fb2657156e3ffc25f9c2353c5ff SHA512 11235d5c364fcd3f7edaaefa3a46826a80f1ce18e1357fc5e8fc6f293cc562cc3783b1e3ca335caa5356a8752720490dbd6bdee5fa24bf71e0766cae9e37ec6e
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
deleted file mode 100644
index 7f6377c90e14..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
+++ /dev/null
@@ -1,53 +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} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/pkgcore-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 2b1a33742b3b..898fbc5e514f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,11 +19,12 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
+IUSE="doc"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
@@ -31,11 +32,11 @@ else
 fi
 RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
-	esetup.py build_man
+	use doc && esetup.py build_man
 }
 
 python_test() {
@@ -44,7 +45,9 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
 	distutils-r1_python_install_all
 }
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 06779407c8c3..39553279985e 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69619c944f503dd9f2248a43cf3352221b34c40604f409038d85366321e858037e3c9c63dc838c046917c3102a2d536e4aef05c1636 SHA512 aca812b3355552c6a65865385e82c96fbca06f9caa39fd21723710922865f7aeb38de33eb041efb1e3553e161c34de6d8b8ed724d7c91ba16f3a818711ca9468
 DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb8b139da45bfb047cb1fdeacc9b64f17982edd237ed0633c391c15326ecaed7d9e599b3f87c0a16a2eb1302ceb37dfc1e0329693d0 SHA512 8d1f418bd97d8249481ad63fa699c141e498820698485b74c6f08674e4b0eee6054e9ad1e59260342fd615a5030ed932d1177ed8173ab9cf6026561c10fee9d8
 DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
+DIST pycharm-community-2018.3.3.tar.gz 310740450 BLAKE2B 53552c228c81b17833d02a18f21838e768fdce3de8595a32fa832938208520306c1858d1e3ca509671e0412f2ec3b70acdf802a8af38816d91970f0c08b93147 SHA512 f1e774633718361fa623cb9810cd23be5da98f1bdc6cdfb01ef0980aa1163e0dea1e6c4ebbd1496ff903d81fec744f022a7c7854e29302c19d503541565dd1a0
 DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
 EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
 EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
+EBUILD pycharm-community-2018.3.3.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
 EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
new file mode 100644
index 000000000000..476b12dea206
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index b46dcdb33345..d62509e93982 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2018.2.4.tar.gz 343705704 BLAKE2B 69cb8a57f8daf8d986c201e549bfb68b048a2f78e819aeee000bab836c5a25b50d0d6aa9870f6ff8b35907ba9bd69fef7071d421c74970f68496e4448495d43d SHA512 3bc35cfeb1f1d4b95bbc490bfdb724ab76757a5f819c7acc2cbe85688493a9d8dc57cfa179a424fc24679f2093f55d5417a6859001093d58518a8b330d60f7f4
 DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48e16a8c047751a88c6ee6e4862c6dbb8df12aa3e0e57a3d0d61c2cccb5995f2763e0d99eaaa967c19c884c40a350a7148dae71a66be0c SHA512 9324315f865bce9b379ab9f698eb6e97917aa3cb4ef90612b22d33516c18cfbed9fb806dd9bd4884ead6e7a72e2b481e5636956630ac7da75234ff8ba4975878
 DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
+DIST pycharm-professional-2018.3.3.tar.gz 398193313 BLAKE2B 14445d3c3cbd7be865569971d37943caff56a14198c9e81708d692110e4abafdaf10700c842f72f54fe252b2e211b46aa4336f583ae548e0d65ee3ceed4ce95f SHA512 ba8807491a78c0da2e772724c15c9aab6e48383f5407adb98a34d5196e2a1015f52f3eef9fb20c0da9115e3d283ed115663a732fc930cbc2bfc8f63d4ce0af5a
 DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
 EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
 EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
+EBUILD pycharm-professional-2018.3.3.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
 EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
new file mode 100644
index 000000000000..4b028da13f8f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index b463f6d44946..2995eb94044f 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -2,9 +2,11 @@ DIST radare2-3.0.1.tar.gz 6638512 BLAKE2B 1051e2d948bf312a5d54d03fa20a2fa6954f0e
 DIST radare2-3.1.0.tar.gz 6652526 BLAKE2B 8da52e93263b47261cadc28e0de637b177943ce978ff342e305c7c924c062458d4eee18d05a21c9ca5153b7ede13332c87e9cd2f22c6880d47fd8e05db21036e SHA512 ee31de49ff83ca1ed093eaf113201cb3709adcb3315671d88413aa4d5c80c37cf9e981c33b4f472b9aa5f67309cdaf9577c2085a8c58e4faf86b37d1ee19866d
 DIST radare2-3.1.2-r1.tar.gz 6664607 BLAKE2B a04bc70eee438e00b59ec0e699b9a4d56091c9698d0abb965a65c20bd28ee604f154f50d8e18d9233594aaf77c72708e864b7dbaaefc7ed7c300f46ef5e02311 SHA512 365d45b3b82551e4e146c5872d0d502f0daca70286682053f8fb4f61a6771d91fd1b1eda34b113125dcfb06e957496f07184a74c532b7872f37fbb305dda52ad
 DIST radare2-3.1.3.tar.gz 6662694 BLAKE2B bb4cec7fd05e4d43473ef2e67e8284c4b6a856ca1ef312153fbb236b800ed3e369ac9833d87e00e2aa5a560c7d8f7f9433d4b8aa9a3f01e7fabe3c26c3f3d60e SHA512 75b4966e8d64ffd341c50b22d12653e4ead23352d25a7a1f923ee6cb177bd0a9a16e7c02cbd5b58cf3da03f415168606cd67ed19f594dca75c66114e9c35903f
+DIST radare2-3.2.0.tar.gz 6690470 BLAKE2B edfa7d03d72ab3b7ebda6a2c860165c0c53836f4141674581c0f5f5cc1d6dc7a4ea48530d4825342268e057aeca458a0883f6fd70fb4a2d5d052634f32555442 SHA512 9773068568cf71797b0c86837188604130ef9d63e7b7fd115820d8979dde37d259aaea45002c9984e8c3599e9bade53720d3bb1b3635bdad5a2dc73aff54f048
 EBUILD radare2-3.0.1.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
 EBUILD radare2-3.1.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
 EBUILD radare2-3.1.2-r1.ebuild 1156 BLAKE2B ff6f7b0bf53f2960cd2b98e8721cf6f25650e740c5bc4e621e3d7dcc44a25da12cac1492ae22c18857b21c7b66a66c913043760f55ff948d6847d215fa91b65c SHA512 a3451ffe1c3c5dd75dcca3f25ea54b4eaf29f0f2889b40fd5b943b63b9bf1f3f84d1a420d420b6e5b987a48e04c95d5bd47e603a16491f28af0aa36c7980d00d
 EBUILD radare2-3.1.3.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
-EBUILD radare2-9999.ebuild 1192 BLAKE2B d6dc77b0fb62846880aa347fc742a8962cd9cfb93596a82bd49c912525d4f5dd4a3a0a9478de900b0c0fa0c2a547796c69b20e9ba1d77577373e4dddf4d8d0ea SHA512 b7af1fb1648b78d52e0d16b99ebba8b70ceef1372ef389e082cf8e4c275e0afc1342f80843e8cc163d3188587cddc4ffd7661769d8c37be1ba50255e62283e75
-MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
+EBUILD radare2-3.2.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/metadata.xml b/dev-util/radare2/metadata.xml
index dc1faaf6b746..45f16b33e569 100644
--- a/dev-util/radare2/metadata.xml
+++ b/dev-util/radare2/metadata.xml
@@ -9,7 +9,4 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<use>
-		<flag name='system-capstone'>Use <pkg>dev-libs/capstone</pkg> instead of bundled copy.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/radare2/radare2-3.2.0.ebuild b/dev-util/radare2/radare2-3.2.0.ebuild
new file mode 100644
index 000000000000..0b3f4cfb432b
--- /dev/null
+++ b/dev-util/radare2/radare2-3.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index e2ecbd2ce570..0b3f4cfb432b 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils bash-completion-r1
+inherit bash-completion-r1 eutils
 
 DESCRIPTION="unix-like reverse engineering framework and commandline tools"
 HOMEPAGE="http://www.radare.org"
@@ -13,27 +13,28 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/radare/radare2"
 else
 	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ssl libressl +system-capstone"
+IUSE="ssl libressl"
 
 RDEPEND="
+	dev-libs/capstone:0=
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	system-capstone? ( dev-libs/capstone:0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
-		$(use_with ssl openssl) \
-		$(use_with system-capstone syscapstone)
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
 }
 
 src_install() {
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index f626f4880a04..904e7e69c274 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -12,5 +12,5 @@ EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
 EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
-EBUILD re2c-1.1.1.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
+EBUILD re2c-1.1.1.ebuild 778 BLAKE2B 37b6b62902098c402bb2e2f6df3624a89f4254c09d8597d68d583a22d284720a84fb1cae52783509713bfa41d69e0aaf45d4ab8127b175a1acd0ac4a4a37009b SHA512 b7aca0793473f8e35208dd79e689292048ea54e24e0c4da4b5170c6fb6c6ca87cdb0a4fd7537e58a4566b4353da615681cd9bb6ad3960b38970517a922c6a7c9
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
index bd4ecbe5865e..55d446ebb198 100644
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 2f597c9082bb..4f7f6694d757 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,6 @@
-DIST redo-0.21.tar.gz 87347 BLAKE2B 1d97f6b4f862e61f9074d0dd57293b3ab61a4f3f26781b242450bd1e194b941a8a169767739ddfffd0a8d721a95229637e8c6d9083d2c67d664b19551db0bc6d SHA512 8fe9ba0a5b0b4bf9073456a4b4fa7bebcb51ceb4fb06a16dd671fc48ba480f2ee4ba1eae48cebc3c15687de43833324eb6f98642843be71ab7aa2fe471ab7958
 DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
-EBUILD redo-0.21.ebuild 770 BLAKE2B 0c7aa63ec92daee1ba01a118230a93a3f0a15f17521c04e1797856a0ab3cb5f937b36b069640fe02766d691a3de1e99368053a9628ba9e1ccad16a47d17b1d19 SHA512 7a6f55caf81a0fda662b32092c93aa3ffe827f4c517e672239130def5873ddd3dff6a3e346b607cb89a846541f38e240ce44d812f27b0deb99a73c952e2155d7
+DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
 EBUILD redo-0.31.ebuild 918 BLAKE2B ab6e9c3c0e9bb68bb23cd6171fdbb9f34787e7f648529c9f96ba8753cea215999620707a34236a80bc9c78de2bb61aa17a28991a28267e621aec84c5508fae99 SHA512 c7c652dabd307403f8748639dd4b6542b784c258964a9247c3e7a7b20ef91913ce32ed275c4981f385861182e0511edf7e7d54ae467407716bb1cd0091605055
-EBUILD redo-99999.ebuild 870 BLAKE2B 1976d982532c6d9581a4ed881bdbf0e2ac6c11131dfc5d2ceaca40208d3083b85720c9ff10880d132d4392be4131d8f525ce8e33a37148952f4f1bf83d1ea524 SHA512 5c15ae10196eb447bb8ef142367111d2fde7c783a1f0d02bc66f4e5d5101e475c4ddd7121104d6e18de588bcf2b3192318624ed664a28a1aad182e7f8286efb7
+EBUILD redo-0.41.ebuild 923 BLAKE2B f6e13631931a38c159cf0e8341a422dd865878a5ac2abd4be9363ea1e3940972bd88d1fd26f12fbe4089e1a9b0c4cc0a57fcc50523a327ee1bdf3c1841d392ea SHA512 0b2fc82c7831774fa11ff3cf5f4425baf7e0fd3a711ac6d058901a9f1c7db0e71084c03308893d3fe01a1706461bba3dd3739b159bf40267c3a107ff8e0eb38f
+EBUILD redo-99999.ebuild 875 BLAKE2B 943e09e0eb1c5f18c4a961c081fe1ec8d4de8e1ec49fc91500707c107bf60688cf92dd5e6dec3a0cc40df376be4ba75e7389d7b3ecd1ee4ce213f6de5f749924 SHA512 5bac30d82f121c5853627ac72d1d8d3733793c086efbcee50f11c5285412bad40684646426969a46429b3833c600df51f4408124f8059c1a2accf40505683869
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.21.ebuild b/dev-util/redo/redo-0.21.ebuild
deleted file mode 100644
index 4c828aa449f5..000000000000
--- a/dev-util/redo/redo-0.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-BDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="${D}/usr/share/doc/${PF}" \
-		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		install
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-}
diff --git a/dev-util/redo/redo-0.41.ebuild b/dev-util/redo/redo-0.41.ebuild
new file mode 100644
index 000000000000..8cafff06ad92
--- /dev/null
+++ b/dev-util/redo/redo-0.41.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+BDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 574d038e33d3..c136bb836dfe 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,18 +19,18 @@ BDEPEND="
 "
 
 src_compile() {
-	./redo -j$(makeopts_jobs) || die
+	./do -j$(makeopts_jobs) build || die
 }
 
 src_test() {
-	./redo -j$(makeopts_jobs) test || die
+	./do -j$(makeopts_jobs) test || die
 }
 
 src_install() {
 	DESTDIR="${D}" \
 	DOCDIR="${D}/usr/share/doc/${PF}" \
 	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./redo -j$(makeopts_jobs) \
+	./do -j$(makeopts_jobs) \
 		install || die
 
 	python_fix_shebang "${D}"
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 0fd2ed79aa42..e3683d27cbaf 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,4 +1,5 @@
 AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b5192e3e1baca36b8b6aa8e35254191ffa783aa8a2b3ee504f85baebf50fdd5e8534a443a6363d73a82108f9e5 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6
+AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
 DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
 DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
 DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
@@ -6,5 +7,5 @@ DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a
 EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084
 EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
 EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-EBUILD rr-5.2.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
+EBUILD rr-5.2.0.ebuild 1090 BLAKE2B 5ba79ce017668a7fc79d40dffe54f3e9b8f34fd2689bfaebfdfb937d792d03df1ff3d8eae706f4fb8c587de101f9e751a237743a436e5a34452a317dffbe2165 SHA512 f539d0afcd1fede8a38eb496015cf2c53131b2640e4c6f77a84ee53bb443a86bc76c73ea3b02f92f968ce2cd77c1458fb4a1380f3f94122c930162b14675b90b
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
new file mode 100644
index 000000000000..0015f0b150c0
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
@@ -0,0 +1,65 @@
+From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001
+From: Robert O'Callahan <robert@ocallahan.org>
+Date: Fri, 10 Aug 2018 15:17:55 +1200
+Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi
+
+These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine
+the sigmask effect of rt_sigreturn syscalls, but they're no longer needed
+because we query the new mask via /proc instead.
+
+Resolves #2237
+---
+ src/kernel_abi.h | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/src/kernel_abi.h b/src/kernel_abi.h
+index e73e49933..29d3c9242 100644
+--- a/src/kernel_abi.h
++++ b/src/kernel_abi.h
+@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
+   };
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext);
+ 
+-  struct ucontext_t {
+-    uint32_t uc_flags;
+-    uint32_t uc_link;
+-    stack_t uc_stack;
+-    sigcontext uc_mcontext;
+-    kernel_sigset_t uc_sigmask;
+-  };
+-
+-  struct rt_sigframe {
+-    uint32_t pretcode;
+-    int sig;
+-    uint32_t pinfo;
+-    uint32_t puc;
+-    siginfo_t info;
+-    struct ucontext_t uc;
+-  };
+-
+   struct _fpstate_32 {
+     uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel;
+     uint16_t _st[40];
+@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct,
+                       user_fpregs_struct);
+ 
+-  struct ucontext_t {
+-    uint64_t ucflags;
+-    ptr<struct ucontext_t> uc_link;
+-    stack_t uc_stack;
+-    struct sigcontext uc_mcontext;
+-    sigset_t uc_sigmask;
+-    user_fpregs_struct uc_fpregs;
+-  };
+-  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t);
+-
+-  struct rt_sigframe {
+-    ptr<char> pretcode;
+-    struct ucontext_t uc;
+-    siginfo_t info;
+-  };
+-
+   struct user {
+     struct user_regs_struct regs;
+     int u_fpvalid;
diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
index 330b1821df13..8a48df5899c7 100644
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ b/dev-util/rr/rr-5.2.0.ebuild
@@ -31,9 +31,9 @@ DEPEND+="
 		sys-devel/gdb[xml]
 	)"
 
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
+PATCHES=(
+	"${FILESDIR}"/${P}-ucontext_t.patch
+)
 
 pkg_setup() {
 	if use kernel_linux; then
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 5dabcb145f01..b0ffd5ef21e3 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,7 +2,7 @@ DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
-EBUILD strace-4.25.ebuild 2297 BLAKE2B ed94fba799f9c5b87db09d7f4f9265e9fcdd290e63d6388e8b4e6ff087f30ac303cc3e0166235519f08288fc9344bc472c867b98254d9b98d757fea5543fa577 SHA512 93044ab85cb494ded02eb3670e295943cd77b8ab185c42eaaf20078a323e844ca7d52ec521475b1ec56d1cd296d8dbf1e4a3da89e4a417d707d619b1dca95fe7
+EBUILD strace-4.25.ebuild 2294 BLAKE2B 635320e7e10bbbc5e01976655df861456a313321d5581894faab9c8b4c8585d81ca242aa2691882c84aeb69b6e7d8957cc917cfd69d760d31d537cd2d0714dc4 SHA512 570c4c507643c76dda22545bbf6b863a4aef988d91b7bb2e1c0f64151bdcabac4e343c95becd415f4c7110949892a20f3e60925b456138f6c84d6f2c2b850a87
 EBUILD strace-4.26.ebuild 2301 BLAKE2B e082ebd9683bda40d46e8438ca7d6d3dd533ca5db8882e3e301b2073795bd1067037cf052e434ca002d7f80d0c7c174a67fbd30bf2e9763e3ba2eb88bad68bb5 SHA512 14afc5fc20b55812801485d2cfedc9c49c9b5a8e3855ef08b1bbd7b799f05dd2b35d6714ec9d2af4d5ffbe740bc7f359add9df4d66af2f745809f4ed06a2f2fa
 EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.25.ebuild b/dev-util/strace/strace-4.25.ebuild
index 34102322dc36..dac4087dd3e3 100644
--- a/dev-util/strace/strace-4.25.ebuild
+++ b/dev-util/strace/strace-4.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	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 ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 16c9634c7e2f..e595d28d603e 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,9 +1,8 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
-DIST systemtap-2.9.tar.gz 3258026 BLAKE2B 92f4fcafcc3f4d517a631950593fc53e31ca25b0d956560e77e216d5522706cea58cb0d788cc3a579b7cc290eab4c1e8dbc295393e3b6444e99ce7235802f1f7 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
+DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
-EBUILD systemtap-2.9.ebuild 2012 BLAKE2B 851defa24b90f2dcd2dd75317197b2d90933e1170d10fb51354091c204bdfaaab629fc889af8c79f9559e1eeba3f3f8432722e8d7adbe39bd814beed5a6cdf66 SHA512 dee651564fb1894dde6b900532a7d3c6c554161ebf573bd38dea24f9f54aba78b5cf2150c782105da59394bb5cb2b8d1daca8ba2f1698f0a3a7e82c917773a32
-EBUILD systemtap-3.1-r1.ebuild 2132 BLAKE2B 6e8a22cafbd49eb0f74aaccbc7b42d7aa675c1316f6560dfa93c14afc0914f0632597d97dab7fd3dd9a3bfeff7dec393e3082f4e62b5b620a898ee386886d34f SHA512 8b4a879a5e8653b231f0b2988b958b710734b3155bf20e0e1d2b6985ba04ae891ea83a7839fced9c0f0d92a5edde7f3c80fd91617c1e7755a48312b70ec50a30
-EBUILD systemtap-3.1.ebuild 2008 BLAKE2B 70a2c35653fe2e580de58e4d662f8124271444dfae7359eaa1d21430f66c2bb4d5398c989decfb4cbb76f8e1857a1dcaa3dc16f2d8a60cc8d14c05118fcd6dc4 SHA512 3becae4fb0226da05ae87e60151550c4b50d93948d0f699b6aff8d2680152e1c58aae944d5c7bb75f410f54bfe6d37dec3630e7824c2747da4d1c13b1b9fa2e3
+EBUILD systemtap-3.1-r1.ebuild 2203 BLAKE2B e2683da59a09e3de875911e9e034eadd33b1727e417017a0db2021ba04be93a191051d59be33258a849cd207274c6fa8faaa36350e3682e326e0e0bc4a503880 SHA512 18a941078d6de47680554ea2fcb46f65115d6e0e7c63ae6c261dbaff7b2910be6759b20b5a8bec2a8597cb99784491eb2f33cba62fb593b4e5da672c504ecaae
+EBUILD systemtap-4.0-r1.ebuild 2619 BLAKE2B 28e403f04559a78448dfe5425efcc4044481667f235f757f799393f2285f2844cf4455f796782207fe9c0e93c479e9a9ee50dcb480a9f03c0e66144e19cf6aeb SHA512 4a6be657da1672400a6d7e55ce96e8a0f4c56616898dd780dbb0f19bf56f1f6249574f6ba94d489d5dcc03b5ae61248a8c7d3e0a155ccd05eaf29be31bf8cdba
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
deleted file mode 100644
index 56e38eebf0f2..000000000000
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ /dev/null
@@ -1,72 +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 linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index be6ed6219e46..66b6c5bb8752 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,11 @@ KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
+	dev-libs/json-c:=
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
 	libvirt? ( >=app-emulation/libvirt-1.0.2 )
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/dev-util/systemtap/systemtap-3.1.ebuild b/dev-util/systemtap/systemtap-3.1.ebuild
deleted file mode 100644
index c783078d0bb5..000000000000
--- a/dev-util/systemtap/systemtap-3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
new file mode 100644
index 000000000000..f3f7f9379109
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit linux-info autotools python-single-r1 user
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap/"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="avahi libvirt selinux sqlite +ssl"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	avahi? ( net-dns/avahi )
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	>=sys-devel/gettext-0.18.2
+	libvirt? ( dev-libs/libxml2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-ia64.patch
+)
+
+pkg_setup() {
+	enewgroup stapusr 156
+	enewgroup stapsys 157
+	enewgroup stapdev 158
+
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/Makefile.am \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" \
+	econf "${myeconfargs[@]}"
+}
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
index 07fe67533aa4..a57e4bc9d742 100644
--- a/dev-util/vmtouch/Manifest
+++ b/dev-util/vmtouch/Manifest
@@ -3,5 +3,5 @@ DIST vmtouch-1.2.0.tar.gz 15993 BLAKE2B 0a8db0e1515a080b7990e38dfafb3f9e26d95b9c
 DIST vmtouch-1.3.0.tar.gz 18733 BLAKE2B 558561302f2fc4fd9ba940d766f999bbed0f471ca15b174900457aead0a5c61ff7ea40a0b71e2e471e1613af38d657367282cde21525aa0841cd595824c89d85 SHA512 ddb86b764dffea6c43a2dc5c48dc91fa862c104a2e5ee7beefb45815b60aba14d255936082593cec97534f7231d65f91f23b0cab3f985695af365c34341a8a19
 EBUILD vmtouch-1.0.2.ebuild 670 BLAKE2B 4d29eb8f74907ad1222f0342559e5b913fcba7690a6a4136dd32cd144b980bbb2382b4999bb076e01731b171df443609a76452ce3a1a46930dd898ab00d50ac1 SHA512 c4b9d5ebdb65432371fc60faa53c1aba4d9332e1363f1ff1e4fc2246270f06c6e76eefabc22ada07261474fc97c55881e276e21695d80620ff51a379ac03ef3f
 EBUILD vmtouch-1.2.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
-EBUILD vmtouch-1.3.0.ebuild 645 BLAKE2B 0e79d7df0057a54808cfc1f57b00ae0d24f4ffe20e5cd71b5a319b3489b19c52968eeb5dbd7ccedba282b6aea80f31083d47fdb2d9cf4a436ffa99b580d6b721 SHA512 146258289c2179a40b409195899b67a9613b63154193b33a4405a8a3b4f98912cceaa7d9db034169fb60aa11cb5c9a1d4ae020cc1657b3ee966f94fa63619d4f
+EBUILD vmtouch-1.3.0.ebuild 649 BLAKE2B 2ddeb42784d5e0809b2628e90623a8c3ce9473ab95cf8e4e766c2b5e85c6a8005b25c94d63f7de3a247f7445478926c3413f39589214791f143bdb6aab233e4e SHA512 264357a3750c59ec8ff4558107702d38d9a2f2a7a1afd16441631446b6be0d17b61f4b445ce884580e82d50b33b5b9a24bef0aa598bd8f641d08dc6c3a8b6af7
 MISC metadata.xml 554 BLAKE2B 461453a6c800b43ef294f3e1f9abf012aca9f09f29431184228ebadfa67fba74b6de87402499260b4f5dfe944e93f431be70547aa96a556fb1cdc242f645155e SHA512 b2ea2c6e314fa0f849ae17461352372b583a5b1f52ce64ea07fda64d21147b649854f54b43788396bf35b91f625389337912f31b80f8428d94fcc44d20896b18
diff --git a/dev-util/vmtouch/vmtouch-1.3.0.ebuild b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
index e043a354abd7..0ac4532e6bd7 100644
--- a/dev-util/vmtouch/vmtouch-1.3.0.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 43e4b8e1fb1b..fd7603af9a12 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,3 @@
-AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
deleted file mode 100644
index 9cf443a22444..000000000000
--- a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Mon, 25 Jun 2018 13:59:47 -0600
-Subject: [PATCH] headers: Remove loader/layer dependency
-
-The header vk_layer.h included vk_layer_dispatch_table.h, which is not
-present in this repo. Instead, it had to be generated from either the
-Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
-that dependency.
----
- include/vulkan/vk_layer.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
-index e8300c3..823c88a 100644
---- a/include/vulkan/vk_layer.h
-+++ b/include/vulkan/vk_layer.h
-@@ -35,9 +35,6 @@
- #define VK_LAYER_EXPORT
- #endif
- 
--// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now appear in externally generated header
--#include "vk_layer_dispatch_table.h"
--
- #define MAX_NUM_UNKNOWN_EXTS 250
- 
-  // Loader-Layer version negotiation API.  Versions add the following features:
-@@ -50,6 +47,9 @@
- 
- #define VK_CURRENT_CHAIN_VERSION 1
- 
-+// Typedef for use in the interfaces below
-+typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
-+
- // Version negotiation values
- typedef enum VkNegotiateLayerStructType {
-     LAYER_NEGOTIATE_UNINTIALIZED = 0,
-
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index a80a1fcc5fff..0045af61b512 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 510dcd7e5258..3ca55592bfb1 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,17 +1,15 @@
 AUX gitolite-3.6.6-fix-shebang.patch 731 BLAKE2B 2e3bd0dbf56c955587dfc6a446ea2397875a0f9051e69ed891e9b630441407846f65bb2583999bb9f1c94693410d4bdd81e314da42e22ba978cb72af89968482 SHA512 dfffd0a7ef37e01edc690bba13f39edb4a751684addc1cfae8248c59fe48a59e51232ba21a1a9f1056756dcd6b51f04375f6652085f2dccad1f55073751bc105
 DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9cc908ed092b55272c59a4bd52145302e638612f1788d68b2445b8c665f025b24c47d50992dd3f6ef2fd6eb63ee7 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee
 DIST gitolite-3.6.10.tar.gz 198151 BLAKE2B 492732f92594871ac834ebd60eb24d7d6a07bcc1c66e35ef0963113d89a3e92204937c9c19342658eafe6a645fbaad3f0b830184b77f0298e5ab1422783f0a8e SHA512 a17fcc4922abdf3a03ebf83cae94501d142ad22cbf3ed3bdeb4b382d5e545a6b94fc3d33e402594565e29436ab5f54e498a285b4c1c814f8c475f9b1dcb5463d
-DIST gitolite-3.6.3.tar.gz 174689 BLAKE2B bf58c4991d4bb9b578b983854dcd5011d55f05515a13781910327bd07aa00ab7426367f5c084341326742796266f5648ce5470dec5247b74bc850f5cfa327c93 SHA512 afb8bcf27052d46725c4b3a6dd483e98ac3e574651bfe2ee35b442f044791acae8a17cbbab4237992a9755367e37f5160514d67cd2d863d623d32ed5fdf39362
+DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
 DIST gitolite-3.6.6.tar.gz 183469 BLAKE2B 91b1b04820f8abe427c7d6a81131a9fce1ff3df8d06c3f1d7515ead91b654048ef24b391fc28f2fe9c6dd0e502e24064a55b5fee8c1da34e3d07974c8f203c26 SHA512 1529330ed2afa315fcb650c55d515e5d4b61921f46b4d763a759537434492959f100d2219ab7673e568d46f397a25a45d4388fe3827ea988333fc8719820f8bc
 DIST gitolite-3.6.7.tar.gz 186298 BLAKE2B 32ccedce5cfe877d69f66ccc354300b1b363de0ac16bf8ec6d97010441d1e5a95e63252c833604d7e4e5b90dd4d84b4e262ee5ed092df80631e7478500e3da97 SHA512 d22bf5c34834f82df771e6d4527496a302da312f7f78dfe81c1284f5a1ea05de90ec217e03e94918d69a006a72fa16dc0006b1f555826ad6183d9dce2dd9d425
 DIST gitolite-3.6.8.tar.gz 197551 BLAKE2B 9788c06885fc7fc8edf422080628f465b33dea2aec8090daf330206041e4776bbae7189b343fc604b0959be556a15016d656b4df133f784d55bc7a6b701ad8ef SHA512 f65d4e4354079f868c9f9a943efb84ad4e29f96c69a3792c13dda383dac0133baa3d93925967c6be71e923b27e0ad91b57b5f1245cf64eeec0f0b719cbda4270
-DIST gitolite-3.6.tar.gz 156481 BLAKE2B 4cb36e631c458c529d51689bb9612ede34b352d523b62afefed70ab90fadbda1c1d954400c5ddf407ef57a3df8371814c73fdcc526bf3750dad9bfa10f1e7747 SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f
 EBUILD gitolite-2.3.1-r1.ebuild 1647 BLAKE2B cf918594448f8cbb0d381118c5fdc6ba3bfcd3669a26b3ca5264f66deb2e4273c29554ba7edf0a04e350619fd45a8083e69017793eb48bf7facf2e4f4d3bb25f SHA512 77347b4575a9236a5e259e9c67eb29ecd023092c2713ca45d8871af2303222d827296405168126f7f88ff45c8bcb96427325391801baa5740a90b2548bb25da4
 EBUILD gitolite-3.6.10.ebuild 2427 BLAKE2B 7e3c7890b8943204bd93d0a70943218fbcec02376902797bb607744fc798427674b78c37a10f3792581a736b7cbeacc51d85cc0825972ed9affaab8100d49d65 SHA512 7846c0f2828fe01bd6b8b7b0afe3523d10b1bd725c5f8d2950499ed948fe2bdc161e27d89a12d2ab408e7ce09aa816daf7caef4965863991c13529ee25431f68
-EBUILD gitolite-3.6.3.ebuild 2350 BLAKE2B 085ed29e81b5c2914201168b94dd4d01b86dbc0bb4c221956f8ff382bade290c41a76e62d417e42cb2c03a1b220704e029240c3cce7b93d02a75e7d0aaef17b1 SHA512 c0a6ba41dc2854d273f780b4f59f9350d660e18861ea6153d4e42ae05235db16caeb10c2ae7f13a462eeb370b8e4e6879d7336949e4563d9d507848581e98d83
+EBUILD gitolite-3.6.11.ebuild 2427 BLAKE2B 673516c57ac3a47f6ef616cd905e97a79250a788df5375aa6f2f9f9bb1f224baee347643de3a18b182c509af454d0bac189b03b2c84c2fca42d66fc183baff28 SHA512 43afd5f2c92ba86dc81c1be394f36ef4534d402d400c694ac080734a9e12eddf780876c9ee0a86da0cdbe25ad3e2bbaee16d2fc52d8012394c8ebbb1b3df54e8
 EBUILD gitolite-3.6.6.ebuild 2431 BLAKE2B 3d34e9ddf77bb044de9a1bd1984082e33d8f6fd6cafc71e63bf4860c2cf94e934dba75346b0648badf0637cbbe77a57c9bce5971c1e4d01c597c9d951cfe0164 SHA512 8b4cf676c8a3434e97962301be3608b7ea10b48e8b5f0f8d185b274c1d9e2bc3d6f7c046879d2b825d16bdc5d514d9c790caa6bb4922b1a1d5a5827a17858c3d
 EBUILD gitolite-3.6.7.ebuild 2398 BLAKE2B 864703fc35faa76894bb8a7c82dd97fe80cc5ebd02a607cab670ebf168eaf6ca97b10ca93824023da02974f5fd740002084f0d08f9eb6411c6b2082bcae16f95 SHA512 1584babccb49c0d491bc749d804bf6ff5e3c4adcb1dfdf80d04d577a076e11315ceec5989f7e9be0e410b86b450aa8637d2cca177a75216a66bcc8577a28384b
 EBUILD gitolite-3.6.8.ebuild 2430 BLAKE2B f383d1280a6a525da61d8b616b986264ba96ed49b9c0935ae7eaed6bd8f84987f3d4a20b4bba0a2618af1106768436c7be624edce1d62ce277b1b89e87a73f1f SHA512 7cfaa7d4b3c4a5e22995f6db00ecbfa040c440df8534f98d951d106cf332df8dae1a6dab4bcb7b9e7e171e03597fa0950987cee34c6fa887514d487832cbfeee
-EBUILD gitolite-3.6.ebuild 1866 BLAKE2B cd81d9ee5108877d42a2cc3ccf3f6ae57f870838c2a11b17638e49d47ab56e6dd54c31481a226b31c8a22fb4c2d1407153d0e7b349c492831614f271a917818b SHA512 be5e90a8996a7c9f433d28e975de5d1a462fe57b134f903572069c43a373f81b6ba4253395f62b66e467a8b3de4e8036b6db37dac3dae9b1c1d4cacc94365b58
 EBUILD gitolite-9999.ebuild 2358 BLAKE2B c414943bbddd70c1d8ac111b11d6cc8c740a2468f64c1f292a3818fbb5877899a49c37429abebce15ca14ad6cd207d887da56fde9ba8f67bf87d54725f5a5b50 SHA512 f86cf6dbe5ea43932dc240868d5c5f098484cc4585ca1b5a21ab657f665d866ac44c87152dd386fff35e0833e5e3d7a66934c481d3dd31f087bc24d243b71111
 MISC metadata.xml 780 BLAKE2B e496a65ffe9f06db9f4ef1c74a16fafb434c9c8a7309f0effc02515270bcc0137b1bf7861ac11f6dd1a7c06fd4ef4eb7d72b27b60a73ed535ba4fad3e08a2066 SHA512 0a7c6ac8bc127892e5f6fe24774f095cb0bcf5971926c65b4d8a52748cfb7ae22d1ddc47365ece99612bc64853dfa224d42ded5093f0cd0976a2ae1b544eb5c8
diff --git a/dev-vcs/gitolite/gitolite-3.6.11.ebuild b/dev-vcs/gitolite/gitolite-3.6.11.ebuild
new file mode 100644
index 000000000000..8da763ed6c3b
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-3.6.11.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
+EGIT_MASTER=master
+
+inherit perl-module user versionator ${SCM}
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="https://github.com/sitaramc/gitolite"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+else
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux tools"
+
+DEPEND="dev-lang/perl
+	virtual/perl-File-Path
+	virtual/perl-File-Temp
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!app-vim/gitolite-syntax
+	!dev-vcs/gitolite-gentoo
+	selinux? ( sec-policy/selinux-gitosis )
+	dev-perl/JSON"
+
+PATCHES=( )
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/sh /var/lib/gitolite git
+}
+
+src_prepare() {
+	default
+	echo $PF > src/VERSION || die
+}
+
+src_install() {
+	local uexec=/usr/libexec/${PN}
+
+	rm -rf src/lib/Gitolite/Test{,.pm}
+	insinto $VENDOR_LIB
+	doins -r src/lib/Gitolite
+
+	dodoc README.markdown CHANGELOG
+	# These are meant by upstream as examples, you are strongly recommended to
+	# customize them for your needs.
+	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	insopts -m0755
+	insinto $uexec
+	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
+	doins -r contrib/{commands,triggers,hooks}
+
+	insopts -m0644
+	doins src/VERSION
+
+	exeinto $uexec
+	doexe src/gitolite{,-shell}
+
+	dodir /usr/bin
+	for bin in gitolite{,-shell}; do
+		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
+	done
+
+	if use tools; then
+		dobin check-g2-compat convert-gitosis-conf
+		dobin contrib/utils/rc-format-v3.4
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+
+	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
+}
+
+pkg_postinst() {
+	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
+		ewarn
+		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
+		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
+	fi
+
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/gitolite/gitolite-3.6.3.ebuild b/dev-vcs/gitolite/gitolite-3.6.3.ebuild
deleted file mode 100644
index 4fc564404802..000000000000
--- a/dev-vcs/gitolite/gitolite-3.6.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="https://github.com/sitaramc/gitolite"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	selinux? ( sec-policy/selinux-gitosis )
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/gitolite/gitolite-3.6.ebuild b/dev-vcs/gitolite/gitolite-3.6.ebuild
deleted file mode 100644
index 91aadb960309..000000000000
--- a/dev-vcs/gitolite/gitolite-3.6.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
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker"
-HOMEPAGE="https://github.com/sitaramc/gitolite"
-SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite-gentoo
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo $PF > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr/index.html first!"
-	fi
-
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-}
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index aa1af8360bb8..54a4f5064dfa 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,9 +1,9 @@
-AUX hg-git-0.8.10-hg45-memctx.patch 1817 BLAKE2B 73e638b88698950e3f178c30c063ea269717738923c4f81a25795eb3ac90b14b5477a08c185a37931a174d18855709cf55089819e5c73859c8af7323959adc6f SHA512 63b24d3a5cf0f553521184049b9c8452e1d66af9a89bb20960ca5198c58af53b0e106dead0cbe2b61f1b6a786ef33547eb9215483eafb57191dd1c053ec124be
-AUX hg-git-0.8.10-hg45-memfilectx.patch 2586 BLAKE2B c40212ab0d201993d2f97b425e84e0f09cabe94e804078c680dd3084859e65d3beb4a570d717f57c1eb2bfeda10d3fdc1440d3d12fcf816d05cf2ea033bb8969 SHA512 3211680a1ebcd508f7a4794ac796bd25fda22087a98f51b7d06e8b9ba16314db061ac8a0085dd0ccecf834c316f27bca54acd87c2152b3bb72df7d6580d5dff9
+AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619
 DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655
 DIST hg-git-0.8.12.tar.gz 124456 BLAKE2B 31a899ba1f2e0de861d81e7ff5fac9f82e9c08813b77fa8a4da3aeae590d7e8cb6c37abb80ebe34a80835c210f10145df7429685cb71ffab7bfe8d5a628d3d12 SHA512 77af45c8f35febe354382ee043be7f0f2c53e1ac7ae331a7068a0e117ed0f54adaa7c7f5127e247e089c9204b9130dde286aa887997b7ab7ede48f447797608e
 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac
 EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123
+EBUILD hg-git-0.8.12-r1.ebuild 750 BLAKE2B b8e1005953ae97583fabbcd3c72e0e732fe76abd3c089aecd3f9590f809253dfca1b694c14cfc51e5867f7beca5e9bcba3202399610bdf1df422ac57fb48a395 SHA512 aad9af3857bbc577d54af072c0913183a9eeaf2bf1e2846e773273cf6adf53ca5a170630d98786887d1d4d11357edfc9f6c7f65a9d88dbcd80c7ff2191787344
 EBUILD hg-git-0.8.12.ebuild 704 BLAKE2B 67f021ab754992b636235ffd2ad7dd43dca05ea63096764f4e63e77ea683b6a6ab057b6581300fb38f95d2dab3a7425a7694b9ea2e24146f38be240400303de8 SHA512 a23762cace05828e78628187a6fd4c34acb6d2a9b9ae9889005d209560fe36af792b8d81eda6e831a97b509c22378e966aaec7153408cf1d07234bdbaed5cac9
 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2
 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch
deleted file mode 100644
index ff9d4d66d15f..000000000000
--- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memctx.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Tony Tung <tonytung@merly.org>
-# Date 1517901695 28800
-# Node ID 843f409526fbea3ffde674922b730075d5cfd4d3
-# Parent  6dc827703bfb995b89b0da5b2e9eaffe3479ea45
-compat: pass memctx to memfilectx constructor on hg 4.5+
-
-diff --git a/hggit/git_handler.py b/hggit/git_handler.py
---- a/hggit/git_handler.py
-+++ b/hggit/git_handler.py
-@@ -985,16 +985,22 @@
-                 if copied:
-                     copied_path = copied[0]
- 
--            try:
--                return context.memfilectx(self.repo, f, data,
--                                          islink='l' in e,
--                                          isexec='x' in e,
--                                          copied=copied_path)
--            except TypeError:
--                return context.memfilectx(f, data,
--                                          islink='l' in e,
--                                          isexec='x' in e,
--                                          copied=copied_path)
-+            # Different versions of mercurial have different parameters to
-+            # memfilectx.  Try them from newest to oldest.
-+            args_to_try = (
-+                (self.repo, memctx, f, data),   # hg 4.5+
-+                (self.repo, f, data),           # hg 3.1 - 4.5
-+                (f, data),                      # hg < 3.1
-+            )
-+            for args in args_to_try:
-+                try:
-+                    return context.memfilectx(*args,
-+                                              islink='l' in e,
-+                                              isexec='x' in e,
-+                                              copied=copied_path)
-+                except TypeError as ex:
-+                    last_ex = ex
-+            raise last_ex
- 
-         p1, p2 = (nullid, nullid)
-         octopus = False
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch b/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch
deleted file mode 100644
index 5c94617f881b..000000000000
--- a/dev-vcs/hg-git/files/hg-git-0.8.10-hg45-memfilectx.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User Kevin Bullock <kbullock@ringworld.org>
-# Date 1517928348 21600
-# Node ID e326b349eba6b6ee57ac8df221727f79c313d04a
-# Parent  89303af1c4aa76b37e6d16f99f6279012eda7100
-compat: extract function for memfilectx signature variants
-
-diff --git a/hggit/compat.py b/hggit/compat.py
---- a/hggit/compat.py
-+++ b/hggit/compat.py
-@@ -1,4 +1,5 @@
- from mercurial import (
-+    context,
-     url,
-     util as hgutil,
- )
-@@ -96,6 +97,26 @@
-         return refs, set(server_capabilities)
- 
- 
-+def memfilectx(repo, changectx, path, data, islink=False,
-+               isexec=False, copied=None):
-+    # Different versions of mercurial have different parameters to
-+    # memfilectx.  Try them from newest to oldest.
-+    args_to_try = (
-+        (repo, changectx, path, data),  # hg 4.5+
-+        (repo, path, data),             # hg 3.1 - 4.5
-+        (path, data),                   # hg < 3.1
-+    )
-+    for args in args_to_try:
-+        try:
-+            return context.memfilectx(*args,
-+                                      islink=islink,
-+                                      isexec=isexec,
-+                                      copied=copied)
-+        except TypeError as ex:
-+            last_ex = ex
-+    raise last_ex
-+
-+
- CONFIG_DEFAULTS = {
-     'git': {
-         'authors': None,
-diff --git a/hggit/git_handler.py b/hggit/git_handler.py
---- a/hggit/git_handler.py
-+++ b/hggit/git_handler.py
-@@ -985,22 +985,10 @@
-                 if copied:
-                     copied_path = copied[0]
- 
--            # Different versions of mercurial have different parameters to
--            # memfilectx.  Try them from newest to oldest.
--            args_to_try = (
--                (self.repo, memctx, f, data),   # hg 4.5+
--                (self.repo, f, data),           # hg 3.1 - 4.5
--                (f, data),                      # hg < 3.1
--            )
--            for args in args_to_try:
--                try:
--                    return context.memfilectx(*args,
--                                              islink='l' in e,
--                                              isexec='x' in e,
--                                              copied=copied_path)
--                except TypeError as ex:
--                    last_ex = ex
--            raise last_ex
-+            return compat.memfilectx(self.repo, memctx, f, data,
-+                                     islink='l' in e,
-+                                     isexec='x' in e,
-+                                     copied=copied_path)
- 
-         p1, p2 = (nullid, nullid)
-         octopus = False
diff --git a/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
new file mode 100644
index 000000000000..c456ce53c740
--- /dev/null
+++ b/dev-vcs/hg-git/files/hg-git-0.8.12-hg-4.8.patch
@@ -0,0 +1,219 @@
+https://bitbucket.org/durin42/hg-git/commits/ae6b1ba7482963bc9de51f299891e99005794e4e/raw
+https://bitbucket.org/durin42/hg-git/commits/143b7511eadbea7507d847c805241a6db290ffe7/raw
+https://bitbucket.org/durin42/hg-git/commits/8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6/raw
+
+# HG changeset patch
+# User Alain Leufroy
+# Date 1541695757 -3600
+# Node ID ae6b1ba7482963bc9de51f299891e99005794e4e
+# Parent  6ae26ba7b928019e48dd1c73358c18d6dd2d86f3
+compat: fix for hg 4.8
+
+089fc0db0954 introduced a new `createopts` parameter.
+
+`hggit` does not support repository creation, so we can just ignore
+it.
+
+diff --git a/hggit/gitrepo.py b/hggit/gitrepo.py
+--- a/hggit/gitrepo.py
++++ b/hggit/gitrepo.py
+@@ -13,7 +13,7 @@
+ 
+ 
+ class gitrepo(peerrepository):
+-    def __init__(self, ui, path, create, intents=None):
++    def __init__(self, ui, path, create, intents=None, **kwargs):
+         if create:  # pragma: no cover
+             raise error.Abort('Cannot create a git repository.')
+         self._ui = ui
+
+# HG changeset patch
+# User Kevin Bullock <kbullock@ringworld.org>
+# Date 1543713965 21600
+# Node ID 143b7511eadbea7507d847c805241a6db290ffe7
+# Parent  ae6b1ba7482963bc9de51f299891e99005794e4e
+compat: glob some verify output that changed in hg 4.8
+
+diff --git a/tests/test-push-r.t b/tests/test-push-r.t
+--- a/tests/test-push-r.t
++++ b/tests/test-push-r.t
+@@ -64,7 +64,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 1 changesets, 1 total revisions
++  *1 changesets* (glob)
+   pushing to test-1
+   searching for changes
+   adding changesets
+@@ -75,7 +75,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 2 changesets, 2 total revisions
++  *2 changesets* (glob)
+   pushing to test-2
+   searching for changes
+   adding changesets
+@@ -86,7 +86,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 3 changesets, 3 total revisions
++  *3 changesets* (glob)
+   pushing to test-3
+   searching for changes
+   adding changesets
+@@ -97,7 +97,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 4 changesets, 4 total revisions
++  *4 changesets* (glob)
+   pushing to test-4
+   searching for changes
+   adding changesets
+@@ -108,7 +108,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 2 changesets, 2 total revisions
++  *2 changesets* (glob)
+   pushing to test-5
+   searching for changes
+   adding changesets
+@@ -119,7 +119,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  1 files, 3 changesets, 3 total revisions
++  *3 changesets* (glob)
+   pushing to test-6
+   searching for changes
+   adding changesets
+@@ -130,7 +130,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  2 files, 4 changesets, 5 total revisions
++  *4 changesets* (glob)
+   pushing to test-7
+   searching for changes
+   adding changesets
+@@ -141,7 +141,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  3 files, 5 changesets, 6 total revisions
++  *5 changesets* (glob)
+   pushing to test-8
+   searching for changes
+   adding changesets
+@@ -152,7 +152,7 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  2 files, 5 changesets, 5 total revisions
++  *5 changesets* (glob)
+   $ cd test-8
+   $ hg pull ../test-7
+   pulling from ../test-7
+@@ -168,4 +168,4 @@
+   checking manifests
+   crosschecking files in changesets and manifests
+   checking files
+-  4 files, 9 changesets, 7 total revisions
++  *9 changesets* (glob)
+
+# HG changeset patch
+# User Kevin Bullock <kbullock@ringworld.org>
+# Date 1543713996 21600
+# Node ID 8d00fde45adbc6c3c0ccab8e362b5f5c36c171e6
+# Parent  143b7511eadbea7507d847c805241a6db290ffe7
+compat: update how we register gitnode template keyword
+
+diff --git a/hggit/__init__.py b/hggit/__init__.py
+--- a/hggit/__init__.py
++++ b/hggit/__init__.py
+@@ -94,9 +94,11 @@
+     command = registrar.command(cmdtable)
+     configitem = registrar.configitem(configtable)
+     compat.registerconfigs(configitem)
++    templatekeyword = registrar.templatekeyword()
+ 
+ except (ImportError, AttributeError):
+     command = cmdutil.command(cmdtable)
++    templatekeyword = compat.templatekeyword()
+ 
+ # support for `hg clone git://github.com/defunkt/facebox.git`
+ # also hg clone git+ssh://git@github.com/schacon/simplegit.git
+@@ -207,7 +209,6 @@
+ 
+ 
+ def extsetup(ui):
+-    templatekw.keywords.update({'gitnode': gitnodekw})
+     revset.symbols.update({
+         'fromgit': revset_fromgit, 'gitnode': revset_gitnode
+     })
+@@ -455,12 +456,30 @@
+     raise LookupError(rev, git.map_file, _('ambiguous identifier'))
+ 
+ 
+-def gitnodekw(**args):
+-    """:gitnode: String. The Git changeset identification hash, as a 40 hexadecimal
+-digit string."""
+-    node = args['ctx']
+-    repo = args['repo']
++def _gitnodekw(node, repo):
+     gitnode = repo.githandler.map_git_get(node.hex())
+     if gitnode is None:
+         gitnode = ''
+     return gitnode
++
++
++if (hgutil.safehasattr(templatekw, 'templatekeyword') and
++        hgutil.safehasattr(templatekw.templatekeyword._table['node'],
++                           '_requires')):
++    @templatekeyword('gitnode', requires={'ctx', 'repo'})
++    def gitnodekw(context, mapping):
++        """:gitnode: String. The Git changeset identification hash, as a
++        40 hexadecimal digit string."""
++        node = context.resource(mapping, 'ctx')
++        repo = context.resource(mapping, 'repo')
++        return _gitnodekw(node, repo)
++
++else:
++    # COMPAT: hg < 4.6 - templatekeyword API changed
++    @templatekeyword('gitnode')
++    def gitnodekw(**args):
++        """:gitnode: String. The Git changeset identification hash, as a
++        40 hexadecimal digit string."""
++        node = args['ctx']
++        repo = args['repo']
++        return _gitnodekw(node, repo)
+diff --git a/hggit/compat.py b/hggit/compat.py
+--- a/hggit/compat.py
++++ b/hggit/compat.py
+@@ -2,6 +2,7 @@
+     bookmarks,
+     context,
+     phases,
++    templatekw,
+     url,
+     util as hgutil,
+ )
+@@ -192,3 +193,14 @@
+     if hasconfigitems:
+         return getconfig(section, item)
+     return getconfig(section, item, CONFIG_DEFAULTS[section][item])
++
++
++class templatekeyword(object):
++    def __init__(self):
++        self._table = {}
++
++    def __call__(self, name):
++        def decorate(func):
++            templatekw.keywords.update({name: func})
++            return func
++        return decorate
diff --git a/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild
new file mode 100644
index 000000000000..e5711f08ff40
--- /dev/null
+++ b/dev-vcs/hg-git/hg-git-0.8.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="push to and pull from a Git repository using Mercurial"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=dev-vcs/mercurial-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hg-4.8.patch
+)
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 7a18853e4dcc..5dd247913024 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,6 +1,9 @@
 DIST hub-2.2.9.tar.gz 318275 BLAKE2B 731c3bb4cc4d92082f93bba94a5cc7ba31fc436479655fa19ffa8078416cedd814d2667589af9d6eed59a0be0c8b38963779429838d8dbaab8a628f838a5915c SHA512 69d69683eb5f1c881b15c9b3294878c35edc51f9b7d568a3e0609c3d77cebf5c1be5c7c018b0356bdd68cf3f56691a860381a53f3e016b28b9f95ab0b852d9f9
 DIST hub-2.6.1.tar.gz 994752 BLAKE2B 956f497699ecaac996fd3a92e5f7042d8e72050077e1de3b6091fe5e2481d9b8e4c46a8e34a2a95a81079b22b87bf82e2a5adf412e4dfbcbc53bf92f8b7ba2fa SHA512 a3aed611455de88a5b410887717aeb28b8837a74b437848c53903ccc809e758678643471ee7b14903ee147417754b0d443aede63e4f69a0e4b252c6a5ab619e3
+DIST hub-2.7.0.tar.gz 997861 BLAKE2B b3ab44f8107d2613af230dc9e26cef2c87c9a8f114a044bbf4d62803fb31328a53425387bc865affbb95302ec0d6364f5c3e6823dae46ef2b322812916426534 SHA512 77223b0860bac42195dfc43e9164f5da446e414e32d0d3caa931f30e5b06d6f65cd69caa2f5097285a91d2ddb48265dfedec9dd8b361417556ff38782fa1a17c
 DIST hub-linux-amd64-2.6.1.tgz 4242259 BLAKE2B b68234050982999f103281da974af9c008e85920c0821ecb5582bf97b0a4889f6dd053ab3e6c7c5a0e18d1b09c7093f69d70f46b94254e51b2e6eb217fe3f479 SHA512 e27d9b8037e50b924b7ef663d9f68568f2732ed28e366aa300881eeeb6a2bdd1f50b4e597e3d36eddb07eb9c133df02ab5f889d5c6ec8632824d244148524e9b
+DIST hub-linux-amd64-2.7.0.tgz 4263315 BLAKE2B e157acb727c8e4a118cc29ff5a433a820aeba5f92b10446440611056e8d8dc3bd534823983cf37aba818f224d36bfba3109d236b409e68592ed04f6b22aa450b SHA512 dd48991dfbb48e6759805707ed34804a77b64e55fd56f17484c13ddc6b2a867c283305308991e462f338a4bab687cb89da42d5059193fad5825ef681b89eeb97
 EBUILD hub-2.2.9.ebuild 905 BLAKE2B f71ee495cb55cf5a7f64f643f7a8e79a9604f4b7dffeb94226bf3feda1759667e5d93d645239c6ad3a97e3ea2ab1c75be2d3e1aeddda59e400199ec7e37d0208 SHA512 51c336022318210fe0a37615f92f61842da7a2d4d76005c61d5b86ebdc5f0f44dbf47874f2811f6f7870cd592bf118545c48c7e32c02a11dfcd40c26050e45dd
 EBUILD hub-2.6.1.ebuild 1097 BLAKE2B 4a3b7f95555f8c5ba8738fc819d2127dde609fb76e2be44d20c38cc316e62a7b30f2363cd7a670b9a92141674d83d9c18ae428538586a731483c8205f97526ad SHA512 b1b9ed74f46176faf65d64c0e69cde33419b2db3a52d9e64d075eaa982f43da44a9fd9fc4b326c0eb896065bb6e04e2848845876de9d5e41adf8720f51088c66
+EBUILD hub-2.7.0.ebuild 1097 BLAKE2B 15ace40d08118382357876dde83a5d77eb9b7f9ced783a5b4d46d50d886e940f18ee90a80bf655510bd373debb21be45d4d7ceee38ff56b9ae47f0b4b36a21f0 SHA512 43d44b346859260cd772c7381a1c57444ae88c393ebeec4805df18fd9769a3ca49545c0d1dacfc5080a148ad9595965306d616e8466fbf5f8ff8797a5936fccc
 MISC metadata.xml 334 BLAKE2B c10c297b5f493184b2191daf7c8c8df963054d3bd682aec7c9768784171f2eacb267fec32b817ea93a85d57e1bc248f5454ab8984270b94c997287b4ab983cfd SHA512 448ebf7bab89832d682b7e99a2fde5e04f242c7cca13272f5827f680077a310d670ff1f201073d07d779b8fb1905e066cd0de7b4f82879233ea6f366b0992f7a
diff --git a/dev-vcs/hub/hub-2.7.0.ebuild b/dev-vcs/hub/hub-2.7.0.ebuild
new file mode 100644
index 000000000000..26f16bf1dcaf
--- /dev/null
+++ b/dev-vcs/hub/hub-2.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN=github.com/github/hub
+inherit bash-completion-r1
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="https://github.com/github/hub/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://${EGO_PN}/releases/download/v${PV}/${PN}-linux-amd64-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+QA_FLAGS_IGNORED=".*"
+RESTRICT="strip"
+
+src_prepare() {
+	mkdir -p "${HOME}/go/src/${EGO_PN%/*}" || die "mkdir failed"
+	ln -snf "${S}" "${HOME}/go/src/${EGO_PN}" || die "ln failed"
+	default
+}
+
+src_compile() {
+	./script/build -o bin/${PN} || die
+}
+
+#src_test() {
+#	./script/test || die
+#}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc README.md
+	doman ../${PN}-linux-amd64-${PV}/share/man/man1/*.1
+
+	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 7770ba2df4a3..8dbf1262ed07 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,11 +7,13 @@ DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5c
 DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9ac15aef21284337924d13bd5b4b14684d729149c4b48bf8fde13679cf661d92da968943c3f04ea065729df42318c SHA512 04d3f97dd4a0f36c6f6d639d8eccc7e4f29b2dc211fa69e7fc17dae0eb954f2ddaaf04f70facc6b968a166db7c07ed80792575d7a27e80bc0c1a43fc38b5e536
 DIST mercurial-4.7.2.tar.gz 6481684 BLAKE2B 1006e541b52148f44b14767a738f4add4d03c719bc6f96f3f245f6bfd401223b1e7444216304fba749b88611cd031cb14089d9938a5533477160226286dd401d SHA512 e8742e9555a6b57e96e61091757b4bcb574605c49082874bd4edb9114a70e5cb024c1360a75c24f1a9ae3bca3205316e6a264ae18d3c9946248bc1d2b042ad43
 DIST mercurial-4.8.1.tar.gz 6869733 BLAKE2B 754be4e004af2b62e7ea2cbb1bbe27d4c0f03039e9c4db5ac5e734cb2b13002d7d68a1e2794e2478ce49302f6cb90976bb43bca56a8db7b05eb4ead93a3a46de SHA512 a4485c22f9bb0bb752bf42941f613cb3542c66cbec5d7d49be2090ac544f5dca0f476e4535a56e3f4f4f5fc02fb12739e6d1c7b407264fc2ba4b19b0230b9f93
+DIST mercurial-4.8.2.tar.gz 6870985 BLAKE2B 822cbfd09b299870b02b7e181c216557d4dcbb60abcb34a95d22b457f130ff2c84c4f85291b6cd4b0314acd9061ec0d416c96821c2daa8627cd7740965944103 SHA512 1010f20ea5ed081f2d5c58e97696027b2d06dd0471b39e88a1858d5409bcf59f2ccf360925c417495834fccba06e1525ae70894233164d617227814ca2277e20
 EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c980435363597625402a0e67afdc10d55cc4477ca85dea764d860cecdb8bd68ee13afc66cf6203ae96f1a3b5363b93e0e74 SHA512 766576864da5700f107a530f1a06fbf33d1d593597ad236ad841d3ba59774c4aedf3e43dda00a86b1894f99c03f7af228d8026363d81a2c3b0b8ab98f22c246a
 EBUILD mercurial-4.6.2.ebuild 3537 BLAKE2B 7f4c2e4c579ab768dd629d53b2fdf1062980405242376c727b05a8a474d6bc8afb4db0f82e22252dde24b6909f9ab87d8650ed73600e6dc01ae4ef2fdcfc71cd SHA512 1549175116f2496ae8bac35360b142c9ae95d458b764496648eeb9165fd79fd030bfcb0386df61a568a7d8536f8e846a9b127f22fe2937ccac5982135e89cf14
 EBUILD mercurial-4.7.1-r1.ebuild 3657 BLAKE2B eab6f75f156f93bf2a23294d9edb267d58d4eab27f9f6f1643c10d2c3a440e814eb5a312b22231168ae1620b69bccc69a161bcd72e76ab3e630558a4495591fc SHA512 f9f33c0cf074f324e37f881b36b435d6cffb2adf1e3499a9f6d0400b16d26251e5a72a3f1120e2f605f798312617e2f429c05c2bd08f6f0cad2be2b3b81f4f6e
 EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2
-EBUILD mercurial-4.7.2.ebuild 3765 BLAKE2B 9137eb5e7fee6a5a3d10ef6839fa8277f83cebb0013599d6688aeb4c56dcc76ab3d80ab91c48a19e82d31dd74bbee26c70d30928293257b2792955f4e46e948e SHA512 a12be602080e091e040f7cae1226faaebc46ff041d0c59b6b9cdd7cd6456d8168c02914411bfe888c746acebd5112237f93ea2c7c3bd6da70cd8923f7f240a67
-EBUILD mercurial-4.8.1.ebuild 3748 BLAKE2B a9e476bb253026addb579d44755d3b2719748b1ef5742ef3764bcff0a26476882b44a458604417d6a9e72ca4f47cff8d270faef1df0c28215a8d6f09115d42af SHA512 92f1e46ab7f51c41efe0da8b5a4eab6016f6983e3f63477a14cf8431fd7a75d6f6ec673bff5f3c3c8aa55a923c78c964f36bb01e155db88a63bde9fffa97f2e5
+EBUILD mercurial-4.7.2.ebuild 3777 BLAKE2B 0486c40021180ab5619bff696fe3d009e148ce172683ca85e7a5fb8bb18f0a34658a2e923ba9f806f76532084739b3ac867f1e4e20895f6770d8f84280fa5ead SHA512 f196ec182293cd8645f91fd12f4f968f80f9066df5e843db1e10c1336554311d4011846ca4a69f5f3b5918e79905d3a25b2fdfa87ad0ef0df1a8a2cc6a0e4216
+EBUILD mercurial-4.8.1.ebuild 3760 BLAKE2B 89cfaff42a3b994ef9bb6e0cd708af09ff7c44d158efb3d3b1fd6926951fed1dee624df3c8ce2abd30d2cc6a4d541b1f2806428ec3d5ce6b5e7cc29f8e95cce8 SHA512 fcfce4e0af0c59b0df7c700552825c3339e459cb42dee31259cf5cde2cc2de28fa106d98add4a09c7c95418f582bb55429e21502ae04417dde0898acf1bfa712
+EBUILD mercurial-4.8.2.ebuild 3760 BLAKE2B 89cfaff42a3b994ef9bb6e0cd708af09ff7c44d158efb3d3b1fd6926951fed1dee624df3c8ce2abd30d2cc6a4d541b1f2806428ec3d5ce6b5e7cc29f8e95cce8 SHA512 fcfce4e0af0c59b0df7c700552825c3339e459cb42dee31259cf5cde2cc2de28fa106d98add4a09c7c95418f582bb55429e21502ae04417dde0898acf1bfa712
 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08
 MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1
diff --git a/dev-vcs/mercurial/mercurial-4.7.2.ebuild b/dev-vcs/mercurial/mercurial-4.7.2.ebuild
index 03aa5b03efb2..59b7732b6546 100644
--- a/dev-vcs/mercurial/mercurial-4.7.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/mercurial/mercurial-4.8.1.ebuild b/dev-vcs/mercurial/mercurial-4.8.1.ebuild
index db363dc02c1d..c2da7946346c 100644
--- a/dev-vcs/mercurial/mercurial-4.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/mercurial/mercurial-4.8.2.ebuild b/dev-vcs/mercurial/mercurial-4.8.2.ebuild
new file mode 100644
index 000000000000..c2da7946346c
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-4.8.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-po_fixes.patch"
+	"${FILESDIR}/${PN}-4.8.1-unbundle_zstd.patch"
+)
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+	# Don't use bundled zstandard (#666972)
+	rm -r contrib/python-zstandard || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion wix plan9 *.el )
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+
+	# symlink to system zstd
+	local sitedir=$(python_get_sitedir)
+	dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 242690991d11..2f172672f953 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,13 +4,13 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
 DIST subversion-1.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d
 DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92
+DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
-EBUILD subversion-1.10.2.ebuild 15350 BLAKE2B 8299e54f27b9fd44822c32f6be3b6da4fff7b5714b10a794b61479cd4be50ce2ec38c2f480feda0b9a6e6e3fec85c4bef83e31d3588d2c07f69f062cfda2c94a SHA512 cbf3211d203f9b69c841315e7d1043b3a7c76a6a608cf3f17f163e362d316dac3cec93aac71f8a97c6b7aacd420d5e6224937b3acbf1df589412c1cefa020bed
 EBUILD subversion-1.10.3.ebuild 15342 BLAKE2B 0326b66d9bb6a5fb989a08d72dfca1348c14ccb9413c2590c1fd5177d46964d731eef143c95b217b7c0b4cb3a86736bb814ea357b4d05b7bb07445c57307710f SHA512 df833c808d33415fe18dd8b94968278e8b40201ce00acc202f9e9e5dfef36f4818ce684534843400770587db9001b9a1253ce901f2eaf7f2118297142345b6ec
 EBUILD subversion-1.11.0.ebuild 15335 BLAKE2B 1a370f57d9da2f53cc892f3656d1c15a9f2ca283e6e468d36af908262a2d979e37297b2684a48662221bb5fb3edf59a70583636693b6b4789b206b4983ec91d3 SHA512 42f0e36713135baa87380083395127f9d29d003384882276b27e1b8fedfa5452eb0d067763975a53b3a7ee583fa6e0e67cdd5a79706aa542a7004934a00680e7
+EBUILD subversion-1.11.1.ebuild 15335 BLAKE2B d90a9d6f6cc38edc3679c269d8f03da6cba1f529b2e7e37a06123c8610d9051e87f23871ff4667963b42778c32d7fecac6576c966c8fcbcffc06741ae94c26ad SHA512 87270e8d071a6995d308b21deb86f936aca09531b4fb8590cb222c641ace7ed4d49e36d563113d3b74da7179c0b8ddfdc4fa2d0ea553fd91fe95eba9efca47dc
 EBUILD subversion-1.9.7-r1.ebuild 15804 BLAKE2B 1231e2ab2ba1b776ef43f3b543b57ff127cf59c52a3eb42e131789b2493388aa93f17f2d9760f110081c86a464dc559cce580ffd1641c146086a426bfe09b623 SHA512 bf0969059cb64b5ddea51c7423e5a8177b5e7ba4a821014799b933eb01f0d10f84d498cb11affd218009fc4e4721aa10f69a8e03dc61aabbfda373511bd143a3
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.10.2.ebuild b/dev-vcs/subversion/subversion-1.10.2.ebuild
deleted file mode 100644
index 6ee1436600be..000000000000
--- a/dev-vcs/subversion/subversion-1.10.2.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25 ruby24 ruby23"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	ctypes-python? ( ${PYTHON_DEPS} )
-	gnome-keyring? (
-		dev-libs/glib:2
-		gnome-base/libgnome-keyring
-		sys-apps/dbus
-	)
-	http? ( >=net-libs/serf-1.3.4 )
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	http? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	if use python ; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${APXS}")
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
-		$(use_enable dso runtime-module-search)
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_with sasl)
-		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-	)
-
-	if use python || use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_setup
-	fi
-
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild
new file mode 100644
index 000000000000..5b17d2b2a8c6
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25 ruby24 ruby23"
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	dev-libs/libutf8proc:=
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? (
+		dev-libs/glib:2
+		gnome-base/libgnome-keyring
+		sys-apps/dbus
+	)
+	http? ( >=net-libs/serf-1.3.4 )
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	http? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kwallet? (
+		kde-frameworks/kdelibs4support:5
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+want_apache
+
+pkg_setup() {
+	if use berkdb ; then
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
+			| sed 's:.*b::')"
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	depend.apache_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			if has_version dev-lang/ruby:${rbslot} ;  then
+				RB_VER="${rbslot/.}"
+				break
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+	fi
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/patches"
+	eapply_user
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python ; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${APXS}")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_enable dso runtime-module-search)
+		$(use_with gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_with kwallet)
+		$(use_enable nls)
+		$(use_with sasl)
+		$(use_with http serf)
+		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--disable-experimental-libtool
+		--without-jikes
+		--disable-mod-activation
+		--disable-static
+	)
+
+	if use python || use perl || use ruby; then
+		myconf+=( --with-swig )
+	else
+		myconf+=( --without-swig )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-cygwin*)
+			# no LD_PRELOAD support, no undefined symbols
+			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+			;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=( --disable-local-library-preloading )
+		;;
+		*-mint*)
+			myconf+=( --enable-all-static --disable-local-library-preloading )
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=( --enable-local-library-preloading )
+		;;
+	esac
+
+	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
+	#compile for x86 on amd64, so workaround this issue again
+	#check newer versions, if this is still/again needed
+	myconf+=( --disable-disallowing-of-undefined-references )
+
+	# for build-time scripts
+	if use ctypes-python || use python || use test; then
+		python_setup
+	fi
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# allow overriding Python include directory
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	if use ctypes-python ; then
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
+		}
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
+	fi
+
+	if use perl ; then
+		emake swig-pl
+	fi
+
+	if use ruby ; then
+		emake swig-rb
+	fi
+
+	if use java ; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras ; then
+		emake tools
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		default
+
+		if use ctypes-python ; then
+			python_test() {
+				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+					|| die "ctypes-python tests fail with ${EPYTHON}"
+			}
+
+			distutils-r1_src_test
+		fi
+
+		if use python ; then
+			swig_py_test() {
+				pushd "${BUILD_DIR}" >/dev/null || die
+				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+				popd >/dev/null || die
+			}
+
+			BUILD_DIR=subversion/bindings/swig/python \
+			python_foreach_impl swig_py_test
+		fi
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python ; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	if use python ; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
+	fi
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	fi
+
+	if use ruby ; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	if use java ; then
+		emake DESTDIR="${D}" install-javahl
+		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2 ; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#adjust default user and group with disabled apache2 USE flag, bug 381385
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED%/}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED%/}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	if use extras ; then
+		cat <<- EOF > 80subversion-extras
+			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+		EOF
+		doenvd 80subversion-extras
+
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
+
+		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
+		doins -r tools
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	prune_libtool_files --all
+
+	cd "${ED%/}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
+		ewarn "You upgraded from an older version of Berkeley DB and may experience"
+		ewarn "problems with your repository. Run the following commands as root to fix it:"
+		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+}
+
+pkg_postrm() {
+	:
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		if use apache2 ; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
+	fi
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index c17e191b837d..a719732b5d1a 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 50f7830c51bc..051d5c499a6e 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: cargo.eclass
@@ -23,7 +23,7 @@ esac
 
 inherit multiprocessing
 
-EXPORT_FUNCTIONS src_unpack src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
 
 IUSE="${IUSE} debug"
 
@@ -122,7 +122,7 @@ cargo_src_compile() {
 
 	export CARGO_HOME="${ECARGO_HOME}"
 
-	cargo build -j $(makeopts_jobs) $(usex debug "" --release) \
+	cargo build -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
 		|| die "cargo build failed"
 }
 
@@ -132,11 +132,21 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") \
+	cargo install -j $(makeopts_jobs) --root="${D}/usr" $(usex debug --debug "") "$@" \
 		|| die "cargo install failed"
 	rm -f "${D}/usr/.crates.toml"
 
 	[ -d "${S}/man" ] && doman "${S}/man" || return 0
 }
 
+# @FUNCTION: cargo_src_test
+# @DESCRIPTION:
+# Test the package using cargo test
+cargo_src_test() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	cargo test -j $(makeopts_jobs) $(usex debug "" --release) "$@" \
+		|| die "cargo test failed"
+}
+
 fi
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c6cdc4ba9d0e..28446ed82f19 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5-functions.eclass
@@ -285,6 +285,7 @@ add_qt_dep() {
 # If the version equals 9999, "live" is returned.
 # If no version is specified, ${PV} is used.
 get_kde_version() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local ver=${1:-${PV}}
 	local major=$(ver_cut 1 ${ver})
 	local minor=$(ver_cut 2 ${ver})
@@ -303,6 +304,7 @@ get_kde_version() {
 # Output KDE lingua flag name(s) (without prefix(es)) appropriate for
 # given l10n(s).
 kde_l10n2lingua() {
+	[[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
 	local l
 	for l; do
 		case ${l} in
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 79887823556f..daf869fe8b9a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5.eclass
@@ -119,13 +119,6 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${KDE_QTHELP:=false}
 
-# @ECLASS-VARIABLE: KDE_TESTPATTERN
-# @DESCRIPTION:
-# DANGER: Only touch it if you know what you are doing.
-# By default, matches autotest(s), unittest(s) and test(s) pattern inside
-# cmake add_subdirectory calls.
-: ${KDE_TESTPATTERN:="\(auto|unit\)\?tests\?"}
-
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -135,7 +128,7 @@ fi
 # If set to "forceoptional", remove a Qt5Test dependency and comment test
 # subdirs from the root CMakeLists.txt in addition to the above.
 # If set to "forceoptional-recursive", remove Qt5Test dependencies and make
-# test subdirs according to KDE_TESTPATTERN from *any* CMakeLists.txt in ${S}
+# autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in ${S}
 # and below conditional on BUILD_TESTING. This is always meant as a short-term
 # fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
@@ -213,9 +206,9 @@ case ${KDE_AUTODEPS} in
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
 
-		if [[ ${CATEGORY} = kde-apps ]]; then
+		if [[ ${CATEGORY} = kde-apps && ${PV} = 18.08.3 ]]; then
 			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-			RDEPEND+=" !kde-apps/kde-l10n" # TODO: drop after 18.08.3 removal
+			RDEPEND+=" !kde-apps/kde-l10n"
 		fi
 		;;
 esac
@@ -574,12 +567,12 @@ kde5_src_prepare() {
 			local f pf="${T}/${P}"-tests-optional.patch
 			touch ${pf} || die "Failed to touch patch file"
 			for f in $(find . -type f -name "CMakeLists.txt" -exec \
-				grep -l "^\s*add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)" {} \;); do
+				grep -l "^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
 				cp ${f} ${f}.old || die "Failed to prepare patch origfile"
 				pushd ${f%/*} > /dev/null || die
 					punt_bogus_dep Qt5 Test
 					sed -i CMakeLists.txt -e \
-						"/^#/! s/add_subdirectory\s*\(\s*.*${KDE_TESTPATTERN}\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
+						"/^#/! s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/" \
 						|| die
 				popd > /dev/null || die
 				diff -Naur ${f}.old ${f} 1>>${pf}
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 8e595d581cf6..48146b7284b9 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -509,7 +509,7 @@ detect_version() {
 
 			# as of 12/5/2017, the rc patch is no longer offered as a compressed
 			# file, and no longer is it mirrored on kernel.org
-			if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH} -ge 12 ]]; then
+			if ver_test "${KV_MAJOR}.${KV_PATCH}" -ge "4.12"; then
 				KERNEL_URI="https://git.kernel.org/torvalds/p/v${KV_FULL}/v${OKV} -> patch-${KV_FULL}.patch
 							${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
 				UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.patch"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 487346dc0f9b..12b0e5c3444e 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 77e4a7ad228a..d66f55c7de38 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,7 +1,5 @@
 AUX xboard-4.8.0-gettext.patch 502 BLAKE2B 9c763076afb8ef182e715cbe82a7935ca495d9485326807146fcbe8406c56cfaacb9ebc0221b18628ca36379cf8d8d14f5fe0c4d0577487e39abf8305e9fa6da SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9
 AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152d99de3a88c1f75db33d0f4ecc1b2105cfdb444599af8905955b3a5a91527bac770fc67e0ee480d46a9c81b73fc1c11bf3ec68 SHA512 3ba68ce96dbdca3f0f8027d54c8cf7d8b7f278a2eb8bf549e3f9a2979bfb19aa0232d391430e6725bfdc73befdcc2da221663ff974774ab81bfe052286205956
-DIST xboard-4.8.0.tar.gz 3691531 BLAKE2B 7743b654e8bdd37672a6076ce032fcc92c846796a8cf84906ae8b74454297f0fed1bce078883e9aff6237c8bfee67db659bdd7b93acd94e1b27bc90629dc3b1a SHA512 fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81
 DIST xboard-4.9.1.tar.gz 4015017 BLAKE2B c886cb06d9b4ed394220f133915a55e1dbe29d317891d00d880c597abe0ad43a8377c926d844318b0092120aee7e40fe8c6c62fff41890c35bd768575ccef731 SHA512 7c6f17450edc3f56d5987f6363da01633850b87b0d6664524a4697216dc66aa58f84314ba57ee68aebfbb01ef96995e34be4e98fb4a5124e3f5090690f91ae08
-EBUILD xboard-4.8.0-r1.ebuild 2016 BLAKE2B f519703868c61099a0aaa90a150c1293a9a06eb62dae2f92b0f1d5ad1bb4932dbd8df527c2b166ed1e89381178b6f0cb0b349a9430bc4aa8a157ad771f89a3ab SHA512 8b262a091b80ab8c531fddc8d76a6efe0ac8cb2e6ab7cb3d5e3901d37c97ba4b47c9f61a3cff80c64788387a6f1f44c7b71b470ba14a75612895aa6e9cbc46e7
 EBUILD xboard-4.9.1.ebuild 1972 BLAKE2B 12c3b0b5dd1970a7007793cb923ec25a2afddecf6ac164b8038a362a280d6d64220f1416dc4f0653d90f716796c8c82da86d4a3d83c46f0229d118a16ac7f762 SHA512 e97fb6801ff96add531264e240cd4bc2da64c712a71dc73b7515cd9e1c42fc52882f35989d31348ab4f1a788a45f8949283b48235a238ae59b20b6b8ddc35341
 MISC metadata.xml 418 BLAKE2B 0fb5a3b7607b0c609e7bf50224e1a53abc1e9dd90a811e964bbc5038f96966d32d4cfca6b8eaefc7e64be3fb2302a0231162554cd436043471c578830f74e1ec SHA512 ff385f8c46788e3c76fcdd891f4a4be50b100ff47298eece8a2f1ac3dd166ab384961f3fde0967dc3b3afcc3978cefb5025e4eb0dc69177395c75affa2416d1f
diff --git a/games-board/xboard/xboard-4.8.0-r1.ebuild b/games-board/xboard/xboard-4.8.0-r1.ebuild
deleted file mode 100644
index 398488b60b28..000000000000
--- a/games-board/xboard/xboard-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fdo-mime gnome2-utils
-
-DESCRIPTION="GUI for gnuchess and for internet chess servers"
-HOMEPAGE="https://www.gnu.org/software/xboard/"
-SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="Xaw3d +default-font gtk nls zippy"
-RESTRICT="test" #124112
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	virtual/libintl
-	x11-libs/cairo[X]
-	x11-libs/libXpm
-	default-font? (
-		media-fonts/font-adobe-100dpi[nls?]
-		media-fonts/font-misc-misc[nls?]
-	)
-	!gtk? (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
-		Xaw3d? ( x11-libs/libXaw3d )
-		!Xaw3d? ( x11-libs/libXaw )
-	)
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gettext.patch
-	"${FILESDIR}"/${P}-gnuchess-default.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-update-mimedb \
-		--datadir="${EPREFIX}"/usr/share \
-		$(use_enable nls) \
-		$(use_enable zippy) \
-		--disable-update-mimedb \
-		$(use_with gtk) \
-		$(use_with Xaw3d) \
-		$(usex gtk "--without-Xaw" "$(use_with !Xaw3d Xaw)") \
-		--with-gamedatadir="${EPREFIX}/usr/share/games/${PN}"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ.html NEWS README TODO ics-parsing.txt
-	use zippy && dodoc zippy.README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	elog "No chess engines are emerged by default! If you want a chess engine"
-	elog "to play with, you can emerge gnuchess or crafty."
-	elog "Read xboard FAQ for information."
-	if ! use default-font ; then
-		ewarn "Read the xboard(6) man page for specifying the font for xboard to use."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 0a011ed7b2fb..c0e94efa925e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index c02778f1614d..0b0cd0a974aa 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,8 +1,9 @@
 AUX dosbox-0.74-gcc46.patch 274 BLAKE2B 6375a8c0752eed6481cfc987ac3b7c7f699d745498e619862223dcbf660eef21f7619ef5b8e2034d20ad09716714988875e30d1959fe29393fd96559a2d710df SHA512 3175ba75be568d24286501844073bebbd2ae2e770ca6bdd9d409b290ca7b9f98a8406b5b92b89a9965eeda8045f2ac9634aacf8eb01917cbf02087996de53177
+AUX dosbox-0.74.2_events.patch 1274 BLAKE2B f0041d8be1c1dbbed5595cb90f618ec6cb5c8e5098da838f2c2892596fc6ae2db40d0b9f99dc19a01c837983516101568c37476bf18868a6225f3a4327fe01bd SHA512 d947d8eb168198598e413011bd6b68dc4cf2ea4d4c9b2fa0028c98276a2245c02709f0830eaacee43c712b921d0879372569766829e12e9cf1a4040e11448bf4
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74_p20160629-r2.ebuild 1919 BLAKE2B f5602bbcea7b32d71584aa1efaef2b0a9e2d305467329ee4fcf8a9ec2e83f4fc885cd12c19abd9c5d4c9ac5a511074fa8286d04c5dd4077e6601eef0a94c79b3 SHA512 2f854b566e89795f2126d687b5d9597a8142ef5d328a4dd87a8fa65529b3b5855ac0a38ff1f114f137f329a52db34a17b19f703e64131cf062a4fdbf57397382
+EBUILD dosbox-0.74_p20160629-r3.ebuild 1953 BLAKE2B c7cb3ac6debda1c32081b954eb751347dca7016d5fefc2402cc79bb163625dc632a790287cc031695e1ac8c0613895b8ca4a66c009b0215a5545e63e96dadff0 SHA512 cbf1578c442cdc2d8526425f39164832dba64ac232730945e09ac5f2835dcbd755b3ce9a8d496ed433573c2445e8d21a69cf583947e1068929d03332a3fc3388
 EBUILD dosbox-0.74_p20160629.ebuild 1076 BLAKE2B e0ca5a03e6817622ef09305464a4a98661fe97d94ffe0ddb021073af2d1fe4bb31ae3fd967e4fc03c08848e2abb2a6465364bcbee1a09f0a415b0077144a9724 SHA512 ba8f55ede135d0e8a024d72b8db79db0816f845452b54e71cc7ad3460e0b1152bad67f0800b5c8a0a506a26959a606f8f57159b37b0a4dc465fd95897a083529
-EBUILD dosbox-9999.ebuild 2015 BLAKE2B d874dfcce054cfe4bf10de764e1a4aad40bf90a74532d6f7e6d97d233871aa53779a601ce2487bd625686ff4a8123b1294d3005091add6e7b70bf832d5593202 SHA512 3352352a8cc3d623184066a5ccbca680defa7e2103986266092be93e4f91cbaf15dd7125112b97a28cf719b27b88b5862e8e7649df289a1315b40a2589a239c1
+EBUILD dosbox-9999.ebuild 2008 BLAKE2B 4fd2809355ff62f58a0d2313e5722c2e32260a3e6ff284c4629293dd1ad4fdd441e04a39fa5b4472ea16037b4a388e833232d4f7e08289810879ac92bce95b59 SHA512 3c820cebf87b34d2c7b05e9d15c87619a7b5c537f79faa95c27e1103642d32b47b682f64281ba73963acc6727cc42dbfc4505f2c1623d7bb76caf7b842dba7f3
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
deleted file mode 100644
index f6a503b6b2a4..000000000000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic
-
-PATCH=3989
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
-	glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa +core-inline debug glide hardened opengl X"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	glide? ( media-libs/openglide )
-	opengl? ( virtual/glu virtual/opengl )
-	debug? ( sys-libs/ncurses:0 )
-	X? ( x11-libs/libX11 )
-	media-libs/libpng:0=
-	media-libs/libsdl[joystick,opengl?,video,X?]
-	media-libs/sdl-net
-	media-libs/sdl-sound
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.74-gcc46.patch
-)
-
-src_prepare() {
-	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-	ac_cv_lib_X11_main=$(usex X yes no) \
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable core-inline) \
-		$(use_enable !hardened dynamic-core) \
-		$(use_enable !hardened dynamic-x86) \
-		$(use_enable debug) \
-		$(use_enable opengl)
-}
-
-src_install() {
-	default
-	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
-	doicon src/dosbox.ico
-}
-
-pkg_postinst() {
-	if use glide; then
-		elog "You have enabled unofficial Glide emulation. To use this, symlink"
-		elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's"
-		elog "directory and add the following to your DOSBox configuration."
-		elog ""
-		elog "[glide]"
-		elog "glide=true"
-	fi
-}
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
new file mode 100644
index 000000000000..140ff29f6f0c
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop flag-o-matic
+
+PATCH=3989
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+
+DESCRIPTION="DOS emulator"
+HOMEPAGE="https://www.dosbox.com/"
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
+	glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="alsa +core-inline debug glide hardened opengl X"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	glide? ( media-libs/openglide )
+	opengl? ( virtual/glu virtual/opengl )
+	debug? ( sys-libs/ncurses:0 )
+	X? ( x11-libs/libX11 )
+	media-libs/libpng:0=
+	media-libs/libsdl[joystick,opengl?,video,X?]
+	media-libs/sdl-net
+	media-libs/sdl-sound
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.74-gcc46.patch"
+	"${FILESDIR}/${PN}-0.74.2_events.patch"
+)
+
+src_prepare() {
+	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
+
+	ac_cv_lib_X11_main=$(usex X yes no) \
+	econf \
+		$(use_enable alsa alsa-midi) \
+		$(use_enable core-inline) \
+		$(use_enable !hardened dynamic-core) \
+		$(use_enable !hardened dynamic-x86) \
+		$(use_enable debug) \
+		$(use_enable opengl)
+}
+
+src_install() {
+	default
+	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
+	doicon src/dosbox.ico
+}
+
+pkg_postinst() {
+	if use glide; then
+		elog "You have enabled unofficial Glide emulation. To use this, symlink"
+		elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's"
+		elog "directory and add the following to your DOSBox configuration."
+		elog ""
+		elog "[glide]"
+		elog "glide=true"
+	fi
+}
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 421603aa2fd0..8c4711e5620c 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
+HOMEPAGE="https://www.dosbox.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
new file mode 100644
index 000000000000..fee09a65a4ce
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
@@ -0,0 +1,37 @@
+Index: src/gui/sdlmain.cpp
+===================================================================
+--- a/src/gui/sdlmain.cpp	(revision 4177)
++++ b/src/gui/sdlmain.cpp	(working copy)
+@@ -1426,6 +1426,12 @@
+ #define DB_POLLSKIP 1
+ #endif
+ 
++#if defined(LINUX)
++#define SDL_XORG_FIX 1
++#else
++#define SDL_XORG_FIX 0
++#endif
++
+ void GFX_Events() {
+ 	//Don't poll too often. This can be heavy on the OS, especially Macs.
+ 	//In idle mode 3000-4000 polls are done per second without this check.
+@@ -1449,6 +1455,19 @@
+ 	}
+ #endif
+ 	while (SDL_PollEvent(&event)) {
++#if SDL_XORG_FIX
++		// Special code for broken SDL with Xorg 1.20.1, where pairs of inputfocus gain and loss events are generated
++		// when locking the mouse in windowed mode.
++		if (event.type == SDL_ACTIVEEVENT && event.active.state == SDL_APPINPUTFOCUS && event.active.gain == 0) {
++			SDL_Event test; //Check if the next event would undo this one.
++			if (SDL_PeepEvents(&test,1,SDL_PEEKEVENT,SDL_ACTIVEEVENTMASK) == 1 && test.active.state == SDL_APPINPUTFOCUS && test.active.gain == 1) {
++				// Skip both events.
++				SDL_PeepEvents(&test,1,SDL_GETEVENT,SDL_ACTIVEEVENTMASK);
++				continue;
++			}
++		}
++#endif
++
+ 		switch (event.type) {
+ 		case SDL_ACTIVEEVENT:
+ 			if (event.active.state & SDL_APPINPUTFOCUS) {
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 988ff3b9fed4..4acd3bf283fb 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -1,8 +1,9 @@
 AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
 AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
 AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1
+AUX snes9x-1.58-without-screenshot_build_fix.patch 846 BLAKE2B a8afca89a9d5a85df688610e2e136f1e47c1558f3be1a02585f47c075587993b68fbc29de987b7e791517a4584aa9373c4985dbdaed979e0688ae6cb3e5c9d58 SHA512 4cb91935d39766c091fdc30a5eb7b01eb60e29ea365da75968b5302d1f44be6992f46c04ba91af412edc787ddd0738ac8455d7127fbfe79ba7782abc423bab32
 DIST snes9x-1.57.tar.gz 2959157 BLAKE2B 6307976247eb3a3bcb506028d75d9054ea853db5c629870a89832fd93ee2fe256799b9191922c67fcd8ef1ed2344d16326212001661c5038a88f290346b9f35c SHA512 d17ec45eeae8f57c618a51243ac54bc3a2a3f09632e4e50c51781cf8557362dbfa7856d9d4ecdebeea344041c2686e2256f6bcd2dcc71660fcf336cf887dcb1c
 DIST snes9x-1.58.tar.gz 2830667 BLAKE2B 66446e56a172b318f7cefecc59d927270377f725df0ca89888e1c50eb3f5475729ffc9da86ead5e50f106ab0781ad644ae3b3ed5719724db9b78b687135ead04 SHA512 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d
 EBUILD snes9x-1.57.ebuild 2860 BLAKE2B d829620d8308791ea4c31dcc07c061baef25ea7203ab8a536db841a5b5a8213e98b939d990ec0ee071c83e12942ea2c4ef8dba36519f25b04cc7eb4de457c92a SHA512 b01974ee1d46b4e929890a81f847632ec73a364218da4e03a9c4030345e513ef8a3644c2d2e6d822a6ac7928aefb4147314aa6fdf38d1a570025752c574e3318
-EBUILD snes9x-1.58.ebuild 2749 BLAKE2B b3fd6d9771bce1debfb35fb7c4a4a43ebe98634c583879a8e8b9c4351142f748141a1f1cf34fecdbbb3f108545649400429fa0b34c0d2ff3fdb74160f3adc9ad SHA512 515d1718224ae25c259aa8d765d228851ba7cf2793d13e862581980116db8c4a2f4518f7479a30c71f2bdd83cbb56317d5c076ae33329d001f74d635c0b96650
+EBUILD snes9x-1.58.ebuild 2804 BLAKE2B d30b3e06951e3889fcecd1bca0cac88b76e71ae3bba163accc08a0e9f6a1b3899684fd9b26ec39b703d9cb63065431c1e8d69500570aa4068079195039f39471 SHA512 057b2dca88e954bb497a181d4cd1f8ed729b210e8847807083c89f33ee4f5a5eef5f4d9fe073ae0d835bdcc0dd3dfd50cb2eb23b680364fd818af03f43c67320
 MISC metadata.xml 489 BLAKE2B 3cb6bc463e0eb5ca5203722cc2320eba2bc2e000fbd42e1386fcef807df3aa6e853bbff49fb6b323ae012b44b6add2c354530df0ebc56d232aa89188297426cc SHA512 805a8089e2e324dcf14ca5d25b168fdd79dc72113710b820904982ce9b2c49e2876095cd461ed52f4905041c14b25626f4540db7e1b38e47a9d55bbac98ebbfc
diff --git a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
new file mode 100644
index 000000000000..7af1e9e2b902
--- /dev/null
+++ b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch
@@ -0,0 +1,31 @@
+From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001
+From: Brandon Wright <bearoso@gmail.com>
+Date: Fri, 4 Jan 2019 10:52:11 -0600
+Subject: [PATCH] Fix PNG usage without preprocessor check.
+
+---
+ shaders/shader_helpers.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp
+index b84e6291..a589d39b 100644
+--- a/shaders/shader_helpers.cpp
++++ b/shaders/shader_helpers.cpp
+@@ -93,6 +93,7 @@ bool loadPngImage(const char* name,
+     bool& outHasAlpha,
+     GLubyte** outData)
+ {
++#ifdef HAVE_LIBPNG
+     png_structp png_ptr;
+     png_infop info_ptr;
+     unsigned int sig_read = 0;
+@@ -211,6 +212,9 @@ bool loadPngImage(const char* name,
+ 
+     /* That's it */
+     return true;
++#else
++    return false;
++#endif
+ }
+ 
+ bool loadTGA(const char* filename, STGA& tgaFile)
diff --git a/games-emulation/snes9x/snes9x-1.58.ebuild b/games-emulation/snes9x/snes9x-1.58.ebuild
index 911de9a90fb0..9fd943cac808 100644
--- a/games-emulation/snes9x/snes9x-1.58.ebuild
+++ b/games-emulation/snes9x/snes9x-1.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,6 +47,7 @@ S="${WORKDIR}/${P}/unix"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
 	"${FILESDIR}"/${PN}-1.58-build-system.patch
+	"${FILESDIR}"/${P}-without-screenshot_build_fix.patch
 )
 
 src_prepare() {
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index cab2fd191524..b77a5434f9de 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/gnome-mud/Manifest b/games-mud/gnome-mud/Manifest
index 621843dc4218..06a7fa264177 100644
--- a/games-mud/gnome-mud/Manifest
+++ b/games-mud/gnome-mud/Manifest
@@ -2,5 +2,5 @@ AUX 0.11.2-gst1.patch 1645 BLAKE2B ad5ec717a6dbaec685d12754c7f2fc8ba29fc3485884a
 AUX 0.11.2-telopts-reenable.patch 1284 BLAKE2B edb0ff64c37b9da04ac5bbd40d2b8e8ebae981571259c8fcdbe736171a97569c900307dfe77b1fe5dad7b3718a6d9a07be0653a1eea716cd42af8c2ab11215b2 SHA512 9a9f8ade511282bcc4142d3bff15b0a64dda36b327920f4d665852d43a13854b5e876bef8e8c667c28330896e9fc09965317595850b4c0e67285d9c8d8223ed5
 DIST gnome-mud-0.11.2.tar.bz2 444294 BLAKE2B e3e1c6ebb4dbd4169f947adb5e481db19b8a7d774866e56e17d6448486b2962cdd5a021195e3b26840143362dbe60c519105166c7b5f8d0f9cc10e3563eef8f9 SHA512 b8dd4ffa0cd5ab7077b21c908fb92b6b5c3e1fc65c06c890d8ebb4ab4fd6d1f8ac4a67d9a815634fc45f3357dd495ba329057df5662c00d2074278a16470c422
 EBUILD gnome-mud-0.11.2-r2.ebuild 1249 BLAKE2B 991a0d465eb7df2a026f4506a137db28067eebfaf4fc894b8c3b1a98eb944da83d480c7a69649822e185a2916c3bdaea86d03ebe35e63f6fb56d7ed6e9fcaef6 SHA512 bee265e98a53b11a1133fa987f65236fdf394aa8e64d876b70b7c1e9962be1ed9254e24fab8c79cce02d7c73f6b421002fa4f842b138cd73369bf32e5bc3babe
-EBUILD gnome-mud-9999.ebuild 900 BLAKE2B b6b91d71c644173611c8b6a7bc02cd452ed96d62f3c0755103cb8ee63ec2d063fd77734753348a7587f33cd6eb67deeb92b55fb1f8d7d496b6f78bb95cc6f3b7 SHA512 cc3accc00593b726687b693214516c98f2e4daeced9f508eebced58ee6dd6596c8d5ae3e6be708cb492e7c4b1a9ad1b4fab34d68458d50dd103b6e6cb517ab8b
+EBUILD gnome-mud-9999.ebuild 973 BLAKE2B 7b9328805c72e142b699117252e668c87e0a8ee17f20356bc1c4ba203eea28337d3d0d47ef8e3cfd2de7663dac9193e32b3d49b54e0caccc47c0298d67be705d SHA512 ca95b9eae6eabc6d74b8ee73fc7bdee652915c689d2c6d26e21279c1a1dd3e189a7670a73363c7d861f52d6a11a5f95f9cd17c9f83bd42c0bc46c00ab1e3de47
 MISC metadata.xml 350 BLAKE2B 6bd2e206bc7a4f2e4d9cde3a52ea0879f08187ee03b79abaf712cf4574e4539302552781c00764dc78f42f70576e4d0faf2d938c9d787c5345c0122a4db77d12 SHA512 0531e7ca85ea8011f5aeef4517ea6dc1362323dbb4b05be0c9fa028e2a3cdeae880cdcbdef070c048649520cbe23ec8bce4785c2bfbbdd3c989380b036d51984
diff --git a/games-mud/gnome-mud/gnome-mud-9999.ebuild b/games-mud/gnome-mud/gnome-mud-9999.ebuild
index c990ec034066..2f5881345670 100644
--- a/games-mud/gnome-mud/gnome-mud-9999.ebuild
+++ b/games-mud/gnome-mud/gnome-mud-9999.ebuild
@@ -1,45 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_EAUTORECONF="yes"
 
-inherit gnome2 git-r3
+inherit gnome2-utils git-r3 meson xdg
 
 DESCRIPTION="GNOME MUD client"
 HOMEPAGE="https://wiki.gnome.org/Apps/GnomeMud"
 SRC_URI=""
-EGIT_REPO_URI="git://gitlab.gnome.org/GNOME/gnome-mud"
+EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gnome-mud.git"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug gstreamer"
 
-RDEPEND="virtual/libintl
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=x11-libs/vte-0.11:0
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/vte-0.37:2.91
 	dev-libs/libpcre
-	gnome-base/gconf:2
+	sys-libs/zlib
 	gstreamer? ( media-libs/gstreamer:1.0 )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/rarian
-	>=dev-util/intltool-0.23
-	>=sys-devel/gettext-0.11.5"
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig"
 
 src_configure() {
-	gnome2_src_configure \
-		$(use_enable gstreamer) \
-		$(use_enable debug debug-logger)
+	local emesonargs=(
+		-Dmccp=enabled
+		-Dgstreamer=$(usex gstreamer enabled disabled)
+		$(meson_use debug debug-logger)
+	)
+	meson_src_configure
 }
 
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README ROADMAP" \
-		gnome2_src_install
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
 }
 
-pkg_preinst() {
-	gnome2_pkg_preinst
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
 }
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 07abf4576384..2197665a0909 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
index 8b5f0165af45..84ef5cbf6505 100644
--- a/games-puzzle/ksokoban/Manifest
+++ b/games-puzzle/ksokoban/Manifest
@@ -1,4 +1,4 @@
-DIST ksokoban-0.5.0_pre20170827.tar.gz 433276 BLAKE2B b29624ea0bae724b798ebb88aaca0623c9912b6d0155f7bcfc945dc76d5b0ace51f36b9991b2e6314d4f0f9c12fe3892bc1eda56789a2eefa9263d1048a61414 SHA512 50b650733c021fe95ea087fdfc6e354071b587156ddc38dc1ae571d893c555bf7405f7d089403d3af3b907a956a3d5dc7beecc9279c8c687b867ac813c796d31
-EBUILD ksokoban-0.5.0_pre20170827.ebuild 802 BLAKE2B 9f0e4c4d4f08cbfe12bcc93fa95ea0c9327d453128d2512d765e3cd3cac0f50e52b7ab9e5160ad75ad2e8a9a4838e554294c2ef497514ef9b58aba75239fd802 SHA512 a5406f5e8ed282f0b3f388b662ff8888f6b6075617980046b123c1a44ae15ca00ca04e652d6653d3e0b7b4cf570c9969b6880b2416084b64f94477258b0f7d9a
-EBUILD ksokoban-9999.ebuild 651 BLAKE2B 78797363b971c6310710b113bba4d191b0af5b309a947101c525a9dcb4b585f4eaad54c739094c8d21b3c8a2631a3fa97c2901aba82aed69a536813cc66d0a60 SHA512 3fc37f0460f2fe7539b343e2ece45d16d91847bfa086dbfcaae6409ed1438e1891d749d9d393adaf4e87492052e11890818c314989fdd736508e1b04b48d0133
+DIST ksokoban-0.5.0_pre20190104.tar.gz 432967 BLAKE2B cd062368506295cd19764ce361cad1ff85b5cbfcf8982402492052c08816257060f99bc349a0ec62ee63f2c75ba9516c63d497e7a2f231b2001213e0bd046e75 SHA512 ce06af9a464aaa3b3dcd0ccac7a6bfcc28858bdf511eb77db1b8a1ed15e2a5e764babaffbd26df54f16a93ccb675de10958fb5c83f00b45fce999c96e393e4da
+EBUILD ksokoban-0.5.0_pre20190104.ebuild 759 BLAKE2B 23f0bc6892b666cd3e8cdb76dc49e514b7980dd872c9b0774be4d27844d8210653f8d6cd9d50f682451639fa9d17a1283ce5602e9484e68641f029866f628a30 SHA512 8cbdf2e4433f500de0e4e89cae45c9327a0f45fd4bf996567597b421b4d27801a85199d29a0f79063d3db66ccf9ac4bb178fe0a40ceb4a3e8dc17345aee10605
+EBUILD ksokoban-9999.ebuild 589 BLAKE2B 1a7af221f0fd5c7c4e0013640aa600f817a76e5a1686161381dc5bfb1b4abceb68835b8f447c0907adb809574b1309bf9c9471392481fb3c70f0832d7585f80a SHA512 e7be19b7258560bebb55f18d2edf9f27a897488f10762460ee9455bf636ecacb78a6f79c2464ecd5eabd633730d41ec6425dd5462daae0ae7e9c1e4747824b8d
 MISC metadata.xml 296 BLAKE2B 8abfdabec906c0024c978d0df7911b26d1df5c21269f78f6b327da8ae9a3955e0a091540741553cd9b805cdae52c09c713d868df83fa92c59e43b203d5db3219 SHA512 50facad52c9acec67642e499d377ccd05b7a18f578f0d71b6b8b222e6ac6a310b24913d9374bb9ba995fbc3cd55612f79ae562c8fe9ecd1e451d472505bd8e14
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
deleted file mode 100644
index 109daa9faf8b..000000000000
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=048b42324ef6dac807af4351174065cda2f32f44
-EGIT_BRANCH="port-to-kf5"
-KDE_HANDBOOK="optional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="The japanese warehouse keeper game"
-HOMEPAGE="https://cgit.kde.org/ksokoban.git"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190104.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190104.ebuild
new file mode 100644
index 000000000000..0646e812dd63
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190104.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=f99c63723ca96cfd3d9499ef7fcf0fe7e7b021ca
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://cgit.kde.org/ksokoban.git"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kiconthemes)
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
index 632e47c6c561..3e46de627eaf 100644
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_BRANCH="port-to-kf5"
 KDE_HANDBOOK="optional"
 inherit kde5
 
@@ -14,16 +13,16 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="
-	$(add_frameworks_dep kactivities)
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kiconthemes)
+"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 473c25fb8740..51f0c404bb78 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index fa8bc20c4461..6f194d924cda 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,5 +1,5 @@
 AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
-DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B 5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da SHA512 b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
+DIST hedgewars-src-0.9.25.tar.bz2 175276967 BLAKE2B 8f0779ca05ffbf18f607716bbec03bf0d6633cd6c3594bcb94b78ba606ed8c36d418d7b5456574cc0a08489e143d2390ed7ebcc8637e7987231ba04c0d5b5331 SHA512 956c21a7203586485e885f98fa4eccdc2fd34b50c0f817c1f6f610af1b4f341a5bb32bb8e0ace13f78ce2fb79a489000034b89c1b56459a411c07a1809041968
 DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
-EBUILD hedgewars-0.9.24.1.ebuild 2693 BLAKE2B ea23fac741436c809f3642818833f23ccefe362b14b4576b0f26dc156e85e2e56b1d94d87002475c7788e645f9d676a343f0abb9f741c98313fb81ba10fc4dae SHA512 710ef2dec6586ae25603552cc5a02213bcb8ff4aa5a0b3037608c9ddb39f83d6e68c90097063757e8cc69bb9fa853f7fa88fae33fad394cdee57aa08c45f7d09
+EBUILD hedgewars-0.9.25.ebuild 2794 BLAKE2B c9be8c1774be0791b6762809b188eb456383a5eaaab8bc60f7e756dc78738a54df37c62e0f1d562da22e0d77970654b8af942a8771796aafff163452a2a7fce1 SHA512 846aea392913a8c97e012d6966e0e4c021ab4e4a9e1a843cb083380d30ad0c9e971f49ffc6296572423d1e5a57593af31b688fd32843e557b7249942e91252f4
 MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
deleted file mode 100644
index 3e592af7ebfa..000000000000
--- a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils desktop xdg-utils
-
-MY_P=${PN}-src-${PV}
-DEB_PATCH_VER=2
-
-DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
-HOMEPAGE="https://www.hedgewars.org/"
-SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
-	mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="GPL-2 Apache-2.0 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav server"
-
-QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
-QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
-
-# qtcore:5= - depends on private header
-CDEPEND="
-	>=dev-games/physfs-3.0.1
-	dev-lang/lua:0=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/sdl2-image:=
-	media-libs/sdl2-mixer:=[vorbis]
-	media-libs/sdl2-net:=
-	media-libs/sdl2-ttf:=
-	sys-libs/zlib:=
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:= )"
-DEPEND="${CDEPEND}
-	>=dev-lang/fpc-2.4
-	dev-qt/linguist-tools:5
-	server? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/entropy
-		dev-haskell/hslogger
-		>=dev-haskell/mtl-2
-		>=dev-haskell/network-2.3
-		dev-haskell/random
-		dev-haskell/regex-tdfa
-		dev-haskell/sandi
-		dev-haskell/sha
-		dev-haskell/vector
-		dev-haskell/utf8-string
-		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	)"
-RDEPEND="${CDEPEND}
-	app-arch/xz-utils
-	>=media-fonts/dejavu-2.28
-	media-fonts/wqy-zenhei"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMINIMAL_FLAGS=ON
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
-		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
-		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
-		-DNOSERVER=$(usex server FALSE TRUE)
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DPHYSFS_SYSTEM=ON
-		# Need to tell the build system where the fonts are located
-		# as it uses PhysFS' symbolic link protection mode which
-		# prevents us from symlinking the fonts into the right directory
-		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
-		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
-		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
-		# upstream sets RPATH that leads to weird breakage
-		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman man/${PN}.6
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-strategy/hedgewars/hedgewars-0.9.25.ebuild b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
new file mode 100644
index 000000000000..c98f3a05e5de
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.25.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils xdg-utils
+
+MY_P=${PN}-src-${PV}
+DEB_PATCH_VER=2
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
+	mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav server"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+# qtcore:5= - depends on private header
+DEPEND="
+	>=dev-games/physfs-3.0.1
+	dev-lang/lua:0=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/sdl2-image:=
+	media-libs/sdl2-mixer:=[vorbis]
+	media-libs/sdl2-net:=
+	media-libs/sdl2-ttf:=
+	sys-libs/zlib
+	!x86? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
+	)"
+RDEPEND="${DEPEND}
+	app-arch/xz-utils
+	>=media-fonts/dejavu-2.28
+	media-fonts/wqy-zenhei"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	server? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/entropy
+		dev-haskell/hslogger
+		>=dev-haskell/mtl-2
+		>=dev-haskell/network-2.3
+		dev-haskell/random
+		dev-haskell/regex-tdfa
+		dev-haskell/sandi
+		dev-haskell/sha
+		dev-haskell/vector
+		dev-haskell/utf8-string
+		dev-haskell/yaml
+		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
+	)
+	!x86? ( >=dev-lang/fpc-2.4 )
+	x86? (
+		>=dev-lang/ghc-6.10
+		dev-haskell/parsec
+	)"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=$(usex !server)
+		-DBUILD_ENGINE_C=$(usex x86)
+		-DNOVIDEOREC=$(usex !x86)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		# Need to tell the build system where the fonts are located
+		# as it uses PhysFS' symbolic link protection mode which
+		# prevents us from symlinking the fonts into the right directory
+		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
+		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
+		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
+		# upstream sets RPATH that leads to weird breakage
+		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman man/${PN}.6
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 58b5c4121663..0f56991204c0 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,6 +1,4 @@
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.4.tar.gz 489503950 BLAKE2B 2802098a83169d1dd3d0d38052145b7da006992843d748fdc263fe04ed0f485c2a46a93569e2728e152d76361d3651f0f207d2cfdd7b6bb59ae7cdec43680cd7 SHA512 d867d68278075536c61eb87c32dd43bcd832de0dd20f9c941e2c5a2f413b95ba1897b5401721a0e895934afe79bb568ea155d8fe648dac58c519289fc7d12885
 DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e SHA512 115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
-EBUILD wesnoth-1.14.4.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
-EBUILD wesnoth-1.14.5.ebuild 2654 BLAKE2B 9c54fb780b96f72a4bfb45db573a9ccff055b7ca8e9396244b57f5feed1d23ee0444c9dc927d971dfefc37f827ebb4d08f4fdd0131385d525eaa481d2a996d00 SHA512 dd80506c25260e2f71508eaf8657665bc9f50c6d113ef5860e7112b0e72b580829085afb45b3dbbae770679d4c3b287ea4251cb2ff559210d3c7074fbd688a00
+EBUILD wesnoth-1.14.5.ebuild 2652 BLAKE2B af84f260e5b35f7c575958b3ded2e139085ed9fd07f58fb93cf0d827abe5729a00f30aea85084878ec2a222651e18bd88e80d4fec2de9a9ba263b07ec8a2e144 SHA512 a3a503cf306139b69f0c912cf73a9d6f32e7089c0e2e44b6c9f06a13ed8df5eeb7889c9d3885884a4112a4121c1176c4e26f6d3756f48ce20e0e0ba455383d41
 MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild b/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
deleted file mode 100644
index 9ce29bd54b01..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( README.md changelog.md )
-	cmake-utils_src_install
-	if use dedicated || use server; then
-		rmdir "${ED%/}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
index 9ce29bd54b01..4cd3506d2b9c 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ RDEPEND="
 		media-libs/libvorbis
 		>=x11-libs/pango-1.22.0
 		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
+		sys-libs/readline:0=
 		dbus? ( sys-apps/dbus )
 		fribidi? ( dev-libs/fribidi )
 	)"
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index dbdad6aea917..41f524a161eb 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
index 5b1ff0879675..3b5e9aabd0fd 100644
--- a/games-util/springlobby/Manifest
+++ b/games-util/springlobby/Manifest
@@ -1,3 +1,3 @@
 DIST springlobby-0.266.tar.bz2 2642384 BLAKE2B 93444df4e139a657dc5d87b0ea9e796bd025259663693de9dcb04760ee611674546170813d71406e94aa456834cc96c8bc811ee5cf65b0bd0199cf66b4a51a50 SHA512 dc1a5e408515cb82004bf66bc014ebdd451eaea07d3543094cec494beb6d87165bdc0ac3672d6474a13d1918b1405507ee97ead05b9f1663789416b072aa6d6b
-EBUILD springlobby-0.266.ebuild 1071 BLAKE2B 5f20ce6e183eebfa24105e7dd1eb5e644b6f670b7383ea88c25709dbee7b5ce1b417da3e090105030df04ad9d324bf3d360344046bf220c82caaccc1a95b6b1c SHA512 0e9a8a853234e5a53391f3024fc9bfe56d6a42a2aae29cd678f10075a4917f78b96e1511bb952e9b4bb8d4f0c14c6b83cf215a6edbbadf461cb01a6eab6d8603
+EBUILD springlobby-0.266.ebuild 1069 BLAKE2B 1c7652169a03cc51e5d7891ecf1d2fc9b7afa0d58b1c6b5fe94dd65992971d269a499b7951f689635a1e91e8f26e5e28c9f2e6fd4621ec1eb869b09ce12a04b0 SHA512 73cb9f0389d2a354ca7b6f620900f0798db6b94ae9aaffef9c47ea22b9843557795d9b8ae3ca1443ace21237fad463bec6cfce14400fd49df62d80b8bae04ad8
 MISC metadata.xml 1168 BLAKE2B 52a394c332bed809d549cf76a750a35cb0c0bcb6af1cf2276d81958abafa6272e58d59d07762929ef05ccece16d5465d5c353dd71974b4ec2657ae99e3d607a5 SHA512 901e3865f60e798625d59085e38e191a256819e5aa0778210190ebc0a08f183b263c3391409079c499a2e2cb6740503371642f0c13eec1e59a8699060c00b59c
diff --git a/games-util/springlobby/springlobby-0.266.ebuild b/games-util/springlobby/springlobby-0.266.ebuild
index 6fd4af3c6e07..cd52d8460241 100644
--- a/games-util/springlobby/springlobby-0.266.ebuild
+++ b/games-util/springlobby/springlobby-0.266.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="debug +libnotify +nls +sound"
 
 RDEPEND="
 	>=dev-libs/boost-1.35:=
-	dev-libs/openssl:=
+	dev-libs/openssl:0=
 	net-misc/curl
 	sys-libs/zlib[minizip]
 	x11-libs/libICE
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8a5ad9468d52..59a11482fbef 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 141bfb2556b9..633d4135ce6f 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,4 +5,5 @@ DIST gvfs-1.34.2.1-patchset.tar.xz 2608 BLAKE2B 1041815fa35e052219df561325bab4a9
 DIST gvfs-1.34.2.1.tar.xz 1822700 BLAKE2B 2de1e86bf9dfe6567c59c7d1e2032f9e749daef0a1deb27963c0b5122be5925256c02a90dae5371bed9e037137400cca8e3461f415b3bed36de4310757bced62 SHA512 ff8d2ebff220e8432584d13640747d54c78c7350c0b8b9ed8544eb311fb4211897fb8473375b246cc1271df507f5ae2dd4edc6d5fd5d2061792377f3f37ebdb1
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
 EBUILD gvfs-1.34.2.1-r1.ebuild 3741 BLAKE2B cdc826af8a3ceffa2e211ae804f31b970c554aace54dcd71ef3eb197ffef40be96c68c0b7624214c6e3007c922d8396f9f8c8d75409b16f7b36081cdd8acfede SHA512 98afd5b53bf08526a43ba561b8bd27e295f4f33247b29a344a0142657a5715d0af29edd55ecccf1912985ab416e34eb837191769de84b3255058e0e1fda22fa7
+EBUILD gvfs-1.34.2.1-r2.ebuild 3767 BLAKE2B 992c78246b386873c9eed365168556a7d04ea4c56e50bc4f720a80d1a700b52e8354c09b678576fae98a202351e9354effb358985814ddb83e025bcf7099e9bc SHA512 b9d67a7275c699605a9745d49b026f0f3d9461fc9ab696e136883d3d342304a07a7a019ff36cc523acb47711ccdcbc4bb293a80f190ed355a0d53db9e82f887c
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild
new file mode 100644
index 000000000000..16bae098ddea
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	elogind? ( !systemd udisks )
+	google? ( gnome-online-accounts )
+	mtp? ( udev )
+	udisks? ( udev )
+	systemd? ( !elogind udisks )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	app-crypt/gcr:=
+	>=dev-libs/glib-2.51:2
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray:= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	fuse? ( >=sys-fs/fuse-2.8.0:0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
+	google? (
+		>=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts]
+		>=net-libs/gnome-online-accounts-3.17.1:= )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:= )
+	mtp? (
+		>=dev-libs/libusb-1.0.21
+		>=media-libs/libmtp-1.1.12 )
+	nfs? ( >=net-fs/libnfs-1.9.8 )
+	policykit? (
+		sys-auth/polkit
+		sys-libs/libcap )
+	samba? ( >=net-fs/samba-4[client] )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	udev? (
+		cdda? (
+			dev-libs/libcdio:0=
+			dev-libs/libcdio-paranoia )
+		>=virtual/libgudev-147:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-16
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # origin/gnome-3-26@20180912 + elogind support (requires eautoreconf)
+)
+
+src_prepare() {
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--disable-gdu \
+		--enable-documentation \
+		--enable-gcr \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable elogind libelogind) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable gphoto2) \
+		$(use_enable http) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable mtp libusb) \
+		$(use_enable nfs) \
+		$(use_enable policykit admin) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udev gudev) \
+		$(use_enable udev) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index ba49f20fb16a..1a127b4991cf 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,4 @@
+AUX 3.26.0-glib-2.60-compat.patch 1154 BLAKE2B a513831c02906d83f93c6864d18dc176e9453ea417d22423e3823e2f2b692fa472bd5492fe6403dbbbb8e87f7010a555ba29090614b6cad2b9bd1090e72ddeda SHA512 54ba7e58820eadcfcb9e3568be09ac389274a1088d7113548c6abc534136261fa30455e701f047a547ee310234cc4fcc26c6051902f0988ea4c09c69b4b8ccd7
 DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9
-EBUILD libgnomekbd-3.26.0.ebuild 787 BLAKE2B 367e2a745e6a8127738df87127a08b9cadf19ddcacf691ebff875d3c1f7ae9fbaa0583158abfc94649d516aaca567350a7094672825b945f5395ab0f293ecd23 SHA512 90b8bd48ecd21b71f88adff154383601cf6a14fdcfafee9a35bcc1e785f733c81b456db6951051be4a07688ef66585642d0df2a3e39e8a25c2aacc2d90f7f0c8
+EBUILD libgnomekbd-3.26.0.ebuild 844 BLAKE2B b3da8f610a5c4f5c554abc10f6f3342fdee60f4b88ee09e20867f70af501bb9792bee031109f3eedfc9cd5d2e9360185526407147bfc407a2d46e52d39009032 SHA512 09e7286cfa12e556f595f3f118a69325fdc9900bede6bc6f68165f5b40bfbd8c317c3369ec47911cce4e5ebb808758de5b1c44d6bd01c345ba9dcbb1911a1edc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
new file mode 100644
index 000000000000..c6bcf66160f9
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
@@ -0,0 +1,35 @@
+From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <akitouni@gnome.org>
+Date: Tue, 18 Dec 2018 10:54:06 +0100
+Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal
+
+it conflicts with the newly added g_strv_equal in glib
+---
+ libgnomekbd/gkbd-keyboard-config.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
+index bbe6904..00dc429 100644
+--- a/libgnomekbd/gkbd-keyboard-config.c
++++ b/libgnomekbd/gkbd-keyboard-config.c
+@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = {
+  */
+ 
+ static gboolean
+-g_strv_equal (gchar ** l1, gchar ** l2)
++gkbd_strv_equal (gchar ** l1, gchar ** l2)
+ {
+ 	if (l1 == l2)
+ 		return TRUE;
+@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1,
+ 	    (kbd_config2->model != NULL) &&
+ 	    g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model))
+ 		return False;
+-	if (!g_strv_equal (kbd_config1->layouts_variants,
++	if (!gkbd_strv_equal (kbd_config1->layouts_variants,
+ 			   kbd_config2->layouts_variants))
+ 		return False;
+ 
+-- 
+2.17.0
+
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
index 9bc10e4ce687..d07c943fef68 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ccaf3ae5c9e4..5b2aea4aeb3c 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 14be2a21469e..48f5fd86eca9 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,6 +1,7 @@
 AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
+AUX gnome-color-manager-3.24.0-exiv2-0.27.patch 1179 BLAKE2B 10c0163f9a3f904dd925e3ee56c8bffa12810b691d883fd7c722ab44d5c34f03325d10d511a7df79f014c12ab5a45265bd7d8091b99804530f57637e5caf55d2 SHA512 a499ac862c6ec5090e88733ddd560c0f4d351ffacfab14f96a5534c6889ed03e8e13e643519a86aaca0a95b25a08617b0a0ab73b8714989b65350c86a3b9003a
 DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
 DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc
-EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
-EBUILD gnome-color-manager-3.30.0-r1.ebuild 1892 BLAKE2B 7f0845ab8fb49ab87a088e9f23deff36b950094423812febe0202996ce2ed1b3e7d2e6f33c3b114689e345a35958d223719448a645cbae31b2409674c9b91f89 SHA512 871d4d680471297a7d10fbe547ada0f4765289975d0d7c2c6ce6a298c0ecdfd1c6528b52b9cc075a11b895f71235a7848e11668295adb1b0987eb79913840fbc
+EBUILD gnome-color-manager-3.24.0.ebuild 1660 BLAKE2B b2e823babb1fd2533c2bf5a6249d40f6b818af3f88252c06f80fbc5249af45ea80287335d2b28ab7eabaf595a14592fb5c3ba8921ab1fccde7784c0708b1fbe8 SHA512 6b6fd6acb3e41c7f44620a2a891222c0a800196546f2b54726be597439237d315f3103614ee11fa2a7419523ececcd8239e38496358e23b1ad036a7fc17f27e9
+EBUILD gnome-color-manager-3.30.0-r1.ebuild 2014 BLAKE2B 951f55cd37da169a0bf8483a10c57d108c21a1660385d6b67cf444c61d706da41e6b5f19c031874b616d9caf0bbcb752ae560185fdae2dcc035591e9a7c8dc53 SHA512 33e46a0f5ed513e8ebc41642b97c3fb9daa9466baacfb4970a2feb06d7e07461a34f5e1d1e53c2626c9f9060faa1daf6839258bbc2dfc1758063f8c3af5c65a2
 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch
new file mode 100644
index 000000000000..00878bc26a85
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch
@@ -0,0 +1,41 @@
+Patch kindly borrowed from Mageia.
+
+https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
+
+diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
+--- a/src/gcm-helper-exiv.cpp	2018-09-04 13:50:05.000000000 +0200
++++ b/src/gcm-helper-exiv.cpp	2018-12-31 15:39:52.288495398 +0100
+@@ -19,8 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <iostream>
+ #include <iomanip>
+ 
+@@ -51,7 +50,11 @@
+ 		if (argc == 2)
+ 			filename = argv[1];
+ 		if (filename.empty())
++#if EXIV2_TEST_VERSION(0,27,0)
++			throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
++#else
+ 			throw Exiv2::Error(1, "No filename specified");
++#endif
+ 		image = Exiv2::ImageFactory::open(filename);
+ 		image->readMetadata();
+ 
+@@ -60,7 +63,11 @@
+ 		if (exifData.empty()) {
+ 			std::string error(argv[1]);
+ 			error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++			throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+ 			throw Exiv2::Error(1, error);
++#endif
+ 		}
+ 
+ 		/* try to find make, model and serial number */
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
index 441b966300cd..3ab3d64df806 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,6 +39,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
+	"${FILESDIR}"/${P}-exiv2-0.27.patch # bug 674086
+)
+
 src_configure() {
 	# Always enable tests since they are check_PROGRAMS anyway
 	# appstream does not want to be relax by default !
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
index 5f035f751268..4048b8ef3bf5 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,9 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# https://bugzilla.gnome.org/show_bug.cgi?id=796428
 	"${FILESDIR}"/3.28-remove-unwvanted-check.patch
+
+	# https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
+	"${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086
 )
 
 src_prepare() {
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 4b36215e02a5..086ebf15ac0d 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-extension-gsconnect-12.tar.gz 1034122 BLAKE2B dc9e4003532bbb500c81d2bd0d2a715f60bb5c70b6bcf3286ebd8b2219d511f51e63c93ef30b0b71ced720531c811462f3b343d9a9eaa07ef4a56a498e5c497f SHA512 3b88aa7ff6e55556a6e438376c578a007d41d266dc91f6d56dfccde217bd0ede7ed40c10b05903582d9bde392f0a375f34b1fbdfd1aae0204f46b9d7e6c246ef
-EBUILD gnome-shell-extension-gsconnect-12.ebuild 1439 BLAKE2B cc555b929f416f68ca21f16e82f4974ea87ed81e40e6a6f1d0d26d922c9019b3f1d2401ceedb43f5a740bed88908e77e1fb4a92fb220714cfb4f74ca95063447 SHA512 496a23fdb4a1f0b0f617a7b49e7e00faaf78ca06ab86fce24e387b8470f3b6b61fa9e52a1a092875334b986ac024ba33700e34059650e623391a9bf85748e9ef
+EBUILD gnome-shell-extension-gsconnect-12-r1.ebuild 1467 BLAKE2B f89f94c2a40773189c8c23e6e39bb26d3e56ad3870ffbf878fe751a9f4985fe67a237a7607615de3e5855ccc4748197c0c154cb6bd522fe91582115031022f89 SHA512 8f8aa26056806b879abee4ba26dec54c72809d8bb94fc7209dce72ce2e6eac8f3dccdc2095ea7eb4ecb809387d466aabbe15ffbb40a804275b99994371fa66fb
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild
new file mode 100644
index 000000000000..8fb81e051a80
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils meson readme.gentoo-r1
+
+DESCRIPTION="KDE Connect implementation for Gnome Shell"
+HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
+SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.48
+	dev-python/nautilus-python
+	>=gnome-base/gnome-shell-3.24
+	gnome-base/nautilus[introspection]
+	net-fs/sshfs
+	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
+	|| ( media-libs/libcanberra media-libs/gsound )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="For knowing more about how to do the setup, please visit:
+https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
+
+src_install() {
+	meson_src_install
+
+	# Rule for install is not complete, only works for install-zip
+	# target
+	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild
deleted file mode 100644
index 2dd95cd96429..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	>=gnome-base/gnome-shell-3.24
-	gnome-base/nautilus[introspection]
-	net-fs/sshfs
-	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
-	|| ( media-libs/libcanberra media-libs/gsound )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_install() {
-	meson_src_install
-
-	# Rule for install is not complete, only works for install-zip
-	# target
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index f266c22ff432..99a9b294cd92 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -6,5 +6,5 @@ AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc895240
 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
 DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece
 EBUILD libgda-5.2.4-r2.ebuild 4949 BLAKE2B 554ec6cc79bb402d73d9cc86c59a16f49d235388abd83ab085a77f75dd4f6ca9b99461220e24436059a5e0add9bdca99a9ba37c407229ee6baf43c47780cde30 SHA512 c59cbf63e1f5f8256a2b54bf3b31eebab3ae05fc90e24f7519ec9e3dc76c3380779a23c0c3501a2f2880b7972528f0948d49d53738976043a6b6754a07a6c184
-EBUILD libgda-5.2.8.ebuild 5020 BLAKE2B c5d5f7bff23e606c109e28d1902023d16f50ae10d15204b46024e00de2476e3024128aacaaae38195c3243348cb5de5f426b8da937aaa6b254fc52e918784d9b SHA512 0a8019b11978e5fed29b6e69434e883e330f7a3247ace6bf539636efe180ddd80d53dfae2140488c669cadb1984ef39da9f310f2081ed7acbf4b8aec77e38685
+EBUILD libgda-5.2.8.ebuild 5064 BLAKE2B 49382d9e5de106d987193134ea65aaa03cb9b6fae17d1b85be929111d8066e9249cbf0e4bbebcac125f3903f4e938c9f34e4234024cf8981ad4475f1e158fb81 SHA512 0424e4bccac3f59bfbef3953cac7240954987fb99c53dc8fe991b06e16fc10805c29ed215ba702ec70d59c7c4dd63b7631502ef6f41f41f8b5488f56f17e8543
 MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild b/gnome-extra/libgda/libgda-5.2.8.ebuild
index 0eb06d4b35cc..6570bb39df71 100644
--- a/gnome-extra/libgda/libgda-5.2.8.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.8.ebuild
@@ -143,6 +143,7 @@ src_configure() {
 		"$(use_with java java $JAVA_HOME)" \
 		$(use_enable json) \
 		$(use_with ldap) \
+		--with-ldap-libdir-name="$(get_libdir)" \
 		$(use_with mdb mdb /usr) \
 		$(use_with mysql mysql /usr) \
 		$(use_with oci8 oracle) \
diff --git a/header.txt b/header.txt
index 53a6d5a82a94..ceda2a6831b7 100644
--- a/header.txt
+++ b/header.txt
@@ -1,3 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index ff59be4f2dd0..412ae8cf2806 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 228b0351673c..2ce03c36a5f7 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-18.08.3.tar.xz 334940 BLAKE2B cb72c25a975b8934759ec0690d910ebf8592da0e304b888f270402103e93131dd7e35153f2f16e10641071b2c9d90652291eddf3c0203cd871369a79cd8b2a27 SHA512 809af85d7b2c5defa5fbb4e846008300e431a5a4c55844656256384b52db1f4e711b51c22fd3e653165b1d5298b43e86dba111f688ff4158f64778b11f32786d
-DIST akonadi-calendar-18.12.0.tar.xz 333476 BLAKE2B ad4f8639bbb5cb1c3365a357f04781e6383d41a28ecbbb5c32db6c82ca09df0847815431e0b1866c38ef2d2d23d4d0d267126473d96829662ab29f5c012360fc SHA512 3c4bd2ee46696a0ba3c84ad49bf5a57d6d6f3c0d8df07c439925eeb8ef39c4e903f7fa41262be1d9545ce9af0b289865021182a2b538d9eae99fb78826243e0c
+DIST akonadi-calendar-18.12.1.tar.xz 333400 BLAKE2B 6725a4432f9353414b083b5257dd5abdc4b9f7bd17a9967031bccc3f19bdbaa2577a1dba22060673e0302ed3a8a97e7e44ac41a5377123c2dd3b0fa2de9abca5 SHA512 83e3b17c39d1e111395709b3c27d5aadef2f9a811262e931c39eb111c29395afc0f012930279daa7ebf348a94caf2ca76b160d81630eff40e5551bd715ba6558
 EBUILD akonadi-calendar-18.08.3.ebuild 1152 BLAKE2B 5a2e26fb499e7a15a1eb8dcf5ad34dc8898451270a0f40ca130d9f510ab7e3ec3ab15e92daacc5965e9f83c5a3073844d001e7c3bee49e54f9d206a2c4b17235 SHA512 08fa09fc5ca863496af1fcf08680372b32023f178269e83d1b7d41a3cc8fcbdf40241c233de0a2dd5eac0eab0e7d6ad579e060bc90849790db469ad90199176a
-EBUILD akonadi-calendar-18.12.0.ebuild 1154 BLAKE2B 26cc1d4f844fa5662260aa5d71d402ddbdc850b6725a93836a566a30870f6e989b92677659723e53fb736f9b8825224ba70353f3b0cc9729899bd4ba6bfbafa2 SHA512 02206b95c7ea95f55dd9c1e9fd66318f352ec4fefc4c6a94f827f418ff1e1a2c05b183f912e052b57c60218d314aaede3ed96f3271e531c6406c217fe1adfb01
+EBUILD akonadi-calendar-18.12.1.ebuild 1154 BLAKE2B 4a0106f68b886d1e12ee0573b233e64df6a90416a732b506d350df19572930c7264d7544cbba6137584511c6af20d19a8f46af6625394e100146ddd2e67c0964 SHA512 0610c28237fd0304723a40fc1a2fdda8fa70cd93206fa5450b0a9ec59130030723f59714e28246abd4c96ba677570c765a395e36582e00b598708349b1c0eeee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.0.ebuild
deleted file mode 100644
index 4bef336b1cb4..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.1.ebuild
new file mode 100644
index 000000000000..511ab9c1bfdf
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 5a8e88dc4f40..6407c5691ab2 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-18.08.3.tar.xz 390352 BLAKE2B 9e0cd84491cf55c92dc16944a0d0a174ab62a4e00c725ca929adc96fe29acd1f17b06079a6b944c3319c8a28d4f39de9712e25f1a1ea9e9479cc6d5f14467fe9 SHA512 8a0c524b896b204824f6d054c00eb07f1e650569bb2635b3a714576fae9ebb1b417d967193701ce1b3ea44f3d11cb336456174b26a6e14ee35adc9b78ab93f1e
-DIST akonadi-contacts-18.12.0.tar.xz 390460 BLAKE2B 32f5f36ec26ca2dfb9982587f91a0c76a2e3d484c06e86543028a3c640c5dadf8cc6cba5883e3ad1df9fd837614cd1f1ca086766472338053fc7a15b7e943d96 SHA512 888b14521a4e40bf68178847b4410638893a4b513088fb1fd6f7a0c28293430289a39b2c2893aed0b2200694e90addf1f6f9ddd229cd7af46b94dcb256456535
+DIST akonadi-contacts-18.12.1.tar.xz 390432 BLAKE2B 65b3b5a0dee835aeb3b927bf48c0730891ff81f44476dc8ea450be91bf67be6452053a7bc43dfe9858f8875314ea6f7eb1897a58abcf94d3ae54dd223373454b SHA512 bf35b2dfb97518392f82309c6bdb07f295dabd9daa718fd10a81779a90cda2efb6c6572c4809e8f1628404940346990457d278f3a00f46e74fdaf705b0e5f410
 EBUILD akonadi-contacts-18.08.3.ebuild 1058 BLAKE2B 3072fb81ff7e2a85d98d422f7559809773b46ab35fc0b7c91d0c3f5ab2c31951870bf4de4dd997b6ae5fdb6f2f05c4c258804d371aca55a9293110b743316f7e SHA512 4e804fc2aedc708439f0037ab398fcf8f96f722e10e404073ca5125af906c53308343c44d70eceacccff38d96c3872b50454b05fe57e248fa7d693435080b547
-EBUILD akonadi-contacts-18.12.0.ebuild 1060 BLAKE2B 515efe61d74f6a9979b657015761aa6b73337ea0709eaecf7677a2d506d2e502cda991ecd1dd89fd67a47eed0f7450a4c7f4fc348f61a428de0a866214f20679 SHA512 43effded22ba5ff3565f6c47cb47f66b8fd4b082f683b4c956d2c3ae51e9877bd7a413e9ac1482597a4c7608903c536c21c3ba8395b2a0dfa27e2b48ec7fe639
+EBUILD akonadi-contacts-18.12.1.ebuild 1060 BLAKE2B 702db73738be5cbd8c98b18931739bcd34d9416ecce8aebb353727b9d51de8491aa3f083ba9b50ca17fe51b32b26f4224c87fb98d0c2d54b2507d53ac49769a2 SHA512 da7cdafd52b245d15432713172261f197432ac1e44d87b025b1c1e4dbe997d88d92aa76b1bb91afbb7c044132da59bf3cc78b65d29822fb7e3bfc5a2c50e02ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.0.ebuild
deleted file mode 100644
index c0e5111519df..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(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 kiconthemes)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.12.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.1.ebuild
new file mode 100644
index 000000000000..209022d9be54
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for akonadi contact integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(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 kiconthemes)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 3feaf63c0b5b..1bdaf3e68530 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-18.08.3.tar.xz 439408 BLAKE2B f77a7ecb7c16dca3999c15fab7a56677b780d9441a746c942b97a3e22d8a296c025dbe0de303b44fbdb748bab64bdfed9f345fb7ff9f87c6856b7cc6c9ac31cc SHA512 603443051fc35e0347ab1f9c40d9f411ae08baca28dda45be76acf6af3cd82bedcbc68d030f88d5aea36df3af11c705e1b0ffa73cf5e81be29f0b614bcf42670
-DIST akonadi-import-wizard-18.12.0.tar.xz 439196 BLAKE2B cb60cfde396d1de1c9e641725eced239bdef3763852e455dee32001f4c4e4415c826656122270af272c8fa0e7008a8bb3159708e202b90affebe707776206967 SHA512 9681e4bd3be844735d059d9645f0584c5c5a37df864b007ae9d458e10c4e5b5a6715332d9a6333dd3678582b1f1771a65998c1816711337bd8cc4463ce9b89a4
+DIST akonadi-import-wizard-18.12.1.tar.xz 438996 BLAKE2B 78072d7c5978cf5d13562ed3687cbe52575827ac59e4529582c8c7e270f35c3634112649c04706c82a4d3788a9aab86f526bb42c754c10d9bece981ce81e469f SHA512 dc8781c2092dad92019d072815926f809f166752c19c951ff7ca196fcc91700b13acfd609cbd68156b13e001b1282a3ba786967e927194e4c626864b15ec45f0
 EBUILD akonadi-import-wizard-18.08.3.ebuild 1089 BLAKE2B b874df23cb23ce80fca984ab385c68e36255fa857dbca8ca7d6d5f68042a0a2dd197deac5a4dea744cc8f1f997fcb280d2d5c8424faee51683329e45d4814709 SHA512 99cbc879dcd86c9987d806f4b275b2a023ca338f321815d16f4e30678d29f28e637865bf61c7485d35153fcd5b4e1c91a88d1057707cbac1a57686611d577d17
-EBUILD akonadi-import-wizard-18.12.0.ebuild 1091 BLAKE2B 7b7bc64204263c682ccf02bc601956f8f41a5c0812e9582d21e687a7b22563a5de341f18c5f8a4893ab957d89919da8ab85a2f75c8b3a33aa982eeb0e0298ab7 SHA512 8405d7f8ebb6cd9862688b79c82873938343c09d8906652dd1c529e67f8b3164f3a19683a0946bdca9f9444f5d55071ccec062f2d64d63fa77a49f965eae5600
+EBUILD akonadi-import-wizard-18.12.1.ebuild 1091 BLAKE2B 6e2779c306e4272ea35a0c303a99c1076a8c90a83a2acc3e7a1fec966418e76850561228291f44f0c592b58c0940788efa3c6d6ef1818e7870ac27dd078c951f SHA512 cca8eb1f71305ab6ee3a1041d9c88e718df73c0a9a930fd92b34bafc3061d34e4d60870cd27f24a49f2b11a4fc3a30323bea24727e9937b45daa68c3ac070b55
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.0.ebuild
deleted file mode 100644
index c2952e662b61..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.1.ebuild
new file mode 100644
index 000000000000..9589f8630168
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 3c742a121762..3d5e304de2ae 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-18.08.3.tar.xz 136796 BLAKE2B 98209c219682ce25a93c562e6f45dfd75c9e0b21f38e9085db51199ed9690f7b621be4aba56c9b13c36cbf791a86f705aa342ea2bfc6277315ee009b8f076e0a SHA512 0db5e96975bf3f295bb98aa5352edaa66fd8da725db2d246c9816362953085f528ee1792e1a1b1cb782d2a6b4aeb654e0ff641a067d0d92c2da9d85769ed6d32
-DIST akonadi-mime-18.12.0.tar.xz 136556 BLAKE2B 45cf78b2039430faa7b6b3c9def9dca157aacbd9befecb941b5096dd5a109ce903171d9f4b7cc67dd4b3150d7131f238bfe010b021499c7b6c32c094dead7d61 SHA512 4b4d0ca51c20ca56016d8a2f4de04cc5091ae7ee41bf623c5efd72e67e2adb80f5436e35e3e1d0fec831236797bb87ff2c0103dc36715aac3586c395f93b2548
+DIST akonadi-mime-18.12.1.tar.xz 136520 BLAKE2B 6eb8c5ed36bce03bbbbc59ac7bdd1677cd14a9dc057e0c6bbb01324aa508c82d2bac901cfbe73652af450f9b8d68f79064279624119e2c07e5fc1a5fcc1113e7 SHA512 8603227e5aa0dc67600d0ba2d445606f30b726e1f22eb7484387216e7c45cfdd7007fa76daf049bce811a6ed0945e56e7e66b3ba0e5c3383225ef9309894b364
 EBUILD akonadi-mime-18.08.3.ebuild 887 BLAKE2B 13918865cf80b567586cabc31948ae328e081369f40de69b10c4d7cc8badd011607456722cad304833fee66d05ad460247766210d3bdff828357fa78545d36d5 SHA512 f79a651b139b712f744dddec6efa517f1f700e5aa4a0fb6f8b351c807621a097ed23a6f2e8697a93c504c209391b00032c3a3b833effb27f63b7c94d1a4fc6b7
-EBUILD akonadi-mime-18.12.0.ebuild 889 BLAKE2B ce7502540632a199ed05e749101af526b6efc4acc1ac58b0e63259f5bfa7d2d19d3668772bd35f3a92417126e9aff7ada18b23a89334aa0410e9618b49fd7b49 SHA512 319da26441961be7cdb0773de9a2573b0b5dcb4a5c913d3486ec546b932ea1eee68178ab04bcc10acdd67793aa1a9ec6e05982926f61ca23f61421c04437aa53
+EBUILD akonadi-mime-18.12.1.ebuild 889 BLAKE2B b8005ebccd37687e8c43867cf31f9e24019d1455712606767c744839d477cbb4aeedd656cc10d849a5157cb52bf77eb19fe3f88d9aafedc091302066c3adbf80 SHA512 40142fad5655fecee495790a16358d043f440cdd1da8d89d93e25a973639fa64f92ae1e8420cac129d25f505318273dcafb0e7b032e5f366120be0346d927359
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.12.0.ebuild
deleted file mode 100644
index 7c6913370b57..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.12.1.ebuild
new file mode 100644
index 000000000000..4c2e5243a96a
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi mime types"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index aac0210580a2..ddf7c4fa570f 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-18.08.3.tar.xz 24612 BLAKE2B 09bc197ae20d5a7e32c1325e2a21c250a7792829e7f355f6c9a6500ff9f8ef25d01fc8899f57a6499aeca75d116340d1087c323271275bfaebf030960ae293a2 SHA512 a986e64c4706959060d4c7caa897f9fbfbae262cdb4ce2aa687172f136ddeb500eb9a960509b1f573a44beb8f7e25d63075267633cdae7000493fd40c716a6da
-DIST akonadi-notes-18.12.0.tar.xz 24472 BLAKE2B d89b2e0a5a5eef866f30c87c482027d62803c3009a8ab7fc80a360791210515cf0a247f8e293641dc05bd72e68f010628a144e0497e6588271010e47ecf0da5b SHA512 2739fcbc75dacb0fafdbf52f9163cb9de81c62ab9deabbd8d011b0da15565223954a75fa17e03c65a943891f985585fcf8bc71db621eae3603837800aff82969
+DIST akonadi-notes-18.12.1.tar.xz 24512 BLAKE2B b8dde57f0f395532a08be6626023c1367f8cfe930fc7c09cdd32f49f771e6a8f11ae57ebb4b91d5b59a6236c5b3987e741644b7ba672d1ef11e4a420b00f2172 SHA512 2eccc58eea123fb6e621b5474d43bba48b2306077e9236e5213f45639b4a38e8918248057ccc2c3c141a3af2a14a67020d247cb213d169c9501d24d4c116a38f
 EBUILD akonadi-notes-18.08.3.ebuild 562 BLAKE2B a7da47b4c1ba282d181191df9c7e2ee98b516e4eeec553def1463ede56ba6d9071e32aa920d86c6ca11d568091ecb980894e701a2dbb6ca08984c86515dddde7 SHA512 8c700f186c11330c407cf6e0b3bd09be26aed0827a77fd2c56dc5d9bc248148b0ad4833d31b282811ef66df77131e4ed6a3c18d3b29fac70451faf08cf56ab61
-EBUILD akonadi-notes-18.12.0.ebuild 564 BLAKE2B 12494f9f224db7dbcee86f89f4e176884dfd4ac4fd41658c9c2d2539635bfb44649fa02550277883844070ab87eba252f783b2fa10c54ab592432f351974e478 SHA512 1c7d060be8957f01649d689123721d1e7f1cd5838c7335997876a04e116e4a56d946d3f11663f90027557a68ff50a7a1756ad10d81cf8fb3b6124e8dafdf1dc2
+EBUILD akonadi-notes-18.12.1.ebuild 564 BLAKE2B c9c734bae23dfc9ca72b5a90fb2dfb4a6fbbaddeae2094ff0f554f549213c502fa578fd087783805f68fa35ebb57c0bfd1e0e5361b74ed862a2f3638a631582c SHA512 45190ec4f1534bdfcaee586d31d088b766327e76165c43f27552d3d0244f66a3a5a41c7d5ac1fd7b91f7e1a32b1f2f1c570fbc05689eb794fa95f9a5be3ae2f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.12.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.12.0.ebuild
deleted file mode 100644
index a0fce16b3b97..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-18.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep akonadi)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.12.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.12.1.ebuild
new file mode 100644
index 000000000000..0fe0a26d5dc0
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi notes integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep akonadi)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 4b05baf89a68..867888af7a48 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-search-18.12.0-cmake.patch 2096 BLAKE2B 6659077a290eaa582a2eb35df4a02d54d07c700baa833a952e6f59e01a0398fa0caf4d6fe62601683d7f0e7230ab448c67af1b5657a284262431f42bce50fd67 SHA512 02e8394cfaa1d4117a8b7e990779d54335741746cccba06dfd57ea77d2e674cf3b2604adb89198c94e762ed3f36165ba9f009cf737fc0b36c10a6b9177ece205
 DIST akonadi-search-18.08.3.tar.xz 82856 BLAKE2B 9d33e95aedb2b1146b9482d249ef581ab5c02985528de0fb042cbb9e8ace22e0b18f9315dbf8300593e422a5cd1d917fbc7e5e4109727020116acd8c9711b7e3 SHA512 c5808b09527008f73166333833ceec29c269b96f3a1efd47f2f56e8e3e8054cae5aaff6f5c9a58d0311df8f6c5da7f92c38333becb13deeb40ff4a9c925cf670
-DIST akonadi-search-18.12.0.tar.xz 82816 BLAKE2B 3d59125598a1a100b0416dba827126c8f921a69d68ac8fabec644d80f0f1eec4ec4fb156d528e1491c9c7ab498b7b80a355abe1eb394b3df11455f46dfe8da7f SHA512 49c6aab6f55eb34debb482307f95d422e7706ee257ddf90684c77ea4f45767282325d05d3284f1336289913f09dbeaa1acc26a6f8d92e303ced7d62bef74ee9c
+DIST akonadi-search-18.12.1.tar.xz 82788 BLAKE2B 49cf50e98a92cdf8add58de3fdd2ded9ff64a139a5268d7657706ecfa5c418af6fe2d6e9dc292e18b6cc96da00788e9a38313c7e9c5d08d945a47872edc55ca7 SHA512 4f378b54562c8372cb9d80e4028e774874a6f541f81be83f902d508beacac893a869e27b5e3fc7ccf31b518c8fc2cff1c2264500872347ead2f6b711fa0d2e18
 EBUILD akonadi-search-18.08.3.ebuild 1070 BLAKE2B db59cbd862c8e83e69989f4dd523a219a7a7382e7dfcb36ef1a21759a949c3822dd6d51c737c679644373d5cd685886363293f1c49a2515e1c6bdf7bf1d2813d SHA512 4f02e14d2a27a250027d9a2e504bd685839d0b23a6504b46e66bc1f0032ec8175e9b6cddf9349036d0deb2273266a2e36c7c900ab162aa10288dec4044dcd199
-EBUILD akonadi-search-18.12.0.ebuild 1116 BLAKE2B aa8757f82d261f09d645b300f34fb753451fc1458a12e163abc5d61b0552698c743cee34bbe88ebc96e3fea7dd19c92df851e2efca5d015f9c21dbc6ea63f734 SHA512 1d978fb1e70708725f3d3a246ef733edee81a68f3fc5aeff4d7b61e06a2ad974941bc5352b46dabea264d58003732e46662bd758a0160286bd3613b126c1beeb
+EBUILD akonadi-search-18.12.1.ebuild 1125 BLAKE2B 250f1eec408941700d2837ef93e9d706c05005fa09724511ce90cd84a26139221a982298e976ea2455a03cf24ee2fe2ad06ce6b56f277b9c38b57edc2f760d6b SHA512 2102cdef6c9499353fb2fae9c0917b26c7eeaae126dcc184a32101c1440a9fe46d9832f52cdf7c8342bbdce0faf9ca71d3f0b8ca65678081c8511327a0eb8f57
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild
deleted file mode 100644
index 72104375caac..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.1.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.1.ebuild
new file mode 100644
index 000000000000..f698d143cc04
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/xapian-1.3:=[chert]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.0-cmake.patch" )
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index fbe705776107..dbf3dc37e144 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-18.08.3.tar.xz 1538188 BLAKE2B 333c86802418f86f2336408d1e63ce16a9fc50267f7d5cb39f177eb6aab1ddc8479fa9384f323f8aad0ac4157d8abfe8de237bcc6bd058b19fe596442c7f20e1 SHA512 ba883902ad83c989bb480712c0b3871e683307ecb121f1d7b3e433b9211056cda209d9640a7bae520fb4b6611950863180b879269797a606af2ac25ae4f24cc0
-DIST akonadi-18.12.0.tar.xz 1552448 BLAKE2B 6c43baecee56ca5131f6bf58e9b6103051316f946a0d7609c5c1a99949ff86caa5b175be1e17de3a466119da92c133c5eae11449ae91c186d3297601714f2938 SHA512 1a37fe66acfe9001ec84849f0abd3a54b38c21421cbec537f86b0af0b30c2120eca8236afeb0d64e795bdfc4f116c6cafb1c2edd92d8ec6208ea5cc2ca642e07
-EBUILD akonadi-18.08.3.ebuild 2910 BLAKE2B 143b2567b8aac042106d3205c56428de0e861999c33e664f5e336aa2bda86ff613fdf51bb5e1535a8e9298caac54d3858e3ace678672a8a5807a075892f4938d SHA512 303dfa503615e1d3e83d66f113d485de8efdd4a1f882f60bc476beb416e2e1c8a55ebcd5383ddb31ce2172352aa7d8f81df8dca6d91eaef97ed8d291331e19c1
-EBUILD akonadi-18.12.0.ebuild 2912 BLAKE2B 39f6a54ccc264bf450deaf74063aea4b90efcfde077d9910910ba9ff987e40276c0187750088c3b382f508bd6d6c9bfa8db7b9addc2e00209a3b07b4386d3203 SHA512 64759f5f407f95356387d034adcba3968873697752127281fd93af99aa93ae4713f2e30048b0042737d7e96b40c47a47f41e1db4febc94d4593c58c6fbcac6e4
+DIST akonadi-18.12.1.tar.xz 1552724 BLAKE2B 7e47c48ecbc25b450df9cffabb6b019003f03a66c5fc214db0d183085b9dd9fbbd8443fb6906837e85d3e554a0d603f8e657db8ddf6bb5795a055f9f51b84aac SHA512 9d20f4b283c00f20a0b3c1a40041bb5b1adff6197fef5d6bc12ff7ea013de2809bafa3ffac0f70494b659e5972bc00f73e7df9d7d3d3157deabbebad5811c5ec
+EBUILD akonadi-18.08.3-r1.ebuild 2952 BLAKE2B 48d6a61ce0246bbec6d67c47a9ae9e77dc395b85660098033ff49c7ee63d5458547233521df0613fac15af791aedc31ad489c9e0c4cfce69e6ae8de1d8badc85 SHA512 bc09fc8a03bcc0ac5ac22a6ee72283ba852167feba801b27b91b40b1de1bc1c962d73ebe602197dbd4fdd4e0e1a422da27428e7aaff7c738d900cd598bb4bc40
+EBUILD akonadi-18.12.1.ebuild 2975 BLAKE2B 3e125b389874d899dfadbf756ff9dc31b11e9c2b522b972e6d3f18c5fa2f76a9b38a917d691107425357de4c94ee79d3cf40cc6efb8112691e0fa388107cb853 SHA512 3e9aae737e1a8d70aa54987b52a69fd52e4781d7953e7f482163c68ddde64e5faf54e083f5808df5bdfe5191eab9235ace72e049e19f936963f4c1b28a4a38ac
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild b/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild
new file mode 100644
index 000000000000..b138b2cd70e1
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-18.08.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="amd64 ~arm x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+COMMON_DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(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 qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? (
+		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		dev-db/sqlite:3
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-17.11.80
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadi/akonadi-18.08.3.ebuild b/kde-apps/akonadi/akonadi-18.08.3.ebuild
deleted file mode 100644
index 6d193b074cd8..000000000000
--- a/kde-apps/akonadi/akonadi-18.08.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-KEYWORDS="amd64 ~arm x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(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 qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	kde5_src_install
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-18.12.0.ebuild b/kde-apps/akonadi/akonadi-18.12.0.ebuild
deleted file mode 100644
index 27df4a99621a..000000000000
--- a/kde-apps/akonadi/akonadi-18.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-KEYWORDS="~amd64 ~arm ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(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 qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake-utils_use_find_package xml LibXml2)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	kde5_src_install
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild b/kde-apps/akonadi/akonadi-18.12.1.ebuild
new file mode 100644
index 000000000000..2702be779843
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-18.12.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+COMMON_DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(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 qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? (
+		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		dev-db/sqlite:3
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/akonadi:4
+	!<kde-apps/kapptemplate-17.11.80
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 4195f5db2791..ff2d1317d3fb 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-18.08.3.tar.xz 193796 BLAKE2B ad59e5b0ae87a3fa037c9e82280c0cab44ccf78b9a52b391fdf2ce2bd6853d6c92558f839f4fe5f25d138916fc78b3f84b2a800b1fddeabbf6075c587c476d42 SHA512 73080055011030da4a56b7d4e20b96539913ccbae9fa01146a21cee343c9c9e87a702671f89bb1e09b83ce345805be521f7c9ca17c20c07717b4e87c805dee55
-DIST akonadiconsole-18.12.0.tar.xz 193828 BLAKE2B b74fe1f4c362e81a42b230c7af35fa98ce469f2c0098fab924171ad21a8461b9e9117f777e01406912d4c0303b7dfbf2d7f21acef459e3fb8c35ccf07a8efe73 SHA512 bc150f5132216be0af09afb624d3f026febfbaed3fe0c353d3b5ead6f8c1d77e1cb44bbe77bb4a9b5d526091637f461f9661447f9a2d804526ab6f1d9ba31dab
+DIST akonadiconsole-18.12.1.tar.xz 193828 BLAKE2B ebb7aceeff54159491a4509df6a3ac03f3c972483146d1e1c04ad761ab640d265387f86ee62215cf73430e89f9e5d3ab05a3c3928f1e73cc23e0f5f56ad73c19 SHA512 d12730c279c79c1447d79544dd08b6f7211e6513a859915a65f911c5a23760c92867a1034d8c19e2625bfcfebe2c1051e964b2c67fda7214cf772ff54f5e594c
 EBUILD akonadiconsole-18.08.3.ebuild 1221 BLAKE2B 606a9b3851a4915ed72f4ed4b8bf0f0d872be6f1dad08f631c47daf154ba03138c385bacd2df48fc570e50e3c691ef649b7d4927a7c911acf6f905ea201b8ce7 SHA512 773246990be75ec4443c7ed4d0ea822d33ac922196bb27d813e4a70da59d2e49fb65148c35a9eaf53e634b74361e13d3ae272f1541dd98553367677bbeccbdbf
-EBUILD akonadiconsole-18.12.0.ebuild 1223 BLAKE2B 7ab08c5e23efd9b67af82e25e56759b3e17dab7f41377fa3a330484e0cdf90ae58a391f3e531b2d7b5e811abcba2fdad35e3464824b90796832b41975fcb1ade SHA512 8160c02d1043ba7a1f1cbce083ce81a2a4223c0d366f396e259aba23c48c3e19b5a3326cab6af68f3629afa5beed82f08c392ecabad0db4a8f0dffbc554c10ab
+EBUILD akonadiconsole-18.12.1.ebuild 1223 BLAKE2B a99959028f4b5e7572bbd8343e0ae53c61fd8da87f5c59900c3e9a2355def11ea7b72f7168775321ba215020888696b39f9bb0cfc72b89736e3b87d2767548ba SHA512 6fc61ba4570064c43f6c22fb0c688e261f8e9c923ad1f2aeebdd638702c9f00d5585266bb60e35dd45623e4554d51863e105b4f5b4abf0f6d1f8b3277fb9a560
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.12.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.12.0.ebuild
deleted file mode 100644
index 5f0f8a8085a9..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-18.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(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 kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.12.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.12.1.ebuild
new file mode 100644
index 000000000000..f35124d9312e
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(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 kio)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 358ba71ec62e..c20aedd04286 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,7 +1,7 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
 AUX akregator-18.12.0-qt-5.11-crashfix.patch 2918 BLAKE2B c2fac1204d75b46cd4eeda1cbce77c3f167fb06ce0406817ba5c41a173c5d1fd0440755a51903793598c1324b00951f139ffcf8b37dc5edf8fed37de97fa93d9 SHA512 135b67de7c97aa31537553aea2c90aafb02d48427c784e74de1d01513c4e584e94f26923b9950f4bb537fa3468904978f7e334a5a9375d314abdaa5e0239d932
 DIST akregator-18.08.3.tar.xz 2254188 BLAKE2B 42215f5d43490d6cf95808d970ee66d14acdd29b62fb8c575587741ffbaf970b18f1bc67937385d469e39da78a86a1d22b8adb383d7ccb509873d5b0b61b969b SHA512 1033356de9ad97892efe875dd79501d9588f06b24c1ebf86e235851b522878bf46b93dfe02c9d5c08fbd4934bbe65dec9bc20201826fdcc3ed9e1f9b3ea4cdd4
-DIST akregator-18.12.0.tar.xz 2189036 BLAKE2B 2b48bce3cc65a0d9a34697f982906cd91a1cb4320a8669dc6453531490de90bae642f4c4bb882b84cdafbdfb0ef2d03e52207e777213ef75153913ed91a085d8 SHA512 b94b7893a5e741848179b7048b21080512be3d7ea0342e870ca413e7f8313a3687e97afda5b20f36ef5ae0ea332fadec294139d9dfd8030dd230b9f0efdaafe2
+DIST akregator-18.12.1.tar.xz 2189848 BLAKE2B 99ccd3e7ec7b834e4186eef2be0af65a9a430f013741c8c1a9a14cdd9c760378c8fa736a63b71fae840bcad9d62b407bca39f25f628ba2b63e82c1b36a9581f2 SHA512 c64d492490c2e2c57b6aeabc67a29cfae54b8804ad236c38aecc05fe0578f9dcb53c7411c2c1cbded556f836b70b1dad99dee86d09e96e87de21eee1d019367f
 EBUILD akregator-18.08.3.ebuild 1494 BLAKE2B bcf2cbd9ad2f7814d17293f44e8e2d6de049844a2360178e46bbd6d861913b163915e574caa6059ddcff29ae81e87fcf127c8fa68f39f7a1c1885d07d74c08f1 SHA512 c37f3316b460efb72a1ba1135c5aea30b4d36beb4d3431e2315ee4e66e908aa5d482b075089abc010e330a847c1d69959acf1d76c64a6a2a4d617bf2fb302b6c
-EBUILD akregator-18.12.0-r1.ebuild 1495 BLAKE2B a4f407b36370d95d33407d894a240c2fa1254e67d20fc1d4128d3c53557088eb623bbeab27e7fd5aecb53719193ddd6296aa1334041eb1c2afe05be1bf58879a SHA512 ddaabdc813be7e4aacc99be8f30ea621730edb65923a5144f0a9c4876f8688fb8006f21c5c126bb2825903645aff0133a440b600aaf869ed319f884ce487607c
+EBUILD akregator-18.12.1.ebuild 1463 BLAKE2B 5256d23f17441dd35eed033e9bd5e23fe9cede6ad0c13871b4ae12052f3262ad9e1e873d585451d3ff2c58449711281f289c4d851c5fad13baf1f068db83f296 SHA512 1422e8c5d949aec3c2a2d8de8de7d9f48d94574f93cfbc10fa38dfad6724bd24773f37c746575f927583c20df194004d544bda0f88c4159790760b8a4427ab79
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-18.12.0-r1.ebuild b/kde-apps/akregator/akregator-18.12.0-r1.ebuild
deleted file mode 100644
index d1132436997b..000000000000
--- a/kde-apps/akregator/akregator-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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_frameworks_dep syndication)
-	$(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_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}-qt-5.11-crashfix.patch" )
diff --git a/kde-apps/akregator/akregator-18.12.1.ebuild b/kde-apps/akregator/akregator-18.12.1.ebuild
new file mode 100644
index 000000000000..2eaee653eef6
--- /dev/null
+++ b/kde-apps/akregator/akregator-18.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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_frameworks_dep syndication)
+	$(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_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/akregator:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 364fdccfb10a..a70c54a19458 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-18.08.3.tar.xz 332156 BLAKE2B 6b87393b53e0abe860b218711eab4331efe3dc5b14850c438b6817ef4cfcf097c40027b558e7946dc5c0536e66d76a3a7d83a974e99e2f319bfdc39c4148ca29 SHA512 d511878b34ce8c84a9b637bd095f89f274c13d9bf5f38c5ae9162b576e3639affa4d1c66b30cce403b4d8852705df040c8ad27a8163a4942d420321f43fd8a18
-DIST analitza-18.12.0.tar.xz 331900 BLAKE2B 3f638a596e96a840a7253de5f624959d8a728f1c17f0a991649aedadc525586e28df7d1a3a7705ba4cd740be7a64f4df74d9db69a02e6108fb76c6490e199cb1 SHA512 552f391db2482cf3698d6087721ad399db14a86412eb607278112e36b0c6c5770daae34282aaae3e70ca48ea03d600a4bb42f46df75b6302407cf38a89684f75
+DIST analitza-18.12.1.tar.xz 331988 BLAKE2B 95ffd85b4ef3cefeb194cdbf4d2c2cc881803481cec264d9789cc6be55e2ac6632628a81b074ba0da3e0d0e2ca26036761486c8412965a66314d7f41c6b94212 SHA512 ae308f8a88198107e159e23ed8c825ef28ffd9486e2dcc7700dce8f66d8bb0e49e392305980720d22a511d5690b62df146fd59b8bbfe7c8b4e83cd32f8a27adb
 EBUILD analitza-18.08.3.ebuild 809 BLAKE2B b40dc166e172592dfb4d1afcc58974bc4c70ca37ac396582fe67e0fd9ae8d59f5ce96044d35f80876894996cd8cc673978fbc3f8a79949b9c3ce8989c0137e35 SHA512 34c7288f71def406a42f8d83457d215342554637fa78976315f29c693e1b886b16110583adc4b22ba08b728873c7c096980a98c3cb3e4ec0ce3bcb62f95cffe6
-EBUILD analitza-18.12.0.ebuild 811 BLAKE2B f49dea4e0561473c161de71d3130d95a9f7364acbb23d96bfc2c9cb479c60767ce8756a9e6251a8da33cdc87a112b91a45d722b6e81277c5e69f865d2d89285c SHA512 1e360d8f97c9c750bfece28bad906b24db42fe5ac87a30c6879b8a90211dfe920d663221fc329ed2ac686884ef2f9a6c3004a0e16e1c1f518a40c8b7dfdb8119
+EBUILD analitza-18.12.1.ebuild 811 BLAKE2B c80ca0ebe179019adb16e908edc72a13d8d572f20edf90e8f994430a61e7d2cdbd1d85f8d99ab4efc546358d58650a8f10a60d8d567213d571ff1576fb1c7476 SHA512 370a0ea3e16dc8ebf808b4ef7edbe8f4e1f228fe403cab1ffee792f17577afe6e71af9b056fa123250318c9730bf15bcf54cdd86e28d62488b897be14f4067dd
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-18.12.0.ebuild b/kde-apps/analitza/analitza-18.12.0.ebuild
deleted file mode 100644
index 9abbdf4500fb..000000000000
--- a/kde-apps/analitza/analitza-18.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="~amd64 ~x86"
-IUSE="eigen nls"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	eigen? ( dev-cpp/eigen:3 )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -i \
-			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
-			analitzaplot/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/analitza/analitza-18.12.1.ebuild b/kde-apps/analitza/analitza-18.12.1.ebuild
new file mode 100644
index 000000000000..b47de4e68f66
--- /dev/null
+++ b/kde-apps/analitza/analitza-18.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE library for mathematical features"
+KEYWORDS="~amd64 ~x86"
+IUSE="eigen nls"
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	eigen? ( dev-cpp/eigen:3 )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -i \
+			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
+			analitzaplot/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eigen Eigen3)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index be05c92b94cd..d92da898a407 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-18.08.3.tar.xz 2580200 BLAKE2B 7ecfcc542d25c0a6ba8639e4a5cd353358d5188077ca309c6fe6dc07288c071083ff7a025d71d489d3fed412c63d69f33d480084afbd015b6c45b64cf08a3286 SHA512 56ec9a592cc0862dfe39dbef424b1fb09e8d32050448558c402b864756e00ba402e9fdec7159e3bd5b7013217f6cf1b33cdd4b0d663a11b8bfe5c4c76535f820
-DIST ark-18.12.0.tar.xz 2580244 BLAKE2B 79f1290ca4dcc40f9b34a838d4fc0165f8d7eb69ed3cf54ffd517b59df5e2df6dc2c627ff0a17db67fb34275638f9d808be512e0faafd89c814c82f154df0989 SHA512 015ae8c9fa8e955c627ff206e9d946ee9f572735f8e05a2a428a029811594eebb5f6354320060b4eca15c7e51d08bea33f8da5ddc8ac4a79fa6901f4b2b597c2
+DIST ark-18.12.1.tar.xz 2580288 BLAKE2B 0108d56b3a140cc405688202e412e0e61c1153a16df1bd5455f53197fa6e5f6a8147115d1f26bd06524e77237bd4ed201a8d1155a559dc46440c6827bf640e62 SHA512 64fe8e3a300c1ff0d192c5366e1ba0f7916abd2cdb7df8f7953eff266d76462d95794d801e9d08053f53d0ca4a6406f6c7695a5ab1a982f3b6205c4e1fe59d28
 EBUILD ark-18.08.3.ebuild 1939 BLAKE2B 2d29d45cd0641f924464fd7114d07efba9e7ee1f8263c1d51acfe9d9eb4a60524902e9b27d9957b59ecad1b0ed7c83203eaa0d774cbeca614fa0ec032dab32ca SHA512 2b264044f2c39f3719f62279a83723ecb768bc044c9ecc4aab0a31b1e97cf4da3f7e9f1c404c698d12c73f80399b3cb0a3fecc09952c7c0c6d3396a222f7caf1
-EBUILD ark-18.12.0.ebuild 1997 BLAKE2B ac00df5e9ca6d7986397f28e281615efb883754bf2c5410fa9115905f35935f03f00dcb96aaff2eb11f3bafd3209bb45d1c1fced345f8c8f28042f3fdd445209 SHA512 56f98683635edcfcc8be91418352955d1710e4886b064af836176dcd601343baa6c37ebfa58d785f93bc18c5f69b146cfd8a7df36f708e308c8f5c3914fdc2f9
+EBUILD ark-18.12.1.ebuild 2041 BLAKE2B 05abffcccd32d3daa4eb145ffbd1f10f0f1d891faab3271ada6d6848e69c3c16b0259c91dd4cd2dad0541b3b63930f8d4ebadd0e1f1089dde71a318a3cadcbc4 SHA512 167bd97e4f0434b516cb35b15ebeec9185e4567fdca117589ee1c8393786de4eb8bbe17d0010ed570ddaca3d99474a912c243c60e112be560029105d62c334dd
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.12.0.ebuild b/kde-apps/ark/ark-18.12.0.ebuild
deleted file mode 100644
index 6ed461e7c98b..000000000000
--- a/kde-apps/ark/ark-18.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://www.kde.org/applications/utilities/ark
-https://utils.kde.org/projects/ark/"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 lzma zip"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib]
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
-			elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
-		fi
-
-		has_version app-arch/rar || \
-			elog "For creating rar archives, installing app-arch/rar is required."
-
-		has_version app-arch/p7zip || \
-			elog "For handling 7-Zip archives, install app-arch/p7zip."
-
-		has_version app-arch/lrzip || \
-			elog "For handling lrz archives, install app-arch/lrzip."
-	fi
-}
diff --git a/kde-apps/ark/ark-18.12.1.ebuild b/kde-apps/ark/ark-18.12.1.ebuild
new file mode 100644
index 000000000000..c56130fda28a
--- /dev/null
+++ b/kde-apps/ark/ark-18.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://www.kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark/"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 lzma zip"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake-utils_use_find_package zip LibZip)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version app-arch/rar; then
+			elog "For creating/extracting rar archives, installing app-arch/rar is required."
+			if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+				elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
+			fi
+		fi
+
+		has_version app-arch/p7zip || \
+			elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+		has_version app-arch/lrzip || \
+			elog "For handling lrz archives, install app-arch/lrzip."
+	fi
+}
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 8315d6e06bbb..79d57942a504 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-18.08.3.tar.xz 3748568 BLAKE2B f337512c8e2ba7fc1defd26d8d3c9c906d1c5b9851589abe146840317572873a5aa772cfd460e2eccdb17008ed9a1316e51db74ec296f9f7e9d9e8be15d468a4 SHA512 79029c470422ca95a87190bd006e0764382098688bbff6d36fbc114508f89f85e9104fda53176db0e18b9e874cd4cb0b632d2d6a2bedc53e1bddda9418492ad1
-DIST artikulate-18.12.0.tar.xz 3748728 BLAKE2B 0092a6f31048e1d0e11f82ac43be7a7c1313c823a75318cf202e326c20cd2e68d6d1cb02b4e75d0396169df02a01a059b9a86729c5b0f200389c183683bd1959 SHA512 2dcd18ba9b790b37c086c5592337a59af4f1d265bdbf81bd7a5ab52e9a596f9d24c2c55b5bb4b10cea75a723618ec3d6c1f420ebff318d4e1b259938c1df7287
+DIST artikulate-18.12.1.tar.xz 3985720 BLAKE2B 17da8b0d12090791ea24656ee507a53fde3033a6ff33a54a01f2b01afd25554b601cab68b935133378ae4d0ce64dbc16ca400fcf87fea0c56fee526e7213a6ec SHA512 440fe563a118b841f6a8bf94f218b8a8616516bff7c600a4f0b615e4ca11767b1594952448516b7be94936dcee44fe22410a7c075067a7d602800ff1f038b9be
 EBUILD artikulate-18.08.3.ebuild 1114 BLAKE2B e7ae99db866fd39af3d25dd3350a21a5dcb343573c70d1f6bcad84e5bd2c139ca42b8a84f6e07fb7df08f3cd55af9bca6d27ea5d2fb7236cddceefa0c876abdc SHA512 c7dd75d18531626dbfaa4d23b9c265956500506b0f8f4cc8463485b6ee203e15cdc3c0d493b97b672d33f76d09bb71c49479dfc955cba83340d674c2818bb111
-EBUILD artikulate-18.12.0.ebuild 1116 BLAKE2B 2772ae3f5bbf6c1c2a01f74b80dcbaa6656ac9e12090137c83da5fa6d97a99e3d277bd85483ac668e1c41a80da44607802b088d2edc0bd6634553f5899cf0af7 SHA512 6924740313fd6bc588a7c97e611f91f5a912c01ece715abcb79f9072710361d901414be94bdb882241577acdd265c2fe7c6aa90d900d248d6be73c8c6eff31bf
+EBUILD artikulate-18.12.1.ebuild 1116 BLAKE2B 483e4bbfa1ed614e5b47d467559c18f6d5034c5c0224b086431e33bda50d8aaa3f672a97220d474339031ed0f0d6f5dc0b2a6d5a04fa6edcafc65d25a1a86e01 SHA512 eb43dc9276e3b0b0daba0528b49253fdfe0148de5bf5967b2842dfa47d984f63ac51220c1f7b2cc20d5a1680f640e16b6bddfd6cd16d6d3ddbb7fa860a10b930
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-18.12.0.ebuild b/kde-apps/artikulate/artikulate-18.12.0.ebuild
deleted file mode 100644
index 0f9f392da82a..000000000000
--- a/kde-apps/artikulate/artikulate-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-18.12.1.ebuild b/kde-apps/artikulate/artikulate-18.12.1.ebuild
new file mode 100644
index 000000000000..870ea574fb21
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer qtmedia"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 92fa5ca3f6a0..ac85e927a19a 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,5 +1,5 @@
 DIST audiocd-kio-18.08.3.tar.xz 248720 BLAKE2B 5ab0241ff09488d2e6aed8f611b84e0db257b3705590871e80e8cc5cac45e8df916c62f4fc13aa8bc12b15daa894c923a86199ec57a42ba3bfd70fcf1ac93174 SHA512 471919ad32cbeb244543c31fc03307dfba26adb9090cdb5c8352f01a2b14126b081571f8002e4a43319e2d2d6f4bb9b1b16965d37f8515fd4682778f7e7e1a61
-DIST audiocd-kio-18.12.0.tar.xz 249952 BLAKE2B 5a73aaa91b1b58aaf06622f3c2cf1350bb1bbc270cc96f0c46f78f1147184120af548766821613f70ab4e5cdee91194acaf42f72dd62e7d83a099475d15bc2dd SHA512 da9def4b45759420a83ac77a780e1f5c7ddb41a1b5edc099c2beb21b4eb066d5baa279526dd619b70cc365bcc8bb6a26ed3fa38c30ddaa8185a50d54b14e631e
+DIST audiocd-kio-18.12.1.tar.xz 250504 BLAKE2B eeb59d32bf1ff9b5ca6245f0a6812818177de26a65b7a0a0bd23b0b39c7cc3c2c0057c9a081c7a9ae8f518181583161654ffa70ab52b13db3d4a3929d2a40956 SHA512 4743952892672f4b70b947b0919daea107b2312fa92d7d8ef1aa094a7a6107d406396fa50757909080059acbf8bc1b8c270d5b4fc7ee94a5b024dbf7ab48ed6d
 EBUILD audiocd-kio-18.08.3.ebuild 915 BLAKE2B ff8f2a32cd8f66a5228f128a0cb29c80f2d6de54f9ccb934e74229458ff8387e3e1a5a2c03a749b9899d2db396bbc99bb7d100cf922ff0441a2b34dc5a5b0521 SHA512 143314da13427f5ff24fd3f5866b72deb2df9133134c249d316a323fdda222b2fa0dae9c22e2dcc1fff68936670b78872d116b03bf3cb4bd3b87a96941ebb5d9
-EBUILD audiocd-kio-18.12.0.ebuild 910 BLAKE2B 3cde9e8da4d4830e8cfde913e5e6e1c2fc5baf3eb97c77ee92a7e72a743c53e6b9db56ab3933b447e2367293bea5584534ce737f1accf79bc09aff396bcca8b8 SHA512 d51d0e93dcdb9bbeb9c3a54dcad283daac1bb4662b2849b655ff4a3f0be680616ad69b2d6cc2c2faf2f15ff6df1fa4f90675622f88ba7c6fff14b2b11189bd54
+EBUILD audiocd-kio-18.12.1.ebuild 936 BLAKE2B 749c403438613b596654a469710b95e21096c4d4f1f463a815e276a2c8d4ebf8a157b4c972f04d2d0cb9715c360a957a618625fb44b61e0c72df36a271a2d5b1 SHA512 e128ab7efd294cbb0e45864f72a9fb9dedabf837fe54f736dbb0f8415e4166a94d58cc8bda1d83b6126adce148f978e0d6f60e3c468d727183d15355b9deadec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.0.ebuild
deleted file mode 100644
index 5e279e2ce0ce..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-18.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="kioslave for accessing audio CDs"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	$(add_qt_dep qtwidgets)
-	media-sound/cdparanoia
-	flac? ( >=media-libs/flac-1.1.2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild
new file mode 100644
index 000000000000..3ab410379fca
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="kioslave for accessing audio CDs"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac vorbis"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	$(add_qt_dep qtwidgets)
+	media-sound/cdparanoia
+	flac? ( >=media-libs/flac-1.1.2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/audiocd-kio:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package flac FLAC)
+		$(cmake-utils_use_find_package vorbis OggVorbis)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 4bc1ffefa600..53430d45ae3b 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-18.08.3.tar.xz 244776 BLAKE2B c8b653d44d6526dd84fd346774350aba865517272ff3a6f9c0320acc6abdab54504aecac1d0d60915076c7e51889c6fe83a0867b142558d01a5383ec0e6d2255 SHA512 7ae26b437c76c2a676fac2f3ddf4fb436eb8a9205d5427ea40fb8c849fb6bbe0043429bb7dc1eec4de24975cf99f3ee695b68516de00a736aa90068ee2d11b06
-DIST baloo-widgets-18.12.0.tar.xz 245492 BLAKE2B 7ce5f76c81669a58b6a7281ce335e4b6460c705a5f6c52dc1f4e2471ebde1a0d30515b29f45015b2dad0200a8b5065d3240aeb9a4d42331fcc7d8d7a7e181ba1 SHA512 eb3c5cefc3108d856cc96d2632eae6de93d0de148246c7f892a71d9f8058c60b1442fb067497b1c919128e657c35b60dae024bc055dcb1ea68aaf9cb08c69f57
+DIST baloo-widgets-18.12.1.tar.xz 245576 BLAKE2B 7847ce32345945c1864d6a8129604401ad4616083d812b072c064b3ec333451d21244f1bec8a3068bf953677086428c93df3aa0a90f30c9424456410cda23003 SHA512 449dfb83d9787e5a65dc59c7927a0d8586376933bf61b658d8338d4e9cd101c2b2d51ac0bc8f1a9fcf4f8827ec1cb557617f91a6ccceb351383320f13c61c2b1
 EBUILD baloo-widgets-18.08.3.ebuild 594 BLAKE2B bf197136cc23b13345708c5d3b1930eda789d3bbdb3f29d4da16e7d18d9adb02cdf8f716653a39f3c64db931b727eacfdb3af49a10c6c0e2d47023177c59285b SHA512 3359289cce51e360334b896f72af3aa0a86e76a7190f23a757542154265598e52826a14dd619b41e6968faa00d97d78e24f5042c2957f3bff63f7b4f10b73bf9
-EBUILD baloo-widgets-18.12.0.ebuild 596 BLAKE2B c2559e23063d6dafcb62bdd255a6baaee079531a02beede7e851dfa00086402b13b47311140879ee2d0e88313ef356bf13fa8cd9270b3d034d85fcb304dfeb1f SHA512 27359ec0005c7f4df7a3c7a0c33e713a73fe9186bc2e02aee7db67a4b0227baa6d8cf5cf123f6d12b29c4b7ebc40b9e43d2ee10a6882af67ea20d87a605617cd
+EBUILD baloo-widgets-18.12.1.ebuild 596 BLAKE2B 9a8aad632d4a28edb7f50301517013b1de634b329e04aad03b9d6b763649e6328763bc8df2e0affb34adeafae6ddb4cc36a7249a6bcda3b4f9c7fe36ea5c00bd SHA512 b56727c2908e53fa676e989430e2f6a1f13375d6e85d60b1970a5176b60aebd963a6880ddc2f2834213ec2534559658a7d540d4eaa4963c8f873d788b508794f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.12.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.12.0.ebuild
deleted file mode 100644
index 2938ec7d849f..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Widget library for baloo"
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.12.1.ebuild
new file mode 100644
index 000000000000..c6b7ad4efeb8
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Widget library for baloo"
+LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 7c0d8e8e838e..53b0eb511dbb 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-18.08.3.tar.xz 2507512 BLAKE2B 5b2ed3ea697939ebfc468d68c8b1ec7979947d6069262df3a8e6ee298fcd14af5634efa3ca4ac13dc9b5fcb2026f12273aee224c16bbc56401255a44ae70cd08 SHA512 2e6c77d1f295535e584ed6f462246c7223833e9d473b99a006a8c5ba0518cdb3b3bc847c8d6201f9ff80c5672d088b21db1be1072992c91ea94b90752d080ba8
-DIST blinken-18.12.0.tar.xz 2507576 BLAKE2B a3696a62a7e4624677fa040e1a9b55599d83c240f18bf415aa2b14658b0baa5d8f704dcbfe7db46f3e4cb449e78e30411a5b24f64408d614a079cec1c8f03547 SHA512 679b97d432a61e7640e871179b98a603bc56e6e076355147936dcf29ad86586eee9999887a4f0681a2a5eeb9138ea92d8040934896d515ea5cb7d8873e184b83
+DIST blinken-18.12.1.tar.xz 2802732 BLAKE2B fb475886050c3ea44e55a5f65a2ffe2ef035239baa2039329f9ac7cd37f5db8e5ba015b6bdd97f68f2731fae5d2debe2347ed6f05d7b7c84f6e49a596d016799 SHA512 5ae4b18b342fa417a7584423cef72dcd639087d788729d234452f4040af749af205758ed73ce6a816cf979239385166a843ec0f8e3a1169f8944123520e3d9b1
 EBUILD blinken-18.08.3.ebuild 765 BLAKE2B 4f604ffb1299adc2ae065dd183896e3bff9e9d2823816caa8912497f52b4661275281fd11a8086f3c731ba3037eadebe3e13587d5c3a510124eea0fb2fd17cdb SHA512 74c8cc6658aa5f6294d0ec3dfe86e9ba3684869e137507f455b15ec697e630ea38d8a7402922f4f2e9c8ce8a198468783b1e585fa70015e28a6ab7c588f836df
-EBUILD blinken-18.12.0.ebuild 767 BLAKE2B ba7929db815a2cc834fb77ffd0e16a5ddf71b8979b17d9f334c20957929a11b342047b10f15f7b44f809ee1cfae87f0a570d3f6fe09c6fec3cb16ed54314687c SHA512 088f1076e8ef48d9bc29f44804a322fcf55e0dde93fe91b38d0ab8db054993eb999772188796b514b042a20b13eeb13781887d7a5ee3e6084ab285645f02d735
+EBUILD blinken-18.12.1.ebuild 767 BLAKE2B 022d83264107d1e24e375df81b0100c8158d80acce57aa31a552e6bf180aa588fc973c13d85b84519c075a459bde0b3f1a720b8a2cb364b73855e7cb2c90b07a SHA512 ad5a9d73477a08c72cb888a9ab936e8fd17eb608e538c6148b041fa23a646a62ddcde7a9d42640c57c10e8296ca04f538f1d2f4775b93231c428bdf6c11c9926
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-18.12.0.ebuild b/kde-apps/blinken/blinken-18.12.0.ebuild
deleted file mode 100644
index 64c03ecb966e..000000000000
--- a/kde-apps/blinken/blinken-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE version of the Simon Says game"
-HOMEPAGE="https://www.kde.org/applications/education/blinken
-https://edu.kde.org/blinken/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde5_src_install
-
-	rm "${ED}"usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-18.12.1.ebuild b/kde-apps/blinken/blinken-18.12.1.ebuild
new file mode 100644
index 000000000000..d94d1f453542
--- /dev/null
+++ b/kde-apps/blinken/blinken-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE version of the Simon Says game"
+HOMEPAGE="https://www.kde.org/applications/education/blinken
+https://edu.kde.org/blinken/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+
+	rm "${ED}"usr/share/${PN}/README.packagers || die
+}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 5ceb18e7aa9c..71f5267244e8 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-18.08.3.tar.xz 819108 BLAKE2B d39e9a18d3001382d3d17077958c7f40036e9e287675c1f86b79f631205d87b19fdd6a81599664387e020d6a3dbd87e544db47cbc96fd505e4ef4292b1ceb8a3 SHA512 6085333814e1a427feda8fcdd5569601241ef6fc2d22f7d219540522866f2ebb911977a3bfffc35127d996a3cf1cbd895d4081bc0513da484327bcbe531e46e0
-DIST bomber-18.12.0.tar.xz 819496 BLAKE2B c05124bd6ac06eb2801c76f5c1b62ee85ff4627462d5ecf4e67a418d5c80c7785e33372f865b83a8419c8e072909b03b0a91974a30cc55bdfe6d4eb55a803ce6 SHA512 4956061d017a993410a0049693f3985d9592552729b88321a5c4dec441ded6b7b7d1dbc2e187fac5a7af369b9f853a508602dd92e8efa94e75e8ebdfc64a1ab0
+DIST bomber-18.12.1.tar.xz 819236 BLAKE2B f378ec69cbd89dd84465b1c0de5e93d84a5fcc2686060ba3f48cb53b3443bcb4a8d9e41f220fb5ce5dec63c98006a81d1502bb94ada3cbf642847d7b14522e6f SHA512 6a933c120b6a59841b7ed1e62954150f71a9d0067abf497a1cc9397c3d070f7d6ce88d1a16dcc1c0dc21d3ecff344375cb810ce68718c32402981270457aae33
 EBUILD bomber-18.08.3.ebuild 682 BLAKE2B 7dfb76a6adbb98b779a15aded5ca79dd21761e6b58ae7e47111ddbee53237b8c2b9cc960e057baf35ff4517ae7bd9b97fb05e19036d86c8c42414930f3cc2b3a SHA512 14e4774fae739f26b748791048bdaa1c238d0f8ae7e8b8eae11540e98529b772aae6d38fa7f7d924f4934b69ffaca82bbde45fbc7dc1500c6a7c3bc49b5fc010
-EBUILD bomber-18.12.0.ebuild 684 BLAKE2B 9dac702b0134a1b757abf7514f4e80bf38f8edd474a9e35c007d858be911adff58af66023b2787d5050fa7f011e0309b405689c98c6d22741c4e983febab38d9 SHA512 122619c0d6e4b1d0c502287d6ac1a78b5782e9f84da3af8ce067e27c19b717cd32242d8b4af8b2a6d0c2c7675fb34ab036809e6d68d9ae3ebd18e113d23465a2
+EBUILD bomber-18.12.1.ebuild 684 BLAKE2B 36127879e513b2a3ba3ebe57c0474a4a25c87b1c579fa90fbffb46fcf5170de7d5ff51770586280ff3cbbd395a7b8a75fe4404b4cb0f5149642ab0f1d61ccafe SHA512 42f92f7712641e4b9ebb9da18cd5fd193850941732c867cbb9ec046eca1fbb78a59e950f0ffd0bfad15c672d1f293d24baaab1f0ea9aade8279fc57f39ea3d2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-18.12.0.ebuild b/kde-apps/bomber/bomber-18.12.0.ebuild
deleted file mode 100644
index 1d4bb83a5856..000000000000
--- a/kde-apps/bomber/bomber-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE arcade bombing game"
-HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bomber/bomber-18.12.1.ebuild b/kde-apps/bomber/bomber-18.12.1.ebuild
new file mode 100644
index 000000000000..589baab8d6a0
--- /dev/null
+++ b/kde-apps/bomber/bomber-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE arcade bombing game"
+HOMEPAGE="https://www.kde.org/applications/games/bomber/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 558055dee7d8..48bdab39b527 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-18.08.3.tar.xz 199576 BLAKE2B 3bea0c14a2f5f63ff79bfc20f36d4e6212c6dd41ea5cd9f79ef45189b4b53d43e656f0df12e582a185cc97ad9f8f5a899d790fe87de40aaeb21e8f6798c2ac6e SHA512 7053c1597c94d3c98c6008b071b43968c49a20f86a51260b4df2b94334ffb2f499885fd7cd395aad48eb80bb21cc201ed60b1c9792be0950b33db77f65eb3963
-DIST bovo-18.12.0.tar.xz 199560 BLAKE2B e3679e62ce4e302edc6fd78813b22185b913bcf365d26ad996298b9bd1f9b88152f9553e3e724e0ce7fb11b66486128be2575fa66603470741fe7ea5f72b3742 SHA512 64533c1fefc4cc761c02a346abfc07ffc775ab7d3c02ce4b47a2e5ed806828fe1d3142444b840291e9985013230a8adba903a69f0baba378e97fd87ae8c9ecfb
+DIST bovo-18.12.1.tar.xz 199420 BLAKE2B 9e6dfc948a6d8b03399fec2d972fa156bae8d9fa4bf1ec6a2570419db9cd0596187d3532006aa106fe7fb62b88abac9ccf1524a8813d928551b10f310b30b040 SHA512 98fcda9fa32b476f6ec9d6ef080ba2f0a13cea619bc07c4cf679d30c07bbeb5353698d395872c26bb19d13ea8ebe5e48f13a5fcfef9feaa1d9f2d69a511aa042
 EBUILD bovo-18.08.3.ebuild 699 BLAKE2B 8ec09267ece378fa446aa93694b6e7402304ef9031264bb3105bf365fd905eb4c4c72006f1321e7dea5b9742a236d4e786bf02a188dee44e25fc77767ede978e SHA512 815d8b1acaed014ce5d3788df62e681fd12e64638770bd54b54592c8273c852ad4278907b6855f00bd16226c98719d5a370e63d4b9e9920b4795902c09693066
-EBUILD bovo-18.12.0.ebuild 701 BLAKE2B fc6ffa0f20cee0e9238b69fc6d449a295eff6669f173cc2079b942343a0b51d5f13948aa6ec74bd3302a22f19e0cc2dd06bba6735bba8cb95e8ddbfea0fb8187 SHA512 e7731bde5bc60c386771814145abfbea4ff13b9e383f0f21872f8ad362be15d892968e9f0bbc3c731ba2b7a795d99c6118e6b1d6d365df34e1eddca8f3c29452
+EBUILD bovo-18.12.1.ebuild 701 BLAKE2B ff4e75ebbde744e13b49751a0fd84c803874c6e33535be4ca6dd418fe9e72e1e39ac223f1f2a4c47839125d943bce72c1faee94f1febfe446ab60321063fd9a6 SHA512 d9d94a5d21029b5998ce6f4eabe64802893422049ed52ac23ef2238b79e76a29370966ea83006165a07a8bf4d701cc209e7d0149aa850fd7bc6ead6a0febb0ac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-18.12.0.ebuild b/kde-apps/bovo/bovo-18.12.0.ebuild
deleted file mode 100644
index 277760acb49a..000000000000
--- a/kde-apps/bovo/bovo-18.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/bovo/bovo-18.12.1.ebuild b/kde-apps/bovo/bovo-18.12.1.ebuild
new file mode 100644
index 000000000000..1ba0be78bd76
--- /dev/null
+++ b/kde-apps/bovo/bovo-18.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Five-in-a-row Board Game"
+HOMEPAGE="https://www.kde.org/applications/games/bovo/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 937f585fc476..bf453b4979f8 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-18.08.3.tar.xz 225844 BLAKE2B 7c0e6689049a7bd022cc5b9e1201244997b20b944f9e350e71ea0f9cd7954e2e07a3ebf431c455c925f7180880d127ba590debf16ca2544bfa762efad33ac547 SHA512 f858d8eb2b79b999459d04ccf8e8a05c53c7275b6b3cd2f80224da42f280a4d2a4d6738a235c1f3bb4b40e36d605310cda01097678441b5c4a94698fdf42097d
-DIST akonadi-calendar-tools-18.12.0.tar.xz 225048 BLAKE2B 9cd9f65b11a7bf848c246e5ee627e3ec9a7dadc21402e86821d2db9443f9fb8d8fc2763b28dba8fc4bb8b82352d0130e05ff93b804297c68c3c72669200bc2e0 SHA512 e230bd5a71ab10ac7cde4696ce29e46f06011826b581988cc29d5703732dd3be1443f9ec686fafa08fe6c769a5b05d1fc66b5f0fa99aa0c932177ec09f472ef6
+DIST akonadi-calendar-tools-18.12.1.tar.xz 224972 BLAKE2B 069371fa75c1c5c467553fdbc17bb9977a09cc376559ea656f5219ba4911814c0263f157676d289e4064d0afd730c91998cc574a1ce82853f15aba3be904bc38 SHA512 bb9c78c793863a124fdc102a83689550c6d7154fbf3f514cf4fbc3d3cf8a8083d8e4d2f09d55f3b47eda916b2919eab1ee3fd189183080cb45db9802af98445a
 EBUILD calendarjanitor-18.08.3.ebuild 1026 BLAKE2B 25e765c446cd24d4c415e6d0e9672fae275ddb6abea3c5dab0f62d77ac4de2bd23dbda59b17be1ea8fd64cd5dbaeb03e31358d17ce8dd9d9b40d4786771e1850 SHA512 e9521466a6b6012f2f9c45b7c428ccf8b547cb1d15cc6801d85d8c2f006bc35c49a5927f0a7b487d0796dd6fc5b6f1b90d02a233c2b0327b0a8b4cdee8aaf659
-EBUILD calendarjanitor-18.12.0.ebuild 1028 BLAKE2B 9f86cbee0b77d62cb211d579c1c6c8508200303757359d159086ed278f7275c65ba540cb5a2045a7a1d2f1e48a5c9630885615c447a708b04b799b2d679931d2 SHA512 d4194278ea9c4c98c1669e1921170d7104b6c21dd00a9e02904dee4f1454d24a8e209a9b525eb83c32316f5554bd6fb024e287abe232b3159ccf3d8a621e0519
+EBUILD calendarjanitor-18.12.1.ebuild 1028 BLAKE2B 4386bc4be31681ebf590fb441c30c0a2bdb457b11e0a7fea9db172267dae2ae704c0ae98e7dad52cbc13a806ffaae269fc98a5a19cef33596f455127b04e32c3 SHA512 4b3ddd39ced2002762d47862d702a28fc5323fce169d6b4a74b1dad11dab61ec34970d18d1617270f15a6b426f3b950b45cecbbcd89d4f480d49f14899df442e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.12.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.12.0.ebuild
deleted file mode 100644
index 140957cdc060..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.12.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.12.1.ebuild
new file mode 100644
index 000000000000..52f7d93122a5
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="false"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	cmake_comment_add_subdirectory doc konsolekalendar
+	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
+
+	# delete colliding konsolekalendar translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index dfe80643d2d2..df30e695e409 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-18.08.3.tar.xz 647540 BLAKE2B 76e0ddb739b74d378af0f91dafde28f930c3224fd4f75377632531ff510ccc47c1cba91e78304545af6e3ab723c758adbdeda3f0d613503ace2a8e71fd45a860 SHA512 7b4d7229ce54146bd4746fb78c8079395409228f87013820de31b5d1a3288c8312c4f489b6dcb2b3bd0f4cdca51fe8deb48e51a77a22d7d41473819dabd3a41d
-DIST calendarsupport-18.12.0.tar.xz 646352 BLAKE2B e3b7c796f7d2304e5ffce6b9ba8b6682cb47f1e19e2d7069d19115ef72f6ee1757a1a66edbbc3dc423de58787c65ef248fc4933b712767e83bfc92d31782780c SHA512 492f353f9cb2d7c1f1296fb81afdfac8b68b477dd458c8242fdfb4379f5e317c7feeb90ce7f3533186265cfb27d4d5433cd1e43e1622efdf8c749dcb3093c844
+DIST calendarsupport-18.12.1.tar.xz 646704 BLAKE2B 4ade87f65fc37befd5358be8d968d7462df8d577c0105750d5ce53ef09c03040c74ac775e20488d7d8265f4d28badd4f27e33fe738a3aedc29a6062b03ce9ce4 SHA512 6329c4f00ac5cc4b19344242b690f3effac424c22fbf18d50aadc94c24e3a45360ec74d9890a4218e2e6b96c77f884bccb0f6531e30e4dd2faa7ded19a321ca2
 EBUILD calendarsupport-18.08.3.ebuild 1096 BLAKE2B 53f9497d59eb6ce5540ff38d607d1511693a5539404d105e0e5392b9009b994ff47d1149320067236f0aea5a7af271b9da5d5b5507da031a612de9b640866993 SHA512 56000f568d689ec26e97280267d98dc4ebcd48f9ad1f71cd21f99e439551cb4d60ecc18e7136c9b9a07fa95945e2f7dafaf99c5da3153da069ff222f769c2bc8
-EBUILD calendarsupport-18.12.0.ebuild 1098 BLAKE2B b26c94a84ddf82c6bcca40c702eeb6b13c950224ae2a49d48a9cf460b23f85b724a71c0cdbe043358683a30e079d07f261a950a52ea57e2f30256e25e59ebe3c SHA512 2f257ddff2c9a0980f6695fa11fb00993c2ae390ed6ee9df0ea4ddda9f836c1c2d71cf98baac3cad854d9b03033c0622b01b0e16ca799f779a8b0d91d8cf9b89
+EBUILD calendarsupport-18.12.1.ebuild 1098 BLAKE2B 7f97d5196e9bd468f642669c958df85e7ce83c7bf1c16a43f7b8c2ae2ba7044d7fd6283f419620ac37c66e19f49242a1b2b8ea0013fcd7f795af99f76f1ac0ef SHA512 3b0566c39eb7926e8af20b11ebd1c2b336cbef8168ca490ce6a7bca1fcdcd0528da3618c33009172b22dc8b7a55695047c4a3f48b15587c4dc1508a09f9aee0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-18.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-18.12.0.ebuild
deleted file mode 100644
index 4a6948a768bd..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/calendarsupport/calendarsupport-18.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-18.12.1.ebuild
new file mode 100644
index 000000000000..e02d9f131fff
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 aae9d65497ab..dd5f9b489cc2 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-18.08.3.tar.xz 2181020 BLAKE2B 43ce8e60d44d07c1a74219dad3322d23cea89eb9ba199c240d7e95473a79dcaa2a8a2ea08e05a04da00e6bc2fce6cef70b3266c28dd6f9424401bf87b1bfb6a8 SHA512 b6a3bfcc6dce8792fcad9bcaec6b30dfe50ab42b0781a3d33477b2fee1773c20400f4de069176bcf3ae6bfb232a32aa0d5f2e6e9059706f9da6aa65f63a018ec
-DIST cantor-18.12.0.tar.xz 2240772 BLAKE2B 0d6627f8f41b5cfb211e732ad173a1926396f5c59fb4e4b3c5dccf35fbb9d95ecf0e4cdd16bffbae04615dcb933b1e7da050e6fe2655749d6e334d627ffc8f74 SHA512 d1d2daad69bd982da0ae2b82512e0fe3d15a93406c7d24d28e8587514518e4bebe5f807a0c0eafccefbafae06701dd5cff7fe876f863792ff9a98e355d9aae77
+DIST cantor-18.12.1.tar.xz 2447272 BLAKE2B 9d49c5751ef6310464a3752516d28eceeeb167c6e2b7b36e2caf9bee56598d17f8428a2ac9a3483e43ebc23f44ec208c6f4ca0e6153aa5eac36aee1d1075b261 SHA512 53128c9868fa0ca0f9f48d828d5232b2316ba3d6808937fbac4f46ddf5797de53fdfc64d91544ef357a60870ead5585531ae600d14d67f724551c365cd62c3cb
 EBUILD cantor-18.08.3.ebuild 3150 BLAKE2B a846548bd1968dc13764e210aeb76da431594ff42948dc5ac99335e0f94a35450b48992e9e03e23333e612d71c9def189fb84282945057fe46d33cf5f5cac0e3 SHA512 9ebd1fd3b01e929b089eb9e802ae630acbbb30d2179f73962dbbae326d797d7c8efad1f3a4f8063592d54d0793d4b65065fd50cad42591f360881b5cd6c26c04
-EBUILD cantor-18.12.0.ebuild 3297 BLAKE2B dcf0eb5c2c36a2ecf9d6af0749557a6c7f355fa6e2af558b372b6c8118576ff3e9cd14bc528b7acf63d17ab6235a44dcecec5579535f6c6b82061793a9604a84 SHA512 7f50755f3d9a365cbe81bb16a950beb74e008b42349dfd081362adadaa87f9ca69555b51ac12b78d6185b73696c9892ecc55308cfff365eb6d53eb04f2af68b5
+EBUILD cantor-18.12.1.ebuild 3297 BLAKE2B 442a1816d7c0e7c64448ea934733d08c58390aadeba1fc41013c921d1af966e592ef8c2f35b529e245313529ebbe6e7a96b7efb2c3c2310243f6842826b9c16b SHA512 b6b38490eef581e2ddef90bf6d56e598c577a00f2487a4098e677bc1c7eddfa7ed694dd33e358dfb9f5706c4c1bbcabe1e5f55b5d64327c04ed8e713204a7fa7
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-18.12.0.ebuild b/kde-apps/cantor/cantor-18.12.0.ebuild
deleted file mode 100644
index 4406f96ddb16..000000000000
--- a/kde-apps/cantor/cantor-18.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+analitza julia lua markdown postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	analitza? ( $(add_kdeapps_dep analitza) )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	markdown? ( >=app-text/discount-2.2.2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	kde5_pkg_pretend
-
-	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
-		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
-		elog "You have decided to build ${PN} with no backend."
-		elog "To have this application functional, please enable one of the backends via USE flag:"
-		elog "    analitza, lua, python, qalculate, R"
-		elog "Alternatively, install one of these:"
-		elog "    # emerge sci-mathematics/maxima (bug #619534)"
-		elog "    # emerge sci-mathematics/octave"
-		elog "Experimental available USE flag:"
-		elog "    julia (not stable, bug #613576)"
-		elog
-	fi
-
-	if ! has_version virtual/latex-base; then
-		elog "For LaTeX support:"
-		elog "    # emerge virtual/latex-base"
-	fi
-}
-
-pkg_setup() {
-	use python && python_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
-	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
-		-i src/backends/CMakeLists.txt || die
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/cantor/cantor-18.12.1.ebuild b/kde-apps/cantor/cantor-18.12.1.ebuild
new file mode 100644
index 000000000000..c4ce5eff6be0
--- /dev/null
+++ b/kde-apps/cantor/cantor-18.12.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+analitza julia lua markdown postscript python qalculate R"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	analitza? ( $(add_kdeapps_dep analitza) )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit:2 )
+	markdown? ( >=app-text/discount-2.2.2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+pkg_pretend() {
+	kde5_pkg_pretend
+
+	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
+		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
+		elog "You have decided to build ${PN} with no backend."
+		elog "To have this application functional, please enable one of the backends via USE flag:"
+		elog "    analitza, lua, python, qalculate, R"
+		elog "Alternatively, install one of these:"
+		elog "    # emerge sci-mathematics/maxima (bug #619534)"
+		elog "    # emerge sci-mathematics/octave"
+		elog "Experimental available USE flag:"
+		elog "    julia (not stable, bug #613576)"
+		elog
+	fi
+
+	if ! has_version virtual/latex-base; then
+		elog "For LaTeX support:"
+		elog "    # emerge virtual/latex-base"
+	fi
+}
+
+pkg_setup() {
+	use python && python_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
+		-i src/backends/CMakeLists.txt || die
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package analitza Analitza5)
+		$(cmake-utils_use_find_package julia Julia)
+		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package python PythonLibs)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 7ee3d1d67e65..9399685d50eb 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-18.08.3.tar.xz 1906580 BLAKE2B 3b939031057ef7971196b8d0f1f9e4f60a5ec068d6b6492432d6d2cab358daf552a76fae2a2f402cf3b8b60be4e7edac785d83ad8e603f043866299d0109d3ed SHA512 52086d5a9d54842efe0300ed43e1d8f1b2cf6d7df7269115441a1baf0a283115c31de5dfeef49e48695ffd88fde6ce941c3a90db5d47fc12f8fae79d73fd4bb9
-DIST cervisia-18.12.0.tar.xz 1905940 BLAKE2B 7190b21c329fd626f8bd086e2294364336cf2e7f78f5014e8410bb29825fec0c3e296b199a29287224344be622b4fc1532b5a8b733f84f2d8a0c96d8ad6d5e23 SHA512 c4b0d91f0c02d6da9665b7525ada479a1a9ae5cd539f8d384430ba7e745bb9fce7bb2ffeb970c629d5eb4adb208fada03844e6febd7e3e9e9dd50faad225840c
+DIST cervisia-18.12.1.tar.xz 1905856 BLAKE2B f9cd40dd1771de034106b155f5cc40b1413e5933df2fb362c524c9df951d6102dbccccd15519221c3827d96a3d06b36c1d07526efdcaa240ae24cff75222f37b SHA512 77b7c6e1200c4da5e2c720c130b673997a0b60753ddf5493e8f2958010669c51bbe35118c3852a27c7cd51aef209c8335aee343007cf6d14de756e9164b08543
 EBUILD cervisia-18.08.3.ebuild 896 BLAKE2B c9014e7ba44c5709f9773afb25fed6405818c320c3f32e7f97478b3573fe54f614d99fb4e0e8b129d52baa660000b0ac03d69c69e61ba251f5b638a4e32011f6 SHA512 b2b0ae677d3df58f4c0c413ba3ffb3ee86e57ad19c50902243e801741556f30a0ed4d95e79b0c9a59489f9970aa42352376ec2882ed63ed0b93cf8e9fe67ec50
-EBUILD cervisia-18.12.0.ebuild 898 BLAKE2B 9c9050b4b74fca45b2c5af541dd02428c0ae3634f31d0688ae2149e8c269e91e3d437b4313f8ccc5a170918510ebd9fbe3e2878cd79032cab7a6720f6aad5324 SHA512 9adc77b7d5c7e922b52af0e480f5e8eca2b0933f9a1bfbdf8137c962d020d34a7a1d57672fdab9d08179a2c524ce175b19ca1f62c1b6386a4d34865e500b2fb3
+EBUILD cervisia-18.12.1.ebuild 898 BLAKE2B dbc284e18c43fa45bc9ae1e7c65975fb1cf9bc0559e1eb4664c9cf3087ee17568d6da161dafb656f3364fc280eaa820b0847db07c6d680e88f972e49ebdf3eeb SHA512 9837c8dae4c3bbf22b3aeb21e81376e2da94b76785612d816eb6d58e0b78d96701955e61d1205f44ca58ee20f889dfbd918841d8fa5695a31c85268070ee98a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-18.12.0.ebuild b/kde-apps/cervisia/cervisia-18.12.0.ebuild
deleted file mode 100644
index b63da5d15e3a..000000000000
--- a/kde-apps/cervisia/cervisia-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-18.12.1.ebuild b/kde-apps/cervisia/cervisia-18.12.1.ebuild
new file mode 100644
index 000000000000..1936d5ac7056
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/cervisia"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+"
diff --git a/kde-apps/dolphin-plugins-bazaar/Manifest b/kde-apps/dolphin-plugins-bazaar/Manifest
index d184008e1876..11161f5f468d 100644
--- a/kde-apps/dolphin-plugins-bazaar/Manifest
+++ b/kde-apps/dolphin-plugins-bazaar/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
-EBUILD dolphin-plugins-bazaar-18.12.0.ebuild 1035 BLAKE2B 76aa92c4ecf691605ec1ed574398938b0432bc64f43476de87433ce655458948416d46c00859188b27d5514a8d651421f5238d9a197e08080f2992e627b6577a SHA512 e3105a3469fb39d766f5414af3b937bf81bce7aff655c5241df2934c3e7d5b730515d3c2fa30a8ae0344c7a4fda4d5e92e3aff75a6b73b1a9cecb7c301538641
+DIST dolphin-plugins-18.12.1.tar.xz 191968 BLAKE2B 22db98fa22fc3c063c1f7729418957af24517de18dfb6c3c78b416e9d3c9cb99dc49b00f1bf3ede09c48dcded8ce3bf9072cbb062cca7078837f4b5898a69abd SHA512 83fb10c3753648a03817df8afce53d22d0cf98b657f00782b1db47067f4a5731de5946ab5b83bac132ecaf54770645563ea379afe614dc8500007ce0ace0d65b
+EBUILD dolphin-plugins-bazaar-18.12.1.ebuild 1035 BLAKE2B c58777f2832beb339e37397d8c428fa6f58cf2421967abcd2698c146ee86f8f28ef5a784c1f7b3936e73e42cfb3e00cc63e9abc23a6c748fc428a5806b2e7e86 SHA512 292d0e1f9eefaf555e7c52a8dc7e941976f2d0114aa060c11335005db87dd841da09af7093a26a25829e90f48a150fb629db39acd499fb214590b1a4c5a2380d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild
deleted file mode 100644
index fa8c485a6ce5..000000000000
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="bazaar"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Bazaar integration"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/bzr
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.1.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.1.ebuild
new file mode 100644
index 000000000000..d90ff3f81dea
--- /dev/null
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-18.12.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="bazaar"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Bazaar integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	dev-vcs/bzr
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index c45fe85a741d..63d180bfa25b 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
-EBUILD dolphin-plugins-dropbox-18.12.0.ebuild 1007 BLAKE2B 0b21da5c970baf9cadb35357f7e31c26a96d7bd1ea847d45bfb2fe95c50732c4c8d4e04fc0de781f227449fd4a2bd892c22744b625d9471bf278aaef83f37030 SHA512 8575eff92b7040c880b10c4a484ad8d76f413cca68c61176dc14b2b2b80bff43da452425bbc4e5a758af983d4172af866b92681176409eb2b2fec82aceb78f93
+DIST dolphin-plugins-18.12.1.tar.xz 191968 BLAKE2B 22db98fa22fc3c063c1f7729418957af24517de18dfb6c3c78b416e9d3c9cb99dc49b00f1bf3ede09c48dcded8ce3bf9072cbb062cca7078837f4b5898a69abd SHA512 83fb10c3753648a03817df8afce53d22d0cf98b657f00782b1db47067f4a5731de5946ab5b83bac132ecaf54770645563ea379afe614dc8500007ce0ace0d65b
+EBUILD dolphin-plugins-dropbox-18.12.1.ebuild 1007 BLAKE2B bdf9683a16b33881b13ed28b538a0d26118ff55c615ef293eb8612940d01ee1ef68e88450cf92ec1a0243fc698697e924c257f7fdc87a2f1eaa06c9fc5d0dbf2 SHA512 25059ee436efe9611e326108b393439e2cdf3ac4f6ca316a0791a307b0e06e6251af332fc9eb6351e0516cef2c341e6ef797da5c10ffc195b9c94ba2851b40ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild
deleted file mode 100644
index af36eed7c6f0..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="dropbox"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.1.ebuild
new file mode 100644
index 000000000000..fee29b0d0964
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-18.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="dropbox"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Dropbox service integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	net-misc/dropbox-cli
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 5b966b82c560..365513bc3a97 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
-EBUILD dolphin-plugins-git-18.12.0.ebuild 1098 BLAKE2B 64043e10a4dc1a3181f2dedb5d816c5e60c0264aa72d7ae6a3c8e9169af5f98b0fee65a2eeb4b493eff9b6176cba075cfd1dbeb79aa4d8f47595cc9f0ea18114 SHA512 29dc5007d82ebe42d9bbd735e8f6a6a632091711cb2cbd227c565bb353ea9986ff7299d28d0248f665f36e59ed97c6314869e994d514a3027c73a9ad4dc8a009
+DIST dolphin-plugins-18.12.1.tar.xz 191968 BLAKE2B 22db98fa22fc3c063c1f7729418957af24517de18dfb6c3c78b416e9d3c9cb99dc49b00f1bf3ede09c48dcded8ce3bf9072cbb062cca7078837f4b5898a69abd SHA512 83fb10c3753648a03817df8afce53d22d0cf98b657f00782b1db47067f4a5731de5946ab5b83bac132ecaf54770645563ea379afe614dc8500007ce0ace0d65b
+EBUILD dolphin-plugins-git-18.12.1.ebuild 1098 BLAKE2B 69787e023c52965b8bab0897a4004c03041fe877a7b01afe99a9ab813c2929fe7002b0135194c3b95120a1569b600b706e53865884f16c46bb4f6f116e4c5208 SHA512 563a2c5d85a4fe5bcf1098551f81ed8c6f1f674caf5361ee98cfc21e4e09f06e1e7b26111cc8517e09f4698767a804e2bacbb5eec0bd480a038f364fe00bef9f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild
deleted file mode 100644
index 452bdecba4b7..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="git"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Git integration"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/git
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.1.ebuild
new file mode 100644
index 000000000000..3e32b6ba8d62
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-18.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="git"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Git integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	dev-vcs/git
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_hg=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index a62e38c58674..59a434cae1ad 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
-EBUILD dolphin-plugins-mercurial-18.12.0.ebuild 1196 BLAKE2B b3f4a41f0bc0325b4f84ef002d7743540facb0a301a8bc1440b19baf144cf81b5c924a3fad01cc459b0de3ca12d331e0a19a6a4f3af1fd32ea3f5abe5a4ac643 SHA512 f21828898e65bfa409cdd343a2238bb4d975daf83bf90c49d3f37a7db1292885ee874f268f9c8876a393c1cb84386819c02dfe13569771681c6ea982b21c6cbc
+DIST dolphin-plugins-18.12.1.tar.xz 191968 BLAKE2B 22db98fa22fc3c063c1f7729418957af24517de18dfb6c3c78b416e9d3c9cb99dc49b00f1bf3ede09c48dcded8ce3bf9072cbb062cca7078837f4b5898a69abd SHA512 83fb10c3753648a03817df8afce53d22d0cf98b657f00782b1db47067f4a5731de5946ab5b83bac132ecaf54770645563ea379afe614dc8500007ce0ace0d65b
+EBUILD dolphin-plugins-mercurial-18.12.1.ebuild 1215 BLAKE2B 90ee0b814909b8882fe641727722413bfaacc5c9304505ff04ce7e9c89728fffe9a57ee8d264c5a705919d5eb2f13727eb2ad38b10dc9816ec0be0e742e871dc SHA512 ba6abcc51048e7aa91395db82c11fc7899a31390478d485360510fe7a8d1d1637ea7f891841b2f34fa8b215daf9e6952f60084bacfa6d1d34591329ab2286180
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild
deleted file mode 100644
index ee6c1196d299..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="hg"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.1.ebuild
new file mode 100644
index 000000000000..d9bd63f61355
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-18.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="hg"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Mercurial integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	dev-vcs/mercurial
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_svn=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 8b1327eb4304..414562372347 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,3 +1,3 @@
-DIST dolphin-plugins-18.12.0.tar.xz 191844 BLAKE2B cf4c59909f961d2c295e6a15e963c409302f9ae52c001c284015977c88ed4d6fa71b47d0402bc7049834c702d94169a543e7552f6517882578dc9a0d490bfc6e SHA512 237fb4204267894903708ced1fed771871591606c12d3a25fb1452526fc71146f53f1e26c97954897eab97f08bfacc277dd189082c53aa867829a61e3b098348
-EBUILD dolphin-plugins-subversion-18.12.0.ebuild 1074 BLAKE2B cf4ec001ef28a17d209e8a54b0af9cad57ca88e00ba7ecad0161d161a09336e3feed813f256976d3ac0501774c8387712fc2277e2e04a4b05e3085d78c8c0502 SHA512 33a7a470d9b2e99eb6dd074d1ae7c632c562794dc1ad5a8a285530c6a8eae890610dec28bfd19fa74e61e3afd349a71a20c7529fcd6eea8d24bdc7d3bea5c6cd
+DIST dolphin-plugins-18.12.1.tar.xz 191968 BLAKE2B 22db98fa22fc3c063c1f7729418957af24517de18dfb6c3c78b416e9d3c9cb99dc49b00f1bf3ede09c48dcded8ce3bf9072cbb062cca7078837f4b5898a69abd SHA512 83fb10c3753648a03817df8afce53d22d0cf98b657f00782b1db47067f4a5731de5946ab5b83bac132ecaf54770645563ea379afe614dc8500007ce0ace0d65b
+EBUILD dolphin-plugins-subversion-18.12.1.ebuild 1074 BLAKE2B 6c4c4c454efe416d8fd1cca5e39b276be9617667c3160af18d4e484758a71ec12923de832ad65e7e0cd74723ecf25abaab0260f9ceaa4ffadc6cdc49e5ab1b43 SHA512 6e91970590e6dceae543b8f09272c662c764b3f7c0bc130e665cc4ca68534b7bb56bdf63e69eed487630c58586ddd3a845c5167e8bed4bd6198ea20d66b3e846
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild
deleted file mode 100644
index f08b557c8720..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="svn"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	$(add_kdeapps_dep kompare)
-	dev-vcs/subversion
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
-	# delete non-${PN} translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_${MY_PLUGIN_NAME}=ON
-		-DBUILD_bazaar=OFF
-		-DBUILD_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.1.ebuild
new file mode 100644
index 000000000000..d3b37421d61b
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-18.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="dolphin-plugins"
+KDE_HANDBOOK="false"
+MY_PLUGIN_NAME="svn"
+inherit kde5
+
+DESCRIPTION="Dolphin plugin for Subversion integration"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/dolphin-plugins:5
+	$(add_kdeapps_dep kompare)
+	dev-vcs/subversion
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# kxmlgui, qtnetwork only required by dropbox
+	punt_bogus_dep Qt5 Network
+	punt_bogus_dep KF5 XmlGui
+	# delete non-${PN} translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "*${MY_PLUGIN_NAME}plugin" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_${MY_PLUGIN_NAME}=ON
+		-DBUILD_bazaar=OFF
+		-DBUILD_dropbox=OFF
+		-DBUILD_git=OFF
+		-DBUILD_hg=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5f4c10b1108d..64461a086954 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,6 @@
-AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
 AUX dolphin-18.08.3-kcrash-init.patch 1741 BLAKE2B f569dfc4fc07790b1c69697b2259b6cf13e4bd7ff0d98be5e3b09a8bf0d404f86fdfee001349c8631b8c74c5ba1a73bf6573b130a5d8bf30241560d2dc6a6eef SHA512 34393a2285647ee8e33eebccc2bb563e5ea5298252c88ece505389bceae58ecc953e5daec3ca5f05cf7838f39375474ef97e4b54ec120d0396cd7e3cc5ac0d7b
 DIST dolphin-18.08.3.tar.xz 4859384 BLAKE2B 60361ce997e0e4734fe953f988774dbe28aef9dcb7c2837c3860cfad5f56345d4d635f1478ce42a1649a6d5bd0d3838f722c95a747e1c77f17828d0d38b0ab29 SHA512 f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c
-DIST dolphin-18.12.0.tar.xz 4865672 BLAKE2B 9459f58ab2a04e61a10d1ea7b8b90544246ea179c795e7b119486b60e5446c9f151298a3ed7d5a22dd2a110c9a292e2fe6481b36906981d2e5a329a61eea7583 SHA512 3adf07f4e58cabb91083080f0942d2d8018ec76d391869481de716c1afb6a0fa63e2bb13f94c31f70a7c1cb0d375444fb1ddc44af2522092108795db1b017b15
+DIST dolphin-18.12.1.tar.xz 4865868 BLAKE2B 9f93d6d9607d296ad1452ba2bfb3285ca1b97d9b9b0e02ae5abc04da0f4279051559720591bbd74e8c0249d2b4c5814746814fb5d0deda6a75e9db2dbfc9827a SHA512 5975c594051f9bcc860026075631bb14ea920069826c1f1994b10dbf606b0474e552324ecf0bdd252deb83c9245e3f1af80502fd122806be41fc37851b96ef3c
 EBUILD dolphin-18.08.3.ebuild 2277 BLAKE2B 447bd4a6809cf09a627eb3ae837df58088e6c396cc62e49c0daccf621e96b20210fb91d440ad222861fa17fccecac302769c7a7fcb0969dab208905ca9e841e7 SHA512 0bc9f70ab9a9be684b7b78d9d43d6996a3dd56242768d4acdcdb287e30cd92830ba31e5a01329040312ef213b0a8a42359a9d43bffe9830626e76021444f38bd
-EBUILD dolphin-18.12.0.ebuild 2164 BLAKE2B 0d32ee7e0eb96a2269798176c5c44fa73c6b30de95f3aacf7b894139ea12f14fd72de99402f78568233d2c45b88d01eddd64ad2af42b2eec2b5f3558f5b451f9 SHA512 23153f2ff12d087e161b5997f338a7a40e25ac7fe32af7705de6464f8628a73de9648270c9983a73a46b2862df2482f670804a595030f363684398309685444f
+EBUILD dolphin-18.12.1.ebuild 2164 BLAKE2B 06717c68e5f22723c4e392edca26c31812119056817d47197f81da4abe37232079b411ad9b565cd028451baffd8eaeeae187c1e2043410b04a61403bb279d40c SHA512 7a8ef3b1b9c33c16059111d90c411f7d69d8b1b354a133e0c8f9c3dad0b7fede53105c10a469ddb805adbf5c112da57a65eeb894e5a1b29bf384d5cd944fc3c8
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.12.0.ebuild b/kde-apps/dolphin/dolphin-18.12.0.ebuild
deleted file mode 100644
index 9ec0f8f669a8..000000000000
--- a/kde-apps/dolphin/dolphin-18.12.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="~amd64 ~x86"
-IUSE="semantic-desktop thumbnail"
-
-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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(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 ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/ark:${SLOT}" ; then
-		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-18.12.1.ebuild b/kde-apps/dolphin/dolphin-18.12.1.ebuild
new file mode 100644
index 000000000000..f9dd43686941
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(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 ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
deleted file mode 100644
index 8edef6b36013..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From b607091c3982f6b84732fcf0c23c1c3f0054f203 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Fri, 18 May 2018 22:43:25 +0200
-Subject: [PATCH 1/2] Remove main.cpp from dolphinstatic_SRCS
-
-Summary:
-The file main.cpp is already in dolphin_SRCS and doesn't
-belong in dolphinstatic_SRCS.
-
-Normally the duplicate object is simply ignored, but with
-link time optimization (LTO), linking dolphin can fail.
-Apparently, the compiler tries to inline inline kdemain()
-in this case. That is undesirable anyway and it ultimately
-fails because the DBusInterface definition is not available:
-
-.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
-<artificial>:(.text+0x2583): undefined reference to `vtable for DBusInterface'
-.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
-<artificial>:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
-.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
-<artificial>:(.text+0x7686): undefined reference to `DBusInterface::DBusInterface()'
-<artificial>:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
-collect2: error: ld returned 1 exit status
-
-See also <https://bugs.gentoo.org/655710>.
-
-Reviewers: #dolphin, elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: elvisangelaccio, asturmlechner, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12929
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 263b3ff0c..e8fe719a4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -207,7 +207,6 @@ set(dolphinstatic_SRCS
-     dolphintabwidget.cpp
-     trash/dolphintrash.cpp
-     filterbar/filterbar.cpp
--    main.cpp
-     panels/information/filemetadataconfigurationdialog.cpp
-     panels/information/informationpanel.cpp
-     panels/information/informationpanelcontent.cpp
--- 
-2.17.0
-
-
-From 8e6f4eecd318041d2e4e6386d1660742dd4ddd89 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Fri, 18 May 2018 22:44:52 +0200
-Subject: [PATCH 2/2] Make target_link_libraries for kdeinit_dolphin PRIVATE
-
-Summary:
-There is no need to add all of kdeinit_dolphin's
-dependencies (including the static archive) when
-linking dolphin; kdemain is the only needed symbol.
-Mark the link libraries PRIVATE to simplify the
-link command for dolphin.
-
-Reviewers: #dolphin, elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: asturmlechner, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12931
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e8fe719a4..beaa0ec50 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,7 +299,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
- kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
- 
- 
--target_link_libraries(kdeinit_dolphin
-+target_link_libraries(kdeinit_dolphin PRIVATE
-     dolphinstatic
-     dolphinprivate
- )
--- 
-2.17.0
-
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 956679e013be..c22d428f3c44 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-18.08.3.tar.xz 1729504 BLAKE2B e71109ff173065cf3db908594709e5b45510753fe6edadfcecb19dbcfb2dd9715d7635943efa04aa3a546bb8119b7b5dfc3b5feba66c2fe016f458f0e30f4e3c SHA512 86706c84c65c2780780d292f2a32b43ff4096d7beb12ba25a72e61ac9f05cc321fea9eef85f0c9c38afd58e68d74d0cbf683443367d499b8e9f678ca310cb3a8
-DIST dragon-18.12.0.tar.xz 1729000 BLAKE2B 0c8305f66b5c706a75e8cc92ee967fbf521da9791d0c16d5e9ffd549babd73225551d5e40627b85033f1b6e67f2cc02a1e50e26ef9de4906eaecb2e9b49f38c3 SHA512 f3d4596ddb990c6936980448c2a53533086bc7d8d1d8648f7b8d2959a7a779aa009d1b5897fd2d79b0e67e17b1e636231c1f7bfd42a6464ba7347faec6d48664
+DIST dragon-18.12.1.tar.xz 1664108 BLAKE2B 59af3bc9a49915543311a374b43c46de47107de185f4e8f9de3bb1d33c05d518bf8ca7aa1a7e5dea71f243b86559c91da6fe95f7c4638b8a4ae56a7e1e2bcfc2 SHA512 82359dda35c4898187a22c009111eedccbfb2923a998673ef56b542f4badf573eccefe798f1a4feec8eee663369d70b6aa02cd200b08fcba766e9b28be02ec13
 EBUILD dragon-18.08.3.ebuild 991 BLAKE2B 36ccfda7c7bd085b4625f2ab22e38fa4336428e15b3a2024bdf7e810a2f9270027b47d930ec8f84538129eb66ce171d78952bb1e335ff4aa98e9521331c275a0 SHA512 5893fca443e2f0128697c965b745dbe5d002bf1db9883443fe0982b59fdbf962417308bb59e4d6b7c41fe50fa303d16d83c0c808b9c435c6fa339c1ee3c632d5
-EBUILD dragon-18.12.0.ebuild 993 BLAKE2B b720c8ce300b399662511ba84e6098a6fd36a88595610e3d9b94278b1e8c64230214b1ea64e27a925aeca5eb5e7eacdad7de495932d573a38da54935f42ad61d SHA512 15ce60f0325f8c7e0ef967297d2bf4f77f8a4005540864a9ecbf48cdae7288d70d1ecbec6e85a0c6504b167cf94422718db4988a70f0a8840d36d95a422cfff8
+EBUILD dragon-18.12.1.ebuild 993 BLAKE2B c759f1a711ab2ac0f01ebd1486d350c3f16cbac3ea3c17c5cbadf87b5ce997f82ab7d28d877d3f47c4cc847fe19393f08be8187bd84765e42e074382cd274941 SHA512 ff19e0ec0ffa745fc43a70ca6260418db64ca1b49807cae81004f695a472ecbc034a978a1a4d649d4a3154d5e6b685fff8a6947d7c3ec20806c4b85820542b06
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-18.12.0.ebuild b/kde-apps/dragon/dragon-18.12.0.ebuild
deleted file mode 100644
index a371377fcaa0..000000000000
--- a/kde-apps/dragon/dragon-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A simple video player"
-HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(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_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/dragon/dragon-18.12.1.ebuild b/kde-apps/dragon/dragon-18.12.1.ebuild
new file mode 100644
index 000000000000..79dbb1c94e5e
--- /dev/null
+++ b/kde-apps/dragon/dragon-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A simple video player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
+
+LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(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_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index e62b793ddd98..7ea0e8edcc07 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-18.08.3.tar.xz 441396 BLAKE2B bed5619fb10dfd37e0d8a0f943abe97a817b509a986931bc7d1e3bf8da4e43a0810209414620acfb7c2c68cf3ae27b91b0c76431cb6f42a05160c73cf06da8ee SHA512 957e700acffedf47f0a247e80d11e6bff03edb3b831a1a91c81b67d347f5add03f49f6f6f2257ddafde193a947a14e07b648e98ede89f1e47417746a899a9dfc
-DIST eventviews-18.12.0.tar.xz 443136 BLAKE2B a88bbf9996ed58bf8875897317cab50602ac2ada7ebeae72e24997d6e77e0808ddd4eb6320c1551cdb4f68bd2af5c848fbc8c17604c00516baf9164e3d129e11 SHA512 378489a355fc82478c10dc4259ef881d8ee64e12da4161e758e2037b5458974d2cf8ed4e358d9ee21e0f162dee015ba9455db17924200c3f91fb838de6f6c999
+DIST eventviews-18.12.1.tar.xz 443328 BLAKE2B 68305acb6f905b488f4814b173212b258902dc6913f84f7a340335cd56fff3a1b7163c83bb7e23075c8194069c45d5a543f7843d5f56efa11defe9421f7cbf16 SHA512 61d7ab286129961ebf80a58159f0723c70e21e16ba85e6e880eda30cb603ebfc70e54076e31b393b8be01150e245f7135aa0e60da03b30dcc8c49111f5d66b4a
 EBUILD eventviews-18.08.3.ebuild 1025 BLAKE2B 22d22bb1c54c43e63224b6c192d7b7e79c4df644b118a6ffcf8d6b3cbe7ef6c9dceb0ce168bfec330c8765379e63f24f740898b52eed4fdae5886d40600afa81 SHA512 f1e76e142c7b40696ad8a34b4d98fcec3312babb2763d5a3d9174fd288e355f268130aa876a2fd8c2b1b5266b3f7cc87df7987e7e2e0c4af78802425ff6de15c
-EBUILD eventviews-18.12.0.ebuild 1027 BLAKE2B b51db68a282d9cd7781ef3b97b98ead0eda79d37c55145c84d7316b408f7a054044c85a43b1d9fcfd5062739915a199e330629af63ef90a225b5fab52c34d03f SHA512 d6369f75bd91339740e72b4ac54fdfa433fe2655705fa595230b9f24e4a32c48cccfcdab056d4ac5d8e2290e310b666a063db3f11e9f05f19174f641ddc9aa83
+EBUILD eventviews-18.12.1.ebuild 1027 BLAKE2B 5cef7d1645149824595868df1388d1a6a04660f3a1389099988f288bc5f9c64f339118f57f4750bc0efab72dc3be14df4e4eb2b92377871b1819100d69a5c25c SHA512 8b8a8f1f07f01d87b5b3c75a07f5b6e573c2e7c69f5925deb936d0e8dcc88a16bb6d482d0b729fb04b1792510acfe598edab4ba55dcff339671a4e528f99be9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-18.12.0.ebuild b/kde-apps/eventviews/eventviews-18.12.0.ebuild
deleted file mode 100644
index d618d2529733..000000000000
--- a/kde-apps/eventviews/eventviews-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-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 kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-18.12.1.ebuild b/kde-apps/eventviews/eventviews-18.12.1.ebuild
new file mode 100644
index 000000000000..116bcd5d9c24
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+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 kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 6f5dd8155a02..6a89ee613e50 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-18.08.3.tar.xz 21860 BLAKE2B 8ba95b874473db9a0e3788f065983804c903f4e74abe591bd28783f784883fff1ee0b01fb089c074819013d5d4f4e27df0b9f93aaa25dc9d94189e1f1d36bfe7 SHA512 d4f08c29d09436140b9723dc7a82f48f959e69e3df7fcce0a6d1bb18ad6bee9cfdabdde4a8e5fc6c830ac57280095885c7f07ff7c22b330c1312ecd5135aa967
-DIST ffmpegthumbs-18.12.0.tar.xz 21880 BLAKE2B 5e507ef94845797d6f71a81423f89e56462e6647469e87d9bc60a5946740bb60539c24e3afa4960b22238dd40d14da126213702e0f77e36e9c0684ccf6601547 SHA512 8b975e10309354a1132726afc0209a3a1ec8ed8c2a9f99c370ed82c48d076f8c33bf0d5e07e0ff5f532965cc876ccc6e0ce11daa2144da265a46f5e404dcce13
+DIST ffmpegthumbs-18.12.1.tar.xz 23972 BLAKE2B 551d296fb5272cd5dbc8f1267a693509e4a237e90e99a3acc93f1cf30b11e975428c0cb08b492bc1c689b832f48570892571653273abb9ab51a24fa6a23f1a7a SHA512 710c9f7a1b17d299268ed11fb99637d617a3d47deb51ba0bdda210023af859a434fd5ae15455bf3c8dc953888c2af5d697ae90f574ef679307b9f756f110507c
 EBUILD ffmpegthumbs-18.08.3.ebuild 518 BLAKE2B 60c00bdd5465c003f951e2436196e7ca11cef0803925dd5cd696d6b2a3b1257e3c3fc30104e8b654c978b4345902122c2b71307ba76fc9ac55af0477df56a371 SHA512 9ef38bc4ca10c6e3caabef909a0c9715081b3ef6a0d5cd2c4a1098417a0b3f382fde378db47cfe436eb8fe408aac9767adf5346b50a8bcb8ff82b1a3c2eb1b6e
-EBUILD ffmpegthumbs-18.12.0.ebuild 520 BLAKE2B 04485ae5ae44fdf96fa5650b505be141b9821952ab0de0e0e797425139a2205b76a2376e2942c61d0c88c6e5524339bf20b007960776f369e0fe997646385d50 SHA512 22ea414e3912603fe0f5db8cbf1b6d4c428b8f1ed1d8ee90a801a13226a9029b915bf6c8cdfa5b89e881a2f0c918e83c464126c23a9e22ffe16613666eb7d779
+EBUILD ffmpegthumbs-18.12.1.ebuild 520 BLAKE2B 77425c1573882bc642aa359d53839da34ad988809f7c520dac811b06e4d86364fea4c498533ff164ca2310c81a2d56ad099e2356e43ada2702ce76dac3c4294d SHA512 ea5914c88ff879bd3dd5c7af5b54ad06a837deec5438907d5a278a9fd8689bf057e0279308d72fd1c95f4e2e676f55bca010851c1b211c7147910f85cbd9d71a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.0.ebuild
deleted file mode 100644
index e0514b8dcdcf..000000000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="FFmpeg based thumbnail generator for video files"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.1.ebuild
new file mode 100644
index 000000000000..1fd247decc8b
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.12.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 7a0143b4820c..24ac38b002dd 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-18.08.3.tar.xz 659608 BLAKE2B 45451d5c6a89798ca2461931f0bd113f66261088ea5c599bba3235c9fe87793a1c8941f2c8240da0071c61298fb1396d32afe0a4941af7008f4e30a635d7a1d0 SHA512 aece68cff2fe136515f70b4bcfd7e26aa7643f02a147e98b378b78ea0981036c0738c0f6f176b4d64c58bce1d5835f0be74bfa6a396e593d0dbf0e9ef864b042
-DIST filelight-18.12.0.tar.xz 660372 BLAKE2B ca31e89a2afb9641ba4be4aab99994a2fc9a1bf4b6d2d6c0c60cf6f10717d78f25b3bc90bf4e9e95cc13a9bfd1415875c59a26f4e6ec40fbb8933370fe98aeb5 SHA512 14719fb462e1eaf5146428e103cb6946b8122237341d969f754b78b0e9657a750e8aecf12b40ab0209766f964b364b3e1d54cf3926e4e081b05a6827209e959d
+DIST filelight-18.12.1.tar.xz 660432 BLAKE2B f68a6551b6495b5b004f7a2ad37dfe46713b2cf6dde018bf4c383652c19980b8919afd672bb60ae82a5882eeae4050ac0a731bd7281d770ff103a5b06e6d71e9 SHA512 f1076813fe9c141b04ab966c7766263edc987a074e26f259c701c207a5b1dc64f68ab07da793cfb55b02f97f30e8927bb497407894ff0180508a07de48115b6f
 EBUILD filelight-18.08.3.ebuild 694 BLAKE2B d67c02cef69417414b879414e546f61410f7eb5c7e4b6b6ed0b18b18dd026105dc540c90b95abf91a3ca376ae906b66fa713f8a4b215df7134d046f463840667 SHA512 a2a35a4f6d26ee8ce64e87f63e3446a12cee5af9e322272ddb9f44d2013ebed2ed9e7c94c08fd4b6dc7caae68f90cc4dc60209814abf3e63c34ccbe26a2c88be
-EBUILD filelight-18.12.0.ebuild 696 BLAKE2B 7b695029497cb4c20c2ffb26aa1b13dacd690ddb01fed12fcf2a209c87189bc5db2aec4c0b10967464df1bad3ba9a0d4974a4b13fee3c3257eff035156502e7f SHA512 b2edcab20dfbe7f4f3cd7e61a9f1072e93ebd4d91bfb2521af433292d4c9ec8d30c271056b50df8e3bf3fe45efae61c94cf6b5428c30a2bb6dd47512a96f2c22
+EBUILD filelight-18.12.1.ebuild 696 BLAKE2B 0f9263a9ee9e1ef7879ea4f8109bd8d06c557ed65ef82d5f09a384a198416d635cad4066aae00c065f59313983c24113ba2084817687aeb67c4a141bff096e8a SHA512 607f3e4f19824c644e00d2888be5c92bf29319379573b3fdb88b20147ab4bf0c6ba77578cf9eb531146d4c5b81a8b047f232fe4322f70d7b4e4160cc87805d2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-18.12.0.ebuild b/kde-apps/filelight/filelight-18.12.0.ebuild
deleted file mode 100644
index 396d11abd4ae..000000000000
--- a/kde-apps/filelight/filelight-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/filelight-18.12.1.ebuild b/kde-apps/filelight/filelight-18.12.1.ebuild
new file mode 100644
index 000000000000..5697f2f54ebc
--- /dev/null
+++ b/kde-apps/filelight/filelight-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://utils.kde.org/projects/filelight/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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 kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 7adee86a1fe8..42bb912270be 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-18.08.3.tar.xz 1943028 BLAKE2B a6cbd8fc61687b825ca84db608f792e7ade19d1edee28a645ca000487479ac479ac3f27a0e6cd5e05805893da484f9aaec8759f44557309abd6557fe4341fce7 SHA512 9f4a49af1ccf004bae32910d53a4a83731b6942c4dec107ee5a80aa950501b12d98ed2b0f2a3a3ca37ca5f6608501a04ab2153304adbc91951aaa83503421250
-DIST granatier-18.12.0.tar.xz 1942924 BLAKE2B 83835a94a082e7fb6fa603be7eefe10eb8e8c681d83da857a6af417d98b69c970c58f027aab900871a846a6d3f67a0c7acffad2e00be6f039081e45a654a30a3 SHA512 90deffbaa728c43eeca07ddf777019823c0b856fe40bff71c79ce3e8343808b4ad993099877a9ff49680af83970a307debe6c75858f7a53e7f486677ac65310b
+DIST granatier-18.12.1.tar.xz 1942824 BLAKE2B 940d1c754561df6cdc0ce8e7652dd44467ede17df3e37d9873b65eb71325d1244463497314179f14c5088e0b485798ffc792488b6fab0f1a7f04a9ebbc1905e6 SHA512 aed7507325a34b456fe13ecf42b5cf37ca84ba8e996efcf8504b6d7ad3166be09ccc28f151d3b2698ad23c67c7946e27132748b4553f3e6e287fc9d4352aa220
 EBUILD granatier-18.08.3.ebuild 731 BLAKE2B f780362472af2634eddfb9f9a6fda38ed42304310826a7dbe9a5e4419332ce97ce236fb78e24c702e70447d5123d0f6b0398ad89f62746addbf962451e55a03b SHA512 00b7ea7d413c113ad9d74b136fcc443059f6a379ab87c7f7e0a2ce49245582a636bb4d79868038697bf5857f71992941d9306d8ea126e2938bedc93d9dc5498f
-EBUILD granatier-18.12.0.ebuild 733 BLAKE2B 42f684cb3b9a7a4cb1998b7b9e752a374376316abbdbab58e0ffad21d2bacfe3f9dd0a3d4106aa353ad29e32fd0dbec2cd7aa55f7406910ccdc5cfd1bcb08438 SHA512 9cb23de5f60c9018325b9b9be03cb732accd599dbb8880e3b7a79fd98eae07f6492ef73bb5cbee4a6858b658b648bdd68bb8927622cdcdc4c1c3274998db83a9
+EBUILD granatier-18.12.1.ebuild 733 BLAKE2B 995390e4e88917a2c50bf6b9dca432c3e16b1b7f809f25d29be0e0b2b5c4153f9fb2b85a58628c5339215e8423c1f5f7f7e24899b4e56952cd53cc2979098a32 SHA512 779e76ec319a87a921efc8c3dd5b02c23cba3e714b8e3fc0ac60c29393d0d857c58d8bac1ff5530639f2aeab5b8f97fe12455f8d8086711d988827517bd41b65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-18.12.0.ebuild b/kde-apps/granatier/granatier-18.12.0.ebuild
deleted file mode 100644
index 80660b8c4c0a..000000000000
--- a/kde-apps/granatier/granatier-18.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-18.12.1.ebuild b/kde-apps/granatier/granatier-18.12.1.ebuild
new file mode 100644
index 000000000000..20057cfc9865
--- /dev/null
+++ b/kde-apps/granatier/granatier-18.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Bomberman game"
+HOMEPAGE="https://www.kde.org/applications/games/granatier/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 29f368f6198f..ced909f49551 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-18.08.3.tar.xz 111340 BLAKE2B 60cc21a9912876f4e6e3844b3fde8d98a20ad073a871c28ea284ec1a3fa88190af463fc3d79f4331ddb723673b846b157562bb9f45b677fee8b690ba51b82fb8 SHA512 f02a2f59ede6a03af556d470291356f8e003292609cb8109b6690e7946ef2a67bab6ec12fb12ebbbeb481aa6f14cbcfc0217e008ba88e92a4b567976f32fe89b
-DIST grantlee-editor-18.12.0.tar.xz 110700 BLAKE2B 7544f96ccf6d31f59a58436338f32a8c6a48cb0d503cb3b5d2f5bf519f8a969df6369a8472cf0b9cd9860029340344b5da04308e131bdeea27932cfeb24251a6 SHA512 e0d649188474c1d9fa14cf7a731d719d7e30b573dd00b0f1030fe989a2380c1512a4f290d96ff906ee5c8d55d140a6f4cffac4581254c40689b997c534f623cf
+DIST grantlee-editor-18.12.1.tar.xz 110696 BLAKE2B ac05c0e9f62a1babea55572c2cbbb0eeb0ad1ea1e23924869a120e8ad32a3d3920f6f46553a591ce776206fde48d953df4948574cfa488454bd2af1ea7cd7d63 SHA512 0150e6888b843ae1b143288928b60b007d57611721af3f97c7b67ed080b69dbafa6215132006302095ee9e75dc7756313c35eba4b663e8b2748453d759e73031
 EBUILD grantlee-editor-18.08.3.ebuild 1163 BLAKE2B cfa5779e05da70f362dfa6f30097431f32e26e79ffac51b9bc2399dac7973539eec95a7e21f19c8da35e82d18281c5d5ee823cea01e3632ce2460f0b4c5eb211 SHA512 2ba6926f18f52f26a98220c853ecc193481e8e778d7e54411b59a726837357d4a99442bdb10b4820c2dc5633153032390807891da069b5b6cb68a7763d6b7e62
-EBUILD grantlee-editor-18.12.0.ebuild 1165 BLAKE2B e9db0847d50cf3ac5acb9fcba05306adbd08a0f3d3ebb10bfdecb9b2db9e78b4d710aadae344bf7fb1f888ad771666718ac22e12384ebb71c65874ec38f4d28a SHA512 e2aaf9a6a8cd74f924aec7fef5d89bbb9ef6158d3b45b3239f43581c0418c868fe734fad66960a09179b4572b6472237ad0798b950ff5bd4277382771486dfa7
+EBUILD grantlee-editor-18.12.1.ebuild 1165 BLAKE2B a53c75ad5763e4e8aae67ba154cf73965825804f6f344987c481231362d3948fe640c8723cc4f4bdd971545d7ddeec2dc8b10b46db84a8c687bc614ce82521f8 SHA512 4ae01f20f174878800f0d04d558e3b99a4e76ed2bc1ae481af50c8af4a3bec31c85e1488e7aca3b9236065413963ee2271db785ffd32835d4100ce31390f8bad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.12.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.12.0.ebuild
deleted file mode 100644
index 1dbf5cbc2248..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.12.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.12.1.ebuild
new file mode 100644
index 000000000000..504fe14f690e
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 343af71068b7..c0758adb2f42 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-18.08.3.tar.xz 51740 BLAKE2B 1c83c9b8d2c376b52416e50bc4b4d82630e17b81e7de51467540fe3b2629983f376780776daa64c26f49b7a3599078256b7e4b4a07d27d2c23bb37e5631304ae SHA512 38331cef77b89c5ca26ffab95bb246942d96fecb719c2341ecde65b049489a2b6883dc4ba87ec4717e7bb10d549fe7a2818b6dc60889dae64f144a80d21fbede
-DIST grantleetheme-18.12.0.tar.xz 51580 BLAKE2B 629513072d44020c037b54c74542b9e8c80117e4b5b4065ed95ccaa7b318bdec039b2888f425e80a8a5abe5fdb4b0a303b8c29d71e33d317c26ba55eb5e09230 SHA512 852923dde7b8c0fb97fb00617b741dd1659dc9930a8b3f91ac6021e243e086c476da21ff7ce2d93e2d939a64b89301aa3ff151b351ae257d686878a0e9733ac5
+DIST grantleetheme-18.12.1.tar.xz 51524 BLAKE2B e55f8fa85e1921e831c65ee0a9541f1bfcc94a313d29473cd6ade809380177eec622365b8af49ac3f445e5573b58106385bda862e3aeb0009b8427abaadbd3bb SHA512 f39bd2cd8bfc0e50499983301c8a883d0b6fd7fffccb467ad8f6d1c47f089add07dcf57a48b6e44ff54643b2b856032b44bb89966adec2cea878e720c0f9a0f1
 EBUILD grantleetheme-18.08.3.ebuild 732 BLAKE2B 0b539237636abd9ce2840f011b620bf6d1a5834f0bce48f6033834e4127e665bffb56d098f84960addea1d006bdcc132bdf170c472874a936b975836698e297d SHA512 290897194ed9f4200532ea6e0d9ca5e340295a57653fa9a4df265464f5312cb118c3053e699a748a7852c861b530bbd31e200545fc9aa23007c51a76bda2f668
-EBUILD grantleetheme-18.12.0.ebuild 734 BLAKE2B 11301736cfedc092b6b9b30fde0487fb47e5310d2b1c131f81c64cb2a4e6b6f75abb93dbe3494dccabf836480f82d246d3e442c2b3fd0de21a2dc27f540a5c51 SHA512 d5808504fa3ee116e0ff1f1c29e03b9d2d073995b5a2e3294c3b28d1c7a82bd2ebff0e14de979aa193d6fd8aa657548f6aa9be76cf2303afdecbc53702ec215d
+EBUILD grantleetheme-18.12.1.ebuild 734 BLAKE2B d10930bb9e21b52e849734f7fa12101fe1a3eb52157b3ef7f0aa10acc1bac85ca822f219c9278afee27efa3c6e5292283f89350745a3c93c831354cb42233405 SHA512 3a78cad314a948f5b9bf8701cbf6b9f8bdf640d332096c38ccf29c08c4a6601124bb4ff218d3c928c6fbb75283b6b52bf5c8dfb0ac6f82d6d0cb952889402a6a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-18.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-18.12.0.ebuild
deleted file mode 100644
index b12c371bd9ed..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-18.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-18.12.1.ebuild
new file mode 100644
index 000000000000..e1a3be2ede14
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for Grantlee plugins"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index 93da9283cb9e..73fa445b979f 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,7 +1,8 @@
 AUX gwenview-18.07.90-activities-optional.patch 5078 BLAKE2B 692a743c319a9498de88af97b113e123ec445322f55513fcae58d4c556b29c23f0b2586e292900fb8e233c5cd2b33a7f76cf759b0c0ad119efb7daa7c290263c SHA512 2afd6fe89d1b455723d15f38866a476f8872e45d0548c36432f4b08d6404d02c4c03f78bfa60ec7dbddad022fef32283155b3ce27a9a8b16c4b753246b301106
 AUX gwenview-18.12.0-exiv2-0.27.patch 6552 BLAKE2B b57836867fe29e0d099d24b1b935ab4899909d94484a3c060e5a1ee97a2cf297c4fe444cc4b6a85d4f9727b68344013ed2292260a7e217b24d85b4debcacea13 SHA512 526fb77137cd504eb72a5bc6ba74a71efab7842f9ada3e4d7f0465284aa5d50cb6619fb54a555b8d959be3d305a302bf8d1b75162b60970523c628b09b04ca6e
+AUX gwenview-18.12.1-exiv2-0.27.patch 15804 BLAKE2B cabf4b2d042a2b5133ff22100fc2cd7d8e06df3b166574add355b13b7bb2e1b6a482c9bbc64a357738b0460765b3eab3303e39bc00dae2cdfb96ccb931c2e85a SHA512 238f40b55008c2de700cad637db09a824dac1cbd01d6997c4d25c4cf864b858c43b2768990eddb096086b7e549762b6d8b47ec09418e1917fa6c09ebee821043
 DIST gwenview-18.08.3.tar.xz 6178192 BLAKE2B 0b25bdd64398f7ef1310598daad07374ca56383578fd67a8e36e348e78e1d818335fe4d630cc733e7a1eb13eaafca268426aea5afbb44195106742c50587c74d SHA512 0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce
-DIST gwenview-18.12.0.tar.xz 6178072 BLAKE2B 4066165db148987c606e85c47cb6a47f236c07938d3819ca76ce6c083764874360cbba82c6b9cbe9a7d72771269a8b66a7894634a55f3d9a2d6db027c982aa2e SHA512 ef7f706c3c3278ca4f826518824f7457948b5fdac2d49cdb55977d55829cc90852745833fd86b94a5ce2cc7b55286c864b05f9a51d546e29538bf0f32bec2ec4
+DIST gwenview-18.12.1.tar.xz 5714244 BLAKE2B f4330290cd3230e40acc8427205c62dc99ddfe65165e03409efb8eee0a54303cf02de4a3fb308bc55d96314ed21aaf9783cd67d9a1e4aec08a2360f5e0ff7b03 SHA512 609c670bc7ff8007fbc96d1fb4de9a0686e8e8c1171c396ae00b1c96fb531855a3881c57bcdf578e1c6c29670fda58ef6eaab407d60ad7f7f419e7c92d5a4d8d
 EBUILD gwenview-18.08.3.ebuild 2788 BLAKE2B c77ccacf146ac431a6e604c6a69107c54a5af2c50c907dafcdad900527aa5dbfdc4cc1405920d7502feff53309bbfce8cbbd244483a8c7842862839367518759 SHA512 4652f7225a398412bfe6737adf2fc437376640cdaff0d3976ebaaca8de15eacb9c9e99b0f950e0a589bce01ea38fdafbd3ddef3dc09b5a07c0d24688179a4b8c
-EBUILD gwenview-18.12.0.ebuild 2730 BLAKE2B 571bd16dafbdb7b345c0964306b2290bac34c6c0255316c6d76303493808d896bb615d0d96743aa022e4e7b38631d9c856e2ceb02003fe032ff90c75deb8a075 SHA512 078b12f52f70efb981259da4d54de975f8fb59579e8fa4233ebf7198ba5de5cd850dfdeb02ce5bb612d55ad7376a5d8f279d40adff74319cd2d17fd861652e92
+EBUILD gwenview-18.12.1.ebuild 2704 BLAKE2B 2a07dd21da9e69cca80429e36f73896519fa8d9f8ab216ad42dfe4c66a0d5fd21cc87311ddfd293284b720ba434b49c06fefc332f9e3b568b9e32df2d6feb686 SHA512 12f0d7579a6afe9948bf2d1085801a4ad12b885cc5a7470c8db43cb79c7df4c6beea21317fa99d0cb65610c185ae6ec962e2020d5920a19e779541f7706a95d5
 MISC metadata.xml 608 BLAKE2B 19b5fd4798750b2efd9d68a6271cb7c0c1c63e82075f2ac68fdf12bf57c5e695d3d9ee08f49d7cc22e0b15931eed086690b3af478486a858c4c233ee23b34ab0 SHA512 bc0c98d5420300aa4f17b0f544bc9cd44d8755ac716c099a5787769705e72eab9aae5d4b9a653434234dc605362f3c0d3d362121ab8c75978cdbde8f5fc774de
diff --git a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
new file mode 100644
index 000000000000..66ed9ed83453
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
@@ -0,0 +1,523 @@
+From 61543b42289fc986e580f2e3443719f3334f17b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sun, 30 Dec 2018 02:46:28 +0100
+Subject: [PATCH 1/2] Use forward declaration for Exiv2::Image, port to
+ std::unique_ptr
+
+Summary:
+Instead of the Exiv2::Image::AutoPtr typedef just use a forward declaration
+for Exiv2::Image, and use std::unique_ptr instead of std::auto_ptr.
+
+The forward declaration avoids pulling in Exiv2 declarations everywhere,
+e.g. via document.h.
+
+Although it would be possible to use std::auto_ptr, unique_ptr is
+preferable for two reasons:
+- ownership transfer is explicit (std::move, release()/reset())
+- Exiv2 0.28 will use std::unique_ptr as well, i.e. the code is forward
+compatible.
+
+Reviewers: #gwenview, cfeck, ngraham
+
+Reviewed By: #gwenview, ngraham
+
+Subscribers: lbeltrame, ngraham, asturmlechner, shubham
+
+Tags: #gwenview
+
+Differential Revision: https://phabricator.kde.org/D17872
+---
+ lib/cms/cmsprofile.cpp                |  3 +++
+ lib/cms/cmsprofile.h                  |  8 +++++---
+ lib/document/abstractdocumentimpl.cpp |  5 +++--
+ lib/document/abstractdocumentimpl.h   |  7 ++++++-
+ lib/document/document.cpp             |  7 +++++--
+ lib/document/document.h               | 11 ++++++++---
+ lib/document/document_p.h             | 10 +++++++++-
+ lib/document/loadingdocumentimpl.cpp  |  7 +++++--
+ lib/exiv2imageloader.cpp              | 13 ++++++-------
+ lib/exiv2imageloader.h                | 11 ++++++++---
+ lib/jpegcontent.cpp                   | 10 +++++-----
+ lib/timeutils.cpp                     |  8 +++++---
+ tests/auto/cmsprofiletest.cpp         |  4 ++--
+ tests/auto/imagemetainfomodeltest.cpp |  9 +++++++--
+ 14 files changed, 77 insertions(+), 36 deletions(-)
+
+diff --git a/lib/cms/cmsprofile.cpp b/lib/cms/cmsprofile.cpp
+index 188b90a4..7d2b753e 100644
+--- a/lib/cms/cmsprofile.cpp
++++ b/lib/cms/cmsprofile.cpp
+@@ -42,6 +42,9 @@ extern "C" {
+ // lcms
+ #include <lcms2.h>
+ 
++// Exiv2
++#include <exiv2/exiv2.hpp>
++
+ // X11
+ #ifdef HAVE_X11
+ #include <X11/Xlib.h>
+diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
+index a2a38a87..06c7672d 100644
+--- a/lib/cms/cmsprofile.h
++++ b/lib/cms/cmsprofile.h
+@@ -29,12 +29,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #include <QExplicitlySharedDataPointer>
+ #include <QSharedData>
+ 
+-// Exiv2
+-#include <exiv2/image.hpp>
+-
+ class QByteArray;
+ class QString;
+ 
++namespace Exiv2
++{
++    class Image;
++}
++
+ typedef void* cmsHPROFILE;
+ 
+ namespace Gwenview
+diff --git a/lib/document/abstractdocumentimpl.cpp b/lib/document/abstractdocumentimpl.cpp
+index d841ae5f..d3d0002c 100644
+--- a/lib/document/abstractdocumentimpl.cpp
++++ b/lib/document/abstractdocumentimpl.cpp
+@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ // Self
+ #include "abstractdocumentimpl.h"
+ 
++#include <exiv2/exiv2.hpp>
+ // Qt
+ 
+ // KDE
+@@ -77,9 +78,9 @@ void AbstractDocumentImpl::setDocumentKind(MimeTypeUtils::Kind kind)
+     d->mDocument->setKind(kind);
+ }
+ 
+-void AbstractDocumentImpl::setDocumentExiv2Image(Exiv2::Image::AutoPtr image)
++void AbstractDocumentImpl::setDocumentExiv2Image(std::unique_ptr<Exiv2::Image> image)
+ {
+-    d->mDocument->setExiv2Image(image);
++    d->mDocument->setExiv2Image(std::move(image));
+ }
+ 
+ void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image, int invertedZoom)
+diff --git a/lib/document/abstractdocumentimpl.h b/lib/document/abstractdocumentimpl.h
+index 1f427e60..86e6bfd2 100644
+--- a/lib/document/abstractdocumentimpl.h
++++ b/lib/document/abstractdocumentimpl.h
+@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ class QImage;
+ class QRect;
+ 
++namespace Exiv2
++{
++    class Image;
++}
++
+ namespace Gwenview
+ {
+ 
+@@ -108,7 +113,7 @@ protected:
+     void setDocumentImageSize(const QSize& size);
+     void setDocumentKind(MimeTypeUtils::Kind);
+     void setDocumentFormat(const QByteArray& format);
+-    void setDocumentExiv2Image(Exiv2::Image::AutoPtr);
++    void setDocumentExiv2Image(std::unique_ptr<Exiv2::Image>);
+     void setDocumentDownSampledImage(const QImage&, int invertedZoom);
+     void setDocumentCmsProfile(Cms::Profile::Ptr profile);
+     void setDocumentErrorString(const QString&);
+diff --git a/lib/document/document.cpp b/lib/document/document.cpp
+index 18756700..afa9ed03 100644
+--- a/lib/document/document.cpp
++++ b/lib/document/document.cpp
+@@ -31,6 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #include <KLocalizedString>
+ #include <KJobUiDelegate>
+ 
++// Exiv2
++#include <exiv2/exiv2.hpp>
++
+ // Local
+ #include "documentjob.h"
+ #include "emptydocumentimpl.h"
+@@ -388,9 +391,9 @@ AbstractDocumentEditor* Document::editor()
+     return d->mImpl->editor();
+ }
+ 
+-void Document::setExiv2Image(Exiv2::Image::AutoPtr image)
++void Document::setExiv2Image(std::unique_ptr<Exiv2::Image> image)
+ {
+-    d->mExiv2Image = image;
++    d->mExiv2Image = std::move(image);
+     d->mImageMetaInfoModel.setExiv2Image(d->mExiv2Image.get());
+     emit metaInfoUpdated();
+ }
+diff --git a/lib/document/document.h b/lib/document/document.h
+index c0bb454b..4b40a6e1 100644
+--- a/lib/document/document.h
++++ b/lib/document/document.h
+@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ #include <lib/gwenviewlib_export.h>
+ 
+-#include <string.h>
+-#include <exiv2/image.hpp>
++// STL
++#include <memory>
+ 
+ // Qt
+ #include <QObject>
+@@ -43,6 +43,11 @@ class QUndoStack;
+ class KJob;
+ class QUrl;
+ 
++namespace Exiv2
++{
++    class Image;
++}
++
+ namespace Gwenview
+ {
+ 
+@@ -235,7 +240,7 @@ private:
+     void setKind(MimeTypeUtils::Kind);
+     void setFormat(const QByteArray&);
+     void setSize(const QSize&);
+-    void setExiv2Image(Exiv2::Image::AutoPtr);
++    void setExiv2Image(std::unique_ptr<Exiv2::Image>);
+     void setDownSampledImage(const QImage&, int invertedZoom);
+     void switchToImpl(AbstractDocumentImpl* impl);
+     void setErrorString(const QString&);
+diff --git a/lib/document/document_p.h b/lib/document/document_p.h
+index 78e0ac6e..4de25f15 100644
+--- a/lib/document/document_p.h
++++ b/lib/document/document_p.h
+@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #ifndef DOCUMENT_P_H
+ #define DOCUMENT_P_H
+ 
++// STL
++#include <memory>
++
+ // Local
+ #include <imagemetainfomodel.h>
+ #include <document/documentjob.h>
+@@ -34,6 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #include <QUndoStack>
+ #include <QPointer>
+ 
++namespace Exiv2
++{
++    class Image;
++}
++
+ namespace Gwenview
+ {
+ 
+@@ -54,7 +62,7 @@ struct DocumentPrivate
+     QSize mSize;
+     QImage mImage;
+     QMap<int, QImage> mDownSampledImageMap;
+-    Exiv2::Image::AutoPtr mExiv2Image;
++    std::unique_ptr<Exiv2::Image> mExiv2Image;
+     MimeTypeUtils::Kind mKind;
+     QByteArray mFormat;
+     ImageMetaInfoModel mImageMetaInfoModel;
+diff --git a/lib/document/loadingdocumentimpl.cpp b/lib/document/loadingdocumentimpl.cpp
+index 07675783..766a1831 100644
+--- a/lib/document/loadingdocumentimpl.cpp
++++ b/lib/document/loadingdocumentimpl.cpp
+@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ // STL
+ #include <memory>
+ 
++// Exiv2
++#include <exiv2/exiv2.hpp>
++
+ // Qt
+ #include <QBuffer>
+ #include <QByteArray>
+@@ -100,7 +103,7 @@ struct LoadingDocumentImplPrivate
+     QByteArray mData;
+     QByteArray mFormat;
+     QSize mImageSize;
+-    Exiv2::Image::AutoPtr mExiv2Image;
++    std::unique_ptr<Exiv2::Image> mExiv2Image;
+     std::unique_ptr<JpegContent> mJpegContent;
+     QImage mImage;
+     Cms::Profile::Ptr mCmsProfile;
+@@ -486,7 +489,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
+ 
+     setDocumentFormat(d->mFormat);
+     setDocumentImageSize(d->mImageSize);
+-    setDocumentExiv2Image(d->mExiv2Image);
++    setDocumentExiv2Image(std::move(d->mExiv2Image));
+     setDocumentCmsProfile(d->mCmsProfile);
+ 
+     d->mMetaInfoLoaded = true;
+diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
+index f2830f81..f13dff7a 100644
+--- a/lib/exiv2imageloader.cpp
++++ b/lib/exiv2imageloader.cpp
+@@ -29,8 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ // KDE
+ 
+ // Exiv2
+-#include <exiv2/error.hpp>
+-#include <exiv2/types.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ 
+@@ -39,7 +38,7 @@ namespace Gwenview
+ 
+ struct Exiv2ImageLoaderPrivate
+ {
+-    Exiv2::Image::AutoPtr mImage;
++    std::unique_ptr<Exiv2::Image> mImage;
+     QString mErrorMessage;
+ };
+ 
+@@ -57,7 +56,7 @@ bool Exiv2ImageLoader::load(const QString& filePath)
+ {
+     QByteArray filePathByteArray = QFile::encodeName(filePath);
+     try {
+-        d->mImage = Exiv2::ImageFactory::open(filePathByteArray.constData());
++        d->mImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release());
+         d->mImage->readMetadata();
+     } catch (const Exiv2::Error& error) {
+         d->mErrorMessage = QString::fromUtf8(error.what());
+@@ -69,7 +68,7 @@ bool Exiv2ImageLoader::load(const QString& filePath)
+ bool Exiv2ImageLoader::load(const QByteArray& data)
+ {
+     try {
+-        d->mImage = Exiv2::ImageFactory::open((unsigned char*)data.constData(), data.size());
++        d->mImage.reset(Exiv2::ImageFactory::open((unsigned char*)data.constData(), data.size()).release());
+         d->mImage->readMetadata();
+     } catch (const Exiv2::Error& error) {
+         d->mErrorMessage = QString::fromUtf8(error.what());
+@@ -83,9 +82,9 @@ QString Exiv2ImageLoader::errorMessage() const
+     return d->mErrorMessage;
+ }
+ 
+-Exiv2::Image::AutoPtr Exiv2ImageLoader::popImage()
++std::unique_ptr<Exiv2::Image> Exiv2ImageLoader::popImage()
+ {
+-    return d->mImage;
++    return std::move(d->mImage);
+ }
+ 
+ } // namespace
+diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
+index 57ef24d2..12a45b68 100644
+--- a/lib/exiv2imageloader.h
++++ b/lib/exiv2imageloader.h
+@@ -23,13 +23,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ #include <lib/gwenviewlib_export.h>
+ 
++// STL
++#include <memory>
++
+ // Qt
+ 
+ // KDE
+ 
+ // Exiv2
+-#include <string.h>
+-#include <exiv2/image.hpp>
++namespace Exiv2
++{
++    class Image;
++}
+ 
+ // Local
+ 
+@@ -54,7 +59,7 @@ public:
+     bool load(const QString&);
+     bool load(const QByteArray&);
+     QString errorMessage() const;
+-    Exiv2::Image::AutoPtr popImage();
++    std::unique_ptr<Exiv2::Image> popImage();
+ 
+ private:
+     Exiv2ImageLoaderPrivate* const d;
+diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
+index bb810dd4..a8cf909f 100644
+--- a/lib/jpegcontent.cpp
++++ b/lib/jpegcontent.cpp
+@@ -42,8 +42,7 @@ extern "C" {
+ #include <KLocalizedString>
+ 
+ // Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ #include "jpegerrormanager.h"
+@@ -216,12 +215,12 @@ bool JpegContent::load(const QString& path)
+ 
+ bool JpegContent::loadFromData(const QByteArray& data)
+ {
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+     Exiv2ImageLoader loader;
+     if (!loader.load(data)) {
+         qCritical() << "Could not load image with Exiv2, reported error:" << loader.errorMessage();
+     }
+-    image = loader.popImage();
++    image.reset(loader.popImage().release());
+ 
+     return loadFromData(data, image.get());
+ }
+@@ -603,7 +602,8 @@ bool JpegContent::save(QIODevice* device)
+         d->mPendingTransformation = false;
+     }
+ 
+-    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size());
++    std::unique_ptr<Exiv2::Image> image;
++    image.reset(Exiv2::ImageFactory::open((unsigned char*)d->mRawData.data(), d->mRawData.size()).release());
+ 
+     // Store Exif info
+     image->setExifData(d->mExifData);
+diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
+index 9e8836a9..3c519098 100644
+--- a/lib/timeutils.cpp
++++ b/lib/timeutils.cpp
+@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ // Self
+ #include "timeutils.h"
+ 
++// STL
++#include <memory>
++
+ // Qt
+ #include <QFile>
+ #include <QDateTime>
+@@ -30,8 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
+ #include <KFileItem>
+ 
+ // Exiv2
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ 
+ // Local
+ #include <lib/exiv2imageloader.h>
+@@ -92,7 +94,7 @@ struct CacheItem
+         if (!loader.load(path)) {
+             return false;
+         }
+-        Exiv2::Image::AutoPtr img = loader.popImage();
++        std::unique_ptr<Exiv2::Image> img(loader.popImage().release());
+         try {
+             Exiv2::ExifData exifData = img->exifData();
+             if (exifData.empty()) {
+diff --git a/tests/auto/cmsprofiletest.cpp b/tests/auto/cmsprofiletest.cpp
+index 4efc441b..f4c7f9e5 100644
+--- a/tests/auto/cmsprofiletest.cpp
++++ b/tests/auto/cmsprofiletest.cpp
+@@ -69,7 +69,7 @@ void CmsProfileTest::testLoadFromImageData_data()
+ void CmsProfileTest::testLoadFromExiv2Image()
+ {
+     QFETCH(QString, fileName);
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+     {
+         QByteArray data;
+         QString path = pathForTestFile(fileName);
+@@ -80,7 +80,7 @@ void CmsProfileTest::testLoadFromExiv2Image()
+ 
+         Exiv2ImageLoader loader;
+         QVERIFY(loader.load(data));
+-        image = loader.popImage();
++        image.reset(loader.popImage().release());
+     }
+     Cms::Profile::Ptr ptr = Cms::Profile::loadFromExiv2Image(image.get());
+     QVERIFY(!ptr.isNull());
+diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp
+index e3ec8d30..5a286b00 100644
+--- a/tests/auto/imagemetainfomodeltest.cpp
++++ b/tests/auto/imagemetainfomodeltest.cpp
+@@ -17,6 +17,10 @@ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ */
++
++// STL
++#include <memory>
++
+ // Qt
+ 
+ // KDE
+@@ -28,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #include "../lib/imagemetainfomodel.h"
+ #include "testutils.h"
+ 
+-#include <exiv2/exif.hpp>
++// Exiv2
++#include <exiv2/exiv2.hpp>
+ 
+ #include "imagemetainfomodeltest.h"
+ 
+@@ -46,7 +51,7 @@ void ImageMetaInfoModelTest::testCatchExiv2Errors()
+         data = file.readAll();
+     }
+ 
+-    Exiv2::Image::AutoPtr image;
++    std::unique_ptr<Exiv2::Image> image;
+     {
+         Exiv2ImageLoader loader;
+         QVERIFY(loader.load(data));
+-- 
+2.20.1
+
+
+From b81eed1dc4d879f06d651ea0954bee1b46c7947e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sat, 29 Dec 2018 23:39:30 +0100
+Subject: [PATCH 2/2] Compile more files with enabled exceptions, required for
+ exiv2 0.27
+
+Summary:
+The (exception based) error handling is now pulled in by e.g. image.hpp,
+so more files require enabled exception handling.
+
+Depends on D17872
+
+Test Plan: build
+
+Reviewers: #gwenview, ngraham, cfeck, asturmlechner
+
+Reviewed By: #gwenview, ngraham
+
+Subscribers: wbauer, lbeltrame
+
+Tags: #gwenview
+
+Differential Revision: https://phabricator.kde.org/D17873
+---
+ lib/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index d60ae47f..229eac2a 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -224,6 +224,11 @@ kde_source_files_enable_exceptions(
+     exiv2imageloader.cpp
+     imagemetainfomodel.cpp
+     timeutils.cpp
++    cms/cmsprofile.cpp
++    document/abstractdocumentimpl.cpp
++    document/document.cpp
++    document/loadingdocumentimpl.cpp
++    jpegcontent.cpp
+     )
+ 
+ ki18n_wrap_ui(gwenviewlib_SRCS
+-- 
+2.20.1
diff --git a/kde-apps/gwenview/gwenview-18.12.0.ebuild b/kde-apps/gwenview/gwenview-18.12.0.ebuild
deleted file mode 100644
index 22f5b406075b..000000000000
--- a/kde-apps/gwenview/gwenview-18.12.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/graphics/gwenview/
-	https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	activities? ( $(add_frameworks_dep kactivities) )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	mpris? ( $(add_qt_dep qtdbus) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-	kipi? ( media-plugins/kipi-plugins:5 )
-"
-
-src_prepare() {
-	kde5_src_prepare
-	has_version ">=media-gfx/exiv2-0.27" && eapply "${FILESDIR}/${P}-exiv2-0.27.patch"
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-}
diff --git a/kde-apps/gwenview/gwenview-18.12.1.ebuild b/kde-apps/gwenview/gwenview-18.12.1.ebuild
new file mode 100644
index 000000000000..bac3051fceab
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-18.12.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Image viewer by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/graphics/gwenview/
+	https://userbase.kde.org/Gwenview
+"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities fits kipi +mpris raw semantic-desktop X"
+
+# requires running environment
+RESTRICT+=" test"
+
+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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	activities? ( $(add_frameworks_dep kactivities) )
+	fits? ( sci-libs/cfitsio )
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	mpris? ( $(add_qt_dep qtdbus) )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kimageformats)
+	$(add_qt_dep qtimageformats)
+	kipi? ( media-plugins/kipi-plugins:5 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.1-exiv2-0.27.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+	if ! use mpris; then
+		# FIXME: upstream a better solution
+		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package fits CFitsio)
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
+	else
+		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
+	fi
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
+		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+	fi
+}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 00e042488a35..5a4b13c91db1 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-18.08.3.tar.xz 522032 BLAKE2B b29b17d6300f4d7f45bbc23b51f8e5d1a4ed2b3edc975238210c363f3a0555124e797dbe14e3855d156e5a16da77b3df1b6b6a9d6fcb6dc1e2680c9b0312f377 SHA512 bdfdbaebeda79fdad019a34f05121652fcef0719b3be4e871a23a6fb0648f1371a48c914d371731dc0a9b0e4f1928a58346b1e280aa2c2105c3789428e87b585
-DIST incidenceeditor-18.12.0.tar.xz 542004 BLAKE2B e6272a9b7399d4db72087f548efea9facec94b6b20c935139dfe9abd77fa40e5e58f801b1762952c4b5d36348f8df6a3f9ca0b7bbf6d4c7381ac87b07735939f SHA512 abc8aafce99239d6b8975816536459084109382a620548d9ab2000ea34d3e343c9410c3c3e789d5d315c895fe9c0140fb55694e56c5c6aa70b4d5d1086ad7c84
+DIST incidenceeditor-18.12.1.tar.xz 541932 BLAKE2B cf7f8658d31253149d0f00a424b498bb0d4a14ec49e3dd97025a2134dcfb533221fc04b39ddd7e0ffca60e04d1009c394bd11a9497a6b20d5d7480349bb21475 SHA512 87634f6cdfe4cc5acc9199d61e9bf9284bb012ffe5cfa4db3fdd957964d7c13bf8af0551473c7387213220a8a97ac8d70ce8cca489e136d44589e89cf19c69bb
 EBUILD incidenceeditor-18.08.3.ebuild 1390 BLAKE2B cdc8b4c3066d2ae4cd2232570abf465e7fde8ab4faf4513e9608abe2b1072e0950e2cb87daa076aefce1c545f671646aa798d221cd43c542a7b713c9e5c8d9d2 SHA512 8a571fd162bcc0843d68ef7f5f826e820122cea7d7e89b08d7ec224da4f5cb194aac1894b4d6d162d3110930b081e551613c6e3edf5d599688623a493487a3bb
-EBUILD incidenceeditor-18.12.0.ebuild 1392 BLAKE2B 5bfea2058f1c5b7126c8dcbc00405adcbc16cb65fc600a849e1ab9f5665ad17f2100e9df13d896246551396334c8d81c9bcb1be2827eb698541fcaac8a3ee8d3 SHA512 688cb04f35d15952337839f8019a87bf26bacc6382142e69b8cd0c217dd7f2cd20200a773e96e0701d01f0452a7fb31ee09923747e4f26c20ee9f1e45e9ac0d5
+EBUILD incidenceeditor-18.12.1.ebuild 1392 BLAKE2B e058e5328b16c80b8a9750df5f10ea6deeb266154a225e28f6a6c3173bd1312257549dfe3314bc0f8f331118a3a3702015ee973421a500315338fffcc2f437e1 SHA512 6eb1414d72c59ac0dd1fc84d0ef1bd5715aa1e37e385032588dcb41ae0687924e52728807fa83d2af730b996a335ed373062caf6c641453c03cd575705e36326
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.12.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.12.0.ebuild
deleted file mode 100644
index b1d1e2fe3489..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-18.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(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 calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(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 kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.12.1.ebuild
new file mode 100644
index 000000000000..c855b911b31f
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Incidence editor for korganizer"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(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 calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(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 kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index e8d8e9e06a67..514bdf08445f 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-18.08.3.tar.xz 1874268 BLAKE2B 9024e64ec657df835bdc5d926478905ba68a94e68cd0aa57f0b7da660f2547052bfeab570447aa6f414f6c273d82769c03b8c39dfb4943bd864f6936e393fd35 SHA512 f0a13f24cdbf075ded5b92848b7239cb5fc53d5d51efc6fc0f2ad9ffc92b0517bb44ee16b5cdb356e92ac8ac8834da8f05ec126244c19681b6d9b4427fecda66
-DIST juk-18.12.0.tar.xz 1874936 BLAKE2B b9113f13b91fc371663325e709998e1de124500097a0e41cf939d905bc73acf3332d1be384b7b30948550ee8a8d68ef413bfe9bbda7d039b9aa97b7d70a1ea2d SHA512 1225c7d99d7b805e7bb81fcfa563504f531bb21da37bebfaaa12ca89b1c30a6c0cd99bf5c27d19241b3bfe40641fff74277899081effe6ab31b065b42dfc55b1
+DIST juk-18.12.1.tar.xz 1875404 BLAKE2B bcd42c976732c0e714839cae910f7218a327f3913059f4bbf6d32d60529fcfe611a177fecb5da192f839b2e7d3bcad902e01484f07a21b797f17a9d4378c0285 SHA512 e1fc8c08cde3203b6c5006d9bcb40a9780d21fb283c9407335cc938eb10719a6795ede1a16afc6fbba6f1306d6d2ef20ca9c78f71313bb9efa1a61c820c793d9
 EBUILD juk-18.08.3.ebuild 1101 BLAKE2B aefde73f5c48d21704b6af8e6e61c0aca16a9221e801f1d5c344bd3f2ef885d989d3c7011000ad3251d7b847045e3a0467578b3bd7e91c8b4fc4546e9344b27f SHA512 8dc7251f76b606591475ce9507fe6223ee2bc4ebe5a90de9c1c75cabbb4b6bf9573d688e9c81a33dc701a9381ad73c683b81537837ef3e653be34c5ab11df7ee
-EBUILD juk-18.12.0.ebuild 1103 BLAKE2B c38f3d58d01b703ebdaf784c4bf66d14338188049e0e2704a05ab8658f9579570516cb4e4c3e58b32835fe3900bf5f159a6ca315d7d9da939b187cf165d50d41 SHA512 19f343725a223d961c08f9ef097adc7e44f6c679d30cf66ae75edd8c8c685f52e83fd5f28a5f8f4aaaee49256c1f249b3cd636a67806752b20a2a497b1b0dc02
+EBUILD juk-18.12.1.ebuild 1103 BLAKE2B 5e9f510d8dec21053fd29442ff1d8e3f7782ee535dcbcb03c2f3aa6e78641d55c4255661e5b01dca112832c7de675138b592b81c93dd151a0a8fe53b60416022 SHA512 2aa383c2cfcf5e8dfd6dc3e9923207b2df5e2ed97f32043c25fb94f910f4b970aa2b125552ca938db1a2de4187ea9dc08f5ec7437c7d430631bbacc57134445d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-18.12.0.ebuild b/kde-apps/juk/juk-18.12.0.ebuild
deleted file mode 100644
index efe3ecdd0833..000000000000
--- a/kde-apps/juk/juk-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(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 qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/juk/juk-18.12.1.ebuild b/kde-apps/juk/juk-18.12.1.ebuild
new file mode 100644
index 000000000000..18157c60da54
--- /dev/null
+++ b/kde-apps/juk/juk-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Jukebox and music manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(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 qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 3197dbc1b455..19aa4e3fb183 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-18.08.3.tar.xz 10598316 BLAKE2B 7758f1f037834728edaddb38068a4cb1bc32fe4953c89a14c735592d3842ec8ec28044e4764fd76a1cc116c060702167fe8c043f6121d7c85654996a3f97d26a SHA512 5479f29770363a14f2f7b9ea7e14c628b031f7744bd459314c502c138daec4728d65c7a4193364aaab7ee9e2516583f00647e07f05acd959c48a749b1ee84ef7
-DIST k3b-18.12.0.tar.xz 10596680 BLAKE2B bad2d13fb509b5a4eaf4911b1eaa7a5716d30c6f31ff353aaa7604e0fadf12998616928945b71f6d5e75be874ff4afe20e2bd058b05ebfb9235fb72433180694 SHA512 0946d579bc72be213cc312fee21382328b760e8c0adb707ba8236b55bc32221dfef385cb383734fa0a3ca5853a5f9c1293f46f2977185de5f7cbd0296ac0ccce
+DIST k3b-18.12.1.tar.xz 10592960 BLAKE2B a51d5123e6c7c56df435a320a19adc6f48de868b53664e0b88d9472ca58f0eb59c33d65951d3511e8c44a5a8f3facd0a2fcc0938525b9babadee926a0266aa52 SHA512 fcbb339b22fa86185bcd5667c68f70e4ddf1d2604c8a333bc5b34e3cb4d7fc1f002fb7748f91487743bbaa3e71b9d8048b5d6ec4a6c39cdf706058ec6277cdb5
 EBUILD k3b-18.08.3.ebuild 3331 BLAKE2B fcb2079f9d6c00436b4d54a34643ac59887b1d6cbb3b7113e25d0b69a9246e3995ced23b1880716acc2d961f82ed05f0e605a880bc1d4b26a36cc80bdfe3e400 SHA512 67379129f16ddc6943da43f574b1a67290aaf89a6843de8c93a08553c0675987050d6516af2afaadbdfa3c92580936d6be7dc238094cf8d0777ce01cf3b105fe
-EBUILD k3b-18.12.0.ebuild 3333 BLAKE2B a825ede67de538bd3513aefef0258bf07e694ac71b61c190c224fac66ab6e305aa12ad25255410fc9c14ee77bc6fd49bc0b11768980d900c53d499e261cbe992 SHA512 1e1d78ff29c50a1a2f98cb7a2a8addd222fec420e2e0076d9b264af7ee88dfe06f55494cf5fdac8f239f05ebabbe44f1bd88f7be6de8c9cdec13178c38ff1cb5
+EBUILD k3b-18.12.1.ebuild 3333 BLAKE2B b0632cd9e67ac75066a598707ce9017c8cd7418c60ae43b10fc4b3f840431ca040bab652f4839f99a45c3499a29596ba82df8bb4eea89dfee112b0cba35706ec SHA512 46e976e3c56548fb891aecddfd5722900b70b6ffe6f9f4bc1b88c21712f1342242d6059adc8336cfbc68e1bda72570e8a9be0303e4dd1677578047100904857e
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-18.12.0.ebuild b/kde-apps/k3b/k3b-18.12.0.ebuild
deleted file mode 100644
index ca07f5b8b2f1..000000000000
--- a/kde-apps/k3b/k3b-18.12.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata 'taglib?')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	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? ( $(add_qt_dep qtwebkit) )
-"
-RDEPEND="${DEPEND}
-	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 )
-"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/k3b/k3b-18.12.1.ebuild b/kde-apps/k3b/k3b-18.12.1.ebuild
new file mode 100644
index 000000000000..8f5e5537b529
--- /dev/null
+++ b/kde-apps/k3b/k3b-18.12.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/K3b"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata 'taglib?')
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	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? ( $(add_qt_dep qtwebkit) )
+"
+RDEPEND="${DEPEND}
+	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 )
+"
+
+REQUIRED_USE="
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	echo
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 47bad34b1274..4ea8d9b11de6 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-18.08.3.tar.xz 71228 BLAKE2B 69b6a21adface411b11cadae21e2db0083e4a03faa45a6f7e834e3de75b2c9977de3cc50177664b42cea66f878c97b0ab8bd5dbf5bb65a0d6e70ae0c2573cddc SHA512 8ad5fa737c7323625c6f961b105046ead133df5659f99501911ba5785445b52dd7e46f7db80486e9c764a3d50ce798d17f31a5204da0bbf4eeb03586d2d933dc
-DIST kaccounts-integration-18.12.0.tar.xz 71064 BLAKE2B beea2b156e400fc22f122c34cc8ea83502095c56fb6832e53a481aac89337524234173280ebd4efd35409caf796c1c1e48cbf6e8d8addec97f7afe97806fc281 SHA512 05049161a5bddda9a03e85dc28e5bb88b437c8c49f04871146955e980d3ea263c7816a655985ec2eff5595fd938b6e0772f8c1411d2d404bd28669e434327d2c
+DIST kaccounts-integration-18.12.1.tar.xz 71052 BLAKE2B 138ec7a8f67efac0975df7cf4fe1976f95fc41d9ed0e59d8d0b27de385d72b3bdbc898c8c3e3a9e6882070e3f34377ea0a8db4767c6cc60fc3e3e7a6962d531d SHA512 2463dc1e837f9caf9fd7ab34672803caef80ad65e19bcce074f3f47b80c60043ca44dd2b11d8130d706201a2e2b90fb36208ffccd8b2b26521bbf6bb5d39e41e
 EBUILD kaccounts-integration-18.08.3.ebuild 954 BLAKE2B d598994f81a1c58974f6d073b0868d80f87a299cf28e0c77a4402d74907b0ff9a3df655234bed3623aaad16b13f71fecda27902367c23ff468b2ada68bcef8dc SHA512 929ef96247e689f98add3520d6c96945e0ce0dd359e2750a0de0a76cdd884db046ed097e03a1487ab387504689dccd321248d466d02c20cabc6b88433df12c2c
-EBUILD kaccounts-integration-18.12.0.ebuild 956 BLAKE2B 13fbde0b78ec711cd9bab8b257add1dac26c3a02051bd615cb22b2adb2ebab830c09e6f9f9a14324b53f0f52bfd26a719039b5c42576fd70e7a5909a4c8a12bf SHA512 44539d65f6bee11e9a1a49c0b0cc62addc084b3627a9853916a8314720e2a181be9be986b5a22ed26156ccc2a6492531815dad3cda356134182c95d1e4e0de65
+EBUILD kaccounts-integration-18.12.1.ebuild 956 BLAKE2B 85490f50683839852c07220d84c8732b14ad9a43cb3314f742409cde730667e567389f96b05faa3b1d570aeb88fd5691566a6c344b3168decbe1e17d2a30c261 SHA512 d5a06c17e10bdac35d174ec0c7ddb946354c53fc20e198da893f8da9fe983fe2530fbb58cfee1ef37d3efaee5b3f293099bc168fe1c528fa9fbcef0d6addf29c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.12.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.12.0.ebuild
deleted file mode 100644
index 0b2e528f3179..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21
-	net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.12.1.ebuild
new file mode 100644
index 000000000000..42e1cc3fc2ad
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	>=net-libs/libaccounts-glib-1.21
+	net-libs/signond
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_plasma_dep kde-cli-tools)
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+
+# bug #549444
+RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 0873141c0bd8..71a65e7f858c 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-18.08.3.tar.xz 31884 BLAKE2B 526d2c878ac00c069f5b0e658c506844f5c44acc1ca77c20196831d84b329e9743a460d9cc943eda705b53be75f52ae4fc08dc52b67a1d0f0a93749263daaed4 SHA512 9f2c426bd1cb7a7133f9c3ca77487ab5903f25866b9dc0f7ffc0950aae92f4c9c4e84f5b1e0ff57e0e25acbc5caa6d90846f9822ad48b271f996180781ccb3bf
-DIST kaccounts-providers-18.12.0.tar.xz 31624 BLAKE2B 537c41f6f08c69eecfed66ada8bfe2511ccfe307e5a1e800b896aa2a022fad7503a6a555c0e8c41cf89f8e012031346f369089d9dfe3b430e40e821a6efececa SHA512 d06ad541842b994084ed81b2d12b98b946c2614aca918ceaca05235335786d615986edfcca32ac45e0541d7962848f0dfeec7f00683d4aaddbb1454e5107fcdd
+DIST kaccounts-providers-18.12.1.tar.xz 31612 BLAKE2B f8be00f46e2b5c85f29bb895009fb34e1ba7cd71649ce7b6af398f86274151a0481d75a2af5a936aebb6a4a88f5a691026efd647278b021d08831a4c6650157b SHA512 d924e2ac0b6062052a9a053d21c059caa4e8a24a2e0e0741ade4fd73d1925b043dd39da73dc09367b0d733bbaf8f988ad72a46f4c1c9a0d75fc16430cbea9852
 EBUILD kaccounts-providers-18.08.3.ebuild 663 BLAKE2B d8f31cb74e410a7acf9bf40fe026a4ecdfcd425a63624a8aa0c72560d02e919eb59aced745cd2295f75e3002148b3b670cbbf34e4557b567dea74a51855f4488 SHA512 cc9a3fa8c3238fea4f39f1a1dffc2ac9f5a9d0f6e462394581a130d37c916e6bcbed2a57e6e4d9ce74af5f5b5a0774d935637c23416265b545896f4dc28333d9
-EBUILD kaccounts-providers-18.12.0.ebuild 665 BLAKE2B b8ba9b68ff5f5ab0885d5fbdab33687c7c6440351628b9660af4a6a2d290c648940afed517ee4e4fc85da13aec5526b190a49a23f54e077afef35a3ead2c6e89 SHA512 835b3a56cfa650d0cc58ee3b51692d3e5a509d4a896193c8d6b2baea6e54b2b7354a26400b09f4661095e2ee5204ff6af3bbe08b26b48e43cc89465a2544ef0c
+EBUILD kaccounts-providers-18.12.1.ebuild 665 BLAKE2B 0f5ce0c5a341cd50ef27ebc6e66e484a790f016486d9da547c3a2c960e826e26181a39bbc3c2015e8f141ed922b766bd53102231cbae157868104ec267482e33 SHA512 0a84963f39dec3d87dadb3fe8ac99a025dcecafdf6efa477243c840ee4ad51640c73412ec0db22b6b39a33eadc34cf42ff742888bae60dc51975f03324281bc9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.12.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.12.0.ebuild
deleted file mode 100644
index 7d0f6facf465..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/signon-ui
-	net-libs/signon-oauth2
-"
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.12.1.ebuild
new file mode 100644
index 000000000000..d344e361ca9a
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE accounts providers"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/signon-ui
+	net-libs/signon-oauth2
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index ef155e3c03b8..e611eba1f589 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-18.08.3.tar.xz 537956 BLAKE2B e92b76ed56581f5d7759fabeb9d8b761061311f30f0d01a6158a6a3c6e0c399eceb5111b343f1805757eb2ae9924c68219cb46754482791341e10ec43faaf6a8 SHA512 f703b2aca2649df477d4dbaef623543af09029101dc8ca0617482ddd3d7aec6bdeeb44841feef2774261acd8cc4f4483faf4e51474418260535dd401164bda60
-DIST kaddressbook-18.12.0.tar.xz 471032 BLAKE2B 8d3c59089cf81a32d04a10d67dc54e2868110ad2af16e12e7c36ff359f5e4951e74e14dda9f44df4bdb90306bcb4b9b229f8a21cee74822431478dd5dda51989 SHA512 a1dc82824cc61a575f91a986a4d9b9297cc661e3baefc89882bf2df714bcf2fcdc091f4bd5f14c68f03594c42ae4ebd37c1b09ea6d049a6d123d0d82a1704132
+DIST kaddressbook-18.12.1.tar.xz 471084 BLAKE2B 3cbb02e4d3927ab4b77705dd61a8b4f1e64f3985e862c8c0f491f3955be7d4a9979787383affa1f7beee769227c81c8a3321ec40e7481678b20f6b9dd6fd84f5 SHA512 4e25527ddec7c449de20eaf390023621d3feeee5bf1687a1b508ec354218194bd20cb77aa235ed3379dd3d0d00f08a146259d735c62a93efc39c1e9fd204d0d1
 EBUILD kaddressbook-18.08.3.ebuild 1703 BLAKE2B fa58bf1d6f073b80e2a5703eca1e962beb6c9587de5d666858bae4e69e34d3dd73b857eaddc327f84646227a5abd1e89dd1507814637fe2d1c67ea3b40a9d8fb SHA512 7d771584bcdcdb9620293c97a49d033d4a5332ccd45e3fb3c7b6d16f6a959f5f813618c9f693a9023324871f512ad46c51ec94db2c837051b0c1c27e3dc5add8
-EBUILD kaddressbook-18.12.0.ebuild 1705 BLAKE2B 465b79f858b362c598d9e0d6d2792e8ee89f1be381fed5f029d137af4bc21caf1ad0c824e992b18ae9d7329fb286e154956e20f72c12758ea6404029877ea358 SHA512 dc97b17134c4b731017104874bc3979b3b108d5adaee5582e77017c4eb3d78316592a9fc913cfb2e409b40d60b1e69e8c366bbbc529f25babe10a0ed924ca315
+EBUILD kaddressbook-18.12.1.ebuild 1731 BLAKE2B c34ad8c2e3cf352b81ef76cbfe40ca66c4964b4adf3595d5cedb4564240c68b7ca07f687af278894e657ad8e951013d68b1053729894e11bb3d8fd02542c623a SHA512 106c0886d0b7ddd867e2270fb349f4e59d094f7ae63ee386c99462c6e4d8275721d6bac4eb291e7d601558e7148a8375ca8f65a6e8fe541b22252338fd5711ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.0.ebuild
deleted file mode 100644
index 805063523fdb..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-18.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-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 kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild
new file mode 100644
index 000000000000..765ce86305b3
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+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 kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 11184b79e2af..3f25e3dcf43a 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-18.08.3.tar.xz 4467328 BLAKE2B 8117c36832c8902bb8616f9f9cb9b9470bc35f1eb9831a16549644696a24bf97f7a10f6fe8a86a9a645eb30e372e0568a28fb0657e5be0e6bc1452a241f64379 SHA512 a19ff94dba7b968834117c7bd8157394732257001a2b8fc6fbecc3f5b4d7b9dd7f90a3ee455301b9c99fbc3563ef526aa5c0d10eb481bd0d36dee24013f98836
-DIST kajongg-18.12.0.tar.xz 4466648 BLAKE2B ee65eb574825da627f5b2f6aae05bc137b838726c5eda20c30d8e02d8529e23ad36a90469f3ef16c541bd97e1f6eb1dcca13676677f2ced2840234dbe151a052 SHA512 568dc2494fec2465da6d21f0ae552ca466abde4dcb5693b55534665d2436ec8764799f54d205f6d8e663b6043b22f333954c0bd37bce25768f5069a6555fe80d
+DIST kajongg-18.12.1.tar.xz 4466412 BLAKE2B 1d60ec5c7c87cbc623826c930e1d0804122bdeb5286948982ef1e71f4d1dcee940f33fdae09deab284bb96425eb2a27542a4ef1c3fddb57fe31234ec53a32247 SHA512 ed3fb9d94d5f3bd7f361a82c50a2ee11b029c4f4361bcfb5acbd7b1e23d77753ed8a86f5613cb096dc9a3425eee6f217efb117779a5497ffbde5b9d07b3e87ce
 EBUILD kajongg-18.08.3.ebuild 1279 BLAKE2B 04aea3ffa48f06d6a39fd3056924e5b6f5bb5a43446afea7f9ba4210894873454ed435ca14fead739abf7f57249ffb6b3559fd0df732fab952856a17b3b6426e SHA512 ed06ffd6e39698282b2df382a0c53e49beb7f3e9cb538e9b2fb48d501ec1218a7185e185b8b3d29d547e4b298443ebd3ef5b396a329c6ac3f267c91bc8380d6c
-EBUILD kajongg-18.12.0.ebuild 1281 BLAKE2B 782cafcd31bb9e53e0535c5f711d5254fd22b47795475da4765626f512e06f7634aad957f7ab15a649a5e4be76629255948dc91b8438a2c54e5d913b652878af SHA512 81a3a90c6f4798ec040d6e9ab3302a01a7675e4026b3963074410fd4c1ac9443413924dd1e9ecc61f257d0e367813fa4f40dda1c1c5723060a6a1903dd754c9f
+EBUILD kajongg-18.12.1.ebuild 1281 BLAKE2B 455e6826a2716d2bbd8f9edeeabc16dc65976cd8c8a9fd48e45ab62dd284effab16025100d396814cd681c9fba1277a790c8514969fea90d47e545998599661a SHA512 1b63834586164b401ae282e3feabd3fe1a1b0bf7d8e9fa1af0b9b1b817e052575282338cc9ccb2f1b6285748af8fa9e5f91188406b2ed6c66103cc607b105b9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-18.12.0.ebuild b/kde-apps/kajongg/kajongg-18.12.0.ebuild
deleted file mode 100644
index fc30aeff8992..000000000000
--- a/kde-apps/kajongg/kajongg-18.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	dev-db/sqlite:3
-	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep libkmahjongg)
-	!kde-apps/kajongg:4
-	!<kde-apps/kde4-l10n-17.03.90:4
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	kde5_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	kde5_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kajongg/kajongg-18.12.1.ebuild b/kde-apps/kajongg/kajongg-18.12.1.ebuild
new file mode 100644
index 000000000000..8fda41450644
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-18.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-db/sqlite:3
+	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep libkmahjongg)
+	!kde-apps/kajongg:4
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	kde5_src_prepare
+	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+	kde5_src_install
+	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+	fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index a47038603978..8524494d5b16 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-18.08.3.tar.xz 1814008 BLAKE2B 5c2b92932ce510b6276b183ad0f88a4e06073ee218281b450780ee8649bdf85dddfa3003d2b007d7ad1c7950d78cd32d14a20ed8090f93be7039cf9436d83f60 SHA512 09c27f22bb496f95685826ab2d8aa81b117ef224e04bfb8aa447809190228616883bbdd5841225580c8f291f90e5b1e93d0263797ca80553fb96728853e50772
-DIST kalarm-18.12.0.tar.xz 1812392 BLAKE2B eb2e0aaa2b3785c3f1e36d08cf72be5894bac051a43852a48749799d5a29a1d6e3927472b2ef78be4db93852172e81be588c7231f6c86c58b720b953d4fd5300 SHA512 5b09dab136d5dc7bce0735d02a9a313b90dee51387605f4148ae476c8256e2adb88a1e536d1a2f1655751791def6c60a6310dee278275bd1fdbb5ebfbf4a639d
+DIST kalarm-18.12.1.tar.xz 1811976 BLAKE2B d18b034b1eca24553d6785be3659f30d29b15d5ae7b986d94bfab5843240955239ebc759c700bd0b6058031343a3a5f78a7a99b9fd642c50ec1468c7a798b6cb SHA512 ed348da82ff0ad2f68d6f72ea03c5f5a97faf073b3b75083a56719444ddac2f1033610d7664b430f35358b15f175a4b0ec43d63a330717415130213883c4635e
 EBUILD kalarm-18.08.3.ebuild 2166 BLAKE2B 6fdbf3e6ed1644452babdc8f089d95304e624638de408a933f0d1fbe00411594d81b9c79fcac4e73fd2e3754ad006851398813b3a7707fb9c7e0332027660f8b SHA512 4bbd79ece057c055faee032f4a9c77f9ba0e6c3e68977027cd283220aae63d14a46639693e4834f9a742aaa85e2e65ce5873dd81086219c7f3b023df726dd4b1
-EBUILD kalarm-18.12.0.ebuild 2168 BLAKE2B e869fddec0dae53c56c6d27ed698ac1537d9d47fd3a8a1c75e12c5caa5f14704b50a242fe888cf7836df39b428f3fbe71258de9b01c230e1835d32992cde19d3 SHA512 a906de64f04c3e69ad3d5732f42898476046da40ab29adbcbeb3adbcb27a36510e70be73feb3df9ebbb5bd66d9965e0e740f613d648c8c3466cf881579b6b3dc
+EBUILD kalarm-18.12.1.ebuild 2188 BLAKE2B 8643e5c3b4c652bb31f451da010c6886265f7b92c4ddf36e6b045bf8a275cc9cdab6a3fe570eebcb2d6f5a91e5303341bc13a1439e0e5d752176ab47405c9aa3 SHA512 7a41b8e65bb75dad961e68e6616a235e48bbdcf137a0bc7fc735e2ff06d602fbd1e91c83bd072c0e7756fe16ca7dca17579d9462db009d5bbcd1d512715f8035
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-18.12.0.ebuild b/kde-apps/kalarm/kalarm-18.12.0.ebuild
deleted file mode 100644
index dce7276b09f5..000000000000
--- a/kde-apps/kalarm/kalarm-18.12.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-
-COMMON_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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(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)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-
-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-18.12.1.ebuild b/kde-apps/kalarm/kalarm-18.12.1.ebuild
new file mode 100644
index 000000000000..441a00da0558
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-18.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+
+COMMON_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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(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)
+	media-libs/phonon[qt5(+)]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kalarm:4
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+
+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 0872aafe1b17..746fa476c63e 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-18.08.3.tar.xz 573420 BLAKE2B 03665ba52d41a6ecf71bca0b6167b0b61cab733cebe3303b08c238d84eff18d7c9d5c0286a0f1150c1d968e86e7fc894868ea9e432d70213fcab53c3ec417a9b SHA512 18a2b4601d5b31ec3f4f1f12e63c0b4ae5d930c1364a649ff48881718bb43b2f254a482558f64abd106c684f71e13b6e91cf64aff7df183369bb57c19e384eb4
-DIST kalarmcal-18.12.0.tar.xz 572904 BLAKE2B 62fc0fc16622cd42c777e11398a5f9fa0976d9735b32838714da113852adc63beaf6ee4b208c43e62c80f7bb53be0cf02db0047dbbefffb10e5cdb32df2b95a0 SHA512 d584dd5ada8043b90225f4a80ab31a132c2dec873ccd86cff4e70e553706bdad1c4112578ec8c44e21de394c8f254daedbb77a286fdef657b8156b2b1146af2c
+DIST kalarmcal-18.12.1.tar.xz 572840 BLAKE2B 4ab6463f85630ccb059103991c7e174d412e3e0de49e131df550ebaca420b6e1cff72ca0473e06d82a830f89e754792d106218fc66ca5acb7d48a3b0682861d9 SHA512 a10b052e44d806af58aa187c1b545c863930356ff3fb2bd398da714e5b61e9810c66e648889cd12058fad16f98f2681815e0470c182f4c76e43bfadac92e367b
 EBUILD kalarmcal-18.08.3.ebuild 743 BLAKE2B 30bdfa2b3d325eb29d18c5f74618e797221c8f15dfe12f2ed6b99fb7bfcf6de8c4cdef7c548a9ffe6ad2506eade61fbd8058d43e44320778a717cd62274a450d SHA512 8b63e9a842bf95baee2e7fc80e154e2996c7e60541f39653f46b9967576db2881d71c56d1895b45ec8715f4645ac0b30ffd5bcd4ec0313ef25e7d9313714d67a
-EBUILD kalarmcal-18.12.0.ebuild 746 BLAKE2B a3e28f7aa433bfdfd971229f9bf9cf816cb383e771c00fbcfac4d78884d15f69b642fb7088872083b6c27e878e94e1db6731527bff4afaf47d0e3123ab6b9027 SHA512 ac3342754dfb75d3bfd66b8748a466753e9a90aa1279ed23fa9d8f4412309c4ab8849e2c3feacb8f432f739b8584ea2704d4b849e4c0c6576fb4a30788051adf
+EBUILD kalarmcal-18.12.1.ebuild 746 BLAKE2B 412f31330d4d9c8135c7432f0a2717fb49f845754ad93b8070d91c148231718cae3e1b01814cf86c8b45c39051892cfc464365da578f9f3f0dc914edafa437d9 SHA512 db59b6271fbf4c00ae2016c6c04729ce4483e7db80be510c87ff19adc1cf4bb362f25e0baada2c3cb67a6627a2714bd0d6eb7ebcbdf43d8193392ec0cc681161
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-18.12.0.ebuild b/kde-apps/kalarmcal/kalarmcal-18.12.0.ebuild
deleted file mode 100644
index 534df798c558..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qtdbus) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test" # broken within Plasma session, bug #665626
diff --git a/kde-apps/kalarmcal/kalarmcal-18.12.1.ebuild b/kde-apps/kalarmcal/kalarmcal-18.12.1.ebuild
new file mode 100644
index 000000000000..030f7db46160
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qtdbus) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test" # broken within Plasma session, bug #665626
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 2e06461af2d9..3b10e5a47c2b 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-18.08.3.tar.xz 707208 BLAKE2B bf115642ba984156852670491120607f2fe37fef840a081df5d695fd1d25e04a12f728f3672e18bbfa835e6a485ec79a518eed75f2e7419fd0ef90581a312f83 SHA512 529fedf7e3146ee9d62ae1f3e2f0d58a95bc2c0f0280311535f03f45a2fb9ea1244a5475085904c7f96dca9bb8562faee8d792ea0e4ea6a956f17238823c0a42
-DIST kalgebra-18.12.0.tar.xz 716044 BLAKE2B b1a1134c085a32705c770f01ec8f390218c9f0c5369b1b6c3bb42174cf8a78e96089c611842e2a9d8427f81ea6c35496f7254dea4e9a3e271621eda4f20fec3b SHA512 604f5bad6cbe362f71e59f8e4757e94bbc8dd32d34c021d33b28ea53e97f4eed9e069975d4223bca49f43b27b710ee7275198da565aaedce2ff9800650b6dbe7
+DIST kalgebra-18.12.1.tar.xz 716356 BLAKE2B c46ee16dfecc3152de19578e3cdbae83506cc37b4149130ad644507668346693156d690a8168fddc9e5fc3ac89b39e217941e6793c720a338ef46e60b1a26b07 SHA512 41ead443f5a2fe9329753efafc05960385b500f3f25d754d783e8c33e560eba6a6b8ec1a25970a693485bdfdaa834e96e5677ad6b47eb38a0738fa3073387b61
 EBUILD kalgebra-18.08.3.ebuild 1004 BLAKE2B e599d18f3bc9183a2f73ae49a352bbefe7fbc281b571f2f67c420d42d6675cbbd05e2e6b5d79448599c3d4f51d8150d0a339d0ce33a84512465e2ef5754f96d2 SHA512 4a4d9379cdf28e49a7001f24e00b0f4a02b04021ffe329559596dde5887819d925a18e59a36bf0b562ced104b72b32aee55b7fd1bbc5970ee2f6fe5df4db1298
-EBUILD kalgebra-18.12.0.ebuild 1006 BLAKE2B 02dbba6b1cc4fc322598629e986b7c2d347807875dcbc229c831be696fdf220ccd9b2290db4804d4f7b295b086600f2e904ce08b74168b30e40f9d17d4704b9c SHA512 664c7fe443fcd7f671b023769061a0106bef7dd44cf098410d088055014058ca247808f58a676b1a204ec8ca575b17ea5110d314299c0ca0a7012ba500274d45
+EBUILD kalgebra-18.12.1.ebuild 1006 BLAKE2B a239d8e4ead32bdac97fe8310baa3c61a27f3654645a3d5600f87d79b5d2420f4e6d9107308e6b28bd06a1dd0589c53a9052cdecb7eeb5a9d8840769e55c7071 SHA512 7885838252cd1189bd6c239d51a6aee1de508ad0075c9eb04e21225293a6bdd6acaac3e0521407789a3717ce419c060bc2db5a4f1b7b38e4edc4fb939fb4e4a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-18.12.0.ebuild b/kde-apps/kalgebra/kalgebra-18.12.0.ebuild
deleted file mode 100644
index e302c62fb0ba..000000000000
--- a/kde-apps/kalgebra/kalgebra-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="MathML-based graph calculator by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
-KEYWORDS="~amd64 ~x86"
-IUSE="readline"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep analitza)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols)
-	!kde-apps/analitza:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalgebra/kalgebra-18.12.1.ebuild b/kde-apps/kalgebra/kalgebra-18.12.1.ebuild
new file mode 100644
index 000000000000..8bcd03cdf6e4
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="MathML-based graph calculator by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
+KEYWORDS="~amd64 ~x86"
+IUSE="readline"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep analitza)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols)
+	!kde-apps/analitza:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package readline Readline)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 2d157ff8323e..90486a7d28d3 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-18.08.3.tar.xz 24377636 BLAKE2B 094167e7014afe89a17d2be3331e546c2079793b3a76e3262f5f390a13e9c0bbfdde094bcbde0b61e95b28582f76d7bc870709968d5ac1c9846151474d27fa5c SHA512 844fccca678b7909675cee73a76dc0b38e901b3dbae42884fe803f773bdf678b2aa9957caebb9aac50ddc58e177169e284de9303ad40886f16f5c51c72347d32
-DIST kalzium-18.12.0.tar.xz 24375924 BLAKE2B 90a3ec78abf6373290ff393a7fb546a49ced3f7703c07949908adc4d00551f51eb18da2d4992ecf37fed3d630e02bdddc7960642a334da48daef6a6d2f30a888 SHA512 c813a9cc544b743ecd44f744d4da568688cc0ac7b8e0c6e1b53eb76ee60d6c795520f2b2a464fe5c4b21e98e66179762461aaa533971d400127f044598c173b1
+DIST kalzium-18.12.1.tar.xz 26573788 BLAKE2B 567441e1e397ea25246157db11a31a4b148ae280bdf5afde2ad9f04f85c333dd5f6f08815c50babbf66466db0e6e9787abe846ae21562b6bc46ed6fbe5b2d05b SHA512 6f9e7c16e64b8c690200440e80be8f036ef6254c9e367cf1fc369250c47bebec47b7918d1fdd1194efbda65685ac03f2e3191c7f6d6380aa678b197dc28d6b97
 EBUILD kalzium-18.08.3.ebuild 1585 BLAKE2B ad0493cd738cf48edae09e0937014782aff796d1c0449df3b7276f9cb2573ebdfaf0e154906a054a4a8efb65762acff2a17723332de474f54133c9fa77f5f53d SHA512 efda0462b109b2f01402351d2c0b84366e834f7515099cf61e841f791b3e21a16877948d28f249493e53ffb8587bf9b7b0e612ebd0487333c08a52e879dffdfc
-EBUILD kalzium-18.12.0.ebuild 1587 BLAKE2B 5f4c5f40eaf63aa52903c409df32a8d394dd4b3317c1d160180e392f0a7d0878fa63534e3863ec01ea6494e6308094276204b5f758358eb4cabccbc536541cec SHA512 5a7504e125a9cb2069ce201d6c9f9d524e6be60df79618087e8e483a3274dc4fead599b3d724f0d4185d2b7cf736f7dabb1f98090f9e68fd2602338660bd515e
+EBUILD kalzium-18.12.1.ebuild 1587 BLAKE2B bd1a97edba9423ede6e2cc290e616e815f9e6683a9b9656a94f24215cae8082c41b66e24436e1ca863ee0ca55649a9a3bca3cee2c799fbc0f80cbe4598cdc36a SHA512 3fc243be6d83dcd4bb9d4ee2a0f59126349a015ad6a93d7f0319d9d87bd1c342adeb446d7eff7a47f621378fca5312fb2c4f9afcb0cfae1a193feabbbd491947
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-18.12.0.ebuild b/kde-apps/kalzium/kalzium-18.12.0.ebuild
deleted file mode 100644
index 4b6cd442ad14..000000000000
--- a/kde-apps/kalzium/kalzium-18.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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_qt_dep qtopengl)
-		$(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/kalzium/kalzium-18.12.1.ebuild b/kde-apps/kalzium/kalzium-18.12.1.ebuild
new file mode 100644
index 000000000000..6d9fd5d6f8c3
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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_qt_dep qtopengl)
+		$(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 ea939b2ea800..85695a7b5858 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-18.08.3.tar.xz 98580 BLAKE2B db1f2aa886145d129adf7d7618431d4451b5719b2df08b6519caf3e44b0fab3fe32761033b5141bb27cc11170e8e5982116b024893633bf96ea641b180ab1fb1 SHA512 14bbba72d12bb9aaaae35d0abcccb8d42e9243eac4d778ea93310fbef6ab2e0e0688e451dc21ba42894aa5a7dfdd30b51604ede5f1b4aa28f17b6034a4f08206
-DIST kamera-18.12.0.tar.xz 98468 BLAKE2B 620f1be906606385484968a76abe786d63dd803a04a4a9c3aaf8e8dd6f29cf2dae53da35ef3f901dfc95717eff94731c1c83d765c943b45d562da2bf8b612962 SHA512 c9860639af02330dc9b3d52b74cb6ece7c9ad824b4c8b9eaf65fce078e83d1072ee02c800206357badd515a4f2e2f7759675be3734b205f7578ac9edfa905a8c
+DIST kamera-18.12.1.tar.xz 98744 BLAKE2B d645c886ff263a014e89267ac0dcca197f8ba84dd6c748a76622b65067f2905b0454e2cc8e0915ec205ecfc4b079bb08256a782216bf97a97edcdac163b29d9f SHA512 c017fd303dc4bcebe0d06ac024f392cbbf929a36d353fe92d1c9670511dbd530f3d27287256ff08cbf7bdcc286c38525ed60f355dfe8e549728283a9828c2432
 EBUILD kamera-18.08.3.ebuild 630 BLAKE2B 696195f7093ea849193f74d74365c8a8fe4f581ce5348ce0288726d226377eb5ba4bf6447ab9a19e9f151552eec2471bdcfb558e7c791a6ab0ff2d699c9affd6 SHA512 f9567030b8a3afca6dd7fdc58395f8b7f4e4e2784a84e5f24e1f7220f9a592a8d9ccc4197dbfcafdcaf1a4c06ef06aadcf24860be5de3a3b687495b2c402673b
-EBUILD kamera-18.12.0.ebuild 632 BLAKE2B 97238f00b05ced99596074e41fe0e502aae61e9a742998cc317a197bb0a625f845727c164c85eaba9cf759486044b08bf163dd70082267f168f723ceb7610547 SHA512 4bf86dc9abb9e2b48dddf43ab1d498430d62d98e011dc13ec1155c0c97e73f2e94d5138330be4e85a21c0c97ada17281100b7466d47af05db68bdb7d02390105
+EBUILD kamera-18.12.1.ebuild 632 BLAKE2B 4de14b3aa1c258933ecadbe19caa0a7a0b3b4406bdc9c780f232c729735afeefd7c0cfd3fd918c3ab5751741129663b5fbf9ee88d84f640351e511b83968d0d3 SHA512 d25a9d08251cbb915b524c1684fb0c8babe08767e44c74a7906880deb9928bfe1b73771513a063a663701e7457b84188c567b4a9eedb3ae864154b82aa67d490
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-18.12.0.ebuild b/kde-apps/kamera/kamera-18.12.0.ebuild
deleted file mode 100644
index 9d071a39c32e..000000000000
--- a/kde-apps/kamera/kamera-18.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
diff --git a/kde-apps/kamera/kamera-18.12.1.ebuild b/kde-apps/kamera/kamera-18.12.1.ebuild
new file mode 100644
index 000000000000..ff6e321ea133
--- /dev/null
+++ b/kde-apps/kamera/kamera-18.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma integration for gphoto2 cameras"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libgphoto2:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index a883fdc37e59..cd07b8e68130 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-18.08.3.tar.xz 183368 BLAKE2B b57bd30f783913b7dcdfdbf4931086411234d4f6f53c8695161526eb8c4bfd34717011518e38356bbf855d4f4b66b81f76d3298f1d28c22137bfb4b3fc27c3cd SHA512 d9d165e265825d95f0d8a3d72e3e1c2a67c1f2ae08b5b523dd581630fc96bc0b7769c7d094812ed8a306541aecb10cf9f8f66ac1ea89067c1cd021c2e7588561
-DIST kamoso-18.12.0.tar.xz 166324 BLAKE2B afc856390cce54e4c10371f7b5a785f1c863840b30bed1c16eec88fcea345b686e80861a5da8b08c01260f549cb11599e128193d493722d448196da73363e67d SHA512 2e01bb18049fdc4b6a4740f7595a9cf788a73d28bc8886e63b55946fba2e4bf7b00a462982bc1a04712f96e4ec3bd92317488c7368e09aecf5112683b0dbed39
+DIST kamoso-18.12.1.tar.xz 166312 BLAKE2B e446452788fa88f49bcb504faaaa7949ecf954382e8270f42cb9019c58473fdcc722227a63d6c30b1f5f066cb5dc675ae57bd50d7e9ca7ff5812704e2733d7d2 SHA512 38b2dcd42eaac716159dbd385ac16b62aa1ac56d7bdf0fedd053a4b7e02d2e51163f679d58e19713e3788b6bef4a11fbec48b4776a0598459b94eb7bff9c7d51
 EBUILD kamoso-18.08.3.ebuild 940 BLAKE2B f766de15aee245da36153b3accc487cd4a5b305356a3f4690f36f4774768f4411af5ac2a863a90c53c667d56545266fb611a529408c20dea98210ed9fd3bcf0d SHA512 9d65acb3e32f2e7663ee61baead9026a715bfc39358a51b65eac6e22f084abba88426b4cf7fa7b2c7bb34927b1ae67711f2a59a473366152c22faa1edf7c48ce
-EBUILD kamoso-18.12.0.ebuild 942 BLAKE2B 915b5b3c6bf8f0d00c7f8ae64441d5a3e536fa8a7a83ae9d793341c227f35c8c179c91be49f447ba3189984d8224eeb23cd5a993acf320083ba2cf6f81e741e3 SHA512 fed3a451a39c9f973d1c4ab91bb1a394c084263add44f8be511bfac9e035aeaa71a1b0f32deae5cb844cb7a3b77e112e0ca96404f2604100abffbaf236be08fd
+EBUILD kamoso-18.12.1.ebuild 942 BLAKE2B f2c38b19b3f20e66be5ef6f3b8b01df4982025bb3bc6a459dc6f513cba1670d6e9caee8c7a34824bcf41333fc6a39898ac3659feaa034121836cee117d733ba9 SHA512 1a543265c24460ee8a905cc2c5fbb08de56c4d2abae2f781ee2b82f2f7bd665175f49f530792a7f587673d28ad7fa9938fc0d38ac601b3d5ab01f38bbd9c9ef7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-18.12.0.ebuild b/kde-apps/kamoso/kamoso-18.12.0.ebuild
deleted file mode 100644
index 663611c787dd..000000000000
--- a/kde-apps/kamoso/kamoso-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-libpng:1.0
-	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
-"
-
-RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kamoso/kamoso-18.12.1.ebuild b/kde-apps/kamoso/kamoso-18.12.1.ebuild
new file mode 100644
index 000000000000..a1737afc00ba
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://userbase.kde.org/Kamoso"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep purpose)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols2)
+	media-plugins/gst-plugins-jpeg:1.0
+	media-plugins/gst-plugins-libpng:1.0
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
+
+RESTRICT+=" test" # bug 653674
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 3cac0748534b..bdb2e916e8da 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-18.08.3.tar.xz 7432608 BLAKE2B 58859c5ef613e97671727545577943ce66bf3ccc94e9e4f1d24bba5d0e38bbce05bb1c5ab50503b883f7934b5e60a6d1c00ce080dbdf81e7b4f0ebc977bd0fff SHA512 96aa8de77729eb1aea1a76de8cc737dff4bf17ad47cd48ae89e63bed3408c357f886c01a1780ee336b9c4dfe1862e5a7c05dc82cbe3a01fa97cb179e34ba4300
-DIST kanagram-18.12.0.tar.xz 7432488 BLAKE2B 47fc77ac9d383eb538573a3ea4a00b1024bf64d0fbbb55b8b48498bdd056b20f326a9bba377864c7a715c5ba570bebc5dfad56b3c2ef79fae273d255e6047350 SHA512 f8717b521ef4ef8cc81ad64fe966879be2e3c77a76e9a4fdedf47a1923a986339b257ae43f86a8003baf59ab33c0ce027e51edeebca374801eb01bc153ed253a
+DIST kanagram-18.12.1.tar.xz 8027864 BLAKE2B fdacb0ccd054d1822a3f3be0ba912302ffc104cec8dbba3265604fb459f650c7baec272f50c66e667528c2626f3e3c6d930c2f0f3cf98550f7ad8c8a1da9ac9d SHA512 31130e78b4e5252ff2ddc5ac42d85933763a75686cb9cb9a9adaf243991250385e4fa3e1d65a56be09ca7761f82273a37a39d342c28835a7c7abf2908ed6606b
 EBUILD kanagram-18.08.3.ebuild 1082 BLAKE2B 5a9a6c3edd9cece6db398187feab09ae7ead7e576a49937c02eeb95f9941862d42f403b9c25ae6e9e0df7968f903aa97bf12fb382833945b8c6fb0272a3cf82e SHA512 0e89efc213b01d9eeb9fd4e9e622f7d7d9e40b9bdec2c721d617db5b6d2b794e8b90998243de567328d0bc253ae19de2c92c75527a07ff682fdce9570579e73a
-EBUILD kanagram-18.12.0.ebuild 1084 BLAKE2B f4815e7cb79c8568bdedf12428584062e9c76357343b42c7facf0d0c218568d4bae7a586777f9ef8318d54a343ca55d049edd2cdef346c5c3b3073b6d0077975 SHA512 ea0acabc02c6e570d9a8f886c321d82e7bbe07844e9ab131eff805d2800cdfc05cd76fc0ddad880b8adbd62563e0e3c378a89c5be06ec79be5e3ae997740fad6
+EBUILD kanagram-18.12.1.ebuild 1084 BLAKE2B dd170392fc56be28f7a5ba5f58f81fc7dea1349ea338d42e269e76f26fbef7436b69ef1d1122f4c4fc05f14e34096e71a3f8c191478b6fd72264f1748a5c0fdb SHA512 aad0b534a7529963b7b07e19bee0e20688c3ba450a110c1c881a8d6ef0c581e42e44b69afbf4bed71cebce20fe55a517ce406067e98cf578e61bf93695565a65
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-18.12.0.ebuild b/kde-apps/kanagram/kanagram-18.12.0.ebuild
deleted file mode 100644
index cb1797d5ef70..000000000000
--- a/kde-apps/kanagram/kanagram-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtmultimedia 'qml')
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-18.12.1.ebuild b/kde-apps/kanagram/kanagram-18.12.1.ebuild
new file mode 100644
index 000000000000..3681213c1efc
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on anagrams of words"
+HOMEPAGE="https://www.kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
+	$(add_qt_dep qtquickcontrols)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 546594c69f80..56decd245d06 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-18.08.3.tar.xz 2525576 BLAKE2B 4514c9e59fe67926cbbab1b0faa7e564134bfea20fd73bc775be8e4968a92b79249895fa29b1a0c4465f5433e053a11b590dc0515e099074dfb549e191bc9755 SHA512 9b9bbb86d926f7138f8f8cf4610064a92e044980eabb837aa4a39a1aa82807067f0bc64f977cc3abb2a1d120b500926f11ff993f93a072113006010df6834f70
-DIST kapman-18.12.0.tar.xz 2525540 BLAKE2B 9850f02fe2881f1d987be2e9788ec83686f1995e753d45c2bef33c90c4d0f45cf98aef9a6f7990be12c5744646d582cfdd37d7d186d2418325b30c54d56d4f5a SHA512 79d2b9843d1b43efd9e338b49c8a8aea773ccd49844006bc5077c69b9202f5fd80c7820f1bc6459b3ee330b0f5cf80c36ba4bf9a3759d76521625cf3a8f6c88a
+DIST kapman-18.12.1.tar.xz 2525504 BLAKE2B 8074203bc25054acddb473813d82533ef12245bad57daa30bb9ef056ac2662b404012844a6ea17e5f9197f6b3c25d50e20792b744bb37421ce7047afc51f0699 SHA512 b3ac08affcc6f09056c80afbb1c5ac762cc49e71f42ff1a2e976b8fc8001121be4f320dfbbb4983f28b61de5bc632b87f8a71da4a861f761d58171cea6302966
 EBUILD kapman-18.08.3.ebuild 697 BLAKE2B 46d63aef5ae68520154ab97979ad8cc3595ec7daa2df81f54e5fe60a40847e4a86b58eeeae27626a092c23a2cfbf0f68f4c6526de4bf543b57a8724f1be52c92 SHA512 ce998f708aa46171679126bb4af861e6d28c0bce6829ef0a2a92d183e162348cd45bb691bd4487bb913d26f169685310f3dd36016914abb00c35646ba6307626
-EBUILD kapman-18.12.0.ebuild 699 BLAKE2B 3ccf94268a6afb065058c8f66d3ff189859e1e80acc11c797ecce1af4f39eb9494bb580a99041ae5f55fdc1198a766f029ccab481d0d8a6aa5331498d6998dcc SHA512 52b1174643043ed9a793babbf923565cb6e15ee6c6cb8d1fa27f490a8bbdd5775b206154b67bba1d4548cd7bb518e24e526afc410a436ef840707b8346c9a05c
+EBUILD kapman-18.12.1.ebuild 699 BLAKE2B a80261e02708585144028fdc6cc6b17fb5d64d51977789fbe7f9f8fc6c1fb101f1ca3014e066064dd9014a2f68540304420f0e4261c555e76abee1be7e4cdc0f SHA512 7437388896f5ff14d5b1f3b9eecf9b522290983c7e9a8b0626bb649033ec54fd78e76a20321e8a23b06af53677ec9a09f81553033665623980c8d75c55b1b841
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-18.12.0.ebuild b/kde-apps/kapman/kapman-18.12.0.ebuild
deleted file mode 100644
index d2fb8aa8fc1f..000000000000
--- a/kde-apps/kapman/kapman-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapman/kapman-18.12.1.ebuild b/kde-apps/kapman/kapman-18.12.1.ebuild
new file mode 100644
index 000000000000..56b2fc6e61fe
--- /dev/null
+++ b/kde-apps/kapman/kapman-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Pac-Man clone by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kapman/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index f2d045557af4..643b41849bee 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-18.08.3.tar.xz 317384 BLAKE2B c2b036ec4a7698c1da7fb77987435f2571b1901635fde14d57602973067ff31fa6a1b1577bd8b934346bc7dfbcb12ecce0ef28f5e9d23d05be48611f73ebd3ce SHA512 48d91554904eb7b6a527824f786d43db0a4347a1594089d46fd5526d8ee78e283e7e4baccb2b639e5e8de72acfe35bb2be1c98ee151751000b8f2e9ee530993a
-DIST kapptemplate-18.12.0.tar.xz 317244 BLAKE2B 93b16e447e6f8a300d2af5bc445418036f5901c15fdc5f08417f6cbe8c52a05be2e5bd2664970a88a67cc856706c134c852f395cf6adaed3701ced5f6e77b4cb SHA512 d77c493e97e5e575cc73519bc5fcf081ba1c325ea521ee2fb9f54fa465e6703e5a8b85be053640b039cdd344d92ccc95a9fedb13de69f2e37a5dd7efd8df4fcf
+DIST kapptemplate-18.12.1.tar.xz 317108 BLAKE2B cf08b86cdff50f14f295b26fa5879888b3b43e69837bfe4577d7b1093f5866d233bb9b42a774045d0280bb17cc3a958662938487781715652f13a0e1b70a12d7 SHA512 2e6409640cc479933d61ca2240c31cc70afb770a75626388b87c11ece7645a9b95acaa55c0c44ac19fac14449595eb33f33e8db826c9fe2bfedb4369b0744e93
 EBUILD kapptemplate-18.08.3.ebuild 713 BLAKE2B 21107b27eab4935c99982a9b512dccdecbd429084f57fa2a83f7ee255fdea52c2004b2b919c86b20f04a303f1844d26a6f811ab166d068fac7afa4af2b21834d SHA512 9e4f1a19fa2e8ca43183c3be303c48feea9119148bca306560d0bc1e139e117951f88e5d66e158eddc46a7a32e7f1503ef9417116749b86b80d76951216e8dfc
-EBUILD kapptemplate-18.12.0.ebuild 715 BLAKE2B cbb54135c0ddf8c666b98d2f0dd736269b5ce1686bba2b91901354b08ba90ccb234ffee30444641d434f075af26eeb6f30a39bddec955ca917f87d78cab306f4 SHA512 8e812abfb0d73fcf06220f8a1cbd43462415820d8c59b174767407b748c882580a1ecbe5b5b5f911424c6c3b2100065552531e4962ef42b2a9251d53916fe15e
+EBUILD kapptemplate-18.12.1.ebuild 715 BLAKE2B aeb110c455d925d496fb0dec8bb090431c2c58a20678aa020b013e89102b52b6ea6d385da6a9fb1d1571ba0f91a1d77e03b30a32e43c0f1c7627554cd9187343 SHA512 8cb112b86fc1da4b8cf6487d047e886862719fb5837ee13579e865ee8a132ac2081d193862c9610881c38999849d5452c7f8d8343e5e307ffe8b7f058027def4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-18.12.0.ebuild b/kde-apps/kapptemplate/kapptemplate-18.12.0.ebuild
deleted file mode 100644
index 35165f143775..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-18.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-18.12.1.ebuild
new file mode 100644
index 000000000000..eff71645299b
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
+HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 89f9474fb636..7560ab46e39a 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,5 @@
 DIST kate-18.08.3.tar.xz 5664744 BLAKE2B 6645600156844c52ca8162bec98f107b45f8f4040aa94adbcf51470fb0102c300fb6755b6d6fb6bd856e6792ce770cae72d3675a2ac7fe0519f0c18d4df70e7e SHA512 08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3
-DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+DIST kate-18.12.1.tar.xz 5763596 BLAKE2B 08ab380281d097890ee68083cb42f7318ea0b2835f9881342967f9447c09788653aa2a09547e3d49b82abfd1570a7c8cea4c5178c7b0d82883ffa9e2807876af SHA512 d7c5189a2bf807845beaa8181882215b67e33229ba0f97027034d74c7bda06a0f820c673bd98e7dee0c47e9f58f81d3bd9af516e5d91f61bf227c05657fa797e
 EBUILD kate-18.08.3.ebuild 2106 BLAKE2B e776a85fd1750c79d578cd4289893095b59993341ac11aedbdfc8bd474e769a23fc3b8f33aee4e0e8658c28a58483faa57caa6e1b37fbba47d183eedb63ebb8c SHA512 95a4d5fd6139f150224774873700105c9327165d2c051d37acb29c8c01585a91145ba42753ee1bbe8f169440abdde61332b10281e40fc7bd6785f42cafae46bb
-EBUILD kate-18.12.0.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
+EBUILD kate-18.12.1.ebuild 2144 BLAKE2B 918eb60113612120104310620e057e13a552ed0e3eb599a29fba74a822afe336dc23e0bacabbd4a1cf1d2876352b98961ce8d0a024c07776542ced623861841a SHA512 506394441759b494de9f8dca21eb202b1d18b32d4f66fe07f8dd62600a5a6868b589ad43cf85db2c227cbcacb91d9595067fbbd657d934c9e6ce8ee36c6e1852
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/kate-18.12.0.ebuild b/kde-apps/kate/kate-18.12.0.ebuild
deleted file mode 100644
index 451e525f55cb..000000000000
--- a/kde-apps/kate/kate-18.12.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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
-"
-
-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
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if use addons; then
-		elog "The functionality of ktexteditorpreview plugin can be extended with:"
-		elog "  kde-misc/kmarkdownwebview"
-		elog "  media-gfx/kgraphviewer"
-	fi
-}
diff --git a/kde-apps/kate/kate-18.12.1.ebuild b/kde-apps/kate/kate-18.12.1.ebuild
new file mode 100644
index 000000000000..3e5b6c4c47d1
--- /dev/null
+++ b/kde-apps/kate/kate-18.12.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+"
+
+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
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && use addons; then
+		elog "The functionality of ktexteditorpreview plugin can be extended with:"
+		elog "  kde-misc/kmarkdownwebview"
+		elog "  media-gfx/kgraphviewer"
+	fi
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 0dff701b5886..8c108d3d9a5c 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +1,5 @@
 DIST katomic-18.08.3.tar.xz 1422820 BLAKE2B d134207c16d3104da13b805d5e1bf30031498ed3acd999933b954730b62c3cc839377b952d09ae3419a6f3b22f371109d0ef16843a4ba401c98d4eedbfd31758 SHA512 f77a46a52a8039d5b67465033e38ac11713390ac7fc21bbc15981dded19ec4355e4585904ca7e0d830a52831b9e3a8ef5bc3ca0c4a270393207f50c7f4a64eb7
-DIST katomic-18.12.0.tar.xz 1422636 BLAKE2B 89548b8a4fbd1900e21713396076269619efddfa7c41f0c2b23df5b17cfa1f4776f3df53baec80cba02133c8565bd09ee6b0b0358a85b7de2267f4736b93ec37 SHA512 071a2846485d4befd70dce12b35fb57bab187a34413af2b8b8360d043d47e46985348ed7839fe6d8c9cb963046ac0d91497e3a80bbc2e97865471049ed4adc37
+DIST katomic-18.12.1.tar.xz 1422536 BLAKE2B fe3897aebd6e2f4ea14ac0ba54d090765a1053e860b1cf639f73f8e1fa4267fa6abb2e5a987abeed454ba6dc182d5c08f54159abd2572e4abba730a09a785ae5 SHA512 712d337e45a41645f6a8a95e1df2b9393b08286b92ad66619e011d4aafe30aa0cc9dc9a1df8f0a5821d4754dd09fd3ca83a88c5ad4b04b660606b120865974bd
 EBUILD katomic-18.08.3.ebuild 735 BLAKE2B 04d46f21724d8b658006cb6e7d442e207850beffbfcc8901450b7230315afb9bed886d6046d141361360be05427b42604890c3ad8a8e14c25333566720f1df74 SHA512 484b850a5e1b8d43f78bfb71c1f6e3667728197f921445db52ea255a860b4208539743d787a6ef90d5996a67142b21adc28e81a9bb1a6e925ba23c9fafd15ba9
-EBUILD katomic-18.12.0.ebuild 737 BLAKE2B bb7d121652cc950a5b2143356f27d351b2db0afecd404470bc7ff11937378e96a8391df798e634d4e81f2254ededcdf7ca0f05d43a2cf0f0a440e979434e7981 SHA512 abb60853f5b5f2412eb4d10748e86ea595bf59f0673895a2d9d02e16f32ab829dd98df02a046e9aa5aff3c90f515ee66ac7237992a054bfd0216dc4f2508422a
+EBUILD katomic-18.12.1.ebuild 737 BLAKE2B 1896f0c0b405eacdff4270f6768a291c9a2327beb19127f77ce076be6546afd11274715d01f84a83aeab16d48743f15459c8b5a2c54cfd146ca441ee5c3c7af1 SHA512 df5827a4596c3f99a4d739ea7c52a259c06276bbf0c2042f01593351d9965045737bd3805069eab2ab457f7c4485fe2cdb913cd74b69b612c1b309774be57514
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-18.12.0.ebuild b/kde-apps/katomic/katomic-18.12.0.ebuild
deleted file mode 100644
index bef67483f532..000000000000
--- a/kde-apps/katomic/katomic-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/katomic/katomic-18.12.1.ebuild b/kde-apps/katomic/katomic-18.12.1.ebuild
new file mode 100644
index 000000000000..804ea573c0ba
--- /dev/null
+++ b/kde-apps/katomic/katomic-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/katomic/
+	https://games.kde.org/game.php?game=katomic
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index cd8eff8643dd..b591428fa765 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-18.08.3.tar.xz 351320 BLAKE2B 1b78a5804feeb502a2ffe35bc2a4e562257da9567128c1ac13048c0be17e1d2a456a549d3af7d3bd3c37eb7c4298c0ea87b89381dd68abcaa5502d0c951cadd6 SHA512 e6e44326c775932992fc2223238784908fccfb5db3f2b001523ce1caa5b2ad739ca9863b529f626938af278240e9464aff9aef0984330cbe922aab988a0358a6
-DIST kbackup-18.12.0.tar.xz 350944 BLAKE2B c1880c477be0ac3293885a4432cd6452059ff76c14ba91aa09b6a6e1835d0779987f3d5e8d9015a90c696f97cf8746735f2713917c6c1658d57fdb4e33cf7c64 SHA512 4feea3771c734651c18ad06c7619a66d06e972d8e336ffd438606e49ecfea00963e8266ce5a2c04c8c430949c9e7eb1437755881b07b6df5fa99960710dfed6b
+DIST kbackup-18.12.1.tar.xz 351476 BLAKE2B 8e8489a037ddea6e2a9991e0411e2353ffae2427d124b42abf01505b78c60d45d6dbc3621ef10905f9b3dc2a04cabf6f896eb0f170d55fff3db53edb7dc3d12d SHA512 e1a3c8c04b249a385b794555f0939126d39d3de3d9d41bb9d97aaef3e1de86ca5d4892868f80a74c3a60b2049146e425e8eab72ec31e76101d65389592ce31da
 EBUILD kbackup-18.08.3.ebuild 823 BLAKE2B 72890aba213dd9ec7ce017ec08a91dd4226995f232229de15c39c3cf1e76596d030b93ab2f4f87a8ffb01a5a27d2e8bdd86c936eaa90d18041088d431cd0a723 SHA512 b4320d28b11ca2c21018ef833168cf5100f4c7598eac108383d471bbd1a65844aa2879a6e3bbd893ce91e2aa2117f2b665ed39e94c1e82b635614f4232d9b450
-EBUILD kbackup-18.12.0.ebuild 825 BLAKE2B 2f1e3d4a1808009f7acd4a212f24344c15f5db3b81aa6b1fb94509a97b449f5854a6507fb7db4436c8715eeec85582b2a5992d5defb7d5832ea7ebbd0b02814a SHA512 e4f7c018a674d920b48dc88db95cedd67718f26cbc202824ce151373e3e7f6b3865c22b7189469d0960d84b74b9fd3e19ebc7a4d5a9b87099ba441bcffec728f
+EBUILD kbackup-18.12.1.ebuild 825 BLAKE2B fae828315e20e2f3e9a2ffdb8be3397b077df53d2b0783c6a4af1578b62095b9f9e4eda28f8d9f46e6c6fc081aad18abe267c2146e959490f13f99ab05482697 SHA512 bcdcff83e1a819f618898719ce50261e9355ca30c7c87e260f57612726d8f0253d605046edafa1871695caa38fc7a54edc39fb87d501defb51d811a2528e5376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-18.12.0.ebuild b/kde-apps/kbackup/kbackup-18.12.0.ebuild
deleted file mode 100644
index 3d5a596c33dd..000000000000
--- a/kde-apps/kbackup/kbackup-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that lets you back up any directories or files"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${CDEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${CDEPEND}
-	!app-backup/kbackup:4
-"
diff --git a/kde-apps/kbackup/kbackup-18.12.1.ebuild b/kde-apps/kbackup/kbackup-18.12.1.ebuild
new file mode 100644
index 000000000000..8175ffa52f41
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that lets you back up any directories or files"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${CDEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${CDEPEND}
+	!app-backup/kbackup:4
+"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 8c7daca14282..ef51a784a931 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-18.08.3.tar.xz 444540 BLAKE2B b290c7a556b4054385cf256b790be21acf14ef6822eea4d32a00356ef939183bf1c164d980c31b48e5996f37c2d882a574c21214831a2a78942007da8d1a1084 SHA512 45b70cfce300b5d9d649ed41862d53bf67ab8ad8744f6381794dd28e34711c878d48b8816f4d31b74757a1ac175ecaeffc0a0ace708131fcf4d2e50ccbbb281f
-DIST kblackbox-18.12.0.tar.xz 444276 BLAKE2B 49b85b728d2f577426c692308e4f293fb234935d68bb21a12fdae687a3673929e16f9910e8d523307b21202d3b4db200c550282db7f15a9a341aa1a02981026d SHA512 9249871bcc150beb278426ab797e0f395a008b5bcbcbd1d09f07bfa00b8f067bcac8fe11d387fefd545615daa2c5e5b38e6a129a1651dc1acd7e9681083660ba
+DIST kblackbox-18.12.1.tar.xz 444216 BLAKE2B 9fd8b71dd12c7e1130c31259758523ac2f69ba200b2e867063bf8cf44f690af8176d2c0ff56840e186b3b46f9c83e5f66c386f97fcffaa51532ca14b325ae32f SHA512 126a179fd71ef040392b6351c8056d3808fea38693d352193f6319f29437dead9cefa207ef18431122ba756c0f2b54a5eeb118dc2f9dd4f15a5f92038cdff41c
 EBUILD kblackbox-18.08.3.ebuild 731 BLAKE2B b73e433a7b7ecb06e7a0c26d2b7c60fb45e67189647bf64d41011cd6eba3527550b71e43e30b44b8f0daf97e1be3f9c2af6ce788fda788cb88ae9dc296c9f171 SHA512 3b8def9c5b781f889d6641d9ca1594e45d423285f085bedb37ba5c8d529d0c7bd23d2dcf4cce809a248219999dc7d351274165695cfeace0909562b7400f679c
-EBUILD kblackbox-18.12.0.ebuild 733 BLAKE2B ba83dea8141e27728d0a8d86a52026250c30dbd05ec5bda293620dd5cbc44474bef0812a0a2bddb0a7cc20d0de5261c1badfe2e3b263da83a561fa3fbc2c64d2 SHA512 2ad8e6a1b222b689a24023baae3a7098750fdf9fe32b20ccc4b3f80669c21317a7708f1addede4db8a6803a00c611dd77ad3b29c7057656c74a0193582911d64
+EBUILD kblackbox-18.12.1.ebuild 733 BLAKE2B 897bc986db257b366f12d6922feb3b0e38818e809714b45748820dd90542720d4155e7fc4e90007cd5784c94cd9dd151c173eba0bc71335d6f21031172782985 SHA512 7cabe39cc23f477a8ffc72732d770bcd8752e79c1fdb6137226bfb59df723493abd04e9a9f2dcc7783ac537bd6f53ed3a698fbc22e3f5fc5995d9eb8fb6b590a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-18.12.0.ebuild b/kde-apps/kblackbox/kblackbox-18.12.0.ebuild
deleted file mode 100644
index 32e8f4464f01..000000000000
--- a/kde-apps/kblackbox/kblackbox-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/kblackbox-18.12.1.ebuild b/kde-apps/kblackbox/kblackbox-18.12.1.ebuild
new file mode 100644
index 000000000000..4a8c587752e1
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Blackbox Game"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index bbbe03f2638b..0c039093100b 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +1,5 @@
 DIST kblocks-18.08.3.tar.xz 1921152 BLAKE2B 0a6a39559b220431306532ee8fc880e5e846a24250af7d95cf7d39261b52687f0e22ae44e16fd15520629708c5fc758308ce5d42b3bd2701e873f22754ad396a SHA512 2e664661f387ebc55ad9621e9ce7836079c2fb330cce82986ce1dd69b115bf99e31faa4e55e497748f9ac750801e98bf73e46e1556c87a1c5e72268837435cb0
-DIST kblocks-18.12.0.tar.xz 1921632 BLAKE2B 930900ce60771da8dbac21c392d798fc18b101908c197b7147879768eaa14003f7173f24562b62217598a56ee903f3c0ba0a056d2ab57419a2b6eef6396a3b88 SHA512 6ca7760abaa54bb7a7e05da4dd7a421c7b87e351f9050987d58565a1f7eb05f186656e02cf03550b835d6aae1d8f02ec7c377f10d3477ae4934d59cd6fa8763e
+DIST kblocks-18.12.1.tar.xz 1921052 BLAKE2B 1b852c998d30c25bfef9f86b4cbfb7c977a03f386eb9a0dc02ed987d7e18a8aff13a6e1ce672d61e8c2ed06c5dbda18af2256e6c42109dcf6338b1d2e41932a5 SHA512 a218d7c0274abe35092ca9713f0cb97d0ec0047b9d0e2c2ae13594b6aa8e28881eb938aaedd17b74566958d6701eab8b1b55596463196a512a9b04a6c96c237d
 EBUILD kblocks-18.08.3.ebuild 683 BLAKE2B c1849dab6ba8a6cabb234f02beadf74e5b04f5fdec1c0331a8e116f07e38bf6c8caaeaa0a26b385a73957eaa944d25cfed12c2a45715f2b94f65efbc3fa2fe04 SHA512 44d3d212700b08987b00739d58a25005acaa16212b3ec638b67fbaaee126d272b29c31926d52e834e51c8cae5b1380b3bf18446519c5265a9c8a6008fd6ddddf
-EBUILD kblocks-18.12.0.ebuild 685 BLAKE2B bad3689301214b3c3cbe800d3c24ae69676014a7443a13543593944deefd318aa0381d4102b460f77c3e768fceeefa7c8ee04735ec6bbdb14e5dcf8340c4b0cd SHA512 ad14e2c41d1a84d09fc9068ac739d799927c56ea65d09a0c1d1e2787004acdbfacc972c85b91116d1caa9214841fa6fc0005692579c84b995d0cd9a1e188e8dc
+EBUILD kblocks-18.12.1.ebuild 685 BLAKE2B ce163ecb0ffca80cb47d4bf5776f2cb8cf4052dd883f0441855c30d31633ac89f34a83b34afd9b136c17232aa40b7bd869555be255d93cd968f32e23412a06da SHA512 ae904d9d866ea2fd776841ef2661138d8703210cd98cdc89e5c647f1ca736570bc6da4d68e7cbaa8b4862e55e7fe8a016d65fdc4d01105e099e6713b41aa8722
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-18.12.0.ebuild b/kde-apps/kblocks/kblocks-18.12.0.ebuild
deleted file mode 100644
index 6a12a96eaca6..000000000000
--- a/kde-apps/kblocks/kblocks-18.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A single-player Tetris-like KDE game"
-HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/kblocks-18.12.1.ebuild b/kde-apps/kblocks/kblocks-18.12.1.ebuild
new file mode 100644
index 000000000000..5fa1203f8f56
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-18.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A single-player Tetris-like KDE game"
+HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index bdf9eb220b1f..aaedf3341098 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-18.08.3.tar.xz 72956 BLAKE2B 0c084723c856ac09066046ee0ad456812929a15cdc57972f49dcf6b6b77a00c3c8f0f46150a0c6dec968cf8e6e50a97bdf03f3d3c47f0c0804c98aaea13651e0 SHA512 1a319774f8d76e59615276df785c3ac602eeb2c2bdae7db0d94d4a3ed5c67af19a670593ca1c4e5dbcf17a8769f1d4abf21ed609240f76d3e7b01010d73fea3c
-DIST kblog-18.12.0.tar.xz 72768 BLAKE2B f556a40a8ec9269b003e9e395cbb2541e863ee128fd91101254d305516a5091159b7f16d14a57b89e0efe82c5ab664ebc9ef22404aba53ef0bf05f1dacbfeab4 SHA512 64ff83bc1bfb130571ad56828a8dd6777dfd3189dedc7ac6a09ae2837c246e3a8cf17482d03431df817fdc779c198fa9645b53f71ee9ff847a5c6e19817eacbf
+DIST kblog-18.12.1.tar.xz 72744 BLAKE2B 91c58f04b12ace59d2b0c0004d4622c7a9450217b16c9dad7ab4b070005a67243f3d01e6a1f7bb48337a45c047cdc0e5c752a002f78e65e1d0b68ea166ae12ce SHA512 076ca6316d9f41236f3402f821dbf014516e6d85355150ca9a2f462fe210912a42bff1d7bb36b93e38ae706d8ff13fd76d42af11d0e741783c213a572b8abf7b
 EBUILD kblog-18.08.3.ebuild 530 BLAKE2B a8b72dab312f634f34a9ff3ef5d1f40ce0943188389a58f543ae5a3ca740857becbf2a10874891d47c2223c3f5c44dc7c7d9061c2a86a216d6c15e1524b3b185 SHA512 85d737d8262e7d75958f60ab65508241bd67ac967156278777384acd4b21eccb2bdd9d1a566181977f46a3458febf47d3e5593c1a0854b3f6b29712451fcb74b
-EBUILD kblog-18.12.0.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b
+EBUILD kblog-18.12.1.ebuild 532 BLAKE2B aa98da915b7a8deb5ca019cbc57c244eac33c2c32ff1127d71b5e935d2b58bd73a70088a4c4a9f3bb57d3207f4fbbb1f5ffef4c3ed93a13c4e7519c954b8c8ea SHA512 fb7aa845c4c5edd98230f942fe53653f97d9f943a351bade99b1279980c5d7a9f3d98d7bd0c028e3780523395943b731e1ea4e2f0449b68c22813cc3131f005c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-18.12.0.ebuild b/kde-apps/kblog/kblog-18.12.0.ebuild
deleted file mode 100644
index 205141fef707..000000000000
--- a/kde-apps/kblog/kblog-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep syndication)
-	$(add_kdeapps_dep kcalcore)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kblog/kblog-18.12.1.ebuild b/kde-apps/kblog/kblog-18.12.1.ebuild
new file mode 100644
index 000000000000..977c08ed42e5
--- /dev/null
+++ b/kde-apps/kblog/kblog-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_frameworks_dep syndication)
+	$(add_kdeapps_dep kcalcore)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index fa55c77b4888..9dd217c93657 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-18.08.3.tar.xz 3465668 BLAKE2B a79731464ffbad50007260c62541268457b91ea5191990c514717ee5bedf49c19558ac5fab0c5d9fd744a5780e9cf557bebf6aad08ca29b47dcffba9e2f3a5fb SHA512 2d98f5b5badeeec04bffcb116930973f0c4313a6dc294e96728ee420156b6875faf996050c47a6feaaa0691c95965391a5367db06898cd70fa8e327f6591e06f
-DIST kbounce-18.12.0.tar.xz 3467460 BLAKE2B 5f2118637200e6d33b951dd2a61c70fb868161a0b4265b5d54629fd2b131f6e41e5d7b8f5a761962fcca63e14dd80c61ba3fa3625d8578ac441cae57c1ef0e8c SHA512 65872dfb24f0d6231c854202aa16f94adc18e590715c0871f6f2a1d3a4e590d87dfebc3ebc14faf4dd73cf29a1637ebb28082c4c1e4f72700b8000a1225a88c7
+DIST kbounce-18.12.1.tar.xz 3468716 BLAKE2B 76b2376ee90f9ac412938b1bd3778dfaee2c7b7e0a6955a258f3b80bf28fbc45f904e1db3ee63e13b1e58b75afdaeabddd3b3ac174293650c81914639e16eead SHA512 47fdc2a0274cb4f4a596501e0e839848e7f907e4c31e26d29b8be5c4690c709ddf59d1281c0dcf90253b7a4a9486ebfb82c95ec27995bec2e46d0cab545aeecc
 EBUILD kbounce-18.08.3.ebuild 814 BLAKE2B fd43555c4ec7b477d88f7b9193dd21fb00f587176182e5992342529fe416961e2cdae3a0a9d62993cdddbf9ee798e7acdab14f6c86ec19f10ebe9b74b2082549 SHA512 3a83d123fa877b11d1d9397791ea7397d4c9b21630b3d01398ffab90ce527be73c9fef6d967489531cb5fca4fc41ce0e45f8a56a13d663c4b717638e4be05e38
-EBUILD kbounce-18.12.0.ebuild 816 BLAKE2B e3fdfc22f9a43080926331c34dac9c52fdd310e75d27f2d9312292747bdaeefa6ac007277ba58749e2b04ce96d65a597f88a8e72e3f594c8a65341a6274aa173 SHA512 7c77e5a6165f9377b184f9c0e9f51b2d0aa85b67a9b15d3fe1fda3cd210e10026a3e8c6e4fec5e5481b3aea41535aabdfb6a6cef0cd4372708ec9a2789ec0d46
+EBUILD kbounce-18.12.1.ebuild 816 BLAKE2B 57131150abe73a82185fb3c249b9dbb3549265bccd827f630c4cdc4d345b91e0943abfb9cff8c938e5aa8eba5574e825f314c0d172bcb6c178eba55e99ab470d SHA512 9150a0a8e5cd91ced3a16da2c5584a8ba36da22eee3dbd36a9cee254891bca3402fe752a7ea58369fe9949f8ac5397711ca9c3960ae6a8c746490f37f2738109
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-18.12.0.ebuild b/kde-apps/kbounce/kbounce-18.12.0.ebuild
deleted file mode 100644
index b9d12510fd03..000000000000
--- a/kde-apps/kbounce/kbounce-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbounce/
-	https://games.kde.org/game.php?game=kbounce
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/kbounce-18.12.1.ebuild b/kde-apps/kbounce/kbounce-18.12.1.ebuild
new file mode 100644
index 000000000000..42d126a2143b
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Bounce Ball Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbounce/
+	https://games.kde.org/game.php?game=kbounce
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index cd13e57ef46c..f063df1ea18c 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-18.08.3.tar.xz 2274256 BLAKE2B 2db6120a7f2a606643e60166d3df0d6d572640aed77e22406aacb9bcf8b79a18073e8829835de1e3a23db29f152cf372b86f90b6ea68fc20f65e76e9f46c636e SHA512 c195fd04a7f2f98af435f052ebdb8026e696ff709bacd54fbf15c928b5baecc649535e2949022cbbaa134f7130d69e792b2a6894d97bc69e5fc2bd4ec0a788fc
-DIST kbreakout-18.12.0.tar.xz 2275564 BLAKE2B 7f59602f698a60050d9f270c00bd0871f834a44176a61166df1ce50e8a307cb259a863fde75d7ce6c7563231d34d34f3296567cb9637cd434399f10ffa4bd480 SHA512 f3cd431415611242e67ad0f3f0f86fd60d2d29a9fa38b331849f5da7834ce54424cdf5fa142bdfa0057e12e7299c2672e3fa7a8b6d03f93c16db87cb60b2e007
+DIST kbreakout-18.12.1.tar.xz 2276084 BLAKE2B a7575b7e2112283a33e27ae11c3a6c289679c114862691050a63b6c90beba104ddd02ae251c7e74beb66cfa69dcccc944076b52f8be73685ceaafb176ad6c0f0 SHA512 687944de02f27fde69dd51958060855a1231bd95f200bef5955ead5171f154537bfaf296240a63b8336381d9c5b340cb1322a90a789d45bb4bd652437abf44d8
 EBUILD kbreakout-18.08.3.ebuild 763 BLAKE2B 91fb4a817a2357cdc29f1bac91517d670391e262970a8d6c78fb3bc905c123f819566f773fca04aebccc3d252797472c8c201134da3ab22f341c676830eadcf1 SHA512 2996faf15ca672d03af15d8d30e0f2cfc70ece17621f8c7df31ae184cbf53945863e87a11a0e6f752975b2a669c57b0e46b6b18cfcb22441a0d632ac81925ce7
-EBUILD kbreakout-18.12.0.ebuild 765 BLAKE2B 7867c46cae46844ecfdf3cf862fe2692d7694cc85f19fbfe07409e04ca6dd7232c66dafdeffc0414a73efe710029c4418152088cf3958f013e74a0ec12def8d8 SHA512 68dcd722d108bd5112308db6850f65b266bf7bee2712341f8a1d4eeae9c0b4b0f35f8eef00373136a39b42dcd1f9cf6b1f672678eceb7f82acc088e7467b7241
+EBUILD kbreakout-18.12.1.ebuild 765 BLAKE2B a1282b8edfe649b7893132a144cbd3dd9ac9f612a4da69f06828fe9d9dd4d1fa73abaf2d2a46a4ef1d769f93a628a52d8598ae5386002b0da392a13704139eb6 SHA512 dd7ae5eec4b40fa456817ce79804d729a1693abb41022408c14f1e93695631f4ed32d53ee6fbfde81c5acfc7f09545ab4d886b49f26d583221bab8f4cfa0c833
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-18.12.0.ebuild b/kde-apps/kbreakout/kbreakout-18.12.0.ebuild
deleted file mode 100644
index dd41dfd9cf90..000000000000
--- a/kde-apps/kbreakout/kbreakout-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kbreakout/
-	https://games.kde.org/game.php?game=kbreakout
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/kbreakout-18.12.1.ebuild b/kde-apps/kbreakout/kbreakout-18.12.1.ebuild
new file mode 100644
index 000000000000..0f102d54daf1
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Breakout-like game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbreakout/
+	https://games.kde.org/game.php?game=kbreakout
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index a895d72ccbf3..f5e1bf76b5df 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-18.08.3.tar.xz 5603772 BLAKE2B 96f4a41ae2be6babd6125b338df7e0fc0dc3dc78191ed12940dba7e2c59c2bb5a250a7ab1f035ca9637881478d7d7f0e23d888602204b23fb81f77e284749915 SHA512 c8ad6634fdd05b4537fe3b2aa50afced142d7892f07513840f698243acc3137762fa906f125a1dfd8baf7da1002adf4609da5e2132129ec19a309d150480cd69
-DIST kbruch-18.12.0.tar.xz 5603332 BLAKE2B 5d7e27a84c9c7068d244d02f8ec93c9b5a007c4e3ce8781e204e8bd6fc7c3ce2578d566d0e147a9d9f4eab7b47b7c6c8da0126407c5cc7cb8566adde8c1ca48b SHA512 ce0040bcf2e9bcad5f49566c69c7f169597b653bb3bb7830a1a41faf08447ad4bfa848ae2c7759a6c4a42faa45004f701bffebc09cf1196c590c455bb72282be
+DIST kbruch-18.12.1.tar.xz 5603416 BLAKE2B bb273a3eb418b61cf9809fbc228e6eb31ebd415dd8f8753347cfa57c1e7cc5bd33046e906c7118353fa13a070dbf29102f4636154d263ef2ac7a40b5e82a63bc SHA512 2d81e75d92501e6eb0b993f1924b2649d84574e11cef534338afbbd886d1efbc083e2fb61784db7f034ac09fc70f98ba7dfbaa2d156f594cae8ca8e8a7a4bab1
 EBUILD kbruch-18.08.3.ebuild 628 BLAKE2B 8e7e61882d5f26958d66b90807a6be9d2b1c7bb18bf3b721c9ddfbad2c70abc9577d689890972bac0493361b5dbe3e68a3d9cf58e1a43778b530a184ab0ce0ae SHA512 7109c23532ff234490ae1a629e90693402911c7f12bbe88cfeca6305ef515aaf78c9aa3dec3062e5c659a6731a29add8775cff310fbb7af82305175cc8ddf27f
-EBUILD kbruch-18.12.0.ebuild 630 BLAKE2B 3a62dedf88da5d6f7c38d819623c67319ed3bf66e71d0c28f1e906be3fd1f479ab0ce365e311ea95a5a04c137b9c33a2741f4b9a94f995724eff60344f324825 SHA512 a5836e8fdc4d58a968da597c8ccf342a936ec5bed8932bf6b521edafb519f076e6b1dee01b23c1296eef319989e47ccece3f1b77394c0590ab0908cf6706b514
+EBUILD kbruch-18.12.1.ebuild 630 BLAKE2B 3df3be0f93350f3b9c9aa724238d5bcceaba70326adf36a9736868d2e5fede3fc02aee975d84e4b5effbf9b8615cb4b9adede7c456e245990aff350acad5c1e1 SHA512 f47e43541176e090c990da0898d08bd22292a043cc77fdc72ae7d3b505e7c22374070a715efe9b52126fc656880b125ac5975a89b8fdb5f8dc3a7e9c7fb43717
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-18.12.0.ebuild b/kde-apps/kbruch/kbruch-18.12.0.ebuild
deleted file mode 100644
index 9cae5742b41a..000000000000
--- a/kde-apps/kbruch/kbruch-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-18.12.1.ebuild b/kde-apps/kbruch/kbruch-18.12.1.ebuild
new file mode 100644
index 000000000000..5574ed5bd27e
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 6c55661e6521..6daf349b0ede 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-18.08.3.tar.xz 808440 BLAKE2B 489c1219f50c24393d754eafa2eee7956c6229d36c1a147829615d4db2689e6f91745ac34f06b0fe872da60c431407f0067e6af71c2493c69e53077eee1be706 SHA512 abbbf7ba539da1fa71d31e4603d1b8a76178a48bf503c735ebce9bbc9887e9ec64b2338ce77de2f38114faa27dee51e19af61cf4d3e9fbbe942a417edf2558c1
-DIST kcachegrind-18.12.0.tar.xz 807824 BLAKE2B 13761c896963f1308298372ccb446b5460a8f0177b4bccd972db090e1e5e81e5f3cad517b01a0d5aacb9a912a2eea78efc89a9f607dccdc59707f1b793d23a1e SHA512 b29b8493c9c0fd1c442be931d50d4412e1ce01fd615b88864b7d687babab8be47ec5527b40c5acc95a65518deeec91241fc469dcd24bc5f003878e11d1b096c3
+DIST kcachegrind-18.12.1.tar.xz 807868 BLAKE2B 1c15d03c3532cc5a48d90dfeba9f4d8f555cf1d74b68b3e5323c63e0f5c9c259f9c044947bad1e9d13d75e43eeb1e772be09636e7359d818197a22bd628b01e6 SHA512 4288e18d3ac4cf7cf7f3e3e44211e28e5e5f23e37473d4c3fcd1d4a51e5f81768dda2b7a5e34f29f386f5f1d661a3d1bdf67fdcfc0c5107d26a6fcd66db6fc0e
 EBUILD kcachegrind-18.08.3.ebuild 876 BLAKE2B b9265fbf159492354f5a6758bd0a94570b3ee6f57bde8f564c7fa92bc7bcaddd4bb369cebe0faecf16a805712fc99be3a2b4e99b9e00d7957b1fefbde2e3ce4c SHA512 331111603257484b3527753145a8d16157a879e8aecb69cf636f576f67c4aaf8d0217ff515c1f2160a779963321465c1fd76ad6d87c80398a5b263c36a52463f
-EBUILD kcachegrind-18.12.0.ebuild 845 BLAKE2B 7ff632c8938938a736819939693827679346331c37a312ec38db33f06d486371db29e6a4a350e6bd3ec190eff3621f4e66d3a215149ee220c53199de8140dd0c SHA512 040839dcb2aea9beedc5ea5db31a3fc81d72813a7bed6f1d3b13bb89d9765bf9c9b6d21f6e98a8103badca8aff0d0ff05c392f55627678b08d8dfbc4ead2827f
+EBUILD kcachegrind-18.12.1.ebuild 845 BLAKE2B f889b61f2a70f490345800dde2f6da77cc8f8c92966e28836ed722602f63bd21504787e127d72452faa3485b5c4057b83196f8f9c1d300e212084542464ce309 SHA512 f37067c03cef042041bb46c3b5809dbfbea0027692d020def1a9693c5b224ad372c887159275ef41abbe6a34d649f32c76e0aedbeb20e47f13efc2063a0dffbd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-18.12.0.ebuild b/kde-apps/kcachegrind/kcachegrind-18.12.0.ebuild
deleted file mode 100644
index 4e6b7763b19c..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
-https://kcachegrind.github.io/html/Home.html"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz
-"
diff --git a/kde-apps/kcachegrind/kcachegrind-18.12.1.ebuild b/kde-apps/kcachegrind/kcachegrind-18.12.1.ebuild
new file mode 100644
index 000000000000..6fa2070d5056
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend for Cachegrind by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
+https://kcachegrind.github.io/html/Home.html"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/graphviz
+"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 33df6344950d..62ee881f98e4 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-18.08.3.tar.xz 362192 BLAKE2B 8fa45fe7ab30b164c773752ccaa375d1f082b272a13eaa10183d2ccdf228bfe53a913b8b375bdaaa5a0023f2636c5000f33845f8dc087c2da2b3fdd13a4783e3 SHA512 55c58bebd13f73e9b9a4f6ffb06c43700493f268eef9ad7357ef7a7e6857ffa134fe396ef3ab1fa3bd4544f01ac35bbb1d2b729acf93c271f9dbfc694b18b144
-DIST kcalc-18.12.0.tar.xz 362668 BLAKE2B fb60ac093fef13661832a551446967ccdca7d262d97d40c4fa7b95f80af653d6375c661da30fbb447fb3e6a05178379c7fab57a500859949cc8e04eef2119816 SHA512 3bc8075210f62e69434e721a5be93d0c091377ad7b72ca256fffbe0f4658c4d47646930760557f66f290d03bc851fe3fcb7d8b24a966efe4ba415d490cab618e
+DIST kcalc-18.12.1.tar.xz 362756 BLAKE2B 5e293b1ae914c5242d59e60ad07ae06161a5157bd0b6ccf0a31cb8a8765f1b6173f5290261f90a3e29d04441c5c2c0480cd946b5a65a4e626dfb0f1d1e0ac880 SHA512 1f1fc813e79958880fbda1d574f4f1120f45817d9d652e2f06f08cac9f1923258c209ad809611ac0ea4a9201e8a8a8bfed51ed049163fb4524d22fa1f75931f1
 EBUILD kcalc-18.08.3.ebuild 768 BLAKE2B 1038f425ed9ac45b0e8241b4727b3f53e4d6e24615165d4d45c7b5272557d273684bee827d5b27fac7d80135b4979b22d521ee06fc4a7cf84a1da924e88e57b6 SHA512 cf2162eda7b62f7827a90875f221830ab740250f725f009c404b562bfa5075f39c6fb2981070259d9033dda6404fc55813d2cac45e604db56ba80f00e73add8a
-EBUILD kcalc-18.12.0.ebuild 803 BLAKE2B 93988210c1d253c29c3df4d032ede4a850abe91eb486e8cb7c18c659f4e95ed278ab27405f13db03c0593ab0f6338f08a11fcaee724dbf2df2d00865e4cb06c7 SHA512 376798fe35eb391b92e513f8758b0487e8bfce6bdd66a6e52282002e5adbd843fe2b216d1b83d50c77d5ab95d6372605943dd28e87dae342b62bc71483724f41
+EBUILD kcalc-18.12.1.ebuild 770 BLAKE2B da4b719912c248ede8763d74ce9935d01b770da1a84ce77b9ee1a7e55deea6c104d09523e25ef19c09524a271a5bb1fa8bc29baec28f43eb816d675841b7e03d SHA512 813cb44286ea8190b005a42467e9614e857babc217330c84b2d1268b59d80ea2b423850163df065b985767a323c70e98ad7541c44650889679be4ca7ea9d8a65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-18.12.0.ebuild b/kde-apps/kcalc/kcalc-18.12.0.ebuild
deleted file mode 100644
index d826dfff8f09..000000000000
--- a/kde-apps/kcalc/kcalc-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
-https://utils.kde.org/projects/kcalc/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/gmp:0=
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-RESTRICT+=" test" # bug #673136
diff --git a/kde-apps/kcalc/kcalc-18.12.1.ebuild b/kde-apps/kcalc/kcalc-18.12.1.ebuild
new file mode 100644
index 000000000000..bc8986b45c1b
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
+https://utils.kde.org/projects/kcalc/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/gmp:0=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index 4fae88e19b8c..0e89aec32a80 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,5 +1,5 @@
 DIST kcalcore-18.08.3.tar.xz 253392 BLAKE2B e43ab2781326ca5a9758fd1c49ea547ff837fb1d2d95d55710247c8f5725ac126f287587aaea2d0fc2376d948d013b965c04b7f8758e37373e7c9099a96816e0 SHA512 a20145604fd809cc04078e689efda7634b1c4bf3c4593a8e7bd662e66193ecd79ca1a5c9eeab9efdb71f94fa1c8868f0f2bdf28806fb585ad6dac2f35294e520
-DIST kcalcore-18.12.0.tar.xz 252592 BLAKE2B e0ee2f99d7543cccbe527c57b6c98673f7ed7b98da5a0c0e7f5801474f1fb2ceed3c6ffd91fa5eb13f71aee36388a550237fa277afe5d8fb749bae58164e5e41 SHA512 3c7a015afde62821254f27683836fe8dc40db374ed452a51c0c8640a6a39f8f0a474bedcf380465af952f7854799dc33a3853e5ea5fb205ddd738eb610da60ba
+DIST kcalcore-18.12.1.tar.xz 253004 BLAKE2B 604b57aaada4d462441842638ccda52b6d6d5c24f06760fd1af505590431c71b83320ffed3d0ae65268c555873ed7afdbceae93163bf09b14f56ce700c541884 SHA512 d3eab74cd1b3fe98fe0cfa363886c37f2c9b1082a125c94b831ec071e8a768498a3db378830a253edb12f6ae648b0ba06b35b9b4074f464ee5554ed8b0d3c974
 EBUILD kcalcore-18.08.3.ebuild 435 BLAKE2B ecbe954d58328a89642658281475bd52990180ba92e84205bfe2791cb8aa99d44144489832e22ad2dae92c960beff81554d7a616ab7d7919831532765489fd28 SHA512 f662b451b23ec7ee55e254ea580d3a0475b338abc4b34af9f03afa391359646fe98c8f3c9a1bc9b9160dbaf2b84e5318fa320f57a61dec062c12e0ffa4a477ed
-EBUILD kcalcore-18.12.0.ebuild 437 BLAKE2B 8f8c5079d8b0cfb927940b3af3fb81134184de70944b38cf69c503c2d59bea105ccec85f782d62d9b4a390ba35e54075e559395a69db9d48222db39850b7843b SHA512 68e1c9abd081b9950015b7da0cdb6725b61591a50ad82a9248c3a58b930629ebbca01ca494ed9874a37a1e26fa2b288c60fbcbdc1797401d21b276f8d80e39e5
+EBUILD kcalcore-18.12.1.ebuild 437 BLAKE2B 1c4f7ebc665943da03e8f8a58f366c7728068b04222138f00b25f1136dc87d320770d5ed404fbc75d4deadd8d1cae2fc46ff1eefadc8b8c4b0ec4049f1f51829 SHA512 1513ad9ade3efc7ed7f731e09b264d6483efb38ebc9af1a8383e80c176773f31431801d99cfe148075e8f889cbd0c47f80f4d5bb64e1d0927e00ec2e7de4bf4f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalcore/kcalcore-18.12.0.ebuild b/kde-apps/kcalcore/kcalcore-18.12.0.ebuild
deleted file mode 100644
index 5f227c441423..000000000000
--- a/kde-apps/kcalcore/kcalcore-18.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for handling calendar data"
-LICENSE="GPL-2+ test? ( LGPL-3+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	dev-libs/libical:=
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-"
-
-RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalcore/kcalcore-18.12.1.ebuild b/kde-apps/kcalcore/kcalcore-18.12.1.ebuild
new file mode 100644
index 000000000000..1eb30934d895
--- /dev/null
+++ b/kde-apps/kcalcore/kcalcore-18.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for handling calendar data"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	dev-libs/libical:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index cf3c9861be80..891b17151de0 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-18.08.3.tar.xz 324988 BLAKE2B b3d8a89ec71dea9f8130ff04c56afbf0b8d74fc4df43fa494ba4640197c6f656fa9a3fe402eb94a1042f8dff90c35b5724d0ddff2b6527a80d9096c60212b719 SHA512 95b7a17c0d4788591ae4ca48e5cfc7f7d91562e1193953629e723b165a3b0ee17ecc5b92c0228a958ce9d32e0250cbb2c702730385463159f0a90291506845c7
-DIST kcalutils-18.12.0.tar.xz 328988 BLAKE2B f72974b48f5dda3e7642872d07bdaaf89c04125b65e97fe4b0122b965320b9f32a6f79544c871877bd820c876b4a9ebbfd10a97234ec06e48e2575b72d914511 SHA512 e88fc10e0aeb437d6e25955c2a1b9dbffb8086abe452ae0701c188f7d989f46a78c0d1516d4c0ceca2e413f1ccd74c771d110232a6fb292a991b449b13f78a21
+DIST kcalutils-18.12.1.tar.xz 329028 BLAKE2B e7b5a1bc8a2e840567f523428ed4c34d0d680bd07654326a47e0604dcfe060c5a0cc8ad1e924506d49eaefca3992768e8fde965060fb90242754732c1b367c26 SHA512 c0f3c588f553a9e4651fc036ac76f724dd6623cc4a00f5cd0dcab7ad534c3867fde3a182bafb9c888e29a06d621371e782be0457a26fb1e67eadb238214fef4d
 EBUILD kcalutils-18.08.3.ebuild 849 BLAKE2B e4fc595a5c2f0614f79b0113fe869149169c19686023cb1fa779182a411a1e31673cbd48745c9692ec82545b882c6eeefabff04f6549dc51530311630ab6d80e SHA512 caf98dcaddd011a671b76fb42a450539d3b8f416aaf11b73e0506c00201f53f8231ece1efa94a24acbe4b93d9356ad3f76bad552d4b47283dc69cc5cf317a23a
-EBUILD kcalutils-18.12.0.ebuild 851 BLAKE2B 62fee68b29bf04b741710bd6aea7699d9b8db38583a5bb1a1165ffe15116faed54e8f8709ae123c5a97c6a0357304b17c7299b7632a393ed1fafb1e07ebc8021 SHA512 5222a5b149c62dc7cbf5b55cb375b870cd20791ed802d31cf331f3e9871b3b8f5d97236a74bc57abbef071d3c2af3910c778f0b72ed4f7965f3daadfc1e9c74f
+EBUILD kcalutils-18.12.1.ebuild 851 BLAKE2B 23fb8b6aee64c8e909e889808e398d9ff84ef6fa1a815b4add75dcdf586fd437f1018fb127a20ada586d5a440925b4c859358b12a82c9a92b3541c706d6682e5 SHA512 9e4f7c49c82507ab73c306a85fe79d223bb948228e45569502526b5591ef0931a261dbbc39d424e9f0336495b84f68fb46d19cbd31c66fa47ddbed6729721c1a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-18.12.0.ebuild b/kde-apps/kcalutils/kcalutils-18.12.0.ebuild
deleted file mode 100644
index ed19674a46a2..000000000000
--- a/kde-apps/kcalutils/kcalutils-18.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 653616
-	local myctestargs=(
-		-E "(kcalutils-testincidenceformatter)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kcalutils/kcalutils-18.12.1.ebuild b/kde-apps/kcalutils/kcalutils-18.12.1.ebuild
new file mode 100644
index 000000000000..450281a2d7c8
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-18.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 653616
+	local myctestargs=(
+		-E "(kcalutils-testincidenceformatter)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 911c1270ed50..4b2f287f3242 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +1,5 @@
 DIST kcharselect-18.08.3.tar.xz 355564 BLAKE2B b5f48e7c4a0fde82790da190f2fe01de628c8e7847be152b9fb646a998288cff659ba3754737500da42ad1d5d36fd103acce25b10d28c8a7ede95a4f1de7693b SHA512 2152b3d6e2e0ebae15e9d2f5fe2d042d0f43df3b48f6e1f4115ab62c8d493c8e0896d42824b11021543a6e38e6e55d02f5332007f24512a093584c260018bad7
-DIST kcharselect-18.12.0.tar.xz 355688 BLAKE2B 4925e31dd81c591dee7086a0fff117585b033a5872aa9d985caa2319d74192f3299baa2a197f0519ffdf56ee4a46d34f2b47669a426d7edc4b083fd0e7ca7139 SHA512 5a0b40a77355736bed7aca069580b47aeb81a39092c3968559d0a010eedb94c7f97145b174d1c551b64d75c1611fa28f20a8f30d6734de54557887a592e651c8
+DIST kcharselect-18.12.1.tar.xz 333572 BLAKE2B 4d7718ef49dcd8f1d3aa8ed37099e0d291e22d25104566507c7ce8a3bbdc5cea7f75f09ee089dc093321f0065a30774c365c080c453017d075b9c57409ab4c91 SHA512 ac6be46a6fc6218472959a5c9ff0c0764a81be4825e236750147adeb3333d9d2af7e532effb01b5b1dcb1591a86d3ad26fd0274bcdf49bbe610ec38e13d3ca76
 EBUILD kcharselect-18.08.3.ebuild 655 BLAKE2B dbd698990452a51c57d4a377d1a15225ab72272b54d695334f032a4d90d86d712cb8dcb0bf69504330f06793908cc229cd3fad6102f422847a30b6e16ced89b2 SHA512 22940524559cba4a7778f9cb540574cbd59ed86eaece81de1df37cab5a97fb0922e01c0053ef274b44de57944a0917efc5d8b8b8f8285f48fcfed300b5878f07
-EBUILD kcharselect-18.12.0.ebuild 657 BLAKE2B 1d83cbaee3e4cc7e8969baafc2a03b55ebf3bb5fff3d49d2bbe3e8eca39a191189af2f73a5b9614aae09d82eb74307c1859e4d82d4b023ca5181aaada3fac0aa SHA512 53cdf00b118d8682e889056c74d44d46159dac88371642106d47893262ffab3abe73d840ec532cf8712f0a62c0163e65b86a5a388be01f37215a176469a2b3a9
+EBUILD kcharselect-18.12.1.ebuild 657 BLAKE2B df6481643504f4a792a1df170af29f84277d2318b851988438305c13cf3a9263295f3d74059b7d2cd4f462ec80bb5e93e063a214171e6765ddb74b86dbbec19e SHA512 5d5337c2577b3d11438299c2144cf1d06d5834acc2795d9ebfe6554d46da74275eb15dc20f02687b1f638698f5c4ac1e483ed704e4a1ae39dc86a5d527002dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-18.12.0.ebuild b/kde-apps/kcharselect/kcharselect-18.12.0.ebuild
deleted file mode 100644
index daae6f7715ee..000000000000
--- a/kde-apps/kcharselect/kcharselect-18.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcharselect/kcharselect-18.12.1.ebuild b/kde-apps/kcharselect/kcharselect-18.12.1.ebuild
new file mode 100644
index 000000000000..419f6ca5df0b
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-18.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
+https://utils.kde.org/projects/kcharselect/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 90b3e4b99d96..86388aa01f17 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-18.08.3.tar.xz 16944 BLAKE2B 156e630ba735e43e274702c1fd8e3adaa598001b39331bb577dab17a9c3c553b38a0fbd3cd7733d65d3746a46c9907996d80c3907bca14fa4305265ec907911f SHA512 4985587ceb4714197a5948f54b879574b4747588ec18dfc14111d7eebaf179de7a87c03c78392164a53b950ea9a095a1b256e2cef035c5e5727048e32a2afd21
-DIST kcolorchooser-18.12.0.tar.xz 16944 BLAKE2B 7fc9f6f50b165947f19014f89d7ba64c277323246db4d38ae37515646ea493ac77036ed25856bb20a06496f1bc9debbbfeab78fd291a1df0428fb4226b051d72 SHA512 578ac3c74b1a19f294f2d97051d1f36265371feb3807f18a2d83808f4879f507d233a2cc51c95a325ef5261d2f25b10d518336197e4d0622919bf9afa9f42b8b
+DIST kcolorchooser-18.12.1.tar.xz 16912 BLAKE2B 2d5315ca045736d580176084543e35d38e21ef6a4dcff1f97c2d37c7c12265dbb2c9c0cb3f271a792e1d81a1a2596ad80a3c1929121b68cdd6fc4a16783b53c5 SHA512 afafe6e04080be641d9a7a7291640b1c71bf5e3efe23d9997bec64a91adc085b942924e76abdc816178aba60e5dcbe82ae053aa5f0bca1877ef719766065ee97
 EBUILD kcolorchooser-18.08.3.ebuild 452 BLAKE2B b62c80e530b90db1301c94f4252474e420c1a96f261078f294430dc7ac30cd56f6fd1f379e730f67e867c01a4560af4d8602483a8f912f2386b52b027e206b2b SHA512 f6efbf7b9402765536d268c92158ecf93503376add340cb1426a016afa1b94239c381fd21d1b77957141517d72c35dfa3c6693195684e2e6ae0c85e60b4ae3c9
-EBUILD kcolorchooser-18.12.0.ebuild 454 BLAKE2B c93d2331c14558e92496ed8cf7891735a4d610b2c0883ca8ee2f8a2cc8d406c8c2ad21b68f4ede42206ad1037d521b4c4f5a295077d051a49901b5309ac9fe1c SHA512 07ffcaab57d4279f840ddc9e6e6ea5e6f8f51ce68a8ef02631e97cea267e853e830f5f4ea20a16efed536d822448b0c14a46f26f9fe0857098f5308c87435345
+EBUILD kcolorchooser-18.12.1.ebuild 454 BLAKE2B 02dbb665c714e15ce8a268788230d7249f6c6584da1fb0323764820a03db60bac7c6d7a13a990ec2c94ad36ffdaf462c2c7db842b7c3bbdf6d2f6f89b67f60b6 SHA512 497586b804dc40d30535e2fe66ec5b8d24fba28669fd30410bd3f2a55b4f907f172e9c8cd81bbeafd73f85656de15cfa27228d33179b47a895177f6da48e8a6c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.12.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.12.0.ebuild
deleted file mode 100644
index 93c9a19c6587..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-18.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.12.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.12.1.ebuild
new file mode 100644
index 000000000000..0fb19b0c83ba
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE color selector/editor"
+HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 3afacdbdc6ff..6592ecf9e390 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-18.08.3.tar.xz 207328 BLAKE2B e39f313750ef9a21d8c85aaa1b21902151e6e21d542d0ccf26f9297e48e62885c27b77ab82f14dae66aaab1992a275e2fa389a93ce0fc64894eac8744a09590d SHA512 866c8d70e03985c346e1a4f8c6ba0114045e1650cb846b1a15ff44cfbe569de3107b9f6c75e2354d6bb5a08ce388ce78c0871e57ffcdb28ff246e69a5444aeb1
-DIST kcontacts-18.12.0.tar.xz 603652 BLAKE2B 9786a81995912c2acb9184e6dc74c93fb75b52e54b493091c827a725089830bb69d1b633578d1b780157112a25db5b7e675296652dc0b96823b350541f496971 SHA512 be59dd2703bdbd42811ceba2059279d6f5ef47c839dffe72c722806ae87297caa5f5997c7600ef0a050cedda82bb31d7c5ddfed579b747aa0aa97e0929780e05
+DIST kcontacts-18.12.1.tar.xz 603300 BLAKE2B 3446641d69f4dd03bb53abfd735d4729731dd77ae3e7b3cb8601c0d0363b9b76f55236c63bc8c2d6255b08e6a9dd13da911e4521dfd45c01b30490dcf09c9f7a SHA512 130a4b6165b93fe5e883d0ef00bd3f9833de4f409883f30367e18de83da1e68f948a297c73903ffa82330381f000b3aab7c3826adf3158e2ca28aa5ff392ea08
 EBUILD kcontacts-18.08.3.ebuild 739 BLAKE2B 930d3720029f351a741a9d9bbdd30a9a6ca27c8d31c92b6477b073db7c10d063950e6666b8725e56aab890064aa8a5572c2c14601b103872971c80757abe3468 SHA512 932e8b7297c0f6cf7de1bc1a9515438011722bdf2fdbe362df96c155c846692671453e7a5d36919e0ff20eca8cfbca1063df3ec8a17a14862cb4e2cecd6d01a5
-EBUILD kcontacts-18.12.0.ebuild 644 BLAKE2B 351a9dd762baac084abc109df9de93bf34fb4b427cd34bdd4f0e864f514e0ad49697f8f0fd5ba2659bf9a622ad5332bc1426bdb42e857b7124a514bfbb10fb16 SHA512 444d5df10c68824beca3ec9e842d14cc8c99ffbe6274f97fd210ada5d292fa91e4049a947318d7644cdb05f90b38c5368a0cda144d746b619a27b8ec69b5f9af
+EBUILD kcontacts-18.12.1.ebuild 664 BLAKE2B a81ae38a1dbb9e62eea6017fd836265d304f2f7140f48d50065f16374850daeca4b005a4a73fa1eb1b2f1fc708f3ebbcbd5548625154612899923b46a42cef3f SHA512 f7fe51b2f62a2d06fd3a6667eadff0ac29ee2984bae7f5ecffebae5baf7be0874601904be7bfda5218e67391caff1e97cd9dd2962a31d1c29f5a621ba1e176bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcontacts/kcontacts-18.12.0.ebuild b/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
deleted file mode 100644
index 4a670d9b6da3..000000000000
--- a/kde-apps/kcontacts/kcontacts-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
-	local myctestargs=(
-		-E "(kcontacts-addresstest|kcontacts-picturetest)"
-	)
-	kde5_src_test
-}
diff --git a/kde-apps/kcontacts/kcontacts-18.12.1.ebuild b/kde-apps/kcontacts/kcontacts-18.12.1.ebuild
new file mode 100644
index 000000000000..d034c58e8398
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	app-text/iso-codes
+"
+
+src_test() {
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
+	kde5_src_test
+}
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index eae76d11a565..125e3f73af5c 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-18.08.3.tar.xz 1056628 BLAKE2B 3aef5da9aad21e1974372484f58bbb0e874d796e95ecb93a3705708d89da041d9706e049fa30d999ce1cba8c8c0f92ddfd80e19ceacda513b2ecffd528087131 SHA512 64de22be2d7e64682c70129bdc6a3ec421cf883264cf87d0a8137e2c6d7faf4440a3b94f4b45ea8b347ddd3bdb5b56903d735a9220e82a99c58ff0b9222b37f5
-DIST kcron-18.12.0.tar.xz 1055804 BLAKE2B d7fc41a6a216445178f451b497f6473c3e73d60ffa79b8f3fb24d04745c40e80c531cb59f0e9f72511892cd570e3d64b1059951de975cac7fd5c2a4373116189 SHA512 d8fe6e1bb63062859c14b95563075ad0b51dff5586d5fa8d4a1102a37afbe1a316a3a2b5152ba6f7acb1406f9699413cae24a54a874e1ab805a0e2bbdcf027c8
+DIST kcron-18.12.1.tar.xz 1055764 BLAKE2B dc3020f13e7d3cd0ea6773a13a4bcd45ec2a0cc2ba4e9f7a96a32987741f5837c21a82dc9579a27ec3d87c9d486bec66f3f9a91af5cbcecd1b05139649a8eb87 SHA512 dfd4dd50cb4c1e43cb01fae854851c9ba44bb40a20b0a041d116e4b59fb93b5bb344e9b73ccdbf0f15a5d433eb9a11f1c90d6289e0b653b4c5a420105ee1eaf8
 EBUILD kcron-18.08.3.ebuild 543 BLAKE2B 55be7d10ac65036a21bc051252c4487411274396fd78e586582f6180a27baf2df3b18a6adbec75938ad890e28892ffe3309e0c9119b0b0d0365cf8123e63d1fb SHA512 7a453e7435ee784f8e5ed66c2c89eb07fe13f9b44adf2f649d7b514209f4bc7e3c779be1f225075870d5cac755116a20fa942f5613f43b0b38b82feddfdfff79
-EBUILD kcron-18.12.0.ebuild 545 BLAKE2B a4569f45675ab967975da79a923940d64a7821a78679736db75cd438e4edfaf85e42144277a45238e3425e5c68e3242fd297f9dfd9a9f60ca21a8bca72fb267b SHA512 bdabc3813c719471c9b7247865f75bafe0fd727296dd337a3da2ae6eea3b1fffde0c92f294c83cb8b77abe8b613bd196893811583f87ee87b464e7b7d44889a4
+EBUILD kcron-18.12.1.ebuild 545 BLAKE2B dafb2476e8c058e3020034a87a2444a76a03c9560721c10ad3f3fb7b21a1bf101a9549a692cf1ba161692ea3e66d941d3ba4ab6a224f79ff8a6d2b5104b87b7a SHA512 934db33fd9c9ebedabd2a3609c69a39e3b4bb69110d75a8fdec79c2b5b39d51e99c4740d583acab571cc6ca5cbc1a47949b4a8bedf2a2bad603e2ab7d4f0f111
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-18.12.0.ebuild b/kde-apps/kcron/kcron-18.12.0.ebuild
deleted file mode 100644
index d82373236177..000000000000
--- a/kde-apps/kcron/kcron-18.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kcron/kcron-18.12.1.ebuild b/kde-apps/kcron/kcron-18.12.1.ebuild
new file mode 100644
index 000000000000..53c6f919ce5b
--- /dev/null
+++ b/kde-apps/kcron/kcron-18.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	virtual/cron
+"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index 61a0d8618333..38bf1343ca8b 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-18.08.3.tar.xz 49764 BLAKE2B 4b77a8346f854750d6fb3fb611c77bb15b953858db308e1020b077cda356d0027de8cf20eb63083e8e26611c70cbf8fd7b7d82807648143fb8630b223f328a46 SHA512 d5009f2b25038bca9037db6399906f9292d0eaf8ebd3491cabfbc7b3bc534e72068a51812ab8a75d2846c472daf25a002cbbc5e0e2bca042a4976ed99ecbc2ba
-DIST kdav-18.12.0.tar.xz 49564 BLAKE2B 5a868f20dbc9d7efc2e8abd92c31baff0fb6d817fdb471a2ad248d298edeaa33fc394373fc1f5e908e56018d08574a2d122de5c3d613771d28094a8572faae90 SHA512 09e79087435dae4e6dfb0a69d0c3539490c5312252443d899088aabda10b7260b1a830a01ece81cebb6c16d7fbe1d05e9966d9d0037baa183e4ed1e4fa421c72
+DIST kdav-18.12.1.tar.xz 49720 BLAKE2B 64b9912f92a29b32fbd8b40c382fc25e7b9502ee1d59bcc222071a1af60879583f106b4ca1d0bbd1f3d65d42e793aaae3abf83cab8916e645f9fd4b05785609e SHA512 cc8b5d7d36503c67c676e752340fc73019432327e0614776dbafeac88db72836aa9176d94275e9b2258959acfdcb521d341dbca3d6971d3e37d329a3a732bd27
 EBUILD kdav-18.08.3.ebuild 679 BLAKE2B 48a5ea155f722eb467f0a7e15d31d0e9cbfee1defd06947fa7421dcd800a5812f4cd3e82f95d706040fc7d55234e307d95044b7db2fcd8ca47c909dbd5f67910 SHA512 bf44836f3113baa1498cb71aa08f728173ae5cd1b387d81402defeb8cf6981d69b964f30510dc5cf4c6a725566bbb56e1f60a7a1022a3f48895988ab1af40f25
-EBUILD kdav-18.12.0.ebuild 681 BLAKE2B 412f7ebe776665f07d61f440a5ca4bad5e877c378c770adbea8a03b0edc43410dcbe42a8a4def6c56a818022d248f0b4ddd06a77719631201c1df4e246e5c88a SHA512 57e48496bee8813e5bb4d5757ada10d3886116f34839aaef7f8e30f66d334078d6a8aff1c8bc7a92a128b424e1644c2bb5cfbb3e8fd9ce80cd49c1e2194b0e98
+EBUILD kdav-18.12.1.ebuild 681 BLAKE2B 6ac5a733de4159504f7ec6b113d43ad735d071d7bf787b477afb79aa10a2ae53ca9d475998093d52507fd3c3b37eb4b567c64bb0b88cd80720828abd106150e9 SHA512 d6a3d38730cf4bbf4e62235065c5260233e877ecda166200ed013469eac4aed4844db9fd046f7ea5941cfe97ea04567bb9b8519e484312b5dfb63c4bc320aa5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-18.12.0.ebuild b/kde-apps/kdav/kdav-18.12.0.ebuild
deleted file mode 100644
index b886c0149146..000000000000
--- a/kde-apps/kdav/kdav-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kdav/kdav-18.12.1.ebuild b/kde-apps/kdav/kdav-18.12.1.ebuild
new file mode 100644
index 000000000000..90af4e08a7c1
--- /dev/null
+++ b/kde-apps/kdav/kdav-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 813b4d72d7e9..3bbda189d603 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-18.08.3.ebuild 709 BLAKE2B 1479cd6085b435c85683b022e9c9f4760e635022fcd34289392247f856193522f792486aedee63dd9bb4a8ee1d7654edcfab9752dd687c7df12f6ed20a29b94c SHA512 0315e479503f14e2a223aa78ca3d19d2d4dd5bb764cf0a68a3bfd247bcbbc081889b285f306d861a8f0eec7d0aeb5087cf4a82eb1492bedb5ebb1849346a9cb7
-EBUILD kde-apps-meta-18.12.0.ebuild 793 BLAKE2B e1549d6042c9ff4b9849026eacd3d14277b104688032dfecb7f120b6e3ba23205ccb49abaaa4c9e68b0033c115f11e6b4db3e831cf1561fd702c9d6ad0bb79f2 SHA512 2f5d4f93e93878e683b6254b6d8be1f8e5ef3dd4822c889d5bf044c4f3d9e8658b9d9d9277cc9733ba05b53f078397453183db48b7c96f72c3af82f6c5544cb5
+EBUILD kde-apps-meta-18.12.1.ebuild 793 BLAKE2B 0ffb2c9476c18e9c7e7879c7596d70ed11eef2259529e124f55af63d5208c36c69d9271c172b91e80dab71ce56501d9fdcd608c80c55102c2df6e1af0832e4e9 SHA512 33f83c095aa302a2c44eae470e826d4d72a939ee840fc7f33eec4820803994b1d66be69621d6d5a2db9b0e16cd508aa26a629510a6e8ab78a0076f79702d30a3
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
deleted file mode 100644
index bd13687b358d..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
-	>=kde-apps/kdegames-meta-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
-	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
-	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
-	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..2f0bf67d698f
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for the KDE Applications collection"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="accessibility pim sdk"
+
+RDEPEND="
+	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
+	>=kde-apps/kdegames-meta-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
+	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 46f279a181dd..a35fbb54e203 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-18.08.3.tar.xz 377700 BLAKE2B 39c70d2fbf9d6a5812fe6d866ba57acc029f260a530ed36c3733e83209059df0f48fb335c515b886a4cb50ee3c2e72ecea74ec90ab7a9003d3d3e37a39116f47 SHA512 7929966632626943ff5b6629d4b7a334e6ddbe39679c09ee3fe617788a42e00b79624efaafcdc37eb6a0e324af13b2aafb21b5ba7d161182be1a724e553b233b
-DIST kde-dev-scripts-18.12.0.tar.xz 378220 BLAKE2B 86160511b519f25b615e4368cc3a8fa92e62a07635cee64421b54124b592539aba0f6dea081bd9d8905190e3aee94e013320b3901a2994b500b3e6c33d556e17 SHA512 2c4d0cb9b1c1d8b11c941fbf0b863bf33f89f5c05f9c8e7133f280d63d8971912cefd9e9a7edfcfdf059f9a2e3f1340e3324508cd1fde717fb6c4b8813b8f997
+DIST kde-dev-scripts-18.12.1.tar.xz 378108 BLAKE2B d270a6d33c064dd4cd5124f46072fe5de4aea82571c7d3d34ec6f5885fb692a3881098333d0f03eadffe8a3d66848a209fd0da76bef10ae88241c6b22e755755 SHA512 235396e6edc11be2bd8f8b032a5c32b353fff00950de3a6e3c6e34baf510428f38970c1359d80262b13c4c4c46c6fbc81281ca128712282df2d608b5f82b50da
 EBUILD kde-dev-scripts-18.08.3.ebuild 575 BLAKE2B b759de104e595947ba21959be3ff83e18a2e19391eb8d3ae153f9ee1e8e778c947585eb32d29aaa99c117d59f2ebdc8bab871a533131b7724cae8e5a5ba0f61c SHA512 fea537b77ad328330276600520f832fca562015a7808e7ead6558ee39d8d393bbbfcf55e6ec3853fe32aca66a872f38e7835b6fc4a716450962b98f0a82e0267
-EBUILD kde-dev-scripts-18.12.0.ebuild 577 BLAKE2B be41f93da1f0ffc31d1601e73b1373ecb53e8efe456554a94fb589c65562c7d1aeb4fe741ea34c3acca034637934212432fafd923d98038a5fc2cca8b9a0fa00 SHA512 987f8607fe745bac9d20d464b70750d9c9e7499be3728fea6f9c78768a79f4334873dbc08916f400b5c48753bd39726ce9f67c4bfabc454a2ef70db5d7477a6f
+EBUILD kde-dev-scripts-18.12.1.ebuild 577 BLAKE2B 839e4f620d9ea09cce209a216525ba3de6f46c5b57cc92dada6d7f55677bdd56368348c6600e54eb124178edbb84a755adeb6b3627bc5a891edb191fbccc8146 SHA512 9c5d1eef891678056673000a6ba9ef394c727a759dd2784fcd5f796fa1e539bac056e39534264cdb606f7c69f5815dd6a598131529f21769ce7c6f09113a96f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.0.ebuild
deleted file mode 100644
index 695a6b13ea52..000000000000
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Development Scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# kdelibs4support - required for kdex.dtd
-# kdoctools - to use ECM instead of kdelibs4
-DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdoctools)
-"
-RDEPEND="
-	!kde-apps/kde4-l10n
-	app-arch/advancecomp
-	media-gfx/optipng
-	dev-perl/XML-DOM
-"
-
-src_prepare() {
-	# bug 275069
-	sed -ie 's:colorsvn::' CMakeLists.txt || die
-
-	kde5_src_prepare
-}
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.1.ebuild
new file mode 100644
index 000000000000..8a92e122ea80
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Development Scripts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# kdelibs4support - required for kdex.dtd
+# kdoctools - to use ECM instead of kdelibs4
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdoctools)
+"
+RDEPEND="
+	!kde-apps/kde4-l10n
+	app-arch/advancecomp
+	media-gfx/optipng
+	dev-perl/XML-DOM
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' CMakeLists.txt || die
+
+	kde5_src_prepare
+}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index 7e6182d96045..ece5b1646c67 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-18.08.3.tar.xz 61472 BLAKE2B 710100def59e037e4002db2ddbabb94c85194d5a97a578521c2484d0c75c69fda760bd76b32346ce8a0aed0c373c123c0f7d2388a5ea21dd3bfab4f26fbdde13 SHA512 1f1d9da9709b860a0559943d6b9d003d0ab32062c77cc9d61866baaedb3d6c342b8aa8bfcfe0327407aa34bf275d6782751db8f4cb03b83f9ccf756ebce2ab01
-DIST kde-dev-utils-18.12.0.tar.xz 61100 BLAKE2B a8f31b43cb54e5299c50f6f3ec711593f7e9923a0e293717308869b4ed5ef8a10a627ee56f5f66d2c037b6e5621ac6a635082e7d8f7bb328b5d26a49ccb458d6 SHA512 9a4f7c196cd8fe3bff6577408deac8da928296c6ac9ca11598f10be2163bbed45272da522d52f964590de37b4dcd5384e2abb27153bbd216f986d69351807cf5
+DIST kde-dev-utils-18.12.1.tar.xz 61132 BLAKE2B d67219be6a02169f4b45ec724faa7bc62f7764e141fae26cca76b536930524aed38891be99ffb40be92a749ce116ab7d2c073ccef99585e424c5487637ca5f92 SHA512 287d8f7e37f0b352b535a6ea7b571872869d7f5ecff84e329f382b5bdc10df29eb29c40cfb47b82a3f5b2540002b85a0e11bcd9243bd68be74981f694e299011
 EBUILD kde-dev-utils-18.08.3.ebuild 643 BLAKE2B f1993c7db9eff55e52b92004ebc92b1675d3f1d372be5dd3ae65fc7f694e52d611e58997d3bdc5c23e8e5b4448d29cade8122e65c8c6316957babfbf0e4a4e40 SHA512 a83be97a4ed3122867d5081575fc57ce3f48ba5c517ba2c0ee14179d500382c8414e3011258a478c8d5795838f02150859ed1475d77baddd876c3691207120c1
-EBUILD kde-dev-utils-18.12.0.ebuild 612 BLAKE2B 4eedc8a4c43a06f286118c15f0734cefeb5e75be57051eae72dd64ec060befa57c008f12adae4b22b37be9d07f49db8cb577676e055f4e779dff18f95a071599 SHA512 6f1f465ec2998a0ae2436b8e960b31c0602b74ae3524171c6efd67205064800386e8285f6bd2617b29ed5aaa68d4383329f153a99fa45e3c537ab1307ef81a7b
+EBUILD kde-dev-utils-18.12.1.ebuild 612 BLAKE2B c73c1c74f312ba2ba09aa2ca8cafe00672d511296bd858c60e89fee0947649b39df0a7e5696865992afbf6e9095ccae1b419af69e5aaf4eb3bb9f09efc530406 SHA512 4110a71f87252e7dd1aff44b1d01a71612b47fa64f423ba0bb23cdbb323807706c770abb9a16899d72828f7a53267754d4a8d459d864a339a01e0e0dfbcd19ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.12.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.12.0.ebuild
deleted file mode 100644
index 688491146e06..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Development Utilities"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.12.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.12.1.ebuild
new file mode 100644
index 000000000000..dcbdc5575e35
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Development Utilities"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index 2a86f07d80e0..6694014b970c 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-18.08.3.ebuild 320 BLAKE2B 14f6ffdfca577766a52cd8564867009a5c4edd7d954fe4e9fcd026145882fe46d1e6041d65a373b57f61ce1482a452940aac6d716e0c00ba82d54b06b3fec8ba SHA512 de5b9eb9e8b777f83def25209468cbd9cee78af7f1ce132056af221ad4a3098c6159303700245a80183f172b936450f82d1f6ed1aacede3293080c821c29c54c
-EBUILD kde-meta-18.12.0.ebuild 364 BLAKE2B 8cec8bb8c1cf3199caf4974b2692f053e195e5b81077593be04901dad00c1ec4f92f3bfeb7979b437ebade3ea59bfa2b8df15ea40560521265e501122558a778 SHA512 b7e6262f143e527f77cfb867a8b8c0f3397d34d924b6d73beae836f42480cfc96ca465cebbae62aac3d0fe7b9ed543eb817f6f08473ebaa59110c3a3c1a979c3
+EBUILD kde-meta-18.12.1.ebuild 364 BLAKE2B 19a1cd61625e40aa853de7dd6d93237ca6c1e491ff9c4e74ea12b26fc2928276d6a84e4e820b2358c50c5d5ffcee1772111d930e85f9d34822eb7b5bdc9f77c8 SHA512 aa897ffc1c6bb0af379822f0dee0c2c71dd38f91549fb694ce242bf7e186120d44d1161e24fb2944e947fcd1345a1994d7247b3735de1698ae4a2a5561a22574
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-18.12.0.ebuild b/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
deleted file mode 100644
index 977c8ae36a36..000000000000
--- a/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
-	kde-plasma/plasma-meta:5
-"
diff --git a/kde-apps/kde-meta/kde-meta-18.12.1.ebuild b/kde-apps/kde-meta/kde-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..2997b45208b3
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-18.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta:5
+"
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 2302a598caa0..fed9230d21e4 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-18.08.3.ebuild 353 BLAKE2B 3341b9a02375644c15e5c7d6b241527d0452071c121e1adf834782c8efce9c6acd83379ce3b5885a3a9307f1e9f0e2d1ee6ea8911a2d99091c0aa441b74b3f89 SHA512 e7a4df768d9a6d702d665f1d64260bbd2b9b19f8c7038de3678fe1fc404ebd0d6eeb26c874f9137ce4e39205c02930da41872de14914b36a4cfefbd32b0ffd3f
-EBUILD kdeaccessibility-meta-18.12.0.ebuild 414 BLAKE2B bf1e9279eeb78861c326c583ebd6996444b57eb2a69c588299f3b68f1db01b1b55ae489ad3ebf6b850d4a6153c0905074beb8efb47ec8e44678c211faefc1dd6 SHA512 8156d6cd6404105bd1d9e2a828b8dec6515564af2a11031458307b8905e709a0b6ec9309b6a7b9e28bbb8bba86c2c09957e192e255c6c5dcc18b3c4ea6fd24ec
+EBUILD kdeaccessibility-meta-18.12.1.ebuild 414 BLAKE2B bfd735e680c0a2dc84b68b6672af435bf016b88794549e6ea76d8faaa29617f4c5b15615d9f8597d2240e90f96957212aded5edb45e8e09d7acba6eaaea6856d SHA512 03645b5054b0766233b5928cbcebf511c564835246b357f7be1280ce490c439d23a23342141430dc56ac7d1cf3fece5f37d1275b4bee5e12700dfee1a9f1d6d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
deleted file mode 100644
index ff81519fdc07..000000000000
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kmag-${PV}:${SLOT}
-	>=kde-apps/kmousetool-${PV}:${SLOT}
-	>=kde-apps/kmouth-${PV}:${SLOT}
-"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..76f72635b4f6
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kmag-${PV}:${SLOT}
+	>=kde-apps/kmousetool-${PV}:${SLOT}
+	>=kde-apps/kmouth-${PV}:${SLOT}
+"
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 12e226ac4111..e62e8e6adfa5 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-18.08.3.ebuild 343 BLAKE2B 9c4d5bb6cbede83503129d6952208202dec0442faacb1a5591649abb5dc87c94f428866536254b1db1cca63567b94b310056540d988242994d1b569407bcdb7b SHA512 be7d8cc3841a14b7df8d163769261f84f0f45401b3df486fb5246c4dc28ac1d09ebfc2b6de33077d3ca3bd61bcb4e623a0a153c03ecc55e614f307f005fa1615
-EBUILD kdeadmin-meta-18.12.0.ebuild 398 BLAKE2B a602697838f6eab447eb3770088c16fd72982db4b8dadf7de5fc78fcc2f15869851df64337efdf772d887c50c1dfb950392e92946da7daadf8fc440e5998360d SHA512 9c31cc676c90e1a0ba6d49ff16011945148c2b0baa1fc0f015e3c04d282b9e175abcd9aed309eb3d308165b3d38a969fcc7fee9c991dabbc12f3ae676e637f80
+EBUILD kdeadmin-meta-18.12.1.ebuild 398 BLAKE2B b76c214cafcd71c6b1ac351f37954640bd9d3ce7cc8bd0baf8d149b16235671ff28843dbe3bdf0648720c24ed186f5187665f3abb8f131df71dcc7d3a8815c7b SHA512 554d811929ad5e7c410e454ba39a0d0a1ad8de62f75ff8f102530806aff111bf8de6d25602809fd5d9ea37f4e765fd4f33f30c64fbd7864ed9e139a10d2d000e
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
deleted file mode 100644
index cbdb7d370e0f..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cron"
-
-RDEPEND="
-	>=kde-apps/ksystemlog-${PV}:${SLOT}
-	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..bb62bf14eb46
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index d87d7adfbb44..6584b20eff64 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-18.08.3.ebuild 324 BLAKE2B e8df3bfd386b952707790050c2a387d1d77481eca3a1ac071b27d1190a681305f4f0ca75dbce48cdce5ebb2074b92039e02756fd53b87ac3dc620235b19a5697 SHA512 fd454d88d42876d2138beae20eadcd18091243e61aba908f2ed0dd02aa210ebabf95cb37f3158b3f5f3330b938ead871d6d827e05c335ea2218b9a04e0badf6e
-EBUILD kdebase-meta-18.12.0.ebuild 366 BLAKE2B 9d4a2948785e56a0494dabdead3017573342f302699b39e2f259eadf1350668187674435110a68468633d2cd8d3745d9e8e8a1506f705b015bbff8725db5c593 SHA512 3ac9d92b26ce4c0226cd994e2ecf9e0c73cbe6117acf7c6ed3778c213b65049392b4e8fe43b85b9f560111b2e1c4f715266b1143460c4b942a933a38e689db5e
+EBUILD kdebase-meta-18.12.1.ebuild 366 BLAKE2B cef815447c6c96b2035c7a63d6e34b334ce1dda554d1e94e6f36489e558cc5dda88ff4e7bb8eb2f87bcd9ab63a382d00e2bb99b01a1bf80e3c8af127a9e43421 SHA512 ddf8d202de08a495369d20e4dd9555d19fb21027f3bf1e9e477b3c130dcedd348e50060226802a8d86cee92d79533b46746052c00567787d4ce217b9cdabf0ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
deleted file mode 100644
index 2d1a6df395ba..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	kde-plasma/plasma-meta
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.12.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..80b32c1ef4f3
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index 95278c979a83..1f5501fc2e64 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-18.08.3.tar.xz 52540 BLAKE2B 111532e80686159c9543fc8572e3a2e6fc7e561794da5a1aa9957991863743b2339c0f3a27848b5504f28d7102bb179610224f41c1fba713343f2697093d95e0 SHA512 40802fe99cf2ce8d4306a1b1caec34f710ccd337b729d0e0fd665d10591f3b330cf9f3b55ec32adb4f94ba6ee470cca1194e6cb19cd0ca4d4ab3cf1476852976
-DIST kdebugsettings-18.12.0.tar.xz 55024 BLAKE2B 66b47def43fe90f93f06b62275599f4d01b42c65a755dde5190af316e7268cab0dbaab3507ac10ef2ee7246dd38c8585e15bd06636163f6ae71163824b763edf SHA512 41085f3037c09b91e06aca4e2f6f05980c01e8351f7817520a87de41c12ec44671293cf18a4c63ace57d7a1a3ef7fad438cf3cff365c6847d2bf94a157a5868d
+DIST kdebugsettings-18.12.1.tar.xz 55116 BLAKE2B 69210f3937152ab38868c4072bc1afc5c37839ab47b7399e64722a25a1d1405a65e8e633b9746bbfddc6f7a4a18b181f62ceb4caa18e096b73172770cebc85fa SHA512 fa6086337bb65fecd41654b39fd1c452c08dee58cfe34c5c3a1580d30d5d471ddcaf83586ecc799802480eb1814070c46f62eb16c86d75770b50d031eace8f74
 EBUILD kdebugsettings-18.08.3.ebuild 592 BLAKE2B 0cbe811df31f64ee6f41f8ca7663c46b62f4f664e3b053ba0059e31d67ed892e6140ccc39429cef969f71a6d7f0afc496944dc939af5b51383adece320c11b68 SHA512 f20c9308bf08b916289dcfd195de0ab62bf5974a8b0f1fd11ff4bcb89ac64e21d420c062622c4b3dc146fc15031ed3af0abe2f40d369978f3cff7a79d1dbe963
-EBUILD kdebugsettings-18.12.0.ebuild 594 BLAKE2B 420578dc0af5e55c7d2882ea6e3024542aaca5fcb0871d4cf6201e2046534d56ec399e34261c86479cc9cbfdbb6f1ac2f36c7db271bde38f8e5b78dc4cff1c1b SHA512 974b4f36fb6c0ece0f5777bd8d6a247c1c99eaaf8c5a8b55e4679a4fd1d790544a172aed40fd233c16e71cfebf9d5443a864ee90c77318f8ff769354da35dabf
+EBUILD kdebugsettings-18.12.1.ebuild 594 BLAKE2B 84106a7f821f68c26b544d11f9f1772629f73157d95039937efcd29243be2b8a3f4c71bc32841f96c85df07c2953d82c28abf345dc2b343dd4b87cc57454c52a SHA512 82479c1072e1045b5aeb7778fa06b6970fbe8fe7d6487cf230d5926e0d494db323b6d976f37f893188740280d7e73c43ab73506ab5d1075d9af1dd87205932b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.12.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.12.0.ebuild
deleted file mode 100644
index 8e09d0982935..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.12.1.ebuild
new file mode 100644
index 000000000000..f6685fd1a74f
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to enable/disable qCDebug"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index a6e6060315ee..b123deb97d72 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-18.08.3-r1.ebuild 614 BLAKE2B f4f08be0d86f2373771f2298ad8d2425ae18da26d481c4c83f31f8c7df6e15d99595866eb02d07cf1424019a1bf0eacf2bb0a06a740a276de9bdccd88a707c93 SHA512 b4eb2309283655dba67e3842256260abf0778d8c0f283e38d015a5af693fee41d60f404dc9f797c04635bc54c27fbc3883c61316ef07f879bcbfec666bc05518
-EBUILD kdecore-meta-18.12.0.ebuild 704 BLAKE2B 7e4f3d5d2ed1c7f7b7e284ed90061927f05c7b1f0ba98abfa68472a56912697fa8d0c2c9eb8fc5c0923b353b7456a6d299ecba5eefe3da6256b101421cb9c6de SHA512 d518bab2b00e6677a8650997759175e8b99473ba28031c808740d2b4d11dfde1e17c18ae0586240c5d6304d58c54ad169908d12728aa2335342c887453be22a7
+EBUILD kdecore-meta-18.12.1.ebuild 704 BLAKE2B dd94715e4c7f19fb2a2bfcf3604d2eaea111f4a96b7deb546656215ce9283367415ab29aac3ff8d4411a8aeb5a9a20227f99d8dcc69cdf8f0ceca83b17b05c8e SHA512 b5f42240ab63bcc5e417fb4fea2f0e39c1704e2952041d173456b4bbea5fcdbb7c5644310db324f53401e9f61df93d119e2a9851a5cb520c31547044d509342e
 MISC metadata.xml 379 BLAKE2B 2a24219261d6d38e3bd4b1587306924e5e313cb4e1670f9067ae32cc2a139f04d1b8c1e626580723d01e0c75b98304fa48eb1930792e9d68d0b28a65a05bc9d3 SHA512 bf09bd560e358d4a279b8b4c3f8e937bd683778c60cd0af445168fd5bf6a4ba571b42e9efd3d202a0e2da11c5e481583ff55e67881cc12945da3a5f35f1985a6
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
deleted file mode 100644
index 1a31e8c41e72..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="+handbook +webengine webkit"
-
-RDEPEND="
-	>=kde-apps/dolphin-${PV}:${SLOT}
-	>=kde-apps/kdialog-${PV}:${SLOT}
-	>=kde-apps/keditbookmarks-${PV}:${SLOT}
-	>=kde-apps/kfind-${PV}:${SLOT}
-	>=kde-apps/konsole-${PV}:${SLOT}
-	>=kde-apps/kwrite-${PV}:${SLOT}
-	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
-	webengine? ( www-client/falkon )
-	webkit? (
-		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
-		kde-misc/kwebkitpart:5
-	)
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..6ca6a2297282
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+handbook +webengine webkit"
+
+RDEPEND="
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
+	webengine? ( www-client/falkon )
+	webkit? (
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
+		kde-misc/kwebkitpart:5
+	)
+"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 805ac0013456..f88dc1b21b90 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-18.08.3.tar.xz 327688 BLAKE2B 9cc6961bbf7e6fdf78142d950b83a90945b55b9a9bd278f66160030c1c02ca026a50e69bf92ada72e5320d4bc6b47430e10e39a00a936b3524c028628e1656c0 SHA512 9e527a15f062cd5f6107c883391c810a02bf3576894a2aeaf9e3d4ba97168ec0b9a5c2411144a94cd0c746e66c6b04485a667730591291cad6d8ea8160cbd183
-DIST kdeedu-data-18.12.0.tar.xz 327856 BLAKE2B 148858b93decc270a2ec42749d1badef9bd7c5a3384c142745b941fc65a07ba8f0fe21461b89dbf8600625bdcfdadd74beb7d4cfcdf5ce878420d97852ef4a55 SHA512 7872d422ada152623e69094cc37d8eaa3efe2106e07b842fd21030f63f7b825088ddcb69e7742283bf55c1412bac6931a5b941d24945fa4b46ddbfd27055276e
+DIST kdeedu-data-18.12.1.tar.xz 327800 BLAKE2B aff8ad701adeb1122b50b7f280880711be63ea409ffdf1876a3a8d8571cdcfc788001d49d0f1af502e897748727a745554cad5df6abd516cb0794b93d241dd6b SHA512 5ab55dbcbbf7cf45410eb9264df6b596cd28504ba8e10305af9f22770199f7158a8db7ba4efbdf140e546aeaa102fce86172843629b5592be96101188b1fa9a4
 EBUILD kdeedu-data-18.08.3.ebuild 407 BLAKE2B 3f76adf816ac3d858155d1bf2be939baab3d699484032c73f4b5b0aa9c816e003ee3aa6c70cdb340a4cdab10458486b1768b08551ae868617db0d2b12ffac240 SHA512 7af7decb3650a2e0b06724b29640a3ed36cdb1a289ef16857f8bcb62b443366b2c934b6c53c02bfea823a4ea48e37035e62a241576f5c70b423f6eee0a81ece3
-EBUILD kdeedu-data-18.12.0.ebuild 409 BLAKE2B 5ca5853bdc7679fc4e31c3e41ee167e17318aab469a331a5dec685f1d66eaece62214df957035267d63c86f1b7a60bbeefee29811ab34be297fc292edc65921a SHA512 cb85ca0e6f84911f0cfad089dacaeb6cd193c68f54bc6a0c3709acf47bd52b1ecd01b87faf5154a075a3df6005832bfbb8cedb204b7530a45ffa5fd0c566e2e6
+EBUILD kdeedu-data-18.12.1.ebuild 409 BLAKE2B b1fdf84ac17a786a4f33c8a8e73fed3c681f2a3a5e442fcf1650103cc885122f39a0c53d6e34a7b759a3257a05c29c1855fe67cd4644c4643f110287b1dbb4ba SHA512 1cfe129cb9d6eb73f7d313fb8eafe052e1a81aa6fb6a3d1cbdd2e485ab03dd631851c70ebb77be0f8711e8fa271a128d4ac3c95fa355a6702dd857f04b1f9692
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.12.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.12.0.ebuild
deleted file mode 100644
index 1e7c7461e834..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-18.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="
-	!kde-apps/libkdeedu:4
-	!kde-apps/kde-l10n
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.12.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.12.1.ebuild
new file mode 100644
index 000000000000..20fe5343e75a
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="
+	!kde-apps/libkdeedu:4
+	!kde-apps/kde-l10n
+"
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 63dbeb6899fe..3c50c0dee8b8 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-18.08.3.ebuild 1061 BLAKE2B 5cb235a62ba467633ffe9f60ae71bfec2f725b18bb7e1715c287b1f64fcdbfacbc2561eabbd308d526be4035248011013c5d2595278fa090d5692a2add2901df SHA512 350d485e3ce1ac5f4321a7a660aedd7e3d13c1591b5fcede5bf5021e2cc6cc4bc8a3aa40e62ca91627fe9a27e711714552fe9e1717ed9800c7aa2e67bf2eab9f
-EBUILD kdeedu-meta-18.12.0.ebuild 1222 BLAKE2B 66fc65f472178d1c193defb18c16bb455697ed67d2f4a61fcb7bc251461b0dd8185dcddf4cb94212a11139fbc83da98ce7b5c015305d3cd5e607b65517315913 SHA512 044e9fc21c312e168e82400aca614e56a316fc1f40825b10b465a9bd292aacbe5a29a80cbc9edf703bd84453ab0ab54089911c453f82daa8838c4defdc7ec0ad
+EBUILD kdeedu-meta-18.12.1.ebuild 1222 BLAKE2B 4ff11697f1f0c49ac996cf1f0689c031eabe66334f073ec6aebdcd3d14bdae40a987d617c59693f3be5023fe385e7991b8bbd79f6351b935fcd31f10a885c9f7 SHA512 4cafdcc757a54ca3c14b061efa8d28ed4511ead12a0bdc1814c9f3d335bc4dea8ec9e22e634dc5b9e72536d11f9e1898b080f2754a1aba739ca1d5d06637ad98
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
deleted file mode 100644
index 798b7d6d7040..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="+webengine +webkit"
-
-RDEPEND="
-	>=kde-apps/analitza-${PV}:${SLOT}
-	>=kde-apps/artikulate-${PV}:${SLOT}
-	>=kde-apps/blinken-${PV}:${SLOT}
-	>=kde-apps/cantor-${PV}:${SLOT}
-	>=kde-apps/kalzium-${PV}:${SLOT}
-	>=kde-apps/kanagram-${PV}:${SLOT}
-	>=kde-apps/kbruch-${PV}:${SLOT}
-	>=kde-apps/kdeedu-data-${PV}:${SLOT}
-	>=kde-apps/kgeography-${PV}:${SLOT}
-	>=kde-apps/khangman-${PV}:${SLOT}
-	>=kde-apps/kig-${PV}:${SLOT}
-	>=kde-apps/kiten-${PV}:${SLOT}
-	>=kde-apps/klettres-${PV}:${SLOT}
-	>=kde-apps/kmplot-${PV}:${SLOT}
-	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
-	>=kde-apps/ktouch-${PV}:${SLOT}
-	>=kde-apps/kturtle-${PV}:${SLOT}
-	>=kde-apps/kwordquiz-${PV}:${SLOT}
-	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
-	>=kde-apps/marble-${PV}:${SLOT}
-	>=kde-apps/minuet-${PV}:${SLOT}
-	>=kde-apps/step-${PV}:${SLOT}
-	webengine? (
-		>=kde-apps/kalgebra-${PV}:${SLOT}
-		>=kde-apps/parley-${PV}:${SLOT}
-	)
-	webkit? ( >=kde-apps/rocs-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..23df4bfc85f4
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+webengine +webkit"
+
+RDEPEND="
+	>=kde-apps/analitza-${PV}:${SLOT}
+	>=kde-apps/artikulate-${PV}:${SLOT}
+	>=kde-apps/blinken-${PV}:${SLOT}
+	>=kde-apps/cantor-${PV}:${SLOT}
+	>=kde-apps/kalzium-${PV}:${SLOT}
+	>=kde-apps/kanagram-${PV}:${SLOT}
+	>=kde-apps/kbruch-${PV}:${SLOT}
+	>=kde-apps/kdeedu-data-${PV}:${SLOT}
+	>=kde-apps/kgeography-${PV}:${SLOT}
+	>=kde-apps/khangman-${PV}:${SLOT}
+	>=kde-apps/kig-${PV}:${SLOT}
+	>=kde-apps/kiten-${PV}:${SLOT}
+	>=kde-apps/klettres-${PV}:${SLOT}
+	>=kde-apps/kmplot-${PV}:${SLOT}
+	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
+	>=kde-apps/ktouch-${PV}:${SLOT}
+	>=kde-apps/kturtle-${PV}:${SLOT}
+	>=kde-apps/kwordquiz-${PV}:${SLOT}
+	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
+	>=kde-apps/marble-${PV}:${SLOT}
+	>=kde-apps/minuet-${PV}:${SLOT}
+	>=kde-apps/step-${PV}:${SLOT}
+	webengine? (
+		>=kde-apps/kalgebra-${PV}:${SLOT}
+		>=kde-apps/parley-${PV}:${SLOT}
+	)
+	webkit? ( >=kde-apps/rocs-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 50baed11d0e5..21f7795ec046 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-18.08.3.ebuild 1520 BLAKE2B 6aaa1425ad3592e9b65940ea017222712c322660a8f976c20bb0fd1670c57e9a13fa8dcba59a4526abcf99320cd3dffee99751a2a515a965b2664ef035e7b7ee SHA512 716c003d14e02ae24843ac10d3b0f3a922b826481f9317cf2d58a05f7233b9d87d7c55f13b462bbcdd2166b1af56036786d8e1c9b4a6cd676e7869eb9aa6a18e
-EBUILD kdegames-meta-18.12.0.ebuild 1802 BLAKE2B 81cdcf33b582c6890c3a3caf0ec0deafb9194cfbce135b44aa74c596f3c35e71a2b57c52328dc8a369f5d0cc654b50cb2019cc3ad0ac046a37fb8dd904474cc6 SHA512 c8586d3ec016ea9943ffbccbf8e88c66e7d63de43b649495a67a98ff2b4d1959c1899114c05b0e8a573f96861cc8166d27c762d2e76d9ede7a4604b17322e876
+EBUILD kdegames-meta-18.12.1.ebuild 1802 BLAKE2B 514b8eb059f8125dcd7ecc8ffb64a06088507671c8c97b365b0d7d7ef3100e3907241f70cc70c5af01db5e5ebe6b3170cd8d61c45f2f00a96c52b592069d621b SHA512 b9b929cc66428612bb79454226f2dc4495918dacdba6395182eb7f096a21ee5653f81f7157b319b7f504337fa738deaa64bbb950a13b300038e362089cd3b0db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
deleted file mode 100644
index 0f37c61c3ffd..000000000000
--- a/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
-HOMEPAGE="https://games.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl python"
-
-RDEPEND="
-	>=kde-apps/bomber-${PV}:${SLOT}
-	>=kde-apps/bovo-${PV}:${SLOT}
-	>=kde-apps/granatier-${PV}:${SLOT}
-	>=kde-apps/kapman-${PV}:${SLOT}
-	>=kde-apps/katomic-${PV}:${SLOT}
-	>=kde-apps/kblackbox-${PV}:${SLOT}
-	>=kde-apps/kblocks-${PV}:${SLOT}
-	>=kde-apps/kbounce-${PV}:${SLOT}
-	>=kde-apps/kbreakout-${PV}:${SLOT}
-	>=kde-apps/kdiamond-${PV}:${SLOT}
-	>=kde-apps/kfourinline-${PV}:${SLOT}
-	>=kde-apps/kgoldrunner-${PV}:${SLOT}
-	>=kde-apps/kigo-${PV}:${SLOT}
-	>=kde-apps/killbots-${PV}:${SLOT}
-	>=kde-apps/kiriki-${PV}:${SLOT}
-	>=kde-apps/kjumpingcube-${PV}:${SLOT}
-	>=kde-apps/klickety-${PV}:${SLOT}
-	>=kde-apps/klines-${PV}:${SLOT}
-	>=kde-apps/kmahjongg-${PV}:${SLOT}
-	>=kde-apps/kmines-${PV}:${SLOT}
-	>=kde-apps/knavalbattle-${PV}:${SLOT}
-	>=kde-apps/knetwalk-${PV}:${SLOT}
-	>=kde-apps/knights-${PV}:${SLOT}
-	>=kde-apps/kolf-${PV}:${SLOT}
-	>=kde-apps/kollision-${PV}:${SLOT}
-	>=kde-apps/konquest-${PV}:${SLOT}
-	>=kde-apps/kpat-18.04.3:${SLOT}
-	>=kde-apps/kreversi-${PV}:${SLOT}
-	>=kde-apps/kshisen-${PV}:${SLOT}
-	>=kde-apps/ksirk-${PV}:${SLOT}
-	>=kde-apps/ksnakeduel-${PV}:${SLOT}
-	>=kde-apps/kspaceduel-${PV}:${SLOT}
-	>=kde-apps/ksquares-${PV}:${SLOT}
-	>=kde-apps/ktuberling-${PV}:${SLOT}
-	>=kde-apps/libkdegames-${PV}:${SLOT}
-	>=kde-apps/libkmahjongg-${PV}:${SLOT}
-	>=kde-apps/lskat-${PV}:${SLOT}
-	>=kde-apps/palapeli-${PV}:${SLOT}
-	>=kde-apps/picmi-${PV}:${SLOT}
-	opengl? (
-		>=kde-apps/ksudoku-${PV}:${SLOT}
-		>=kde-apps/kubrick-${PV}:${SLOT}
-	)
-	python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.12.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..354fbc7cf912
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://games.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl python"
+
+RDEPEND="
+	>=kde-apps/bomber-${PV}:${SLOT}
+	>=kde-apps/bovo-${PV}:${SLOT}
+	>=kde-apps/granatier-${PV}:${SLOT}
+	>=kde-apps/kapman-${PV}:${SLOT}
+	>=kde-apps/katomic-${PV}:${SLOT}
+	>=kde-apps/kblackbox-${PV}:${SLOT}
+	>=kde-apps/kblocks-${PV}:${SLOT}
+	>=kde-apps/kbounce-${PV}:${SLOT}
+	>=kde-apps/kbreakout-${PV}:${SLOT}
+	>=kde-apps/kdiamond-${PV}:${SLOT}
+	>=kde-apps/kfourinline-${PV}:${SLOT}
+	>=kde-apps/kgoldrunner-${PV}:${SLOT}
+	>=kde-apps/kigo-${PV}:${SLOT}
+	>=kde-apps/killbots-${PV}:${SLOT}
+	>=kde-apps/kiriki-${PV}:${SLOT}
+	>=kde-apps/kjumpingcube-${PV}:${SLOT}
+	>=kde-apps/klickety-${PV}:${SLOT}
+	>=kde-apps/klines-${PV}:${SLOT}
+	>=kde-apps/kmahjongg-${PV}:${SLOT}
+	>=kde-apps/kmines-${PV}:${SLOT}
+	>=kde-apps/knavalbattle-${PV}:${SLOT}
+	>=kde-apps/knetwalk-${PV}:${SLOT}
+	>=kde-apps/knights-${PV}:${SLOT}
+	>=kde-apps/kolf-${PV}:${SLOT}
+	>=kde-apps/kollision-${PV}:${SLOT}
+	>=kde-apps/konquest-${PV}:${SLOT}
+	>=kde-apps/kpat-18.04.3:${SLOT}
+	>=kde-apps/kreversi-${PV}:${SLOT}
+	>=kde-apps/kshisen-${PV}:${SLOT}
+	>=kde-apps/ksirk-${PV}:${SLOT}
+	>=kde-apps/ksnakeduel-${PV}:${SLOT}
+	>=kde-apps/kspaceduel-${PV}:${SLOT}
+	>=kde-apps/ksquares-${PV}:${SLOT}
+	>=kde-apps/ktuberling-${PV}:${SLOT}
+	>=kde-apps/libkdegames-${PV}:${SLOT}
+	>=kde-apps/libkmahjongg-${PV}:${SLOT}
+	>=kde-apps/lskat-${PV}:${SLOT}
+	>=kde-apps/palapeli-${PV}:${SLOT}
+	>=kde-apps/picmi-${PV}:${SLOT}
+	opengl? (
+		>=kde-apps/ksudoku-${PV}:${SLOT}
+		>=kde-apps/kubrick-${PV}:${SLOT}
+	)
+	python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index b65eb67e623e..fd76a1933af8 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-18.08.3.ebuild 762 BLAKE2B 078ce9a6189a5a8ebcb17c56ce229b8610ccd60380cfc218c47e5578f6176da22a1aa44c3015d566f01d1ba302c6c7e89484cf47e4a5bc800286e6cf3ddd4a94 SHA512 8ddc889b383f43b45f0e8bc364f1333a4af56d477a657fe4567e905a56c5f21dcc3521842d5ae243480047fc8fde4c245b3a07c76d268c9c57f31824b38e2f31
-EBUILD kdegraphics-meta-18.12.0.ebuild 857 BLAKE2B e971e62a1bf7d864f275999ecc0ed09a6236b20f09c9324ba88c964394528f3f96511c7d3eb470056cbf4fc3e4762d8c5e4d0f6c17b6c74902813bc91d9720e2 SHA512 0a7b0706724d6c33705be15c346531b5da53d423828ae1d21976fdd976a8d0867479dc3c5326d1961b384569a344a8f1a4cb4f1522c2f4ee11556aedc5987de4
+EBUILD kdegraphics-meta-18.12.1.ebuild 857 BLAKE2B 671f60c7c5f0b0135bfbd76dde6afabd55b1595af01884e3dfbb665b7c61f92099e0b16c5bea4d34276f34c6a7821b3436e17c625c7c1750bc1a147a20a51c1e SHA512 c01ff12afe103832fc7227f48ea42e5ff76e5c32da3caed72b0f1f76bc48715b527d37ba240cb138a266845186ab75b4882b2b1e1a030e6be4481f83913c7911
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
deleted file mode 100644
index c67c6f805c0f..000000000000
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
-HOMEPAGE="https://www.kde.org/applications/graphics/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-RDEPEND="
-	>=kde-apps/gwenview-${PV}:${SLOT}
-	>=kde-apps/kamera-${PV}:${SLOT}
-	>=kde-apps/kcolorchooser-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
-	>=kde-apps/kolourpaint-${PV}:${SLOT}
-	>=kde-apps/kruler-${PV}:${SLOT}
-	>=kde-apps/libkdcraw-${PV}:${SLOT}
-	>=kde-apps/libkexiv2-${PV}:${SLOT}
-	>=kde-apps/libkipi-${PV}:${SLOT}
-	>=kde-apps/okular-${PV}:${SLOT}
-	>=kde-apps/spectacle-${PV}:${SLOT}
-	>=kde-apps/svgpart-${PV}:${SLOT}
-	>=kde-apps/thumbnailers-${PV}:${SLOT}
-	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..967a31c31dad
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://www.kde.org/applications/graphics/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner"
+
+RDEPEND="
+	>=kde-apps/gwenview-${PV}:${SLOT}
+	>=kde-apps/kamera-${PV}:${SLOT}
+	>=kde-apps/kcolorchooser-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
+	>=kde-apps/kolourpaint-${PV}:${SLOT}
+	>=kde-apps/kruler-${PV}:${SLOT}
+	>=kde-apps/libkdcraw-${PV}:${SLOT}
+	>=kde-apps/libkexiv2-${PV}:${SLOT}
+	>=kde-apps/libkipi-${PV}:${SLOT}
+	>=kde-apps/okular-${PV}:${SLOT}
+	>=kde-apps/spectacle-${PV}:${SLOT}
+	>=kde-apps/svgpart-${PV}:${SLOT}
+	>=kde-apps/thumbnailers-${PV}:${SLOT}
+	scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 2d77cef779c6..2da3d5d1dde0 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-18.08.3.tar.xz 13476 BLAKE2B 06ad6a84cb2cdcc8b107c383fb72a16f1bbafd6bfde325d288475f6a1d3c58d8b5c6d055de80e253b79fdfb9a37ec0253dbcdac43d6d6ca0b6efad79be463a01 SHA512 d5410d431f5cad5e495db6410d3ab6c9c1cbce3b3971965a0fa3690709763b68d351d79060088e279bcc6eca933febbeb1450e16cfcc376b1b572024a36e58ab
-DIST kdegraphics-mobipocket-18.12.0.tar.xz 13452 BLAKE2B 9861ee633078457fab83d21ccf4c970b388189b17e239aa030de191385284640ebd6acd57f78b86618049002e2a1a6b8e24b9fab26a211d666036ef0de217767 SHA512 6ff2afeeefa479fed9e958296a46efba92580dcd2040c73688cc41cd31549afc6b2afb91aad4ab978628ad837b1433e1dda5c75669189eb9843a2fdcd5fa7d9c
+DIST kdegraphics-mobipocket-18.12.1.tar.xz 13448 BLAKE2B cd98cdcdf51a8d3e85b1f6c3b8338d112779437bbc6e4e639b53aaab524dc189bd2c2da2f7c19f8c30eaf34ad4cb6b09f67cdaf251262b83fc3635a7a56f3ea5 SHA512 595e9d864c4e8b2118f93610705260df48431241acee8292ee605cf12ea7c3c4b36703033547283941d75a132fc4dbb3eb24404011dff88806f0048da1763eed
 EBUILD kdegraphics-mobipocket-18.08.3.ebuild 419 BLAKE2B daa24e0b098f55ad1777476e4cd45e373c65070001fb60fc294d248b344541fa4fd17da70c5f1fb8b4d4abd5af5d0e1e098efd11e8c70f0496163d21ec92da84 SHA512 49d9cc30993f041b0b8f145de9ae76d1392efa45a13337672f73571e6ff2a115bd9025ec198c9f4d5c2204c8483e3cd1fc6a2125f753bf8a10a30048896d019e
-EBUILD kdegraphics-mobipocket-18.12.0.ebuild 421 BLAKE2B 31df842e00d91385b4f3babbe5ffff0845ed6de628988c18fc0663ec22c6fb08f84331a9673716dd141572354c383cf0d1f4f74e8f27932e93799490747b98fa SHA512 5c4ff41f655b7a84db5e54aa0ea38cb5acbfd237696afa3ff71f5809fc5f2d03aaec0c2fe1daee26519c1247e387a82e0cf47b1e27d1bc3dc1dbc78769810a81
+EBUILD kdegraphics-mobipocket-18.12.1.ebuild 421 BLAKE2B 9606b74046938a58f872f6aaacb4611b3fae3733d3d979262e7d1fb43e83ebdc2250a92dbd1555fd75ec686b7f675411ec6bbb232024136992084dfddef89e4b SHA512 132bb085180be8a4bf4484c04419c7bd4eef4de444e7115885fa9c7140acdcebd4c60d5807e528543694c9487627568e3dbbd440fa71d0143f32509009f922d5
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.0.ebuild
deleted file mode 100644
index c8641b807ab3..000000000000
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="~amd64 ~x86"
-IUSE="+thumbnail"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	thumbnail? ( $(add_frameworks_dep kio) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_thumbnailers=$(usex thumbnail)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.1.ebuild
new file mode 100644
index 000000000000..f06b85205d7c
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library to support mobipocket ebooks"
+KEYWORDS="~amd64 ~x86"
+IUSE="+thumbnail"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	thumbnail? ( $(add_frameworks_dep kio) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_thumbnailers=$(usex thumbnail)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 8e2ed493a624..9ffb10924b01 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-18.08.3.ebuild 732 BLAKE2B 48224c0b24ac2e587de83033502e5612ae95586a5a2bb62ae7c625401edf1bfa8015431fa3ffd8e909db5b29652a324c381de64742106a5aad004e6bfb70a691 SHA512 11d7bc46b931be4ad3d30ec2d84b27952cf80ba0fe44a52c8913a68740fdf1c7be63d200a8d27104d11f1909e7d52e7bde4839a91a13b17cc4886d5b4b9cfe69
-EBUILD kdemultimedia-meta-18.12.0.ebuild 809 BLAKE2B 5d6cc03824822ff38bfe22624ace930ad949fb2d4a53f835e7e7896000a9be559f6485b7965e2b815b60ef44b1089b35e217242094c5263017edb00af5bd218f SHA512 bbc4e12b2cbc56c456be92f5bbb9bb17254418d9a6b15a0b9f4d46579329f5e0fa68653dda0efd7262e16b42d1863aeb6b9eb3626e3b57c41bbfc9e46997f4dc
+EBUILD kdemultimedia-meta-18.12.1.ebuild 809 BLAKE2B 3650886208db29c06ffaf9078bab9263da1b0ac43349e23ca27a7a08c991bd12f1905a8b3b5ef398288aae4a45e9ad69fe504fa6e4fd6c62c2e7889070733746 SHA512 21e39cc7a287fdad6200fe61a6d63185667131f4ca7419f2ed6e99515020d0b686d64dfbb80757530059ac89ca02c7a024faa2bf878ab46337c901df2809019d
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
deleted file mode 100644
index 7cec145c8094..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://www.kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	>=kde-apps/dragon-${PV}:${SLOT}
-	>=kde-apps/juk-${PV}:${SLOT}
-	>=kde-apps/kdenlive-${PV}:${SLOT}
-	>=kde-apps/kmix-${PV}:${SLOT}
-	>=kde-apps/kwave-${PV}:${SLOT}
-	>=kde-apps/libkcddb-${PV}:${SLOT}
-	cdrom? (
-		>=kde-apps/audiocd-kio-${PV}:${SLOT}
-		>=kde-apps/k3b-${PV}:${SLOT}
-		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..cc98ab9fcaaa
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdrom +ffmpeg gstreamer"
+
+RDEPEND="
+	>=kde-apps/dragon-${PV}:${SLOT}
+	>=kde-apps/juk-${PV}:${SLOT}
+	>=kde-apps/kdenlive-${PV}:${SLOT}
+	>=kde-apps/kmix-${PV}:${SLOT}
+	>=kde-apps/kwave-${PV}:${SLOT}
+	>=kde-apps/libkcddb-${PV}:${SLOT}
+	cdrom? (
+		>=kde-apps/audiocd-kio-${PV}:${SLOT}
+		>=kde-apps/k3b-${PV}:${SLOT}
+		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
+	)
+	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 2fdb87b95bf3..2dd756298e80 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-18.08.3.tar.xz 313048 BLAKE2B 66be8fbb524ad9b6e650f33fdc8dbb41d2553d279219a7a7e9bcad2670620ea56c5b110c4189770dc753e40874b159db3e59419cc7b9d09f92bfcd020b306da2 SHA512 facf42254ccaadc6779683e6b8297bfbc7a4ff03647caeb0128e0f1a4dd68741d95358b32ae851b79155903d302e49c98e761bd442f9b63c2f2d878816f2fc37
-DIST kdenetwork-filesharing-18.12.0.tar.xz 312764 BLAKE2B dab115ea63a4f45f54d4e472b479680e41ac68412644a21508c697185cfead7224e281e73ac49b07dc8ebee41a22e0e2bd6d3047c9e480dafe66424413b4af67 SHA512 071a927a1dd640ca3a9da961cf000f1350f877775fd67a36bc54e5ff5b3847a764be31ca46240ccf6c5a4811e96e449b7b972278a7885af45c6bd33fac5e320c
+DIST kdenetwork-filesharing-18.12.1.tar.xz 312752 BLAKE2B 2d620cb6cb63b0a663aaf137b71b0979d53673579325bae2554bfdcc542e542cfcb44bdfa9dceb29b26261bc7bae13db3ee3288fc52fa4b022345652c9ab1502 SHA512 bafbe37d6e6664db71d0ac294254138d797b8b7b08686f71b3ba17044fdfa8d5a11f3a0e88ced12d2274613adbb745656ada9b88fce9636a6009cd78fd149790
 EBUILD kdenetwork-filesharing-18.08.3.ebuild 569 BLAKE2B 38520dcb4dc1caed0be3caf597ceb875279e196eb36a8bc9436cb690c7d7afe15ca17ae59e92183330692a43a3fe5e1b1d6a10871b761db41288673d64753e48 SHA512 5e8440007ae91bd22d11dbbd5c0da4cd9b66a6fe7b6cf914b6fb4df0d370b0ae54c02383871e84637d426b83c667ed8c75a082052e7029e16163f9308a04a318
-EBUILD kdenetwork-filesharing-18.12.0.ebuild 571 BLAKE2B 9f9d45ce29c2619704d55d72883bd176d7205f83cbcbc758b84833c99a9eef4de97a2b37b9d3c7c17058f2631ccf1839ec03a695d611899951f2b4e599a831f6 SHA512 7426da52239d81daf34a5f7f2adede95415b9ac345bff541b219ed7bd4d1962f79d062c6c39567bb33fbcd8f0785566085d773d67036bd21f0bc6b499f9aa240
+EBUILD kdenetwork-filesharing-18.12.1.ebuild 571 BLAKE2B f7f158f2c615d9c04be5c06b8a121bfd5c0e38b753daf29aaed88605df5b612e027292d65bb5481dc547093fcd7b0c46641866313ca62eb98b77f2f033d01fcc SHA512 1a5f7c185fb51e4d1b6b9349e5e448cad2f327d6e6d08bbfd433c2302bcc4aaeaafb4171f74f1b8e10db96bcc37a2ddb9cf7ec4a4039b11340f3a9ecc2e80501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.0.ebuild
deleted file mode 100644
index d59d7bd40bf0..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.1.ebuild
new file mode 100644
index 000000000000..dc2fdf06d313
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kcontrol filesharing config module for SMB"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index 43e310023a01..87eaa3cf8d4a 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-18.08.3.ebuild 508 BLAKE2B 7d56875f96683b3ecb637f7eb5a1a1353186313dfc30f0c13f5726319ff2d1b9953a4e50e13af2b404c8e368b624ab5bf4035362b6a69af77f054ef014063072 SHA512 29de2da6d4fc33402be78f36dc822f9bb23315fd3dbac8108c81d8eb1602dc3ac32321552b945fe0bf7105565777723bb661c9bee13d3de41fa4c2c0c4f0e7e1
-EBUILD kdenetwork-meta-18.12.0.ebuild 664 BLAKE2B 77d53d9aca2425a150fcbfe286893054e472a22135ce5e3da8025f7608666b8911ff14318cc973b4595fbb3aff63536f8757435bd1b40ac1036cff4241a7bb73 SHA512 84dfb7863e38801ea222174a66d479f4c0035b6db58bf9d510a886abe134e63ea6fdb9071e2f6f170878c877699f47a84ac92bd8524257721bb6818af0b19dcf
+EBUILD kdenetwork-meta-18.12.1.ebuild 664 BLAKE2B d62cd7df694cd6e1e0cd3d28dd056ef5841c8f5d14d931d4f344179e177de02406823cdcb56fc76d8c1ccc1deabe3b69258df5622473184d9dc0f18a6adbeabf SHA512 1e19e0fc9823d3c0d40cfdda2d422fd08463d6f92c2ea34e90eb6ab8ab0e9e8af13cded62bf37c7e5487fec4445dbf899fa64fceb7b2c48c19c4456f779b537e
 MISC metadata.xml 546 BLAKE2B c0eaa549235c2cf501ecfb5eb2b39bf466193e892715224ff8979528e49d2dd129873714302505f54ea200707eba0682a75a4232bbfe89b78244b5483d93a2dc SHA512 a423dbfbd45bd72c6d5aa9f196c9a4f1b4740400ac31112f358246e40f22ebaf76d3fc66136b4f477ebdfb59c967b45351841718621fc88f5576b71338136e6a
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
deleted file mode 100644
index f8032c178faf..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="dropbox +telepathy"
-
-RDEPEND="
-	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
-	>=kde-apps/kget-${PV}:${SLOT}
-	>=kde-apps/krdc-${PV}:${SLOT}
-	>=kde-apps/kopete-${PV}:${SLOT}
-	>=kde-apps/krfb-${PV}:${SLOT}
-	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
-	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
-	telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..cf411e1ccade
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="dropbox +telepathy"
+
+RDEPEND="
+	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+	>=kde-apps/kget-${PV}:${SLOT}
+	>=kde-apps/krdc-${PV}:${SLOT}
+	>=kde-apps/kopete-${PV}:${SLOT}
+	>=kde-apps/krfb-${PV}:${SLOT}
+	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 31a470a93d58..a1c5f8fbc629 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,5 @@
 DIST kdenlive-18.08.3.tar.xz 9414236 BLAKE2B 214cb1f615c6d1a1eba47c68d79c74f9daa40388ef811313bf20b321bb469c2b5a6f1168e44001900509554b5220b6a1e00f7f19a8562f32cef2e8da3d799f0e SHA512 10ef69fdd971b3333d275da68c38ec16f30075bf50b4f0b3d02ff623814f1dea02a8c1df6ab6f5262579813f2b6309d101106ef561cd8bb42cf33c277bab1c7b
-DIST kdenlive-18.12.0.tar.xz 10196100 BLAKE2B b0add0e04e375f59c3f08a86bf7af5a937a79c5df64b8fd72abae24d67252e6756cd2528cc96a970ab0f83205314f22977bb4a0806b1b430f40591f52e0af7da SHA512 e1eeac9dac15d45ac08239b82d54c51d8720b6c5da37b322560e33a8e50f50910dfdc6502649bbd31320227b7ca4d730a6b2e5838414cefd9610733aa20bfbd2
+DIST kdenlive-18.12.1.tar.xz 10195996 BLAKE2B 5beddb2037acfcea2c3e9f254f8d2b6b729ce763cd6ee092b3c98f1513ccbd2c43b42cfd5ac46a49c8e40d04f53f750dfa9c419b2db5b63f5df1d1ba0afc9919 SHA512 68099d2d254bcfb85443d49675ed116d91737b64062395d7d45870918b62586adf9a8bfe38eaf7750bb56efaef6a3ea9587c96c1b9d57bac4116ba79bf4e0712
 EBUILD kdenlive-18.08.3.ebuild 2219 BLAKE2B 71b4705d476ccd9f3e095bacbc8ce432a460c82483adc4cbcfe2202e6494db2c737cd9de4412a44877b25d916c3dca6f49d028f6c550f3587e8743d8c589a7f6 SHA512 3d35a83d301c4847c79e808459666371e82604ccb3c0241b24dda8fa8669b9d2453013f42d2a3ce2d4c5680a41354af56102c64e511a3f4a56ccc8e52f18711d
-EBUILD kdenlive-18.12.0.ebuild 2221 BLAKE2B 1e96d58367eaca30049393e892c2a49ecd2ac7d8fd801dd1cc612fd943242d05ba601b0fc6f9b7e850425d55cdd14d1de569ec784ce8c3d0a0ed421ecd502464 SHA512 e119d15f43708d2729cc4f6aff7351be6338b1c6a96bc71dcca1f4cfbc56f3a2c3c46b799f02d2dd28b93804fcc8f17cb299b72ee576f8fec934233c52a3a17e
+EBUILD kdenlive-18.12.1.ebuild 2197 BLAKE2B d3c80b8fae15081379cff386e44220c3aea097aa9c5220ec26fbe0a5cc0e72ea25a7432ce3c663d060cd65fe807118846e0550680e03cce6cfd7eda8314a9be9 SHA512 f9b0a59b972428c15e2449ae47902d9feecf1fbc9b9324a28097df22c3d64124c7173bec889faafbd5cb3cd4c5708edf2e783f50cf5a271b803ea657113fede2
 MISC metadata.xml 631 BLAKE2B e31fe832d690c7c842a255697abcc15cf51546023a97ee121e918b2ec990e12555b3fcec1d585563c8bd75750cf84c66bcdab0d570d99c1ff85545753a698a00 SHA512 35e594ff05a23977e5f3944cff530c89404a4807db0f9a5f7454dca69de13b8e7df2cb18ec4a06292f4526fa4b27c0966d129a4c4b3f153de4eb3250ad3ceef9
diff --git a/kde-apps/kdenlive/kdenlive-18.12.0.ebuild b/kde-apps/kdenlive/kdenlive-18.12.0.ebuild
deleted file mode 100644
index 116743550f9e..000000000000
--- a/kde-apps/kdenlive/kdenlive-18.12.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="freesound gles2 jogshuttle semantic-desktop share v4l"
-
-RDEPEND="
-	$(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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.10.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	virtual/ffmpeg[encode,sdl,X]
-	virtual/opengl
-	freesound? ( $(add_qt_dep qtwebkit) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	share? ( $(add_frameworks_dep purpose) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		-DWITH_JogShuttle=$(usex jogshuttle)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdenlive/kdenlive-18.12.1.ebuild b/kde-apps/kdenlive/kdenlive-18.12.1.ebuild
new file mode 100644
index 000000000000..7a9734a4f55b
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-18.12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="freesound gles2 jogshuttle semantic-desktop share v4l"
+
+RDEPEND="
+	$(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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=media-libs/mlt-6.10.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	freesound? ( $(add_qt_dep qtwebkit) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	share? ( $(add_frameworks_dep purpose) )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
+		-DWITH_JogShuttle=$(usex jogshuttle)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake-utils_use_find_package v4l LibV4L2)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	# Gentoo bug 603168
+	if ! has_version "media-libs/mlt[fftw]" ; then
+		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
+	fi
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 1bb7eac0005c..5299292bcec8 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-18.08.3.tar.xz 2134684 BLAKE2B cf311193dd1e100fd4c3c08926be0b8102795f7e7475b3610be4dc60e4071a5286bbfffcd7928edd5ae3f779c7266e9efe08664abea153bd95c8840c05240f92 SHA512 9d9ec5c0c51f14bc7936e40b8d67f67120e4d458d1b226dfcfc08b6aa28a30255300a83758c3af7b1e68e7f755fc198208402027303f4451c054dba4c7ef8f82
-DIST kdepim-addons-18.12.0.tar.xz 2038112 BLAKE2B ceb133bdeeca82980fd2c92da0edeade5dcbef20ec632bc2208e2cba57bfd136891f833e8471372977fb3927c554eddaa608f2b71f47878f0da5048a8949c861 SHA512 b23e9abbd3916be36bb50fbbed4972b29712d9e26c46b65328538caf44e96dfe950c591f3a4854b048681e3c3d239cf5965c6e31394fd8c6a6a1e132b2d5b8e0
+DIST kdepim-addons-18.12.1.tar.xz 2039288 BLAKE2B 46723c7936fb8b9fff5329157b308fe117ce91a26fab8391be6bd5b1efb49546280ef5ec6549bafe98c181eff105cb2ceb2f7249367ac6d071b3f261f301ceee SHA512 f731a24509223770cccc3266d2c2b9b78b40aa5faafe2365c58cb6050051d379da6fbbcf8091121c0083cc959c5f168a0dc3678cdf1c42d0ce1fbf1a20a06719
 EBUILD kdepim-addons-18.08.3.ebuild 2310 BLAKE2B 361eb1fb6cfb7c03da7533acef6c6ba527f401bb775e0c6dfb2ce0b292aba13a7fd8e6138204b7a8c435ad7e327627459dc47655db20e231e80ab704d65fa028 SHA512 401f3941a857f23bbab3d04ed1b908a2c7ce3025b15700dd06ff80a2f5d726f291bd8812202bb408d3e405a3c9168151394ba7d1ccd82ccd56b76916eb7a341b
-EBUILD kdepim-addons-18.12.0.ebuild 2406 BLAKE2B 4d64afd015ca6cb51c5ed8bc8d37d8f397737b1f63608b650946b980bcd4311bb7c84bd925a21668a652620f8043b86c80c0474ac16298c7d62ac9fc7a256c1a SHA512 96289ab1efd0423751d2cd4a491c0f1fb6ea58fd0e0173d08f581aafee4af3847895fac2a4a4f9d4f773fb67648f4131e5a27664ab5b62b9e51bc7085cd3c7ab
+EBUILD kdepim-addons-18.12.1.ebuild 2406 BLAKE2B 4f798fc98b5091d863b415a2961371f68ebc6b24f1da3577dc9488d51c3c8bc847973d3f33984a418e8d7ee3f4708fb79933d4c168bf0c0374271ec4497f7855 SHA512 3f0b08cadf3ab584b7e800e8cc6491d00d615ad9da1145e50a3108e43fc54065f68c1abce22242f77a72b7561b55114faaee4d88e76eb91596909ef4088a70ec
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.12.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.0.ebuild
deleted file mode 100644
index 9f2939e7bdf9..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-18.12.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 markdown"
-
-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 kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(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) )
-	markdown? ( app-text/discount )
-"
-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)
-		$(cmake-utils_use_find_package markdown Discount)
-	)
-
-	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-addons/kdepim-addons-18.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.12.1.ebuild
new file mode 100644
index 000000000000..6fca357d3d7f
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.12.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 markdown"
+
+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 kitinerary)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(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) )
+	markdown? ( app-text/discount )
+"
+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)
+		$(cmake-utils_use_find_package markdown Discount)
+	)
+
+	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 757730e8dfb8..6f8f53e5624e 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-18.08.3.tar.xz 82980 BLAKE2B 36c0295382e523b21fc97a8c05b98c68b3ce62306b2b6b7600c04ee07ddf55942b9efd4b349d6b23f889a3ab32ed7997ac9fa0c8e145bcc668ebe3e781c393c2 SHA512 479449746fafe3b67cac12cf1b464b658f4c3a3482dc9ac27138616190d2e62f75e3caf5030fee7613f28b548365e1aeb8158508cb0bd3d00e873d21ab0e0baa
-DIST kdepim-apps-libs-18.12.0.tar.xz 84724 BLAKE2B 2045fa9ff1d60bdbf14c3231577817584d74217c64c489c45df2b51b6b8ecc542a17fe6551bf34b7a08a03b5bf386259ff448119b1fb032b975cb1ead5cbd024 SHA512 5b73216504a7803c689d7593016824f380355e428551b06f26a83ef52d2b39e59dfd3faece2fc50c0a0be5d45b86dea752b8854ecb81c045967de1b9e31e1e54
+DIST kdepim-apps-libs-18.12.1.tar.xz 84832 BLAKE2B b863ff93730bfe1fcba6ce4b3683d8d00a8b816a76c8c5ed18c55864dbbc45dece0d907ab088fe9bc1e72a1e39e97745d3a7b82233b238b9ff2346dabc1fe14c SHA512 8a6ca3ffde967d40971dbfd52f74e61f2c997a749e43ce758df865afff78f1ce487ccc4864a89a202eef5bba6d1ae401f9281ee793fa14e23e17ae9d24eb6feb
 EBUILD kdepim-apps-libs-18.08.3.ebuild 917 BLAKE2B 46f4c5f8a89e075bee2ce830f4c1d06376f66e9b651a209009ab3f489c0f0c4fc4b7908cc27a0bace61a2c34ff78e83d269ed2fbd24c9a7dac732f6a0ba3572a SHA512 24c0b502abe4f57d45342570e0d745b8e663019c90c776f49a017278f96d78eab6706e049b017914999195cf02b2730d1429fcaa5ff963cd64b3cb251f1886a0
-EBUILD kdepim-apps-libs-18.12.0.ebuild 919 BLAKE2B 2799cab2c9e2550c215c852de16c9fcce8fb19ba95b51c7ebfd56de7ef8e22f340296f50b4395061a31a6f1b79b5e8291a4b7a428c8aa6fa2daf462d28c160ba SHA512 6dc7d69decb84474ecee3531eca16347c922df84a038ac9a1a862ad94fe82b61cece6d89c591d512c4249e1d3e19043b68908b4dccaa95865889924670584756
+EBUILD kdepim-apps-libs-18.12.1.ebuild 919 BLAKE2B afa17d9f1d5c9db66df9547ebb15a17b04fee6cdb99780275ff450ca284ea33410f0d20c7e4e9848a699b7a0c9f3025154870132f096d6a9f2a5a72a9c950459 SHA512 6dbdf29dfbefa8584ea7d2883f5cb259c1e2de60664ab74e7bbef88c1f15d3ea69253bf09f91f03ecf177b7f6105ccd11de6d4ec13e1c72ccffa0a7f5ca3f7ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.0.ebuild
deleted file mode 100644
index a59eafa15529..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.1.ebuild
new file mode 100644
index 000000000000..70c9a697e40c
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for KDE PIM applications"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 2ba7e5d927b4..fa227e53af49 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-18.08.3.ebuild 2078 BLAKE2B cb8a775aab8dbefa612ec5dfddf84f0d726b19ae516d5a44b683ae75fc4f4f0a135f4106bf7df008d75aefadaff4c4657110bb803472ce092c6cab8d27ebacf1 SHA512 ff5ad478ec5aaed7eda63dbc371ca524c390dbc98a432612b7d18f54b2978330854432631cf9fcc181c099156de01c3605604bd5505fd3164d2f0db0d8453b6a
-EBUILD kdepim-meta-18.12.0.ebuild 2662 BLAKE2B dd568e14d60bcf2c675e1f2f335d95595a7b072e872f6695bb81303d2787fb535ae6daa5012841a7e1c7f9410028cbd27b4c795c62918a6a0bf2d58fd39ef345 SHA512 d27890fcb62af9194d76d5ded0de48437414c86e00c6fde20ac72be4c8a4805f35b191070799fd1769920e4b0343c36afde9c9a7c904b2da0b189f867824c250
+EBUILD kdepim-meta-18.12.1.ebuild 2662 BLAKE2B 46f36db83b73dfc9ad5ab9bf3647979dfec7339530c1b88374fed4267ff4817cc42d5cce6ce7398123fa393cb8a3093061023f5542780ef29c3cc030cf7f09af SHA512 d8f0d080906b83ffd59c4e960c80fe317926d062ef4c92f6c522ffa6f95d92531b6fc777efdcea9487a725a3296dc10da10cf34054bfa7f3907f37792f448a9f
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
deleted file mode 100644
index cc9d9e6aa318..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalcore-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kcontacts-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-	!kde-apps/kdepim-meta:4
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..7c0f3acfc850
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.12.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=kde-apps/akonadi-${PV}:${SLOT}
+	>=kde-apps/akonadiconsole-${PV}:${SLOT}
+	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
+	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
+	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+	>=kde-apps/akonadi-mime-${PV}:${SLOT}
+	>=kde-apps/akonadi-notes-${PV}:${SLOT}
+	>=kde-apps/akonadi-search-${PV}:${SLOT}
+	>=kde-apps/akregator-${PV}:${SLOT}
+	>=kde-apps/calendarjanitor-${PV}:${SLOT}
+	>=kde-apps/calendarsupport-${PV}:${SLOT}
+	>=kde-apps/eventviews-${PV}:${SLOT}
+	>=kde-apps/grantlee-editor-${PV}:${SLOT}
+	>=kde-apps/grantleetheme-${PV}:${SLOT}
+	>=kde-apps/incidenceeditor-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kalarm-${PV}:${SLOT}
+	>=kde-apps/kalarmcal-${PV}:${SLOT}
+	>=kde-apps/kcalcore-${PV}:${SLOT}
+	>=kde-apps/kcalutils-${PV}:${SLOT}
+	>=kde-apps/kcontacts-${PV}:${SLOT}
+	>=kde-apps/kdepim-addons-${PV}:${SLOT}
+	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
+	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
+	>=kde-apps/kimap-${PV}:${SLOT}
+	>=kde-apps/kitinerary-${PV}:${SLOT}
+	>=kde-apps/kldap-${PV}:${SLOT}
+	>=kde-apps/kleopatra-${PV}:${SLOT}
+	>=kde-apps/kmail-${PV}:${SLOT}
+	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+	>=kde-apps/kmailtransport-${PV}:${SLOT}
+	>=kde-apps/kmbox-${PV}:${SLOT}
+	>=kde-apps/kmime-${PV}:${SLOT}
+	>=kde-apps/knotes-${PV}:${SLOT}
+	>=kde-apps/konsolekalendar-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
+	>=kde-apps/kontactinterface-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
+	>=kde-apps/kpimtextedit-${PV}:${SLOT}
+	>=kde-apps/kpkpass-${PV}:${SLOT}
+	>=kde-apps/ksmtp-${PV}:${SLOT}
+	>=kde-apps/libgravatar-${PV}:${SLOT}
+	>=kde-apps/libkdepim-${PV}:${SLOT}
+	>=kde-apps/libkgapi-${PV}:${SLOT}
+	>=kde-apps/libkleo-${PV}:${SLOT}
+	>=kde-apps/libksieve-${PV}:${SLOT}
+	>=kde-apps/libktnef-${PV}:${SLOT}
+	>=kde-apps/mailcommon-${PV}:${SLOT}
+	>=kde-apps/mailimporter-${PV}:${SLOT}
+	>=kde-apps/mbox-importer-${PV}:${SLOT}
+	>=kde-apps/messagelib-${PV}:${SLOT}
+	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
+	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+	>=kde-apps/pimcommon-${PV}:${SLOT}
+	!kde-apps/kdepim-meta:4
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index ce2859ea37a2..ffb56386ed25 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX kdepim-runtime-18.08.3-gmail-resource-crash.patch 766 BLAKE2B 10d5a43d3c4a9322e8e7c864193880de226c70a1ebe25376ee133662cae0e8846d56d982c3b8255be55976cf03e1ee4c7323d99a47d189f4abb3c510227c1724 SHA512 4de43ca3b38a042b1f519616563cddefa522929f0e7ff9898d7cc5da3616bdf9aecbc981f50f7dffe47058580c7bb248ec864a27eb36ca88873005cb979c57fe
 DIST kdepim-runtime-18.08.3.tar.xz 1752272 BLAKE2B b3bdac2cdd6a741d1af60881b7e923485272edd8a0edb6c1dcc51cf961e0c25e005946467d7fa467d4ee266fd08bf2e7de5878a990ef88c19a614f9c4cc28a7f SHA512 b2520e1eab7f722eeaf8c34a554db86aa5ee7bbfdf11e31c471f06c67c50426327fae1319f747ae240d8919ee12259c34ecdee0ce0a83cbee5df5c3b481b76ec
-DIST kdepim-runtime-18.12.0.tar.xz 1772412 BLAKE2B e8c1a943c614cd9abaebcafa2431aba3e3f2b17b5ad8f6e9479b491b67b8da4f57daff23a3d5af1322a9bdc6a045c4b9831db2e94eb24e872eb34625de5938f8 SHA512 f98992092bb2407342f10e695dff5c0514f670f69f664b39187df5d628eb9c9c3440eecce1e03f75c1e12fdf686c2bf1d5a92d78f331e2ff9eb4cf07321d525e
+DIST kdepim-runtime-18.12.1.tar.xz 1772996 BLAKE2B 1a2b1e55d3c3f1ce67d831e9deae5020ab8855244e5148dad1c2e0516083c52f36d6f6da0d213d8f23d23c54b378142bf68158df2b6d992ea431955201b96b06 SHA512 97df412d0ad2ae89ce306f0b788aa8cbb1666b7066e59e0c37013680dd5ef9dbe635cf618ec09029eb91f95a0b3c3cd2148f3edb522cfd2d9ae33f8b49ef5261
 EBUILD kdepim-runtime-18.08.3-r1.ebuild 2309 BLAKE2B 125c80cb8273e6d651c5872aeb0b1be57e3687802c93858d9511def314109f9823163d43dc9ac11ba29260dc931a79ae418e7f2c1d63efcd5a68c3ca1d098145 SHA512 bc78143b32b741f3f1e8bdd35d7e6293434e4e53ecf19d2af6df5c5b5f76079d6989e1e58a93138132e29e0a1fcc016599ce533e9ae32c259c8b6fd1b1a13431
-EBUILD kdepim-runtime-18.12.0.ebuild 2178 BLAKE2B 674271b87833fd791dd1b9d094072433cbf0382d7f0fa8a36fb79106078f797a8e22fa1d38f341d3f89a6500c959a4a210bbd52d0600050d5cfc68d518d38a11 SHA512 bf1bb7c3be83142496267038f7e9867c27e00dd4186cd17f8067520292f8c0209ec665767e073f56ad813b28cf334b3daae3cb7b06fcb99e1f4b87cc018d3d12
+EBUILD kdepim-runtime-18.12.1.ebuild 2178 BLAKE2B 25085e36a4bcab5241000fa49c7bd67c41d248006fc444bce24137c92e2a9f1e2c43c10751bf149bc8e3e8390ae17adf9e5216fbbdd618094c8808fbae969b11 SHA512 28114e08dc305ca61a1db11bee28a93e9689d9f76f05a83fb9da71439de72a549d4aa2261d4cbd40b13b1b252271ace0a7c9e086577495ee52a39a34eba76f63
 MISC metadata.xml 431 BLAKE2B 55fb350365eb22d45202e33da2e0fc7e7f713e363760376a7fce354422d1b3723baf558cdf3301aac10f71e9df2541404995574e982493132a1298eda0b9c13f SHA512 1cdd40774926be019a6d332c2acb9ba00ba07fa794d42125ed0993c324058742287fd1961db5d59ea061a3653b79af5dfe7ae0774a036e53006b044cbc7df3c6
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.0.ebuild
deleted file mode 100644
index 01617fb57e27..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+oauth"
-
-# TODO kolab
-COMMON_DEPEND="
-	$(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 kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(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 kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-	oauth? ( $(add_qt_dep qtnetworkauth) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kimap 'test') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-misc/akonadi-ews
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.1.ebuild
new file mode 100644
index 000000000000..9d1c568bdf20
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.12.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+oauth"
+
+# TODO kolab
+COMMON_DEPEND="
+	$(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 kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(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 kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdav)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkgapi)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	oauth? ( $(add_qt_dep qtnetworkauth) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package oauth Qt5NetworkAuth)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 87656e841942..6b3d3e1e367a 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-18.08.3.tar.xz 37400 BLAKE2B bc934740af22dbab5d90adb4e35ab38c32b160dfd5b17f3282d578ebe04caa7a265a0913f1aafa4f34dba05f6a4b2cb0939fef3465c84000fcd7adb9b433912a SHA512 7ab41100fa1719f429313434229dcdd8d0ff28d66e6138da3fe58a699ae8ca1724790f3aaabbe8206935eb5641f3793bed34c8650a9bcf4a4378cd4dd6da73b4
-DIST kdesdk-kioslaves-18.12.0.tar.xz 37272 BLAKE2B 868f00c96bb8c86007e64aa5f9df1d74224db04a4bbc9af9c8286a23e8d97fcb77bc3fc17b96640da3db49601fa9f2b2eea391ae60e7a5f61eb1594bf5bdd592 SHA512 3076c34777c7b463490d5f56d771b16bd211eaea01c8b8d3828f625ef607f16494117756c62459c4ec32809c36d3a94f22b5f5734c50b9dbb140f30a0788e81c
+DIST kdesdk-kioslaves-18.12.1.tar.xz 37248 BLAKE2B 1ff8bc3706e69bf27c565f5ef9ba4ea3cd8eaf6b8078e660edcdf20b9ff6a80357964fcbc9aecb2fea3f92779cd73ac4c504cb5eae76f5b5397fe953c2449623 SHA512 70a5ea00626aa30c42763b1becf58d2a0a108f24eb054124ee43273cb771bc999dc161d81a3e1aa7ba19aa05d5605b8a8f3c4f24f7f50bcab3deeea23fb39e10
 EBUILD kdesdk-kioslaves-18.08.3.ebuild 372 BLAKE2B 4d5a1ed99f22527345fed2dae29a39b4406e8348eafc552ff2e3ef1b2bde159e1fc499548b88a321bb445df383d6d61cedf2e14b7737464a3b09a6fb76790002 SHA512 2863343be9e4ad505f1633cf343f7d653761d1f289411f11fc2d4b1988bdd72ab227acbc81b23c0a7514d7defb2abb04a2eafa72d581e61f49999ca7fd13bfaa
-EBUILD kdesdk-kioslaves-18.12.0.ebuild 341 BLAKE2B 593b992ce595803d0258381b888897c530085db88432e32ea092a1cd53d7c142669492f2839ef0bb48d779f12136b83c190844c8e57386815636d0513264c115 SHA512 4f3e7758fd84efea4b621d52343337da6f7381edcc26af1a675165e3cd496b9de5bcd281e8818ec560120bd7491c6efa53d3a0d52858ecd5385873980ea5c1cc
+EBUILD kdesdk-kioslaves-18.12.1.ebuild 341 BLAKE2B 39a6766cca72e933fe2638d7316805508387c1ab46db2d7b0dd8c6e851d2bb48e9b4676ddcb3f01ddbf25305169f0f9b145b2c69ae541078818ad4c6b12c9773 SHA512 e799bdeb2569e2f5d99b489934218c2ffd5cfa52545d0b9e769c7464aa39a8e4999a5d4f60f16e1e703aa4c678553ed059c199e9c92490cde0479d336ce8398a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.0.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.0.ebuild
deleted file mode 100644
index 52fabcd3cb57..000000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-lang/perl
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.1.ebuild
new file mode 100644
index 000000000000..0d4ed629491c
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-lang/perl
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 4b24c090aa8b..bb3e97ebffa7 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-18.08.3.ebuild 804 BLAKE2B de68e25ff1b99161687352d20d31732fcd0e1c6d9d823cb4e93caadd2395f3869e65ddd67d53330991a33446a36fafd545c032f08f9837ee223f7506720645ee SHA512 21c8ef1fe9043d0d678d64e9d34ed81f933417548b83e72226dbf8641bd6c3641843b9b9107040f4ba9863d66ec33afa11b2180744a80c59eebbd7e8bcd7be32
-EBUILD kdesdk-meta-18.12.0.ebuild 1141 BLAKE2B e33d3a65f2a55bd013711a8cf8c7d629b74aefa5a1f2197b9824fee8518c54a2900820fd86d9cebf02b74faf8d93b4d62baab7e53db17a6bef99c7fad8f838ff SHA512 69b69e4dbeebb0e12bb61c353a7534b8c7242fb25bb07d769fe21b47644d643e9615b551603bec8dc61edba086866123431c4cbe9518dea69eccc4887a5e3fd7
+EBUILD kdesdk-meta-18.12.1.ebuild 1141 BLAKE2B 61d31b53e5c01bc9ca82d6a307a1cc8cd464767e70f734b203e8b49eb6b3e214a168d75643e20b7a112d08e3164f89f06551844470febf26f7c9b4a0cd9491b0 SHA512 5a092b7d794776afcf5792a1b73088f6da7dae3de929939a67be7d6586321261f1ea4479afcf746d1c7341cdb221d7455ff89566a879e32ea10e7733d4f06ae5
 MISC metadata.xml 831 BLAKE2B 3ff18fb8e3bd5dc045b904b841e1ed10639381802d746be424ec00dc40e3119fb6f3c066f4706aede87b1e659f4978c6b5a573ead33851983db01cde8d54d566 SHA512 138c632546c3860be6daafdf94c969d2c55e837bb2da18c112d5835511018399ff180ef3417727264899fddbfc3291845420df37c60853a6c9d6b9db5b758349
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
deleted file mode 100644
index b2166bb058e4..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="bazaar cvs git mercurial subversion +webkit"
-
-RDEPEND="
-	>=kde-apps/kapptemplate-${PV}:${SLOT}
-	>=kde-apps/kcachegrind-${PV}:${SLOT}
-	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
-	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
-	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
-	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
-	>=kde-apps/kompare-${PV}:${SLOT}
-	>=kde-apps/kross-interpreters-${PV}:${SLOT}
-	>=kde-apps/libkomparediff2-${PV}:${SLOT}
-	>=kde-apps/lokalize-${PV}:${SLOT}
-	>=kde-apps/poxml-${PV}:${SLOT}
-	bazaar? ( >=kde-apps/dolphin-plugins-bazaar-${PV}:${SLOT} )
-	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
-	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
-	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
-	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
-	webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..0f90afbfeaf4
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar cvs git mercurial subversion +webkit"
+
+RDEPEND="
+	>=kde-apps/kapptemplate-${PV}:${SLOT}
+	>=kde-apps/kcachegrind-${PV}:${SLOT}
+	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
+	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+	>=kde-apps/kompare-${PV}:${SLOT}
+	>=kde-apps/kross-interpreters-${PV}:${SLOT}
+	>=kde-apps/libkomparediff2-${PV}:${SLOT}
+	>=kde-apps/lokalize-${PV}:${SLOT}
+	>=kde-apps/poxml-${PV}:${SLOT}
+	bazaar? ( >=kde-apps/dolphin-plugins-bazaar-${PV}:${SLOT} )
+	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
+	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
+	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
+	webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 5f3f397bad41..95d828f0eb28 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-18.08.3.tar.xz 17336 BLAKE2B 7c4814cd3159b3ac8f97648e84880f57e77a3a90360031e73e2ce21520dce3014025f5a8295cf17d283097e9734b33f6f21b8153551fdac0162fb5f5fc3f0773 SHA512 22995f512f43bd09749d8a071928f262471eae5817ff62f50e3343b8d68ae963861d59f8b97e27ac851d699eb2b05e43618c4059e83f70f583b3931be7b75731
-DIST kdesdk-thumbnailers-18.12.0.tar.xz 17268 BLAKE2B 33b4ac1e6ddcfcf8b2de9381c53a6f704abd56322a59098d079cc3e71272d7b49fef30cdb1b7bd684699e2adb3ca4cd20c28c24796e169d6a17a15ac3134790e SHA512 f0d35bc67097d3596966de442682ad30ad9e04cb3d446d42f7e2bcf81fc1bf0e827a89bf5247a4373b45567620f6d3c6293e68f909c4a6d15100ad489ffcf8d2
+DIST kdesdk-thumbnailers-18.12.1.tar.xz 17248 BLAKE2B 12bece8888cf187baeee1f421ca5d0743c10db0dd1567e96c3e0a4d89a64080acd917ffa94dcaa05957ce48f5bf0224050a51de0f1208ec5f74e0f250c5bb500 SHA512 29a6f74040da6e0d34f2dbb894031a1bdd1b674adbdc2b21cf15ee31914cd6e78190ef671322cbf5783479a0a731933015bda3f5610f4785d1d9cf970421c1be
 EBUILD kdesdk-thumbnailers-18.08.3.ebuild 425 BLAKE2B 77c823ae12793eccce1d9960a59993bc62a21fa83abb1c35184fc999a92930472098c500ec143b0bd95e345457716bb8fc9f7ef1bbb04b7d3e6c4204f4977a9d SHA512 738ecd698d64f37687533985a9f88d7abe6c783ab1e606eae2d65bed2bfab033b114c90e904c35f2b07f10975f97f9ffae2b5d0e5cb423e75b2d931c697c26ee
-EBUILD kdesdk-thumbnailers-18.12.0.ebuild 427 BLAKE2B 84a4e2dae97eba1ae13ca2dfdd31b5df1c81ce7efca03b9bad96eb45aa3c8d23aad8d27fe0e1f22b278347808d4eaf03eee09073192192fa604521cd454892e6 SHA512 d2860b1280e8a9e78cfa26adfb7f6483ef49547be8c6cf9b9e78a15ecbbb97ca01987c543800469b803588f798f937262bc837c76b2b319a59ea6968541a0c46
+EBUILD kdesdk-thumbnailers-18.12.1.ebuild 427 BLAKE2B 61c34ac8656fd46133621faaa9115fc03ab42596075b9c85e59b29dad9a58bdd845a7fd15ac76890831f87ed0fc9d5e066798d56e7e5fa992a0cdd9466f260c2 SHA512 a02ee1d7ab043233d651e238c492069b762fae21dd0f6cc29d3f79f63b9977f7c88fff0ba307c1bf8d5f7e438aa70b2f0e502aa0d70608ea6d1bfa48f882aae3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.0.ebuild
deleted file mode 100644
index b4204ac9dba7..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.1.ebuild
new file mode 100644
index 000000000000..415a7018504c
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Thumbnail generator for PO files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index f9fd86152a5e..4839f95a4374 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-18.08.3.ebuild 805 BLAKE2B c31bb07b92ebbca7801c59dcdf286030a33a9b05d9ac5c68ba9e783c1fd72d1338ab247f043449c8f2bd0f917204964b15842e2fcf637a774af50383c84ae00c SHA512 6be922a9d5b1ebb444fcdb1169b6c4d312a75936a9d11838bf87f5000a786c4136156a53419380a20b944dba67a63fb6223da06cfcbf03f7e23df35f1a77841d
-EBUILD kdeutils-meta-18.12.0.ebuild 1133 BLAKE2B 77777e7a283d0724ec55a81c901306005061138221f7375e672b782ea84270a108a003849e35e4cb47a5958161a348ba8cd9d66926307af283989263fdc17261 SHA512 94cd83baab6ee7eb9169f045cb487a5b4f4bb78e638ecf8749e113340e107ebbb91763b8138982426b53f3a5802f0fd9820793188c3ff2dc8617624781fb2998
+EBUILD kdeutils-meta-18.12.1.ebuild 1127 BLAKE2B 5a69f08f6d6edbafa85267b6e731ae71c0b1dd2c0ca4704c0465f855ce92c97aa1f81d7307d3c4eefadc51e71fc02012ff6df1fac65e89b10dd0dd7ed95d0672 SHA512 3cd46eed80629f76d3ea6c845bd217492165c59edd2a93c0da9b793b5ae8dd945231ff2ffd8e4f3a6fa5b434a127114e52519415e18a24bc14f00b514d6fd0fb
 MISC metadata.xml 752 BLAKE2B 44ef1551929d69e70d5af562ca212c8e2498ff26e27e38d718a2ae0a2499a002c382cdcef6b51a6273d2c372174509636a5c5bf705b2b60c31dc4e7368727a5f SHA512 35e4ed0057daf09428e123daefebbda024445d4fd324d813a95d1ec1f135b90bf7380ec3fa5553fb13e143194b9d61b82fae2bb16ed33757da6f8dceb1d4b27c
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
deleted file mode 100644
index ea86b513debe..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="7zip cups floppy lrz rar"
-
-RDEPEND="
-	>=kde-apps/ark-${PV}:${SLOT}
-	>=kde-apps/filelight-${PV}:${SLOT}
-	>=kde-apps/kate-${PV}:${SLOT}
-	>=kde-apps/kbackup-${PV}:${SLOT}
-	>=kde-apps/kcalc-${PV}:${SLOT}
-	>=kde-apps/kcharselect-${PV}:${SLOT}
-	>=kde-apps/kdebugsettings-${PV}:${SLOT}
-	>=kde-apps/kdf-${PV}:${SLOT}
-	>=kde-apps/kgpg-${PV}:${SLOT}
-	>=kde-apps/kimagemapeditor-${PV}:${SLOT}
-	>=kde-apps/kteatime-${PV}:${SLOT}
-	>=kde-apps/ktimer-${PV}:${SLOT}
-	>=kde-apps/kwalletmanager-${PV}:${SLOT}
-	>=kde-apps/sweeper-${PV}:${SLOT}
-	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
-	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-apps/ark
-RDEPEND="${RDEPEND}
-	7zip? ( app-arch/p7zip )
-	lrz? ( app-arch/lrzip )
-	rar? (
-		|| (
-			app-arch/unar
-			app-arch/unrar
-		)
-		app-arch/rar
-	)
-"
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..42e4e28760ae
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="7zip cups floppy lrz rar"
+
+RDEPEND="
+	>=kde-apps/ark-${PV}:${SLOT}
+	>=kde-apps/filelight-${PV}:${SLOT}
+	>=kde-apps/kate-${PV}:${SLOT}
+	>=kde-apps/kbackup-${PV}:${SLOT}
+	>=kde-apps/kcalc-${PV}:${SLOT}
+	>=kde-apps/kcharselect-${PV}:${SLOT}
+	>=kde-apps/kdebugsettings-${PV}:${SLOT}
+	>=kde-apps/kdf-${PV}:${SLOT}
+	>=kde-apps/kgpg-${PV}:${SLOT}
+	>=kde-apps/kimagemapeditor-${PV}:${SLOT}
+	>=kde-apps/kteatime-${PV}:${SLOT}
+	>=kde-apps/ktimer-${PV}:${SLOT}
+	>=kde-apps/kwalletmanager-${PV}:${SLOT}
+	>=kde-apps/sweeper-${PV}:${SLOT}
+	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-apps/ark
+RDEPEND="${RDEPEND}
+	7zip? ( app-arch/p7zip )
+	lrz? ( app-arch/lrzip )
+	rar? ( || (
+		app-arch/rar
+		app-arch/unrar
+		app-arch/unar
+	) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 9e4bf433c902..2a6e8c70e5e9 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-18.08.3.tar.xz 556520 BLAKE2B 126d472066ca2d8727b9332e961a07d3187609139b90eb9e659e02f8300c95d62eea0d6ef18e60965cfee84757fc9c3c161018620e0db2d414b9dacfb3bd0704 SHA512 254fce406169797cce36be40d6507a7a4e081073926d7861a091abceaa4aabc0b0a00ac47172a990830bbb7981efacda6244958d783733ed160b885482053b2e
-DIST kdf-18.12.0.tar.xz 556404 BLAKE2B 2588b66d9cd92f8df30fe2c70669dfb0f8c3c3e7af9c08cf5d8c20a9c26454465abafe076ab693dc25963409fbfed62fd3c155ffefc12fa21200bc50b21d2bab SHA512 f8168f3a3e3eac154b8b4b54e334465689a3293ccd69fdbd4b339822b2255085c6ac4e07f38d0c68bfec5a9ab20b76195320b2a2d8e087b0521fde54fb733c48
+DIST kdf-18.12.1.tar.xz 556340 BLAKE2B 50b2ff3fd0b3ad570a2ee2d3ea972f1e2ea6a084d8c90f54209133ecbdc65f504d88e8195f88201e211b3e3aad4067f73fe61e7fb4dba096c0af1311c7e6272a SHA512 f0f490670c732959d7bb5ce895b5590821cfbd6ac6a8f88a85f2aec60557d103f6510548651cb05a59ce301efcb5e34289d1fae2832ab81e08984e8959cb9b7c
 EBUILD kdf-18.08.3.ebuild 721 BLAKE2B 35eff2ef8203691339967d5dd4a522e64c870b36ef320cd2907618c4c6a9e889f1261b816f744d1c60fd5981746be65cfb8d0347978306551f91393a96884d63 SHA512 ce174668829c6ad6e60abc21bca72f61c6665d1e15a7be84f661f8754c389de6396541085d00215ef6a100aeab5d212cfd720220e38613063827c401b742c70c
-EBUILD kdf-18.12.0.ebuild 723 BLAKE2B 75dc896d8b37e0bd56213accfb15ff4f4dc87ff5f5772ea472749fd5b24194eb46c45f09657caa0ff5ca71634205e1e7d70a31adb93c5b7f5f04fc779cd093c9 SHA512 75bfa39c7aed33a6251d2e641bb62413f10f64139256b4e42334cfa6224fcf65407d77adcb18636bd079ae944bb3312e3d8cecf7d609187ac6b7233cba1172cc
+EBUILD kdf-18.12.1.ebuild 723 BLAKE2B 5bb11e2391ef7399fd9d19a86516e515697473ced877de2e3342d8f1922e0846e0e8bf93b5e8d75f78077f143cb900da04d0adb002491b5859e89ace30a64c70 SHA512 aae0accc966d4dd82a3854f5201dc3aaa30ff4a94a459ef830b1b2704409dd5750b7781f1f7135c4d5fcbbe26032df3127c309df137651651dbfc5dcda8ab1f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-18.12.0.ebuild b/kde-apps/kdf/kdf-18.12.0.ebuild
deleted file mode 100644
index 5d3a9930cdc4..000000000000
--- a/kde-apps/kdf/kdf-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://utils.kde.org/projects/kdf/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdf/kdf-18.12.1.ebuild b/kde-apps/kdf/kdf-18.12.1.ebuild
new file mode 100644
index 000000000000..5d89f8807ae3
--- /dev/null
+++ b/kde-apps/kdf/kdf-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="https://utils.kde.org/projects/kdf/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index cd96832a3c2e..f62568915e38 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-18.08.3.tar.xz 96792 BLAKE2B b08aebea2f35b2421a6b2341c287aa3c25809e1f63d5c7e58a155b106f4ae18ae6eb467c27503d8c2a5675aebef7aa5084d7cafe34167140e1fdcc86acded419 SHA512 317edd5990bbb877ee26c1d20e8a8845955863dfe02d81280d53c2f0173e0d725cb5b3f6b1f6de28cc94759f81365639f6f6cffa742ea1d1ab7f82eeaea66505
-DIST kdialog-18.12.0.tar.xz 97388 BLAKE2B 8302e1e61ea473551889a6bda8b4086f70363bbf0a8d2e1534959d5407306629a21971eded3ae2d4a13eb093970e1f734d2c9b61b76e4dfdf010ecf215ed3187 SHA512 23364a48e74d1bd8e57477aa1d9cd635a764aedf5d0e7ec045f786a83732fdb1ae391666ac5635dbce87861ac429401a5debb55ecefef2e84e82ee51df8ebdb2
+DIST kdialog-18.12.1.tar.xz 97408 BLAKE2B 2f937bf825b3d6338f41e044a1512e1be855b7186dfdc5c6d366fd8930c60e4764c9f4b7431687f0f10d2248c60ac8cfa9695397bc3de842a7ca17a7726c2f43 SHA512 0dad01e181a336568060d9c2b1623eb80b05bee4c6231425c2132d7ca4091421ccac1e860f7b9234271967dce130f36780abe1565a7bfc31a6d2a7ffe8c875c7
 EBUILD kdialog-18.08.3.ebuild 832 BLAKE2B 09b6aa8351d72f2ccca35f9991f341c3528a35e87a7f20346511fd4e0c0f8ce5a1af723e5a1664cb1a3fdfe669760720e8769280cf761004c75c7bfba0038373 SHA512 b80f8236749a2d38dcb1b04599934ec397a38eb36a5e9ebd3984a05fa4be2158ef812ab0bc1cf27f33191eaf9b3b035f783ddf1fa2d473d509a3ac7eba281bac
-EBUILD kdialog-18.12.0.ebuild 834 BLAKE2B 4d9585b2be852204edcd5fe7e2a7f02ca7af6aabc06a042fb4ad8d04502d7554f60df304461b8f8299ee0f8ff1e7cea47e788dc32b8071a1120acda476983b6d SHA512 9890812767bb4b928f7f38c5ac1256d91d6d67085b680cecf4e2ea2116c84985f91e8b31604ba45279ece081d7a12a51165db156650b166ac996c00ece72a0b6
+EBUILD kdialog-18.12.1.ebuild 834 BLAKE2B adc3d6f9dffd284d8aa46a95c9e6e9c26c8e557f2075b7ec3c7b8fabc087c61cb13511e8135e9f27a024382d2ba550b4c13897ed3a1a58a9c24d794845eed6fe SHA512 cbb2189eaf1fa082a4ae728522d8346d798bbcec15719732f897438af7589f1341b29a6cd28104da8b560056d10fe4449651302677386daf5ecc03b9b0075376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-18.12.0.ebuild b/kde-apps/kdialog/kdialog-18.12.0.ebuild
deleted file mode 100644
index fb1dfdfb4775..000000000000
--- a/kde-apps/kdialog/kdialog-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdialog/kdialog-18.12.1.ebuild b/kde-apps/kdialog/kdialog-18.12.1.ebuild
new file mode 100644
index 000000000000..0c9330722699
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index cb85b0c465f4..76c6792b1ba2 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +1,5 @@
 DIST kdiamond-18.08.3.tar.xz 4718708 BLAKE2B 58061d3e55c0bd095ff70bbb085948b9dee3e4ac399c12030d03cac408cbe5eac16c0e2d2e5d6c1e78f78931f1c55d463fefc50fbf3232a9f32c77ff3f540c47 SHA512 87394059c0dcedf9a46f21bdfa537e5ac9c55b58b405e1d12fb737ddb051233c2ff8f9dd211dccbd369a4264cc05a2bdd02a77da90b52669a6eb451897a49ca5
-DIST kdiamond-18.12.0.tar.xz 4719436 BLAKE2B 58fe03501d36150355a9eb25b9a134e4511ed6f48f74a5d7cad2a21f5498029a4bc8199356e95207882cb5bcc03c0e0c94d06d116c643371234a2673e1aa7fa6 SHA512 0f4401e70432f0af1a354a4d211f132e43a3909158cb282c950abec664b4bfd030f6a26ab0d7cab3bd8f64b94092d55e9446041023353637d0fd70420eca617f
+DIST kdiamond-18.12.1.tar.xz 4719636 BLAKE2B e93a5481d8fe52bac99959dd6a6b0122a9ea43f582a3982a8e7fd57b773ae9b9d639f41b7dd07e7cc38da894b63a92931dbc662bdf8faab22578b23457154dbf SHA512 f42d0efdf73f9368e4c01de46bb31af08193da71ae19859f299f4ceb6e24cb309839360418891218f709904f7b1b71a7f9005fea32dbc2496c6e32fc1c28c386
 EBUILD kdiamond-18.08.3.ebuild 786 BLAKE2B d2889332b8e5fceb8acdeb23d8451b4d5c91d35434cb1e096e7d02031ff278f7204e844cfb8960d1a8959c307430b35fc9505d142e8f130537cb6078364a3795 SHA512 81015e3bd02e46ca835e885b1e08581e8616f3277a79bbfbf5f471dc457700547b1195fa24439910cab4e9948e08407fd9bd792b3e993f2446c51d79f5800b49
-EBUILD kdiamond-18.12.0.ebuild 788 BLAKE2B fd9ef2ff3a51f66111f077c617906f8a2f11dda350a638704bab6054bf602b0376fe72de33060e33baff55036b90ddf0f86d4b5652a4f56a463ee303a27ddbc8 SHA512 b7c747d82b8bc8e1ccc8603b8197e6106f6a3a1ece136bc7ca62eed596ce1ef0628c6da42014a9dd22628c8dc0f970d27458e4d4f928604349a74e1516ac4566
+EBUILD kdiamond-18.12.1.ebuild 788 BLAKE2B 2c4e1c505fbf1d5341d160eb5a4a7a6443c5e70cd258f8935646213f5a25f837f21c86e5e96112262cdacde4f6242f807f33d71e5b546ae1a8f1d4ca2c918397 SHA512 5f721c68968c811d907461f5a81f480b4cd988fd9f726b408ae8d2fbbdfcf47ebf8dad06f27d8c19631e70ea42f0b48bab20a20f2844a5ae6b6331e8332e6bf7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-18.12.0.ebuild b/kde-apps/kdiamond/kdiamond-18.12.0.ebuild
deleted file mode 100644
index a71a0d2bf9c5..000000000000
--- a/kde-apps/kdiamond/kdiamond-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE three-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kdiamond/
-	https://games.kde.org/game.php?game=kdiamond
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdiamond/kdiamond-18.12.1.ebuild b/kde-apps/kdiamond/kdiamond-18.12.1.ebuild
new file mode 100644
index 000000000000..07b1b905c5e3
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A KDE three-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kdiamond/
+	https://games.kde.org/game.php?game=kdiamond
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 0a7c4aa4e9b9..33afb42f956b 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-18.08.3.tar.xz 183900 BLAKE2B 0edade2f84cd16237a8864612c915f17bf9d286bf05435f81d9cb10fb8967bd5d6d2b4ac966d3a05861487b1694cfe90736a6d84fd47218f6b8e33f6f5ec0eba SHA512 13fe3692ab128dc2af9457cecf64351e6e9c5dbdd0607552a8008b46e58434b8d0dbe9cc59b53036edf9c8e6ff43814cc617abefc078a975924919a9db33eef7
-DIST keditbookmarks-18.12.0.tar.xz 184712 BLAKE2B 4aedfe6d2a00326d1e6ea1a7858dde6409686213950332445149aba0bb36ac47d8999592f2b5198fe5fa2ddca7dc9589e40e724b51ffb8558a8e28ae751f731b SHA512 b0d4cbb8d25c9bd13167fd6fbe995758b64e190de9c21f1e1ba0de6995ecdc8669be0d6e90429ec2e9d1ba85b19fcbb9e3b44653d616402c7371bdba1995319e
+DIST keditbookmarks-18.12.1.tar.xz 184732 BLAKE2B dd65d11bda00e265fb5f7a6f8f2fb57d3bbf9a5924855caf7e1ac84ac4ba455a03b5d6c73bc5b59f633b6a0c2859a4ae82e0e52532d8fb48adbe88ab77680f1c SHA512 f9579ba6619a318010b0a151ded17fc53bd555788fedb04624ac2c3f52c995454936a2007eb31684f729164e9cafed11d48f46b436d515cbc24dbdf10906c569
 EBUILD keditbookmarks-18.08.3.ebuild 1008 BLAKE2B 4dfbbbb756d2c212ead5e6b5475864778778878bd841349770db99cb290277ae99c65f6a6b5bd0713b608f91a0f2d0e378a3d91406d14959b132f56c3eea5123 SHA512 fa27f0ea85a4ecad71fc953d0db8e640f67507e6e5606af3eff3227498c054cce6a3b9bff485620f9e88a3420cbe0b826e39fe6c60d7dfc7d664ecb0577d7663
-EBUILD keditbookmarks-18.12.0.ebuild 977 BLAKE2B 760437d6da0215bed73822f849606d6540c77bafbecf426a88fdf366b20cdde38fc441968642e59f8569b891b0c67c8f73bc4e036db37a82dfa83010bfa8f718 SHA512 18f06a09d753b21cfa944f8eb385198a67cea4266d27599f7e5254a8a2113176850c219dceefbfae83c77230a32797041cdaa1215a15baf5ba096e916c2dcacb
+EBUILD keditbookmarks-18.12.1.ebuild 977 BLAKE2B d8a33b29524fbe75193511a42c3a35a2149f553ede1481d660f3d5857e50b657368fdf1eeb4bb2cde5c1587f49c882b6d35fad90a802d708f29da8fd4c9eb58e SHA512 e02ac2385a0697892485b2885bc84b06c84067e0751b225ffcba94e55cebd09f28e4de35d2e920d7d7d67ee81973813007ba50ffd49bcb4aa042c6f8d51302e1
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.12.0.ebuild
deleted file mode 100644
index da45600d2ad6..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(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)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.12.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.12.1.ebuild
new file mode 100644
index 000000000000..30b7d51cdfdb
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Bookmarks editor based on KDE Frameworks"
+KEYWORDS="~amd64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(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)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 45835c8f589e..36efb9b995a7 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-18.08.3.tar.xz 210136 BLAKE2B 0ddbe718149dcafc1c2ca827ece20bafbeb5a13be4dfcf276179b53bc932deeff600b9e51a66f9ca908a70bb3b56b4b90ed40be38657b6ba26ae3b4f4f6fc5af SHA512 f0a8b1b7792ae3d72039ede7ec07c75269f141f168850b3a2b2d40b22ab1fba1c41a1c50a232f8431f2864e128c97a675910e6a51c6a7fb9cad942e057a349c9
-DIST kfind-18.12.0.tar.xz 267448 BLAKE2B 50824f8f35a60eea59bed92331f6a130b8631be1eb97260d7c4bdeef94b008d8c723bf686b50a7290bde7adaf2bf2c3406462395b416d073d2f874e64271d430 SHA512 da53d96d5cbef57cd91199e6e4ecce9e56b41da2c81ac55fcce522c56064f54c66f040a1a78beb408c2a0de72a03457fcd781e94dafa3ae2a3e9277cbce0dde5
+DIST kfind-18.12.1.tar.xz 267472 BLAKE2B d82a00e0b90a77ed6bb77da51a657a1c213a6b875dd1d24107244a275d77b5b8596d4f71e606b6e070e23a45049ad1b48ffe7d025bbaa47c926fecb505a8e198 SHA512 8037b4d235d94e296b4866951b37a6b135debe8b03f2c611badccc91ef4fbf93d078a9ce2f1eef51a2d32ec3f76d470b9463fc5db584972430baeeadd64059bc
 EBUILD kfind-18.08.3.ebuild 812 BLAKE2B d91bb804ccd2e869403efc53f48bab85329c123a6c12f4d6d17bbf23103f080bfdc5eb1625a12752a2173e15af1a85d6c9f8a3ae9b9f9c9cae27a3427e559dfc SHA512 cfe236d467f12c153a2a311f7512e55bb9d0348b6efed0be6be06fa0a8986898e3f8c298cdfc4c563c704cc2411c754145cd3d3dca29160420e07011ea1af1d2
-EBUILD kfind-18.12.0.ebuild 814 BLAKE2B 05b3ad4eb4999621ee30c21204443877161cbe8f547627aad838c0659a5da5cb421c994f2a75ab3f10db18ee5c85d2ddcf787d487ffa77f94f01cfe2c5172029 SHA512 283fa13bef3f989099bb3f7c68e2cf40e79002892ec4e3f056046c0f6a3ab38b4a2fcf777e527be332c049c25ab1996fbaf205d289acf7bbe3b72fe72dd7e930
+EBUILD kfind-18.12.1.ebuild 814 BLAKE2B facc04733ff7d18737b54cac48559d31e04b2343948a204631b6b44338326daaba8ab82b07700d96c93b71d5735fc8a67a98fa74eec4ee045906fc287e5c093d SHA512 afe8846d87e0aabaa029cf9a8fc9c23e2aad340e25bfb9dda2cc02052c84f73f18527bec0b8716672a4d18b9f8753c0ed997ab652d6cf25685cce960cdf27e10
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-18.12.0.ebuild b/kde-apps/kfind/kfind-18.12.0.ebuild
deleted file mode 100644
index e4bc91c6eedc..000000000000
--- a/kde-apps/kfind/kfind-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
diff --git a/kde-apps/kfind/kfind-18.12.1.ebuild b/kde-apps/kfind/kfind-18.12.1.ebuild
new file mode 100644
index 000000000000..ee7444ce32c9
--- /dev/null
+++ b/kde-apps/kfind/kfind-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index a1e05229104b..8f75359c3888 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-18.08.3.tar.xz 199692 BLAKE2B 0ec4b901f790eb83f7a11050d78eb8c734d01c7589733e724fe365b947e2fd4081e3812586cb019341f5bb787974546e94ddab6f99e9ff780b5b387c1f743b76 SHA512 19d006fa5497a896673138c002333b77cd08a7a46425d03e62484940ae8a16e233d5fbce44d2951f0afbcd9e32cdfb9887b760f87bd9d00d093cf8ec6ab697d3
-DIST kfloppy-18.12.0.tar.xz 199260 BLAKE2B 123ffbf86b922cd57548101aa4fcb4e5d399c6784cb3fc346d5c6ebd68c65e0c701da8efbb1b137585abeae818ff1e96d93ce16b605f8144372e030927e9a11d SHA512 b22a66aec49132493162bbf30ba8a57cf64c7ea6d5e2694775d84d8154f07bef8cbd014c6092cdd1104ddaaa16f09905d806bc7087ba78203045293d8b12027f
+DIST kfloppy-18.12.1.tar.xz 199252 BLAKE2B c18999560eee4d7d3255af8b1743d134ebf5dd11ffd461849dab5f36ac7ad4126eff3eb39ca6b64ad5bcacafb7a6d6d85c0a7fcd1208c3c31858fdafc39b6e76 SHA512 e27621d2aa2cd7b62041289ca65289e03633dc57877aa0427e69c294b1961708cf3b6658d4b9e2a4b2f4db07fb9a35148279add015fe924b04eea7b4a9834822
 EBUILD kfloppy-18.08.3.ebuild 748 BLAKE2B 8747d79d609d68c9dbee3c857ca2ee4f542f6c5ed2523250ac07557e0a74bb89849130201ce1a34ffefb9fdabf9cd1945967ecaf12c978caed3d5b84ab2ffcd6 SHA512 6299e0482ae4b61b67cf190960f78dd3e99a92412bcc629e036524e4875166b4b28dc6c1be1c4fde3398b666ce485c31e04f3270b3bf552b53aa2e5073324552
-EBUILD kfloppy-18.12.0.ebuild 750 BLAKE2B 2aff8323dd982d24403b0b85c8fd57468522a7680c2eccf07646484eb76a80daaed341b03b78c2c403875a2c877dbd611a103ca54ac53f51e54b4ee181cb9739 SHA512 40964453d1b3df90a82fb694893aac569bc28536beee7aeaeb18794b5dd8594e273dbf341f3eea818815bdc48238836a4a292331c2d43d0a5fb8f7e3a17a305d
+EBUILD kfloppy-18.12.1.ebuild 750 BLAKE2B 8a18d22424ef104b5512680d8b7e1cfabb10e4fe25f1771271025c2605de0231af95db79e5b46f4ebe02f52c77535f90656ae39221674c8862cf9bd31bb635b9 SHA512 3f6201b549601596acc4c2379020aaf6a9243e08be478fbe67750a8d0febb2ad34178a6cbc10330054a366300b2c4be89047bfa310efeca0391a54e61e828ca0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-18.12.0.ebuild b/kde-apps/kfloppy/kfloppy-18.12.0.ebuild
deleted file mode 100644
index b9b6a42b4b3b..000000000000
--- a/kde-apps/kfloppy/kfloppy-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="
-	https://www.kde.org/applications/utilities/kfloppy/
-	https://utils.kde.org/projects/kfloppy/
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/kfloppy-18.12.1.ebuild b/kde-apps/kfloppy/kfloppy-18.12.1.ebuild
new file mode 100644
index 000000000000..894b92bc7096
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="
+	https://www.kde.org/applications/utilities/kfloppy/
+	https://utils.kde.org/projects/kfloppy/
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 89d12901e980..f5c174b6093c 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-18.08.3.tar.xz 635652 BLAKE2B 8b4a4bd3b81207dded9f6a5013816e264302dff763c17738f099f0ab4d9e6f04a59298f25a93d206f97cbbeb373253c5b1ae162119e24fa41988f03c1ee53179 SHA512 d7fb81034163fee2ab98b49286e64127468b405592efe18863084ead4cd5f6e8288b22df712daa57afab215c736a3f1be5f9a094e13a550bc01de583bf148030
-DIST kfourinline-18.12.0.tar.xz 636108 BLAKE2B 4833c0140f06aeee778856ba1b9eddc7ae56b1a34733639c293e983a423163fbb4106d4031127a989500980a47a5f77a38e4c9f28a8f9dfabb2b4e6fb1582410 SHA512 2e5152aeb47d600ebb707bf2a0e787ea60886cfdaf8dcf4e30a82e191515793903002500535db2bc3a943213b1d5a2faed28b349b3cb3ddc83dc683aed9fc655
+DIST kfourinline-18.12.1.tar.xz 636488 BLAKE2B a3fa858bd6ea3ea6849a4885e363b03308613788b68c20ffc130897698550f9aea0413797acc8a1966ab6d8aaf59635f9ed788159e029055464114734d2e44ad SHA512 e20bc82a6e529a5d9fbdc2cbec4b09452548150337eb93e1913650fde8b0702bc7fde6143ffb94871ca4d732fd8c9f5a6b29be6e130bd3476c9da5f64e38411b
 EBUILD kfourinline-18.08.3.ebuild 730 BLAKE2B 8adb83c3a63f3a2259aa5068478da5cac6abae8eb5878796b08390e5aa8ff0b70cdac0a4ef3fdc3bbeb8f1574f52fc498024308a655d7799e7fbee0530b15c22 SHA512 97c827c1b65a5898e68c23ab4421b0525ecc157be0b2eb211a9e06ada0281f99b41ea3d90fc9b37a5802f26250139f74ce35d058288aba6e7c7fff243bb08ffa
-EBUILD kfourinline-18.12.0.ebuild 732 BLAKE2B cd0fdcc68db533b72340b8d2909ed18b29796d134fc9caabd19d1a85db9dd78e27bf3a4f06557163b4e07956515c8de451fe2012f22b77839575398dec1a5f1a SHA512 02a8ebd6ec3e4beacb9cf8bde8c760f2f6d4a5871105117a9da7198cdc93e2c65c6075fdf7fe6533d8bb89b0429eef0e170c7a02af154b9ee3b85d98926f9369
+EBUILD kfourinline-18.12.1.ebuild 732 BLAKE2B 90f15fa471ad983e4814a30447be0b2e9cc90ce60a6b3c5045538d4eaf624e6168e7f0aeb4737b0ed2f3dd3aceb8b6097f18f3b1a55992b19b3143ffd55c0718 SHA512 ce2c5af2f750acd13f088799a0e55a4c87f6cfa420ac4a3271c7870b1047ef52c1a1da6664267a5f623cbbf910876d1dd77f19e04d40cf9f0a8439e1716efc98
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-18.12.0.ebuild b/kde-apps/kfourinline/kfourinline-18.12.0.ebuild
deleted file mode 100644
index ace085029e16..000000000000
--- a/kde-apps/kfourinline/kfourinline-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kfourinline/
-	https://games.kde.org/game.php?game=kfourinline
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/kfourinline-18.12.1.ebuild b/kde-apps/kfourinline/kfourinline-18.12.1.ebuild
new file mode 100644
index 000000000000..e11fce16523e
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE four-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kfourinline/
+	https://games.kde.org/game.php?game=kfourinline
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 14defad63c93..e1ba1fe64f8c 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-18.08.3.tar.xz 10932424 BLAKE2B 2ee5d9ba43b45705a260c4ff8a40e367d76a0b7d6fb3ac279fe7140c1e8e079638c44d90467b967eaf81f4cd9af5ce96ea4e77e531ea39b7dcb9c4f093dd774b SHA512 ced01a2aa2c9f4245b9c62f33ada378f032c4f34977cc14e52a1767e9f19e241af980fb5318df3e064f21a71dc0e2318bf4c016f6f5a6ff512c3726f4c9aab9b
-DIST kgeography-18.12.0.tar.xz 11078980 BLAKE2B 9c6b4306fc88522372d0fb823498bbcae5e04cb080001b47ce5bebc8afe1edb431bd756aa7b01747c2f13772cdfe5e1904471462c9ded43e1f8f9f4bbdb23cd7 SHA512 07106264fda9280eed5e8075d29261642c5c13ab2b43062c6df44b2e4c57a3f8801d9eefe80eef6376c25e296d8c44be741f5ff92a62fac6c5757e222aa1bdaa
+DIST kgeography-18.12.1.tar.xz 10828588 BLAKE2B 0ef95ec80c3b2d3c655855e5a2417c21aa1b5f0f0cac40cf6eae19a1af879fac69f10d40031dc21b031655c964189a6f489afe069445339d7a08fea9ebe011ba SHA512 ff2197ebb0550514d6d98ec75d65c375681e2740126263627d4e3806602190cb08bf39cedf1705beea8b08cacd0fe7f1ff57afea5d28b162b2699ef9fdd8ffb3
 EBUILD kgeography-18.08.3.ebuild 740 BLAKE2B ad3feb91ba4b5921b414a3108385c367fa5d4f819e707a1e59b91733147ee4ce3399f71cffa4b0502d81f1b3025888c56cb855e0d48ad087ae96979b146376ff SHA512 3648bbe2593347c8ef44fcca528dfdcf4310bbade428eaf052dadd216528b87ff80f6c4187fbc3d00a89e7ad75017c2f9121531758cf58218b96d953e68c889b
-EBUILD kgeography-18.12.0.ebuild 742 BLAKE2B 7a3e6eee9c5b1ef7b677370c1020c43d8bf6ff18fe37339de81ba12cdeb3c2b83c74ebf7d29cc3ae4c6b9406f82948e7ca5d23b86ae48463eaf4b10b9f9145e6 SHA512 18f35102b6f65d82ceccd3fa18cb240d98ac86443a888e98767caf456644c167e7b515ddedf98745b575bf9784065bcf18d6bddc147596a2fbc2c1f987e6d835
+EBUILD kgeography-18.12.1.ebuild 742 BLAKE2B 5b9ef04028c42e722bcda949b81f65ebfc002363888c148fb42af892c417799337f59ca924b3a357fe611fd667258a0dfe70606a5b8bdb0f09d9708dbcd6e368 SHA512 c86e883bf3a3466b86d92efe88501fc3ada3849e59d74de9c381528d67ab99797b16a6df6111a8e779451dd4f74af88a1f5a2298c7f234dbe171e8bfa7661b9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-18.12.0.ebuild b/kde-apps/kgeography/kgeography-18.12.0.ebuild
deleted file mode 100644
index 8e45af5416a5..000000000000
--- a/kde-apps/kgeography/kgeography-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
-https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-18.12.1.ebuild b/kde-apps/kgeography/kgeography-18.12.1.ebuild
new file mode 100644
index 000000000000..bb51284a2571
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Geography learning tool"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
+https://edu.kde.org/applications/all/kgeography"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 2b38fb3c3324..9a5cb20f86be 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-18.08.3.tar.xz 5212448 BLAKE2B ae2003273c1b1d291beb844173ce7d6b952007aee425136bbf5b9a333c432e1a65f894b750a0482dd7a08d749bd230f2817a246310429ea2967b9bfd12538701 SHA512 48c611522ca1637fa43537c75985dc685228c209ff2703ed5e7544b556710ca7f6f9aa7ccb8dfabc5fbf1089f6e53deb48863f11283f052e69600db272b2f7eb
-DIST kget-18.12.0.tar.xz 5208624 BLAKE2B a3ab01b5a15b08d62516e0a913c2987a1acfd7daf0f88e317cf99ff7c470db083d5b8bdeb51d6865eaa051b897e05719bf28672f1273da2df29fea67cefd1515 SHA512 8e5728666ec5023013761b4e9d992fd8f2a93519d64416ca168b91b5487c01fd56c10c6b740600fa75c03c0dd75ff7489d806ccd6fe490413bebfe52ce985812
+DIST kget-18.12.1.tar.xz 5076944 BLAKE2B f0a1caa24f38bcc65d150dde7073097c29c9ff026794b065d7d8b65c9a0d510121892d7beb882d231f4fb8204d0dff46e71818904b44a0c00b8e269abbccc963 SHA512 329ea452c798097607529c0f9910b9403efd2bbd8eb679415dd0e31561754fe3e9d8fb69ad780c199dfa8a99cb6f16c5758e31e893de75b520d84a76d6d76226
 EBUILD kget-18.08.3.ebuild 1855 BLAKE2B 4877d0f1b65bb12619bb7c64153ee93d442826289d344d401640d77867fc86a5bb2dcb7a95ce4a387b1101d0e0dbde6e4d3b4f7c621d080a78009820ebff81e2 SHA512 21ce60522dc6933fa7a501d0488a32a2b7170488cbe07b62a9d8f2724337e41c340456ef46d63711546df9d8cf6f13da41d3f9b8254bf8837ae59148dda6aa56
-EBUILD kget-18.12.0.ebuild 1810 BLAKE2B 13a546c36265fef30293958171853ddeee4dcb8b58e61d19f0b7d76fa0ee79ad430fcd3adf467037c402470919116279f17dc3cc6a00dea2cf425e810b311d78 SHA512 2138d6068a96869ee008092b069120f1ffbedaba070e43e0520830f4722541a55888e49668145e2c61589ca727760459e6a10cb09a3b52b6d3216f7a6e8009dc
+EBUILD kget-18.12.1.ebuild 1810 BLAKE2B 7c7335ee4256b048e496df91f5daaf3be4ec26e784d0de61f282b4f9169addb8b9e27af3ebbaa5029c9d90bfe84c0c852b6dd76a725c8e4fb74349c26cce4722 SHA512 9119c7a9bde81169c2e65deb24fe35bb63710be1694ab0d652a663f861c949fa3f5887b9d5d87ad9be5c9aae7ad44251db53ce3a93fb26a928502453ea3e08bd
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-18.12.0.ebuild b/kde-apps/kget/kget-18.12.0.ebuild
deleted file mode 100644
index d444477bbaaa..000000000000
--- a/kde-apps/kget/kget-18.12.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="~amd64 ~x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-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 kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( $(add_plasma_dep libkworkspace) )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package kde LibKWorkspace)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kget/kget-18.12.1.ebuild b/kde-apps/kget/kget-18.12.1.ebuild
new file mode 100644
index 000000000000..9490221e3932
--- /dev/null
+++ b/kde-apps/kget/kget-18.12.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced download manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kget/"
+KEYWORDS="~amd64 ~x86"
+IUSE="bittorrent gpg kde mms sqlite"
+
+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 kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	bittorrent? ( net-libs/libktorrent:5 )
+	gpg? ( app-crypt/gpgme[qt5] )
+	kde? ( $(add_plasma_dep libkworkspace) )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bittorrent KF5Torrent)
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package kde LibKWorkspace)
+		$(cmake-utils_use_find_package mms LibMms)
+		$(cmake-utils_use_find_package sqlite Sqlite)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 3aab6f05c10c..9ac2e938536a 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-18.08.3.tar.xz 4409296 BLAKE2B da5ab466cd779355f381a53d8dbe6643b8073c441698a18a782d6e1cb69a906c3ff7f96f878498cdfcdeccdeb77f24d81901e8f216e0dc4090aebd436a08d35e SHA512 42177d168a1f63847e711fbea9c59850e2f0914733550fe5eba8d66a014e7d3593a6565ad163bf8c67ad6fe95f0a5e0305d07717de5d484d13f78998f51d0d59
-DIST kgoldrunner-18.12.0.tar.xz 4409436 BLAKE2B f2e33980e01556b7a5994f7f0d40379f5ac00ee29512b083f1534862fa6f85f680e87840651be1d76d2786a5b393cf6d174ad07b3872ed611cc16f2b9bf1daff SHA512 0019265d86ddfb7e5b1495fdee3f2eb573f0277c46e1d0448f697adec73519a17a3f4f5d2188441a3d399abfd4f8c114d847bed5fc1deeddb712236037601717
+DIST kgoldrunner-18.12.1.tar.xz 4415076 BLAKE2B 3f179e3f9baace3cb2c0f04f78e262c19c950b99e4514dbec51865c2dfa1cf7797c097404af7ea6cfaeb10ddb70e0f843a5a30a9f64cf0e1ee58823840d0dea4 SHA512 cb803a119847499e167f99c55728015c8d3ea4b88e8e21121ae03183580bdd13ffb4c9295b6d271c5862a1b0cea898becb9ad8619aaa443d694e992855a60838
 EBUILD kgoldrunner-18.08.3.ebuild 881 BLAKE2B 0f9997f0f47de8332de97ca2c07f2c5585f415e9ad2a725d3ce103a7a314527aef7db368943814e287f49b29dfc0b7709b2b023eab883308a89ceadc4d920757 SHA512 be28deb727dd3c056496afeb409ced54c12eb504d872c251f573d29ed22fd9298a89f9f2e2ee08807183267bbffafb60ac02baeced1fd6cd75a00a44e8bb6f20
-EBUILD kgoldrunner-18.12.0.ebuild 883 BLAKE2B e419512e3030d7ff611c5d2bd2fc31d3676ef2e328ece83bd2f3addf5e220b64d640abe674c966054c910dfac376010729d8b58d8146c93ee14605fd0f6e6995 SHA512 f2a86f48d135862150d3eac87336da58def9628dbe6fef7f16ffa3a5612adfb9dbc762f2674ca717c9aec2f298b714ca8a4a98f921b3d3193621f8acb51ce814
+EBUILD kgoldrunner-18.12.1.ebuild 883 BLAKE2B 0be9450ecbd859428fd0dc7bfb3e0cf4f5003b41143b63aac436f6e65becb6fda533fa18e1e8d08a2abcb6fd8ddde781dac226c1785bdc26d257ae879529f598 SHA512 062ba26f26eb2fea559e22c90b63d3fae079e70306fe7e620b766b91324ed4cf2594ae66cda4f5fcc9c48c35a3a08b1a9512e9f3b6b95a37bd37b53c4fd784e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.12.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.12.0.ebuild
deleted file mode 100644
index caee6127a924..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kgoldrunner/
-	https://games.kde.org/game.php?game=kgoldrunner
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-	$(add_qt_dep qtsvg)
-"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.12.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.12.1.ebuild
new file mode 100644
index 000000000000..4cd4997b3657
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kgoldrunner/
+	https://games.kde.org/game.php?game=kgoldrunner
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+	$(add_qt_dep qtsvg)
+"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 270b298c770d..4dc3fa766e39 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-18.08.3.tar.xz 2857468 BLAKE2B 9bd5f6808a9ee882b83b44544b01998f542f64fda0a318d8e17064cec173baf33a5311ed92372468049b5d2b42b8319f8a56ab597bf98df33587eef571192c7d SHA512 0726e9f3c4a5ae460123ad361e09e06b5eeb4fd4255645e65e65fcde608664becfb1a5c0499b39a0c32de83a531adb4eb14f9c770ac587fd2a5a95f3fe8a215a
-DIST kgpg-18.12.0.tar.xz 2855872 BLAKE2B fe12a0866bc66844320b98e6e3a9e6385e7c534a878b57552bc455fa7056bb47675a8698bf1412ec6fe7f273544af7ab19c514daf4e4ba1a209c3a658668e87e SHA512 b05c1e9d67f02550685b1b44c8cb911a5e1a73b62702c9df05e67c271f9cb7ae4953e4d42d40040ad1fb4ea516b5591f635618a296fa0054fa9716f66d7fe669
+DIST kgpg-18.12.1.tar.xz 2880716 BLAKE2B b421b92abff83ca25937e0dccf16448c99047f2672d094f3f1bd9916aba9064880fb819516be18cb97e6b551febe5fee36c12d52fcda8b4b454d646618f3d8e0 SHA512 01436ff8a3da1e1d170afefde3fb8e499c3f2f3e33de069a3949bc79c4a82a9dd8b3b5bec6c297978aa1ac4aff14bf815b7041c711ee6d9f204829dcdbd512ea
 EBUILD kgpg-18.08.3.ebuild 1273 BLAKE2B 252dd7f6e2173b7ad61df6ef990a94acd2b01c503ce3dd638b617cdec724b5bd53198cb16654579b22fe90268b97cf729e4a079377073fc7ce524e570a8fa105 SHA512 c1ea73a96503d94e83b8e47b9edd607ca4e5d8843751733da1ae6c462b4836178ca2e52bc5be9d714c427728c592ec1600ae886b8a62b548db557e6408b95aa1
-EBUILD kgpg-18.12.0.ebuild 1275 BLAKE2B e5e27b8e0e78fce5cce4275c004f04e83529cb08db57423721b320dee7106e7778c04a96228aca42173f0f68c3e1eebd5c5f7aa98df2633cfb95c15fd6f8cc60 SHA512 eeadb86f5c4c0f21c87646a75c1b3da88df68213ce4864f2210c8c6283802da5252c9e59975aeb1c565c169b674a8cc22ff94f880ee52d3fbe3c4f7d8595a8a4
+EBUILD kgpg-18.12.1.ebuild 1275 BLAKE2B a13360b675bdf2d1affb9105cd03a9b1657272b3561d72557ba46978cce75dc7fe2cf2734b5ded4c8285459cecee476114553b6c3c2eace6a7f4a16142ca9a4b SHA512 5331b461f866d54724fe1075f85edb4202b02e050079d45521908fbbb15a619b52bfb60cf75b6d2a3e6c06356aaf5332a7cb10ac5e4ada6da2eae2a0bc2e3ef0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-18.12.0.ebuild b/kde-apps/kgpg/kgpg-18.12.0.ebuild
deleted file mode 100644
index d3d800f21a29..000000000000
--- a/kde-apps/kgpg/kgpg-18.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(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 kcontacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-18.12.1.ebuild b/kde-apps/kgpg/kgpg-18.12.1.ebuild
new file mode 100644
index 000000000000..0fec5fe18e91
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-18.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde5
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(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 kcontacts)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index c4c045eced40..2dcd202bbb3c 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-18.08.3.tar.xz 7266880 BLAKE2B 642329b0e0773e17ed06785397d1565a861b36137faa33d716d354a6be58ac5e006018c503ea49902fd27dc511f7ff038a9f8151eea9ad21767542c62e42becb SHA512 276f2a532bc8b434fc2bfbd924a6dd58832f21106898af102243b6673090ab088cc9e1409dc50046bab7fbc552407738ae8e052a7b5282070e0cc8b8162f3b9a
-DIST khangman-18.12.0.tar.xz 7267432 BLAKE2B a01fcdb418e14fbdba29fe775bd293964110db6df3edc23caa6458c1ef5b6fc34d0267b1d513a4e1a22b50286e4ea2ba6e5cc2436cca1c58e3bb3d44d0fcc1eb SHA512 59905c937e50fdcb0bcc26d20624aefb6715891e5e0658aebcd8f4d8b7ccbda5ab0c1d88f9a8a0291740e1a72dfe285ed96a85840e19171318345cb2501cd054
+DIST khangman-18.12.1.tar.xz 7115664 BLAKE2B 7e5bdd5fd435114f614ed9bcdb338c97d82ee27dfef11fd99f9fbdbe60cf29a979e663559aeba7a52d5daa93c90390e8db53efb036bcecbc02580900398dffa7 SHA512 825eba948777e1f48f3a7cff3505e322116945fb9c79ed2ec8850a0564fc06f183bfa77f9189a8fb46bc3d1aaf7390ea9296148de7342da4fe25a9f6ac106346
 EBUILD khangman-18.08.3.ebuild 1037 BLAKE2B 757dc64e6f7d3b6247a9c240bdb3e66971ead31b1ea3732d4126f6bfd9ec80bdce39bdc2262535a300e66a6d07c4532d1641134d83b14decec31a9d2c87303b9 SHA512 e0124972ad1a64dcdd6abdf1a99fcfd98b3c2aadcbfddd3492962636e94b48872eea4e9dd7db9a0ed62c2ecd0756950b60c50ddf99ce3d4fce7b719ee8d05d3a
-EBUILD khangman-18.12.0.ebuild 1039 BLAKE2B 5aaaf1c68894c7e321be18a23578a78b826ab6e9aa91b4ca37237b6acb1d80484cb50c40366bb1661bbcf8f65dfe128cc473113fdd0955253e9deaf7b92d01e1 SHA512 5c2e88d88a03357708dd6e2767a80f99f248a19acd298f4655a0e7af937f7d6a5c2c4f3f4a5c17a25de594d63975b7db26b8f4b3814d195ca58153cb4dbb893f
+EBUILD khangman-18.12.1.ebuild 1039 BLAKE2B 3a2b41891ca7eb4a09d1edfc575e598c11b586060d46ba95239b53b9f926880df254eafe8feed0ee5aa692a6b91fd2e2b82b4f7dd7e8bff27f79385be7bdfddb SHA512 5f52368ed8761dab8ffb0bc91705800aaf7e2d51d7ac68982ae8d8e345e9bbaaf809b42fbcf960422a7aaa052d8dd76d5e489bec7b6cd879c58d5feb55bc37eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-18.12.0.ebuild b/kde-apps/khangman/khangman-18.12.0.ebuild
deleted file mode 100644
index a780506caecd..000000000000
--- a/kde-apps/khangman/khangman-18.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://www.kde.org/applications/education/khangman
-https://edu.kde.org/khangman/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtquickcontrols)
-"
diff --git a/kde-apps/khangman/khangman-18.12.1.ebuild b/kde-apps/khangman/khangman-18.12.1.ebuild
new file mode 100644
index 000000000000..69e3be0597f2
--- /dev/null
+++ b/kde-apps/khangman/khangman-18.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Classical hangman game by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/khangman
+https://edu.kde.org/khangman/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtquickcontrols)
+"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 5d753b810cae..0550af0d76cb 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-18.08.3.tar.xz 3841588 BLAKE2B 998c9490d9bcd46c404104cfce4f06e27e50dda7c361b7cdf6ad5f2ae76c06852958e74434315201c321146fbb8c2be80bbc10d0798d7bbc03de201351d0d4c5 SHA512 4d117bf1c7615d1767bc00a5c8c3cc13f7a9a981414feb9e960ceaea264b1e8ef78fca610d19649089c3571dc9d8e70321e387c98a7186ce343817cf6b040bff
-DIST khelpcenter-18.12.0.tar.xz 3843276 BLAKE2B 72d5ad163aab6eedab67c1befcf5aa4190edb4a30eda83da1c706ec2505566a2582a4a8d736d5c65336a2b62417fd323a081e54f5a0f9d9d0a008c41cb792dcc SHA512 e0a52ec249ea62cea102e1fda9addcc9861f1e9bd0f8a0ccb98e19aecc2ec6e9e502fb10181860b754d1a6862e6b92450aa56924401c6ba1b09d9e12ae0bedfb
+DIST khelpcenter-18.12.1.tar.xz 3843344 BLAKE2B abf9f9f125ca559facdc80adf6c17e130089023694b6516d5fc3e4b1ee7a1aad1f9db3cafb41d59d793e561746a85d9f1b8dff878ecd66efddf5f587c5336af7 SHA512 6939d46f4b3636800f22fd01f66fb9de2a42fae5d242f1cf11b5c58c8f99fd64b9180c2ba5bbf7096253fe8768b0ea85cf9f03345fb952d89517e3edb4bda99f
 EBUILD khelpcenter-18.08.3.ebuild 1071 BLAKE2B c8e46c60313368fd2baab867da1319281e6f9e99a113d5fbc71b7c075ae45609729afeaf069cfed23b25aa2d95875dcc530dac84ad4db96d69bfdc7ab94a7ed3 SHA512 47184dbc90cde8a1937469a6fc35b41e62296991d6acad12516237518e402393aba2a184ef3bbefd42341bd9a97592970e521a4917122c6219ea3dfbb6fb355e
-EBUILD khelpcenter-18.12.0.ebuild 1073 BLAKE2B e77ae6312c8d6b3afa370f82152cc4d7116cee163354c7a4b42377a285f30a145e1a58871bdc6d01cfba11c0e0135df1ea6588dc4dfabbdb08a05bcc64df77e9 SHA512 5d730f094d42b59bbd0507cd6a57a49d1af2f9f61ccd7e8332fad52ba2166b50a6b7572926becb4a834296cee4e87441652f162bb1c46a2d3f6742b26c2401b5
+EBUILD khelpcenter-18.12.1.ebuild 1073 BLAKE2B 67e3900df62b897552305932f05e84de317b94684261f4493de2a08385ae591edcd3b350da86083fdf9c5999f2e2e65fd3be238031a8b1a5fd94556f7006097d SHA512 a86393087a07afe015b0a595a521baff1666b9cee2c280061b64edaf1d8bc4d14b92a477eb90feb55c4a2a5926a63c9f823f3710a8dd406636ba40818da530bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-18.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-18.12.0.ebuild
deleted file mode 100644
index de27ff250f73..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-18.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(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 kdoctools)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(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)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-apps/khelpcenter/khelpcenter-18.12.1.ebuild b/kde-apps/khelpcenter/khelpcenter-18.12.1.ebuild
new file mode 100644
index 000000000000..84a8c55b2fa7
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-18.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(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 kdoctools)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(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)
+	dev-libs/grantlee:5
+	dev-libs/libxml2
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index f278983b5c61..5e64b6a5cd65 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-18.08.3.tar.xz 148184 BLAKE2B bd1f04bd21b150728450213757966743d00d4bebffd91db129225de6a940bb0b9e06507c4f97ccb8091fa94b30aa14f071ee29c0ba60845613dd473a355071e5 SHA512 efb705349c396a1f426d0eefab02e86e5a33e4d1f76d36b1632e8c18de3e586eee2f4d01c6a527e2ed676964b73318780def591305357bfbd87716a5c70699b0
-DIST kidentitymanagement-18.12.0.tar.xz 148540 BLAKE2B ae88304cd8ba39646154aca3fed7aba72ed592affc49b0065ceff910afe8ffc036361f8343d85e7efdae7cfd39691cf723ef4d2faafbc26995d16b38f74124e9 SHA512 0bc981fece6499eaa4ed8dbc7913c48a489a81e2746711964101462718cbfec863f80d012142f73850f85c313307472885d7ac1538836bdff33d75efb8630fe8
+DIST kidentitymanagement-18.12.1.tar.xz 148688 BLAKE2B 6ec994793164fca827c533c352baf181f1da87bbee72ebc3a8ae7cccd3c5be323549feeb7178021cbeb1e08e908b430d3f11d90142801be0b10cdb43bb182654 SHA512 b734b1906845b6c4d5bf26ac55f1321cae671d3176f4016b8a2fd8178c55bd394335a7043c3650017237a0d1ced954f3aa3f35f158521b9650d8b3ea69477658
 EBUILD kidentitymanagement-18.08.3.ebuild 765 BLAKE2B d00b081081a47c838d6f1a0b78a96c4c41dd06baa841855bf3ce3e1ecd97b1cf7ce9b7b3065c22bf9837a9702d2ffe9611bb1db73e62b4042ce28651b1625b29 SHA512 27bfeb417e9d79e4097347a498aacf0c6b65d1e51639e8bef7470338db6ee7757316530645bc7c1a4dc968ae4d06ab2a7c943caf1e3d7c934078e2d6173f05d6
-EBUILD kidentitymanagement-18.12.0.ebuild 767 BLAKE2B d0909c28d4601d42be15839f68120bebb0e797dc3c5b19bb943a4a529311787084b32531edea8568c10a5e5d70db9db9718a2682bafb7caa3573e054afc7bba2 SHA512 f2b6361919ac349a1a750e95044d7217aeec69f5ff66392a0df8c9704b96b6eee7e7daa2432bcc09813879ed2c3ffbfdcf000f59234be2d132a40035b2332767
+EBUILD kidentitymanagement-18.12.1.ebuild 767 BLAKE2B 631db8d596687dac4442c4407e3b0c061719b86c8e847d1407128a20e094f297db1fdca3e990d1470764e28aafc82aba2fc595dd7adee77ceb69a2d615f3f4b8 SHA512 6fa25b68b9a90ac4ad919403e188e603ce3678f120c3f10f6eb489252a37fb4dc4b727291e6bbabfd7d9828770b72eef8545a7516bda104a8cc95e9b1f6c6865
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.12.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.12.0.ebuild
deleted file mode 100644
index 3c17725c9d10..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for managing identitites"
-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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.12.1.ebuild
new file mode 100644
index 000000000000..2434d645c511
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for managing identitites"
+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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 42fa6e9082ef..e10ce9b29ba1 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-18.08.3.tar.xz 3596736 BLAKE2B 68397898b47c9e0d2d7fb589612759fee7b330d76260517ac9cd2baf81f1326ae9ec52d68b5f9c7579eee817e639ec52adcb63240cc9b9aa3438d8bfbaefb1fe SHA512 c85a109e628bf129f859ff3577e1b57284a5424266769e807abcd65f3198c041a3ab11ef274fd4f45636d77be070141a496a5227e176f04b8e8a186a966049ff
-DIST kig-18.12.0.tar.xz 3498592 BLAKE2B ae020ce5e1277ce36c43e9fd13810b37081d37ee220bab303cd2dcbc2e6fab9fe9a91c18595102c60c0132c5b398338d91f4e4dccbe31b2280a3f79e655ab08d SHA512 16905ab1da3f5b33df969467da5428183e29c22e2d35b9d0606ac4a170363f2f172ab45c1969100847852420ed786967c12cc3f36e29537fea2aeb9301d411c5
+DIST kig-18.12.1.tar.xz 3498588 BLAKE2B 305dc60ad932c50ae3a42b0bd1f701388d4295cce7b2020ca29a6b731f85489750da6362930d61be17d38025b48dda7defae516bac10bad9cecd26b4a9caa63f SHA512 ced987ad076c7795d967e7798662703bcb078a7382ece51cd867b9e1db9379ebef23ebebc598948cc40383469febef2c4744f0887d163937b73df407dd7bd11a
 EBUILD kig-18.08.3.ebuild 1497 BLAKE2B 36c9dc8e582df77c71cd83f7dc5abc78864d3cfa4e204dc9667693c358370ee03c1bf60495b65a54af14442782131c42fe0a06cf4718b4ec0e33c70976aedc4b SHA512 5f6afd60459a20090c2a5104448a18a2d959f935efb76c097e8cec8295c6c9f861ad15228a5f0803dfc936b35867569ef95534060341043c5345307eed79feb0
-EBUILD kig-18.12.0.ebuild 1499 BLAKE2B d1d57c75b2f2728d080c37eca45cef0d1c35ad22591558b244c223489adc84126a6be818bec9a2598041269f3b36bb1bff55dde495b016997e5ca36d3eabc246 SHA512 c2b82a7bcd2c5bf0152bffa108dc9397050913e46465fd05a13593f0d8362cb670ac0e5e2ac78893ba28862a802c699b11a99baa1d846aee35ed0c0d9193df0b
+EBUILD kig-18.12.1.ebuild 1499 BLAKE2B ebaa17008ba6bf6c0515b3ead5167ad366b95c48748381c6710a669eb0463b1cf7ea3d1285d084e47c689bed92404fc42926632ca28641f24aca225b354fcff6 SHA512 8d6da5839ee4cdde8e0ef3fd430a7affd0c5c989ca1c51a32355951aae1c2dd62939f07a78fdd91cf0c6374e328b22f1ddd071e94f6dccace097ff07da304e29
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-18.12.0.ebuild b/kde-apps/kig/kig-18.12.0.ebuild
deleted file mode 100644
index 4b0627e87696..000000000000
--- a/kde-apps/kig/kig-18.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig/"
-KEYWORDS="~amd64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(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 kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	geogebra? ( $(add_qt_dep qtxmlpatterns) )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktexteditor)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kig/kig-18.12.1.ebuild b/kde-apps/kig/kig-18.12.1.ebuild
new file mode 100644
index 000000000000..4531ee416a0b
--- /dev/null
+++ b/kde-apps/kig/kig-18.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig/"
+KEYWORDS="~amd64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(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 kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	geogebra? ( $(add_qt_dep qtxmlpatterns) )
+	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktexteditor)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake-utils_use_find_package scripting BoostPython)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index f6280e1afcbc..faa293d3ed40 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +1,5 @@
 DIST kigo-18.08.3.tar.xz 5224376 BLAKE2B 5debe372a9d817380d700c1eeea7700010b97bf693fb6cd79aa5ff5c4d853ef7041a654feff675b8a826e023e32e037cd9e5be99dfba695c7c867a606f67eace SHA512 b8df9f0e9a0a3d193102889c0be0e07e93192aa9622d1909b6d2d47be5279b898cb6e7d7bbe4239270d774a9dabccff3bb5291426eb0228ddfe41b923ae42f93
-DIST kigo-18.12.0.tar.xz 5223956 BLAKE2B ef1f1090ff09bb203f818bdfe8113a72a5d8a6af120fffffb8a3ca913b982d719db8fb0b46709b44a58713c953da9095fab4f28b179b268b309a9f36a29eae23 SHA512 1ea9ec7aad131c9c6178488c7deb93efceffb2f5bf7512747ee43f783e8ed875ea0bd06f7e933d00ef901e32ad2c36267186783660505fa7328bd7fbf4d50060
+DIST kigo-18.12.1.tar.xz 5224212 BLAKE2B 428405221e441ad9fb19f09f1c4a13d6d99f31fa69ce3fb859321677885a69960547da13657d05361149bcea91de40b6ed10e902f836cfa434e011db999babe0 SHA512 7c81a700d115eb1f398a8d24a7e3a6ccc06b5e8673a9544bb9b1de6e7a90840d5cce6f67886f2a1c54c4bf132ae78e6ed5afa3635c0befa966b190a382b6b51c
 EBUILD kigo-18.08.3.ebuild 850 BLAKE2B 316b3ad5297e525a8e7a30df1f7b9c63fbc883eeb91dc93b834b64f5040ad18e2484478c6da5f6eed7b201eb7f2cf81a502480b252ed518c42dcef274ebb06ca SHA512 1fed920d3f259cfe6bf4a3dd077b18f8e468de7e10ee2f3732e08423db0c13be4e65bc25132e8c1274fce15c2decb2ea6012505c1c00059e1b1ea3fefa9ae04a
-EBUILD kigo-18.12.0.ebuild 852 BLAKE2B 40d74f8d077ef174e92532a58e62134bce739a23212505454e834e2b3d0043e3cedb1a2d48157984af16c5311d001a06a3d8f1af0b342a38f7f55d802ed12d1d SHA512 c6510f2fec8c92072dc9eeb1b1d0a669f4577025e59166b07851eeb84a815bb017283a0a6720e80468fe200edd5ddc69d4511e165424ccfe186560cdf3674d36
+EBUILD kigo-18.12.1.ebuild 852 BLAKE2B 22780592e8f568e4cbdc710b3043eab2542e9b23960ba39d3378dd7a05c2597f169827a326a40607018d9f29120219102989bafd42db5bf2349de5e22cf147bf SHA512 6e7ef494ec4291d6993cfd42b582d6ddaa9d1b10a7b5f34a69a7f32755f412de94b5e84e8596ac06adf03acb67bcf0761cc710211209d2d952aac4e54159e1f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-18.12.0.ebuild b/kde-apps/kigo/kigo-18.12.0.ebuild
deleted file mode 100644
index 09bfb89a580d..000000000000
--- a/kde-apps/kigo/kigo-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-	games-board/gnugo
-"
diff --git a/kde-apps/kigo/kigo-18.12.1.ebuild b/kde-apps/kigo/kigo-18.12.1.ebuild
new file mode 100644
index 000000000000..29fe77cff42e
--- /dev/null
+++ b/kde-apps/kigo/kigo-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kigo/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+	games-board/gnugo
+"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 983097b09f71..aeb369c966ab 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-18.08.3.tar.xz 1165152 BLAKE2B 6214132a5e021a1ba0cb401e6b2329fcffb27b4a1c8496849a27efa4357bd8026ae939ec0763dda580eae590e93b60f4cf18938d654db46f8654404c836d4a59 SHA512 6acbac422208b36dd2c780438923e599a5065862c4b810cc302c1c55a70321c4cc297b4266409fba388d9fd1f380478b8e6c6fa118a0e129450aad09250a40bb
-DIST killbots-18.12.0.tar.xz 1165020 BLAKE2B 23e167b034ee4438b461d15984e0c8b9f697056f832835eaad3387fc44216cc903f8d5355ead04980d5f6bf94628eb04e2d079e6a009efe89b2f623e76d21cf3 SHA512 bec41d42e0263743c66b03792cf62432ffaf48595a2a812a3dad989c9afea15da85063321d82a2fc48942df5516e0486a2923e18af5932000d36b5162f724f31
+DIST killbots-18.12.1.tar.xz 1165004 BLAKE2B c01d5865f4d18f13871154016dc28fbf8e716e942499dfc514d56ef0ce94d78fa0fce24383d4d9b002ce7348a21ee7216b1d2f3925baac4e669be8675fa447a0 SHA512 3dd8679d4134dce65495c4120294de5f8cf2139886d9f1eac8b0c9e94cc3601ee5143ed4ec9c2503fdd55e5fa7e7801c318bf6697d9d9da7062c3c6c8a65ea8f
 EBUILD killbots-18.08.3.ebuild 712 BLAKE2B ba9af94e48b7e5c73591d5a2c066a2383f1ecc029f82647ba4fb7224d790c91f87b3d96a033021f15481fbca87716e6b076c1df75952f620a3c612de7b416ae5 SHA512 f735d831414cef444e31bf8d8b470fecf1a0772207ba6d1370d5aebfc9313db689284e4d41be001ca8e2a9761b9b9de07de5fe340cfdcd9475f03b31cfdd7661
-EBUILD killbots-18.12.0.ebuild 714 BLAKE2B 7227670f6c0eb44c35e0eadc038834101eb91b00e622f0b811705fcf3407cf6b408484df8b32f99521e97eb33582f87672097fe2871d8daf1e59bed4b90d77fd SHA512 86c90b90b3b51a5ba4b3595a06e12cf560f2bd78aceca0876f85945aae8dbadc14279d17388fe3e8ecee990b2ac3579293aab3b6685aa6cae1d94d89d7859537
+EBUILD killbots-18.12.1.ebuild 714 BLAKE2B 67fb8c61c6c77813853a52460e49cffa5fea3b27549a4e6985d00412ef572e030ff1126f3e334f24a7304c8c2b180d4630324488c1dffe4c653116dd979efd03 SHA512 3326bb9feef1b9f69a92ce7378003329cdcd4d193d55e292ecf7ff5b8a6ec4daa8eba612f4f7c3744292ba2a51eccfd777586091f9ccb5a61337e68a1d6bd94a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-18.12.0.ebuild b/kde-apps/killbots/killbots-18.12.0.ebuild
deleted file mode 100644
index 8e9b868cd539..000000000000
--- a/kde-apps/killbots/killbots-18.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/killbots/killbots-18.12.1.ebuild b/kde-apps/killbots/killbots-18.12.1.ebuild
new file mode 100644
index 000000000000..651d467c8885
--- /dev/null
+++ b/kde-apps/killbots/killbots-18.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Kill the bots or they kill you!"
+HOMEPAGE="https://www.kde.org/applications/games/killbots/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index b5c6a59d9ed3..6bf746df8251 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-18.08.3.tar.xz 1057028 BLAKE2B 342c9a10b0470b56f67d4aa83196971b9e38428c27005ceb3ab1c110e8fd78b8d362b2f6b833d95832f7e4e67376bcf409d15f45e5c0fe7d6fc93765e1f4cab6 SHA512 e7ac4accaae74c7367f41226953e76204ba70baae8735de1c822b0f13703e3d3dc5691e9bf5f3f598d4e2f5856f43f167451645149eacff932e4073e7e76db97
-DIST kimagemapeditor-18.12.0.tar.xz 1070712 BLAKE2B 15a7257d874490525d1b18b4cbc45cd45c3e19ff5c6d5f8fc30378e76e8a7709b27152c06e1db506261d63d6a326cd9169b3244179f091961045c1fb726674cb SHA512 ca76c9f3f9287f962ddfcd315b3db31cb1738c7bcfee16db1bdf546f28b79252f87e1a863a9038319302a7dd7e54d5d39345dc8d0621b51740498dec82eb424e
+DIST kimagemapeditor-18.12.1.tar.xz 1070696 BLAKE2B 6f62d9152d99179dc360db50e880ce70ea5c961c6f42d1b143b299b7ec5b31103ecb358e7ff7bf0070422d953a9f90ca87d5e5174e850e6dac29646050a569c3 SHA512 0db7255b875b58b7354c56a48d3c6ea76ec5bff2151c5a6be9caff1b27279a78a9e837d9cfe8ce6645d078341d24e816a2361a0e515a2efdd61855b666e9a0c6
 EBUILD kimagemapeditor-18.08.3.ebuild 800 BLAKE2B f6f2153228a810f96a56f97a5a990129505f19a0a5310e94043c4f6f0373675335bcd9c0452e407ed28def39091b306b2b0835490f229e6df1f1cbc63fef07fb SHA512 549ac98170cc08aeee5e0bbbae45d680666a20463269fc55377fe7620d8b8da2f28166140366f0ada9608de695c27b2c31534a199da8c7221d8b3c6f2de3a25a
-EBUILD kimagemapeditor-18.12.0.ebuild 802 BLAKE2B 8007ca2f632f2720faedc2140c2dc431ccc1b1ccebebabe6ce8204ee27e062fca46a5d6010183d9a3ce4ddc3dee95ef5a8c7070cd010950288f5291e6601b81a SHA512 90733b8a8a08432151015b3337ae4d144d5a3d61928623ab74d4516596924681d2cf29716f37582d969eac7b37e9217e9fbfc4ad951e1034290d9573d5386dd3
+EBUILD kimagemapeditor-18.12.1.ebuild 802 BLAKE2B 0c761bc97ed29cee6fa0a576c459e140e1e3f4dab9473353a8037b89f447cda9fa4b774f3d53959e916f35dffacb70f2b0a300e6cc313601c64636f69a1db80d SHA512 336a025108d8d9e3e742c7227b3380a3ac05e9a2ef913203d224888d30bd72e146f863471b505108f2422383c763aec811d03d807ad3a1fdb51c0433f0093267
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.12.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.12.0.ebuild
deleted file mode 100644
index 1b577dc05ee2..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.12.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.12.1.ebuild
new file mode 100644
index 000000000000..9eb5f33c37ed
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Generator of HTML image maps"
+HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index d1da37a11cbf..a54dac0f7a30 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-18.08.3.tar.xz 119920 BLAKE2B 92058a8789166fc0943c177f69e268f558485d04293de6d65bb411861a398487e3270370af86e243f9ce73ed25a603d15806ba42ad86f203ac56c02096821b26 SHA512 d18b0fa29fa7a6170e668831a860aa1d6a9fb3e0d1621a81009b7e1b87b88c2283164c1a4013dff32ccb8fc58fb0515f8f9f3a092d128f2281ade17928c5d649
-DIST kimap-18.12.0.tar.xz 119616 BLAKE2B 0fd6023dfa46d75f2c91a872d274198eaef2ee9b182a6d0214cd47667ccf631055cc4b92d5cfa86959e23cdea949c079292096cecf95eafaa9fddbe147dcb093 SHA512 ca1590e54477c87585af248cb166439fd3adfdaa31feb308717bd478c6c4abcae3fae5fd0cc0f2bc316baf3ff37895ed27892a428b7ffe6631f03467cbc5f374
+DIST kimap-18.12.1.tar.xz 119560 BLAKE2B 2df3351c74564b79e209b94903a0ac09236ad0f2c6acb313d46817ebd09f0a76fe82b7d3dbd6ee204974bc24a819cc9b097b6379e0f3b1113c41d4a051db6ae7 SHA512 4784e50c01a520e7c7eec8e5b2c2841fa13da5cfb68b3ff44c1b9f454b565893cd067500fb289d2a28bf3e1206a6d72555eb0de78cc5cb44d8aff69d40abceec
 EBUILD kimap-18.08.3.ebuild 718 BLAKE2B e01cb7ebc971374bb8dfa3ee68007071f2485af5e54e7ffe9fa6bd360ea89c592d271f934c8c49ad0e010326decf22b90a99d2ce86def2a113cdf52b564f3e2d SHA512 05c3b1c45585a370c32230f851dee78b68c50f0c1e3065038a07adc722064242abda76a42cf0cc0a4ed9b32875c10eee965926b7815c0b7e6f0a8a1741e1ba6a
-EBUILD kimap-18.12.0.ebuild 720 BLAKE2B ceacb56e392be478fdea694373ef742d85b29c563201eb006cef0b5a3bdc760b7be2a727efcc37b5389223ca9fa97d08fc5ea58d64d88ae663005d68d6831d34 SHA512 d16ab23f11467af9895fcd125b717fba0174771ccffbf4618968ded5ddc9e3c3a34a4986640255039db594b30dbeea71d5eb4ab3b4044e8d7c3112a06a141f79
+EBUILD kimap-18.12.1.ebuild 720 BLAKE2B df4d1ec1683b115ac9cf2c352e55de02b46aa35eb9c12daeb2468029669f95fce49d3cb0beaa8db1b8959a387f1b327d368d6265300380bfb23adb8caae46b85 SHA512 7daa355d25c356673fd8dd3f70a9239c9b81b635a7e65a81542a7639a5790af0b2a41355a8662bb5e4772bc86590ebba78274aebf1bb3d4754abadee5e276933
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-18.12.0.ebuild b/kde-apps/kimap/kimap-18.12.0.ebuild
deleted file mode 100644
index dfd5dd064f0c..000000000000
--- a/kde-apps/kimap/kimap-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for interacting with IMAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: Convince upstream not to install stuff with tests
-CDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${CDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-RDEPEND="${CDEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/kimap/kimap-18.12.1.ebuild b/kde-apps/kimap/kimap-18.12.1.ebuild
new file mode 100644
index 000000000000..6077f0c80cb8
--- /dev/null
+++ b/kde-apps/kimap/kimap-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: Convince upstream not to install stuff with tests
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${CDEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 1d75cec14576..045575e27e3e 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,6 @@
 DIST kio-extras-18.08.3-sftp-18.11.80.patch.tar.xz 31376 BLAKE2B d4b44ec4c76309737a417d6bc930c360a0078f743cca96b1b12f164916e0596e0d29bf5d379e1896ffbea94962f2eb61d2b02b8f21000d3bfd75efe0fd55faa2 SHA512 15b43c2b73189db72e7d5b84eee5727ead49482d3d454591d5338b5dee876c751fad16fa76f3697b8ec2070d2bc2f89eec05e6de1ee402272d65aafe4464990c
 DIST kio-extras-18.08.3.tar.xz 552044 BLAKE2B 22f6662a1c45ab80f217c9f2611f0ca33500897c31d8cb8d29949a00500301f1f72219baf17ab73011037e4e1c9cd85d5247692361dcf0ccbf5aed1d829ab922 SHA512 f79ab19abedd47baeffea4b1e99acc21611c9d435f0de14751594c97c373eaa493da07fd5d754b1f62f696e4f445b493861566845794d6d32e63e0354189d726
-DIST kio-extras-18.12.0.tar.xz 561848 BLAKE2B a667286be332214b6c99896329b3c159bb90459c87b817911daa5cdeecba00dccba57e34e97b6b13c1a635de99691a1e94044efe22dba7f990e6983d5f413681 SHA512 872c95894b703e2024bffeb41a33b09b1e5512e4b69418db08719811b6ee18a7e73ffe064753c80810a476651cd5e66e2af4c75516dc311e924623fd6b4fe87c
+DIST kio-extras-18.12.1.tar.xz 561768 BLAKE2B a57a6a3c539eca5cddf6fbf54cd0282c48f6359540443c3b226c908d59024caa622d9fbd29fb3785f133b26d8c73dcb770850083b559d08ad51fc7d1d3b282b9 SHA512 6546dde9b0c34f298bf400071cff47dcdd43b006a31203d03fdb9144b71489543b30a1aa178195d9c144237eb5837ff5848b1534f63fed12a22883c9d0aa7b05
 EBUILD kio-extras-18.08.3-r1.ebuild 2292 BLAKE2B ffedf40ae1af2c3d104cb2b442071f3827e0fb208527e49926c82ea96892c241df2d36ccea6e974729c3fe7ae6da621121bd4621dc9449beb6dfa9095a452893 SHA512 9bd5f965497615da163d39d09a7ceb11ee14f2a0079ef54abd6999db2e4ccca8b6ab6ba690b8c4dfb78fdbeb09cd38f86cdd1ff7556de6b8d39d6d135620d675
-EBUILD kio-extras-18.12.0.ebuild 2104 BLAKE2B 916f75cd337c215555f0ae607948940697dc4aaa5e35f87e13d2a36b09072688474af7b4ace1dffb82762a5fa6abc1948296d3ebd6a79bef449136c49abb5689 SHA512 a546bc5d4283cd60c28def063908238497b6f60b8c72c9fad6581a5d1f8638b48e923fa4819eae3e26adfa5dbdb6bcf06d49cfca122858220e368d6b5c8e21a0
+EBUILD kio-extras-18.12.1.ebuild 2104 BLAKE2B 9aecf2c02d88cd464edfe189282ce93aa67c7cdc0b35ba91c7a340fe7ca28e139d15269740370e1cc870cd1b10cb2925536a63015ae72a5c94f359b31b643c1c SHA512 5cf866580fcabbae3032e40d587c727c5b6dc5d467e6a36fbffdf1b0e15341c5a3dc20485a07ff800aceb765da4ad11d3c8c6a66cc56e9e7612b0a7bf13f9c08
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-18.12.0.ebuild b/kde-apps/kio-extras/kio-extras-18.12.0.ebuild
deleted file mode 100644
index 823d7137fa77..000000000000
--- a/kde-apps/kio-extras/kio-extras-18.12.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="activities +man mtp openexr phonon samba +sftp taglib"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? (
-		$(add_frameworks_dep kactivities)
-		$(add_qt_dep qtsql)
-	)
-	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-	man? ( dev-util/gperf )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp libssh)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-18.12.1.ebuild b/kde-apps/kio-extras/kio-extras-18.12.1.ebuild
new file mode 100644
index 000000000000..ab1a87e9374c
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-18.12.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://cgit.kde.org/kio-extras.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="activities +man mtp openexr phonon samba +sftp taglib"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	activities? (
+		$(add_frameworks_dep kactivities)
+		$(add_qt_dep qtsql)
+	)
+	man? ( $(add_frameworks_dep khtml) )
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	samba? ( net-fs/samba[client] )
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	man? ( dev-util/gperf )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package man Gperf)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba Samba)
+		$(cmake-utils_use_find_package sftp libssh)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index a5be5c91027c..06e80f1f9804 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-18.08.3.tar.xz 371704 BLAKE2B 42cd40edfb7b05ffa06437eb87d4be7f011769cd8b645b5b175f91c3c94ecbe52374ee650492d960c861eddf6ef98117da7c3ed83015e1cc9ea51093e2f47762 SHA512 df09b4603ac4023fdb245488d82937c896545aa6201ff17d297b42e679ebdf2009f42984f5e63961252cda60e4ec53965b92eb7a383315e016fa622ce9b93ff0
-DIST kiriki-18.12.0.tar.xz 371732 BLAKE2B 8e03c2f9b1f6a8fa282caca4d6d71d520d97b64a4cdde8bf7a90b7682482f19b208f90ca3d22317d4e73f1b893f8efc45c10560c07b24b630ebf161cd4909deb SHA512 6e90999b0f1641e49ef8e1bf42e6881df4ce84c458abe2e2f71aa753e6cadfd8d93dbf36e7619e58e4c1a5d5f4eb09e09a637571d30c8d28a6e8dac24a2bcf04
+DIST kiriki-18.12.1.tar.xz 371664 BLAKE2B 88fe80c6092f46570e2c20c0840a403f440ddf5bd9dad282c9c0fc65e128a88ce2b8ec81843e05a9a914b24d98ad0a183f24213720144f50b448c1731533a984 SHA512 09a564a3058cc92b2aff0b2baedac78709b23b0b08e3f52551fa20fbb78f026626bdb6fd11de3efc93a8c87704db720c122032ddb719634fd9690a39e12cc7f9
 EBUILD kiriki-18.08.3.ebuild 777 BLAKE2B 42d74ffdc78bf23be26538e96b42588f5a49cb2dd7d7501e22de058636c32e4804edb778095fd8e54c9b4e4b4941d744f685d65d5313b9d6a4cf3a9285f33b09 SHA512 60f001cf741c30d09540c34c0303ba9612f9976f2ff9498e7bb9955c8edd4501fe722dc8746af27968f15bf536b29877c2eb996b32dc5be131ec1f038958f6d9
-EBUILD kiriki-18.12.0.ebuild 779 BLAKE2B 70358dec893e2e2509f4d9385e9c2d8073c2e84e37bd96d622cd97c36f41e58a969110c2174748a5afce7f3a02e0f70f5f148a83f5af0fa8bac578d506db4132 SHA512 5e292d722ab3ffcdf450507a7841376b41f1175ab956fbec3ab0a1209a3dfe8cc6e4e1131938e72f051437f90986bcc6c00363a13cec3ffd70082467167232e5
+EBUILD kiriki-18.12.1.ebuild 779 BLAKE2B 8c2969a9129952851a4e621461df1a02ab7e5a9dac3daebb3ef88139dc0e21e4827b0c8997deadb1a86a2491b7b5e42a2bebdba0eee5dc943ebc5735cbd452cc SHA512 9dff51f4c3247d560238c6357d9a42f426616bddee73ce537e44d9a636bd428c3930cc7da7f1704098b67a8d7ba781063c64bd8c6ba4bdd679d7e39a2c96959f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-18.12.0.ebuild b/kde-apps/kiriki/kiriki-18.12.0.ebuild
deleted file mode 100644
index d73a6c103d8a..000000000000
--- a/kde-apps/kiriki/kiriki-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kiriki/
-	https://games.kde.org/game.php?game=kiriki
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiriki/kiriki-18.12.1.ebuild b/kde-apps/kiriki/kiriki-18.12.1.ebuild
new file mode 100644
index 000000000000..4aed3a828530
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="An addictive and fun dice game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kiriki/
+	https://games.kde.org/game.php?game=kiriki
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index f40d5812d7ff..720f94b5d9dc 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-18.08.3.tar.xz 11553800 BLAKE2B f2316582df2efc813f9c0d208bf33fc836951265632dd1ce8ebee96ed23c81de5bc29c7bf8fa881dfdf9187357de0b73168619d5321513f74062169803278560 SHA512 2f81b613563a4071c04c91e789ac50c0d64780005280ff7358cf9057535be5203caf74dc7b6d6cf6d312fdbb23641ac65cad4d750ed63bd6e521bc4c87453b28
-DIST kiten-18.12.0.tar.xz 11554352 BLAKE2B 4f695790ddcf96aa603e02db49e0818d7dcf851a14b63b610fd59cd7fa0b5cb1e9405b98fe38b037f7ec041a397359dfc92f474a844655770013e7c7d25871b4 SHA512 30f93c54116e93837458abedd4effcf114fab3b5295c4d15a8755c39aec19357e4a2f998cfbda8c3d70bb3bc8c564f91c8ad112db9638d2af6d102c178939d24
+DIST kiten-18.12.1.tar.xz 11281444 BLAKE2B aa0a8c6e40193034a27ad07e475e0af930fa0893fdfbed1f4065f6fb0037a74de6eaf6d2f0637d9c959c348257238755316c230cc10798a2f3cba2c44c8af2c5 SHA512 3a79bae3e5903371e934de62a99e24fe568e3dbccb5abe3dbcc1db8ddd473502e17f1b2ba1c04259f3abad809bc9f95da1bae8cb94eb1e537d01b41236dd86a6
 EBUILD kiten-18.08.3.ebuild 920 BLAKE2B 553cb7c7122885367b823817798c0e8bfefa09e7378f2bceedf20cd2901c92935757cc75f4c75fed155c41245b47413f08c63b1107bf8d52085e960476cca865 SHA512 8883d03febd54979e6e55006dbb098747ccb801dd5692585ba23813e016d184d05ea1b531d629e103e5d4940bc7b14cea05ce5118fa7516502b2be4567f9005d
-EBUILD kiten-18.12.0.ebuild 960 BLAKE2B 192c5bb34593370079964bc69c6e272c24a2aebabb92e1758b2524cf03ca88593d0a426a455d460fc84baa784e05f5f0304ffa561aa11a9bf69d050af300296a SHA512 55e4de493ebdf049bfbba64eeebaf97e4d09804895d710ea1efce22cf1276bcffdfb325a6ba4b4d641481acc490760300be8ed80f96b193da77f7b7a79c1832b
+EBUILD kiten-18.12.1.ebuild 960 BLAKE2B fb7a3df894940fa869c69dea454fbc1e9f1ba92fe599ffb8d06ff72c68fab904f4a8fcd62c18a6823d36f0025958831b82b86391d1e5209ca0c4603b7765a43d SHA512 c2089fc12c9750ed5634482b778f4e64684772f22126bd33af1f9590a7a9e70223da90afcb3622d577a549d3b2acfc10f77ecca400e3e13b6fc4be80d687b156
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-18.12.0.ebuild b/kde-apps/kiten/kiten-18.12.0.ebuild
deleted file mode 100644
index 9f9cc9608195..000000000000
--- a/kde-apps/kiten/kiten-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	kde5_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kiten/kiten-18.12.1.ebuild b/kde-apps/kiten/kiten-18.12.1.ebuild
new file mode 100644
index 000000000000..889553a45e3a
--- /dev/null
+++ b/kde-apps/kiten/kiten-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Japanese dictionary and reference"
+HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
+
+src_prepare() {
+	kde5_src_prepare
+	cmake_comment_add_subdirectory data/font
+}
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 2769c6407a51..15d5fdb8a897 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
 DIST kitinerary-18.08.3.tar.xz 622380 BLAKE2B 55213b5897abd8a8cbe763116cfddb3a498e8cbe1edc4a50fe073da193d97fe6a872c3dc5843e3b15e0d23cba5aa57be4118c2ec554a1b2f43c2bb3b8b121bc1 SHA512 d2fec91f292a143f96096a6642764599198a6055c44f63b3706bbb6428bab919c507ab6a4a2211faf6e57480ed8d6e6ff3643b612d295ff32d415a79509d25fa
-DIST kitinerary-18.12.0.tar.xz 651688 BLAKE2B c78fb3105237386463745f78d447e77d8eecc1be6cfc7150a49144afc0aced29c7fcc6cc4c11c1e35ebf66178fed6d93ab2d522f37ef059f8b5bacb90c043db9 SHA512 3a39949dc600daaa4f71ae1fb92dc3e2d2fa04058184e23fc42d2002529b521c54dc27ba51222df0569dbd0616dd687781441af989534faf6a1e74feaa4026dd
+DIST kitinerary-18.12.1.tar.xz 653812 BLAKE2B d2c2e101aa6f4475889088314bf48b4557c1d94fdac3f8b9d2a49a98889eb8b56214b2c1fa8ad3a3567dfe5dda9f953f413152ff60253efb7d4987a13e1d8d04 SHA512 ab421df8bc129273dccacecfdc972ae22b449d78422773d17ee2d9f10390beac2db100b1295885784837c0fe8c7320d2ef2d82ac6d31a2c20c90039d0455b642
 EBUILD kitinerary-18.08.3.ebuild 824 BLAKE2B 1477b3096da1f8fdbf85cdf369ed4fc6ef2ba3ba7f616e62d0a951ca8fe95dc16927c3ada407442a7c41b02c73ca87a3f248f6158eec3cafb830b11139c3a13b SHA512 90121f44de95a067acea09b8308074da55417fc6e9a791d32b49c4189662f834fee3e0431ef5272ced65e324968575b0ed07a45f2b61721e23c80ee2da60af63
-EBUILD kitinerary-18.12.0.ebuild 826 BLAKE2B c5b477ef8c79a6421e16bcc8d7d32dc0ddf503a0859efd9fc217086fad173c122533722e7764511cf32ddd93a3a56d0d72eebe1af28aaf3ce4d80fcc34b0208a SHA512 7de54eb18db30e6e7a890b005151dcc2f3ba9ff59599f99557f658eab0a216e52509c434484217f1848855368b7ad8b92d8a88292610e2def82fc10695128e9c
+EBUILD kitinerary-18.12.1.ebuild 826 BLAKE2B dbe023ea991f79e99c7e24c05ec5c6aa69f5345eed9db8fc379268aaa28e9026928e64a93acab795a0183d487420dd3c6226cb71162bf8a40475fc5693a40a71 SHA512 48a9b6f12460d032d30bf1cf090f7222f3b3ee7361c7989ebee0916d67afcdea0f853d14337f26553846468253811484f7d5184daae65172dbcf110034ac7022
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kitinerary/kitinerary-18.12.0.ebuild b/kde-apps/kitinerary/kitinerary-18.12.0.ebuild
deleted file mode 100644
index 69bc9fa6fd90..000000000000
--- a/kde-apps/kitinerary/kitinerary-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="pdf"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	sys-libs/zlib
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-18.12.1.ebuild b/kde-apps/kitinerary/kitinerary-18.12.1.ebuild
new file mode 100644
index 000000000000..4d56dc1da9d9
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	sys-libs/zlib
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kjots/Manifest b/kde-apps/kjots/Manifest
index c58d34d52a84..791fb7b81873 100644
--- a/kde-apps/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
@@ -1,3 +1,3 @@
 DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
-EBUILD kjots-5.0.2.ebuild 1062 BLAKE2B 4bca62145135ba8f89e605eeb780f3d86824a6c8dc9f52d321bb9e3e209c32a657d315ac0bd860500a366f93a3ff4e199e1e8430d74f7ebd560ba4b8eb44c6ce SHA512 6d5d42741620ddcf4a6da18870d5f9a6e7c61fe56f01ccfa9747a5a33dafb78ed1d83e1f91683d5c623290be92832d7b2793282c014bae93ba216467bad2b3b0
+EBUILD kjots-5.0.2.ebuild 1058 BLAKE2B cb963f6c9f5b5b7079cefedd16ef799751f79ee8f7c3d347bb63ef0480a72f7a428ca3b9cda41016e7acb0f3e5c082bc378a0816bbd0388836ece2e1d600cb74 SHA512 4a195e05cb2752b83e7a71f0d40b13676834a2a15009164032cb5a820beed89a0201070e37b2b0c9e2d554d3ba69aec2376fa6d99028b019b554fd6721feca17
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjots/kjots-5.0.2.ebuild b/kde-apps/kjots/kjots-5.0.2.ebuild
index f57d4e7f3d6e..e0e37d4e7a2e 100644
--- a/kde-apps/kjots/kjots-5.0.2.ebuild
+++ b/kde-apps/kjots/kjots-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -37,6 +37,6 @@ RDEPEND="
 	dev-libs/grantlee:5
 	dev-libs/libxslt
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+RDEPEND="${DEPEND}
+	!kde-apps/kjots:4
 "
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index d5354ecc9923..a0e6d38a12a3 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-18.08.3.tar.xz 286716 BLAKE2B 1fbcd34e2ee789dcde61013e8e802a6e38a3bf60eb2621de5aace6fa3297c1893925cadf1e53188782943cddbe8c1f51a0722669fc7836e2fe42f85fb9dbe0fb SHA512 9e8b6ae890b1f1ffa29908bb0ed563f736d6499e81bbcb7b0deccc325697731084ffd2b382e5325df341613a2833fdfafc5cb1b6183c603c0c3e126a8b9bdd9b
-DIST kjumpingcube-18.12.0.tar.xz 286412 BLAKE2B cdf61237cb02d8fcc0e5b872b045375b279eddbe977186a12cc666fd015effb92744cb421052d9ce21cce375119e8b73e14f2975707f2bd866e1a3a3fcf7411f SHA512 db17f79ea58bffc61924187a30e79e8a382bead1f827abf84b51611526e8a5a0e730c42406568cef6ce137fd576419269680d519a2a30bcdee0455f8a0fdecc5
+DIST kjumpingcube-18.12.1.tar.xz 286408 BLAKE2B a80ad4db698b23d43edb9e7fea530908732aac906b1e56e7ae220a6ff2938f20a191133bf77194250ab8796e542f658ba29d80d3733c93375daf5719b74bc297 SHA512 d15d440f3613b0ec064808f571d8d63a9886bea14380c442f7bd827a4ec36d64965dbdddb94922d251f372de5fa585fcb576e18160ecfc006d0c1807a67e4271
 EBUILD kjumpingcube-18.08.3.ebuild 764 BLAKE2B c0000069b8439b4500ac09f9c5df2b368231b6f1a13ac5acd5fa13840129159954d732bfb3f216c41b4d53a8f63851069f5cb1dc584b1482e11001a71c42531e SHA512 832ae7f730421c13b3372431e9f81389919c1b14e828ee8feb53a20414204dd817ad97d8a6fe90f4b6b9aed21cfdb2864111b37f94b9f0db7ea1c8be277ea478
-EBUILD kjumpingcube-18.12.0.ebuild 766 BLAKE2B dff0c6d38aa73d603697274fb772860c9e0c3fc40e767d86261c43da3b0344fe43b9c608ea8e4cda9ec24ae49625ec601531e5bea4099443a45bd233d072e2cd SHA512 a07efa663119305eacd51edb5843b7c714a3223ffd337ddd0eafa48cf6ff86f00ba93a1bda5a787dc8e43a91cf81772bf866fb0bb203e4f7318ece74734c6d8f
+EBUILD kjumpingcube-18.12.1.ebuild 766 BLAKE2B 2c6979131621ce60c48f1cd7f9792590180392919046241c50739408a0e9613581c437e0c4b4bcb338f5bc659976bac49519de90c23207bf2799d50337434d06 SHA512 35e76db9be90516ecf6ea735bd0ccdeb90699ec96de9a689256562f5f896ca49a4fedf3b9dc5e2ecca10b6514a3201b4821223ea2b258f20dcb9a95125543068
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild
deleted file mode 100644
index f51ea825dff9..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kjumpingcube/
-	https://games.kde.org/game.php?game=kjumpingcube
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.12.1.ebuild
new file mode 100644
index 000000000000..dcd48166f5b9
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Tactical one or two player game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kjumpingcube/
+	https://games.kde.org/game.php?game=kjumpingcube
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index 90fa47d1c214..26aa99c959de 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-18.08.3.tar.xz 156456 BLAKE2B b1e176d2c6af79e77e14672721998f25b76a718e756601491c3084a94b92d94bfc961493e7fa3c624377768723fedea7f2628d696628e5356274deed5b68e0a7 SHA512 e2b20c58786f5dc20cec34e470dfe13efecebe12bd6b8324a6ebfdca48cfe1e5da23b3bc5802f643688a9bfd5a972f410f1f0c21db0d577a58e636e75759dee5
-DIST kldap-18.12.0.tar.xz 155596 BLAKE2B 7c79b825e1e4cae0abde3ec386d8c620f8ae1c231ded0f9587f3f1d29e4a431f710c5013ea8289054ca6a6ba556ba10b9cb91e744f75cc50b0219ebc050d347d SHA512 f52680e3b018367955b850a5c0711bbee414ceb98cfb537268812fad13cb0768fa378179e2e306f46b7ae1a6293c54e1d3f51b94d84e91864a76ad2a26e61d77
+DIST kldap-18.12.1.tar.xz 155456 BLAKE2B 963344fd26d27d135aeac9d7cef83aa5d4c583e627e905d4f0f97ae815932b9056e1110f7026e3390698e98de07302e9fe472b5f27353256e3c7c8b592f85b0a SHA512 09760a3be39f5345979d754f15d4799d00f0efe15028877551a5940a9b9da76617af09dfbab6e69372cd06e122ac7ea08b6aa2367044753325ff78974fa0f050
 EBUILD kldap-18.08.3.ebuild 749 BLAKE2B 5fe52f16e9ab8393b50463ea93edd98a0f9082367859b8ed198ae04c60838b2f2c382bbe870ec53d8b8c6bf4b1684230e1083a7976b07404bfc1cf47fb35c4c7 SHA512 efb14c69f18c605697f46c18cbf3ddd99b8d5f2732f780ba45380ec3001fb7e88d62d8cf2c3face3c21d1d80a639f3818437e8152859e8da17abdf70137e27dd
-EBUILD kldap-18.12.0.ebuild 751 BLAKE2B 88797a562ee954a866519acb4639425d26f48cefdbff5cb09be3511f45a38e734fe53f371940ad1bb906d45db35fb4b62a5542df0d65723d439c492b43ca5042 SHA512 f33e270298548cc113a4d2627ec76e0b9bb2dc31d399428cd8c2fd99d6021b42a7691b811efb652671d949e911db0c4b51262026491764987e6ac232e8419c3d
+EBUILD kldap-18.12.1.ebuild 751 BLAKE2B 38a11d82accd83ed4c232ea9ecdca5016915fd93cc1496c27af125b5b32e35acda323bfc0b480da28e87b5f6940ef5d445e293aa31121f5c062e9ffaae90a1a4 SHA512 028e1672322a58d044d17fdf21e36d19a38b6f326b1842f38e89e2e7a15f8ab7efec3d0a71279d44910bf0662f3c6c116c07ae0bbeba5430010263e746de2ef5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-18.12.0.ebuild b/kde-apps/kldap/kldap-18.12.0.ebuild
deleted file mode 100644
index 713405e6e0fb..000000000000
--- a/kde-apps/kldap/kldap-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for interacting with LDAP servers"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kldap/kldap-18.12.1.ebuild b/kde-apps/kldap/kldap-18.12.1.ebuild
new file mode 100644
index 000000000000..c77fd05a2f88
--- /dev/null
+++ b/kde-apps/kldap/kldap-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for interacting with LDAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+	net-nds/openldap
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 8fe860dae4c0..4180382882fd 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-18.08.3.tar.xz 1930244 BLAKE2B 5d01d9c8079b151858287947122af427af33f71574d80979d7709b2d01b1e521bbeb6eaa03df631206fbd27869a92edbc75e378e14b7007c2865f49313eae2c6 SHA512 3740481570653f718eb469f1cdfbfa69e7b41104b26403c3902667894d17321f6119b3dbf1487d59c7fbfd6707cd6dcca562aeba6036cdb41a9b29530bfa5a6b
-DIST kleopatra-18.12.0.tar.xz 1928836 BLAKE2B 6f02d8f568696a79ecbf02eee0df1fb65d9c7a8e3b44a31658ef50ecd500e2205abf3d2beea94ee733a618919a8c28b8904cc102363b7ec1587d2bd331112d4f SHA512 a941af0824dc4dc973bfbd40b0069b14e201328a974a01f62cea52a11cbeb2787468170073e431c22ec009e59f99d9c3399b62f9c0d1c89a86ffd72c8ffd2081
+DIST kleopatra-18.12.1.tar.xz 1929036 BLAKE2B a5dc7d1af04ab21048ed1c7cee82ae0dcf541859bb6d2594597b444ccec1d108d1e3b8638bf9976f767421b489c3ef74218d05bebb0945c98006eddce6bcf7fb SHA512 c150da5b7111d5bbcb6ad63394a1b35db413ce0e61ff9173b0ea30e337c6c588c93e79585b10b8aaf5fd8e15521187a5eb3965b4b374ae0734b04fcbd080d392
 EBUILD kleopatra-18.08.3.ebuild 1320 BLAKE2B 38c6748123787b80a224cac4c1c09ccb0264f203de89aee250e28244b86595416821077a17e2a0cbb6eabfae1af9da09bd6350bdb2b7e7f799359bc9e912527f SHA512 0b795992dc22393cba94c13263b20a9ecdb6572d45ba492d8c4856f42f908aaa65dbfa0f6ea38b5c8d62fc272be2ab0355db0d513ccbbbe251911e5674d97cc6
-EBUILD kleopatra-18.12.0.ebuild 1322 BLAKE2B 4f87603e5ec2e85bade2a46623abde5bd329b7cc14aecb9f47eabb96cb07a3d5117125614ba635b72b00b7dcf8d1b3232dc3049f7cc03ac0c187975d6541a128 SHA512 20d75761255d4f06b189cb5528f9b1e7042c30205a3ea42f50371bfa23c6bcfcab8fb9490bd4552c631ad36c9815b29934a60263c8b9c955ec28980b0c15fdab
+EBUILD kleopatra-18.12.1.ebuild 1345 BLAKE2B e854d3cbd97d40c18f3d7432263e0df48343ef90aa3a8cafb9f3164aa9dd31fd8a614e5c8062197268a65557c415ec690129628d21d5168d92aab19c08bf0c15 SHA512 0990fa4c164ae9159b09689f73cd8b7b0a7e1033428643fa975187977f7def4947c12e4b38a8656d71a3defe672cd55c4616ccd7af223cda97c9c5dd2dd1ae75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-18.12.0.ebuild b/kde-apps/kleopatra/kleopatra-18.12.0.ebuild
deleted file mode 100644
index 9d861e8fd9f2..000000000000
--- a/kde-apps/kleopatra/kleopatra-18.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
new file mode 100644
index 000000000000..f846276c1005
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kleopatra:4
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+# tests completely broken, bug #641720
+RESTRICT+=" test"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index fea833c7a75a..0ff0ed203605 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-18.08.3.tar.xz 21713040 BLAKE2B f61fb63b6c7aff7d9292463ee184b9fe8a41b4795df707c69809adc547ddd13b337459a0a410c71bfffcf6727f45b6f395f45d9a0fdd8fd32a50bf5949e157ad SHA512 19cf9701136dd707752db35287b8883c31016da7c6658b4fcf5c357e1d0006b692370f317a0a186aaeba695093127add7cc652078c4c7affcc86d7dd04366c34
-DIST klettres-18.12.0.tar.xz 21713292 BLAKE2B bfd4175208f63b5e93fa95c877835987df89247b4d3bd6102dbe0f0455b922d52cd4ce22488a6e635477833de57c092aa0c512c880eccc2d12a6b283aece3b86 SHA512 a2cc818567d5ead45c4dbf7602460b1a37dca4b993827274ed3e5f1efac39a87c8f28112a947f33cacbccabe432cb2425a4d4f7b98d4642709ca75c20e48077e
+DIST klettres-18.12.1.tar.xz 21486452 BLAKE2B b0b03efe8740de3480e7edd185bfe7f08ac1bd1020c8a1297f6621aa4caee1f1bfcb50ad5fd91c0b6afe1387abaf40326a9f0db9d1aa6cf898a440856160fae7 SHA512 0ff3d4bc513555da345af21caee1a112f8b810a00a857f2744cb8294e07941a583d3919937381da77a6c9009c9b0b3c41c967233967460f0e65eeffa6b4c17c1
 EBUILD klettres-18.08.3.ebuild 769 BLAKE2B 8693af038eafce78e2248ed0414ee1ab136da7bf247f7a8e47a6dc505ca4a75af84d5fe77671a3f109e5fb89a95a909bb1c9bdbe906399f4e7e0006371e0f95b SHA512 8edb221c9500436126e143df1f2d7ebcd0731ef0908963a40a119b4b5d73f57fad954c899de8b03ad33b6847d51ebf375f091e5596ca0a933ec8ab42c5e893a6
-EBUILD klettres-18.12.0.ebuild 771 BLAKE2B 0a54d08375ec57e95ec759ef6fe49ac88b4e477b8d7a838aac0cc56f30c631098a331c04eda409d7fd2b5cfec072882c2ed33eb902e6922a2237421ffcb465fc SHA512 2c7d9fbe881b52eab59badf1ac16dab8a6c4841e81c767fa04724ea1988fd25461181c84749c25e280b1098ed3c444b803fe5accfc8ae21f4ebf5fdfe21fb4c6
+EBUILD klettres-18.12.1.ebuild 771 BLAKE2B 55e21958a2a5b244f039aa6fd8ce800e5e86ea972426a678a8bea35b5b82713a0da6259209f0c66cf3cbfe46b5e583647faf94c3111a51bc9c6e8dc27f4e3acf SHA512 58cd5dd897675fe5011469f13cac87a87182acb8e0bd576a66e3915ee06ad3c5b3f7f0f2f67297b1aab11633839181bc9060150f38a098f79d93dadb342b56bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-18.12.0.ebuild b/kde-apps/klettres/klettres-18.12.0.ebuild
deleted file mode 100644
index 2c3f476d2da7..000000000000
--- a/kde-apps/klettres/klettres-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://www.kde.org/applications/education/klettres
-https://edu.kde.org/klettres/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-18.12.1.ebuild b/kde-apps/klettres/klettres-18.12.1.ebuild
new file mode 100644
index 000000000000..d7aac5d00277
--- /dev/null
+++ b/kde-apps/klettres/klettres-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://www.kde.org/applications/education/klettres
+https://edu.kde.org/klettres/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index b648e96c3e41..e44b34368b5e 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-18.08.3.tar.xz 1388908 BLAKE2B d9bba2ba7e6617215dc6fe50f59a1420d7cde83be5bbecb6308461369c5100f6043c6bc34fad0b1180f472f5bdd02da644a8aa51218a961c26a158d5ecb73680 SHA512 64b93852829bc45c4235a05b2efad619bedfd5bd1aaf7f380e8381c6e23e01881fecc92cff4a67bbe16d1f4d2c3db0c221e10072428f1b757d74191a8123dd18
-DIST klickety-18.12.0.tar.xz 1388768 BLAKE2B 6ee3b604ccce41da23081d900a5ef7ed12f8898a0f51c6b392fda29e032f5a8b19409126eb1cb94a970de2336604b33c288922cb8001e0bbcd95c74190c471f1 SHA512 01d85ab5697e884d20bb82e13d13465f2a69134f4ceebacdfc5880c13e6ed57bf9a9e95bec4061fb8016648ca58c23e21ade337adc17127db1da5d72395c31a6
+DIST klickety-18.12.1.tar.xz 1388564 BLAKE2B fec7613d27a4f0f107734a7f2af7fa96066516dbfa45a9759b581208ac6f0cb628fd8b1e5a48d23b25d08989cf02406de99e93da6a704a121c8557010ac04089 SHA512 6043f1e67bdbc212ca526caf12fea65b19a3f6feae4958efc468101ba03d6e2ab8ca1a60114cc67da85ec7e45d4e7d2378241c4123709506447e853fd0475de4
 EBUILD klickety-18.08.3.ebuild 774 BLAKE2B 7fadbd74991905e96a8f929abb860fcef18d07276f03f45292c27f2a81edbf42b01ca859c87c53189a617de995f7b773347ddf117b6784ca05414f49c32e5e32 SHA512 3b5dfeb6dc79298a585951598374e5211ad79af501a00e1e47b985328432ecce3708a13afba24ae3dbecd5d58d05ae62a2dd580d8cd2c9f6c97c9acc002d9da6
-EBUILD klickety-18.12.0.ebuild 776 BLAKE2B 9ce7789ca063686f181623d9b4ca02cb7f0403d5077de787532512b8d126c70d943328ad277378db587f5e2dd8718db46ae22014eb23ace342714ec01e64a083 SHA512 5843787dccabaaabe9d06a9f39cee59ba3e5fb4201ac8b84f9a26f3758f1358008b3aced78fa73eb04fa5bff0801962f4cf1cff3717b540b9fd3678d165c2a25
+EBUILD klickety-18.12.1.ebuild 776 BLAKE2B 55f76fb6565574d2d6a9a452ee673cec344c88df363b9397bf7bfcc115e0663ff6751e44ea43cd95220954e88902b2adf116c32ce0eb88fc7928ee26cb0d08b5 SHA512 65ff1a240619bf4bc184e46ef8fc679b27e95a79467263fd7d713221c5f012898a21859e586e0ecbf581a0e200cdf650c77f2c07c988d19923a7326026b2878d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-18.12.0.ebuild b/kde-apps/klickety/klickety-18.12.0.ebuild
deleted file mode 100644
index f5618bd99460..000000000000
--- a/kde-apps/klickety/klickety-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klickety/klickety-18.12.1.ebuild b/kde-apps/klickety/klickety-18.12.1.ebuild
new file mode 100644
index 000000000000..445808095ac9
--- /dev/null
+++ b/kde-apps/klickety/klickety-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 672b322a7afd..75ae3bd7cf04 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +1,5 @@
 DIST klines-18.08.3.tar.xz 1781644 BLAKE2B 535a661aa1573a0bc47b80e3d6cf0cdc789beb444c917713e4804f979a486c6336988ea12bc77ccf5e96e110ba09708e02cd3d75445d0f0bd05f28ccf3ec3451 SHA512 089ed0c4f8ffa0381879dcb57ed658ba627e7678de83dcf6dc98111afbddbf743938947ba5d830fb1f8348e3de17f06cfe0888ecc901e4d66b87ff71543a4d2f
-DIST klines-18.12.0.tar.xz 1781452 BLAKE2B 8d9efd961980cc492f183abaf145d9c344feb499c307d6be9b10c2e957397928ed36c9301787fdb44d4e238e2dad538cedfe26634d45fc00c9140eab3d07bd6e SHA512 4456848b5a73104463d805fa52e2922a319438bc007c21bac825ee5c3b11e9f9ba23d472bdaae2f1de772def9ded6fc7dc0c633f2a165fec15a8c4f4952bf2c6
+DIST klines-18.12.1.tar.xz 1781624 BLAKE2B a12120e9aca51d5521ec663d0e766a7d17849050391a311b958ad706ad5077719c7ed94f4a9e07e40957817d1e8b5ae5df2bc73cdbd63e2eaf175d641636c5b9 SHA512 50e5e66db7832c594608d554532e85720f80a53ee34ba7b6e97b9168a3bbd8d3680c4599b52edd2ae38c8c4a80d3478190c5c15b785b3d4f3c57a839dc7baa60
 EBUILD klines-18.08.3.ebuild 783 BLAKE2B 2766e26a86f63f9e2fd3915ad02c535bc6ca383889d83076a2985febf52fe2e3175bdc6ed92dd84f01040ddfe5728d7888873d4580dabfa1954c2d350ed64019 SHA512 70e97ef78af491aacda434429db8957f1d59c47b90fbc84f9bb3601e100c9ff060f853c527d09b527f6aa49660c4d5b904e84c0a50b9866c8b00268cb5334483
-EBUILD klines-18.12.0.ebuild 785 BLAKE2B 50895440a879607b151bb2dda0a60b5aa6ad452fc0b75d6135d33061e79c6e89e37ca66598fbac08e42211a6ea648e3b1c259d43c2b0c6f5ebcd15d02bc28509 SHA512 306e81266a59b9e628b5207204db7842620ff6e4dc1d657215865e4f5d9b440dd4a0608427df3b9138edc89fa8da7b15f8f50a6027514ff8a6c1ee33a5c0b27f
+EBUILD klines-18.12.1.ebuild 785 BLAKE2B 1951c99e5c90ccd3563b00506f32cc711fb89161eb14416ba48cd5b482ea091ceabd7bf709939d762c548f9fcde6a694696e9ab1afe1b30e6286c8d4d48c29f0 SHA512 c70aea87981584b597a8c449319aebfa7c973b1bee2bfb362296b32c0aa0f65e642f2565b83df1785ac9a4d7fe5ab995e5ee7cd396da4b47e5c869c0d3860e6d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-18.12.0.ebuild b/kde-apps/klines/klines-18.12.0.ebuild
deleted file mode 100644
index b4a2dc21ef9f..000000000000
--- a/kde-apps/klines/klines-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="
-	https://www.kde.org/applications/games/klines/
-	https://games.kde.org/game.php?game=klines
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/klines/klines-18.12.1.ebuild b/kde-apps/klines/klines-18.12.1.ebuild
new file mode 100644
index 000000000000..982ebfbca61e
--- /dev/null
+++ b/kde-apps/klines/klines-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A little KDE game about balls and how to get rid of them"
+HOMEPAGE="
+	https://www.kde.org/applications/games/klines/
+	https://games.kde.org/game.php?game=klines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index c5f4cdca04c1..140babe3ca40 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-18.08.3.tar.xz 628376 BLAKE2B 1556bdbc11a5c491e049065d096747a17e32d6d3cb3631a5cf509270910e7ba036e8933f02797993c39f6ec02472888677bd55e81b1d10af48fa5efc6d824a39 SHA512 220f933b0b83924bf6589b1b488cd18653e7531bad9f0d97c149c79e5bb4e2c1d441bce111c0f0304bb7c6ae33554bd666577a5a2e0a191f1e072cfe118b5146
-DIST kmag-18.12.0.tar.xz 628812 BLAKE2B ed27401b2598cae5726751eb3aa3ae3120c200bdfd38122e205a15f4de1ff2e5b02e0d9e02ad13674946dee9fc0ad7b3d923b01160196602f7e7a711ab9eb3b0 SHA512 124c074835729461309e6acfbdda1affc4fc3cd69c951ba0b5e3c897da30fed84099012a2571b34dfab3436a4bf872b362eeaebe6fd7c21815c8d36c92768e89
+DIST kmag-18.12.1.tar.xz 629164 BLAKE2B 18a7a14933a568eaba86cb9413ea25d7c70afacb3e9780597b687ae018ca58c0416b7f529ca38726d987747b5a3401c9becd3fb2a18c5f8c7201fef19f92ea95 SHA512 eaafc283051470511f11e245a99de5ba4bebbb50babdac157112dc841be422d74c68d61a361b8c7c86d0c4ae401985f3c0cbf6b770c8e3ada965dcded42b0f52
 EBUILD kmag-18.08.3.ebuild 854 BLAKE2B acd5ecbada5b9ef0c5a590e663426568225e1a00256d732968ca8477bf5d58fcbc741aec09d67bc33506cdb602b5760783785460b9199c6471a66f4946756a1c SHA512 1e8f89cde3656e71df824993157bd50eca7cf1739acf2b4ac9ca07639756d54e4b3797e8a789e58a99fd267a981087cd8caedbab1ae29a5cccdfdd577b2fbebd
-EBUILD kmag-18.12.0.ebuild 856 BLAKE2B c58b8e55b61cd40134aee34d7d7de57e12ee7ad1a1ea003b2398d38bbdf8e4f52a9b707badb48ab6451d2cb046602022b8312333ba817c3db55765777f3b7c4a SHA512 e84ed108b1949c8f3a544916940f26858d50afa1e75de66b47926aab7f7ace32242e6cc31e9086bfcbdd859038b10319a455c26df69ee14defc51ae803800215
+EBUILD kmag-18.12.1.ebuild 856 BLAKE2B b155854719087de7d53977b8b6d8ed38671b75107ff0c8f226178e558faef65b035f7cec3cce4a0a1a2b0abc33c50acc17f7e6c5ec33268342ebc30000e797a0 SHA512 105d08e8afefe8b9ea41787f37a9440b722ef4745f621a645661bfe35d23bd5164fabffefa16a20b60315fa487f3b2a283da8605a3e76254885f3358dd240771
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-18.12.0.ebuild b/kde-apps/kmag/kmag-18.12.0.ebuild
deleted file mode 100644
index 73fd726f7036..000000000000
--- a/kde-apps/kmag/kmag-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="~amd64 ~x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmag/kmag-18.12.1.ebuild b/kde-apps/kmag/kmag-18.12.1.ebuild
new file mode 100644
index 000000000000..eff9a0f53ce6
--- /dev/null
+++ b/kde-apps/kmag/kmag-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
+KEYWORDS="~amd64 ~x86"
+IUSE="keyboardfocus"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 411dcbfb43f9..3edbd1ba6cd7 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-18.08.3.tar.xz 4064204 BLAKE2B dda79066121e4d31133e718deb46068b827bd8886d5b452b2e4d19af2264ffef4f4e30ca774cf21520be12ad0792a235eefd858083d68bf8c2a0afe5ad26b26c SHA512 ceabdbdaa89040cb5bae0512ee592c1f55da23b8a7c085f79e312a4919e4bca9c9c984b0c141af75924e0b9bc812dfc13e6feede70d2549c1d45b08a4c0d24c7
-DIST kmahjongg-18.12.0.tar.xz 4063912 BLAKE2B 1ea5f2c08784518199a207b653c42143b2d1ba5aa6ce4747d047efd360fdbd0f0fa20602d7348b4aa7e2c71c0903700fabcaf3530b1b3c864fe3f5dcce350237 SHA512 54e60992476fcc4edf8612ccbc7de7f6d9ebbb7b6872f66d22d1172f896b1ddf4d017fedb18ebf72327a3a49ae90b3bdd3498e9b13d4b20d2ce6f4601950a32e
+DIST kmahjongg-18.12.1.tar.xz 4064060 BLAKE2B 7068feea9c48aeb5400dff61138e751bbb42947e9a1aff7f65b7eba0345990a9376976377c71e12263289910d4a3f66638e6d8cc68557a4189f2d17b2b54c84e SHA512 c2ca5e3f2303779038d7ca0aa6de3ca992771eace8017c530a9f8155832cf05c9ae6536a3a8ce29799c4306ba85a8ea185213c975506abc53f65f24546747c2f
 EBUILD kmahjongg-18.08.3.ebuild 916 BLAKE2B c79c877fd11a95e9b9980487bf335f0a61270e72628b4aaf3dc00364a17537cdca84955a4c2ec553c859def6b8f3995494099285644304f3f36826c25f2d525c SHA512 4ee8021aacc775fb62113e968d85233dae1a15d71375b03819e67379aa1c35038761b3b0524cca896df1e975a0e098d184bd92e0151d776fdc18e539e7c180e7
-EBUILD kmahjongg-18.12.0.ebuild 918 BLAKE2B 8e1845f6c5c652e996dae86e3ca50b173e091a02e33699bca7c6b46d607735ab469299f7abfba2961ff6bf255b73b2fa3c4ae42a7db9e194397f8642e6bf44ef SHA512 fa4abc9992b171836559e87e1d567a09e7ca554c2fb930601b86a5a0f2c18b11daf4aaf8841b1560eec9f17133d4ee4ea3fc0bfa04629da0d7d55bbcc28798cc
+EBUILD kmahjongg-18.12.1.ebuild 918 BLAKE2B f2bb56f076d21dd9b137cf9d928b99c346e3c9ca6c55dd622d694cf6051a129743043d611e7b6697e43364ab9aad5cba3f258b4699e0e3b3b747a29b9bb48ff5 SHA512 62c77a8c87d4b30d1fb58755595ec56bbb89bf0c65861db13ff8f6fbdeed2c536d932a7f321b63079ed7fa80128895856f8be6ef0be10ec44205784f7ebc458f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-18.12.0.ebuild b/kde-apps/kmahjongg/kmahjongg-18.12.0.ebuild
deleted file mode 100644
index d8d0479a3626..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmahjongg/
-	https://games.kde.org/game.php?game=kmahjongg
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmahjongg/kmahjongg-18.12.1.ebuild b/kde-apps/kmahjongg/kmahjongg-18.12.1.ebuild
new file mode 100644
index 000000000000..6bc91c827a10
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A tile matching game for one or two players"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmahjongg/
+	https://games.kde.org/game.php?game=kmahjongg
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index f81bdf11c49b..2ef1580b610b 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-18.08.3.tar.xz 156088 BLAKE2B 166fd701d409d07295a3423d126732029e5905ad5267695e0caa2025da1ffb0232f8cfc871134dcb80a8f48e256208f38011d3576e742ef45bd740a252aee594 SHA512 87200c12fd0bf5c24eca6609f97406553ba8dc60273705fd24474cb31e42dc4dbeccd4ddf43ae37cabc2e06e776f908fdc969c4f625b764ae69f827d0b5c477b
-DIST kmail-account-wizard-18.12.0.tar.xz 155964 BLAKE2B 845d656f600fd96f41fb5ce7d9d5f01f0ef959be0c6fa25ac3e9cb4201d43b33b11edd7a5736f42b7afaf10cb3da456c0ddd11fed57779d81055db8bfa76d1d4 SHA512 123be532fd47f1f912949eb7165db73d9613d9101f3a6c7f970e082c2ca5c3c2b20831428599f5804a07a17c2d52b7adc41b41485545ca4a17039c9f320b8752
+DIST kmail-account-wizard-18.12.1.tar.xz 155856 BLAKE2B 8882dbb3f40dc32dacf47743ff995691c01a2f5cefcde8d70b007e26e348c9c88186532a0a90b35640e291084a869fd6518f1fb8004521e00b4d898d25d1eb58 SHA512 d75e1aae49154a046bee58691dc10b90030c22593353a21e4d6e5589192a5c3c2454b49144497dafda998ab62513005fbe1d5275ae3d791dcba21f3012332517
 EBUILD kmail-account-wizard-18.08.3.ebuild 1440 BLAKE2B f1261fbebfbf63f4bb48b3b57cdcd50dfa3e396aaa8aa3b51cf4f57977fa5c54e2c836ff07dd0f6960e1b3114dfaf6426bf779eafadd49f3582a1fc23cd0e6ee SHA512 9ca3bd0650e977e8f6165f257731ed51cf07f4bf3ad672286b0bc85816c137da01fb62f472bef29077d880b14def9cca136744bb4edec7da1f601bfd34cc9fe0
-EBUILD kmail-account-wizard-18.12.0.ebuild 1442 BLAKE2B bddabc879c6998b82a9605b15b9c99e5b235b38eb287637a1ba96a7a9624efd3017c9afe2f14519b709b4816040497319644112e3833f40250db0d48c5eb32ef SHA512 4991f1c267c1525aa946d822a47a0bb23adbe7dff5204987c72b11bf80195b184339df0969d500a717fe814858b52ab57452c72dc582d97fbfca5aa911cf9613
+EBUILD kmail-account-wizard-18.12.1.ebuild 1442 BLAKE2B fa4a2a7ec26c2ce44389b6dd251608f4a812d01e2ec5b67510378db45009d09221e3acc92349bf636fb384c8c89562c0c1d7c4e133fa4476d5db6ddbec69a160 SHA512 8a0312952e4ae01dde5645fd21ab50e4da24d212379dcb866a62af1943d499983bd8780fc24835f7b37089ee186073fb62cc844006c49f3b82f1a9c25f2e7a09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.0.ebuild
deleted file mode 100644
index 08cc9666e24d..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.1.ebuild
new file mode 100644
index 000000000000..01851efe31d6
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepim-runtime:4
+"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 0672d0a4fd9c..703140524082 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-18.08.3.tar.xz 4778216 BLAKE2B 18cc1402fe56e53b99ae3b4b152cb88b4831a9a851f359dac39b23c249790107a80ae6937a78b62c5b561e6a7ca89bbac1b58075993465e56fdb3dd67b35bbfb SHA512 1ce516f18d01f8a4bb2cfcee8adf6fcd32d8ee2fd2a9005935c57fbf2cbc9ef35dda98815202822f606cf7a7131e86fc6eef875975da4e00bf421bed5a989c6e
-DIST kmail-18.12.0.tar.xz 4723296 BLAKE2B 1ee5e9ebc868022a56f33c7a22d6df26db1bce86c49785170a86f5b8ad48a9e089e444945ad8442ef24b22fd6021b59cbe85ef9e4716c57e19643f46c8eafa88 SHA512 4d0af86686315c1ed01984aef6b8044fcb7545b70cc4769a4fcbea737b22eb61346dc4593b6d4af9f0a8c1856725f9480e53789ddc3046acfef589ac5a03de0f
+DIST kmail-18.12.1.tar.xz 4723532 BLAKE2B 19fbbdc9b01abf6df5825e4c4bdff5a4c391bbdfe373818c40a77721ee0e9988a7b22e9a2a1430e5d2bb361492103271952fb22e43152fa8de8ba74aea5c8e09 SHA512 9d75a157694348022b788cf9b675d0d250290c6fad45b264265f7582942d4f486dac9d6b2aa0dba07a6ff6a5af43041ae786ecf6432f2b0ad4167bc4d1d88e61
 EBUILD kmail-18.08.3.ebuild 3170 BLAKE2B 0959bb4a869f93c30655327319568fa4ba6017e1d83522012f5a463b89e1a31742bda341a40f02f093f118bef807b41276d607bd90404c27b8de0f4378343fe0 SHA512 d32da391c2f2b3a78e82d1405fcecd5967262a26dcd7adfbb7ccc9d9dc10ba5dbdca7a50322a28dc866f69a8bc697b77182a2b84cca87ca6ab69004557181b69
-EBUILD kmail-18.12.0.ebuild 3172 BLAKE2B 1adfcc5906b6209567caf6f9d440de033c9901b0dc810e874f2e159422845321e1279523c892db94a04d6d9580ccabb404d91996ab75e78763b5161b5bf81c7e SHA512 d367827f076b74198c3b4c44f9036e3084e23128f0aa248c23ae20a828a4ba7d41aef7489c89300a0a4d6e27789ceeaf990dc51a53219f7f7e56a79252c0e840
+EBUILD kmail-18.12.1.ebuild 3248 BLAKE2B 24410d58d0448dac9bd27f20b4deef0e0fd7c515c6a08aeaf7b515c8da07e0428c5d9b37e2f6d8933d554bf961cf87d261aa9258bcb5cd0b6fcdf7c7dda1ce58 SHA512 9a8d3098c155f640f25f52f66b73a7460a5d137f0188c414ebf497a8d1168d74dd46309c8a47c0cf7aa7348ec534136113854c438589d91db9800f7657faa6bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-18.12.0.ebuild b/kde-apps/kmail/kmail-18.12.0.ebuild
deleted file mode 100644
index 56e4cd96e314..000000000000
--- a/kde-apps/kmail/kmail-18.12.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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)
-	>=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() {
-	kde5_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-18.12.1.ebuild b/kde-apps/kmail/kmail-18.12.1.ebuild
new file mode 100644
index 000000000000..4827eb308999
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.12.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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)
+	>=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/kmail:4
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	kde5_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)"
+	}
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		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})"
+	fi
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index e4f824eacbe5..171ee0212853 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-18.08.3.tar.xz 165984 BLAKE2B 3f728c77f3340a5d4a0cf05bf4a62f54ba15fdd797162b1eab6b3db8b4ccfe008fa95bca27d8f71eb8c9b7b67db870844b09b3b2e9525d71e333df83483322d0 SHA512 aa091ee09efae4fef47ee64de503ec3ab9dbecd212a112d97727956d4ad51955a61754f37df864326e1bf5b91d527b3e954033f6d3a6106c189a7cd8c7dc3148
-DIST kmailtransport-18.12.0.tar.xz 165880 BLAKE2B 44390678627e55d66df70a90fa2349c2691aed1386870657547aead2ab4b70d4c04aa98835bf113ca0730ff05b1cd07498739411a3add60b2e068444e51d4096 SHA512 7f86e84b38262fd14164f5b340ab9957efa696be72613892d666426c4ed7b1e90ce71f1e19a04ce965958ce33b93d26f84983394b99cb31668b21b4bfaf2384d
+DIST kmailtransport-18.12.1.tar.xz 165820 BLAKE2B 2f2bf44d3972cdb47e783f8af2189c1c2c923aa3d4a00d6e790db5090515a3c106bd2c4a262e3264cdd41d2656e718618396cc23e1cf97ecad63b7ea41ff51f2 SHA512 be169a9f159961db82db5a3669e1bc0f8eb09e8e37194c4210bbb200bef7305c59f1b59c70a20e2216794d095245d05fd46b47519740e4483495752ff776c202
 EBUILD kmailtransport-18.08.3.ebuild 946 BLAKE2B 6e03412ed630264161002fbf57603cfd46018f1cf7669fb1af4ee308291a28a79abe6789bffb86a4108efe86af0f1c86c51ecb7aae523142d0ad60661b218699 SHA512 27a0cd212515ca3ae6382a121afe1e8e4d433d7f4f7b2e2fe2c53becd4030627cacbc9a4566d7cbc3ae00646b58e6e0b2db28453d810732333f2cede9f498cfb
-EBUILD kmailtransport-18.12.0.ebuild 948 BLAKE2B 03802cef2e30c2326d5872f70e2d86b95c866c9d5c555a1f52010bf3aab31f4f27d5ab1e9e1fcd145a2f7230da6be15509dfcdf64bcd690f9b5e6defc821b508 SHA512 7f131a127a7e527f1824c7c9255e3392f5c5750692bc3ccd1a1a9281660bb6c962e2a950a5a4f3afbae908a3866e5c03e4cd7707a4ab97562b7fd27422ba5d03
+EBUILD kmailtransport-18.12.1.ebuild 948 BLAKE2B 000be1cd2942fefc14e2e36c279ffb761c7b117bc0d77be0f2517d0d8595f115630006895ce863928e6f0d358f04376df7a184f11ec4c06bd791906ed4260c78 SHA512 6620eb68140fb55768038060d7183e29bc3c7baff7721a48b2bb1cb173a5100c2b80296775a731b4d8f7997b6ff475057bb93a5284a50906adf74c9efc259327
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-18.12.0.ebuild b/kde-apps/kmailtransport/kmailtransport-18.12.0.ebuild
deleted file mode 100644
index 650675c741af..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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_kdeapps_dep libkgapi)
-	$(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
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-18.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-18.12.1.ebuild
new file mode 100644
index 000000000000..b5e345d9339f
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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_kdeapps_dep libkgapi)
+	$(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
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index d1c6c83b51a7..07ed18188bd2 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-18.08.3.tar.xz 24572 BLAKE2B af25951c7d29ff19dca05626423844472640a82996e5683d7f214485b916b27bef75b1cb0dababd2f8b2c15c0439225189731aeb0bf7d9dee45ae4bcf712f079 SHA512 ad72ca418931c7f52ba3cd377db12843258ac949f12c7f074596c5114d3bb92c61a0edb4210b3cad39f4e45c4590af48ecd856783fb222bd5780edb96a6c8b79
-DIST kmbox-18.12.0.tar.xz 24660 BLAKE2B d025f9c28f1dfb4f54b5afd0eb22ab746375bcf6571ab1e07596fba1f15baea75882e9035ae58c29391dfd3057b549d1e16f982af28409b7f2c95474c1498ca5 SHA512 facaf2679fe2e0cc7ce92fa5bc6e7f09037f294ede82c75adf67069f0deab6ac515784ccc61525c66ee96a02bb2e65244b2ccd7b3f7ca07f3ece53c97864214c
+DIST kmbox-18.12.1.tar.xz 24656 BLAKE2B 3341767ea6205ba9c7b1890ab3ef08c1b134b9abe0962cac49b63d087ba7cb65b80dc43665a00f30a90383c5c5addc74805cd4a7b6a0b6c6324ae68d66e8966a SHA512 bbb853ed865077585e3bcc189b22ec5b27bce11a81be62a15a5ae5cf776d0e212bd87078ef5457b4ab4e7082a73a3b7f51de7b9d7866c8e0205051e011f2347e
 EBUILD kmbox-18.08.3.ebuild 306 BLAKE2B 5b47c0a3a44fee24815cd7c5cb38f11d5f67118ab31aea88c1d9ebead35b3b38d11bbfe00e1b2de969023c16798a68ff8400c4815a7de2de22fe96358bb6ca79 SHA512 8dec59a82306080510cf0f99d4382b718bf903bd152db7939dd287ab438099f0e2d28657bd6ddf0a7d06d3bb1ee9ca82b58809fa92e9422ce7d53d9356140572
-EBUILD kmbox-18.12.0.ebuild 308 BLAKE2B ecc00fe9f0c5682e2302c53cb2e84651e6629a572dbc504ea4068f1794de7547a4cdfe294d96b37ee779d02377993445d286873a9b4dca2b7c2e7067baefca4c SHA512 91cb758945c3c55b43ab9d96fd43c2a620157937afd9f511096cd3e9ec316068e5271e34fce2d130914ec88c8ffe1329d62c71c34ab91c71de1e344789c4581f
+EBUILD kmbox-18.12.1.ebuild 308 BLAKE2B 2baaebe74ad4ccfb36aee4bef4f4e9374a34bede8798c6976ff1bd7a4046fe614e028bfcb3367464ac2774dde2562837e75d2fa90f052a2af5fbe07adfa1bac1 SHA512 f0b529d31934c3251b62333816332136958512ab983668632266719c18570636a7f3eefc8640f595de07084b25bf1484736024368976ea909c5ee8848d984471
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-18.12.0.ebuild b/kde-apps/kmbox/kmbox-18.12.0.ebuild
deleted file mode 100644
index e397b6a2bc69..000000000000
--- a/kde-apps/kmbox/kmbox-18.12.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for accessing MBox format mail storages"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="$(add_kdeapps_dep kmime)"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmbox/kmbox-18.12.1.ebuild b/kde-apps/kmbox/kmbox-18.12.1.ebuild
new file mode 100644
index 000000000000..522ab6a92dab
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-18.12.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for accessing MBox format mail storages"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_kdeapps_dep kmime)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index a3a399e7a615..44552b983539 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-18.08.3.tar.xz 146980 BLAKE2B e858337a16f844875f1214d144abf8a623415e6f1d70418df5ff453f78ff67c54a81b3844effbef41da5fa55e1ce584ed548c3cc7e4af47cbae5e793f8391abe SHA512 1dc8113b0853b29eeeb7c30a69c30f4778f8e176d49a3e05cb0229b9575394ab9d3461cd5dffee7aac2e3ec738b5023c859ab94209a788c40efe28685f079ebd
-DIST kmime-18.12.0.tar.xz 146912 BLAKE2B c578218c75b686db0cf83c6a53a3b0bf8b067c3c6df3ea40da7bb0b7ee367029e1621c276440e566709adb8e034b2a97541da23ea929fb6d1323ebc288de5e2b SHA512 6299c7b695c2b41ae1f35fe49d55494b2de3bd462ca15a68e3a81fd13497713472edf5bc1637c20ef290db6d29151529f09843422d6d8eb275bbf47e1228c01a
+DIST kmime-18.12.1.tar.xz 146852 BLAKE2B 54a0f3dad6e8cbcba50fafdd7c9dfd322c45494850c85a4bcb648074494798a754cdb48bbaf630dbb4f66e0fe9a0974715acb2854631c9ac30927017e0afdda0 SHA512 990672e00f90fc7234b45b179e69aaa055861b02c393ea19c8aa0e80e7840c0d7e05bde33cb6dc4572bda1b5f3bd3d9b3f568ff8c35852217b96282148dc6111
 EBUILD kmime-18.08.3.ebuild 376 BLAKE2B 94b3f933814cc481ab56cdf08b350d10dd50ddbebd18caf6fcce5856d21e4f3963180b63be6f3af85f639e9f349796a79baf0e0f711df91e85d8dac6223aa302 SHA512 0711927e13b5c599decd486e66a33a84c2d54efbd223674ea164ffb5ef49d6d87e9d5ad3a7d257802ddc358820ab0d0fd548399ee1e3d2cb9d49d7830f3209a7
-EBUILD kmime-18.12.0.ebuild 378 BLAKE2B 5468677043f7d82d9c4f78066528e863e71661a0bfaf4c12ad455ac660e6b65febe6f35cb3e69e16e2f6998c9b15e669c891f8e11061d654a8d78d00836db2f6 SHA512 e530ca31acaa9de5326ef7a40349e53c5a2fc21e60161f9a9e1229dfa5d9f98a7812e8daccf68cbf3dbde7ae610d5c7f693101696c400e21239f726a4b197606
+EBUILD kmime-18.12.1.ebuild 378 BLAKE2B aa76e5f8fb44032c69917f228efaeedafaf7f79f25b2b9189414c61d7b5c6954dc1738d409972b3b4357ee128c47b8f7c0f439451e4e079dc5f1be6772074be1 SHA512 371ddc392e26bfa7c83cab56da66b527cbc201cee5ff17885f0c51b9607ac406f8b217d47e74f4214fb285b8a7d163ebfe97326df1ea9b619b418a26e0ce268b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-18.12.0.ebuild b/kde-apps/kmime/kmime-18.12.0.ebuild
deleted file mode 100644
index 9ac5848c7cb7..000000000000
--- a/kde-apps/kmime/kmime-18.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kmime/kmime-18.12.1.ebuild b/kde-apps/kmime/kmime-18.12.1.ebuild
new file mode 100644
index 000000000000..7d89f702bd91
--- /dev/null
+++ b/kde-apps/kmime/kmime-18.12.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 45ae3ce831b5..ff5d8dfbf9fb 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-18.08.3.tar.xz 901348 BLAKE2B 90f20295c7128da496cd0489f7ae5f21ad6bf01df262a9c314d95ec170fdfa3e24748b5464aece8ab2e032c9b37ef44b9d22a2c7d68e612efa01ce36db9ab28d SHA512 24e4d00ce9bb595d598fa9c473167b005c0a7fb6ff7e84858aaf29fa018ca295d1e5172064ac1f42efb10b6d7ddf018577e1f331895bf5d4c2805950995805c2
-DIST kmines-18.12.0.tar.xz 901096 BLAKE2B bd23763790caaa4e903cbe98fd4771a422261cce83e6b714e2638612cda8a15d9c01e6f372c7f195c7f4ae923c3cd05f95aaf59e7dddee2dc83c784d65f1cf51 SHA512 61aab02df4bd6a3ba261bdc0df13ae1977dd319164329466c64abd6e2c21650fd798aee4e722016637692939196e8a532bbb9cf4f7f050d32e0854aa0fe88401
+DIST kmines-18.12.1.tar.xz 901240 BLAKE2B eec8eb01bff536cebac1b508f51c5b85092e11ba7df33a9925882b5f0d76a9202095e02132181d3f6df15f731a2920ed7f6fff30df91044d0b226d9b59a7113e SHA512 00cd629cdee86939c1a4a45a8e3fc37fa86d02f19c7fe0bbab440ed8dcdf40e934b6419b6ec0f448da745fb9865d95ccf065ad8d7cb0e83e9f52365fb8e34a06
 EBUILD kmines-18.08.3.ebuild 770 BLAKE2B 29ed8a44dadfb15e79314087f73f8bfce2d4b5281ed081ed99155fec2b4102b70b8058f17806818e490c981877a75ab3e401eb03b542022d1d70b0d5655dedef SHA512 4290cbeef0760deb5f547076c903a25003cdb8fce45d38acf6ebe14dcec1530bc3f433b1380b78bbb99c1f3483ce1cb3383b7ba7540fbec7b4ad1800c014895d
-EBUILD kmines-18.12.0.ebuild 772 BLAKE2B 67542fe80e324d819ba087d8fbb3e545db683a6cb5752cef487c3e6ee0a243072128575939f881886e2dc3ea9ad975952e66fd8b8f9e87b2cd402eab545b046e SHA512 2f7a0e09286336c60b55bd3beb46673682ad8f68059d1510352f0236f6212204bc9378c6cc4aee7a24f44c7c79f1ebdae9089e4b853c4d8cbff0d27ba3cd835b
+EBUILD kmines-18.12.1.ebuild 772 BLAKE2B 3277214e4dc5eaf04fc1cc17a333cce01bd5767d0b24ed7559e596b0c1a9125f4770dbf5a2c455cda1a5cb3813e9ba34d77cfd05ea3dc28c883c20196348b294 SHA512 ad168ccde0a40eeb2b1ad7052e11722198b0c008b18489745c2e7acb6cea498834db25e34e31c9e0ff87b077f3808d9c46fe4d2a2770b374638c03ef2fbede06
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-18.12.0.ebuild b/kde-apps/kmines/kmines-18.12.0.ebuild
deleted file mode 100644
index 2651ed5425e8..000000000000
--- a/kde-apps/kmines/kmines-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kmines/
-	https://games.kde.org/game.php?game=kmines
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/kmines-18.12.1.ebuild b/kde-apps/kmines/kmines-18.12.1.ebuild
new file mode 100644
index 000000000000..5a79421488f3
--- /dev/null
+++ b/kde-apps/kmines/kmines-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Classic mine sweeper game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmines/
+	https://games.kde.org/game.php?game=kmines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 412a385ef883..5d4bcc97d7c9 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-18.08.3.tar.xz 1073328 BLAKE2B 8da9f30c1f9fc9b7c8c342f48039123613907a8b5ac7120135a68477b1405eea942368877becdf9674a7ece096e21cf00e4b2cebe5d000a7ea2169c947b38a06 SHA512 6cbc2bb5ceefd4a834a59662da67b51dac4ae4ae046af72ae7a87532c5e6fd26f401473713ebef6e81aca1d247870cd06c7b4c8f8b0880966ed3ba6f4f567994
-DIST kmix-18.12.0.tar.xz 1075664 BLAKE2B a23ebc2b7b1486207f1fd40b10a83251070759b03539ec92ed78b70b4ba6d5f7206357392ac3df5a4eb1184440373f8d4fca9edfe62ad5cef56792f157c01ff2 SHA512 793dfd2533c7dc76d4d4ff0d68b57cad6e82e3ed6f3ccb8375b72730b689a54b1ceb23189845afd71ec26ebf0fd485f1c9e63b89203a4be32283387606203b91
+DIST kmix-18.12.1.tar.xz 1075688 BLAKE2B 8fe8ebd024e81b6bb41ad0d4cb92c136095069e99fa5390d374a5fe466963800bbce6e0d1333ccf3ab01bcd745f5af08dd0fee1cc92385a05583bc27a5547f59 SHA512 c8be7307b0d9aace92958f69816f4fdc1ca294a2d6644b3eebcdbc80289659ba545ae95336d3d535b41c5ada145b4e46282faaf9e82eb746d87d768a9aab5857
 EBUILD kmix-18.08.3.ebuild 1254 BLAKE2B fd34e24743c360edfb600b1cd2d4446a17f0520e2cf52f7eacbf919b083ca6c347d90501e577d3eb6bd3cbbf50052a8c1832efdb7018b0a460e6e99fca2132fe SHA512 e8775cd623d9f7e032c5486046e71473eb2725c2be144647320d5ec160d08e0a3d137520165f786f548cea292cbe19f6aff9d38f7c2fc620513c95875b970fba
-EBUILD kmix-18.12.0.ebuild 1256 BLAKE2B 84f8b7c3ebfa2720c3167e042af7a22a12a1fbf6920203c2f2ae01d9804d76a1ade3d4f13ac6ea90e0c67ebdee719f8e072a319c70905ddb7e3c7423f951bffa SHA512 70e4a9356a542573f999bef43686646bace4c1f442be3b326864ed95401508df4bec0a171397da0bcd30919502cedf325c4cb162a471f339539362422dcf6506
+EBUILD kmix-18.12.1.ebuild 1256 BLAKE2B 27ed92f37d01e06855d3d8c7132f65e3dd6a0cf7400aa94584917de73ecfc043b188caa3a71bb2baea3e877d2210c86f3c9b858ce96d937f92d3dc9931938167 SHA512 8963acb69d1fe609f1c310d30a02a90a92175c5675f3ecf20b5be3fb70458eb2bd780ad30e8bd4385954b7b570c8e11c6e8cdff44885dcfb482b46e999588dda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-18.12.0.ebuild b/kde-apps/kmix/kmix-18.12.0.ebuild
deleted file mode 100644
index 9945973078c4..000000000000
--- a/kde-apps/kmix/kmix-18.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-apps/kde4-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-18.12.1.ebuild b/kde-apps/kmix/kmix-18.12.1.ebuild
new file mode 100644
index 000000000000..e35517d27097
--- /dev/null
+++ b/kde-apps/kmix/kmix-18.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index db31f7c3d157..807fa1364207 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-18.08.3.tar.xz 113032 BLAKE2B 48a83c8caa9f54da18ca61cc1abed52b7779ccffffbd48b5523f612057ef9f226e12cb675c36fe6edc42a0d6a2557c932caf63fb9df98f03fe6c65b75c9eb95b SHA512 7caf340cc7570eda6b563d8fc498a386a33dcac54bd998c040ebec60e108c87a83a2b114841540bffe094ab247d4561ec78c6ca82b44fa203120bf0c5cefe7b2
-DIST kmousetool-18.12.0.tar.xz 112708 BLAKE2B 5b29e15f78b6cc844b297f03adc6d265b72142aad0ee0cae7a1c7097d0d14476151174c47d311f5c50a37e32c2b884f5e1a73c01fd6d612cba0013a4121795e5 SHA512 0ba16a4926254477112cdccabc7c0f92b349079f3dde21e99ca0dc0cbea7fbf6dd9ac09aa1f120ae916dd95c591823fe90461a9921ad7793893af14bd62e484d
+DIST kmousetool-18.12.1.tar.xz 112712 BLAKE2B 5cb85f7372bb0b8458bb1560c7f8bb7459cd7e9a704b81798e147e9f25d6fd97d2ee0dea7c8aabe7005d94c38dc3d7cc4acbdd17b140e793f155f24816e712d5 SHA512 d89116d1234957422165f54d56b2f7ba3aa4ae13caeb6c6c4ab554f997f316c6b592afacb50eefd110a8f1e6f73fde3d5b7da686496b1019eedc0ef8861e5862
 EBUILD kmousetool-18.08.3.ebuild 816 BLAKE2B 8f4fcfea75a23317952b5e88bb82ea4f222a90ce339dfc9e0659931445c5a66f0fe52e5088e05754b164353e64a42bad6f0eb6222354b1d0feb64c43da7f282d SHA512 4ecd777325d8991a9e23791b4f126a994d8dd945ed58db55d8e9c8382c2830258e99c0d2b1248632669bc1e12c42d5f8f7e3f31968540453f2bd57c39b096c7e
-EBUILD kmousetool-18.12.0.ebuild 818 BLAKE2B 3fa65c8de4332e55fd4a9175e4c54986a1fa7931c59be856469d26ac38e917733862bde4053447a439f80e698fc2a33d5fbf939ae69f2cf7a41928ede6593d60 SHA512 f4d5b273059e679f215f7a9ee69d9f1daeda650dac5558feff317bfcfb9d9fa362c0b4ac0bf034e9a3a10159d15d019e8bcff584f0c5bcc57e9620d85d742975
+EBUILD kmousetool-18.12.1.ebuild 818 BLAKE2B 4e83f75786717aa39a2b2efef179c054aece6373e87ed8ce0e0f66f4dbedf1c83e13db6e7cfc437be0f9c31e9e70f975f445919bf731411103370b7a93d570ab SHA512 c15af7f3beb94c7df30839f94d64566ee8e5a03da022ba79cec0b4aae1eb843faffa70b2ed3b0b9b92594fd0333867a718a2a4912dff32bae2f2a87e27c2b82c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-18.12.0.ebuild b/kde-apps/kmousetool/kmousetool-18.12.0.ebuild
deleted file mode 100644
index 11cdc28ef286..000000000000
--- a/kde-apps/kmousetool/kmousetool-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-	x11-libs/libXt
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kmousetool/kmousetool-18.12.1.ebuild b/kde-apps/kmousetool/kmousetool-18.12.1.ebuild
new file mode 100644
index 000000000000..89581130c4eb
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE program that clicks the mouse for you"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXext
+	x11-libs/libXt
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index f3c6528689c0..e42908541829 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-18.08.3.tar.xz 1767044 BLAKE2B 9705fb378c4e61f0d0d787becf9fc05264c6bc21e316c4a3701cfd3407daa5133f3483c72dcf334350b7de23b7e34448331def034c95fffb8c7d05a432167edf SHA512 d4ebe4d0b51b6819c3924eec74beb9335707f244e384e2f085c910f700bc646023bf9971d175f4ab19280753db712f50a4aa9721c8b53b59feb9ba5e21882ea5
-DIST kmouth-18.12.0.tar.xz 1766124 BLAKE2B 2931761e12cafe196b011104ca6b77496199ee8c0f9dc6a2a76d80de0ea714eb153649c088705b8a32c5fbad227416d1e8d8564eb327cb74885058ab489f7cef SHA512 df8b756a3bb35b49128be4d80bc7a731b878d76e803c4b08abbde7c25a89d2ebab52c8bae6103dfe2f45d273008448616aa1f3a8254f1084c22f4072bbeff2bc
+DIST kmouth-18.12.1.tar.xz 1766284 BLAKE2B 13c013a4cce72c1ad55ab6053e1c42b1a6cf8c2bf0a63fa00483d70c9ca812d4f66de3279d0b30bb235307e1d360bc0f8b4aefd8ff447965c5e740928738852e SHA512 6234b9822bfc27a7d6eb58109758089d936a98ceabfdb54285f478296c2bd0e6322fcf4345396c6e56545f3eb46a3f1604f630c51a63588110ca35055cd93607
 EBUILD kmouth-18.08.3.ebuild 767 BLAKE2B ac5c1beb54c67730eb1c8a1aabec33542f202b3e2b5c0a6ed1589cb99bd47510968ead89aeaeaa827ed5b0068e2684f88681ba3e8adfec9c27b55b439856af9d SHA512 2671bc2cde9eb1012151af1f13ca85bd27e6c2c22f587ad6a87bd4d09ad21ea8069ff2feca4b1159586b67d5184807a8af6451b9c5ea2f6867340b942a0d5233
-EBUILD kmouth-18.12.0.ebuild 769 BLAKE2B 2a9cdf94b4b6bcfd583e15961d72d5f1bd3d5ddeeef4abdf1eaa0ce5c8b7aa0f1273f3a57df34718fd6807594a950b90a09db124ecb22e5976cd18242375c9db SHA512 ca2e1404ed495a93925ee895885d90440efe99cae0f88a341b70d7d43d9e4b6ac1d2b5c13c55848c673265e623db71b8ca1900c50aef85305a3f9b2fe8293a32
+EBUILD kmouth-18.12.1.ebuild 769 BLAKE2B d6056316007c759e8d303d172765e5b7ae69f3ede0fa544cdd47b1dfc033687145d08d3cdae928c70c5830ce3918563e3ddba920d5bf44660166387eae24710d SHA512 e38304e79bca140d04fe0e86825790740a100fda30cd155a51cd4634a8215a45c21598899e17967cc6e713a63d9378e6c6fb987e41fb2aadf54efc74c6aa7967
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-18.12.0.ebuild b/kde-apps/kmouth/kmouth-18.12.0.ebuild
deleted file mode 100644
index c1f3beb97ade..000000000000
--- a/kde-apps/kmouth/kmouth-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kmouth/kmouth-18.12.1.ebuild b/kde-apps/kmouth/kmouth-18.12.1.ebuild
new file mode 100644
index 000000000000..aa195229fd53
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Text-to-speech synthesizer front end"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 8d222fafd27a..037574138300 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-18.08.3.tar.xz 3028732 BLAKE2B b462fe17faa62fa5c5a9718a6759f001a4c756b6e4f3af575ae9727be3a2c21ee9f007294621fef7925875118167eecfdc057e6b8f37e06540b0a200c77553c9 SHA512 c03eb0f08b5a2182a888dfb40f97eccef4e4e2fcf4f7fef91e66b4e0045e4ba38df50b15f309e972cf56569cc527f210ffefd72f236f94ef881652f07cfd1d67
-DIST kmplot-18.12.0.tar.xz 3060852 BLAKE2B 7d0aabde909e14065ad06c1feb561c3978eac55a50510765571330b5271a442eeddc92478c2ba4fb1e304885aaf4996c10f3e3c2a712fc751bd6f8f9d7916dae SHA512 69c905091c4172e8b3fa4e7140c38bb643a2d4383be1cd060a49132c816d2059357a2f2bff951a53d0d185c838fdc30202ce6d8f1a2776be16253407f0393766
+DIST kmplot-18.12.1.tar.xz 3060904 BLAKE2B cddcc619aeaa40fad971a136fc8e9fd947609c564dd10a93046c77e8542f14108841de19e16b575a4e74243bc9ec6382a5dae874a612db5363f44a2bda79d8df SHA512 10638b379ec7aa0203ff20bc0aaec0557a34db98962919de3e130bc1de5f72cf72a45f02e42f52765417fc6eb4d492fa81d99db1eb5c3fd4fcc92f5ace75298e
 EBUILD kmplot-18.08.3.ebuild 928 BLAKE2B d2b37627b3489a343596068a607ecc5ee4b0955144c00481816b7603dae89d3f41b7a6c1acb4379524537f8a8c994c45536393c197d4270346403451d1fffe26 SHA512 c0d0f4a0783c96f1bbf95ac189980e1f89e6c2c78088b1487297d90f47942499ae44f6d3ccd0d420a4549b37d10a0d92fde6002052328c156217200b6f129d7c
-EBUILD kmplot-18.12.0.ebuild 891 BLAKE2B a95289039bcb299d47e95d22296a759d8651fcc00b1c76ef28d0fba8c0789c5cc3ae63d7b93a9adb994797e586237a8f7d5739c7feba6130ef811977575e1e08 SHA512 d10a6b75c07bb58a3b426267a73ee2280cdc8aa5fff7ac509b3fe8b655dd6d5fa650883cb74b5f427b99766f7a04e8a115278595ffdf67bd9afd633f36e787fc
+EBUILD kmplot-18.12.1.ebuild 891 BLAKE2B 74d79b2049df07dac2608248a4e1a6bd39c4c375c49390a2be4527034919c5e18bdcb94b74db30f79992ed3e3493b543e806a744cb05cefadb6aaceb084eac5d SHA512 e67e8d0e718608e57dd2f09aafc95a956e68d227825278de7fc71e9db9b150538f05771478e37ff30ad86ce8a0b4851a1f0b47fccaab9debc9aff83e4f57d4b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-18.12.0.ebuild b/kde-apps/kmplot/kmplot-18.12.0.ebuild
deleted file mode 100644
index 7b042578ab40..000000000000
--- a/kde-apps/kmplot/kmplot-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/kmplot-18.12.1.ebuild b/kde-apps/kmplot/kmplot-18.12.1.ebuild
new file mode 100644
index 000000000000..000307b133fc
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Mathematical function plotter"
+HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 0458d90e3462..ada2a504f61f 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-18.08.3.tar.xz 1280356 BLAKE2B ab6517e78c78e16223bfa359f395d5024401c85b909d037eab7d878783bd8cda9a8f877076cf17273b201318c6298d218e088c65a0002639e2682f15e379fec5 SHA512 d0d41ab446f2583bcbf5ca9486ef1b2c622c82c39d0aad0abdb371b99461c59fdd5488e67bde9ab12953043e4a0b4dec7dbfe5d605c8ffdddd1d927b647d1b3b
-DIST knavalbattle-18.12.0.tar.xz 1280492 BLAKE2B b3e64379d5e8de01f7fe4a2a9a497202a649cd7ccef609ca827499fe37375b37b7023f5a7eb99be76576f00a86b74c2d0a54038927b78ce71c49928cb0622eae SHA512 c211a81f94171cd5e837b6d91d79824ecca2797d236abc42b2844baf4e2a64d816a4804543f1d9686bf12256e2d7939237667ae1f5e368c75a61d8a853227804
+DIST knavalbattle-18.12.1.tar.xz 1280452 BLAKE2B 60097e09c347e84413cdbb77fe0993a9428a8f42558c6589744f86a43cf0c5a8b2717bdbab9ed94b9148e7e8cf8ddd83e167f44e27ffb401f20bb0b157b66603 SHA512 323a5b2fe07cb636b7a110ffba4cdda0b80b2ff217962e362f63f300a10084f22369e13d369f92a8eac8464dbda1ab815af0fb32b2dc20c5c43fe87832402d61
 EBUILD knavalbattle-18.08.3.ebuild 869 BLAKE2B 00d2590344164212f9cac75f0b70ba3711574264e15720f8b11d3473a517f24b166adc110ebb37b039d34e2ff27d021ebbeadab8cf765b8e41e50441c51cff8a SHA512 f79a3303b593ddda7e25ced89857cd3e99516ba3cca2699378d154a3b3c27a3d58844790adb3d0dce88e7316e37d001ba5be2c9b54afe27fe2991676f088f0a1
-EBUILD knavalbattle-18.12.0.ebuild 871 BLAKE2B 57059043c84d1620554b93739e2c9a870f3c86d3c94456ec708a3e6b1a9472b7170b0c788f82573a814bc7a0b22d3b9332124539c3f79efc2eaf66063ce5b0c9 SHA512 1ff94e46b59435ed5ba10b4a46ae0f33240b87475f745e0ffe4b4fe57fd75f063899e5d37e5d3d333994f909f019fb2be7bd5c7c1e072d20657553aba1048822
+EBUILD knavalbattle-18.12.1.ebuild 871 BLAKE2B fbd896e4ffb239986ffc9768a88b23560aed20135be466d5a764f51bb3e86f66c980c8ee920c753d82b4783bcad1dda575ecf624594c0632b8afeb10f18e5c75 SHA512 d7b62afaaf8fdeb0fb7bbc837837229212fa23bbe04e60bc1b3e32c73604352c7fc5bc48ad7c4d11e5b917953be202667a5d545ffc2319b44c221d6270acc22d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-18.12.0.ebuild b/kde-apps/knavalbattle/knavalbattle-18.12.0.ebuild
deleted file mode 100644
index 23d70fe88ba8..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/navalbattle/
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knavalbattle/knavalbattle-18.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-18.12.1.ebuild
new file mode 100644
index 000000000000..7fdad3932733
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Battleship clone by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/navalbattle/
+	https://games.kde.org/game.php?game=kbattleship
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index f6747e8de1ca..42786943eb71 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-18.08.3.tar.xz 1036720 BLAKE2B 2a57e065c86a858a56ed7b6bf3fc374814dc924cba61f4b39baceee56ee1a23a809935f705c7f9f6ea4b758d0c66591387d2d8c49340c8811bff6d6d87bf7442 SHA512 a31170250287e4d97e91eca41cfc2b1c0c51e67824723f8740ca2faf5f543fb6e7f9183f703ea84d82692e733e8d849d9efa5cbc7af67a091dbb096114feafcb
-DIST knetwalk-18.12.0.tar.xz 1036600 BLAKE2B 31497d99243f47dcabb6e94420b683d255117237294e6b7088815a471369d3f1caee481abdfc60b56413e1a35a54677ed6672bd6e4de8d413a0f6689012590ce SHA512 f07696553d4f366b5eaacf7f88f93862f42a1bd53eb23f18c5ee2bc075300e1cc09718e54664f7f6c7c2225ac60abc4ae147e35a093d5f9db76b04f7896fef23
+DIST knetwalk-18.12.1.tar.xz 1036456 BLAKE2B 9350056c9c3ac8c425715e3ec9e782e9def52fcbdeba4267842f1ec07adf3f6d2aac128c391c77970c82a20b01889d4170f2759b9de6d464958fce13408d7172 SHA512 07244ef8d23fbb473276848214686b9d7b6a02c71f10448bcd18c8619b1510a4213d6eb177ecaeae0eed54a06290f9a3b651d7500d8aab022c746b317250bda0
 EBUILD knetwalk-18.08.3.ebuild 861 BLAKE2B 04aaacb4fdf80b08d12d58b7e3a51c3b42377ab7bb4208b71f1a2b2b419a00634144a3c6611178b5093bfc3b3d40639ec16d63f109f43d44bd72f4c7da30ff09 SHA512 fd07cabc1dee4f742893ede40295bd7ee2b271dd9902bdbb3eb783d7b6087159e59b082ea35d1339cb67089d4b440870fb92d1da40db9355d04c98320ddb5b72
-EBUILD knetwalk-18.12.0.ebuild 863 BLAKE2B 64476569e2f661217c95b216df21e4651e419e1ad65ddb325ff9b115e20ad3a8f8229db5b82d4a65f1add28bd10a7b552268ae57a780b0144757414770f03a30 SHA512 24ee94086c6b1f7fd8b12267a98a392d94164b563cd7689ec94a31f2e36b306f403d1dcb1af7f45d08a84dce462c51c5a6189748de7becefe00d9980e2207a21
+EBUILD knetwalk-18.12.1.ebuild 863 BLAKE2B 90559e5e326f072dc9b2f696145c0084b4b7332a3d53dd26ab3f93b70f6331c3fce83c20496848579ee728e5e31d6911aaa3bc78c672494d00c30606646e4b41 SHA512 8e79f2220a10c276a77f7d2fc1e209172dc25a939112c7407a45a61ed22069543223e1e10bd3ad272b01468265b6692ec264c50f54a299c3cd548d5bf0209ce2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-18.12.0.ebuild b/kde-apps/knetwalk/knetwalk-18.12.0.ebuild
deleted file mode 100644
index 289adb382ec2..000000000000
--- a/kde-apps/knetwalk/knetwalk-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="
-	https://www.kde.org/applications/games/knetwalk/
-	https://games.kde.org/game.php?game=knetwalk
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knetwalk/knetwalk-18.12.1.ebuild b/kde-apps/knetwalk/knetwalk-18.12.1.ebuild
new file mode 100644
index 000000000000..b4fdcef2ff84
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
+HOMEPAGE="
+	https://www.kde.org/applications/games/knetwalk/
+	https://games.kde.org/game.php?game=knetwalk
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index b3bef1b793c0..1972e7cc945f 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,3 +1,3 @@
-DIST knights-18.12.0.tar.xz 3507724 BLAKE2B 9b9f4d958f7cfa39feb972b47f31ff840297773ff5226664ac0d164bfc7b3d35c79d4fc4e8f673a9758f7702480dfb493bb4fa6277013c523e296c514699f83c SHA512 11128bf41e0ea28c3927488063e4cf6d6c86492aa8f79455901291ecfe53e22099dff0904b19060bf53d490fcc7c4bcc2b497f73811c848bfe16bf3ecfcc7c84
-EBUILD knights-18.12.0-r1.ebuild 1153 BLAKE2B 074871f1a07df27e4a6fd23a0af48daa5faad4ad64dcdc019009fc01b91b4849aa00f6e3325b6ddde6f38dd5c9dde8396031d4fb4d7b2eb8fcc3098f6a37da7f SHA512 4096c204b840a5040cfdd47912ac761f2ab40b7565810ad76aa2d4102cf15390e4c664985678a9584933874a4e79e2368a7130825cee6a4c4d26ef781052984a
+DIST knights-18.12.1.tar.xz 3507844 BLAKE2B 71e5dc4e69b9ab01f67e787920d26d8961362e0f78d5d616f68446ea5d264cfd1c7f67f7072474cff810c5d6a6a4f92fca2f1d5dd385d0b445802cc2c42f8737 SHA512 a3c827a235ff6e295041f5d769648a5b8795f7690c9ce6e71a01d2b9443acc96cb4f9b69922f5413a1a53d634a8a2d25dafd2ff35b6c8417bd1a570adfb71bf8
+EBUILD knights-18.12.1.ebuild 1153 BLAKE2B fbadf4b972591d948e4a66ac96bd5c3a630742d4fb4a457724811662688f7707c3c8e8e7ad6b5f1c4dd5a0373e576fa3c0bf1097d1b7d6879c185f20f3d2c915 SHA512 6ec74ea89938cf24b0245aa2027b8de00fff77c7ab9345f0212168870facb78ca893e4899adf04536b8a3e3480c9a36e2b30dc1f9017e9423ef9d19975174994
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-18.12.0-r1.ebuild b/kde-apps/knights/knights-18.12.0-r1.ebuild
deleted file mode 100644
index a09b920890de..000000000000
--- a/kde-apps/knights/knights-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://www.kde.org/applications/games/knights/"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	|| (
-		games-board/gnuchess
-		games-board/crafty
-		games-board/stockfish
-		games-board/sjeng
-	)
-"
diff --git a/kde-apps/knights/knights-18.12.1.ebuild b/kde-apps/knights/knights-18.12.1.ebuild
new file mode 100644
index 000000000000..3eca9594f586
--- /dev/null
+++ b/kde-apps/knights/knights-18.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Simple chess board based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/games/knights/"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	|| (
+		games-board/gnuchess
+		games-board/crafty
+		games-board/stockfish
+		games-board/sjeng
+	)
+"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 448285387d23..bb6ff29cab1b 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-18.08.3.tar.xz 338460 BLAKE2B 4bfb2b7c49d4ec8dc1a79953b134b21bc3ad68f5591ccb1336b75f26245b706868c2535a77eeb4a1ebeaa028d7492f900f9707ee0afac1ad1f7978db682bb660 SHA512 90221b5194daa39c3d2b33d1200fb03f7e014b0e8a98f1a2619aaaa3c028e9e715e583ccd67d4b690e728f63f1cbc4db3a7a39523ad891c2660fc5c1e04f9519
-DIST knotes-18.12.0.tar.xz 319620 BLAKE2B 7831acb103e3c5a47ff7825f8627d8de878cc3b10bd0d369446c74935f678ead594d3d0ab5e66c72a7789f59a8c8838f3726d215f23577cffeff6b3272ac57d1 SHA512 2282b5c74c5b32c203f719665bdae815a86f56d69688ce7a9b0cbb2e458f7f80c9bb53ffb77ca28c37d51db6f686b1ffe1dd9078dcfdf27964c78bde19adf6f2
+DIST knotes-18.12.1.tar.xz 319668 BLAKE2B 56fc798d73bbd528a6c401d274c759d83baf9bdd2de742b721009b3cd7259ba70fe5a4125852f9896308f42e8dca0fb53a855a3916ab0b73a134775062f8574f SHA512 add174d11a12975676db9e6f4f0461c7b7cede003098f689a8f92c83fba6de81a122edc25c56a85f7d648b090e8fa598f78d463c2da8cff135f540461b8b20cf
 EBUILD knotes-18.08.3.ebuild 1846 BLAKE2B ec7447496c3e7b0a5343993cd9a216c896339b77e403d93a119631039137740ff5db7f60efed134b1809f1265b9931353e046b4eaebed2ecf9cd098993bc2995 SHA512 79cc96688921051b9c20564ce610750ada34f7ab748a4216f5799d7fc5a91031666ad6cb792e006b616854ea8e0e72aea4a6298bd13f48c18ec1ef8b47bd944c
-EBUILD knotes-18.12.0.ebuild 1848 BLAKE2B ad68d649d60202e35e3bb14cb437a0e09957f2e8be058e23996c433471ff9aa239b9ba0517df6293943a894fe3affbe1de7fbc01757ca6e4e21a2cc3d03a7885 SHA512 ce0fae531e22c73989b5949c8faa2654fd26eb802bad54a61087b4484a88a94b696d1cf6176cfef444260b9163ab8211b72e86d92ee9b41091304e47d1671cbd
+EBUILD knotes-18.12.1.ebuild 1868 BLAKE2B 69d274c852a8d6779ee1813ceb53c0fb63fb0c278c49f5d5e5a1266f8977d7a8c65d1ac3200b2b1a602c82eb2c0c071655751eb1eca3519356bf2da6eab82a8f SHA512 ea280ff014dc9790b210988f000528e75525e08a114b903062469624556610020b8665850be056be21a64478295c10808dd6d20fabaccc2696088899990b1ca2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-18.12.0.ebuild b/kde-apps/knotes/knotes-18.12.0.ebuild
deleted file mode 100644
index 70cf933ae6c4..000000000000
--- a/kde-apps/knotes/knotes-18.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Note taking application"
-HOMEPAGE="https://www.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
-# 	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/knotes/knotes-18.12.1.ebuild b/kde-apps/knotes/knotes-18.12.1.ebuild
new file mode 100644
index 000000000000..733b2b997fe6
--- /dev/null
+++ b/kde-apps/knotes/knotes-18.12.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Note taking application"
+HOMEPAGE="https://www.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/knotes:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+# 	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index af74fa07380b..ad700b93a112 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-18.08.3.tar.xz 925604 BLAKE2B 7cd1a3f0c4d509991f89fd478e1ac5e5d2e9b5694cfc36cbef5bf0334b3761826e69a7180e124dd884aa19edcee4827655ce9eaa9e3bceb7b418f900cef943ba SHA512 e916b8ad647c0e6ebedf076e6fc6ed8040c0010bde70290955e6ce9a158123436536c210ab25cbf12a325e00776088a57a19a46bf22e4c67bdf33cc737c4e466
-DIST kolf-18.12.0.tar.xz 924652 BLAKE2B 274d8e6038ff1c8b8ea2ef49d52c9856564896beb45395ab805a9da6fbfa8252a374f40b7d2341e8ffafeb0c9611f3ec80e0e0a8e4f07d3fa4871a8d61418aba SHA512 43ecb26954d9dffba1ee0ff7bc51ffca2a6118006b51aef5474e40b15ab6c5561c856af7c196d393e95ac340dd80aacddb1941b7e080bc01badbc49bfc67aa5d
+DIST kolf-18.12.1.tar.xz 924628 BLAKE2B 8807ebf52b44ab6ca2c9ca0f847afc1fa4372c90ad867081ceee74f62ba88bc15f39a8a945f0fb15f74857ba4abdf2e28f25498d2c64f5cfe3c6ca639719de02 SHA512 a40f9883899564c7a7840ac9535a7d5759eda1784945f2eddf802c5a2a7b2d85e95ce7253b953327739e152dc09989973f123cbec275a02e7b2de6c4ce84b6ed
 EBUILD kolf-18.08.3-r1.ebuild 821 BLAKE2B 3baf57d996e7d70964503a4a8ea2135aefad8fec2285f7897dd8803798720843ef8f6dd36a18e1641157cc6cfd9c999ebbbf5ca15ca9e0be1563e5ffa088993a SHA512 70bbf1b97d0e7b6336bbf13bd0409bc9d0fc1c721a74233a1602455564feb8cd2916aa66c759900cb6cc998bbe6568395a8beed7f00b6267245691ba16ce5e98
-EBUILD kolf-18.12.0.ebuild 823 BLAKE2B 175cc90ddf6b81c3977c8f162f9c6ef7989dc56fba8df63bec2f478d6c7ca7937d1b930820b549fb4252c47544f375fe80af6dfce08c2cb3e5c4656882df6290 SHA512 b59dab77f9eab029d666e092ecf809785d5b2a3589328f719261947383e3eac3ac461441226dd5adaa6fbd8afd5ed89fd3a14fc42252f599408f06948e5f7011
+EBUILD kolf-18.12.1.ebuild 823 BLAKE2B 8459c57db991e7436efe786fec8fc71817c9e0425dfe7eb730a19b07fc4dc4e0e65cbf81b6d431207f3bcb0b4e3398905b715ec49ec66e65912556a1e0978210 SHA512 977db90353b6b8b86ef83589e374c650f720e5fcc765f958db261d7e3c8abb13c31e9931d23c012c33321072cff720e9b5c5f4cd9ed2728c15e2f9ecf528be9c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-18.12.0.ebuild b/kde-apps/kolf/kolf-18.12.0.ebuild
deleted file mode 100644
index 8490eeb3fe1d..000000000000
--- a/kde-apps/kolf/kolf-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kolf/
-	https://games.kde.org/game.php?game=kolf
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/kolf/kolf-18.12.1.ebuild b/kde-apps/kolf/kolf-18.12.1.ebuild
new file mode 100644
index 000000000000..86db100024a0
--- /dev/null
+++ b/kde-apps/kolf/kolf-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Minigolf game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kolf/
+	https://games.kde.org/game.php?game=kolf
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index a4360d72d19d..31827ca9539f 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +1,5 @@
 DIST kollision-18.08.3.tar.xz 280676 BLAKE2B 589dc8ed2f9f97a457622d3bcfa00197b709717de3309f2790b38e03c0b05517e792828895f9418c6dc33d95b3afbc7b3c67d18f4857a2cd9ddf07c4c1b0d10c SHA512 26150d77ea6fa523c641739798c2b0ba50666ac980aa98ca860234c0c9b84ae5ded52a307cbe1c93acfd974e45eae380493fcdb340146d4f8437eac9f63915e6
-DIST kollision-18.12.0.tar.xz 280768 BLAKE2B 8db91416ef6e4937b9e80b040e34ed8ee1dd26c3dacd893cc72404552c60e68efaa22efeac692b3f0c5d89340d1d3e7976c8c2d3be96464609f669749ae70926 SHA512 7122f76ad78ce869a18098d8eabc74c2e51a33d747dd7d7542eeb385f2095b6bd2f913a1d54f1de533d756af40d3a168689d7fc1ee1bc9caab6e9cd8d5049972
+DIST kollision-18.12.1.tar.xz 280764 BLAKE2B c4bb3d5f1ad312b4a0f8b26927778c80ecca91805f66951c1984d970a74b2dfae233a82264e758f63c12fb7a70c3ce9b89f6970aa7ca27c0d3cd2be81b05f34a SHA512 d4ef14879283fd7fbb08441ca34763ceb3af504497215b801a810d7268249f43667291e1cf22eab7aeb4216e975480737c2d6e0b3d2d52ac9fce2545ee5c489d
 EBUILD kollision-18.08.3.ebuild 674 BLAKE2B 380038f023cc63ec20ab04a98bc68761830485cee30fa04caf29d72534b58afe1ca002879a63181a497267076df82970bd223f892cae94e3b544b04832962e92 SHA512 a13bd48a05ec94d317d6e47a06b89c128623f41b8b0d932d300cb90ad2645707dfe99a455a9da7941cbc79d26577a985b1792e71e0f50d19d7e3267ad8591ad6
-EBUILD kollision-18.12.0.ebuild 676 BLAKE2B 9f8603e04353b4c342a8bdf2763cecdf7b2a1fb0985dcf6fb4d681004742bc1acae7f516531da23802b998683c9ed8625d09b58d8d17071b2d7b4fc998a644ba SHA512 afa99f2f74ca97fb1e922f06623ef382d3d9eedb95d240fa54c65fbf32985895dceb9ae5eaf367b51c4dffdc0dca8e9e60c90c6d373b17182866bc29ce2cfc7d
+EBUILD kollision-18.12.1.ebuild 676 BLAKE2B b5b3415ddff8dfacfe86f16617356072617fa37ecbff4bba6040f2a61b51ace0692e0de26a7d9cea20a4dcc22023e2e330b6900d84a60fb4b96833140cd57013 SHA512 c0a6327d9d1380efbc9b513673488993c221161a2c3f176a82cf224f09e2f645153483baf58308b741c98e7c9a52605391b8f3f43bac173182e4633d7b686aac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-18.12.0.ebuild b/kde-apps/kollision/kollision-18.12.0.ebuild
deleted file mode 100644
index f65958c448e3..000000000000
--- a/kde-apps/kollision/kollision-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/kollision-18.12.1.ebuild b/kde-apps/kollision/kollision-18.12.1.ebuild
new file mode 100644
index 000000000000..e46a64eb5710
--- /dev/null
+++ b/kde-apps/kollision/kollision-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kollision/
+	https://games.kde.org/game.php?game=kollision
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index cc8f9c4aaffe..55a1304092cf 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-18.08.3.tar.xz 5548536 BLAKE2B b7529b835ca31147cbe5973a15be767e3495084266ce4cd23eae6e78d5f8b86a334a25591447c255a64f09b8d1561e8e306db651fe8d67325be2cb4a358c3e34 SHA512 259eab582cddd2f3bc398e1a99933840ce4abb7ccaa3333c339ee6497a98016f235715e8d7f32f9134416b05d90efdef5ae3f1063192287bd53af6cd2ab3b820
-DIST kolourpaint-18.12.0.tar.xz 5547648 BLAKE2B e8d3e53406fa04635e303a32126e36d5500c8f3a476f6ce776c401b79efb8e98ee43413d6e6bcc4dfbff3fa798434905336fce9bc1679797a2d7fa89f1cbc159 SHA512 47968201af1507c759286025ecf5487ad71aa5c0f1ab152b8e0e2df4e904fa5f702134ca4532770a6e443075ac5319d8c8195827e0c2f0a9d82a0c268fe36ed5
+DIST kolourpaint-18.12.1.tar.xz 5218268 BLAKE2B 3fc3954e5ef334fdd69f2eeec0ea141a221350ac95ce1ed26b403cf0216b6e8c5403c8f1a97e17b3630411f4b8d600cf01a625b4a875c000815a1be38393389e SHA512 9d135e999b54efb90121a18c1c97006ce421d87ba9c0ecbca02115db692a2cb93f09f92c0f312702227e15615c3585789be65e966670bb1ffcf4705e79bec951
 EBUILD kolourpaint-18.08.3.ebuild 1047 BLAKE2B 1281c1ae31774f9eb4a7255a84765a5d537880a6653c7b55debfad00b901890f29a66d6ff5cc4ea77b901eb2c31b5d766376f619f414c0f729854ddefacf818b SHA512 0da704166f0da28dab3993ee72936b2276f974fa66eaeca9a07cc136c4b8a6952201b5349e0cbb7c327bde23b1299605e8ab5a99fcfd0195529c7e7cb9220e0b
-EBUILD kolourpaint-18.12.0.ebuild 1049 BLAKE2B 72534bacf302b51286b7f72bef68f6884cc5336b02e6a32525426dbf7e6382c331bd9b9f6a671081f86c40223ef1cd41ef96d2eff43cf07b98f01904406dc83e SHA512 937749400ffef2a576af7c2e6230c191b0e18b13b5bafa081d1292a0d30565f0f4429ac76170e5950da1432b353badff70ad479a362adec093cbc28dcb97519d
+EBUILD kolourpaint-18.12.1.ebuild 1049 BLAKE2B 908db5ae76b471bbf0260814b5bab6f69fffac4d5a57b8733aea438138abe4e081363def660adf01097a903da51dbbde03acf72dc4c40f4a381b51051d9141b5 SHA512 a978d1d41d5c6f7979386414a53f4184da45b25ad88bae52d839f1f4b27c9a842919db8e47f13c41ae8d6aa316e2b3bafd41fd0a5dba1cd16d66b4484d39f9ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-18.12.0.ebuild b/kde-apps/kolourpaint/kolourpaint-18.12.0.ebuild
deleted file mode 100644
index 0caff9e0da14..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-18.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kolourpaint/kolourpaint-18.12.1.ebuild b/kde-apps/kolourpaint/kolourpaint-18.12.1.ebuild
new file mode 100644
index 000000000000..78ffe58dd5cf
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-18.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Paint Program by KDE"
+HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package scanner KF5Sane)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 8d62b25d48a2..0a0e51d7392c 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-18.08.3.tar.xz 802164 BLAKE2B 9db037e9b7db3eb71160e16481f116e0a703d275e1cb8d6f7eaa49e1723c187f25d1132971211c8119b70d4504cb32b00c4a04a7ebd3c7f059cc67d3f76eb06e SHA512 92f092e1a7764926c84bbd5018fb9700012f3b40d2af443091e0dc55556dc9eb46b02e0ef949a13cb01f180b450c0a6f54e7aeb6514c25ba9ac58199fa1bceed
-DIST kompare-18.12.0.tar.xz 801596 BLAKE2B 235e37bbe608f52f7f8c7850f9c90fd2266e42ffe44da02fad73feb99e26f104ca68a1bbad1bd4f647a85a176b76a53706054292a894abbdabe981e01b1f2341 SHA512 1ea936cc89653fcf530e7954996818a3729b5e2cb121ec7aea3a8cb87692aca98858fa36a357f9968b89ee9eb1d153983134e69b3a897f2c10d3abb6139d0093
+DIST kompare-18.12.1.tar.xz 801588 BLAKE2B d4daff99c4d610fe872b47034cd0e9132c761d65a2dff62af7910db9aef819e4dffa6d5250c5b5560c3782516f5160c46b2f20b93808ec5b99c773ba35e9fc5e SHA512 175eb27b25008e2b5402efdc141df5cdcf62f0a151effe6da855d3d87ec5a269d019500228e112dd67fc5a8223668b11633c5db9f6255c6fb381dbccb1a5f420
 EBUILD kompare-18.08.3.ebuild 917 BLAKE2B 0ab52147fc476f251f99027a5233a08756399552f1533a4ec9bc2f641a0c33f855352be23dbce5efd2303504bb59252d343c85b235483392c1d1b6b28b64c095 SHA512 b08c9281dbbe65698a8986c119a4ab5716eefc4949ffc501df63dbb8694d0ef901465e71dbef78604e9a8439176d77dd178ce03137c56f924a94379253f31d4b
-EBUILD kompare-18.12.0.ebuild 919 BLAKE2B 095b4967852bc1012bba1d053a26caf07408da6c51d184a291d14beb40bbf36ab164263f68e7ee29a66e1cc71d4548532d1e2837eeb2b8c93346237343f767f4 SHA512 61c5f52ee3b75841e4d7ef5a162190050be35b91027290d25681e5862076db8bef018fef709370c399734d6c9e073c65ce3ae57224348db1308f594c8dea8183
+EBUILD kompare-18.12.1.ebuild 919 BLAKE2B a034ff346604baae848846535e6539ecb9232b52493e6b9386e3c6e0691151e26f45c3f8ec93e130e32773ba6975ca31e216c0366ad08afcf7245b474866e8fa SHA512 fc23a1325c9c356ccc2317e093db1c3eb7bbebb5435a38e02f07d6d1561b54fd3b880ba42baefd65fd27407fa29971a52f5bf9b18be5d3ecce738016456322dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-18.12.0.ebuild b/kde-apps/kompare/kompare-18.12.0.ebuild
deleted file mode 100644
index 688b10b3b495..000000000000
--- a/kde-apps/kompare/kompare-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://www.kde.org/applications/development/kompare"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-18.12.1.ebuild b/kde-apps/kompare/kompare-18.12.1.ebuild
new file mode 100644
index 000000000000..d3fc07a6339c
--- /dev/null
+++ b/kde-apps/kompare/kompare-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A program to view the differences between files"
+HOMEPAGE="https://www.kde.org/applications/development/kompare"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 8c6e4370372b..83532f045fac 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,6 +1,6 @@
 AUX konqueror-18.08.3-tidyhtml5.patch 1645 BLAKE2B 9c9edb5f6cf7f40bcce3764c3c778752baeb27b9df55efbba96db603be61f5a1d01257538abaa8ee44e59d13d0942fdf8afd16860018c07c9c232ec7d2538b90 SHA512 98e13b59d94b65dc163827f0b8b85ee8b4d02afa794ff5e3156a6b7ab0a996df3958fe272e766b5799daf1c5cbb746f48c520f01d6a808f0ce19925d3a95e38c
 DIST konqueror-18.08.3.tar.xz 7742624 BLAKE2B 13b4ee924a3ba1f5373c35676ac940ff446aa5d4beb34fc32b34afc80387695e270543ad720a541c249ef560dc04e87b067a7377986778348c5ffb0dcab1e8a9 SHA512 ac7f03c03e8fed6c052350654d7248c35832d8b13ab325afc7d48e1beb321c3016ff57c434e7121fedc12a9e52780390cdcbe2745c290bb52a5f2dab64a7113c
-DIST konqueror-18.12.0.tar.xz 7756100 BLAKE2B 8c95aca3fe46c634a0e8de7c43b8cc826fb038b66a847f51a151cb3a16c459ca4f974f32ea668ac5a247ab2aa73cd55e7d1801362c8429fcee743cbb65d412ec SHA512 045b26702c098591ee09556becdc338f8f359b316cfb0433f4035666ff74d88f8fe6482bbfc00df53d50fef60623b29b943ae380abc1a0b5f6c508203672f3c0
+DIST konqueror-18.12.1.tar.xz 7755864 BLAKE2B c591dbf4a626017d1d94f9678cf3728bff7ea0cf1a8470cab7e652c4db9d3096e73b728a52658dbe2cc1491805dec35ba118165ba05aeebc6708fd5c09b1ca51 SHA512 55de5911b926d9a8867363fcbf2c457d6d9d7b8e53766c53a389ffe7fc2c2b4e0c3c35361bf85d8838b086a9b578ba67ecf86183f4fae99e1b33f22a6ce6da91
 EBUILD konqueror-18.08.3-r1.ebuild 3042 BLAKE2B 8765eea7e54e670282d66e40c1339618e6dc897525772e12aff82bb2e7397e957e40a3e67bb949cf3304b765e67ba01fb94548e6e906eda65ae417649dc63da5 SHA512 60f46ee94d108bd849ee942a49e5113cb5528ea528e5baeec9d6320331845b51c70382d616b14acd30ed40f33c6907715f71f177f1704caa0c758aaadf132e47
-EBUILD konqueror-18.12.0.ebuild 3053 BLAKE2B 1cbe146f7d3850de1b525954a4b464b5a5dd439f6cb7a39dfda8cd4fab6ae1f977163c2c6d98d2d128556d7e02248ac6b0537015770bdc0f3900e4b45082d2ae SHA512 53a0418b201fb22dca2a7fd70b10744e604a9bf8a591abbbfc07f322c1a3eaac8a0dfb32afe717650e393ed55e7f408f7b418a332da6f64e6068c0689facb654
+EBUILD konqueror-18.12.1.ebuild 3138 BLAKE2B f7c26f22b6eaa0b46dba823d8aed0431591c8980dfb5935b6799eae4792793e10b8becb65f89be3d3fd96b8ec15baa045265d06bf3725f788bbda86cf89da456 SHA512 25fc2421a6eb0e77e6b9257875eb638ea23fd84974a523f28e218672b0f370c92a3156caf22404c8b0f601ca0ae168cda3351aa9912b6d59466b8425f429ee15
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-18.12.0.ebuild b/kde-apps/konqueror/konqueror-18.12.0.ebuild
deleted file mode 100644
index 503376e9dc64..000000000000
--- a/kde-apps/konqueror/konqueror-18.12.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://www.kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(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)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/tidy-html5 )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kfmclient:4
-	!kde-apps/konq-plugins
-	!kde-apps/libkonq:5
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	if ! use webengine; then
-		punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepart
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-		elog "For bookmarks support, install keditbookmarks:"
-		elog "kde-apps/keditbookmarks:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/dolphin:${SLOT} ; then
-		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-		elog "kde-apps/dolphin:${SLOT}"
-	fi
-
-	if ! has_version kde-apps/svg:${SLOT} ; then
-		elog "For konqueror to view SVGs, install the svg kpart:"
-		elog "kde-apps/svgpart:${SLOT}"
-	fi
-
-	if ! has_version virtual/jre ; then
-		elog "To use Java on webpages install virtual/jre."
-	fi
-}
diff --git a/kde-apps/konqueror/konqueror-18.12.1.ebuild b/kde-apps/konqueror/konqueror-18.12.1.ebuild
new file mode 100644
index 000000000000..407768a1f142
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.12.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+	https://www.kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities speech tidy +webengine X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(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)
+	sys-libs/zlib
+	speech? ( $(add_qt_dep qtspeech) )
+	tidy? ( app-text/tidy-html5 )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kfmclient:4
+	!kde-apps/konq-plugins
+	!kde-apps/konqueror:4
+	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	if ! use webengine; then
+		punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepart
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tidy LibTidy)
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+			elog "For bookmarks support, install keditbookmarks:"
+			elog "kde-apps/keditbookmarks:${SLOT}"
+		fi
+
+		if ! has_version kde-apps/dolphin:${SLOT} ; then
+			elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+			elog "kde-apps/dolphin:${SLOT}"
+		fi
+
+		if ! has_version kde-apps/svg:${SLOT} ; then
+			elog "For konqueror to view SVGs, install the svg kpart:"
+			elog "kde-apps/svgpart:${SLOT}"
+		fi
+
+		if ! has_version virtual/jre ; then
+			elog "To use Java on webpages install virtual/jre."
+		fi
+	fi
+}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index bb663fd6f811..ed1cfa533d43 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-18.08.3.tar.xz 658764 BLAKE2B 5202b8f5793561947c5acd09b378f5a8ae5e55290612d4caeb1c376315ce4e4b9df03640d6f9e88bc7b5c4bea0963da7552dbedceb83a6a78134fc944842fe55 SHA512 ac6a4534ea111828a140800e6f084047cb41b639fe861fde2c1633872002e7e900b07637681535925845bd35851a9b20f40453d2e91487ed45ebf5f0a69f33f2
-DIST konquest-18.12.0.tar.xz 658540 BLAKE2B e041d5d7d718eb0a53e2abc2ab52b42474e0d27dcd82d046f571fe4da226fe752bdcc3641e5c854233a0f06825f0fee660a10122ea80a379bf5f6e0aa5653384 SHA512 e31499b1b55b6b46fe423ad27ed4c002dc2cb87724daa7132e9a8b244b135cd99fb2e71025bfe1f4e04752cc1836acced05b20e539c5b5fa2fa6d16242a97cec
+DIST konquest-18.12.1.tar.xz 658432 BLAKE2B d8377b263760995352b927ca9df084bbf5abc7503ffab7c42d6ce61b761f14b7b5ea3c5702b2cdd615dae6c43bc4776d5831e6602c8caae1c4bf0ada8f081bee SHA512 016f8690b17b28b5b42045410fe6104cfa086d510985d2a0f0b6b6fe5bc637a6c5fe6de669fb6a69b6b536e98f08d563ac210424e6da85d80534e048399d87da
 EBUILD konquest-18.08.3.ebuild 788 BLAKE2B 66c5cf7bff53da6846739fa72c7409cdbf657acce4b1922a9b018baf395a5d527dfa39796da69e6c044dadab7dc62588288b71abe00920dad42482869bdf82e0 SHA512 b576c9eb4fe29ada3ceec05783144b244ac10ceff1d04c8d70057f73e9a81cea2b5f599171a962a2042bae38b69d152589ba641d3a0610e2c85fddaf33cc567a
-EBUILD konquest-18.12.0.ebuild 790 BLAKE2B c84a2891441794ea069c231fc4f31530ce1f06ce731d19a509f4955444a003a2b14adc3df71f3ef97cc09bf71a0a7486411f26cef8e72ecc5a3663008cb8bfa6 SHA512 ea8de0eddb6570343d3937b589fccd5f02b4881d98c8980dc414de5fa1543018cb2addcdb86c3880d9d45e482c4fc0640d9a59afc0f4f6939b0e330898b10375
+EBUILD konquest-18.12.1.ebuild 790 BLAKE2B d14d56a03dfdcaf1db064541bab6e51dc5e500ca9ac09f4b97613a543c11b585ecfcf641db790800d6554931f99f15bf3391d17732335b99b7a657253cf5afdc SHA512 1fbe3bfa27aeecc0dc1ea512c642f1bd2a569ac6779f6e18b9d8dadde2564a61e07b9fabeed714f54e00cb0f98820b7ad309cdad3e018abaae8041519fa13442
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-18.12.0.ebuild b/kde-apps/konquest/konquest-18.12.0.ebuild
deleted file mode 100644
index e45c88b6a578..000000000000
--- a/kde-apps/konquest/konquest-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="
-	https://www.kde.org/applications/games/konquest/
-	https://games.kde.org/game.php?game=konquest
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/konquest/konquest-18.12.1.ebuild b/kde-apps/konquest/konquest-18.12.1.ebuild
new file mode 100644
index 000000000000..956768888500
--- /dev/null
+++ b/kde-apps/konquest/konquest-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/konquest/
+	https://games.kde.org/game.php?game=konquest
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 0dfd017ee8ee..09e2bb957e6d 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,8 +1,6 @@
 AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee
-AUX konsole-18.12.0-fix-cursor.patch 2392 BLAKE2B 8ceb13cedc0f2a7edc043ba2ca931cd99a2988d87f5e60b23694ed1cbaad44bd116055d10e8c143a812f4b2e74d95f9f8273ebe242640d03d801b398838468b6 SHA512 2e9dc095c19f7be76f220a8a31e4ada7dbb705cad8e92069fa77893c75a76737590cebeae0e1ce30f50d382cae8eb26c4b2e474f5ae0d4fcaee28562c23029fe
-AUX konsole-18.12.0-fix-drawing-box-chars.patch 6037 BLAKE2B 9214a32c9ab66ad6a0cfd7d02a3dd05d4e8dcda067b247322d7a320ebab9a251193906577e1a395ef52d06658e436776cad628e1d6a7ff81bbaf1bed5486e045 SHA512 6439b1c90a37c80c3de0dc16aa1f68eff87e41562c74f86748b99c20702fe14c27cd6a0553284e4c957b70f1d6ef3c645b1b2485a73858cf390fc6603caf48ee
 DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82
-DIST konsole-18.12.0.tar.xz 1093284 BLAKE2B e2a50364d80f1060c705a6ae09e657dcf3461a9903b0485650c57547964b57f99a98b2101e0f7702bf487f386018f40c1d9a96ef9a926fe935e193c7036a2588 SHA512 fce0f46d68453d795c68bc91ebc56c3db8e04e3cd20c5a036d12dd9cf29daf5aed7cd53f5f9af96081c3e6d3b79f52af7e0a127412771fe12ac1e24e09fcee95
+DIST konsole-18.12.1.tar.xz 1093548 BLAKE2B c3ab69b568d7dfa582b220e8b967a57b5f39949afd45c4be03c647d784f673d187ca41220caad2138dfc1a61ac64ba65ccfafb3880b34f001d2e69bae2cbb4cd SHA512 5eae431f624bab778cb7d45de80a7485df92e4d392744b0bcdea5c1fc54e9a557051986bd868f2b2115a0ccae3f8a871531d7095dcbc9e21173395200bf3d9c3
 EBUILD konsole-18.08.3-r1.ebuild 1463 BLAKE2B d8b66938939c560a9a8152e1a3cac2187156e725f80ee1ca1bacc8bdc5e8a2f13de4b287aa049180423feda04a9854fda2835ba23c8e21ec8deae74f34f942a2 SHA512 0114d8802c1863cd68b559c7be971436fd99585e804c84919bcd494d6156967b249e950742a33a4b3f884d5cbfc4da90231310012b5299d5bcae731a0f2d707f
-EBUILD konsole-18.12.0-r2.ebuild 1555 BLAKE2B 5709edac373af0c51f2d5e7e69523e812dd61d0eb7d851cde6a205a9ed6691dd8bd4abe772aaad06c160ea4d2406a3217f738b2b4deb7cbff443ce99c265f09c SHA512 e09cfcf041dd9e3f993bfcd60dce1d15cf06dab5a7ed2cddf75ef8b1423761d83b96b42f7b35e3f2bcdc17c43af3f7f9d5f1ba29e1b42ba5cd02fe50027b7d8e
+EBUILD konsole-18.12.1.ebuild 1419 BLAKE2B ac5911697cb27bb51dc674ef623d2ab4a3db72471bd0220e97366615f891cdd6a240e5b5d3bee5ef213cb04366260bec764e23ba50c04772da993475cb9b4a29 SHA512 98d90ea117098e0fda1b52574091c3a9b1df8e3a849f0c98758bdbd3ab60beda5258c8c04a17e8184d0f23f2ca1d817512b4cde542b5d1a0f65b4086f20853d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
deleted file mode 100644
index 36aabaaccc54..000000000000
--- a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Mon, 10 Dec 2018 10:09:35 -0500
-Subject: fix cursor when anti aliasing is enabled
-
-Summary:
-When there is a margin of 1 pixel, but some of the anti-aliasing
-"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when
-it regains focus), but not when just some content updates in the
-window.   Without this it draws outside the content rect, most
-visible as a vertical line if the cursor is completely to the left and
-then moves.
-
-Reviewers: #konsole, hindenburg
-
-Reviewed By: #konsole, hindenburg
-
-Subscribers: pbraun, konsole-devel, #konsole
-
-Tags: #konsole
-
-Differential Revision: https://phabricator.kde.org/D17414
-
-(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932)
----
- src/TerminalDisplay.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 6e8b262..64c831c 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter,
- 
-     // shift rectangle top down one pixel to leave some space
-     // between top and bottom
--    QRect cursorRect = rect.adjusted(0, 1, 0, 0);
-+    QRectF cursorRect = rect.adjusted(0, 1, 0, 0);
- 
-     QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor;
-     painter.setPen(cursorColor);
-@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter,
-         // draw the cursor outline, adjusting the area so that
-         // it is draw entirely inside 'rect'
-         int penWidth = qMax(1, painter.pen().width());
--        painter.drawRect(cursorRect.adjusted(penWidth / 2,
--                                             penWidth / 2,
--                                             - penWidth / 2 - penWidth % 2,
--                                             - penWidth / 2 - penWidth % 2));
-+        painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5,
-+                                             penWidth / 2 + 0.5,
-+                                             - penWidth / 2 - penWidth % 2 + 0.5,
-+                                             - penWidth / 2 - penWidth % 2 + 0.5));
- 
-         // draw the cursor body only when the widget has focus
-         if (hasFocus()) {
--- 
-cgit v1.1
diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
deleted file mode 100644
index 1847543737af..000000000000
--- a/kde-apps/konsole/files/konsole-18.12.0-fix-drawing-box-chars.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 807ac77061604c2ac7cf84b0a0b29dd949a6c634 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Thu, 6 Dec 2018 10:02:41 -0500
-Subject: fix drawing box chars, avoid storing and saving state all the time
-
-Summary:
-to get the box chars to be drawn correctly we need to turn on high
-quality antialiasing in qpainter. in addition only turn it on if
-antialiasing is enabled.
-
-lastly qpainter.save()/restore() is called very often, so try to avoid
-that if it isn't necessary.
-
-BUG: 401463
-
-Test Plan:
-`cat tests/boxes.txt`
-
-old:
-
-{F6428268}
-
-new:
-
-{F6450304}
-
-Reviewers: #konsole, hindenburg
-
-Reviewed By: #konsole, hindenburg
-
-Subscribers: wbauer, konsole-devel, #konsole
-
-Tags: #konsole
-
-Differential Revision: https://phabricator.kde.org/D16947
-
-(cherry picked from commit 14b3c8be2c15ed9711b1308b4a991de4aad5802d)
----
- src/TerminalDisplay.cpp | 45 ++++++++++++++++++++-------------------------
- 1 file changed, 20 insertions(+), 25 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 722e200..2b14556 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -619,7 +619,7 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
- {
-     //Calculate cell midpoints, end points.
-     const int cx = x + w / 2;
--    const int cy = y + h / 2;
-+    const int cy = y + h / 2. - 0.5;
-     const int ex = x + w - 1;
-     const int ey = y + h - 1;
- 
-@@ -671,33 +671,33 @@ static void drawLineChar(QPainter& paint, int x, int y, int w, int h, uchar code
- 
-     //Intersection points.
-     if ((toDraw & Int11) != 0u) {
--        paint.drawPoint(cx - 1, cy - 1);
-+        paint.drawPoint(cx - 2, cy - 2);
-     }
-     if ((toDraw & Int12) != 0u) {
--        paint.drawPoint(cx, cy - 1);
-+        paint.drawPoint(cx - 1, cy - 2);
-     }
-     if ((toDraw & Int13) != 0u) {
--        paint.drawPoint(cx + 1, cy - 1);
-+        paint.drawPoint(cx - 0, cy - 2);
-     }
- 
-     if ((toDraw & Int21) != 0u) {
--        paint.drawPoint(cx - 1, cy);
-+        paint.drawPoint(cx - 2, cy - 1);
-     }
-     if ((toDraw & Int22) != 0u) {
--        paint.drawPoint(cx, cy);
-+        paint.drawPoint(cx - 1, cy - 1);
-     }
-     if ((toDraw & Int23) != 0u) {
--        paint.drawPoint(cx + 1, cy);
-+        paint.drawPoint(cx - 0, cy - 1);
-     }
- 
-     if ((toDraw & Int31) != 0u) {
--        paint.drawPoint(cx - 1, cy + 1);
-+        paint.drawPoint(cx - 2, cy);
-     }
-     if ((toDraw & Int32) != 0u) {
--        paint.drawPoint(cx, cy + 1);
-+        paint.drawPoint(cx - 1, cy);
-     }
-     if ((toDraw & Int33) != 0u) {
--        paint.drawPoint(cx + 1, cy + 1);
-+        paint.drawPoint(cx - 0, cy);
-     }
- }
- 
-@@ -705,7 +705,7 @@ static void drawOtherChar(QPainter& paint, int x, int y, int w, int h, uchar cod
- {
-     //Calculate cell midpoints, end points.
-     const int cx = x + w / 2;
--    const int cy = y + h / 2;
-+    const int cy = y + h / 2. - 0.5; // Compensate for the translation, to match fonts
-     const int ex = x + w - 1;
-     const int ey = y + h - 1;
- 
-@@ -792,16 +792,17 @@ void TerminalDisplay::drawLineCharString(QPainter& painter, int x, int y, const
-         const Character* attributes)
- {
-     painter.save();
--    painter.setRenderHint(QPainter::Antialiasing);
- 
--    const QPen& originalPen = painter.pen();
-+    // For antialiasing, we need to shift it so the single pixel width is in the middle
-+    painter.translate(0.5, 0.5);
- 
-     if (((attributes->rendition & RE_BOLD) != 0) && _boldIntense) {
--        QPen boldPen(originalPen);
--        boldPen.setWidth(3);
-+        QPen boldPen(painter.pen());
-+        boldPen.setWidth(4);
-         painter.setPen(boldPen);
-     }
- 
-+
-     for (int i = 0 ; i < str.length(); i++) {
-         const uchar code = str[i].cell();
-         if (LineChars[code] != 0u) {
-@@ -909,10 +910,10 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const
-         QColor color(backgroundColor);
-         color.setAlpha(qAlpha(_blendColor));
- 
--        painter.save();
-+        const QPainter::CompositionMode originalMode = painter.compositionMode();
-         painter.setCompositionMode(QPainter::CompositionMode_Source);
-         painter.fillRect(rect, color);
--        painter.restore();
-+        painter.setCompositionMode(originalMode);
- #endif
-     } else {
-         painter.fillRect(rect, backgroundColor);
-@@ -1041,8 +1042,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter ,
-                                        const QString& text,
-                                        const Character* style)
- {
--    painter.save();
--
-     // setup painter
-     const QColor foregroundColor = style->foregroundColor.color(_colorTable);
-     const QColor backgroundColor = style->backgroundColor.color(_colorTable);
-@@ -1062,8 +1061,6 @@ void TerminalDisplay::drawTextFragment(QPainter& painter ,
- 
-     // draw text
-     drawCharacters(painter, rect, text, style, invertCharacterColor);
--
--    painter.restore();
- }
- 
- void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
-@@ -1071,8 +1068,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
-         const QString& text,
-         const Character* style)
- {
--    painter.save();
--
-     // Set the colors used to draw to black foreground and white
-     // background for printer friendly output when printing
-     Character print_style = *style;
-@@ -1081,8 +1076,6 @@ void TerminalDisplay::drawPrinterFriendlyTextFragment(QPainter& painter,
- 
-     // draw text
-     drawCharacters(painter, rect, text, &print_style, false);
--
--    painter.restore();
- }
- 
- void TerminalDisplay::setRandomSeed(uint randomSeed)
-@@ -1499,6 +1492,8 @@ void TerminalDisplay::paintEvent(QPaintEvent* pe)
-         drawBackground(paint, rect, getBackgroundColor(), true /* use opacity setting */);
-     }
- 
-+    paint.setRenderHint(QPainter::Antialiasing, _antialiasText);
-+
-     foreach(const QRect & rect, dirtyImageRegion.rects()) {
-         drawContents(paint, rect);
-     }
--- 
-cgit v1.1
diff --git a/kde-apps/konsole/konsole-18.12.0-r2.ebuild b/kde-apps/konsole/konsole-18.12.0-r2.ebuild
deleted file mode 100644
index abc36ad9309f..000000000000
--- a/kde-apps/konsole/konsole-18.12.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 knewstuff)
-	$(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}-fix-drawing-box-chars.patch" # fixed in 18.12.1
-	"${FILESDIR}/${P}-fix-cursor.patch" # fixed in 18.12.1
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-18.12.1.ebuild b/kde-apps/konsole/konsole-18.12.1.ebuild
new file mode 100644
index 000000000000..e7071be9cf1d
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 knewstuff)
+	$(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}"
+
+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 ab48b261c1cf..12a0b759aece 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-18.08.3.tar.xz 225844 BLAKE2B 7c0e6689049a7bd022cc5b9e1201244997b20b944f9e350e71ea0f9cd7954e2e07a3ebf431c455c925f7180880d127ba590debf16ca2544bfa762efad33ac547 SHA512 f858d8eb2b79b999459d04ccf8e8a05c53c7275b6b3cd2f80224da42f280a4d2a4d6738a235c1f3bb4b40e36d605310cda01097678441b5c4a94698fdf42097d
-DIST akonadi-calendar-tools-18.12.0.tar.xz 225048 BLAKE2B 9cd9f65b11a7bf848c246e5ee627e3ec9a7dadc21402e86821d2db9443f9fb8d8fc2763b28dba8fc4bb8b82352d0130e05ff93b804297c68c3c72669200bc2e0 SHA512 e230bd5a71ab10ac7cde4696ce29e46f06011826b581988cc29d5703732dd3be1443f9ec686fafa08fe6c769a5b05d1fc66b5f0fa99aa0c932177ec09f472ef6
+DIST akonadi-calendar-tools-18.12.1.tar.xz 224972 BLAKE2B 069371fa75c1c5c467553fdbc17bb9977a09cc376559ea656f5219ba4911814c0263f157676d289e4064d0afd730c91998cc574a1ce82853f15aba3be904bc38 SHA512 bb9c78c793863a124fdc102a83689550c6d7154fbf3f514cf4fbc3d3cf8a8083d8e4d2f09d55f3b47eda916b2919eab1ee3fd189183080cb45db9802af98445a
 EBUILD konsolekalendar-18.08.3.ebuild 939 BLAKE2B e37f9b52e4e697fd45d502a04c94ea1e4b4ce48e3837ca94907f5fd52c67e7046af48cde1a1e99f7423a16bd34b5d796ef5264cc48e80ec137ed5afc36767bf3 SHA512 045b9e676b4a707a761f732ea774a906b10817bfae92a2cbd112e7b774591d1818fc7d2bcc143cafb3f925dfa41b8b73dd152ae77aaab139655e75528920f0c2
-EBUILD konsolekalendar-18.12.0.ebuild 941 BLAKE2B e780558a1832530137a7c98f20e4df2230a3996883f0fd8a2aa687fd2864c8c90d6a3c77f3b7fe4a8ae4eb724b29289b8d9e513af63a623b036397c143ada218 SHA512 3c189382d6b13e0ba53599fe4c3f0cccc72a1c702db4f2c37e06ac594106ba62d207d24038bbb10d078910813b095fdc4c3f535f484f12efe2eb31ed78bee593
+EBUILD konsolekalendar-18.12.1.ebuild 970 BLAKE2B 0b112c0cbd3eba08e65c13359a218e3824d926ac068e67bf272dae38e1bac2f33be78272ffa25e5f86f2a1795e2c357cc7012a8b0dc0056bf5bff96affda2eb5 SHA512 2b4a92997f6b9115c0d74d85e6c3221b94546328e53a634970873d80f3d210892675c2ff7dd1f9548d66b77048a42d7bd191e0b573cd4e39ef4ac85aa8018afa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.0.ebuild
deleted file mode 100644
index 7a038070c7e8..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild
new file mode 100644
index 000000000000..6b040a998b3d
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/konsolekalendar:4
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 9395124a1e42..8caead4810bd 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-18.08.3.tar.xz 864428 BLAKE2B 613eceb643a62ef912a4c48c5124fb90458bb45af0aed5987e557f0783a9e2e825e0a78e56024e0469a30053c5fdddc918eb103ce654ccb12afd69b308617da2 SHA512 26dded6a7bf8fdcc273aca194c4920ed5cc2017d7e5b092282a0f72d9d73c6f77e793e7467c280707351e393d81b1c1500be4faaa4b75fe51452a31b659fc091
-DIST kontact-18.12.0.tar.xz 792068 BLAKE2B 18ef8533c3eea7f211cd35223ddc99a1a1e9f73ef5178129df7aff08d9fe1a152cee8f30b854a59cd0f70cee4582e1c4aea057bb4d5723a39fdd6dcb68f49363 SHA512 349991ab22b005fd87caeefc7c79d15ef5b0ee84f8b53ef22f06746aefcb7395b92b5b3c28a9a4b5b88e676db48d6e1ef61ee08e521ba57f981dc1582c4b868b
+DIST kontact-18.12.1.tar.xz 792032 BLAKE2B 04a6670819a1a1dc2e0c2e8400ab6d9d6d9ece78b90354cb765e36c8143e23403aca2a36ff3fae0bd75da4cf6b40e792abe80e15fd4743b188e5c48f925bbc6e SHA512 0f037f285e0d5f1b0538005144f77f8237cd9d18f6ab0afab0ae4c7896cff297b420a68297d3c4259b9c69fc9f0c58cdfe42d0d2df43c927a5afc5400e478d90
 EBUILD kontact-18.08.3.ebuild 1198 BLAKE2B 9e3969a3bb9339e3866a174221220b63ba62feb2442358ad9990a1851bff5e7d34b10ce80afa12530ad018dbb39cf4e75886d2fe23453e1c7a9fadd5ea514506 SHA512 9ac9e17ce9aa1306c4a7e3390cde863f29ce2e07b0d035de6f5c98743d0cfb19072dbdbe58f414b5e307fc99f22f9ac927711f9a95af6562efecd1c9e7a7a7e1
-EBUILD kontact-18.12.0.ebuild 1200 BLAKE2B 55150e69bdc82295562dae9646db00854f15de36efc3270ba23f6c2867169d7e8d1c6782bb60e148088a63390f51b01c559adb67e8ba0838c312d8cf6405addc SHA512 c56cdd26bd62757da6da55f6547da4757176548410d5c724def69fed4da60fa05ee1e18e7eb37d4ac96103fef58032151a9279a1161d53ecdd73634e0d8a23da
+EBUILD kontact-18.12.1.ebuild 1221 BLAKE2B 4e3ea4cdbe509dec66e6cc290fae4d1bcb35cf5a59f85a89c9ecf984d58c194969dd1dac338cfb45306da3fbe063ca1f89288b0fadd7dca82be388c4fc68ab9e SHA512 f656c1e9f1f88f865b02a498b8965ab872e72688b95f3a0ce7853b4c5187589a3d624c5a8f42552a41acce0637e9968ed62f0958d689aaa7e256883ffdd5af01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-18.12.0.ebuild b/kde-apps/kontact/kontact-18.12.0.ebuild
deleted file mode 100644
index 69556fe33a42..000000000000
--- a/kde-apps/kontact/kontact-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(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 grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontact/kontact-18.12.1.ebuild b/kde-apps/kontact/kontact-18.12.1.ebuild
new file mode 100644
index 000000000000..31acd1a9fa04
--- /dev/null
+++ b/kde-apps/kontact/kontact-18.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(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 grantleetheme)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kontact:4
+"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index bcf48ee19936..3fdf43c6efcc 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-18.08.3.tar.xz 33020 BLAKE2B 23033866f94075610c0daad82d982db51613de0dc0f1175632e1a8532a1eded5ee0600a0d3d2580ab06d5c15a0f71e52073fd0f2a48cb539f200e2b4d6a438b1 SHA512 9aeac4b40862ca30240a7ce0e92ca9921b43fb8b2c5be0f9093361c7f9c1e65ce42c6c53a93dd4180e64463a896682b89cb8ab0b524be9ed18472a02a243e94a
-DIST kontactinterface-18.12.0.tar.xz 32860 BLAKE2B b36183f853eb9dd702d8f30e51aed9d99f5727d6012709e3e7b71ba8d9f5817ca5108ce8e8660aa450c97ce1df0ed6bb3b6adc53e766911f168b310ae3763c5c SHA512 072cf12c0005355475fddf6012dd8b2d6a746cc5a92feb2953147f71868d9bf12a6560978130d9eab4b27ad71ce6e44d15156229822628a9539d876c4d750d98
+DIST kontactinterface-18.12.1.tar.xz 32816 BLAKE2B 5ba6a937596d66d0ef765c3696b0cac31685315f086b592ef6f9084293318a1d1528df6c6948e8af49736176217ed26cbea3ad475229ce498abcfdeeecd48f74 SHA512 af1b004bd2ecb40337b9a2d5e54d23d5593d4d62ad11586dd5361c44ddb41485fbaeaa88be34390072d2615cf6a7fbd6ae131a72c4883461cb34a246cea7ceeb
 EBUILD kontactinterface-18.08.3.ebuild 589 BLAKE2B cbb5c5fdc6edd4abc19409cd6933a6286eecde5d1a763dc23bb9a9854a9edc92705fcd5abc78b86c012a381a8da54e9c3262e134bace66a71be4095d899b7b71 SHA512 f7647e386c681653a1bfed377b4da288bcf22bf608dae0682a62f08b07bb56a9985397183ebfc4cf01fd2ca952a5279ebdfb7ecaf25bb5bda6906e5eebed0aa4
-EBUILD kontactinterface-18.12.0.ebuild 591 BLAKE2B 305563996029b4b26068ba099686d2c3ed01dd70dad151c6bb5d2d3be13fa5514948b577add05d326fe3c457c431dba495b56cd6f7dbd85e3cc30b016edd3db5 SHA512 abf6a9887906fe1c3b69babe365a39caa709699d619aa55057c4b56e316da036b89e0e433807dc76f25fd3be8c6d23cb247126c94426ab0a701618d8e970b134
+EBUILD kontactinterface-18.12.1.ebuild 591 BLAKE2B fe067aa3ebbf15c0bfe5cb11d049495ea7d90be887308941fdc2f5f99f87607c018d1ffd1d200fa529356dc983559fc79195e805e30751492c557a13c51c63be SHA512 fec95fa836729d8a49a867827c286dc52853cbf8e49b0ffbe130965364a5175c41e517474ad032b1bb56a67c760bd15d7f3ef6cec4e3292a6e2fe95c1024a0fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-18.12.0.ebuild b/kde-apps/kontactinterface/kontactinterface-18.12.0.ebuild
deleted file mode 100644
index ec6d4a14ce0f..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontactinterface/kontactinterface-18.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-18.12.1.ebuild
new file mode 100644
index 000000000000..cc0709d4415a
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index eea820100cab..5f091442a356 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kopete-18.08.3.tar.xz 9382668 BLAKE2B 3a45ca45c89dada7aab805997c66c58d3cd68294acf15cca738e5246cc4c23b45ce96869e0a126a0cacb545b919e4ae1490a967cc6ae5bc59f806d18d400507d SHA512 411222369e82395610604e62794442bd34e3916a8874533873debe29afb42dc24877137ceebb6872f2ec3717a80a6a6b14242d2549892dce6573668a2f8ac02c
-DIST kopete-18.12.0.tar.xz 9346732 BLAKE2B 0ede322180d0609890ff947f3994999fecd88d67857bb0aeb8e6c58d59a1e7a5346e0abd7d9ae103f7f24d5691d1af2adf60f84a6c70c37abe16931976c1a022 SHA512 9400cf572cd1ad47dd1f9f491fe85376fc8b8232ffa59d2c2c68efb930cc013ee8d264e88cdb86fce7736c4cf061ad2c79d90854b961d660f5fb517f27f6c43a
+DIST kopete-18.12.1.tar.xz 9346024 BLAKE2B 747f10fb1b93b43b9e90c1033fd6809da03c8413eee3ea39d87419dc92a08f8405b26b7453fb757e4e92b34500a52a89759378a230103ef01e0ee0791396a7aa SHA512 4c81126ad44e09cde6dc9959b5543c83c4593ef24b29e5763bc9a1f4abdf93f726ab44fb104097c7db21940391cb308d5b1a2f3006b4a2f9b9069018a2b21edc
 EBUILD kopete-18.08.3.ebuild 4510 BLAKE2B 38fe478e55503659c0ed71a43d5e40f61419549d78fba5eb1eba291af818dbebd4f69adee7b0a16d29c844c529629bcf771dd6304de3132eddfbe503c7c5e706 SHA512 221894084ce809fc7837a0a9e3ac784e40ec2ac51a5aa25338c99af15df3877c0934ea8b059f1e93a4bb4b78bce4756f0c67ea3da8efb1e7523eee229ebb28fd
-EBUILD kopete-18.12.0.ebuild 4512 BLAKE2B a34b186d39677ec5c3bb3df6ca7532f0277deee6cdea1440c98feaa9dc3cbe448f4584d23450da3130b75407a7f8fb67e28ddf0218a1fe4432a81d786ec063fe SHA512 14d6ac96d48a6ab6ba086b517f08d147c6533420cf5f8ca1cb260b84515612008d6696b1691297350d88e4dac7599a0dea6c92b58c4af272968955dfc44a7342
+EBUILD kopete-18.12.1.ebuild 4532 BLAKE2B aa1a30e532933db21c9de7372315b7a15218d5a110b0567c3b9fbc4e1fbf9bf4b4ca2d879b20cbdc5ccba5ec1e2837f51c9b8317fd9c851800a9c2b37ce1ca7a SHA512 c38a7954045d84c510a03912e5c21d74b9845b5a662398bbcedd162cc3ea22be2c06f75bf2936d6c28f1eeafd3e27431fbebba64665d4cb5146bac82dda69f4c
 MISC metadata.xml 2031 BLAKE2B 10d27c95c13f44ac3a3149072350e9434ef5b88c2dc4d493bd628d398e531de6a0d7b25071981246da3d53cd5aaff20d392b32d358da3af3f4238fc76143f6b0 SHA512 790e5f6a88bf63533cc6555b44b1a4fd43fd9697d4dac284b0770d67b5dea6cbaa33d399f8ac653d976bb12a29ae583cacc734f2c2bc63be9363ef4921efc568
diff --git a/kde-apps/kopete/kopete-18.12.0.ebuild b/kde-apps/kopete/kopete-18.12.0.ebuild
deleted file mode 100644
index a35312c6fbb2..000000000000
--- a/kde-apps/kopete/kopete-18.12.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
-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
-#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
-#	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
-#	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)
-#	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
-
-# disabled protocols
-#	irc: NO DEPS
-#	qq: NO DEPS
-#	telepathy: net-libs/decibel
-#	skype, sms (until fixed)
-
-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(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
-	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:0=
-		sys-libs/zlib:=
-	)
-	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-"
-RDEPEND="${COMMONDEPEND}
-	!kde-apps/kde4-l10n
-	latex? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-		virtual/latex-base
-	)
-	ssl? ( app-crypt/qca:2[ssl] )
-"
-#	sms? ( app-mobilephone/smssend )
-#	winpopup? ( net-fs/samba )
-DEPEND="${COMMONDEPEND}
-	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
-"
-
-src_configure() {
-	local x x2
-	# Handle common stuff
-	local mycmakeargs=(
-		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
-		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
-	)
-	# enable protocols
-	for x in ${PROTOCOLS}; do
-		case ${x/+/} in
-			jingle) x2=libjingle ;;
-			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/kopete/kopete-18.12.1.ebuild b/kde-apps/kopete/kopete-18.12.1.ebuild
new file mode 100644
index 000000000000..2738349796d1
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.12.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/Kopete https://www.kde.org/applications/internet/kopete"
+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
+#	cryptography: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	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
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	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)
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+
+# disabled protocols
+#	irc: NO DEPS
+#	qq: NO DEPS
+#	telepathy: net-libs/decibel
+#	skype, sms (until fixed)
+
+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(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0=
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	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:0=
+		sys-libs/zlib:=
+	)
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	!kde-apps/kde4-l10n
+	!kde-apps/kopete:4
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-base/xorg-proto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			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 a5ceaa7f282c..6b0b7debc831 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-18.08.3.tar.xz 2278088 BLAKE2B 8ff533c434856b674c187594368d84544bfa7bc9c662ee8f12a6600e63df7bcbd739c6610156bde259345260d6aec93b12338b4a5f14cbaeed82a1fc511dd2b0 SHA512 b1290740e1ce7c0734197cd8c3cf040c6cb1cabc89049225ae9beb4fdbae633ecc38a97c55db3228b13e35be238d76f1ab3d8b3efcda85d885823626f60c5549
-DIST korganizer-18.12.0.tar.xz 2232952 BLAKE2B 14b7f0aeb9ae3eda7cd8482d0e8c438014ad78faa4456f0508910fd95ca867252c44c6a158f886834ddf367094d73f740bff7c9790ea0498ea7a25480b5a9961 SHA512 9c38b6dca1548d61b9b58a681365d436dae2aa117345f7026fdca8c422f798a62c1cb5eb9da5ece409a4f6cc5e8b408334a34ab66ccd67aa50ad641af8513337
+DIST korganizer-18.12.1.tar.xz 2232976 BLAKE2B 6fdcd7069556115b41187d3da81628729b423e9459559a025b1a0ffc9dceb4d8de4a2629e61e3912f74a3100696925fc07e10ce8a319194a1de8a49e8b34ab09 SHA512 c00550c8d87855d0eb7d1eb1badc3ee929b07b4a7bf21a78a04a7ca15073ebba1f47e9303ec7c81335b4bf821b12c467f993ad23925937e3ec47d17de0316c99
 EBUILD korganizer-18.08.3.ebuild 2438 BLAKE2B cfa6b77d1c96f94046b4a1f1fcb314ff0fe50d18cf542405306009acd408ed8e623e81f9a54f81eecdfa549a9fd03681cf20b3478ddf3722313dbad5fffe2740 SHA512 c751af95eb58acf7a9450a5d6d3555fb01f04f3765b2e00244ac1a95d7c4ca7497cd6aab7ccc01f93121d58f476793de8726aac9d38326d05eab196bc46151a2
-EBUILD korganizer-18.12.0.ebuild 2440 BLAKE2B 6f2c589d1d0d93cd6c9f03798edeac833bd5e2baeb9e906af87286a06bb11cfcabd3a5c8233c1ee68c1c963f3c91999109d9675ed207969b7c467053376de1e0 SHA512 8bc92ca8b4b7a57515c61255d364c833e080510ba474da58daab771a4d82b1ca762310ce183d6caceefc47879c457830f8ea1d34e54fd5c4aebbe4843d5677a9
+EBUILD korganizer-18.12.1.ebuild 2464 BLAKE2B 146a9b2449b625646e711d6d50f8293e20d11f895ae8c59b48c2d5f11475a01c4f12534b5370af40bf63df985dac9043615470d141911daf1bd05156e23012fb SHA512 78511a65cba235d7fdf29f338bab34c6e335da947690d54d6ad8281237984a4e278d063bba20a85bea374ca4ae555ced75bac04077006726d68f00717f41bc86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-18.12.0.ebuild b/kde-apps/korganizer/korganizer-18.12.0.ebuild
deleted file mode 100644
index c8488051ea9f..000000000000
--- a/kde-apps/korganizer/korganizer-18.12.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 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)
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-18.12.1.ebuild b/kde-apps/korganizer/korganizer-18.12.1.ebuild
new file mode 100644
index 000000000000..baee0100f6bd
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-18.12.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 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
+	!kde-apps/korganizer:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index dc122e37922a..d6f977e5cc8a 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,4 +1,4 @@
 AUX kpat-18.04.3-qt-5.11.patch 568 BLAKE2B edb523a493613cff7a3f56d434c79052b178a7b26e9b2352d761af961ae4abbbbcfb969a8bd3df72d750e737a0649247635a540c9309190962335f8cc498e7bd SHA512 ba6ad3d6cf110b5ef3a618dcd20f17cb1a97249c1a1105cfe11369bf1b249fb7d8a1f7f7c6077aa91af14217829959a848a3f382931e49edbecce8f5b6d4ea12
 DIST kpat-18.04.3.tar.xz 3565116 BLAKE2B 3b61d26df58e6c502f45acdf3ece92d400301c6e8087fe00034d56f4acbbf047cb5ffe391345cde20b5ed69317cd703ecf1871c891e192e53d91eba73d6e4c8e SHA512 bd325d52faad7200d5aa1738cc539d8f285c4b9cb67e2f63837379fc89b4adb8873433df01392447e69546db04698b2f108613fe0a3001bf7c77dbda0bd73acf
-EBUILD kpat-18.04.3.ebuild 943 BLAKE2B 4556072482bf996c91f101c4c2c770a578b9f68dda46a5c3dd383e7add8b6aa6edc055cde56640a3f89ddde01cae295f7160a2f4a530c09f060c1e9a8454cbe6 SHA512 17a5ecb87bffec8d68f4e858c2cf0b40f240dc357d5fc277ff497968dd23adf696eb01753ada055e17e7408ee4e96c31cfc6cba33da27082bab65b78dc5644f4
+EBUILD kpat-18.04.3.ebuild 962 BLAKE2B b851e3b1878a0e6bf5a60abf38c97bac2dd8efb37ad7a1c32468c561af08ca5563ce932504ddce5f0173823e6488b7bfa925a7168dc9873de624c68debbaed29 SHA512 31d55c07a1a397fd578090625a3d9ff777b08fea4b65e68c27fc38f9619e7da78693738483a6e8c0b008a89161ad8d070496426a712ef42b8cb9a07b448b6070
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-18.04.3.ebuild b/kde-apps/kpat/kpat-18.04.3.ebuild
index f6681caac28b..24d04644fc62 100644
--- a/kde-apps/kpat/kpat-18.04.3.ebuild
+++ b/kde-apps/kpat/kpat-18.04.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,8 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	x11-misc/shared-mime-info
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!kde-apps/kpat:4
+"
 
 PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 1f9f9bd5e411..a6672239ef60 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-18.08.3.tar.xz 143012 BLAKE2B 157a6231e2def27b89781c29c99c73f8c35cf6e60bc6b5e293e9aa1eb78be65dad5a24485500193e9156c1fe2986dc75d7e8e80d3692e5ce1001d590fd2f5229 SHA512 3a5ca2c2fc30f1c961a6f8b76a01c29be4b36c4e512e3c0cfaaa36c95fa9ba548f0d56cca3b9be86f2453c5c4be990b031cb2cd52a0747e1ab8af798156a7da7
-DIST kpimtextedit-18.12.0.tar.xz 142472 BLAKE2B 64957360e1144d318747b3d7ef40712b3260fe7c66de5f95e5ec3d46494326c3fb63917ba1189845f78a2c26c382f5698b077aa01b95e3bfa21b1cd1deef0355 SHA512 72b3430844710f7b6840402f6e94798d5566e5b97dacaa246a097b85bafa31a02e293f930b183f565ac61a64f4353e885764094728098559afd5b7c5e288909f
+DIST kpimtextedit-18.12.1.tar.xz 142852 BLAKE2B 6dbb5ec21b26dbf019ce851066a341844ef2e5149bf5ba13c9c820d3084c2361befe90f96788a12a5d30514a196c050feb5c289d268bd21223359acc57db7553 SHA512 93af30e10ffb1ed34ebbf10266c035595f5681a925d03914d151d4a59152153d86e402fbf9e48e1ec10795e02fbc12532bee613e16bd1b5650d4b319f56fb444
 EBUILD kpimtextedit-18.08.3.ebuild 1126 BLAKE2B 9cc1f3938f65a86634fc8ece24faa8d03da54f951c13a777f0d4a4108bfc4ea34b8edbb442350b996836f45d73745fd1d3a5228a2f98eaa4556c12bab8a9b83f SHA512 f73cdf8c965360617aa9f43e862bdce21b0305ce360578c93e1bacb507863e590da194591b113ee2e952a2a6d5a8707c23b063ed4baa76f71474678fddec38e5
-EBUILD kpimtextedit-18.12.0.ebuild 987 BLAKE2B a5be845edce2b73fee5e6c09357d3a0932dec5bc33acb53bbeaccdbb5db66618c4446b78347f73b4752412f1786c1ae4e633c00474cd51663289636bc9d7e46e SHA512 074ffb976a7cde33bd7d836eb07009847f8d064bb17496b5415a0a2c4bf8b64e6a0df40855088fc4aed41d877d09a2ad15a7d15103483e694539195da1804daf
+EBUILD kpimtextedit-18.12.1.ebuild 987 BLAKE2B 4cfd547c4f688b18c260a730dc3ada7f052b07779ceb2da2b50175742c69468510f35bab227a67fdbe807c10e934501080eb554e55b5d5974fdc9166b2896084 SHA512 a32e44851218fb6ac4e42a2bacd3046fd2d91d0395e650cffb5e13f0bae8eb7310068a0741159302ff453dcf996344334c85d5654794cfab27a2f7c0a27779af
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.12.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.12.0.ebuild
deleted file mode 100644
index 52842fcf41f5..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.12.1.ebuild
new file mode 100644
index 000000000000..8408949a9177
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="A textedit with PIM-specific features"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index a53fde85137b..3e5463990aec 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
 DIST kpkpass-18.08.3.tar.xz 22924 BLAKE2B 357aa5dec52adf5e9de61d88b8971b9c6b50250d81957a3ffda93d1a682c02be755e1224c514bd56f56d0a9de408190a7a4cb277186bc1cb0891800531f76fd6 SHA512 391d618dfb6378d8665156df7b7a2123ef87cfe07fe8a5352ddd492b6603bc7f83fa06c7ab23ce63d02ddc423b753d6b848e6a1c25d14b49d19290e2cdae5066
-DIST kpkpass-18.12.0.tar.xz 23220 BLAKE2B 506ce09a08140391e9ed7e170b34eaf32abeec2d5e0daf0179cb5d8cd2389518da49d2bf81ab820bba7232cc70e0fae353bce3856e14abdb876c2388ecef63d4 SHA512 8c1fa70149544739b5b96f1c6b4a25ebade5fa944b004c8a32e19a759c8939cd402196d5a7f91962a2221d57050555349c777437b7ae79a73b3406f1be5a51f3
+DIST kpkpass-18.12.1.tar.xz 23216 BLAKE2B 376515b38a5a6061eecb3715aed96a538c0387ecc27570517555b11c3aa6879da29c3a36aba6d2fd1dd90f6773e0a6ebf4abe99f9137de12a9c725236920d2ee SHA512 a3e9a22f81b4c567b846cbac6da71cd5a8c216b6aa16cdbbdc9442b4462ee9d3f3c687df3676f3b3a6bd11a25db51994f4ef1cf3b65943c96da503279ab664a7
 EBUILD kpkpass-18.08.3.ebuild 467 BLAKE2B 1d87103ae63ce670395f1ea4bee0278ad493fc5543dd6b937b1a40433f0e4e7de48635a2167f1126f9912edd66aea0a0341a756ef6c591e1cd0e626571b156ae SHA512 9589f24f3a4924508aa5928cd750ca801170cc7155c1d99039a7feae5e9d5c58356c6e255353102119f0a4efb5ed15cd1d053fe8b6a386dd0a7fabd46253a522
-EBUILD kpkpass-18.12.0.ebuild 469 BLAKE2B b302c2e948dc2ef36e0b0201d476baa53ed8a34c611c2e818582841e4e25bf23a7fd8f121789476a381cf9751946ce470633c59672904e8fc58e6eff42e5e0bc SHA512 d90cfa48b4ee1c433c7d00f1b15a5a0ae2c3868a35caad5dfe3a9e5d5b11c6f0c5fae68e9f1e09523306d2e4a38af18319ad77e436127ed44b75d0c25dcb01be
+EBUILD kpkpass-18.12.1.ebuild 469 BLAKE2B 9dc39e7d7598c0891b16de997de33ed3a0bd2be39fcfd09b1b4234f8f2453e0817843c33b37c1a9a1200b491b9d6e6d8ad50b51fd596d27dd6e5d590c1d1944b SHA512 041bd2ea40941a98fd0b7a7894e2fd85d8938e395554d9d08075b9799a0fa147334c410b139d872c79c54b3230099e4622cb29631a0d2be4cf8b9c154e32a2d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-18.12.0.ebuild b/kde-apps/kpkpass/kpkpass-18.12.0.ebuild
deleted file mode 100644
index 1923f58dfa19..000000000000
--- a/kde-apps/kpkpass/kpkpass-18.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to deal with Apple Wallet pass files"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
diff --git a/kde-apps/kpkpass/kpkpass-18.12.1.ebuild b/kde-apps/kpkpass/kpkpass-18.12.1.ebuild
new file mode 100644
index 000000000000..13f3f492ac72
--- /dev/null
+++ b/kde-apps/kpkpass/kpkpass-18.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library to deal with Apple Wallet pass files"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index b8e7c954e29b..17cc3e9a2358 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-18.08.3.tar.xz 25684 BLAKE2B e5f78ebb48ad33d37cc5bc10aff3070cd105ed87b6e77da7ebd1e1ce8e5dee99364e342343df7d599ea7242d850ac4e6f2f91ca3e03ed35dafe43da4cfaae2c5 SHA512 4736b2cd4aa29171adf2979b3aabad1aa06d9d2bf7ec3ed6c97a267a9de2f7d2350590bd440f93003d60fa42793ca786d240778dddde2f304de41755b50a3e0a
-DIST kqtquickcharts-18.12.0.tar.xz 25688 BLAKE2B 2a21d25e61dc05a68f237518117292e24d42b73b3a0afad8d30db7274a89264058c37e4c01bdade1226a3b7363173cad6b1e4652466fb7eec8ae7c890f647c41 SHA512 bce0e6381c24baf8d1cbab74ab983ab9fcbaf8f98b8b0a2b2a4aaa0ab15537d52c1ccfc97210e4149f05eb8c291daabe2686a273944669d7d7d24061adebb773
+DIST kqtquickcharts-18.12.1.tar.xz 25672 BLAKE2B daff3af3cf6a1f1adc507b1d318c8cdbe90476d2444ba0ae5356f30b601183719c5945f955e72d58dab126c60343b3485f6c328697222956fed2e32b35d52b26 SHA512 122adca24964f86e3a748a9bf41814994861c6ad7403fb591849ee2f5d0bb06579dccbd3f019978da42ddb3ddc2fe38a678632786cb22924e9dce814f73968de
 EBUILD kqtquickcharts-18.08.3.ebuild 305 BLAKE2B f3abc853043c950804c4ce3c38fce195c7109979452212416ea1061b9a35bbb011e917f533f475cc88faac6fd26c8d95de3292585cc7758734e1e27d26c40b4d SHA512 d69c295d541f6a32b5e1812a75cd71f49d3c4a44407aa93547f57203ef2996c62b87b762a7160ad9363de7aeb25957104a2112b09eae2250a1f40d1c13a90f7f
-EBUILD kqtquickcharts-18.12.0.ebuild 307 BLAKE2B 1cde0b04e772a71bd2398d5dc437054699d76f821c791ad3f52f161f571a1244d05417a09cb1fdc1790dca48cce0f945b6920ec373a8aca9a2d355f9259d1876 SHA512 c4fbcabcd0b2cef875304ef929417ac31e02af28070fd2fcb5c93fea77e106b30429b60fbf85d8bf9dcb94f470687838f4d1993b8428e8f4761b335beb879590
+EBUILD kqtquickcharts-18.12.1.ebuild 307 BLAKE2B 78203032a004f47c961eae037ec4db487782c7543eab81a53e58c801bede202dc318555901005d7732a21ab1014673599ee6796fd9c74f8baf057b451c055d63 SHA512 8d17bfe8a0b852fbcd40d44352eaa5b213a481bc077d90b070fcf03bfee08d845dc312a19411717b4270f8e69422f26980d2eb54b16c0c6ddfd998cee45ebfcb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.12.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.12.0.ebuild
deleted file mode 100644
index 2550e18378ac..000000000000
--- a/kde-apps/kqtquickcharts/kqtquickcharts-18.12.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.12.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.12.1.ebuild
new file mode 100644
index 000000000000..4be2adca48f9
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.12.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 3d4d7ac9bcb9..fc216a97c37b 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-18.08.3.tar.xz 1561228 BLAKE2B 1c55b4af1a2ce9553a2de297ce0de02e2c4331360d64220998d340a93e6241a6b9415a6e9bb60eb460ea52a4db384a4469a37014b94656a380d6a1f165e2da96 SHA512 6efd562839d512dc5188b18c3a33b8dd3b13d6021ea211a0c1691100e9948aef27ec3a3beefd213f9e939606f5b7c2bfa6027955369b38d5ad1d10c381d466e8
-DIST krdc-18.12.0.tar.xz 1558304 BLAKE2B 44058739afd921f380639f11acb3dfe87294e885287c609047a52d35a60a23fba92f365c9eac6bf640c8d097fcd5a732fc1516f4b9a43ae8663c5ad456e5aa4c SHA512 006410808635330f4074d855cb3b0f8cb3dd8a502914cf5af756ad28928f77d8ddad24394a4e97332719b653d814717f3656d5103e170214c191d46ac1b9bdc5
+DIST krdc-18.12.1.tar.xz 1419652 BLAKE2B 44a8c9ae97df14296e03634a742c88150cac8313ced7b14b126dbb0007987caa8afebcc1d7cd5ae8e8c7c0e3162de72cf40d1d0e0c62f481d9b220326fb41a41 SHA512 3787656f052c61ce555ec6b17b48d4f9ceb85ae2c5e16f1657f04a4a616fdfbf16b4c0573d70540f210ad73f4f4ebfbadfc885a102bc24d8ffe4103cb095a0cf
 EBUILD krdc-18.08.3.ebuild 1172 BLAKE2B f73eac791c859a7e69e6a199e66d8b4449e87e175135598d9229b72b3abc63816347e7049bc679008f5e34354571540c423627c90cb8e5cef2b34c94d4d6115b SHA512 3be76ff505306d511e8eec7a2ba18601a6a8c3ce82e0c083bff05e41b92a7bb6274320953952501fb07838a2873f6a25f4b5636d76b3361c3e27e81526cee9e5
-EBUILD krdc-18.12.0.ebuild 1174 BLAKE2B 0e5b69b6af85575927b37d3a1ad5825ea3538ca9722a6f76872fc5eb1b35200e9ee4bc87914c460c4a5ffe1accd64003d13bb75610a1eecbeefdf2f82e841012 SHA512 d0f911492c5a5512aa4662b9315626c8f3cc3a5ffa0a03dec568f2131b052d272a6faea3e57b5ae4d234857332e2177ac0fcdf660310f4a48265c5ea2754bb11
+EBUILD krdc-18.12.1.ebuild 1174 BLAKE2B 67d804975d90efb7df416a326ada8ad6b79150d080e4d783e229321c3232e8f30869cf7b2c86ffddd622057c51f0c96ecd8cfa6fc4b31e36cec5d9c3edd634be SHA512 449003b6213a15a4a40623cf2fbc048fa1ee5a8ecb0d488fd1666bb2e692b27c3725f651713937b79e70818511ca2dfd92ed84f277a4d04a8505a678633e24a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-18.12.0.ebuild b/kde-apps/krdc/krdc-18.12.0.ebuild
deleted file mode 100644
index a4556201d51b..000000000000
--- a/kde-apps/krdc/krdc-18.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rdp vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_LibVNCServer=$(usex vnc)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/krdc/krdc-18.12.1.ebuild b/kde-apps/krdc/krdc-18.12.1.ebuild
new file mode 100644
index 000000000000..8f83da05a4ef
--- /dev/null
+++ b/kde-apps/krdc/krdc-18.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rdp vnc"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	vnc? ( >=net-libs/libvncserver-0.9 )
+"
+RDEPEND="${DEPEND}
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibVNCServer=$(usex vnc)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index d4d020c47a5a..88153dc7a36f 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-18.08.3.tar.xz 943584 BLAKE2B 751d0c77ce4bd8bdbf6b6d207fd1ecb4f4217b70b4508af896816eb1947bf000a53cb4a084bb19196da48f7b2c6014ecb4353f67051078a81e9c789b5eb6c9a6 SHA512 e239328b253b8835446638c78ce7931952da4acf162587aff24c69960e56b63890a1a9cbf9e92f1943174e065e962ad7d0d4c00ae3baf69fc109d16ddf7607b0
-DIST kreversi-18.12.0.tar.xz 943036 BLAKE2B 5a35cb25d4c016c95714d349915f5fc746a748f8b688ec1e9eb582355c464b2bd7bf69539edceec422df4d0903a592fd38585010081969e4b2a949ab86181944 SHA512 c1dc910e3da36b4db8d13f8ab7426e304844d6764e0edf52c775d84a6fcd9abc77f78058f8f1d5bb254b77de750cf3d75f54b68ff38854e47d8c73fdad8f1108
+DIST kreversi-18.12.1.tar.xz 942948 BLAKE2B 6fc83f64bcbdeb51f0732c200971d37790971cdd8d3478d91045fcf49e5bc920689323338b98e660bc7bb286ea8c4959fe3b99c6e997e9576ba016ba41b5ec63 SHA512 1d42f43664c9a5acb4f378bd380cda906900b2469ef624eed63ecdbc6e1b71ef1ef78020b743bfb139bc209bfb8ff7499053e0e9db013b28b7aef9349fd9f178
 EBUILD kreversi-18.08.3.ebuild 926 BLAKE2B dac973f1499858bf9cc718a5a89fcbc160fd8e0294430c888e697ba7dc69d5be99c30f55a16b83af2aef26705a7b62e69bd10025c6367b7f408c38e5d289bf71 SHA512 d3e3c697730a02520064accb19ea5c07393e3a857031c1ed0851b16709236cdbdb0ec0faa112ac7cf250b4395c225365c42b9a4879d83545a6fd6b19d21e7c66
-EBUILD kreversi-18.12.0.ebuild 928 BLAKE2B fb1820f2538450e18d2e46dbf8e25ff51ff6add3b21fab50cd5fa7504283b4c00f168423f2de5e4823a7be45afea5647781a8cd9172fb4f4b0014b0638290887 SHA512 45d19b391d545032329fe9001bebda5a3249ea341036fb8bcb35567a34ad23a40e0d8d59f7a7cbfe0b227b8df1be17d33a2fad0dc56a1e2997aed86ebe2c4f59
+EBUILD kreversi-18.12.1.ebuild 928 BLAKE2B 6390fc3a22f5424b686e949d39e4cfe571a502c34799fcfd2c7f4a9daf60197b77171d0be7a79c96d14f6f855dcd6f51204192505931b1d82e5e7bd6eeef3016 SHA512 356209ab43f28a615eb2f152c5dcae10cc341211672f6c42f5379d41ea6bbb43ab472a2d7197d5beef05639922321237bceb79ed07689e2592bf20358944b81f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-18.12.0.ebuild b/kde-apps/kreversi/kreversi-18.12.0.ebuild
deleted file mode 100644
index 37472d2a6294..000000000000
--- a/kde-apps/kreversi/kreversi-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kreversi/
-	https://games.kde.org/game.php?game=kreversi
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kreversi/kreversi-18.12.1.ebuild b/kde-apps/kreversi/kreversi-18.12.1.ebuild
new file mode 100644
index 000000000000..947ebbd60cea
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Board game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kreversi/
+	https://games.kde.org/game.php?game=kreversi
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index a7ae222a5a9c..3968d58c10a2 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,5 +1,5 @@
 DIST krfb-18.08.3.tar.xz 994716 BLAKE2B 0977f9ec1e91f32836758e7fc388effa4a66d56ae4cae5286dec43fc1c143545599ebb190897ebc4ac9b5d136d50e33d6b0dbde655b126b3570fb76f3f58b96e SHA512 7e629b29065b1d2c84cf888bb4c1d65a4d532feac5daafebb9169e0ce92ebd67a1dd6bb99c4b8157a9b7bcd75466a09856ef1f1bcceb656a36685546d66da315
-DIST krfb-18.12.0.tar.xz 992260 BLAKE2B 081da3eef60fc7cf41bbd4f6677a63b8c58412a1954c36a9671bdc3bcc67906e4d2e4f24867cf1faa28c5d472d25b4daca3c222dcb04f6b4f8008f938b615547 SHA512 76e5f148f6dd07783eb0a54f39a45aaa552faffd4ab90be06b11e51042a34334300550135c72462fe1b5a5403d14d51ed1c9eaae87e21b0ebd7a1fbf2956f4d0
+DIST krfb-18.12.1.tar.xz 931608 BLAKE2B 8631e7df668bdbdb0e7eebfed39708856efdae00cd30dc713b5f8edd9f5944eb940b94570437726aa5c5d84c86a8349f0a5c225b138e5c48b89c38ebaa5501d6 SHA512 2a5c0df9501ca8beb6a0ce4ed350c604bfcc9d77ae1507fc1701ad05254db06c975859edee1926d542394e0e5a09e81bbe1c1908a724afafcad2cbd269af76e9
 EBUILD krfb-18.08.3.ebuild 964 BLAKE2B 94b1f5df4ad6bbaaddf35801f375667e371818fe8143d0d628a2a8ee9c1d1c5b7e985f8ca4133163046666371febf8cc479d63c23a864f55e8716d741a25a09d SHA512 ebcf583627862242a41dd91364d972f2b84080b40e942bf3461dc8811e7cf68db5e586e977665fcf6731f3b6f0c7acc448ab57eca36585ea6321bc251eb4df0e
-EBUILD krfb-18.12.0.ebuild 966 BLAKE2B d52ec5424d6d794d704b29a31017d4923ae444063d81de392f8d669a43b8942be0846b83a1b993102ed445bff3f160b98e978f7f7f47551661efad81b7e14dc0 SHA512 723281d0c797ad397da720162a6474e5d2e86d3510b73f379b32f8903061dae09d54a4507d15dd10a2ae837933349cdf913dbeeb5f56803e54db06a5de63c41b
+EBUILD krfb-18.12.1.ebuild 966 BLAKE2B 53228e664f346aba8873022a33db3c6a91c47330f90e0d8a8d256199c18a9696ed2267e2a8be80f7c3790090f7623ce6613da1793f5c2456a1e49069e6d54b70 SHA512 3044a2415deb34615c29c129729e778c679a480d1b8361525f5ac746e283fcc81462fdcec968c1108f1fecffe922bc53685746cc53939d80527a80cb0ed05e7f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-18.12.0.ebuild b/kde-apps/krfb/krfb-18.12.0.ebuild
deleted file mode 100644
index 3c2f257cad90..000000000000
--- a/kde-apps/krfb/krfb-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/krfb/krfb-18.12.1.ebuild b/kde-apps/krfb/krfb-18.12.1.ebuild
new file mode 100644
index 000000000000..114bdb7c5f8a
--- /dev/null
+++ b/kde-apps/krfb/krfb-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="VNC-compatible server to share Plasma desktops"
+HOMEPAGE="https://www.kde.org/applications/system/krfb/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=net-libs/libvncserver-0.9.9
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index aa08248ab3b5..42056c7b6c70 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,5 @@
 DIST kross-interpreters-18.08.3.tar.xz 144820 BLAKE2B 4be475441b0ea9024848460b730a4f026fee8712f767d0bd3f4b98543b39bec09c134f3758de316a75186cf70b3819088fa61bcdc3a1517497fea95d48f7ed61 SHA512 8ad0c10d6a9552bb6306f3aca9af729a80c8682c0416b90e1610a67036a80b84ce85313fcd693023115e5bdb56ea28d63b79704bed4c26d90dcc146f059ce645
-DIST kross-interpreters-18.12.0.tar.xz 144800 BLAKE2B 5d09e05ed13454c4635e2c2ea49e1a77f530eec535ecb19c68d2aabc3f7c175ae077d2c301f54f2b5d91a1c9aa05b39e0f5891c6e72d3f0597b96817c89d15a4 SHA512 4fdb46d2386c1f0d5a6e646b71700a28993e4ec6be29edc3fe42838234441ed23c4e3daa2b038631b91f931816031ce0c86a50890c2e3d0b84a59d4a6c7636e1
+DIST kross-interpreters-18.12.1.tar.xz 144816 BLAKE2B 6bc8f4aca06e90cbfd3628c131d5e06d05a1242dc8f48199d90123f1a7fc0ef25f5de0c811b6c54d776d043ad2885eab1d6cc6b47ec17c3470a9abe08222f83f SHA512 f2c9ce4fcff52fefcb6bf71e88d8ab6e3735e25dce3c78380158f0524547afc2a7b7cd3e139f50a153f9dafd1542aa18e4a911ce21c57d0976cdcaf903c25d1b
 EBUILD kross-interpreters-18.08.3-r1.ebuild 739 BLAKE2B e8b0d50e4367fc5c343862f87474d6d86ee6c932532fa24e8df3a45066de9e0b98566425e3b658f7b0dc5138ed0eaaecf6dadba400ad56d38ea120028ad70785 SHA512 e4e49021524115d083db8b7e346f99f98859778fe4d5b743309e6bea0a773bef0c8533a0596b176f9023aa676e66e6c28aab7213f9f0039441473000eeb44857
-EBUILD kross-interpreters-18.12.0.ebuild 741 BLAKE2B 33e911267e1a792285197fdf666bbad870928666927903a385ecae523044b2a573d572541fd893405ef9b677dea8fe7382f8d653343ffd9a843a312cf1603356 SHA512 21d6f9598da88ca657e6bc283d83c54a3d2e249c02578ad68243bc52ffe27258c76ff95e36af7e84bdfbcd674a922c097f18e8182b6db8f304078661b2f2a243
+EBUILD kross-interpreters-18.12.1.ebuild 741 BLAKE2B 2e0ec630ab5666d2303df0bf110789d82d778c652c04447443961f6220dd69c6139d58789a7eda6cceeb74310049d254ff1bc6565b3bb146c82863829ec97daf SHA512 f4be462b340390c9721273fa9557183e8e5d19ac0f1b7f07fa19af9b038146a46f03c2f7363a20d9b73677a36b78ae51b0f0a9bd6c144e527c8e187cec90981c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.12.0.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.12.0.ebuild
deleted file mode 100644
index 7e529ce23054..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25"
-inherit kde5 python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.12.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.12.1.ebuild
new file mode 100644
index 000000000000..7a5fa9026bd7
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25"
+inherit kde5 python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 7680c8108040..7ae82b49dafc 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +1,5 @@
 DIST kruler-18.08.3.tar.xz 295980 BLAKE2B ea8045968085e42f18486b18ba9c1c4f455812231879785200626ff92dc137d707ab2113617f2e5e3e914f1f4eb281cea5cda812aee193d2ee645198abfeafac SHA512 44be1edab33549e7e00a87c16e2abbdc6cf8aab7ce7b265605b82b74c678d3453b0c694a35af00258446c713e4f6e5e9c0472b02c79a058fd5376217761cdcfd
-DIST kruler-18.12.0.tar.xz 295872 BLAKE2B 79e22dc4b01d293dbb7262ee64ec94d7cb17169f13aaf612fa9c14977c74acd7678f13d8d2b7af0e4e34a572c9905708eb8a67b2ccfef7275e502fdf6f029d71 SHA512 119b7d8c823ec86bf12971186a1c472d133e90e76638fb03d0009348f9f461a70c4389b86fd827991d07dc29e1413b804a51e5b491724821decf948528866e94
+DIST kruler-18.12.1.tar.xz 254564 BLAKE2B 5685addb00e9018e5cbc3f2ee3e1073dfbaef5c71872423bbc89ba0f4e2b108b8b9972667f513f1d82e06cd080e8aca3a3581b4bd7944aa066516fa20e469d71 SHA512 7c0e2aba77f9670ea6ada669855ee78847e49f3a5aeeb2a3d90252c1c4fcf75eb8bd0eb7cfc234972fe8f482f4b22d707917f05c3e21ca9ba0f61d14f0bd1cd3
 EBUILD kruler-18.08.3.ebuild 841 BLAKE2B bc65bdd49333b3695ae378227ed869e8d8f09372eb5d7c5c23938180876048294a751d4c5a3c6ca1ece35de2e1afd95bf7e718d2c00ff0715840328a94a563e6 SHA512 cfcc79c548358aeaa36fbcf4bc7da822b5b695f2d685cdfa7133428331aa9bcd4158cd72010a4f52d4d7aa0323c07a86cc0b5a020be7ce952a2610576e81236d
-EBUILD kruler-18.12.0.ebuild 843 BLAKE2B 562363358514fcf75cbe8773410a79de165329646c6bebaea5995ebba16b8d55f28f0ca2f9b76397e2c558996e691f1e314bb64d25c21348b43e6e46f54e1b9c SHA512 2a226a8c2b4d42f99bea0c370481cc8353f1b09df4c64a62ffb880147e8d97d41d08318beabbd6d1c05cc544428ee59f90086d55e3fe1d19635b490978865e1c
+EBUILD kruler-18.12.1.ebuild 843 BLAKE2B 766b933ec9d9fc2c6c1c13d361f28d80e3a1e0f5f19f5708f249ab356bec6c82d9ba8a782defee0cf78c8730e8d1cff2584a49888a1d86474e151bfbe3a3f1f3 SHA512 a8578eafb25651fa3fd0e587269615f7f1e0f864ce0f69493ee33b798ed36fbde138c6dd60c4c4602538649e1a47c8ec895202edafb999015939e1ba2508dcf9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-18.12.0.ebuild b/kde-apps/kruler/kruler-18.12.0.ebuild
deleted file mode 100644
index 41726831f97e..000000000000
--- a/kde-apps/kruler/kruler-18.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kruler/kruler-18.12.1.ebuild b/kde-apps/kruler/kruler-18.12.1.ebuild
new file mode 100644
index 000000000000..29672c334e0d
--- /dev/null
+++ b/kde-apps/kruler/kruler-18.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index cf59ed4e58b7..9538afeeacbe 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-18.08.3.tar.xz 821192 BLAKE2B 22d548aadb1dc902f0f27443522f8c88402486c36e35abde03e0d69c18f4dedc814c307799c7d66a6023dedff8da75cd94be353c2ffee4f08e30068a262297f3 SHA512 c38205319f142a9cc7b70042ea142fdc0904fe0af8c56056d87269599507b69970f1f45f9f023b02767baa693104bf946314847fb949358f3783f08b0de07581
-DIST kshisen-18.12.0.tar.xz 820884 BLAKE2B 1a3c0bf2ea6aa3ac8064f5eca8f8405f82fce1027cd47e8f57cf0442768fa44beea6483fd9bb4e33ea5ff2f70b5284b65454bbce922bfea27aa40b4cda6c036f SHA512 e3ac23ebd287215de317b3d254cf267b67a006fbb46022b6e29d7cdbd64be5c87e73e407b5987f6652eb2e5779b306a1f62f7bc913497fa5394de35b1f6b801a
+DIST kshisen-18.12.1.tar.xz 820908 BLAKE2B d373005d1c82410e8db6e4448be188b47bd084ecbe39941bd7ccb3b2a2f3f98b398282f2857ee636eeecefb521cf8fbec3317cec8f915b5039fc64a52cb5d8e0 SHA512 b62718442b55b9eb647023fa4cf51186eada83132dc8498a4688b38c0747df845b6723c2a5245554c35bf8a48d3e8b30ec3181e3ba0680a988e31f262d51bd80
 EBUILD kshisen-18.08.3.ebuild 775 BLAKE2B 7cb955009f7e24f80381ce897f1520709e2ed65e09ac807abbd1193ff964c63233bb22b7fe9198f961c636126782eb4d352c81cab9ba6994cd0462f037155678 SHA512 7da46cf3a8a7d184c739971c76b25952e7439175426afb85fa03e860dd561f393add88ce51585704828c3241ca6caffeceffdc09be650eebf6c07becde2f2f50
-EBUILD kshisen-18.12.0.ebuild 777 BLAKE2B 59e8162a41b7d67eb7e5e0cbbd2054faa8d6c64d47169b92fd72652af4489bafda7a8860706435946808adc77f76c0d9711fcd5cc5003f1459c18df128d63cf7 SHA512 4e8e7592673ea11d0f6f11ebf26b20cfe1f8e7ba291720fb2fa6cf6845238ea485e519c425874ede48ef838a2d1c43bc5bb19214e5f933d901acf362f2b05e6d
+EBUILD kshisen-18.12.1.ebuild 777 BLAKE2B 16aefdc5f6d5b5200e765495d9b2821a21094b868a71ee11146af3caf359e9cb6772cf805cfd9957a9d8040122cc4598faab1079bb36855087a39bdd00f7063a SHA512 2dc1df681eb3f209f93a6fb95a4142b5a21f005a748f7d7da22f3fa19e7c5824972026f93c488a80801c47de15218bded478336296ff7c1a7a5ecd6c720d04cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-18.12.0.ebuild b/kde-apps/kshisen/kshisen-18.12.0.ebuild
deleted file mode 100644
index 4f186338f786..000000000000
--- a/kde-apps/kshisen/kshisen-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kshisen/
-	https://games.kde.org/game.php?game=kshisen
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kshisen/kshisen-18.12.1.ebuild b/kde-apps/kshisen/kshisen-18.12.1.ebuild
new file mode 100644
index 000000000000..e47d607f44e7
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kshisen/
+	https://games.kde.org/game.php?game=kshisen
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index be799ba3f1c5..2597bd8e8044 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-18.08.3.tar.xz 6987428 BLAKE2B 5c839b86f86b4298b90e4aee1d3267ef9beca67cf3a2fd48aef32e45696df102a53517523f92ee12302834bcddfb6958e2d9bdb89d607a185ea200ea75060f89 SHA512 59bf76dfe9bf39c485e178a5d95b8b6daaccbdf411aa7447aa55b4ffc146ad7b4bfb3f9b56209ce093baae09a212ca9c6fd5a7cf5dd799fba561be3847c50d20
-DIST ksirk-18.12.0.tar.xz 6988160 BLAKE2B 48b7674703264efedea878d9d589ea5f6acb64ce39a186f81f44ff6d495dff47b0d239392fe706417569e0a3221633a3f516eb42232b4d6c46265a621cbca7bd SHA512 698ce0b5a688fdb1beecb86ef618b6b0a3992a5c8f4bbbce49fb62c8cf10e82b6b833c076ce86aeba8cd429addefd0504d83050ed66b47fbcb5696e5740a8a0a
+DIST ksirk-18.12.1.tar.xz 6987060 BLAKE2B 59d1fdc7699ec9e639946e846cc3577a6a08812e964360e1009f49981bd57bfd5591e791f0fe69425f461f23df8875d2de1744c01668784f38741014d37fda2a SHA512 9a7e6a4ad31f1a220813b7f73813f81ca6a4ada2a78e5b05fe9e0d29ab19b27f5709a43dc119afebc9cf338752141d71e51468bb68c57536f7cb2fcd6aa70dc2
 EBUILD ksirk-18.08.3.ebuild 989 BLAKE2B e9f7c6c507eb357c1366182536acc41d3e3af499b3079e1a7cf2f9e8c748ded72ac49fd6088cb7d36551cf57c362097ea50e340b27fff060f6bbcb5dc3f17103 SHA512 d1fcad9ef71c7a449277530da75cf23f42d401276b49c9e3401f442571a88e9f33cc1b1f135d626695c613f3b2a94e2d5b8b093fbf2288cfef30eb438e952663
-EBUILD ksirk-18.12.0.ebuild 991 BLAKE2B f488d60906403a681d3ef48e2ab1c1d9d14561817bd2202cb32e15733bff9b2fa8fe052482115b2f6a658e3beab5c3fe6292810407c143557a31314ebebce586 SHA512 93d505d61b8ac6f562b9d0da1e5108df5b74d260ee21e6982705e130f9d1b7d1a6266ec88edf09e34118cc40c96341334167ec3a2423276907a680e1fb83e7a1
+EBUILD ksirk-18.12.1.ebuild 991 BLAKE2B 72a00115b4849e12ffe0accd5136172d532e530f21a6cde3926f0b2fc2d4397ceff7262518e006e2f6f93388d8a055cf8ff66fb85f8920b245a92bca238dfabb SHA512 9c400bb24609ebf556c3eeb1109f2bc1d8850dff39defa8190ac7a7ab381d4ba5b733cff27abc6028a8b0729b8d38f82a1e99f9e7c35117aaa80e08247bf4f37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-18.12.0.ebuild b/kde-apps/ksirk/ksirk-18.12.0.ebuild
deleted file mode 100644
index 81150eed5337..000000000000
--- a/kde-apps/ksirk/ksirk-18.12.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksirk/
-	https://games.kde.org/game.php?game=ksirk
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 knewstuff)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/ksirk/ksirk-18.12.1.ebuild b/kde-apps/ksirk/ksirk-18.12.1.ebuild
new file mode 100644
index 000000000000..e84e0f9d4421
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-18.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Port of the board game risk"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksirk/
+	https://games.kde.org/game.php?game=ksirk
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 knewstuff)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index f31e8da9f271..996414e07260 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-18.08.3.tar.xz 38996 BLAKE2B 341e5f8c247494ad868a41754e4a8cabed363eee43d2abfd4d372303e3885583de0758d82dea7c663af60fa3e331bbf2e99224838c48e100771042208a9f9a33 SHA512 80553111da6bc6ca070a68c6de62b3fe28f5938889c78dd227b546c62f0eb712222fa6a49747e627c386ff6bb229b6cb561af0ced804490ea45b028e1107581f
-DIST ksmtp-18.12.0.tar.xz 40112 BLAKE2B 33f79bd9c765e77e1852f0d2afecda17f817b7dee224e826bb6c06714b6b1e12220358341c2c92aa525eee6b7f94b1c272f2dcc8a56ff5cf4c74274ce713fbc2 SHA512 3c5fcf2914f3de909f3f19959b362418046c7903bf8d6a208e761bf6cfab90f538b041624020c4881426ce5a8031a4759d8f40e66e58ddbe3743639ad7ea3c12
+DIST ksmtp-18.12.1.tar.xz 40176 BLAKE2B 30cb89c959d79b582dd600f71781ad8c3f1a7d9ce73a6cfbce560237e2494c9d9a86cdd068ac904e0b193bd786aa91326fadd777a0fa6f66ab3f04fb288da6f9 SHA512 ea8b084dc90725ec618bde7b4f2f0df9a5fbe9ac849f2d26f4ac96c2c45ca0649564beae593e117e7bb7fbcdbb5cf2ab4c3e6ce0f4647a236fccdd6b2c194b93
 EBUILD ksmtp-18.08.3.ebuild 462 BLAKE2B 961031af57e66ca075fae710404d41d21dfb80aecd3cd87cccf2fbfd60972f4a96a90d49e60a23c9ab40c236c8fed022567f114ac3e8deb51b6215194d7863a1 SHA512 6770e7dfd2f5f5ac3941979385101d433dbda1c8b74ebae5fbd036391447c730cb7d6c4bc730c6ac457de1f61612ea3f8cc132b3d0061d685ed2d4f1778d0036
-EBUILD ksmtp-18.12.0.ebuild 464 BLAKE2B 51f2d974c5a5e25bbb7fe37e8bf1bd589c312eb08f5d50945bd7ff59622d0a2e75837f0a03134e4d2c5c5e8f5abda57788cd6c6cb4676d910f2a891d5613d70e SHA512 1aceb2f8eee3d5d7b6991c633066d37f5d965474e643e3e82d1bbda38b471851794925849a3eba275bf234d0dd2222daa0be159316ee344b278ed39a7344b5c8
+EBUILD ksmtp-18.12.1.ebuild 464 BLAKE2B 821925853e4cda675404275e01456757d9f509e2ae7f523149d9a54bda1856484ed88a36387ee5cad61d6b35a91ccc6ecefa46d4e1a80f20d9b16e5d27d31dbc SHA512 f3d039b7418a78d0d5a8ee036654049cc49894ac743ff11c8313ef9c7dbefe6b2f43f478c86edf5a455ed91e2da2913815e259fd23013baea18936bc41fa7b63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-18.12.0.ebuild b/kde-apps/ksmtp/ksmtp-18.12.0.ebuild
deleted file mode 100644
index 33ebc23a9dfb..000000000000
--- a/kde-apps/ksmtp/ksmtp-18.12.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-18.12.1.ebuild b/kde-apps/ksmtp/ksmtp-18.12.1.ebuild
new file mode 100644
index 000000000000..b11454ed709c
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-18.12.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Job-based library to send email through an SMTP server"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+	dev-libs/cyrus-sasl
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 1056a92601b4..ce9d5ceb9ee7 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-18.08.3.tar.xz 605480 BLAKE2B a337c7f7333609c3efff6f80ebe59ae5a107fdac82f93f2962925c94b972b8c19f9ec4a24004f506913b77b2cdbe676622b25c41c37dd2ab798c2feb8468451b SHA512 1948c62da1e348d1cc093a0577af38db8352a25d12608eb1fe20a8a93d93f8b5f9d78b1e8c529a6d269940104c392047291f387426161a34d417eb482243e63f
-DIST ksnakeduel-18.12.0.tar.xz 604952 BLAKE2B 6b59f35bdd752476a42f035b9535ee9210c5b8a64917a30a3509aeaea8dd9028c91318827dbdc09ec7ac30d04655781bc6974a9e1d322a34b5a4f5b0aa7ac221 SHA512 ea9b251d2cfd5f51becd5f4bd8d86e46d54b23d51487c117ec5849b9700df30ad36a3497679c7f2ada2a73ab827ff6ba9bb5e4c53f4ab38b9533fe88c5959539
+DIST ksnakeduel-18.12.1.tar.xz 604912 BLAKE2B e8562098c23ca6cc327cbee9b2b350d58a9677cb0d0eaaaf405c64485f15e1b689c5a170acbf61d5ecefbaca7771e2cff318e1f366f840681ad2610569f840e9 SHA512 5dc6cf75d81496ab3d050c884f3cd50f42143c4f33e17075d1943fc2a7fc5c0df10704d279991c063808d739fdc29bfd331c452d04a0ccf519893c732153cc69
 EBUILD ksnakeduel-18.08.3.ebuild 796 BLAKE2B 038854f6317432c58e616faa756f621b5079a022e3b7d75357140553f965538ebb7ae9f3518716984978d38b473fdecc01549e35eb059a6c025a0cf810641a08 SHA512 5ef04da334e1db752f7637f5b3ed3fe34f4cde54ea15516f8af3edaa18f21814943c6dd751ffc49e00dd9a64c3a8b35dbd15e3cb461f90fd2186280f0cc1e181
-EBUILD ksnakeduel-18.12.0.ebuild 798 BLAKE2B 873e58c9ca92bb30b4237f625cec4e983f095ffa9acfd4bb3cd58d0784ca17354ba04998e8d7bbba04e6ad8f9ebf25c0c3d116a8d453c60fd4df3c47404337fe SHA512 8e2ac131d94d6d3cbb6317590ea44d3c44eeabc7c768f3bbdaadf77c0ac0015ee9816f8c3ebce83925915a10dcd70775c691ddbfcdbd9a40b6f1fc899e9091a8
+EBUILD ksnakeduel-18.12.1.ebuild 798 BLAKE2B 2e8e7f56be045c34ccf3f723e726c3102fd432f471860e2789f2306745dbf01b5cb2e04ad177339220c3a3416f75391e1aeb5dca72c7741a8931ae8d494e1683 SHA512 c8b15effa16732f2dbfa413181738fe1041690a50871660e769aa95740d3d30cd5520c85e2c10b26d78fc99bc9fa27b6812ac54ab3c2f8b92c0466b484572aed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.12.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.12.0.ebuild
deleted file mode 100644
index d7d13364f717..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.12.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.12.1.ebuild
new file mode 100644
index 000000000000..8d12b59ff91a
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index b59162d81f25..72040a892228 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-18.08.3.tar.xz 611248 BLAKE2B 171188b38528f98502b4d53a28b929c75594390c9c3d37b0b2c79b06648beec5f49ef94eb2955cdfe016cbb69a2171e8fa56dc5052d5183b86cc1fcd9d7dad21 SHA512 b69c6deef012f9dd7a4a174920c9791839b1dc6aa3d70b903493018d6169871f32b7fce1ac5ab54c3f45c23f3ffb69737d108c69242522b101d7c98d90136d80
-DIST kspaceduel-18.12.0.tar.xz 610444 BLAKE2B 8edb9d3f7d67d62c269f2dcb06d624c4dcd51089c351d42b65961787d6214a8a7cdad32975f18063e4a0de2ab32f0fe33e8c124f0ae314288c34a41af045d9f9 SHA512 80ad3e7cadf5057b2fd1b4d88b3167695d9dd8889463956ed6b9f46f78675927d78c4d6064c2b3fd274b42b214dd3c5e9e4f6078250ba415bed3096c7835bbcf
+DIST kspaceduel-18.12.1.tar.xz 610400 BLAKE2B f8efdc03c4f8d781a336caead14eadbe537c65e4f2e6011228a1cbb7c4e6f2d9b020185378ce15e80e46e0e2b890c55edde43bea57373b5b48c5677df916ec86 SHA512 91268c092a3e4ae2495fa133527acbc6ff68f3a97ded964abd7579e9146b2f37408e79cd6673b862e4cf9b1cc412903c60416fb958f3f7ac658194c2b2e4feaf
 EBUILD kspaceduel-18.08.3.ebuild 749 BLAKE2B c99d214cd66b1bce9894aed25817891e1141d377bfd31b412595052ae2c8caea7c63449b4ee071e92a4f4f573e866a529fcd3283db358b7c80f7734d25a4855a SHA512 66ae19747122260fe7ada5f7cf977dd96aea29fdf3552a20f27f57e075656599575c4b31fa14fb76bd69b8f015f2a24c044adae5f1964017ecc3469a2b80bae4
-EBUILD kspaceduel-18.12.0.ebuild 751 BLAKE2B b2b0b8f7698f1ec0a2ea607bb1dcd6c7187b2d431452d8b6d4ac2640dfc50d50188b39d9b81c75d371199f756c5babba3849e33e3cfeeb52cc5bd7a268c54f52 SHA512 9fa65bea8f6c8a737b401bdc42e9df94363849514659e05e2c6a0f68309bd9df6a551e063dbad5e1e647d86f135cb5d57451e1d9fd2bb36bbb801bdae90ef947
+EBUILD kspaceduel-18.12.1.ebuild 751 BLAKE2B 00bd0cdb1272177155d91e2dc70d6a858ae5a6b6c97da05f0658f41432f8192d635a687c45b71e42e8973f730c8238908dcc2cf606688d756ecca1a486d239d3 SHA512 efd1c62944e0767251954ea4bbab53609a194e43d3d19897168537f4aac27bc48b097f9f557ef2fc5983aa33b61a22014b4449988b28650ab713eb55c80a2e28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-18.12.0.ebuild b/kde-apps/kspaceduel/kspaceduel-18.12.0.ebuild
deleted file mode 100644
index c76df004541d..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kspaceduel/
-	https://games.kde.org/game.php?game=kspaceduel
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kspaceduel/kspaceduel-18.12.1.ebuild b/kde-apps/kspaceduel/kspaceduel-18.12.1.ebuild
new file mode 100644
index 000000000000..5334834a6d10
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Space Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kspaceduel/
+	https://games.kde.org/game.php?game=kspaceduel
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index efcaa14d6be1..c1d0323c3f2e 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-18.08.3.tar.xz 258964 BLAKE2B 53bfc39bbd8bd4aafd1f3139ce65e09c15e7968653247e344897aaa25b4577c89b6f848fe191859a50572a46519dda52da52873ff775404083f5b0d29d051437 SHA512 0252c5d00a661e29ab82af18d624aee3486a28ff4a58bfe0a4460603430dac6342c9f41231a971e8184c88c2e5b76c54cb5c4fe11d9493eb8026bce02201ee1d
-DIST ksquares-18.12.0.tar.xz 259220 BLAKE2B b9fb1cb9a7d226c148630ac2066ba7f23f8170ade918b1ac762c2ad83bdb0bcdef54198df21ea1e67ef688195e12482fd2fd5375cc91251c40b92bc5771f6ed0 SHA512 2aa8b437ca89483fc3ee41fa88d79911a77f33792ccf384a421a3a037c0b7d8d2446d4c1cf38d3a188d68b4eb263ca68f93a848fb93421d8d137a1c70a4b16b8
+DIST ksquares-18.12.1.tar.xz 259272 BLAKE2B ab517b8bae850045dad8695a4a22823a739aa79eae1b40448a6cc8813097ceffe0485d60ed17ba79cbc77079672da94e8eed5bf5cb3d014923aac1d189d26653 SHA512 f8c565a705fe145de871a4f2c60a672aee7124642e0f425af0570671482d49131c9fd9de822e13ee6d8c17383695d5b7951857f077e3d9fcdff739cf9d8f9018
 EBUILD ksquares-18.08.3.ebuild 750 BLAKE2B b030f205357f597c9a10e161c5e38f36d43f243361c387f1eb9cd3884166a2bdaee780583c8da8b89c112141daa83c6503fe9e6d575373be50d80c238353623b SHA512 048f2e49f709cbb6f29cd187c3d38fb4e5345e32ebe5fd320ffe934ede8f4f00e84cf2e97cc25548ce6d2a830a392047308eefeec8d7986c3f4fd070a39e1909
-EBUILD ksquares-18.12.0.ebuild 752 BLAKE2B 2281dae8912cbc637f330d8acc4953437b96b0bbf53aa6fa867a0f2b56b44bc09dc8ff0d7f9b3bafdd8bf3c8086e6a5aed5129a218fa1302dbcac213c25e27ae SHA512 90509f13a4a869f9b9c8dfdc9f7cdf4c35d6e15c5afdb72bae143fd382704ed31058a22a92b1f5c5e529a9b42514c201fbd3449c242901db1dd807d3125d5e17
+EBUILD ksquares-18.12.1.ebuild 752 BLAKE2B 9226fe0b9f595149c33690543c7b95c69a5ee6f3c6f290b3ffba04ef30f8ff433eb922f382322aea9a0dea1b3d8f0bad2edf42f10fbf040b4711b4dd9738395c SHA512 ef49c2c9532dbd708d62ee30e06cc0d2fbffaa550bde06f346b173ad1dc41f3fe77d3c08a581cf7840230b7c494cd7a5a5c00eb204d227d2427b209ba98fdb4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-18.12.0.ebuild b/kde-apps/ksquares/ksquares-18.12.0.ebuild
deleted file mode 100644
index d3cda5cf1bb6..000000000000
--- a/kde-apps/ksquares/ksquares-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksquares/
-	https://games.kde.org/game.php?game=ksquares
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/ksquares-18.12.1.ebuild b/kde-apps/ksquares/ksquares-18.12.1.ebuild
new file mode 100644
index 000000000000..540be44665a2
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE clone of the game squares"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksquares/
+	https://games.kde.org/game.php?game=ksquares
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 40f8b68595d1..d3ea3939ab58 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-18.08.3.tar.xz 1646020 BLAKE2B 01b53d387832e6a2620d0abceb04fb88d2ea04568e69f998ba0f9b5983aeea255c7da98616f504022e582266d82161962d7184355315a59a83a2b54fd77f072d SHA512 7c57f178a834027d23ed24f0f2b2c76956e204211539845ce275b0eb021a5d2c8dc99e977cdc8f8f26db01f6363875efb6102a8829e880225a917aa016e6e40f
-DIST ksudoku-18.12.0.tar.xz 1645928 BLAKE2B fa851966cd346e5908e1b2b74a703b32451284fac3f941c19e51d4da48442760944bc0115082d536a5cd1f0eb3df646e4c4367fca38d0f0a1d156ad1dcfeb407 SHA512 ce3b6614d5a14f0163c1d3d2130fc8e21048fb8dd8506d359b808a1f3531d6909ca45b23f77c5c9cfd67407d0711706153ffbe92f7b036135fc0a35f186b8ba9
+DIST ksudoku-18.12.1.tar.xz 1645704 BLAKE2B bbdb5f3cd0db8cf0f776b05a2dccbc8588131669aa4b9126a583fa39a8b8acbace2c1f5be9c09686a5b4a9d7f46cce392c0bd30d34b7f85913a5fa8650de8a10 SHA512 acf68e252df73bd66444bbc2696e1c0329117f79971c8e1b6db5ef64ea60d0a6986eda8f3bed1756211ec22ee4da0052815a324e1b66d652107e95c36b873583
 EBUILD ksudoku-18.08.3.ebuild 1131 BLAKE2B ea652220e396bf3a185ecf38aa7efbd7c6eaed87e010fc128ea75b88964d198499eeccd633ad3ca9dcd6fde08859f7cc328a8e85612bdd9bb6d0fa2f411fe029 SHA512 73251afeada1d739a8b2a2567ab671ac0d77665e71227d3a4ff5fe73af33bc684a88a4600cb13d8bc948b2102e7a404893a2005bcb952ffbe3687c288477364f
-EBUILD ksudoku-18.12.0.ebuild 1133 BLAKE2B b7a44ff98cd1020f695f16988d794e4e9db8c8273f52ad493f8ac15e5b59398f85f476db2a9f5612c70f7ba738b81ec18dd6718cdf213b01872697faa8eaee94 SHA512 2342c2a07212cea55b56f5813f92d97d8b6fbaa1df0921f666f881fa8fa131a88d3de0a7233fcc462a1fda9123e76fd4d0ffa9efd3b46af2cf895cb86b56773b
+EBUILD ksudoku-18.12.1.ebuild 1133 BLAKE2B 5c495f6de889af67eaa93247a9a6d8a7060f97725f0ee31d3e492020c0973ed94c42dc97765ac3ba862f65fc6f8c32df40d94c7baed029e0c42c425223ea554c SHA512 91f2b1afc175d543380de0cf3d53a8afa799543a69b077f22ae67cc19ed54c51ee2f8d8e53c2c0e90be4180c4f5e6b80b7b5d4d822452773e06d08742bba57c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-18.12.0.ebuild b/kde-apps/ksudoku/ksudoku-18.12.0.ebuild
deleted file mode 100644
index 9e8e4b863a6d..000000000000
--- a/kde-apps/ksudoku/ksudoku-18.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(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_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ksudoku/ksudoku-18.12.1.ebuild b/kde-apps/ksudoku/ksudoku-18.12.1.ebuild
new file mode 100644
index 000000000000..c1fbd106e81d
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-18.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksudoku/
+	https://games.kde.org/game.php?game=ksudoku
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(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_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/glu
+	)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package opengl OpenGL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 8579cddf0490..401f49aeab43 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-18.08.3.tar.xz 1966776 BLAKE2B f6715026b009296856c9120b0236b4efff681d1cd02d7694db8dde3d8df7a521c0640540ee3b1cfd69d1cf8bf8a6976773a217dcfcacbde5f4aaeb2689786fe9 SHA512 0cdf798c3d6c51851fd3cc2eda04e445a413459ee29d7b98d799a749d21a6a80447bce37651ac22e4b652fc10452dc2fb6408108cce2a968e7fc7f2379b0c915
-DIST ksystemlog-18.12.0.tar.xz 1964412 BLAKE2B 9dceb8df613f7ed2d316bcdf0284f952947fa384660296e516d1c8883c04b82383d7d5dd93cd49c7dedf16e119fbfc8c9ba2c644c200f1189fc737607ba34f7a SHA512 3d22774144f2d2e52926a10b5ff93e1ae9e356fb60457aa9cc6c81535307214d0ab7d4339d221450f42166dfd8153ea608cb03e808d0a66d01a92fdcd63c93c2
+DIST ksystemlog-18.12.1.tar.xz 1924228 BLAKE2B c7742e1f03a0d8eb034ee2ed5b08132361d45335219a4f99eb9e6be857b68aa2794d3d213f0f6f05b3d0bcfbb1d78358aa1b0b1b46665c3086cc90d2f9244bd4 SHA512 93e5beaab4f064ad09edd24f15a6eb9f7b4a7823b7edf5af8b4b788d6677c268e2582f421ef28baad9dead1474ce6519745058da281441cc60de94725a62a03c
 EBUILD ksystemlog-18.08.3.ebuild 1561 BLAKE2B 9a30c79477294ffc2164aa9e088d00d62b15f0af1d62a9153aa86e63ac80503ead1f31932108d54af492afc8952608f711229ec71269a4b83dbbab0b9155e89c SHA512 e697b4d7a5d7a450e2fdb03c449f1a005028d1cf605d9c31dd54b537479c7dd13f6a8a22c734f542c7032c116b7e444e1e31816dc56b45a15d6ba5d133acc05d
-EBUILD ksystemlog-18.12.0.ebuild 1563 BLAKE2B 7c845a45766eda673347e79a837efe7fb8084cb90f45da14626212c4cd84a912233e5b3c2f22f430ffbe1d711d6640f481c89f15f73cf8d143af1774a98d4963 SHA512 accc43953db180e11d92962e8ea675bd8ed3768fc84db0f4f28fbc394973654f7b6e57d60dea934f3bfd88ed50dc3eb38fb79835049b03f42497fe528603173b
+EBUILD ksystemlog-18.12.1.ebuild 1563 BLAKE2B 071832f9738b2aa558dc0aa6dfa7e9bdba99e1a325ab9f0320c1330654e3610704a61992986e0cd29654b3af066f4dfa55375d4fe8f6e5cab299166f0ca63747 SHA512 269cf9b80f06b202612db970630bad1e074d9152ec3f86eb5df31287fc9bc3dc1f4ee004c37220d91b83405ad547a609f2dd95df5a3053497f9c7e269fc05766
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-18.12.0.ebuild b/kde-apps/ksystemlog/ksystemlog-18.12.0.ebuild
deleted file mode 100644
index 5392f6e78e42..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-18.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="System log viewer by KDE"
-HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use test; then
-		# beat this stupid test into shape: the test files contain no year, so
-		# comparison succeeds only in 2007 !!!
-		local theyear=$(date +%Y)
-		einfo Setting the current year as ${theyear} in the test files
-		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
-
-		# one test consistently fails, so comment it out for the moment
-		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-18.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-18.12.1.ebuild
new file mode 100644
index 000000000000..d782c0bee352
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-18.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="System log viewer by KDE"
+HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+# bug 378101
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if use test; then
+		# beat this stupid test into shape: the test files contain no year, so
+		# comparison succeeds only in 2007 !!!
+		local theyear=$(date +%Y)
+		einfo Setting the current year as ${theyear} in the test files
+		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package systemd Journald)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 7330486052e7..b40d861d524c 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-18.08.3.tar.xz 298004 BLAKE2B 1e3637c71c554df64bbc8a994dec3c062fd98b76c196f88d897eda5958c8380594369c1d5436b0ede1bcdf3b74a5d4c07aaffb56796fe282784900862d15d171 SHA512 8530abc2aa61d4b309b6eeda075184b8572b5a82dd59a7c2a19e209ac2440e0b560d587e79af772d92d1fafd04940919a8258729c25ca812aaab419fa0f244f5
-DIST kteatime-18.12.0.tar.xz 298372 BLAKE2B 510882d5505e1d3191d2d06a8a3fd745ea2ac263fc54b5c29d78c1e7720f5992abaf33d0d30e79dc869904a9da7be86f42c065b33d384f90d3d0142fb7ac2635 SHA512 8abe08fde2a2f0852737cbe901ef21b5ffaa0e46f89f94aa159942befca6c163e129c3eb4f6f701c869212ab5829c6fe15d4f89ce59d5cd281fdf0d3e3d606e5
+DIST kteatime-18.12.1.tar.xz 298252 BLAKE2B 6011f8e4a25b08063d4dd3f582e7399e25672e9d7fb65fd2a8e563926adae22e71e7b1458c9800f0ea09ab0e47dd5be3acb26988e68ae06badb80485673d74d7 SHA512 eecbb13da5dc3936eda84fb3f1132d4c212fd653f4909bee116038392982c9906d13da285f9b6e14e254a8903fb3181e6a516dc722828cfcf40b28c758c0e3a9
 EBUILD kteatime-18.08.3.ebuild 715 BLAKE2B 80de303b39d5f35388f7acb08bae7198245b738f48b9c95a7041032d9465dca392fb59021122532fb503a854725f76fe8a033ed82d9945da53aa1db1a0586624 SHA512 c99b9790d251deed121e481a1b11502c3881b49042e089b049d982fe634c99188868ff8701ea091a197d29850b7cce7c2e30dbf207611580f6268aea55d1ee1d
-EBUILD kteatime-18.12.0.ebuild 717 BLAKE2B 6f29ed929dce34aec9ee847dcc7a1fb2a380ffde7e66b7a98e2d65a3a684d490843372e67ef7e4d8a34e8b9527c8d4600caa7e1ff55825dd4f71b11eb2fa8794 SHA512 46129320812a1ecc0401f8b6fab330a5fe95492babd51ee3e44ff327d987540d7e68df928d6504e35da26ba2c76fde3c0e5be374f15fc9b835fde881aa799bd5
+EBUILD kteatime-18.12.1.ebuild 717 BLAKE2B 1facea166d65412f2b1e6978d4bd18351ff6dffb5022078fd03fbee5641b05c272f7466319e6d36a3f057f3f18f412945cc79ac92a31dee34f9bdd00bde92475 SHA512 d66757c512ee580ea93d0512ab2979c5797681cbf9127db3da644845393ac24760fbb9a1ac56fe7f90fcb86bd1616e1a1e3e35470b79a4dbbd4f5f622df1745a
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-18.12.0.ebuild b/kde-apps/kteatime/kteatime-18.12.0.ebuild
deleted file mode 100644
index 2a570b268121..000000000000
--- a/kde-apps/kteatime/kteatime-18.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kteatime/kteatime-18.12.1.ebuild b/kde-apps/kteatime/kteatime-18.12.1.ebuild
new file mode 100644
index 000000000000..655092e5848a
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-18.12.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE timer for making a fine cup of tea"
+HOMEPAGE="https://www.kde.org/applications/games/kteatime"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index e48d6c4c8b25..8e544b92be21 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-18.08.3.tar.xz 509468 BLAKE2B 82575a73dc824e3b65fad1dd027233d0ebdc28149dea0bfc9adf6b01b27431d06a94fe2320b3eab003935b1865b3569dda42c9e3316c9986266ebb6b091d5318 SHA512 a7c4aab964d85f813b4567cb822b9cb845ee29520175f04cbf60a4a729a1acbe569bf02e2af01b6b545fdae4b4dd912839f8d419765d63e45aa33ab534a3cd81
-DIST ktimer-18.12.0.tar.xz 437312 BLAKE2B 33ab730c9ace3f15b9e10869ec96daebe32c34304fce333794fe15c1794a48c031c438d4edefc6e9de5033867c553076a2c484cad135e041146f05fd94db39a1 SHA512 df07d9bf9714868e43b721af18ea6a1beca1d5cd59f7751b613e93f9f8d66b45ad20be727c8743eea3ac123d6917dcfc0d13fa778bbc606047c8ef42af581640
+DIST ktimer-18.12.1.tar.xz 376592 BLAKE2B b861a17ce3b7b2e0759ba6d7524b925a065a4beea8ac037a3621fcba86b321769134228d089b58264a0cae55f9593090fde24e1ab6c20a6f246d6bfafd4b8877 SHA512 0fafc3f64693665e8b51845f47c638ef5624eeca31b655f60836a111dc7a50aefcccd4717f8992fa77d69aa75d033abcab7d6de9241e54544f8164c9741a885f
 EBUILD ktimer-18.08.3.ebuild 658 BLAKE2B 71e3aabff44ac5ffb1cd28eb0e94ed757d83e90803f5598f24c193e855f89d75737c9e096469644a7decb56cfd77639ea80d31bcb08c65a540af66bc92a5f279 SHA512 27f8ce0014f17be70270613d28bd8a11c06e09f0d68f6f094df4862ea5e17a0eb9734328dce4804fd2229aef004c7ec53c752ff2d46d2fe8b2e5fb43925971a3
-EBUILD ktimer-18.12.0.ebuild 660 BLAKE2B 666531fed8bb8ce7d1a244c43e05020909b8c0113decf428519050ccc6e6844a0a0c90407b83340381d267fb8e0eaeaa46e5efdcad5fbca3378834d669e1fc00 SHA512 5e53df93eeaa1ab07964d32e592771e99fe1782eb5bff23e22335c5de5604d0233731e9365deb4dd29bdfc654d423c4215b75b7e8b5ed837cb0f4cf41b085993
+EBUILD ktimer-18.12.1.ebuild 660 BLAKE2B 9e77b0c422942011a43876b447efe03c2869ef46ae6b130addee9727cb491ada848e5a1505a152a6f723da9f30e7873357038f66a7f79adc7753ec09dd3faace SHA512 881fd20b0119b8bdb75c034fef1eafc00a66ae5174c0b5fd16f201aae5eb9af0a64f40ddb31dc99b078af5e9cf026ff7b89f4f92cb16ebc115447d97256f310b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-18.12.0.ebuild b/kde-apps/ktimer/ktimer-18.12.0.ebuild
deleted file mode 100644
index cc6e0c53c5ad..000000000000
--- a/kde-apps/ktimer/ktimer-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Timer"
-HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
-https://utils.kde.org/projects/ktimer/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/ktimer-18.12.1.ebuild b/kde-apps/ktimer/ktimer-18.12.1.ebuild
new file mode 100644
index 000000000000..b971d5367d0c
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Timer"
+HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
+https://utils.kde.org/projects/ktimer/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index ad5b884b8c7e..1844cb37e7cc 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-18.08.3.tar.xz 5106384 BLAKE2B 99bc9f6b3d403fc723d7a4eb1bf7c2acecb919b5e6d710254002f39a8db05f03e2f3969b6b165c539bc76244a1b73df93eabdc9a813c0241a8616d3aa102ab4d SHA512 a6c0a7bffb754a5f92555cf6658e5bd2b79e563831824674c17e939df8ca7d971677188f5f473a27bb00651ad5b903e454169eec0e51fc14900bc9c6bc00ec0d
-DIST ktouch-18.12.0.tar.xz 5121672 BLAKE2B d4a09150007c94a9f32bb9c2a6e71bebbbf3a744bd667fe26bb71956503777eb53b66eb4910439307a233d5fe598e443accfcff379ce42dcb24d1f99b1e7094a SHA512 45d5136ea882f41d84d426b7b9d06e1020af3eb3a241566bc70b3a7ab63234e637050ab3bc27c6df713d21e967551e9eaf3fc93f224f8ae5430e6c6f3d5d5d1e
+DIST ktouch-18.12.1.tar.xz 5122924 BLAKE2B ce85dc670166ca368af94b50e440448b5e92b530c31126872f369e58514fe224522f11a9620dc07dbf4cbf74f17ee0e693cf6aeecb60516f71d12c4f0b21be5e SHA512 1da6da2d91f3882df7d0950863de5e098d7ba3d5c6c9dd063d5eb87b1d40df6d7e78056ed4b6afcb61a724c85ee6a5951f965ad2887bd025d721272fdf5c6acd
 EBUILD ktouch-18.08.3.ebuild 1108 BLAKE2B bc5d6a4bde31231ac3d95af604b5ddc3a7db4ec51c0e2b574081212101deba452356c78ca3e6805b8ddd9d9e47b946e1d544aa0869f4fe671e0e45511e4db3eb SHA512 5a1c824fcf288e311dce2e528d43b4b46120e02ab4a087b6e21fa65c26b3b789067f47778f9fc4fe484e3562470f3b91f778f9c6201f6a181c2f187b902fb675
-EBUILD ktouch-18.12.0.ebuild 1110 BLAKE2B e68ba87d61699481c054f7229310a05dd0390845eb10cbb5c5c1d3a6af03512a05dde7a48901addff9b48d8450348d983cdd5b610d4cbfbd445088e629024677 SHA512 b0333939e268360b9d162efb0d6ff2b8ee2de0ccd06cb18a4f55349b8e6dba74f9e22153ef734f5d1d83b7593e35f196cf2111cd70f4f1771a18f7f2f7d1e4ee
+EBUILD ktouch-18.12.1.ebuild 1110 BLAKE2B e490d217cbca6f5ce8c207554a8f3f9bab8e092bd6108c17f258f614de4ae261b5c141b658d5053bcd5984e702671abe2b6b0d6b71866ca0c035d17e812ed745 SHA512 f10477b80b02181b171bc319ed5e18f3a1fa85876de3d67df135d2a0b6e6f4f7f12793c13d647ba9ed44f4a981025e14316bef8fa11d2e30d6be3e3a8e25e860
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-18.12.0.ebuild b/kde-apps/ktouch/ktouch-18.12.0.ebuild
deleted file mode 100644
index bcd1ef9192a8..000000000000
--- a/kde-apps/ktouch/ktouch-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
-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 kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kqtquickcharts)
-"
diff --git a/kde-apps/ktouch/ktouch-18.12.1.ebuild b/kde-apps/ktouch/ktouch-18.12.1.ebuild
new file mode 100644
index 000000000000..2ce65355151d
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
+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 kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kqtquickcharts)
+"
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 715fd0d3b894..1317a536629f 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-18.08.3.tar.xz 264276 BLAKE2B 437b13856295370b630341f0dc7b0d2cf547026a6ac73794861aa4ad9ec87eee00df26162c07f920817743c50bef34e71e28092797058adbc8cf887bd894465b SHA512 76ceadf72dc1dc6e9265fb5976e4123e20863fa470cc1dc1c1537a1ba664699b69e9e3b1ff88708859d194b9033ae963e619b1f571e680d1ef758bbe63ce8d98
-DIST ktp-accounts-kcm-18.12.0.tar.xz 261664 BLAKE2B 717e104fed7c25b143a32577282f5f1e928cc4d329c257a8dfb66abb2fa5e8e75c076fd75e53d0eefaa3906b6de849fb8962417e6640f91c2f19418b3c086f5a SHA512 ca94dc40d360f89c650c369c5c3b4dc3ddd99965085298b37c7e61a2a4f816ae944e94afb60b17954d3f7ece9ff75cd9bd782ea4ef1c84765dd2256d4c432f82
+DIST ktp-accounts-kcm-18.12.1.tar.xz 261516 BLAKE2B b210b4c254a18a0e36147d29583fbb22917505fefbcc2517f5294e33117a3d1a175c341ddb780869ba556566e1c54c82571aa636d865bacdab748c573d3bf78f SHA512 eaf3252515258be73bf1cfa5e11dd71538dfe4caccd684876ba9a0c311f637b85ca27754efdbc04481d9c5c76b68f9f0b9acde32412e612554bf6fcf39dc276c
 EBUILD ktp-accounts-kcm-18.08.3.ebuild 1531 BLAKE2B e354ac4cdb14c9fee712f5b011eefb9bade4b812592407b9179d499bdace824edbab8ab21065e289c6c3a8f62eaa017e405c5d3b0ee4e9bdc941f60a754e6309 SHA512 ac328a96979813c943c5d119cd8709430afb50fde82b007301b9d73e0a4ad833d59cbda2de952df0ef70c204f6bf6517aebc7a94eecf34cb7c00569fa3ecce29
-EBUILD ktp-accounts-kcm-18.12.0.ebuild 1533 BLAKE2B af44f3fee12cbe17bfeae8ab14e2e70d0607a7c602216f85c69d14f68727eb9d0b5926ad99d8a2a912835a96fab5dc5b3e6eee7e406eb82b4f8a0f766531138e SHA512 f0195dfce3576756b997378ca53d5c66c5ac6274fb35bf10f39ae11f2c0a2ec4ce1b4307a1b025152c5509f98b440fb0879bdd76f076188373408bb7de08e236
+EBUILD ktp-accounts-kcm-18.12.1.ebuild 1533 BLAKE2B 2172bd3c648086959c914feb01554ca9b0f1f7b5cc642dec0cf3db684be7053456e67e191f5d68ad57ac084c7eebb5fc7cfb2b1662b468f8dd8bb5d2951f0f30 SHA512 6e9474ec4c6f5b05d4392a479165203ea79af3f993f36bbb0c92bac8a8484e436c160fa20d3516a0fb0c5511667ec728233e45672ac559848a07a88b4567d8dc
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.0.ebuild
deleted file mode 100644
index 3aef765d210e..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="experimental"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
-	dev-util/intltool
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
-	net-im/telepathy-connection-managers
-"
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
-	fi
-	kde5_src_prepare
-}
-
-pkg_postinst() {
-	if use experimental; then
-		ewarn "Experimental providers are enabled."
-		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
-		ewarn "Use at your own risk!"
-	fi
-}
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.1.ebuild
new file mode 100644
index 000000000000..b7806c666a04
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kio)
+	dev-util/intltool
+	net-libs/libaccounts-glib
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kaccounts-providers)
+	net-im/telepathy-connection-managers
+"
+
+src_prepare() {
+	if use experimental; then
+		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
+	fi
+	kde5_src_prepare
+}
+
+pkg_postinst() {
+	if use experimental; then
+		ewarn "Experimental providers are enabled."
+		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
+		ewarn "Use at your own risk!"
+	fi
+}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 6c6f780a34fe..82a8c7994b72 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-18.08.3.tar.xz 37124 BLAKE2B 17e1aeda81fcf0f1905ca5c25d88457e508653a330c3d4667cbf88c5e3c182fe0b371fbaa6c80c60cb5e47ec894f49414f6232f7b6aa2d078498d6441135ad59 SHA512 6482a9f117e7b6856c1732cddfd03bbe816fb5324595987c48ff7eb837920dc80ef2306de782ec8cf12c9631862592d52530826c1781a96fd2c1ac2e8259bfb4
-DIST ktp-approver-18.12.0.tar.xz 36900 BLAKE2B 5f1876a2ae07a0a862a5a2dd6cc29c65d96fe9a7cef1d0265debe8e21679b58047447abc132564f5b1fb53fb3eeaacc798b90a882e6d2efd4a2b5f46b0f0cfb2 SHA512 a9cc126b6be79a78ae14aaf55f8ce233890af6ab8f7621b745f95fb5089b6de68cbc11effa164fe8537b003361f4dcafdcb9264a455e5570d453ca48b9c87c96
+DIST ktp-approver-18.12.1.tar.xz 36864 BLAKE2B 911fef4f6ebaf3e5fecdf1d4abe364598324d62e52e39e8645a05f826899cc5a308e54805962f710768ff3fa13ccf2bfa668548b2726422ae10d6aafc35812f5 SHA512 231e9ec950c012f905fe9daf568ca6c15578c8e834efb45fc675ea8833a50eb4548c1d64102c2488b7b6499c691144e5de8c1567189520fffe6ac6cb5ec2d64f
 EBUILD ktp-approver-18.08.3.ebuild 673 BLAKE2B 5c1f8a04bf1e84fa8e46d57d5e9889177ba0da30d12ff64dd14a36d0db68fecb7b75c93fd39c8ba79c48f7a44053a67d4700c74420db12b12987fa58ad468960 SHA512 a484f757b2147f687db5ffba3b5634126e43c119dc78e8e307454b2539f1a79c83477af522cffaf27e3d425e529af6cb7ba675f0315a4a2e141ebeb2a9e6567f
-EBUILD ktp-approver-18.12.0.ebuild 675 BLAKE2B f0a0427561107961f5498bef2e0f07108648a44a3734c36dd151707147d4106ab6405a72cca6cacb899ac7d260bab2533a61aeb40167f91abed8bfca3c3f8d53 SHA512 edc1598b9c8f6e9a9557e976d4e7507c4112a848ce990b3c261758dfda6cc720d5e255c87064d6f7875303308197c5fe9f1565fc6468003a977648c966fde1a4
+EBUILD ktp-approver-18.12.1.ebuild 675 BLAKE2B d2b41638410ac18a930e9aa64dd59770d7116b6a6a231d173aa73abd651a5c611016ed3bd58c01e0f4cf8d73663e0561855f516a33daa41799b8b388c8c0913a SHA512 f147b12295d6b54661ba2cc6295f1d628c2087812bc9d7430527e0affd34a077acc39e30c75a7b8ab7ab9bd3db2e1ad54136b0c4dcd4b36d22871c652462feb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-18.12.0.ebuild b/kde-apps/ktp-approver/ktp-approver-18.12.0.ebuild
deleted file mode 100644
index d7a49cebabc5..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
diff --git a/kde-apps/ktp-approver/ktp-approver-18.12.1.ebuild b/kde-apps/ktp-approver/ktp-approver-18.12.1.ebuild
new file mode 100644
index 000000000000..a188b78584e9
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy notification handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 05ac8117b990..c730c966d60d 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-18.08.3.tar.xz 46392 BLAKE2B 566a1f301db510cbaa01c951efe2d56aefe9d7d9fd0ab0241c8b24bd3cd3ea927e60092d9311b1f7e53a105fa96ad34b73c7cc84858c80f10ceaab8bbd530949 SHA512 83f0ba7d0961b9ff8ba36fbaf5aaea34a7ae5d66df7d3e1fbc3a5440f9050c07d6199e03ffe373a4c030f3b3dc3bdcc0245c5001238ed32911ce485eb4c658cd
-DIST ktp-auth-handler-18.12.0.tar.xz 46012 BLAKE2B ef5a838fe138d9a86417a7986febf72055a657eb415ad9a4cd43459b5fb652f902a1bcde8ce3649aaebeef50e1115e12c2f5b796e8784e6d0229a06075a8a581 SHA512 715b9c6e87ccb8cce477f9710ee74d2d8fa53b0ba9642991419324145e2dfbcf9139fcf2a763b3e940f92f76e685f228b0348f6a38865d06dd5bff5bf5313d09
+DIST ktp-auth-handler-18.12.1.tar.xz 45968 BLAKE2B b4dd728c51aae989a08dbacc118bcf72112251c28137be6e89b77ad28e0882a3cd60aa01b191b8d1930224f731f8145a9913712b1e09054244e7111a778af36e SHA512 861cf128d0a15a8b9a9e1db42e60344a81db8bfae4bf4e530d04c0d0ba031e0a7135a64a655625ff1e0cbf95f92988306b3533778073e77404bbe694ccf0e80f
 EBUILD ktp-auth-handler-18.08.3.ebuild 824 BLAKE2B 06dd50bc4338f8864124242e744697ff9faa050b970c9e4a6c35fbd2f767de8b9b58f5349195ed083d71570c4a91346108ed70353d8d328f2138e02cbd6085d8 SHA512 78a00c8accfa954b90be96be57aafb30f8764688b8a5d970e7d1a01dcf24021b5908c769facf78360e2d80daa93f290352fd4b1833b189191cfedd8014f62f2f
-EBUILD ktp-auth-handler-18.12.0.ebuild 826 BLAKE2B 0d135a22ff3e283adf47edf3a5509330a23ac282d2c56addd7cd1f7e97b7a1a3250424212da0cd10b19e66236d05dcd52b6d6a498c42e0473c0e0bb22c222c4d SHA512 4d6f2889d35d44bccb80f93b7ccce7eceb52ac07a52d49ff72652f65907fdc3e0c85b334d0b39e0898aa88d319abe1d5fe4fa9e4622ec01cb4aef55e13acd4ca
+EBUILD ktp-auth-handler-18.12.1.ebuild 826 BLAKE2B 6994c442c8b695826c59785601cba5a641961c6efd84e8af707ca26ff8691b63676607c9e93eb949a5efcca30830e2080de722abcbc0a230d02a184a018d52c4 SHA512 e662bf72158098096647a192c3b599c16a8a3a7d1e9287d320f8d03e97f7834b9d9f609b53d0bfdee05d69d80d829ee430d49e352b4bbc5dd9207f2794b81213
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.0.ebuild
deleted file mode 100644
index 73d0a5129257..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	app-crypt/qca:2[qt5(+)]
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	app-crypt/qca:2[ssl]
-"
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.1.ebuild
new file mode 100644
index 000000000000..1787b49cb78d
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	app-crypt/qca:2[qt5(+)]
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[ssl]
+"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index dec23aa27f15..41373bcfb207 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-18.08.3.tar.xz 96960 BLAKE2B 7b53ac3118428700e6a066c56648fe87327beed9133d96e31d4a425c4300fa4bb091bf23a740986ff69acef1f4728c04f79bd017a903739e4a3303c46547d14e SHA512 427b4b59b4762790605143be806679853dbcb7e79f4acf3a16321817e91209a972c5e4d24254b8e47df3f58e7f1cf1e99ee8ee47e5d60da34cb9c5c494f0e3fd
-DIST ktp-call-ui-18.12.0.tar.xz 96284 BLAKE2B 9323ab82366044ed4606519f88b0207f286e25cda6ab990d480be96dad6a005cb7c7e6163b4848e68007a6363a12d7fde5db6f96d118e9481ba4d9b55a5e71c1 SHA512 984ebbdb88b7a468c2cb4b9d65c6e775171e748372516e66fcc0340cac4edd0386ecada479d572d78158d2936588174bdd140f2a3fa76e53d8711f98f923745a
+DIST ktp-call-ui-18.12.1.tar.xz 96272 BLAKE2B 6dddfb90efa4382aa55cc60b118793eb73f6caead4181388b04365c2960935d3eb99524fd5905e8aed7e728d28f31d4a74786fadf5ba1f514cf788513744a0f7 SHA512 297e8766581e311ff0a9beb0d3b88eae1c20bcf1657fd599603d3646021ea873ebf1ccfac4ae96b1dcbdbec2045bda0c3cb177626b2b05a551cd2ee791770dee
 EBUILD ktp-call-ui-18.08.3.ebuild 1055 BLAKE2B e711400215a550f6d94c63903869c7c2151bf7b8c0f25b7fb333dc389018bef8a1610ddc329a765b84dbd08ad5ecd3e98befd683e4ee00cd8957d502470db493 SHA512 256ce3572148c56539459af263fe684621fb22a7131691b88176e843985f1b74b76d4c28f9f5bb153c14328d3540067bf951ef18413ee2cb04d116b009666539
-EBUILD ktp-call-ui-18.12.0.ebuild 1057 BLAKE2B 9f993daa19f58d2a18752dd167ae1373db6d701f9bc32e7d76bdd568b7dfac8225ed3fd3379727a015b7218118c48a8fd78144eee8e713f12dbaccc899d30ed0 SHA512 98a21dae3b4ee37339ac2dbfa4a14a279164473c2487c6b27203662e43709b8b5dd4019280264547a114e4b5b491136085b58d981d76c3f0e488d6397854c1ce
+EBUILD ktp-call-ui-18.12.1.ebuild 1057 BLAKE2B ba817352ceb1ac332e2f7f2dffd1453a19a5d625ccad2584791ba8c643584e83a3e1b01c9b33ef5d858e205ee9ec65b8b51ccb1aca8056885b1b9a55a136598f SHA512 9eb7167f579ffc30f7ef1de10fa862487d96dad7ce79865d06328cec3d16da9d82c04a5a975492fb29c5c77649048d26da8db33baa71457004dcfd677fedbd34
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.12.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.12.0.ebuild
deleted file mode 100644
index d8cacc85baa5..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-18.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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(+)]
-"
-# TODO: dep leak suspect
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.12.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.12.1.ebuild
new file mode 100644
index 000000000000..45ff62766b3b
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	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(+)]
+"
+# TODO: dep leak suspect
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 3ce8bcdaa460..3cf79bfbb6e0 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-common-internals-18.08.3.tar.xz 443696 BLAKE2B fe4660f48edce06f8ff5479f36d111130ccc6204d46a3cd8ca9e6f2b6a58968b49d33d1719d04fa433a7664cff1e6a4396e16fbba3efa0a744078d264736832d SHA512 a951c6b9c5507706331cefe8fc3b60d92ad1a44709c789c8b37f15ba9ccafb59f53814ea3a4d0314d70ac5f4784c7d8aaa103af0d3a205c047938f4b389b4633
-DIST ktp-common-internals-18.12.0.tar.xz 441212 BLAKE2B 978edeb34af91935d3773c23b4b5b8e006a8b198e15b5ea5939b07968aebea154df6c52bd9ed4f6108c653cbcead58d9cdf05b74f6ba55015896b40479e47b63 SHA512 64e0ca0c586c69ea875dba9fe8370d730cf7af302109752fc4354f1e8040fdf613d35dcff2c3c1ea7f3f8aeb3709e402825e21677d79beffd90bf7853fdb4127
+DIST ktp-common-internals-18.12.1.tar.xz 441176 BLAKE2B 855b6441f7a56e8f358867717efde9ba568ed5f2898a2fe42cbec8195b18e1857ec51d35a3ef5bff0284dcb6bd4b8a27dbe53cd6730ad0776b27e039a25ceac1 SHA512 1a3092fdaac1af0e0f36dd5956d0be7488f26242e904fc1c751752faa98c3ce87406cc62142686f92aa677d434ffcc066d14ee695ea8b4f172703b4fb5fe2d25
 EBUILD ktp-common-internals-18.08.3.ebuild 1572 BLAKE2B 169e376584cde7715777bdf7e14f24b7da56a57d5103edc1ca6305a0469a419d933c9c3644cc30b9375b093c26b7a1ed954b77ec95489ce373718d31b8cfc2e2 SHA512 2f3cb77ca188c6130b94923162e60cad2aa2e3e1ce6b8cdeec0586cef4ed56b903f7aba53b4f0e812334fec56d250c1e8c89dc56f85e05aebd01c9086fcde67f
-EBUILD ktp-common-internals-18.12.0.ebuild 1574 BLAKE2B cf172b367094b23634ff8c4fb662e18411bc532fbe33506d991d94711cefcc356e15d098fe04b67029f3f22a5af8c6ad499ad2bf3e390d86949062a436986f1b SHA512 75a8c40eca0b446c91bd543033ef3fb3b8b688aa5d0e3f61670a07ae7dce54d854bc092173b502dba8125a7e02e901550c9435136372b02501871d78eaf1ffb6
+EBUILD ktp-common-internals-18.12.1.ebuild 1574 BLAKE2B 2a90b3131737ac30831927c4e3f4caeb35584d169a60bc8778f1f71775af417a7b90cd733599dddf7e7797ab8f98a4ed117dd5a360a3b4919da9310668943fdf SHA512 5aecf54ed6d71a5f1c388ad5715f1b4fb28470753219c256d6bb773d9700d4d0d89b7bf95259fa036fb77137c07953ef64568fb9a123f26d91ff3649d93e4b86
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.12.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.12.0.ebuild
deleted file mode 100644
index 847ebb20732a..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-18.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=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? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.12.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.12.1.ebuild
new file mode 100644
index 000000000000..195784a1cab4
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.12.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="otr +sso"
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=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? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+		net-libs/telepathy-accounts-signon
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package sso KAccounts)
+		$(cmake-utils_use_find_package sso AccountsQt5)
+		$(cmake-utils_use_find_package otr Libgcrypt)
+		$(cmake-utils_use_find_package otr LibOTR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index b91a0cb14b38..bb22bd0277d4 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-18.08.3.tar.xz 147424 BLAKE2B 57184f9fbb0416925c6ea88cb637a5adcba4437143a4194e72b93a282a47a235543ea945eebc156b52e9a4687cd70caa1b794722d97d52568a625a7aa8b5f806 SHA512 2b91cf1c1178bed377ffcfda2a19d0c9dc5eb08d0237e73492da81527b778801c8ec089ab1299846221a821cbaa27dac75b2766e54239866f453becbd2e644be
-DIST ktp-contact-list-18.12.0.tar.xz 146452 BLAKE2B 18ba0855b9b3d2fa286feea60c01919d36c4db4baa9fa6b36a68857132602b8a9e123abc0177e8b936d776d0b7367555c065b628a595644b1f97dc513ab89c28 SHA512 56f9b7124f1384804336a7816fe185ffc7db270ca16a5f344c3cbeea600fb311b798cff4b598dd02ff67db8db9d38c34041a1abcc81af219f500c6a276d5d8fa
+DIST ktp-contact-list-18.12.1.tar.xz 146360 BLAKE2B 42b2360ed8fb269ebf4ac577d1b4dd798e8c0ba5af3a9a9768623dc9802baf177974f120e44dda8ca9ec633bbeef5d66c2d583445a9c54b647e59d3df29a40c9 SHA512 ec3df4dea200e3853f5c48cadb2b7162d9ac0a72fb453ea425a8ad14b0a65bd5302dfbba31cfa829a8b4d21799453a91639f4e9c09dd5dd11a26cc5dd630eedf
 EBUILD ktp-contact-list-18.08.3.ebuild 1029 BLAKE2B 4ec1b13da622fb6da7969badb80d224f27510235bb4bb0318987d1267c1231afba20da3b6a5c6a972e3cfc7350bc5cb0928018a635c8b2ef9ad26175f15abd15 SHA512 9770cbf59dc25650f0c594b8bcf905d310fb4ce68de4d9b8c043fb946854737af7df80f0fc53dedfdd51d73360b7e2125cc9a33e5380766d1cf4b4ea3b385b59
-EBUILD ktp-contact-list-18.12.0.ebuild 1031 BLAKE2B 41b86a921f050407a4689aa69340e690f8fa1e60d900decaebf48992a1584f8a4d3deffff3b02e082536cc93b3809ce0dffbe28d1c518b8a5d31fe6d7f83265f SHA512 f3448b6406ccd9ff5bdcd0e743e6ce2674c5c8aaedeb37ea2ce5df8d3be174bf072e527b1961a02279b10ae73cc538bd073b6023b21e1e36747d3f81c773fdd0
+EBUILD ktp-contact-list-18.12.1.ebuild 1031 BLAKE2B 4ec8813ad8ba00ad6a74c325bc475c9bb97a44825a980eb756db7dd25e4f79507bef4c990b6e221983f7965ece1943c0b8befb616b0bc290d159a0998065b194 SHA512 e9a1f927ae3c63b9dbaa457a93bc650264947b7bd645b34c39ab96f8e5905232d3cd9b5e246793171ab6492ce2744df4ae66bfc558f71bb78e469791f09f0c91
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.12.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.12.0.ebuild
deleted file mode 100644
index 23ce063fabda..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-18.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_qt_dep qtxml)
-"
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.12.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.12.1.ebuild
new file mode 100644
index 000000000000..03e61025d576
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.12.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_qt_dep qtxml)
+"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index adec1a5f2e58..2f07b102f08d 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-18.08.3.tar.xz 42720 BLAKE2B 51a9808af1d3ab170e592007dc00e68f32d1d7b3bf1f87d97c4000cd853c34b88c12d9ffa3fed89f589bff26d5d0c84e1e13400a84b0dd3b1f896c165e7cbf9c SHA512 bf2cf64fd53d6289e2763bec35265f0c89749f85d0c3e7f3dd495ca221147e7ec5910bf4f2602f31fe1167b26e1cd9de9ef53a9e32244d18e0bb3ac6880ff27c
-DIST ktp-contact-runner-18.12.0.tar.xz 42180 BLAKE2B 48f4d60d3a6cd29ff8376fa0dbf477fc6ced5449156b8b1eb49cafdb1e8bed78f73f04bd5fab077bdecd754ebf82f707f32e9946f34a1c216026f64abfc4c3df SHA512 2ca8e3450d7d4562053a525a9f8a780beb113957df7ff06d0c787bdaa2c8fbcc24ba11eb2dc16aebd59d6f0241aab3bd25a1974d2b3c05b2fdf7df8fdb055fee
+DIST ktp-contact-runner-18.12.1.tar.xz 42144 BLAKE2B 4f610781db36278bf4ce901c490f766f40ea45a0f4017d5400c94a64fcc33af037eb42d80578987607d4fdebc601a401a5fa298fda95922d5dff8dfe56943b70 SHA512 14483231b4a6d4a1c231ee9c7e1acb7684eebdb64e6264b50cbae4e3dcb00b60333b87993d7cb4f3965978cc4253df5388ba8f24869901ebec4ab72b881f0a10
 EBUILD ktp-contact-runner-18.08.3.ebuild 599 BLAKE2B 71eb3616f4d242698ec1d668690b6242a34d3f1a92e9fc5174ae9e64e42d61132c2334404a2586070223fb05043478f873f12a4fdd95b2b61124c28e3b5cb73c SHA512 1730c891bf34bf9d918c95c74a1aac52509e88f30f38388f1abbc7218ebe908a15a4fdf8a90f5f8832db2313c026da2375c242849f2c8942e0cbd52b0200310e
-EBUILD ktp-contact-runner-18.12.0.ebuild 601 BLAKE2B c759075dba061f823e18c15aa6e605d5e05bace225be03954c9dcfefbd1bdf8ccd8184da86fa74886967853197abebd351d706fc13b40f413ce656e21edde1e1 SHA512 e3479869c86a46604368cd3ce642c67bc9d04a4c3588988de8d9736ac254ebc0b1bb62446bc431f542c1f9bccc93a7450a16a0fafb5902623e9e8fe3219e093a
+EBUILD ktp-contact-runner-18.12.1.ebuild 601 BLAKE2B 8b84f25e9ec6b7e1351f939a9762f1495680978a56b82ed30f79b26b9ae3b37f09b5f93ba4ed851a5dbc18583ec69a180fb915ecb3bef11028613cd0bb60b087 SHA512 91bb2bf9dcaa311177b116b90a4f556c6a3e8536cb7039f15c6cc192be4477f13f95a6cf07c63bca1890a82db366d3ceb20c00c25d375a685f38308702fbe987
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.0.ebuild
deleted file mode 100644
index 0f5fcea8dfba..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.1.ebuild
new file mode 100644
index 000000000000..8ffe88e3c0f2
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy krunner plugin"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index d7f36529ecb1..8ccb83bd7839 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-18.08.3.tar.xz 43120 BLAKE2B 3c1e1350bb50a515724d6b80e7dbe4a2e7dc6aca7c8c1a3b7f60bdda3aee7e87e51170b708fadf59d5403e943df6c549b3eb16d43429bab8352da7a7966fabe4 SHA512 3f26fe03a8431cdffe7c0c86a63a3767b8e8ad192a1e5b11c7856d5d51af9e6c497cabe24033521f1834a3dc766d60547437453674fa8b5a1bc8c3b9ffe24659
-DIST ktp-desktop-applets-18.12.0.tar.xz 42672 BLAKE2B 3e81feca393c04d6c9ae0283e5ea8afa7d689f5608ec3009a8090798c5a41b037d12cfd43edd90f7030fd1f4f8a9d98b710d7bcd27bbfbeb977ed455147e692e SHA512 ce79d4ae3150342678cbfbe753647fd99e2ee180016f85ca0fbf7840a5c4f501697d57c80e88728f8e2e75f47d79923b22b9a6d021847f0710292bd6d6c722df
+DIST ktp-desktop-applets-18.12.1.tar.xz 42592 BLAKE2B ca58f3f0664280058bc2cae859172e5ad81494dc074e53cb39a529e8e7b545a21db6a8330bcd7f3e8b844775af358cf2d58a85e604e9c6e55f49dd2b3a890eaa SHA512 f7650139fb59e1267ca34551ddc48f280d365f52197c74f44e7a816908a3fe95cc630e08501f417d1ec6d240b54e60409ca0093d8a71c44482722ea3a913bafd
 EBUILD ktp-desktop-applets-18.08.3.ebuild 569 BLAKE2B 11af9fb208e27fc251e00ac3cf90a8e3a08ba7933e15b04fe285d57607d6b9212c54dc55850868d5246dc6749186f9eb4f33fb3cb1a2c4d84f44a476168f45d9 SHA512 714eb5b68bf22e0fc05703ae6f0b0a1bcb82d4b8bc6896092f98d533a9fb11c54be9f7a7c137a252f85811001c601e6c52598680fa15a620edfae9a0318780f3
-EBUILD ktp-desktop-applets-18.12.0.ebuild 571 BLAKE2B e205cd27cebed4fb8ce9018ba3283def31ba284baa813fa5c05cbbf1298ee2f17b2879e3e91719c946a45faba42be310fccd1cfa79ae5da91bf9b56ce405c7c7 SHA512 5f46385c411246b3ebd33fc92a2ff7752a41c7fe9f05cc6e73feecd8fea4634484439aa09686a7f771a84ef2b50d2d7f68029f188f984b9c1faa073350995de3
+EBUILD ktp-desktop-applets-18.12.1.ebuild 571 BLAKE2B 35775aa8cb548b28d7b9713cb68ee4789802c3b85555d3e72c6b2c37f2151221d7681354ce03ee443a1e79483f361cf9b414dce6c167145bb4ee1f1b3f2dddba SHA512 660c7852cb4813e658252164149aebea3f2ce835819ca48ec5ad300eefead955d5cb6793c738f4d5510627a1a6077218f4d2dcab0ae3f02aeca566c54343bf09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.0.ebuild
deleted file mode 100644
index 8426d18576cf..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ki18n)
-"
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.1.ebuild
new file mode 100644
index 000000000000..a02099583636
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ki18n)
+"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 446fb635ce96..20b9075da6a4 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-18.08.3.tar.xz 46196 BLAKE2B 6c19d323ce21415f5ddf42f67373427df768f00c60492a5f50b40060c5db524e2a736fdc4c0f378f2655685a0fbdcc9130aa5cd379e2ac7d9d457e31cae01d35 SHA512 b88763ceb61553d0fc0920514d3a845b0f7bfe03fab6006be6e498f711a657b5c1f240bfcff6eb75a6d1f7bd7129147415dfd39d2ba83104f7790e34ea2fad32
-DIST ktp-filetransfer-handler-18.12.0.tar.xz 45756 BLAKE2B c5e30b4c1ceb1c2c2b1809147a046d3dd76ea6b76775fc51c3d74e1e89b388f69b3fc0b358468bdb452b4a48a01dd7288210ab37e2bf63f8a0aa3d207d70ab85 SHA512 89fd24b534d59edf2f225f2772cfda10d7940aeae4a1a75dd75d909bdca4c494bf5b98fb87b4ab363b3a0218aa52275309a467f5ffcba390c1ea8c1d750c8475
+DIST ktp-filetransfer-handler-18.12.1.tar.xz 45772 BLAKE2B ee8619e6694da88c46a367e80c82b1418ce53903338e59aaf27afbe9e8744fd982573b0a7166aec2d7716174fe65464d32094462d98295d10600dae3b7c37042 SHA512 e4182794a087c7bb6ad67964d69f251de0983676d95772cf230e9105b0ef68b47d5b367bd36e9d5f246523073218bc8a68cbb0562abbfee5343d26be27f5f202
 EBUILD ktp-filetransfer-handler-18.08.3.ebuild 615 BLAKE2B 9e79de0e4f3e693b53733ca9944bc1e4158abdcbdd6fd43c8e61fad9ce372cb88c14868a5bbcb0839fc8bbd04340916bbcb63427ceb6bbee4debe33f5c5bfa6f SHA512 17a88e409ea72fc3702e6cfeceac7cc7da3196916909e971189802e6b83351762010a1dbf801439f7366e320f74d6fe6ea3d1d297a8e9bc670ef7d5d4c448272
-EBUILD ktp-filetransfer-handler-18.12.0.ebuild 617 BLAKE2B 93fd6b3ffc8aa9a720007f9434f40cb2b971ac0cbe33c804db536623135d900ce25e6925c1683a4568b3caa9e8663478d27a6a59baa8c6b64b710e58b1620bc0 SHA512 ae122f3ba295062c8997ef55b251c92a3d15617724220a84cae6d395853914fa5fc20bbc2606d8350a59ba780ea68967f03aaa1adb75c9b4afaad195a19c22e3
+EBUILD ktp-filetransfer-handler-18.12.1.ebuild 617 BLAKE2B fbe575ae5a21728efc64dddc2cc3b811084c655ce09cf04698c6ba40614c1c23dc545fb2d24cc56e82a1713e02ce602de5a3ceb5201e704c8499f1c0489a1a2a SHA512 4bfd0cc3f3146564db09e5b155c08a0ff01328247fe084252adb2e21b9da4fbe7e77d054f3c0006bf44f1de387097d76b77ab6c934a187e3d8a230f92fba8fba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.0.ebuild
deleted file mode 100644
index 5ea88316f8e9..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.1.ebuild
new file mode 100644
index 000000000000..27675b563357
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.12.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file transfer handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index ca191542e7c9..0772d347ca7a 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-18.08.3.tar.xz 95168 BLAKE2B e446e541d010e9b7d9f3e2b93c83bd5efc3cba6e2c036a1d3884df7c88796ad16e807aa919d6e093056d3d009f0f1cf6093b7a548430d100551d27f884815c54 SHA512 2607f690e3545380e6088a63f215390e06a134b939d4a229d50987140a06cec65a9924a18948186b98d5f91757ac548865e2391dcc1ace5a0c011133df6a9993
-DIST ktp-kded-module-18.12.0.tar.xz 94680 BLAKE2B bf673bea75ecbfec84522e4c16f1ba6cb26921600c448ab27be7f8d55f9fbce0caf99061154162c60bf2e589ef4cbb7ede5a51c527b60800cd92077d5aeac24a SHA512 59f21ea6bc38a2fddaaf0d613c1b7f8ea4bb7b9fcac4d65981a5be16a8535426f753cf8665caa846f309a17a7006e4cf2a1f96acf2e158357dc15ac87bd593a7
+DIST ktp-kded-module-18.12.1.tar.xz 94624 BLAKE2B aa921765ab01b170fc5bd365257f4fffe5aa5e97eb07b9b8849412fe004ca96867ce0e812de73ec309340961005e48fbfa1f3c9e21675e3b6c3ebe333aa097d5 SHA512 a01a7341335619d005abcc1e3d2af96a287ecbda814ae4cb5c44e6e07adae12e633f66f04a95577480bf342a7f8504f6bf2eb5ea6e4f2070b45b64618694d141
 EBUILD ktp-kded-module-18.08.3.ebuild 974 BLAKE2B eecf2dd205309dfb6eead77e182d828c7e2a8711712f0ed0bdf7e161818b2b2a207dfbcd8249f037e00d6d90a9a00086ebb57d21e905e6a040d0a89b532fecff SHA512 666a152eb553839e21f6f3287f1d3e36aac35a1ee67002275a6dd1c9e2797939719411fea5f3f8153bfac2f3f3912fa51cbc098cab9ebd9734ce6c42138f0b91
-EBUILD ktp-kded-module-18.12.0.ebuild 976 BLAKE2B 3cabf1b0da0c9ec4dcb778fd6ad48c303e8f8d19e796500cb54e7baed7b9a0da8108f861fef51a39e1cefd74dfc86466d41b1286aaf368bcb808744d66a7da8c SHA512 dea9c3e29e2b0112fd3687411de553e1d1d454b1d1e472ffb750b4a10d91ff564b79b7e47bb6743b47f00646d2dcc2805463c18315ab9b5f1f4202a27af6d334
+EBUILD ktp-kded-module-18.12.1.ebuild 976 BLAKE2B 00ce9850c443d17193c6d7ae63b2051b1ca9b1d1665741bcfee4c1a135a77aa4a263664155bbc17ee9ec15a9eb2a5c5556ede9ed3dd09d109f99770afa6e1a51 SHA512 797e1bce15ef40422ab1f6d94436a882a246088721732f5e0215c79c96486710fa914ffb865a23ccf9e37a2c96818d6313e1e01808bc88887c899c34ee6de106
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.12.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.12.0.ebuild
deleted file mode 100644
index 4bde594adc2b..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kwidgetsaddons)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep signon-kwallet-extension)
-"
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.12.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.12.1.ebuild
new file mode 100644
index 000000000000..e34d8782bcad
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kwidgetsaddons)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep signon-kwallet-extension)
+"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index ded234634c46..c740687143f6 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-18.08.3.tar.xz 28832 BLAKE2B c98dbda9a8ad7e41f9b17786bf44189e8075812b84b948f59a2635647807525924d54420507a95b04200b5c7fa9e77da2fb945f19631ab5d82425a9f4f879cc5 SHA512 bbab4e17f860d3388ff07f7c29aa24c547674c7e39c2816a938541f440c8d95731f47ac905b962748375baf7ecd84044bd6646792cc9e1c1b4d1e0df19e25c01
-DIST ktp-send-file-18.12.0.tar.xz 28556 BLAKE2B 25a23727d4de44991e8cb75d755a3ae2417c7887f2dd8d3e5417e53d6661b0c80f3eaf578d49a27a3746969c43688483356cece39feb443a85cef90813c2b085 SHA512 f51d17c74e0546941ac6002a5ed9bc432c0ee0e4692f73149c0b818d7333d1873ec0d97b6ab889e0ff6afbf63b8089af37291c6eabca4043d075ac2be705b760
+DIST ktp-send-file-18.12.1.tar.xz 28548 BLAKE2B 51987327d44e087e6ea9994549d5ed99abbe7d1ac165c73a6d9da690619f1fe93f6087a1797d4aed2064ae17a74be8d0ded8fe44819cd003d857eb7a42ad693d SHA512 63cef9865f8468e97fcadf022ca68ed5fe23d9768d9ce3ea8140dada832bd738dee0113de0b63b3f2ad1bcff6e42ed664a312f91f9073ec4dace73fd56008d54
 EBUILD ktp-send-file-18.08.3.ebuild 822 BLAKE2B c952500be37d9bbc26e256c17165d0814c598d665a4808a68d7ec0c874d3121959c6e9d6c847b52c7fb91106aa47cfd47b8cad8d1458134b0da6ed428347508b SHA512 b16247354f0da86768bf16ee1d9e598a695d2cb08f70fcafa1e77927712bca06fea859a11084e9761c4fad5ae4abdfebf9c01cb1a1e7dfa42e3091c48293f51a
-EBUILD ktp-send-file-18.12.0.ebuild 824 BLAKE2B a662f6b809d1a9ed9b8918db5898486850edf5edf5c4cd93100868e4a6023d36dbad173b0d280189666f06c31dd64f1f7ad33281322e419d416dcdce65a7b03f SHA512 7cdb3e1882102b778267ebfbe93e41be3313874aabddb04d38dd41488cf6c8860e33936567a29cd637b5e077cda507d5112e1f4608429a48c69e4646cde69011
+EBUILD ktp-send-file-18.12.1.ebuild 824 BLAKE2B 8f12b5162e534799f388ac3e6d12602ad1bc94ece9b59045bbdbf5ce5af18107c617b7fe1d30b9b97f4541c79f52e9b84a70a7b8c3d31152edccff933d566130 SHA512 4c3f39ab0e3b0dd89a87e6943c5fc1f216fc386ef31688f42228c1de0cb1719cfbfe6afc1337acf6ee3e90567a9e8f5c27e6441e9792970f678d35b76ceb493a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.12.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.12.0.ebuild
deleted file mode 100644
index eb1c70033e4d..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-"
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.12.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.12.1.ebuild
new file mode 100644
index 000000000000..fcbb52657b3c
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index d083391f48ef..f73bdba45280 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-18.08.3.tar.xz 469856 BLAKE2B 27bdcdec15cdaeb692194f1e085dae0e8d2d3a6f913b5631ffb7195b2a62ca8b37dd02971515ad31024704eedf8f5b1a4e3225f211461021ff550651a27e62a7 SHA512 a3d46895d501156ebb6727e3b5bd6b4c0b6f202a77d5cdf557c6a15658d514ea692cc3f1cdeb59e18d45cdedc1387225816655e0c6e129b78ed8e7a6c1cd5444
-DIST ktp-text-ui-18.12.0.tar.xz 465828 BLAKE2B 8f80c009fe405bd7398b349d78e53f9a57e097a8b7e6fb9305af6880b4a016a3383cf58858b99166ca0fad9ebd2829ec4133fe068506a603ba07d084464a997e SHA512 db11b82075c5a3ad6416445e427268a590fe51f5d94e010a0b72413cefe711a1a951fe2c4677cfd912a5d038bce2e32053f524c08bdbf3f44406c6678ddb10a5
+DIST ktp-text-ui-18.12.1.tar.xz 465884 BLAKE2B 659ffbf80cfde4d42d691c0d1eea1bb8a5fe1f05f46d1fa49addd154d597e50259a60d49b1a0c24361a09ca51ad2f5ceb1d31dc190dbf98d5fd851a76f18f14c SHA512 17e48cbb5646cce61be7e775a742a491ef7ab9a44136eb224fcb0ba9d35bc3162b2887c291a6e39ba8f16198b107acaf0763b6d41213e949e9407da859f1b944
 EBUILD ktp-text-ui-18.08.3.ebuild 1484 BLAKE2B 28617a89ec2a9d08c6a45315708a28b87383bd0fdcdf7594f561009de8c9ef785a00f03287d9af6c3e763701091477b99cf719b9aaa229822b2143cb57f1f79b SHA512 9da1607b603317a8e3594167e4d7609a5833f5c1bbbc83911a42e8eb3e2ce1d4977073c34274a87d80ecc50b7f907bc61e7a1f853a13c8da134733ddfce6c89a
-EBUILD ktp-text-ui-18.12.0-r1.ebuild 1453 BLAKE2B 469829605d10cc751edd185b25098d835f344044562c6166db235cb00eb593011bd6ac8f579ab73fc92ddea17320ff174f37d5e073648d0f18e5df9c7130a753 SHA512 6cf066e86d059b0460673738294d31c5730bc3235f70a83c3917fee37c12d84b3fd7b4fd305ba504ecd79fb0836399b91a9e2052cbc2a59dff68c90edf9de302
+EBUILD ktp-text-ui-18.12.1.ebuild 1453 BLAKE2B bdad8f347c54b48d8470c120488794ed0c3ac6b5fa2f51310c42d4000129e709cbea92530fc566adcd02f1ffa41dca89940d05adf264998e11e2fdb10a6eaed6 SHA512 afe861d2cbbc828b7dac67899eb5847693113092adc4db1cbdc74c0311119167cfeff36f658f7a89b3e0202f8166bea304326791edc0a7013123e807e7a424aa
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0-r1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0-r1.ebuild
deleted file mode 100644
index 0da10c8efe3b..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpeople)
-	$(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 ktp-common-internals otr)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.12.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.1.ebuild
new file mode 100644
index 000000000000..793df4dc4d4e
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.12.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpeople)
+	$(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 ktp-common-internals otr)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	net-libs/telepathy-qt[qt5(+)]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 9677fadbe7bb..16f6c84edbcd 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-18.08.3.tar.xz 32797600 BLAKE2B 8a088390b81ce08042a7e42e30418b31613d79daad1abab9c671c69785be8298dc7918e1371f4f00010d50ac0d0bef07c8664fdac8de73241b51e0b33aa9f604 SHA512 cb6974bd426b23da04399110528a414ff8af512dcf8c9ac7c2a45279c827233eca4e8995bfa5f54a815baeed35f9c567b762d752c0df453532a6bf4aaa7bc180
-DIST ktuberling-18.12.0.tar.xz 32799512 BLAKE2B 001415c302ed974afc15564b26435cb7cc5dcd0e1677bdf610748989820e5f286c5cc5dbb9643ba5118b9fbce27d6eefb6e3f33be9c3afd5ffa44106e5645873 SHA512 1825978b38a0791a7535c97e31e537cb9dd157627897b1de0403124e0776474afaab9763eb0adb71bd16a97e04ecf87d04b27d4bca95d81915e861315b7b7eec
+DIST ktuberling-18.12.1.tar.xz 32799780 BLAKE2B 30ea90d691970cd12ea60c322b56913764651fc39770ebddada005346aef83df354a34d8788e3db8f2881b5a16d7eb28531875ebef30111e6cde6008a093de13 SHA512 8bec28d973eccbf5db173323a8b9d94eb0c94dd3e807add7eb12be23a43fc8165578fa1d4edeae8a330759a9f12bc46f7574dadd1836406e1969c4c53b7b7f97
 EBUILD ktuberling-18.08.3.ebuild 972 BLAKE2B 75e1570dc04ea63b7795609b0b5b8067352cc139a0edac36593f86fd0d01cd5fc7cc3a71a2094e21a77d9591fe881b3e84b4f98565df687ad2bd77a0ef38752d SHA512 ec6e82666f15ad391e15f0a42f6494b378831c69fd2bbd3b518622701292caed76a893261c00ce4377a8980b68feb53d46f43bde6ebdb9cc137db48fcbf8567a
-EBUILD ktuberling-18.12.0.ebuild 974 BLAKE2B aa9e6937b13c20af0e96a041133c529692cecda0159006973ca7ab7f6b76d8f05aff3d5c5f5af83446fba559fef5fc15eb25b5e45f29353d7ffde6d14f047ddd SHA512 3746e66f68e4d381a1dc11081276f4d8df9f13ecb3fc0422e0e41dc3d4452bb06fabb3d97aced36850cd8a4e7aceaecacfe9e58b39fc594c453bb78f67b9e21f
+EBUILD ktuberling-18.12.1.ebuild 974 BLAKE2B dc94b2e413957c7592887983019ee6f3046fac97fc1c2acd90b479706c424d90e6e9f72647749d228fd7c22966767fa4bb700e810d9a8a715c3f8850b0c989d7 SHA512 baaa9a182cef8bd717e0640397fa3d5575b2df2c0c63a5ed4fa7c3a9e19c04b198743a55743f8ae33282475713a11d8ddd5f16f4788247109d5973ee1885b8b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-18.12.0.ebuild b/kde-apps/ktuberling/ktuberling-18.12.0.ebuild
deleted file mode 100644
index 2af7e0f064aa..000000000000
--- a/kde-apps/ktuberling/ktuberling-18.12.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ktuberling/
-	https://games.kde.org/game.php?game=ktuberling
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktuberling/ktuberling-18.12.1.ebuild b/kde-apps/ktuberling/ktuberling-18.12.1.ebuild
new file mode 100644
index 000000000000..e54d94e8c329
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-18.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Potato game for kids by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ktuberling/
+	https://games.kde.org/game.php?game=ktuberling
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index fb273e01cd80..ab44a3f02e81 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-18.08.3.tar.xz 1608276 BLAKE2B 4ab93cae322fbd4ef8dc6d314a3ccf760eb5efcbbc86058046dcaeab34a0c0686bc23eb9f35cd9885a8a852afa00ad32da259a20e5b95e35e08c32f4d4c620ba SHA512 061cc40fab9a99d65cbe20ea6ad65ca37da3df51773224a6a4f6339b3d4bca3ce4bc49b77c88a78e17c6dcb52f01e82d303babb106519cb23a0af5e2d1678d2c
-DIST kturtle-18.12.0.tar.xz 1608508 BLAKE2B d0139745ddcaeb16535ef36b13bd7813130e40bfd5af016afa7cbb570a5e562c45fed14cab429fe7c36993b345d6c92fb8a91482f4ab291c657371add3b15946 SHA512 52e383070e3ec2442620f72a1146b4bb9ad3afe6889b4cf1e0421a14d948c9cabfb8f7da86e7a5f29bd4333f6a76de5437450f9131410dd7bae34553229aa962
+DIST kturtle-18.12.1.tar.xz 1560532 BLAKE2B 21757e50ddeb0041f8760d6380e924a15200d4291b9086f41b4e728764f9e5b8ee35e1295bf9d17fa3a8887f4caf00ef818b5afc52f3365a6eba03215287bbd8 SHA512 e3f67030cc56cba83c3af644e7ccac750459934b298f9cc9d084cc4d4a23579c5b729fe14f44df6afdbd4b46bc1c8555eb8acf1e27c768fc85c3900220894a03
 EBUILD kturtle-18.08.3.ebuild 841 BLAKE2B cdb59fefffd311d38e6d355f37aee43a45a1f86f71818d20aa24d576e36bbb6955c1b8d89af282e138849cff735b9f953b4db018d13bfdb2c37d558bf704d6e4 SHA512 1ccb710ad75b91b101f623a7656756e1df1129ae46ab40496e52f804995954860f39a36b6e2239fab18aa0c99a6b12476147a01710b475f1a33356b2cb28ad43
-EBUILD kturtle-18.12.0.ebuild 843 BLAKE2B f58d4c3b9555683419a3fe6013d0f99d565cb665f8ab9c6edce9831a206ca130c64c124b12030982fa75c4bdad50e19209dccee6b0a39bdd11d6ef71e400c30e SHA512 4e13670832142ab4f62527c83493058b84b2f5c01c20075cad0900e70aa538ef57b602b37620e7129811efd6b7298371f9100ee46bfd5dc1ea6597f0ae95f802
+EBUILD kturtle-18.12.1.ebuild 843 BLAKE2B 31930f195f74a67d5cbebecc1dc1ccc17e14faae057e3d4b0d634c3b83d01360fe7f3ddf62c42a37735cff70615e9df0da171f9b785f7aef638f36a2646aa537 SHA512 73d47f06614a365331342bc99a20398314f2bfabc84d79f8c450e50b4c7b00edba820d86106d3724d25d5c6f379ceb803ba3fc0e9fd2fd5b76387700c5ba7f31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-18.12.0.ebuild b/kde-apps/kturtle/kturtle-18.12.0.ebuild
deleted file mode 100644
index 373a6e397356..000000000000
--- a/kde-apps/kturtle/kturtle-18.12.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-18.12.1.ebuild b/kde-apps/kturtle/kturtle-18.12.1.ebuild
new file mode 100644
index 000000000000..1e1000a2de07
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-18.12.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 28b33c3aa923..64881ee5e429 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-18.08.3.tar.xz 311100 BLAKE2B 13168ddbc588b2563268d0416286da2166efb13006ed659578919b45fca47ef50e1d4ac22e8643bb39d7123dbf2f51f962876e771be7803a99527379b0d0e9c7 SHA512 7070f17a6aa1a2bc2098bb619569356f06afbe8c84207d69a437cbd06cb0a24836619151c408f1aaeacb7d98834a3838d8ee50b5b5f0828c3f364c3b823d8d8f
-DIST kubrick-18.12.0.tar.xz 311300 BLAKE2B 304b5ba8a5615b38e8f1bcaa0a412f759b5543d90ada81c75ec3fab3a5e50f0868c24ca7569ff835af58aac0479a97e3287283e42cb8142f8ab068c50fddd375 SHA512 6296329e34a7259a8347367851811c097d882d818808d17f6c44b0b5063157e41d89029a99bd593266d693b0e421552e15af98be0c5fe306cf980df4dcd79e9e
+DIST kubrick-18.12.1.tar.xz 311100 BLAKE2B 3481b5a13d69c8839d09e7adac9e75ab0ccaa88c36ab7f3b9be83288fd42b527b295c1f73af777d4f3aa7e2e05a876185b02c2e2609f2094cd309a9a07b13f5b SHA512 44c07c2b52b2e54be7e486e51139ff035cb3a808758e775b98429d98803251cfdeea8de9016fc2776624a650a74d3f9223e619af07e72c672ada3ae0cdca74f3
 EBUILD kubrick-18.08.3.ebuild 746 BLAKE2B ee605f73138642c6893d91e103b9c4d67f17c2cef1e6a65fadbab6c5dc405c0af3756dbf0725b219a3255cc5991674e01190cf6440fc243108cca5c7fb727f2b SHA512 fac9634815c6ff016b0dbb1d45e2a52bb29fe28b269d25a69fac848762c5796a03409f508668325524d3e4102d53d3144b721d90e11c37efdf9fb71facf78faf
-EBUILD kubrick-18.12.0.ebuild 748 BLAKE2B fdc2527330cae88d393c6e6f2331ccbc39a113a40e2c147495a921f76c9e288f7b87911e51cc67a17d158be132ddd51d743dbf482073ea55b510fdf143c0ead3 SHA512 c02aaf9edb61b990e31d8a2c803642f45cca1d2f19e2bd0aa804eb7d22b2592fa81f564a77daa17944fcaacbbbfdeb998a9f13c3e27d287d1e91e3507dbd7c8e
+EBUILD kubrick-18.12.1.ebuild 748 BLAKE2B b56b4a3edabc99028d878d342729e9eb757cd235a47b48b734630f62bfe5ba926dac49a1a6bc9cc5cdd0152e8fbddb5dfd44631180ed5c30b5a7564fa98aa92c SHA512 aebc09fe235b8ecd6ccfea58aa0d13de2d84a9e7191ae00c1ddadc3a7101d302b4802b5109f8f67ee602da1b4bd9368d75e3abf0b1141637616faee2376db6db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-18.12.0.ebuild b/kde-apps/kubrick/kubrick-18.12.0.ebuild
deleted file mode 100644
index ba7f19dfb475..000000000000
--- a/kde-apps/kubrick/kubrick-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/kubrick/kubrick-18.12.1.ebuild b/kde-apps/kubrick/kubrick-18.12.1.ebuild
new file mode 100644
index 000000000000..56b342d6cb4f
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index a72cd0c29584..d8b502a0f7a6 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-18.08.3.tar.xz 787060 BLAKE2B bf53fa995b131264bdb1a31b1bd0171232c63d787298b4140390b576e9e7ecddca3647bc75757404ad39fa1c1fada6f7346c30fa704baebd45c222a544a68cb5 SHA512 5b0a8256df7bbd7d82b167311030c8ddbe9870ffc9f7fb5ef5f523729d7c9ec11bc3a934462a6c645c1f3abd9ffe0e69c76ea3e9b118cb7534a9f702e626c5ac
-DIST kwalletmanager-18.12.0.tar.xz 785372 BLAKE2B a553c54bcfcf7f2bee8142b46a87c6beb62d5c0300987d4a423ea2dd3c24a526dc9685b9e3bf5573af2a994d2996b7bc7606ff38f009b2bcf53602c4e051703d SHA512 4937e72ddc0f1a4ea3221d69467c87dc77d05f21d5594df2f99b9ddaf9940553b3b1bbb6ff1f45f17e96e277f954f9823c79922d2924a9e03c90af73eb90d740
+DIST kwalletmanager-18.12.1.tar.xz 785304 BLAKE2B ace1036ebf96e0ecdfbf6c89fa042e4f9b5f7aa5a43b4cd6fedc20c82371b01819b870bc77a4ba8a949ffbb91a4d3eb1b91efdb3ee10f9120b1a1768e10f3d21 SHA512 ec1660cc3f930d76ec5ec5081add9839bc4d30b6c5850a77820522556d1b6065ab36988252d037547fba99860fcd752e1c19bd6b7b85e9ab91cc261eae90d61d
 EBUILD kwalletmanager-18.08.3.ebuild 1243 BLAKE2B 00e28092ec40302567aa3637877ebe388c19fdf4bfc84b19076b60048d20a30de70c0adb4eac90246eb7e40b2a7b41fd5852e362e682a06f76bfdd9fb5c3e3e8 SHA512 20f29943ab1abcc24a95b1219ca34d0c2c2fb5a4401065cb7dce151302f5f1a2a73b8ac45ede575acafe08880abca90cbe59923fd35237a6f90ab2cf703ee62f
-EBUILD kwalletmanager-18.12.0.ebuild 1245 BLAKE2B 393f512e1ff092105cf61cfa2009b4372490c8d54fc8cf4857113e53b2924dad004399dda32391d61cbc5b98070aaffed2d3fec978d54ebf32476676d88334c7 SHA512 571bbfabb0397180dcf1ab0e9785b9133dc3e5b6814124d5d5c30205c800c5e2b0528d2d8a6f9bee6bda208611f7e0cce37effef19561f8e477b395eed5f1002
+EBUILD kwalletmanager-18.12.1.ebuild 1245 BLAKE2B ed74f71a431a6b08134830fe3631ca286d169e1dadd4958135ce191238156b74b88f5c6115dd0d2cbfb3b861f775ded3c150656337eeda6bba9946426118733f SHA512 890a2491776cda8a604617263e6cdce509cca9de9a1f6afb28439d01cb06f1162e68cefcf5aa5244374e7e62aee29608681edef8a1d289f31f005eb609865d8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.12.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.12.0.ebuild
deleted file mode 100644
index a240ff823f21..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-18.12.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Wallet management tool"
-HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
-https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(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)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kwalletmanager-15.04.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.12.1.ebuild
new file mode 100644
index 000000000000..3f0439fe4a4c
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.12.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Wallet management tool"
+HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
+https://utils.kde.org/projects/kwalletmanager"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(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)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kwalletmanager-15.04.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index aa8a7ef7ca2c..7db9c7206cc5 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-18.08.3.tar.xz 6214600 BLAKE2B 1ef161d62de71d60ff2e8507bf5ddf2a8e778c2ae62b08669d481f41223ec2e7273257440aaa21a53063aa4c072a3303901f2fa027318b21a3d7f33e825ecef7 SHA512 ddce5e748403e0678fa6713521713b5320b3c8732e5e70cb056b3c2da63e6480e47a47112521266d9df31ffd7750fa6c29485ee45bfdfbc215e3b3013173e469
-DIST kwave-18.12.0.tar.xz 6212188 BLAKE2B 516593f77f3b060b5e94ccf426daf6b2d44d830de88bef2da88855e185b23af6e91c5e993ea1c470fd1eed64a3dc2a8c61bb15eadc27bfa40a16674368847ccf SHA512 078c173e7838e52a161263c3a995f0036097e8498077e229a6b0ce9fe73d06db62e2e1d5c88dba6b0c724ea58c6719a6519644d38a4ae5953c13a8b66dca3e3b
+DIST kwave-18.12.1.tar.xz 6212400 BLAKE2B 47625cb96e8d8e5f8e5ece4119175a5dc94f884d6cf9cfcb8e37dedc1a2c16eac44918e9752744245844bf275a1f05d649f63c4c3cfabeef034838a109573d73 SHA512 53685ea2719eb6b2ffb401f985dffc7dacdcb9ef5d4148fe54da612bf56dba8217d7c94cd6e5c99208f03933064dbe12e7d0e8a9a470a53707b2c055782a875b
 EBUILD kwave-18.08.3.ebuild 1984 BLAKE2B 4659071cd80507db8f8390d3480af80c8286509b7cf0f5a668c76125f1d18bb3d33da722468a7651a3c8e0a8806bf5dc872f1c02fd86eca2e29feca971d07950 SHA512 3f828db563fd6c898c2bda265e1f371f0f3681237213f615babf9906cc83610c17d8ef4278b337565c8188165343d2c1cec5333562f391831e976ca29566af6e
-EBUILD kwave-18.12.0.ebuild 1986 BLAKE2B a656d8ac7de996556c2fe9d1e943e99279b6a7d3cc9108b9da417cd6cbb49b47b16922aca77d561e53e9839bc9d47c10bbb8de7e592a67342f8b794ae645d36a SHA512 e42c034788958290db2d4ccaad5d1c61ee6455460e45402daa1b36b6c4d11436a0e1ad6e67127d893de9346d987289bb6fb93425246cc87f53a1539ee43f8a15
+EBUILD kwave-18.12.1.ebuild 1986 BLAKE2B a4e8647964ee9320259769b864fb361d5e06aa73b8eb672d715f1e207ca37672b003bf28a5603e2c2903aeb0f63b6101766d3f1bb0827027122d1df32c3d6dd8 SHA512 1cab38e75430bbbae927d37f4cd4a6b9bdcce5a8568e98bd947978e50d53b1acf84747b6b3901fce8cfa341aef2a898f0bdf69c6f6bae6b7d7b4b2cedd3f6ea3
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-18.12.0.ebuild b/kde-apps/kwave/kwave-18.12.0.ebuild
deleted file mode 100644
index 5332d69756bd..000000000000
--- a/kde-apps/kwave/kwave-18.12.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
-LICENSE="
-	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
-	handbook? ( FDL-1.2 )
-	opus? ( BSD-2 )
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-RDEPEND="
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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? ( $(add_qt_dep qtmultimedia) )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_kdeapps_dep poxml)
-	$(add_qt_dep qtconcurrent)
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwave/kwave-18.12.1.ebuild b/kde-apps/kwave/kwave-18.12.1.ebuild
new file mode 100644
index 000000000000..1f5ad36db75d
--- /dev/null
+++ b/kde-apps/kwave/kwave-18.12.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
+LICENSE="
+	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
+	handbook? ( FDL-1.2 )
+	opus? ( BSD-2 )
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
+
+RDEPEND="
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	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? ( $(add_qt_dep qtmultimedia) )
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_DOC=$(usex handbook)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_MP3=$(usex mp3)
+		-DWITH_OGG_VORBIS=$(usex vorbis)
+		-DWITH_OGG_OPUS=$(usex opus)
+		-DWITH_OSS=$(usex oss)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_QT_AUDIO=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 31df262a59e6..7ca92b4bdb6a 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-18.08.3.tar.xz 4168392 BLAKE2B 1b6d0641e4ffc3c5c806bdf9a3ee364653c106548f942e5d0febc1dd8226f20471ca9d39545420b85debd262d3512ca8ca64d3f35948119a8f11db0da5580933 SHA512 889f6bbc34cc7d9f6ffaebfdeb0e7dd07c166cde237e8d2cd029ead5ce8a3ca0e78df6de546e1eef0a822ad716135206aa0b11da5f21b31e61d795a2568ed01c
-DIST kwordquiz-18.12.0.tar.xz 4168980 BLAKE2B 1c3bb13bfb985d3d6c851256f3c228159194bb919484863e62769311ab88d80ea4694d0548ec44ab8329fafb04eccb6617c85edf407c88fc7fb33b901ec7ff86 SHA512 0d8b5e3aec1273357668a254556cade8fd47697783fad284a6049af2f393c2b9a03657733aa44a09618f6194780fbd79deef69768ccd06a56d67ddda1a734345
+DIST kwordquiz-18.12.1.tar.xz 4168948 BLAKE2B c21ab7b53c7bc48a99e136943f677c449864d7a676be6155abce5daa5427a8d43d64e163d0c4d13ed8d6bb4cb6d6ba8d0957021c235d517ade9d5302977a6d00 SHA512 01c6709e39b7b882e124bfc5c1f54534f46014cd7ba8c87c505a00f171f4f8dbe673c171c060c4c5f7032414cc9dc71b0dd3d0a05a52e697396bca9330eac235
 EBUILD kwordquiz-18.08.3.ebuild 1060 BLAKE2B 3a4693a5b8ab103f140f8f2aa3a6ce423435a899599ece72153eb966a8fd52485a13a2bd307352f00dce8c0104b53a122455e62f758a419884d6bf834b76b371 SHA512 9dc7bbd79c716e0f031baf833b29f97e279e0f0d750f2246a41937848a1dcfd03d2d2fa0906a87624e12f40c72fbb90a4c1e203dda06b44d97ae1daeab9945e3
-EBUILD kwordquiz-18.12.0.ebuild 1021 BLAKE2B ad641ac8b1044970d9c286443f75e0977ff188e2d88643564298c60e0066608ea44bdb15ef0c6ba637184a2ce08751c88c066dc13eec25ccaad44b82fca62305 SHA512 2de1f9a7f3a8b16ee472defaf7f08e594140130609b51501f90ec387e4c59ea8c7476e1ef912ad1133da755364479916f1f17c092e1f5596942712baa0edff9d
+EBUILD kwordquiz-18.12.1.ebuild 1021 BLAKE2B 33b05dece414e33a5feb25814c5143884211d145890556ddf2477464cfe9b8fb9a500c9e90605d8e0733819272ef8e000faadfa126ccd3ed586999bb78a0be5d SHA512 cf5d71446a0cc75a251fd73dcfffcc7f322a5827fada876c79e7b8073d12f9fe4042855c2aabbf93de7f8e9bbc5c3e062fef82c0ee73ee7a5b3e7a6d1d263ee0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-18.12.0.ebuild b/kde-apps/kwordquiz/kwordquiz-18.12.0.ebuild
deleted file mode 100644
index 95d3112b902e..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwordquiz/kwordquiz-18.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-18.12.1.ebuild
new file mode 100644
index 000000000000..d4d796acc467
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+"
+RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 52f626a66def..09e11e6b71b5 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-18.08.3.tar.xz 5664744 BLAKE2B 6645600156844c52ca8162bec98f107b45f8f4040aa94adbcf51470fb0102c300fb6755b6d6fb6bd856e6792ce770cae72d3675a2ac7fe0519f0c18d4df70e7e SHA512 08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3
-DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+DIST kate-18.12.1.tar.xz 5763596 BLAKE2B 08ab380281d097890ee68083cb42f7318ea0b2835f9881342967f9447c09788653aa2a09547e3d49b82abfd1570a7c8cea4c5178c7b0d82883ffa9e2807876af SHA512 d7c5189a2bf807845beaa8181882215b67e33229ba0f97027034d74c7bda06a0f820c673bd98e7dee0c47e9f58f81d3bd9af516e5d91f61bf227c05657fa797e
 EBUILD kwrite-18.08.3.ebuild 1184 BLAKE2B 23fa41c246b1ae097d7ee090a3c842551633b46e07a03b60ae22d46c9f6a1a0a00ac86798037cc9ebf8282e1a21c7e50f5ad5c05c24c13b66a5859621f44b902 SHA512 6046dcd2fbd951faa6da692a1bc3d896d88452e25d692afc081a3ab6255e1d50c7d8665a64b35c1bd2743a0499979649355d76918d922335172c8d4fa740a6d9
-EBUILD kwrite-18.12.0.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
+EBUILD kwrite-18.12.1.ebuild 1186 BLAKE2B 11e283aebe4f4c9b86882359baae4b73ae10286fa176ac19df12b95ebffacb50afdba27995409896c5a760cf8d1c72cfd7fdc19d69eb673ad4081e1e1d80b6e9 SHA512 a8e6f1ab7c1811ead325c77da985c785c33533fe67899b68141e8a323f72b4dacbd1eafb55a2c96d708edaa9bedfa7b8269b834732adf7754b6e8a782a293cee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-18.12.0.ebuild b/kde-apps/kwrite/kwrite-18.12.0.ebuild
deleted file mode 100644
index 7452e0dfe13b..000000000000
--- a/kde-apps/kwrite/kwrite-18.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-18.12.1.ebuild b/kde-apps/kwrite/kwrite-18.12.1.ebuild
new file mode 100644
index 000000000000..4735027f1a3c
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-18.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kate"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	# delete colliding kate translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kate* || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index c440868ee4bc..ac02ab270375 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-18.08.3.tar.xz 30400 BLAKE2B ca9fed0045a2166182dfd6828b6dda01054253a907c2774ecb2c44d61c3fbee738439322be716f716bb185910c79343e8cc89b13bc9fa458d6886f530df15ca9 SHA512 d3ca400ad36d8beab3df177b8862c6887789aa4e85bbe9391d8dc58d11208a052d3b4d9fd185c7300023dd169622c31948001c0f87855c682efb2972bbc8a64d
-DIST libgravatar-18.12.0.tar.xz 30180 BLAKE2B 7ecb1f71543d025d0e719de73c6bbd57507e21d7cd522f75b1ecebd8ca5001bedf1bf1e5be6f61faedf91c3e5e7706f3bd11480e2dd613f9c3812a6f734e9873 SHA512 eec1da8c0251b30a5fb15eef019429ab5e48fc1c6138bcdcbd3ad322ce120df9d4f8b417599cb4e48f9a3599f01f96e505fe8b51cd129735747a6c42ec0e8c4f
+DIST libgravatar-18.12.1.tar.xz 30128 BLAKE2B eda5369da172f87fae6200e237a037baa41121b7f7e4fe1deb159b2826cf1f26c3bbf84f8c75ae4a4c8faea5d19910a24e6733abe55aa3a6c4872de1bb0a30ba SHA512 f2d7f2dbac4b2e1bd0421a7703d235949a86d8bde8db149abf1b1e684b42df47e1763a0d963c2bfbf2dcddaacaee8e09717941deeef0e9951af6aaa3463d9172
 EBUILD libgravatar-18.08.3.ebuild 720 BLAKE2B 4658b570ef54b5a84ca0703da005ccc54d0558c6008f244e591db99adb23710e78c4a6108f2d2a949e4da8533a6e49cdde488c5a54b1bf1610334f7bbd4182cb SHA512 d4dc57a30bef90f8a92f569c8e528c4c8f3e0e0ac7e2f4a27cf40d89d86c93154d60a1a6093b0d3076f7afcd97e1ffcf0e9a64bbf00dca7b7c1670b7628a2089
-EBUILD libgravatar-18.12.0.ebuild 722 BLAKE2B 3b594245d0a45d4630b6773bbfb7fe141daff064992faab0ce5705fabb2e1d126f9ee7b878d2e28a4046073aed29d381a4c271bf908ab80765a54c951171f5c8 SHA512 1fe18961ae422030bc10f1e1bc846d4e73d748e3b24de015b621fe965441da2fb5e2e78b320187fa0059b9168ffed9bc6473f34f153ae8647f2c7619d2f17bfe
+EBUILD libgravatar-18.12.1.ebuild 722 BLAKE2B d8528f79bf82b2e109756c988b28b1559250978a984225e7477935452aa3b07fa69f56962ed2684472f999ac4359e7b7daa91c45df959f03a1726a2111716d6d SHA512 c1ffe1cb7890640d0e14ffbf3d6c16c527482e6ae709bce4df559c9bd39db20c3ba79e40c57d31df2027445c7766160d702e6c71e159cce7563d1cdd3d017a04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-18.12.0.ebuild b/kde-apps/libgravatar/libgravatar-18.12.0.ebuild
deleted file mode 100644
index 3ea83cb004df..000000000000
--- a/kde-apps/libgravatar/libgravatar-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for gravatar integration"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-18.12.1.ebuild b/kde-apps/libgravatar/libgravatar-18.12.1.ebuild
new file mode 100644
index 000000000000..f72cc4291eba
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for gravatar integration"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatar-gravatarresolvurljobtest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index b2d8cf2c7abd..8945825ac3d6 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-18.08.3.tar.xz 426900 BLAKE2B dc5267b33ae715b95b9b40f36737e2c42ccbb6686580eb087ce86b7e156109bfc6f605b4a32cbacbcb01e0aff76ca26790173f64927f8745d16826b251e5c0d1 SHA512 07c91d8e53c2b30bfc2ca1e13aaae793ff88fc79d57475d32aa6cb392c6cd36b174ed8b5ab185a2a625d1fea29067b813b46985ecaca15510d8094fe32a5193d
-DIST libkcddb-18.12.0.tar.xz 426692 BLAKE2B 73976115a2dd6a4a27ab57687acf0b3e34cb6955d8b57f30abb81b7a580c24db7b451d0c7a121218db01e8e0c0c826aba63eb68db2296db6e18ae323c3d98be7 SHA512 4256267faf4ca3906c7868e4de2345d6917241551c9a6554781174cc67f2e199f80fa78c063de1e4daa811684dbd8fd88e108b794ec6c20c411f4e127a4da465
+DIST libkcddb-18.12.1.tar.xz 426576 BLAKE2B b19463f7850ecaa9b857bea654d711f6f58b422f11ea5912c9805c2f6e1c05abf617c14ff20e4d2c9f34b2847b6e38b2096b0a125a2d5a3df31108862d98c16e SHA512 9936c6543a5864b87ca2a229ce4fae2a86a5100747d0bb9e4980e4a0073337725c8be1eff66584e6fabfffc17150fd0fb24f3f9f10df4fa6547b641f939889df
 EBUILD libkcddb-18.08.3.ebuild 1066 BLAKE2B b08147e1b8011b9b70f7ad8470696e57490fc7655bac53abd1e2fe5295aaa35beb12d36f1153fcf0a375f9dc9156bc870f585cd82f6bddc4fcb1b9852f206f30 SHA512 1d9db467c157da80c77f594b695cfe669d5726031af80b39073bbe21832b7f34d7736de17e123712edae196648bc91a678b5f1d5920bb952e6a8e2bba76ee78f
-EBUILD libkcddb-18.12.0.ebuild 1068 BLAKE2B f495d468c5a8b016be366107d59be9c4559179033190db780ca657848d1dc36ff7cc0e215be600e20c57e36421c1f5d97a8e77c2a429d1ae2f9ab68f1cd83a29 SHA512 1fca8b4591693c8fd38653658d72cb2e882c9e2c896856861be124777b9d579835dcb14cb9e46694b92e031031eddbb022d04cd7c29057a5c212505008af3c39
+EBUILD libkcddb-18.12.1.ebuild 1068 BLAKE2B 42a39127c7f8fba31c6b459ac257c16294cf1fab27bd62dbc3008947e6fbe6586a1c6fa5f6bc55a79ccb0af48aef2ac4ce137f6fdc640f9f4a68cf914be67b60 SHA512 3d78dfa37f88fea3aa06b630da29cfcaa9e3da7e734fb42c831b5857bcdb943d8cae46c4fd0c761d594e758c6f99bffb96474201aad654f58970b4743b17e7e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-18.12.0.ebuild b/kde-apps/libkcddb/libkcddb-18.12.0.ebuild
deleted file mode 100644
index 904641d3237b..000000000000
--- a/kde-apps/libkcddb/libkcddb-18.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-18.12.1.ebuild b/kde-apps/libkcddb/libkcddb-18.12.1.ebuild
new file mode 100644
index 000000000000..6047693859c4
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-18.12.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library for CDDB"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		cmake_comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 3e77837dabe2..5fa55ffd5345 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-18.08.3.tar.xz 88620 BLAKE2B c07b100d5dc40ab2b4b78790f7c88c5e83b29938ae45de4f304219bf465ff8a21b4485bb0a6e77f0a66c0460b7e2808c045a78fa997ee2f0edf776f62c14def6 SHA512 c734044ee96dd1bbd386fb95e5b277d7ec1261af484185d9237ed9b2d6937c7035dd28038dfa3e1eaed1a78a80fe4c814efa45a72da34827e38bf2448d7ee438
-DIST libkcompactdisc-18.12.0.tar.xz 88580 BLAKE2B a4a154931b218d9827308e6794d8ee5c96ef899302b50dcd85aadf6a0bf2bb18bfa09deb102e61963342fa74e319abdaf4110e2cace376fe8cd49d4f67d1e625 SHA512 f2906aa2a5d67a13a89a7900ac201d5be726e75a36c1ef93bec04eb9dfbe05c9cdbad598496e5167c7cc26360625c5665a2feab7aa40309bcf188d1f629a8911
+DIST libkcompactdisc-18.12.1.tar.xz 88544 BLAKE2B 9238ff2326a35d767730a1d499775ff4db239355c3755c4b98a68775fbacec5947afe97ff4496501620439c962979b90a6a1f8f321078755a47013e0328ba3e3 SHA512 e3fdf642109d346acb45cc7e642038609ec9ef5027fb84673bb198dfd9a8d8f786e517ff64bc5d64767391c25cb98f305722074801b405442142296be081cd1f
 EBUILD libkcompactdisc-18.08.3.ebuild 571 BLAKE2B fec2b5df6041776ede3870d4e5003f8e081e45a0d40631460a49bf64597d42c3cf3b74e8b6d9921c50e0ed65f7b607152a1f0ed0d56b6f4f522937645e36e6b1 SHA512 600b8877f984eb324f5b2a375642e0a7aa3e38b6b7136af3af0bdcc3d3fb48038d9ee151acde692507c4b031dc31c3b2729da014222b6cd555db2576474090f0
-EBUILD libkcompactdisc-18.12.0.ebuild 573 BLAKE2B b5ae1bec5e9410ccc1f0687d9daf8026a2b37d4cfc9da576065ed168876723d6576ac60d2ff30da43bf31998b9a876725c4375a6cb251807b97e194aa8660cec SHA512 74d3e063ec9723106dcdf83297758ab3b8efeee2ba8ac183fcba3e13c8b01f8668938b1a0b59943d975e4135e6d0dc004a4d4e3a7e8291a26a74c0c666f668f3
+EBUILD libkcompactdisc-18.12.1.ebuild 573 BLAKE2B 7d07d3463913e77a3a3bfecd5c527fafb448af1d4c4af64f788f1078371dd1998d064493e204e4fe21d698d8074cef04008262d2a3387053521cfdb5ad7e16f6 SHA512 75d1928ab3827df87c5068a0494af2d6890d55a2fb3c26b45ff0baedc53b058fcd862052806e1e4204b31e1d85b9764d96326e0ab15e3df565063852e3eb5769
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.12.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.12.0.ebuild
deleted file mode 100644
index 5fe56a60fbf7..000000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-18.12.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Library for playing & ripping CDs"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa"
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	media-libs/phonon[qt5(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.12.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.12.1.ebuild
new file mode 100644
index 000000000000..8d7cee22e528
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	media-libs/phonon[qt5(+)]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa ALSA)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 5b87fcee7705..f302f424a913 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-18.08.3.tar.xz 42180 BLAKE2B b33c0b12b66543c23c2ad072d8553c722cd9234d19bc028761b3adb9db530cf9450c988e4e2426c7159a07f6d00edcf4df3aeecc2aa0ce755fb98cd3e721853e SHA512 415607c40efa1449a59a07e087b20cf88cd583e5d8e69711f337692f1df6350ecc316ec1d7ff24bd757a6e50c0ed42d0625d144b110387c06ed1d415d07013f0
-DIST libkdcraw-18.12.0.tar.xz 42096 BLAKE2B 892ff12b8b92e3981328ec6574986c53c3c8aa4fb73c811cd62e1a5d382639e1c1320d9227ab43542ea77a53904103dc34e9f7cf044750f3e5bc8fd57f8f9ca0 SHA512 4bbf40b896df3b8abf31f1f4c34ba2fb7693a7612b4fe889d796a329d5f3697e8bd173a708a44592612e2276210c7dfb9fa1fd89af949cb41e48b49280347963
+DIST libkdcraw-18.12.1.tar.xz 42104 BLAKE2B e9bc3915aede32cbe5cefb14d7c29404ff60edd4af397a0a132c7facd52f32ca79175fbbcbf8de97f457f0106bba15b44803004870b2a8582269efac9cc728cf SHA512 6adc597e93e6a299c50554c94fbf3bfcc934a97205af04ded7a5c84a980372e72eba23aba063548e5c6cb53a218bc04cbaefbd137450fade09939df578804ffb
 EBUILD libkdcraw-18.08.3.ebuild 333 BLAKE2B bdd77f2886a9b0f004d6ba7e7bb977df49b42fe70bd3fb7b8fc77c9ca32253145c5ee60df8c7826d73b8c8ccc16230b58cc05e26de16aea1da9048fb007049b0 SHA512 1d8a08bf81278901b1b47d27759139004f221b95d501af52de587b27cf08aa6e05ba07e1d9067fafb6e6ef1719dcc1226330aebf27e8ad3b0a890bc4e810e83b
-EBUILD libkdcraw-18.12.0.ebuild 335 BLAKE2B da0245514d1b831efaa2dc2b120b800b9fbf5ac836eaa6d720129f7f7f2f1e3858377ecd7f99e07e165fb12aeaee508f7b52527f9e1a395a1002e4a51380ee97 SHA512 066f41bb5dd0e45ca1f42d7b5cfbdeeb6e4010a9b4c90c23d96fe41e0573f6c8acc4e4afd803494820390596bd5e2244c3b99d243247b0e955f1aca48378394f
+EBUILD libkdcraw-18.12.1.ebuild 335 BLAKE2B 85b6232e6177cf06d693a7d05d383bacb056cdfb0c219e23ba51d56e733e3c18f8cb1e1fbc0a608c12c6c48a3d713dce720cec2183cc7ffcc1cc4eca09a1d4af SHA512 c22c25f3bd3e7a1ace556ffd5b53df964b15b66dc2473bf216aa35d0ff0880f122368d2fd1ecaf3a73306961bcae15a9ec2e592c02ab5e3b51c9c5619a7789c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-18.12.0.ebuild b/kde-apps/libkdcraw/libkdcraw-18.12.0.ebuild
deleted file mode 100644
index 270d7fc13614..000000000000
--- a/kde-apps/libkdcraw/libkdcraw-18.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Digital camera raw image library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-libs/libraw-0.16:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdcraw/libkdcraw-18.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-18.12.1.ebuild
new file mode 100644
index 000000000000..3004f333d1b7
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-18.12.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Digital camera raw image library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-libs/libraw-0.16:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index b3e5c0a67a7b..58d70a2da823 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-18.08.3.tar.xz 6385140 BLAKE2B d1bc45615de6ea3d4ea74966fe9e9006101b2a9c1d957d371ca8f93153f1837aa7f20dd407d79334b25ced8a617c0121d26d8831bf58ac6e01418d4e466bf622 SHA512 614c3428593f005401f98a975884015f7647da303e67d03440685aaf70302fc20f34997b14bf8b5661d6b83fd291e181accf6829432ede259d122ad73f01ac67
-DIST libkdegames-18.12.0.tar.xz 6382788 BLAKE2B f86537ed8f4bcbc7ddd9c13b9ce6c84fb66a61bf7d452a0bdaee96e73cc1c409bc46c948675d2e83762be149d4f77fc6766131c0eaab39ad3b77578cd8601f72 SHA512 da6ace43777125349b59977603e136862c1bd8e7375c24f5aadd37968cf1c5e2412c502aa702b4903212b15d91d426da30384946fa6e8dc642406176a03865bb
+DIST libkdegames-18.12.1.tar.xz 6381940 BLAKE2B 5eb2a4176244c2a0f486d72b6ba4b86d5c8e9b125c61eabeb05999758350f3876bf8e9daba916022d866353a595ee558cf223a62a4c8083e5994fbe831614f4f SHA512 f04cb97725e6c710ba047c811e1753738bf102abc2538600c02250a9888b9c4a3aa4f0c813cfb788efbd9eae925bc434bb5e2a49cbcf78acfea1fd59afc97f1b
 EBUILD libkdegames-18.08.3.ebuild 1275 BLAKE2B 405312a586473c6cecb25c88ebbab78a14783740dbf63fbd481b1ea6a5ebd08739466ab8df7631c65e5527756a7d604bdfb18bd083b23b3adbcfdb64739d585e SHA512 3379c9fbdefd64343d978b19d690111255803e29f444a0b4291eb20b1eee6cc5f32ebc0d91eaf4ad271617fa978322b2c7be80358b992c7bc065c6bb6e691e93
-EBUILD libkdegames-18.12.0.ebuild 1277 BLAKE2B 805c1981e95ad4ed0be28cc335de70b5fa86c3c7388a19d37959610c0548cd0f202e833ac8324d3a01c56946a3dcd4beef99c5b6bb399c4e963bfd70b5d6048f SHA512 70cb7d3a2edfa7f5ac6c931b1e98681d2e31cde9187e4f4f8d854852228dcb1f0e22da8cd097c4d3e3e6d755356b0caf7a4689ed29a0cf8fb817c0ca4fc9af05
+EBUILD libkdegames-18.12.1.ebuild 1277 BLAKE2B fc2ee528616d4bc510cc1e97732356e97c0f0b3584a669e0d1f66df62f440388f21b26fc6fd0a64dbc29330d32e72ce7728117e5a432d12b00ac77ba14ecc23a SHA512 fba0302b4cf5c89b08ef3dcab7054b22ac8101aa9f84802ca1c5f3a874d0283bd10ecd03d801efd53ed1aa6cf264de1006cc5cda78ae614f3b54e2980b317c08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-18.12.0.ebuild b/kde-apps/libkdegames/libkdegames-18.12.0.ebuild
deleted file mode 100644
index bab24896e647..000000000000
--- a/kde-apps/libkdegames/libkdegames-18.12.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtxml)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/libkdegames-18.12.1.ebuild b/kde-apps/libkdegames/libkdegames-18.12.1.ebuild
new file mode 100644
index 000000000000..5455d1dbede3
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-18.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Base library common to many KDE games"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(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 kdeclarative)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtxml)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 77d8da809713..50cd30813786 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-18.08.3.tar.xz 336668 BLAKE2B 57038366b90f29833fb9a555415483e67081db15413bfe4377348c7ab8289a30ef3551690629423cacfe4910d26610db5374a41b9a56a45d628c3c514d8b1c75 SHA512 87bdb505bf79a4a92ae261d781bc5d99369c957483f8783c656b7a50c1c71955d520854cdf5fcfe8985eb9df9baa5d9fd0b58b3f225cccdfe89373165c72120a
-DIST libkdepim-18.12.0.tar.xz 336228 BLAKE2B 3d8e2877039a6db1cd05fdcb4ae4220bfd6f0c9bf15bc95d1f1c5a7c625f6fdaae455ea11a2ceb2dfdc4723c577450754c04b7f4f4dc3e58702f6dac97452727 SHA512 c4a98ecdc1296bad6981e58aafc3761496a2c887eb73efd0ad1461df0a06ef40cec1861f3600e3d04858e6a06a0d759b3af0855e72c81077919b17e0513e707e
+DIST libkdepim-18.12.1.tar.xz 336208 BLAKE2B eb677a884ca7d5058a2554b0ecb80eaa6b34b803a3996c8983ad3228139360b23bf7e2db60dabe43b2d76e3c1c4b0b79d4f8c28a7eca6fa1847a00e3465eb906 SHA512 ffa41194bfd0f476ad98e7d735713e58722baebda446eb0ba44e9b0f585457481ecab66747ce34bab6fc4d2131c009fcb7d73d582f531f24edff880353fd22a7
 EBUILD libkdepim-18.08.3.ebuild 1062 BLAKE2B 0ad4a23ccb9353fa75e6b2c4e85c5dd417df752b4556b9b272f390ed8cd738fd9e4256ca59f104caba1002b3299679ca673720f3bb396903752b0ca30ed27ba5 SHA512 2b84b80e372c465efe07826435c1e5d4e40d4ed9a82e5dc2e305896201a306c94c3147eb7d4fe187e1d409519ae81afcb1092023e6e23f3eb82e8af0750efbfb
-EBUILD libkdepim-18.12.0.ebuild 1064 BLAKE2B a4baed8c32672f8285e68dc6dcf7abc0a7b17d197a4b9e0a252ec7cd757b823d08a5df1221c2f6ca8391c2b5e56b73ed5c14cfddf93b43e66b86f1f16bcf4d95 SHA512 6d1e5326959567997e65e30264f8710c52e9867845f07489105300451b3208afb5f8f8a7653e40e11fa3a1774c2785c7044700de58829a6e0310bee0c5df1df9
+EBUILD libkdepim-18.12.1.ebuild 1064 BLAKE2B 2f188fdb41413d2320e5de2f1f620294f89c8938c9b8d314049cacb8e224f12ad59b68e3625289de1d023309ba683b6c6269202bb73a6ce3af686baba65c0a20 SHA512 16e374fe20879765f7aba447ddc812d8a27fd57ba72114fd205c5492a725b55ee93ca122533b1b8e87c929fdc38405543bd277eece68cdecbbb926a9bc5aba52
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-18.12.0.ebuild b/kde-apps/libkdepim/libkdepim-18.12.0.ebuild
deleted file mode 100644
index a97de1a8b4e2..000000000000
--- a/kde-apps/libkdepim/libkdepim-18.12.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkdepim/libkdepim-18.12.1.ebuild b/kde-apps/libkdepim/libkdepim-18.12.1.ebuild
new file mode 100644
index 000000000000..75619bdc2d0a
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-18.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index b3721223990e..b71416023db3 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-18.08.3.tar.xz 206796 BLAKE2B b35a16375e91694c1b18034ffd59181f6c67dd4f5d7874a84bc287928a6f09e810f7922f5f7b190f143dd197bd25f78c03d1d07083a0bc6175172c12d6df8230 SHA512 9cec451a939414654efb559f38ed9a42ce673dd17e2af016408f60dd98d7b8cc4c08b75d8fce8c0d680637b123ec14c85a1a4a8c54f0c9617d4b8afa8baa9fd0
-DIST libkeduvocdocument-18.12.0.tar.xz 207028 BLAKE2B 07ba47dbcb3fbf70f4810ae326f13ba26c2f686ec63abd4cce996fb46af1dfb7558c720e1ea45bdd8840e9c3dc554b1930d975ad08dcfa2337b6593c8f7d54ce SHA512 39eb41bf0d4ac6428e45d77049da875e392c13b27b28f5aa8c7fcdaaa63009191e75ec7bab393da5046258e66589cc9e73a64f194382b1a20dd5d60fa8ab6d92
+DIST libkeduvocdocument-18.12.1.tar.xz 207024 BLAKE2B d0ff4f601a217269e37cce9591a6348949d0860760c470036b7682481f3c96e8ae0f92757c37c9f287f89fe477f0a5f61457d626238fefe37cee0181ec6d3f8e SHA512 bf752f742720d400c00b855b213b10db6c97fcf4616ac7378e0972f349e661e46cf85c3142b6cb37e061dc0a2098892acab7b47078863eefd8b6b74213c3e5f5
 EBUILD libkeduvocdocument-18.08.3.ebuild 596 BLAKE2B 91bab23098f6cc499a342389360770a7b23b49414f99f9cf12945a3c39b8f11c10916ad85cfae915fc2114d70632fc5234274087ab288db7392fca3f0edf4425 SHA512 073b7aab21c8590005e074786b644c11545ff99ab1d47d05e410fd06d6facbff5ac8bf61a1588962f24a8de3f4f1baaf59bb06dd2035e08c2551e0433cf8a0a2
-EBUILD libkeduvocdocument-18.12.0.ebuild 598 BLAKE2B d764bf8ecd51113aadad9b692894fe8a4204cb1d2f81f8ed93012a052ac987a96b26388b2e054818bd2b99ea04c8864f10d8e61387cb70bb655aadf653215bc6 SHA512 36f9d326aa27ada8d553237d6233480b10c8726d57d81a91e781218c67ba438fa932bb5ee5dc9265231a057a331385603b5b417c7f04104be663858a317f81bc
+EBUILD libkeduvocdocument-18.12.1.ebuild 598 BLAKE2B 7d8e24ab56525d49ff2228952c9aaa372ec1bd3d7dde4a65df4a9b9467499acdd3937079425bf7e101cb14237ee42d18505556b79788462ad50d97a7b8a62829 SHA512 d5d79407034d7bc89a224795b0994c53fb0e0d7b7c1d9a3fa4c307427f55269bfb3766598e3e67db35ee2bc847b86db79da7e994f6a87c251a035c29a26f3c90
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.0.ebuild
deleted file mode 100644
index 247314dcd806..000000000000
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
-			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
-			-i keduvocdocument/CMakeLists.txt
-	fi
-}
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.1.ebuild
new file mode 100644
index 000000000000..2110f0ed1c80
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for reading/writing KVTML"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i keduvocdocument/CMakeLists.txt
+	fi
+}
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index b0e329459417..5d6a3f4ad2aa 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,6 +1,6 @@
 AUX libkexiv2-18.12.0-exiv2-0.27.patch 7827 BLAKE2B b16eef536dd2517a62de9561bf810cc2b2c404baa6b6c17750bba4f1880b1615cfaa0301983a009654bbcc8cc7b6f19704992e5a7dcb4151f266e6b83b4d38c4 SHA512 aa23336c5667c9bb6610e5c88f713c14f5aae187526faf1e65f92e5258faf50d6f7926b1b0b6deeed9874cc024061a0adae0ff6f4896ede1495678cadd9b368f
 DIST libkexiv2-18.08.3.tar.xz 64504 BLAKE2B b29645239bc1523bb363e04ab0449563f4c9550887c359b9a55414682e850289f80e85088c043a756d34dc83bb3b0c6cc9975cd4e5a513b80fbf4d6f93870d6e SHA512 eef3fbb5942823d23d276f56a1e9187b5142331485a4fb7d7e419f4af5504659c5a755f64e4cdf2a9bef6ae499126672ed5627c0fca7ef56fac7dc6a12794143
-DIST libkexiv2-18.12.0.tar.xz 64528 BLAKE2B 697c88fdf36c04dc874ad3625eb7bf699604630d35cf5f7e81ee40f269a54a2e03e837479b0e66c50f79aa9a646128f0b4588e2a7d5ffba091bd3c2f30a410a0 SHA512 8fc7a46b5814e6ac2013630e41dcb209074ea7765dd65343ed8e0d25216987f5262a77dbf1736eec31dfbfe05be730efab3474ac3689ca20ac94f363976a9d5a
+DIST libkexiv2-18.12.1.tar.xz 64508 BLAKE2B 2e8a6e36236cc090a33c5f16d5b8949208ad4a12cf4ec4ae845cdca1953e4230d71d795c47dcd5f073590eb8d6d95f104eecd75f65f25b6a4c509ba75039a067 SHA512 f89d105c4e081311851d649065640ed9b53761d8eaf273afc734a34dae52df9e834806a6d71299312f95e5c8267414efee1b30671b4469a1b6b604b0de90e6a0
 EBUILD libkexiv2-18.08.3.ebuild 353 BLAKE2B 2e6b4be08764403b6fe046b37908a1684e3a95f4f23a9c5e4fbc3f1c2e870362f43b7528d8e433940c6b40879eab4820616f28a1956dd7ef6d05dfbd6237b7ea SHA512 33ba8badebe5fa55e2dc648ddb2a304274ebf6a5ab71de0ea23712757ee7e8e9133027d77b283cc46e45f07a1779eb325e7dcd33c03979f370c6ec10ee769fff
-EBUILD libkexiv2-18.12.0-r1.ebuild 432 BLAKE2B bdd98454dc04cec92e69a77afc2cc020ba614d1ec5f45beb6dcb5f3659c3a7972d67653cd30e28fa5dc95642dea972975ca3319d3a1acbb7ee0f9fc6bb262d97 SHA512 4f875fe797aab12afcfc7ede5e0670138d19b10a180d9be5c67178ffd1bfc6c4fd5e853cdb93a5cddc3c9d738420129029d9a8ab3bacd99b05798bc20915f6a7
+EBUILD libkexiv2-18.12.1.ebuild 417 BLAKE2B 65fbadc0a74f99b455121bba24fe9be13b31a367a2bcc86ddb8ba5a978b1cacbed8c6c2ab7f1d95b50206d6d623683033f265494ab8276b4b6229053302562ea SHA512 86a3ec66c5755e003bb91ced8c3bfe28925eb6f7472bd739ce6b5ba03a135d1cca8a0e793fb885067c86f93f04fb455d3dc5bdb05cfdda6a44af260a43143fc7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.0-r1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.0-r1.ebuild
deleted file mode 100644
index 286798e5a355..000000000000
--- a/kde-apps/libkexiv2/libkexiv2-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.53.0"
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xmp"
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	>=media-gfx/exiv2-0.25:=[xmp=]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.1.ebuild
new file mode 100644
index 000000000000..f44487230a99
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-18.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.53.0"
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Wrapper around exiv2 library"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.0-exiv2-0.27.patch" )
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index efd63269bf21..84350a9acae9 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-18.08.3.tar.xz 215880 BLAKE2B b731bac02e575fbccd3e9587e540a02b8395dbb71d142a6c84ef1bec725d1168e1a1ac6c14ac58011af6244829605484d13909ff486b202f9e434b9fdc09ef8b SHA512 d42df6c4a845782334ea34085564e7b0b7039e86236fdcee9586a3cd9bf2f53331b63c08b78db7d38f8ed904041a69e1b8b8de0f44c707196b33f74c56d25494
-DIST libkgapi-18.12.0.tar.xz 215000 BLAKE2B 35850b72cb4741554cb59cf8af1f05aff86a524dd8fa7c258f9e99ff56eb9f5d131924cd14f9d234fd790b45008478cc3ff19c5b91e95b0a93cb26b9ad55c1ff SHA512 1567d25103a120c4639926317d68f8f119fda4c003d896a47f834a0628dce0a61e64f70073976e3da2ae8abb714081aae13e882ceb3150d23b1b763d094296bf
+DIST libkgapi-18.12.1.tar.xz 214984 BLAKE2B 51d22b6ff51726c31372b000ca74ae1928a2694b8238e8574b7ddd7825df7c474e147a76663aec6e73f04d2a1c4607508fbac25ce16b6649e9c1e6489c4ecce7 SHA512 548afda637a019bef62d52cd84b297610654b0b17c9d785f856df8132586d20778c44ca21fe0acea200f33ba2d4390937a6cea1bc827c06eb0994fb405faa2e4
 EBUILD libkgapi-18.08.3.ebuild 813 BLAKE2B 5dde628bedabefe6499e9d715e7f072243286a81af4a4f233e70010bbd173d842fb7280e6d4a7ac7c6305405ae241022a2176be7fe7a5527795779886fb67d20 SHA512 7fd8bbad015d23fa38a7f3cab6afaa2b383c1582a736ea8577f1888cf241913521ff1d8c1d0defd458a4792ecbc01e8d186420fa267575f5c5a7959e48d59ea0
-EBUILD libkgapi-18.12.0.ebuild 815 BLAKE2B 228d2cde63d65286e5958e1fbe627203bd1ad64c0b16d88ca04f2bc2766b147c3c8d77332c0f9f1a234e4925d79cd494f3bd2ac7de02d105022e848f8e20e110 SHA512 cc53e9f8085c359796127cdf343f2de1b9c4a9a7741a58753788acf4647ee45ae01b9049fc4774eb029a20b0b414970f0f184bc1ec4f0becf72febb4cc9d10cb
+EBUILD libkgapi-18.12.1.ebuild 815 BLAKE2B 6ccbfca73a7f57c6da2f85448d920d768aa9f22a7e5ad55eabb511d9bf6eff72b8f33998f084763af5c58d35764d79f569f2f3a4736e3f0ebb7191b1004a00bd SHA512 db0f14546a8e2db2135cd60b1929e264e635dd0df059ae9eb71ee214f08f56e3beae1e83c0defd920e208f8354519b778dccceee76dfba31fe0a140ee6c62a62
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-18.12.0.ebuild b/kde-apps/libkgapi/libkgapi-18.12.0.ebuild
deleted file mode 100644
index cb1e7727f859..000000000000
--- a/kde-apps/libkgapi/libkgapi-18.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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)
-	dev-libs/cyrus-sasl:2
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgapi/libkgapi-18.12.1.ebuild b/kde-apps/libkgapi/libkgapi-18.12.1.ebuild
new file mode 100644
index 000000000000..e1f8427bb1c9
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-18.12.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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)
+	dev-libs/cyrus-sasl:2
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.07.80:5
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index f434a9a334e4..8b744780142c 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-18.08.3.tar.xz 150976 BLAKE2B e9e7c85e2c4711fb6a68829644de2e99b47c417f915cf734928da1d93590a2b61faeef4b895d970c403dc40e844274e73204ba4fb00164fb295d13a43cd442e0 SHA512 d7b014085ba2a89d77802202878c58286307c20c25a024d748aa1271b61c7f31ade7e066f02bf44f66fbc6ab85f5cd176e09a21fbca45a3095096b4cee9ca275
-DIST libkgeomap-18.12.0.tar.xz 151164 BLAKE2B ed83f92021363c1538b8501efc1b4a90f671a1127ff6f5118e61fd8a63fa8576d31ff96b42a5929c10c86e7ff18de6af8fe799152fb593983216fc886c336d84 SHA512 26cc0e96dafdae906d5f30a4e06cf39ad97972785064b615171124c38f006c9e8828c3ed5bba42afa85a7d7172cbd70c2878b60f77207349e43c3620848727a0
+DIST libkgeomap-18.12.1.tar.xz 151076 BLAKE2B 5ee1d29254a6ac1b101e639eedeeca5a9b944f4c617eee440789c8086423f49cb1d7d0b9361d1ad1d488a82a97e581c14f228a0f4ccc640f2f6da52a45091b36 SHA512 d63b99e12d6b38fae5d6b73a512242304acd65f0486801a1d881009d2328f8764eb33004d4c90aae435be34650b07cbdb114e1c3d28cbfd6d50351a4c8f3676b
 EBUILD libkgeomap-18.08.3.ebuild 771 BLAKE2B cac391cf6f4e71333afec08c058f2370a24bcc15814ee731459de82c3851dfe866287b0f6f4031e8bc666890ecacced152f005901de99f34a897b28ce2ce7b37 SHA512 2a773f41e6b060a8893b96a2b9500ddab74e20f7ba57153874db1f1f3f3d16e7d95f6aa8d7e7502c1b07f6e5afc7e2995b0c7e99deb3bbd115016268f66924dd
-EBUILD libkgeomap-18.12.0.ebuild 773 BLAKE2B 192f6d06d438f986c996eaddebf8e2772e64117628848da2a2ae2bc760341b820c0e964f3af4f371954b0e4d5209f7c2fd1fa279428de1631eb4873e13e3e9fc SHA512 5a43e8063ec37ad0cc9d070a833f87ba06b010cc9bef638fbd7c44a1507091439328a768a7bcebb4513a4c8f46d99632cd358c181c829eabb4700f7c7cc5aa6c
+EBUILD libkgeomap-18.12.1.ebuild 773 BLAKE2B 03a005ee41974d7e1dcde4e4c8883c0361bf0713f2164e9c53bf23a8a58efb7c2e73dbb3161db2aabd0094b670971a6bcbe665c9eea8ce0524dbde0fd785f4f5 SHA512 a33d9b9a24cdc906b6df7f17de3d15925ad54e7cac80f786d72c447562537e4298674fa0166ac345282a7fed5252117d522900890d9606f11d521ba9d3674027
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-18.12.0.ebuild b/kde-apps/libkgeomap/libkgeomap-18.12.0.ebuild
deleted file mode 100644
index c0d623de9443..000000000000
--- a/kde-apps/libkgeomap/libkgeomap-18.12.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep marble 'kde' '' '5=')
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkgeomap/libkgeomap-18.12.1.ebuild b/kde-apps/libkgeomap/libkgeomap-18.12.1.ebuild
new file mode 100644
index 000000000000..3970ea2d41ae
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-18.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep marble 'kde' '' '5=')
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index b05567ad31b3..4b3a85e778ae 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-18.08.3.tar.xz 103640 BLAKE2B 9396803a51994e6ce36452085434be17153ceda3bb6beeac1c4fb85b8048c41350f750b7f9ca27e6475d8307983ebf00661919baaeec289c8c00232547814701 SHA512 6cda4e56e6c879471ffd8204ef13e817a8d34b8161c6bbe66dd898f02cf215a53df8537447f7dba3fd3a812e52d62a53dd423bf30fb2bb9cf76ae32a917e51f9
-DIST libkipi-18.12.0.tar.xz 103444 BLAKE2B e38e2b36f1145a83624be25357693062053f9c0b845fbe04b19ab2c689d5483c51b5aa841c94a7ab74db101bd12001da92b47fd99b67fc08df05f3956850d2b3 SHA512 fed4833a7b94359b9c5ad4e920e1a68d9b421c786d4b7a123bedc0c7796667678a72db499864528683d757a1a84d38aed6144b27247507508ba5b870af6ac1c6
+DIST libkipi-18.12.1.tar.xz 103464 BLAKE2B 8b7c0c5566f9181c15027c0cd6d379b1b62b4453cebec14d01367493d629f02f8511077ae6f46ffa032f603f9fff028bd7f9e07280c03a90b85c3b3978b71d32 SHA512 3eb1918aeae2abc47e837178ef0e5e541fdbdcda0cc310d918b42559271a4dc01e92625ab04c9d5a9ab6dbe31e9906fdd53cd192fe11d23d503d815e6609e9bf
 EBUILD libkipi-18.08.3.ebuild 562 BLAKE2B 1266b0e79ea3bcc7b2495bd6de03dd1c891dc3c8721c9e1c414e614fc6417caaf7d5dc0535ee917ad690a8035a167a3b3a23baef6e65a6f229a7acfd7193681a SHA512 ab6ee60e04fd1347f65bbce67a7c3ddecb65b47751b435ae0784e7d3da7fbcc994cda865ee306ce5dddd8a3fe146de74077be2fb5d5baa2e67b5121941a3d1c6
-EBUILD libkipi-18.12.0.ebuild 564 BLAKE2B 90490e716e6b9356b6b7c67199e64c32cf93127ff3ab11e5f12953b5fc0b9d977c70ffad49a85f517fb41e03c6407db0177c9044748024831b8025e4562f125f SHA512 911d8f8ea0b45b6d62fa2add532dc1026b68ff5610083c7edc85eb37b3b8cd12e9e22e4866fd15fab8a69cd967965a010e9686b8a2ff0d77083363dde82e88fd
+EBUILD libkipi-18.12.1.ebuild 564 BLAKE2B 9371862d35c74ef7bdba75442271f0f90df5ec5ddad886f8623e932997e6d2958964611fc5f6b1d811e030009b9133de1d7c530547b7c42f388f3bea83524cd5 SHA512 505c9bbd1f1a87e078d240b9bad33b54a4a9448c0272c980059526fcbfee5a456b05091706039d9c38fca8a603ebf837632cf0553b2b44826cf1269647c4da39
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-18.12.0.ebuild b/kde-apps/libkipi/libkipi-18.12.0.ebuild
deleted file mode 100644
index 8d81c5f0c2d9..000000000000
--- a/kde-apps/libkipi/libkipi-18.12.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libkipi-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
diff --git a/kde-apps/libkipi/libkipi-18.12.1.ebuild b/kde-apps/libkipi/libkipi-18.12.1.ebuild
new file mode 100644
index 000000000000..0c329d930516
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-18.12.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="A library for image plugins accross KDE applications"
+LICENSE="GPL-2+"
+SLOT="5/32"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libkipi-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index cdfe01e25f67..ed64d29032a7 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-18.08.3.tar.xz 336012 BLAKE2B 26f9a7b59a88f09f71e7047a4274a80971b3e5fb220e194c0663a59fa8f5411569d8a4b4038b46dee28f7622f0167447dd9a9516bebcb225c221d30ce968c2cb SHA512 5bd2aac755e6dad05e05e1c49b83cccf8b349c9231533dc821b3ba1dcc4da3fb66f7e8aaaeebdd1c080a28d94b9646afb248b5bee44e3bec8447d1293dda5f10
-DIST libkleo-18.12.0.tar.xz 332952 BLAKE2B d16b9483752260e51ea0d4bd17e4bfd4203fa5afc65225da87f22cc30551dee4ab428552e6351c42cc607b31194c29c4e08bfdedb6682f3a96d7c96fd5a50287 SHA512 4569bb0c954235760b1803d56099a4ffe1d2e4e12d61a2e9c2a59bc36aee1cc06e7c16bf6a367e75a9f40659ad3cbde4eed76c0526bec27012ebc196613bc931
+DIST libkleo-18.12.1.tar.xz 332956 BLAKE2B bcc1bad14b566780aeea570ef99bfc792ba8389ff2bd3ee4fb79acd513c803fc51d2e0ebe3a9b433125ca401367d491cc36e5579cb9a95f498e6a5a218d2f7ba SHA512 a4dc5fb74376355579ae20b59846945e56fc51db5fa651c2f6e0b8e0978150737c6ecb6fa0f03207ab28aa03257c5d1ad79b89fedef83eb64efc4b79811bb6bd
 EBUILD libkleo-18.08.3.ebuild 733 BLAKE2B 005224c0d5f5743cde2bfb6a54bee3893f909dc6f99206f9e3da017d11604368b3abbb5d60a2c0637788e162adc1c615f67a80a8f2120ec8104ad4212321fa7e SHA512 5b871b428b7e7e09457cd0bd0da5a87a05b20f35100ec583164727e6820186298d80cd10ed64fae506029dff094152b668a9f3f9783eb585b5a57208b857d1d9
-EBUILD libkleo-18.12.0.ebuild 735 BLAKE2B 00df41060874d558ddc74020b58a49a39e2ab2d96910fc8f5538ef6096f928978012e5a5e30fa549d5e0b33c8d2428e3898ce5d26744aa012e5ca2a811646aca SHA512 0277314949c09a8bfcc190a8846088638f8b35edd9048df8af7a8eb269d42af84e6f84fe5a7785cf6f53a358ff027b8c3395fbc188e9a12e278b26b127bd4463
+EBUILD libkleo-18.12.1.ebuild 735 BLAKE2B 3dae721764871d9c882536b2604bcf4c1a3e5e61e5047170dad9c5a23b98386b95c4aa04d358327a93e74ee7994f9db354adb0910e6e92e9268287e851356f21 SHA512 131e0841ba17666b19b8e1bdf2eb277c5f0514e56a784f55d32aa9968799e9147411f5c79eba1ea581b652f8d7e0e07a0c8ab21b75b3689273e25a7f75aa9542
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/libkleo-18.12.0.ebuild b/kde-apps/libkleo/libkleo-18.12.0.ebuild
deleted file mode 100644
index 208b8b525845..000000000000
--- a/kde-apps/libkleo/libkleo-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkleo/libkleo-18.12.1.ebuild b/kde-apps/libkleo/libkleo-18.12.1.ebuild
new file mode 100644
index 000000000000..2cf40b75b6e8
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Library for encryption handling"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index c87c798defdb..bf8b7b2e6ac3 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-18.08.3.tar.xz 1684004 BLAKE2B ad3e6da9e0c7170a7998ffd7c30435293300456df4ecba4717ab60bcc6e49494973ae96b60d5cd5d571a4ea2528f974913f34a48002eca852c351efe2308e9fe SHA512 655211a0e79d5671bfc9579a42c70f11c32b322ed987635ec1e2f35ed9a5e24ceea73619dfdb30db8d1c0b0e197314a2279947149819c812013bc3f51b86d15f
-DIST libkmahjongg-18.12.0.tar.xz 1683336 BLAKE2B 308305b13220ce4ac4bcc55ea0dc9e1b65ae2297698c709e6deef9ed5000e5c0d82ee1a854ef85ee9b67fdfef50480c0eda9ea32ce552b3e5d0928837d135bb9 SHA512 3ea223d166d0505f9d7cd41a0210df595fe02d4c1f70520744b678d1fcfff940124c43ec3598757ba43c405444530a564d10c948b3accc819d601b8817c884ec
+DIST libkmahjongg-18.12.1.tar.xz 1684212 BLAKE2B 07c450bcc978350ed39bf2552a5d9e773a46fe15bd2d338d03d734df34283ece0a0beb2bc3e69e3b78b15993d70c8eae9b3e26912a1af65ed4c7742342c8c6be SHA512 99121b000da881fd93d09d64ec50fcdd277c50410933d32b758d1ac08641802ffd88d0c29c7db40d75b079cf26098b0a45936cea59c65050a3be2eb73e6958c1
 EBUILD libkmahjongg-18.08.3.ebuild 543 BLAKE2B f70ed51b66b858017a7fa7d2784bd83b87e87f4e31b6d8e6ce2de691c72aaca3ca477538ed91974c53b9be149f11f0d735fb0cf020e2fe1470561672279112ef SHA512 b3533f32a7bc83af0560663aa0a103d44c5ba7ce2ad0eec6a2e7aeda7cecec6076f48bb9fa0d96571a0d2ca6398d759af63dc68eeaad2c09e1f006b6b9146ad5
-EBUILD libkmahjongg-18.12.0.ebuild 545 BLAKE2B ecc3a913147fe120c67f790f6901d04d0ce7f7102c1d4c709f326a77dea7d0a755169a871bdbeb481b5ca1ce3c03f7b50395ab5a5c1f006834433febd8e8e62e SHA512 98ba4acbbb730a24274cb507d85be2d6b00f96292e70d08c3a8958af347b8400bdf4248270315618dc09fddff5b00c42e3df12071f87befecddedda739b5603e
+EBUILD libkmahjongg-18.12.1.ebuild 545 BLAKE2B dafeed9b4ab4444aed2cabc0a22c5fc7c59c5adb2df863769cd1df1a6f3ce153158489c134bc9f5fcc61adf3dc72d35e7142f2634a6e1d1a25ffb48432731470 SHA512 7c56aa5870aee64b2b2907633708432761a16f05a7d2d9f92e3c46a806061e290e09f5784c214dd89f74cea0a7c6375b460dfb0df9165539d10feb22fe13b497
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.12.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.12.0.ebuild
deleted file mode 100644
index 34598d762dda..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.12.1.ebuild
new file mode 100644
index 000000000000..87a57adab84a
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 4da069faa181..21d69ec16c58 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-18.08.3.tar.xz 173644 BLAKE2B 4d158b886786455dfe098df469361dba9e6a18ac965a8e522ea23719498fc67dcd7f77cb155880a6b5a0f0bac48da286ab34a07c9e9bdc7cb316d6a44a454978 SHA512 670c06b2179ae4402a9e80ed88262d1ec6d7b8b3df7b5489f9395d222b2b428795b067c61aa2459c4dce253fe8b2733cc7eb1ce8b3aed69d290541c177f5c48b
-DIST libkomparediff2-18.12.0.tar.xz 173444 BLAKE2B 182120cdff29d7f3247e049bdd4e28ae896b11e7a93da38d26e3e24a20bb850e0c152aead391eda665db836b48bf81c549dc368520071beb6229a71c77b3e1fe SHA512 8e5744cf37b76fed5624de9c0a8a3c6611593e254415e6fa62521dc4e585fe2337f6003c345d2747cfc5bc9e9fa392ca48aebfc4f3461b9b8ca28a9add4a4edc
+DIST libkomparediff2-18.12.1.tar.xz 173436 BLAKE2B 52e0732c3169aab217cd13d330ab0059c1325ef05f052fb394b2a2dff824a755ff3e50c2a9c08781daff17e2d4e039324e0bcc43f2ef9544062b36acdd0e9709 SHA512 00c4fd06fb16a105e5b2faf26f67f249dc570f74d47869407e1c18121d741b4ee2f1355b6a6e99fcd1e8d750249be622f8569912d6459cec141804620a109444
 EBUILD libkomparediff2-18.08.3.ebuild 527 BLAKE2B c7400142c94985196a911383d402eae99acba5bb125e84840f3af485871e89f25648a8bfe6e20e514d499f1ae549ce44428c27139ad377e54214fc55c37d7c51 SHA512 74eb62eb88000c518a955b064f164183bbec287089800058fb49722bdf020dd8d105d6ac2bf234a4bdd46a7e30a01333eb05a145208a05b84c93317c2767c935
-EBUILD libkomparediff2-18.12.0.ebuild 529 BLAKE2B 9d0fe8e96e88b2a0d5c4485e1bf9e61793ac1547fac2d65e493e25650a8d337efce1de43e6948351269879e746a00e49b9de5dd1973343d551d4c19929185216 SHA512 09a81ac4d5c476fd0988b152bf3f3959cda9b9500145d82722ed93e606687519309599b5443e3e2e5ac52dab9f13261da8d797b1890c6cf12e89db8407f98213
+EBUILD libkomparediff2-18.12.1.ebuild 529 BLAKE2B c79a5dd1eccc477e3f4c821d73b9177752e2262d1835bef4fc8e1a3b59a47df45bc34a05d256e2e69c0dc7ebfe4bd1c9faa70b8faae84db54393a483930ecb07 SHA512 a9cfad16b996c7ffd3117fa3e9640c2f89f274771aee0805e2059148b1fe01b86bf00d04397fea8af3070e4d64b15490e2cb4f6e7773d90732cd60fd3fc345da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.12.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.12.0.ebuild
deleted file mode 100644
index bb1ae1b7b0f5..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.12.1.ebuild
new file mode 100644
index 000000000000..79718603cea6
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library to compare files and strings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index e0f429ee3bf9..1cab3d2e02c2 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-18.08.3.tar.xz 137556 BLAKE2B bf0acd88271a70a7156802c2499eeae8bb960f480b0edc0790b8475871615918228e1a1aa6d0959b0855806d74c555ae07b94d64052180f89f4b44b72ca57084 SHA512 f2aae62e445d3cef43e2d974fd2fe080f0504ed4415b08427b65d4e863ab8e4284422c5607db987d80ec68ddc6b9fb28ad9c512fc50f2871f51f89d0d3e63d24
-DIST libksane-18.12.0.tar.xz 137768 BLAKE2B d3b6afdd1bc8cf3654f10de3e1f7fd8b85d005318eddcbd7a86f76228ce6ad3e592f789bc4ba280911f013b750091e275058509497f611de99145d2f81afa761 SHA512 d351b55ac4548b36d3eebf9028f0171d564427d89789629cd19d2908b92b58bc170e35874a2d9a64ba9db375041c4b8d9ef2c8ab0217768428c9029a5879180c
+DIST libksane-18.12.1.tar.xz 137700 BLAKE2B e430715653800264cce3e46a9359f2720cb38e28189155b195a7a133a4af88cd7cbd384db480be20ee77c3ee15c2e73188e52badc551e2b7da37018eee91a2d5 SHA512 e1ae8acdf1b9e987ee7c6e32e5e2311bfb59c448b535f59f41083835a371d83249f6592a6b7a6bca7c38485a13caf8cdf9f0b8f14302e613d510d724b42f43f4
 EBUILD libksane-18.08.3.ebuild 707 BLAKE2B 1e2a1d8dcab7d67635d6b81e07bdb90f2241d5a3b398f75590c39f1615fa32b16ac91d87bfee5c0cec2757aa2a66fed2d644ee788770d5bc784eb3921dacd407 SHA512 06e6b795c9d703d590003e1abbce0a80d4b3d4b1d2bb6eefabe5410a845a1770e5757a54ec36d2da41e700c795d8f1119a4ab47afcedf4315f570adff931a3f7
-EBUILD libksane-18.12.0.ebuild 709 BLAKE2B 96cf0cc91b6903ebd10b7a55cca38365e52d6ee6c2c17bf5f8387c2540a111aac3eb90305dbf47a64c3479bafde88c79658670d92d9859b43b37a22f2d310a94 SHA512 7c0a93a74dcb9981a97aedf849818cc19bf0cb46fe049db02265a867edac9c0bf9e715370eb7800e6b415cc138d2697f20fe70368b2bfb9a6625c9d453f499b1
+EBUILD libksane-18.12.1.ebuild 709 BLAKE2B c9b0c2a2cc3e8afb0ad87a08a296a65745fc132f8e7970fafcf6bc2c7ac17121d75da047ac5108e8346dc43cc1fc8fe1085ba735828f13cf91280ce5d50fdefb SHA512 f78852b6d313d00ffe7e15f2e549833240d8cafd93c83139574d6cfac77322843cd8d14b89cc8d18b042e449aa0a63097f505b99c9a70f1a42ca1a7697ad6bfa
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-18.12.0.ebuild b/kde-apps/libksane/libksane-18.12.0.ebuild
deleted file mode 100644
index 57b2af94de3b..000000000000
--- a/kde-apps/libksane/libksane-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="kwallet"
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-gfx/sane-backends
-	kwallet? ( $(add_frameworks_dep kwallet) )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/libksane-15.08.3-r1:4
-	!kde-base/legacy-icons
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libksane/libksane-18.12.1.ebuild b/kde-apps/libksane/libksane-18.12.1.ebuild
new file mode 100644
index 000000000000..58728652c83c
--- /dev/null
+++ b/kde-apps/libksane/libksane-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="kwallet"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-gfx/sane-backends
+	kwallet? ( $(add_frameworks_dep kwallet) )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libksane-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 970d6a9ddf23..468ee9e4caee 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +1,5 @@
 DIST libksieve-18.08.3.tar.xz 550060 BLAKE2B 06a255a05e691d4d4adc6e3ca0cef98a041f3dbddd3a01084257a1c7a11890fca6f717970ea996641b9a849a69e181539ecebdd8304807a95d33825d72c4f2a5 SHA512 2fc52ab6e2277b5d09038b16757428ee931f5b26f164362751e71e2a42d81d6ad3aed26eef3f036b4e3adb0d28e08d9259039403439a2be813a37b5f5267c9fa
-DIST libksieve-18.12.0.tar.xz 550536 BLAKE2B 66f6152caecde64b96b9c40982567eef85b433c76f750c6dcfdbda897788edb7429d36ec4ced4fa6d34c453323b0216269a2a5648a7a4647596aea1c1485cb21 SHA512 17e6b15b3048d0dfaee61d0a8bfe3e1caaaaf9111e7f536e5050a738158932b648213187a3af2938cfa2de8ac752d0f59bbf7e161170cfa53dff2501f3fdbbf7
+DIST libksieve-18.12.1.tar.xz 550424 BLAKE2B c3a415ea08eb88203c28ab3f62987fa5596f0b54f1767e65a532d70406304cdbb85d70d21e571e00760cc908f6054bbb3135101fece144bd5e8fac9d7e929055 SHA512 a1ccdeb811458f244dc531494455a61ec4d62d84fabf27d0849800b2e0108dac13a934b2dc5acd88d0430f3b0bd0376f0c37965fe96495ee470e9cd3a0d3f7ad
 EBUILD libksieve-18.08.3.ebuild 1453 BLAKE2B 0b80f24d23008d8eb56a3652767fd1c9323d5e80954c8944b61e08d5abde9a0b87b8928746e179b65c27e4f63ea704738b7d04011e97dcaa4998bda283fef198 SHA512 3c6368edd5b26fbf67d67725a0c12a47e01a30f2621a2659ce80e678c779c04d2eed2d1d243fc49148c0687273a690264ef406684df8aa4b24ff0fdc0c38a654
-EBUILD libksieve-18.12.0.ebuild 1455 BLAKE2B 98406b5c85a071974185467df266ca4f4becdf4b3d660c244e201850d745973e2ce244749b18af0b4a8fe8c733d99b2bed0ff235d1f8f361a3cc17cf12267e42 SHA512 9b2df81854dea9f19bddb181268ec4cde99ab250b053563050b2c9519e9935bc7a5fde07722c77842d46cfa72c2cf8da3d8226cf425548a794705ac328fbd651
+EBUILD libksieve-18.12.1.ebuild 1455 BLAKE2B d1b2719a81ca58cd26177839dfd9ee1ac57e9913b997dfd535d1ba8d867bf57b4d52b1d042480ea5f57af0a187d4f06e9fc1386f26b272a3da94c20a51b3adba SHA512 03122008ba30b8329b97b43571b27f7a1d78bff841b367deb7d29b08b534e6cf35bf90022afa98a6d017e448294392f36a592f3808328cba2a96af827c9acd1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-18.12.0.ebuild b/kde-apps/libksieve/libksieve-18.12.0.ebuild
deleted file mode 100644
index f4c909585471..000000000000
--- a/kde-apps/libksieve/libksieve-18.12.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libksieve/libksieve-18.12.1.ebuild b/kde-apps/libksieve/libksieve-18.12.1.ebuild
new file mode 100644
index 000000000000..e0cd8f3f69b3
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-18.12.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 6dc6b3557aef..590399105bc9 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-18.08.3.tar.xz 300340 BLAKE2B 2aa2157de3f10f21098430d7da4a760e2d44c15d7c15e2457f138925f36be2e666d506043ff0ee1f5aaad32f9a198ccd8ee8072ef3db665d447a7fcc78e3985d SHA512 8c783631c21ec74487eb127a5f79ea67e2575efb9c65861beea2b494cee204657f025115368cc594916fd7c2b4621f39746d0fd03c01003386331077a9496d12
-DIST ktnef-18.12.0.tar.xz 299572 BLAKE2B 03de8877129a63c4b1d83f4e3019684c4e439fcc5cbc286e600ec171114491ef999d7a6e9bb1f7d85465fc136b10f7188d2b4d49778c848f3fdec01be5344211 SHA512 5f046fbffaef99d24d4779ff196a06820832912c7cc9f1d1bc2dca8dc46ac88a16ef11374911db6ba7c123e57ca1e5d344932fee7b97ca8f8cd720de27c93f0d
+DIST ktnef-18.12.1.tar.xz 299540 BLAKE2B 4ac40a3198d79006168b8649395ffa601914d48f3437d1d59c535c6a2553419c9ace85155309ea2e8f01ceb2bc0108273dfba58f8f7de6991d2490baa498d020 SHA512 35254fbbef8d975d6651578e9cf30fe36d0988b393207e7239851bf2f0b07234460bace065fc271441b724f83f59993d9ef886068e31f22851c15d4a13fc6a8c
 EBUILD libktnef-18.08.3.ebuild 448 BLAKE2B b1e4d79d0dd0f363e4464afc9da6c2909b9cc92dd830f44551c1c4b3c6da2488e94a56d265463959b49e1206967d9f7d44002e3bc2acd7eae7c6cea3eeb0fca9 SHA512 c392a3d9ab5f3a1308e43f4f5cb5705b2129a5a81ac2e7c085b9490a07846414e1908c7d3cbf19d06fc05fcc42ccea22cf3ba000bde0f9121cb651ab4dff795c
-EBUILD libktnef-18.12.0.ebuild 450 BLAKE2B 146ef2620ceb34cea2599ff3aa7ee40715f22ce944b72e60c2b298526609b93b3ad7869b3e1d58ca65190bf9d502ed377376a23b39451282e35a1c6aafdb6121 SHA512 d7695a33956d0e4cd09bc618d6d7edeefe8e42f01004f324b0023830d2d3f2e86fe8019dfa11468da1a7a63938da73658a41aa6e92cfb4d67fe73fc20daa6f63
+EBUILD libktnef-18.12.1.ebuild 450 BLAKE2B ea3d00c7e4be606d2477be51fb42b5b52249846dc2c1ffe0eadca9d76feedcd2b53116fce44a09733cf33bca7c54f8f86bafa156c6ab6cf0d4316af30918d34f SHA512 e855a31e04cd6865d14006ab16e0075d3a710bf1794e4360863b171319c54fbc3d05c1c59fcebb326b1c2769039fa8fdd174f235a801b94d7a7f6d6bad67254c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-18.12.0.ebuild b/kde-apps/libktnef/libktnef-18.12.0.ebuild
deleted file mode 100644
index 9faf657d2166..000000000000
--- a/kde-apps/libktnef/libktnef-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libktnef/libktnef-18.12.1.ebuild b/kde-apps/libktnef/libktnef-18.12.1.ebuild
new file mode 100644
index 000000000000..d28d9c688cb9
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+KMNAME="ktnef"
+inherit kde5
+
+DESCRIPTION="Library for handling TNEF data"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 520402738333..56b5e06f306c 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-18.08.3.tar.xz 2894260 BLAKE2B ecf28734baeb920bf690f25fb507eccd60d73ebe69c64bcd80c04380aa213371d0bd52aeec6e745f924672c1c1c24122c9f790860ea27c8a434f6789959ad29b SHA512 d7686f2e7804f01761f7786d560270450e0cea9d88d26c8993a6f0b3efb4b8e099e25b38178e5dae3a52ebd2aaef19cba6ddb9404136947f5533f40f80abf844
-DIST lokalize-18.12.0.tar.xz 2714584 BLAKE2B 40c7113d3badac3cbc862ea099fc7fb087dc2d9ceb5618211f110b77275cf6baf7070fbac7dff38834747a2669f113f76e3832e11172130a8dd8b7b41ca56ff6 SHA512 30d5812e17afd2697c7fe55d16f3dd5249eef534518f561d96c80d57867eb916f4ff73b1ceed7bb30993239ddf0174dbef751a5edf966a299eee2c181f27fa1b
+DIST lokalize-18.12.1.tar.xz 2309852 BLAKE2B b527c6b9d849d26361490c8b3b31fda7011cfebd6b4e5aa011f7297072215b784d2cad12119df0b5b9648fa8cc258d3bb4965abae6dc97c19a948b7daace54d3 SHA512 6d46c201151eb18512d925927f61f1b037468042acadcbdbafb21daa7b9c67a38f12c7130e5625b833826a3ca931741f38b20e606f33aa7674a259deecf00788
 EBUILD lokalize-18.08.3.ebuild 1551 BLAKE2B eb0d9934f3d1310ce6ddee617721393238e68b6f80725b95e052788a90d8952b6d0f24f5bed51e39ccc8e05fc1171d6ae6ef3f27c2709fb2c273da768f800b45 SHA512 aa368929d129a2c1b3ed8ef7186be6c85e3e306d6e702d86c430136b8dc5e09e26a5dbf6a94fc9a18ad9b9b26507bed8efea7aa27d57f53075412706abedf01d
-EBUILD lokalize-18.12.0.ebuild 1553 BLAKE2B 2e52e6597030289ca15a33ad72a2806683ee55dc2c51cb2d25e9213a0677bbf6d4de54339796998147e23449d630e1b07726636eeaeac6bbfe45ca5d028fe73a SHA512 e334949cccddd351700a796a83d8586880ead0a32fdba6b50a68c8e1fdcc2533999c8bac9bb57a865ed37512c07abd323c37fa19d8ef2dcbdedb22aeae33908f
+EBUILD lokalize-18.12.1.ebuild 1553 BLAKE2B d43adfbf1dc1e27ea87ec0c002f2d782b10c7dc3d1329b91687fb9945bc880a6ba994ee2e15aa91548d94dca4b52aabec057331a5be4330d3525aabc5031edeb SHA512 456410fa2c3cc54eee9c02f207286fad3cf70bf974356fd97f0463f09f8fb1e06b6676ae352a96884a856ceeaa460bbec87a98b9c6d32f5cb30890b453f6d220
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-18.12.0.ebuild b/kde-apps/lokalize/lokalize-18.12.0.ebuild
deleted file mode 100644
index df43c30aacd6..000000000000
--- a/kde-apps/lokalize/lokalize-18.12.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://www.kde.org/applications/development/lokalize
-https://l10n.kde.org/tools/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}usr/share/${PN}"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version dev-vcs/subversion ; then
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-	fi
-}
diff --git a/kde-apps/lokalize/lokalize-18.12.1.ebuild b/kde-apps/lokalize/lokalize-18.12.1.ebuild
new file mode 100644
index 000000000000..2bca6a6bd3f4
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-18.12.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://www.kde.org/applications/development/lokalize
+https://l10n.kde.org/tools/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-text/hunspell-1.2.8:=
+"
+RDEPEND="${DEPEND}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}usr/share/${PN}"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version dev-vcs/subversion ; then
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+	fi
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 9a0b8c8b4d6e..737c27e909e6 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +1,5 @@
 DIST lskat-18.08.3.tar.xz 1217664 BLAKE2B 85ab3c0e34246ea17686f3be2bbe40c92a4fdfc9f3fb38f1691d6a0028077ee9023a02dda4edde3b132083ff36d3034411d71d382744fc967cf52cf639591e14 SHA512 a5c1407cb2b53ae3e8621c5f44da8e6868f7a1f1db1b62b9c904a657249bc01f5ebc8a550f66161c7b022a87317e8bd91e35b81560802cba8fcd1d6b16b7a6f6
-DIST lskat-18.12.0.tar.xz 1217688 BLAKE2B 2406c6c2d437246624ead24c7c801c03eb4a0ec06fcdd9cfaf43e98a83005cbdcd358e09f1a606c10d962e693cf5c68e58cafd26eb2e701b43b95af5be4cd15e SHA512 9cd3b93dfd75f8d848551f4e6575a07e680fda6577b8d5a4be615e70c49b45befa27ce7e7b2ac55cce4b36ad7dddbe92844a6a5444b5ee34b69d0d3eecb8dbfb
+DIST lskat-18.12.1.tar.xz 1217448 BLAKE2B e2af49526e429d208d217dc1e70bb96cd47a3ed8e1b4d0fd8e8e70f02a8275c7ecbfb6c28eeec08ace51e25c5e0999d8ca30061a428ed7f6d3ac775a8ca64d0a SHA512 22c71d5fc561a8abb70e9742b27bdbacdc57a24da009587c6b69b891f8f0e3ef75d7434952c75a7901c5cb0684709af2c7f9eb9b19efc69b18421c3295ecb428
 EBUILD lskat-18.08.3.ebuild 728 BLAKE2B 320b7ee46d13deb20cf3d60d22a063d78a558a3dac6a5057eea4933087ee0f8d03590e99fa7d9ec29a8c9a848710f3e43607c0b52f262b89826c406b86cbfb12 SHA512 fa0209a1f0d783c08ab1996fdd910f068d0f0f9069b0f67e96f0aa818608ed1d24e6f2d867e607129534490117593a5aceb7ac44a85e25a3c2f351c3b2591d6b
-EBUILD lskat-18.12.0.ebuild 730 BLAKE2B bbde7591b902acb01d0db47081476fd59708add0e19add4f5bbf4575f69d4c00b3b13507496cb46480823f4b941ecdbd0424ee763696a36511d908d27b6f6d34 SHA512 729ba8076e8c41629f21c980e6cec7386701fbad4948fa25035c4d9d4be428b69bcb715fdb0fc061a06f6d33c3523098249616a94eebfbeed0dd57550f0bc8c3
+EBUILD lskat-18.12.1.ebuild 730 BLAKE2B 904937008872205fbda8282dab6d86ef8928b6bfcbd32e312933c9f16cc6aa5ccc1af5c935fec1a5d0c72e6f0658cbb48f5f540a3cadb1346a86edf25ed71a76 SHA512 4cc625e0e1ee41351cc036c45783ec931b8aa6eaee388ff6ce07419ab96f328537108869f666604be8b79661c919cddae1c0b6de5b5f30bba567d6cafd50a1d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-18.12.0.ebuild b/kde-apps/lskat/lskat-18.12.0.ebuild
deleted file mode 100644
index cc6f36064459..000000000000
--- a/kde-apps/lskat/lskat-18.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/lskat/
-	https://games.kde.org/game.php?game=lskat
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
diff --git a/kde-apps/lskat/lskat-18.12.1.ebuild b/kde-apps/lskat/lskat-18.12.1.ebuild
new file mode 100644
index 000000000000..1baa76d13c9c
--- /dev/null
+++ b/kde-apps/lskat/lskat-18.12.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Skat game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 113c36d06569..9fb63c3dd258 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-18.08.3.tar.xz 691320 BLAKE2B 776ea337b6f2ccacbe721f1da2df68cf16a69e2bb8b1deb86d97c7420c3a5ca74618b4024c37e0709fda3d9e58e2da2b8b71fa3afb8b18c19522668d9fc57d72 SHA512 206bdef32f39d5894516964fae58020bb97343507fddc97a60aad456b4364b3bf688d6856d954594f354ec0c6acda814dd911f245b94a8269b01dde63845eb3b
-DIST mailcommon-18.12.0.tar.xz 693348 BLAKE2B 5cfb59cb8ade4a9b32648071a8b5ade614ef4a6ed7aac1d49b0cf4d89b8891d5302599daf7004e905c4c3c7535313a7438847b2b2caac729a5096a245ea00d99 SHA512 4684c343acd131d8bfecb7285564c2e113edd6d7a814f39dcb4d4797524e14fd2ff1a73dded02f2d4a7aa1863c799c9a3d474c5d989564ff70201756b8c33823
+DIST mailcommon-18.12.1.tar.xz 692244 BLAKE2B 111a3924ede47e7ee2966e8f3c7cbe9f7aa08b62d62eabd3ae9a57e44ecff84a7ca351a3bdcd07c0781354b282c7541332fa7063d690df9d4471be6ee751d679 SHA512 47eb3db2f910ffba7490d1c6acec2e78bca5547ab27220f162b492d480fd74ea27598daccd83fbcc9d0bd8e76e57fbeb3fa81425c4ffdf8078666411e93d9f5b
 EBUILD mailcommon-18.08.3.ebuild 1436 BLAKE2B e335245533625057464f9f756a52dbe3e444affc44d8d52a6daba864cf10d25938076daa48ef3abd2077984c8ac23a3faaa9d04d49b6d5a79a8451da79303eaa SHA512 15488013725b82b4fafe8b8135acfd6a9c3254e47e78ccde1c5b02318ed17753ccd261b74125ee19fff2b206b7a076b60a66ced30ba8047ed5f729ef522d329c
-EBUILD mailcommon-18.12.0.ebuild 1438 BLAKE2B a13a1853ce23f61a75b0b5fccf5ac93d6205339ea9bf7b7063bcd531454670ef05d7136556067244f3704108ee2569b6905175855699a13e4064df21d9e7d5a0 SHA512 4eca3d74cbd02f1116deda15e9825e611cfa38a30ad31160b8374a8d4200578f9a1f2b1872d506c7f08202299c1fb55729755ef3851f6401f6acfb989c456aea
+EBUILD mailcommon-18.12.1.ebuild 1438 BLAKE2B 5cf1a6f1a150d5a056a4194ff95c0c8549eece80f15881371ba76fbaac4140e657c18ed312e1fa43f7823d43ab33733643314437ce5f8cd69635dbdc5d278e26 SHA512 ec59f7d8ee818c625aeabaf7c2c32991b096a00ddb33f9b7cc58f28621de31dadcc66bc1b496c1117194f99173bb755c112a3b465434d06d509c12ff98e66003
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-18.12.0.ebuild b/kde-apps/mailcommon/mailcommon-18.12.0.ebuild
deleted file mode 100644
index b8bc39886227..000000000000
--- a/kde-apps/mailcommon/mailcommon-18.12.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-18.12.1.ebuild b/kde-apps/mailcommon/mailcommon-18.12.1.ebuild
new file mode 100644
index 000000000000..8ffdac3092af
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-18.12.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common mail library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 0bf563673145..f4a1bdb938ba 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-18.08.3.tar.xz 540724 BLAKE2B de0c77c5a48c607b5c08c1c1e2bcd2697303e1fee48547dd68a14302917bfe1768ca37a70df8d4b9b7b86e20a041320cf181c6acb33d008f13c52c3df115653b SHA512 d2ba934c6c32b66bf3eae6a2693215d63daa31cbc0807226779db3d70fc5599c5ada3e17d1835d66380c67d084c76f5eb482700ac7a94f09cec2b40ef02e051a
-DIST mailimporter-18.12.0.tar.xz 540688 BLAKE2B d54f647e18c2f7538363503f4da8e4edcaa6ca6c7500652bdf6ea9f098df945ecd92640ad2a21a6d82958a3f6735a74885e724316f13d2fbbaed061146bb1a2c SHA512 4f6a282dae9ae611a8582a45eb226882172054539b0eec82e18522d6976b89d24af87371d6a69f9161c3cb6034ac6919403b455b7b7a4ccdaa0cc94362479a59
+DIST mailimporter-18.12.1.tar.xz 540456 BLAKE2B c9550935c05e1c8de8d168c9bb70d9c02b8093e6812943a56331034bc0ec2516ec5b1921c40bed34595c2be08ba8353149cc704fe12ffab50736d473eae36030 SHA512 b923b487dc4fbe34b06cb19dade2686d0c1c373a98c9fe8d35298d2953bdf3dfb8b2aeeea229dd2eae7a35d2b2e0c08b0adb843d4abe956d3d1d3cd7af7624da
 EBUILD mailimporter-18.08.3.ebuild 649 BLAKE2B 2dc83917fa757ec939899020f64d3af255f0c3a655b5756d4ab351c9c96d6f658cdc4069fa120f60dcb32ab6902c49111f36bdc3eff8fdf55f8fc9fbe4ec077f SHA512 14ab8e873981704ca9e6dbf976c1028d2a5699e91dc94ab73d1029b7a392d1e38131b4915c5b929bb8aa745c425f859061855801c48aec71168492d37936fdae
-EBUILD mailimporter-18.12.0.ebuild 651 BLAKE2B 4a9714114fcf5dfa818b0fd8353339bdc1f8f7b68819d020cdebea6558662d2117f2a4fdb336aafc7217dc02a1e67c1a11416d7c1d0be169db4da25c26ae37e5 SHA512 08a331abce4782555bf77b70e52553dd336a2b125e656b780a48917fdec67f8a0d0b911ecd7282cf62a3808427575b8a1a026b9a48b2bfbdfe9efa88ec56f97a
+EBUILD mailimporter-18.12.1.ebuild 651 BLAKE2B 1efb1ff3d9ff2a5e0db38a9039bbd3a1238189280a39c785406dde0a64af085f3ac71808edb6be4af3bfb9c43015b4535005594e986adf6905700354391425e0 SHA512 3d23680ea0ec9e624c00dd471a434e5fc47be059c3436336751bce7b5bc44766a107d769c61907352477c8729f5658ff07e787b654f1f58d7834262e2a3d48ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-18.12.0.ebuild b/kde-apps/mailimporter/mailimporter-18.12.0.ebuild
deleted file mode 100644
index fe7ab6f7ccda..000000000000
--- a/kde-apps/mailimporter/mailimporter-18.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/mailimporter/mailimporter-18.12.1.ebuild b/kde-apps/mailimporter/mailimporter-18.12.1.ebuild
new file mode 100644
index 000000000000..9e4de23f456f
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-18.12.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library to import mail from various sources"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index ab5866b37dfd..16ea45e472cb 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-18.08.3.tar.xz 52419996 BLAKE2B 3b591f4feb4614dccc477bc22b67b4e00ba4a499f63d4cf74d38f98f23094018578793fe93f6e393003ad3bd9ac8ba934b665522e8fe75bf9e48ee92c8bcc238 SHA512 c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9
-DIST marble-18.12.0.tar.xz 52415644 BLAKE2B 64a1f229caab03bc1aefdb7dd63a9fb5114c6656a849dea472a586f45f4cebe9ad44c9095aa1c9b1c0b1930af5bdc35f2a77ba4d712fa8959afadb841db1333d SHA512 4cb13b6d4a51d0af6428ce60b728e20e6b6c9f861d27de81aaf258815e7f8114a5571d19a80fb6ebc703cd1e6ac03a2b7e79218f832bd8188a3734b1cadd6360
+DIST marble-18.12.1.tar.xz 52422648 BLAKE2B 6d6685687305dbe1d853d1c39585b387958c30f55d1ba520c221f54382e5c3b473477be30786b9e9913de3ec0cabfae6594f9b499cae050f552b332e997d9b6e SHA512 7ecf6810587671dcf3e7637b967cdedf089ec9bc13873cc11bbc3b9eabdf534c26c75958c03bd18df2bbf36e7c453ff4e251276787fbdc7581808a34977bef3e
 EBUILD marble-18.08.3.ebuild 2243 BLAKE2B 4ef171f5aa0fb4b1d28ab9fe80d2ad1763680501255569898e235ed777216e5f8e5240d7d09d24953622644e00edd85069bebb8a5a5844b514e9dc6b0c6c6760 SHA512 8944e1a251ed5f80c14c45a4bd11fa3c8d5c4b9003798222231ae9cd63509b9d7b8bd9f7d1063673fcda1c5a686be4c090f3507d8dac88ad4eb6fd098c6c8a16
-EBUILD marble-18.12.0.ebuild 2276 BLAKE2B 8a175e46d53d7c9c682c65cbb05569ca50cd25ae4452e054689415abd00aa0d0f2b7c9864e7b94075dc007a20522ecd963c563b4fd04ff23af5d6d04c98cdd4e SHA512 b88ddcc0d17867436cc45014b60357c432cfe32b42afc3cd0767411fed79a6b917fb482e4f1e4c88b9e9a97e0a229c9e8c6b3be3c78f6ca71760b2387eb69163
+EBUILD marble-18.12.1.ebuild 2276 BLAKE2B 54b164933d89d421a9bf83f4e1ccde2c945b0f0435e9569902f735307002b06f1a3d1a8f932bd211ab57e1ead9cee7789203531dab9b2e1adb150b6149fca202 SHA512 14e965bb6b49d9a75fa91aebb0e71ff817cbe795a339b9e918a7eb876c7037a6378035100573cb28efc8fe9c4441294def164390f7cc980e33d5fa37e83fe46a
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-18.12.0.ebuild b/kde-apps/marble/marble-18.12.0.ebuild
deleted file mode 100644
index f096e9a87d5a..000000000000
--- a/kde-apps/marble/marble-18.12.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
-
-# FIXME (new package): libwlocate, WLAN-based geolocation
-RDEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	aprs? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kcrash)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep kwallet)
-	)
-	phonon? ( media-libs/phonon[qt5(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${RDEPEND}
-	aprs? ( dev-lang/perl )
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	if use kde; then
-		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_use_find_package geolocation Qt5Positioning)
-		-DBUILD_MARBLE_TESTS=$(usex test)
-		-DWITH_DESIGNER_PLUGIN=$(usex designer)
-		-DWITH_libgps=$(usex gps)
-		-DWITH_KF5=$(usex kde)
-		-DWITH_Phonon4Qt5=$(usex phonon)
-		-DWITH_libshp=$(usex shapefile)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/marble/marble-18.12.1.ebuild b/kde-apps/marble/marble-18.12.1.ebuild
new file mode 100644
index 000000000000..916e5d73fc7d
--- /dev/null
+++ b/kde-apps/marble/marble-18.12.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SUBSLOT="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+RDEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	aprs? ( $(add_qt_dep qtserialport) )
+	dbus? ( $(add_qt_dep qtdbus) )
+	designer? ( $(add_qt_dep designer) )
+	geolocation? ( $(add_qt_dep qtpositioning) )
+	gps? ( sci-geosciences/gpsd )
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep kwallet)
+	)
+	phonon? ( media-libs/phonon[qt5(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+# bug 588320
+RESTRICT+=" test"
+
+src_prepare() {
+	if use kde; then
+		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
+			-i src/apps/CMakeLists.txt \
+			|| die "Failed to disable marble-qt"
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aprs Perl)
+		$(cmake-utils_use_find_package geolocation Qt5Positioning)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		-DWITH_Phonon4Qt5=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 4c9dd9dc901d..4d67105b88f7 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-18.08.3.tar.xz 33588 BLAKE2B 8434c5cad6253c5e0e916410ed03f6faefce7e5e31970a624227a6b53a0ccbe6e5064a9e8008903b1066bbdefc4c9e1faf55df5e50899a4b16ae1d8262514510 SHA512 c8b480ac2dadaffedca941eb6457dc61738e6c1315a4d92e8a62db2b505ff55d19b3d9b1fdc32410f89181c430b810987973a4ee982fca73a2af2009695182dd
-DIST mbox-importer-18.12.0.tar.xz 33364 BLAKE2B 721d216c55b44e35cf56485927d2efeafcf53933aeebd5aad88d6dd95bd4534ae3dc7958aa2f2f9d8aa65f84e4e69c648479315ccd13cfd29f99aa6c21017001 SHA512 a019f62d35e4580cd2a6d7987d42714f2507aa8904104a414291209f7b781066dc9820e75f2658ad7fe660e334ee59eeb17d93dcc3b2aff6a9a5a83e69a9bcc0
+DIST mbox-importer-18.12.1.tar.xz 33380 BLAKE2B a442ddaa373f5b32cd812cf83187ec4fd5de80d288c83c954a8227d2956168fab31f3c1ce62b1efe28f4a20d1bbd311f8a4bb98ca1dc9523b9f07b9c083f057c SHA512 14749894160c0469747cbfbf21b2845393324c2d4f3b87ad8e2b458b6d250b04347b1442d5534003032627298ebc499e22765e1157fdbcfad06a55cdd9d036c7
 EBUILD mbox-importer-18.08.3.ebuild 822 BLAKE2B 78eef854bc2d83287163a4c66965a113305ef15477c2334c5e7129a790911dc78bfb57948599611c605756866a52017bf7089d188dfafb76adba47af8c787188 SHA512 54236996b8067085c1672c01388984686193ac73915f6d33d660ceac160b4403c749c6f4fff33f6d383c898f2f135efbcd57b3d12f0abbfc052636741ffa477f
-EBUILD mbox-importer-18.12.0.ebuild 824 BLAKE2B c9320465fcf6372c7656e35941e7c8f3cd0dfd45f89a8bf4273495d9941e7f725ac60bde240262711cc0a8369b2e4680824505f397cb6c70e3ca31b421cfbb18 SHA512 1cd3d604e8af9283f22d1b241c44932a1daba54bc779707571ce690422ca42e8a48bc9219dab4a7157e276872b8ff5350683455698efa6cd4f382374db96b263
+EBUILD mbox-importer-18.12.1.ebuild 824 BLAKE2B 55fe80c098751013faa297dc7af4c0671890571d5be5b79505277bd93d26c8fea8e18689e2b8c8d2b613e3c2876bcaa65e15a3fc71a210db23d8e21a34355358 SHA512 e59215cafce22af8c124e8eefd3d4b66de7c0166c8e66f6915d55a9ad6d7c5b3f81d61ce6108ebaaa709c5a5aa7c553920d044b1138bb8b6c2e278329856c027
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-18.12.0.ebuild b/kde-apps/mbox-importer/mbox-importer-18.12.0.ebuild
deleted file mode 100644
index 126c640f4148..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-18.12.1.ebuild b/kde-apps/mbox-importer/mbox-importer-18.12.1.ebuild
new file mode 100644
index 000000000000..6266b4074f7e
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 2876dffeac94..23dbe428bcb0 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,7 +1,7 @@
 AUX messagelib-18.08.3-CVE-2018-19516.patch 1088 BLAKE2B 720f3c72fe0e02b68c2d84a0b748dea6bd992ecdd52f40a0e7d5b6955322539db08ab7b4db2a4276f41d831160d4821cfd7460dbf3122fcdafec78bcf6edff90 SHA512 bcf557ea46ab6ed277a3730eff5560912ab0c55dbf48a8a8cb953916c6af887b9d520cb657a3cd6904d67133cf9a4ec8c99b69b9e1648f3b326d46f51d96e075
 AUX messagelib-18.08.3-newmail-crash.patch 1100 BLAKE2B f3f566f1fe5541d5ac4de5193893696cfce8552058300684ae72f28655062347eba83d5f739cb9edfeef6bd4611586df3bcaa7489e3018b405b825334a4a6bc1 SHA512 10775b6ea3cf6cf144aac6214a192bad891f7cfe44e6c373c5da6ca5cb2b1a532b189a569a2a48127ef569713af3fc040d62ba31968a476a83ad7b712549a955
 DIST messagelib-18.08.3.tar.xz 10417308 BLAKE2B 7b2df9549c5b691dbbf902fe9fc74978d1904d7c4e3c64f67a731cc0ac7590a46e9adb3475ad8324c4752a09e2e8a7626bb9e620aefd4f7ad0b0074d8d3fa4b0 SHA512 b7e26a9588c82ee6840602e712e46394b236d65eec55ced005fe5db2c375f99ad684c0e3c4a50e80315db346def9a86b56c403bf084e3face5e29ef7f2eb028b
-DIST messagelib-18.12.0.tar.xz 10428548 BLAKE2B 4c85c1c05ddd3f6fec2cda830b0501589b2ffa5c59b7d650c175d1599169d0d4126ede90f6658bc2930881943de637b5fd1fded111bd37aaa8f256d54c044445 SHA512 71893c5f2aa60940f442854565ccd11a8e2463565d539699b4227d846469286800f671c2adc2c875fcd83c3a8b83bb7037b2b4670b5cfe7b12d7e3e651f95f33
+DIST messagelib-18.12.1.tar.xz 10431240 BLAKE2B 4bf3a5c1634a0ff29f06e5b4b0da2d09800edfa676c6993c6a087678d8f595d1dd46a0c92f4282041c3f0e0b8a51eb05c703d5bf0f9b12858739a0fdfca2b664 SHA512 e308b444c99da9802934446323e4a8c3978915f6256ee9b890736a5e70da2301b33ddb453c2086d52e59c74c445ca2ed42b20ab1575f22d2ebeff010cb5662e0
 EBUILD messagelib-18.08.3-r2.ebuild 1990 BLAKE2B c84bc610f23be28f887e0f890b086e5247b4739d35edaadac650b0cae2c284a03ce23e1556537b1b7980aadb725d8962569c9a969378c39272cbed5dd9fe5ed2 SHA512 a6a1b031d1fa88774a1729d00b238063d476b45c95295dd9c71d79988ae09beafb79cb894fa9b170126deaa76d4690e47bddce8181753eb388e34c142bbd0ba9
-EBUILD messagelib-18.12.0.ebuild 1899 BLAKE2B 29d1da4b1d45a544ed77e9093c9b8c1d23020fd1f9f571f7365fd6aa4b693fafc7c207b38faaad4570ffcad10b7d40345090000cb91c9e35f9cf6635e792f087 SHA512 06af0f8e792867f2267cba4ea79d0b4c99f8f2142832d0af616584c26f2bed2f875ba4a60f7dfe73878a24e0ebf1d80f1b8f4c1d628a69d38dcee19b5a11b38e
+EBUILD messagelib-18.12.1.ebuild 1899 BLAKE2B fa21a6a453fbf8cab9c5015d8d875758520ed68c54a4f0ce6f26a3fa3f197efb41486f5d21cf31a791cf0b27f07cdcc41dded802ace5bc60251666b4e7a216e1 SHA512 b35b6ea2ee1c13a26b4b50117a30b31166de058c300e955e06a23d7adac7c868c9f09755a5895ef84bc2f009e743279222b0d355804c6f04357320d65bd0609e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-18.12.0.ebuild b/kde-apps/messagelib/messagelib-18.12.0.ebuild
deleted file mode 100644
index fd87e77d18be..000000000000
--- a/kde-apps/messagelib/messagelib-18.12.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 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 kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-18.12.1.ebuild b/kde-apps/messagelib/messagelib-18.12.1.ebuild
new file mode 100644
index 000000000000..4bdb46199476
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 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 kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 0cf3a7de9fc0..cb1480d26273 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,5 +1,5 @@
 DIST minuet-18.08.3.tar.xz 27789492 BLAKE2B 6f741738815a4672e2c9edde172cab99b53f20523f5c272029d5a47561673603a2f0a3a06f2d71a953c23dfffcaca7c2d82867795c8f164dbd59faa0853f3a63 SHA512 95ae460db8d1d51926a3be0db12159b0256e3817232d94bcbb0400efb0c49fd43298dc83557166585ce29cdf6c46e24865aa104374dacc29ed2bcd1d52ef71e5
-DIST minuet-18.12.0.tar.xz 27790124 BLAKE2B c189b5034e23dcd4432b5ce4ad4cb91bc9082226c54855cff414e9e937f22ed5f2a79c62fc78ca0f1d224d0d1e4eb6da10d9f0a1cf3da2802e75d7da3db917e2 SHA512 85b025931506a7919e5c9f253c0593a727224140811a226885b486e8513109d5bfc7fde6ae2a233a6e2b14d6d18aad1ea3597b46f52de421f8925d2d2133f78b
+DIST minuet-18.12.1.tar.xz 27598176 BLAKE2B 0be1d2269e042d496a43c440cb77436d000c45466b82bb37590d97faa7a06faef60375abf73f91bea0444048b7638d93af6e8e57ad6fb26c1852506065112e9d SHA512 a51581a0152bae1b347b2d89fbcc1ba9d5822ec7227d1a4e59862718106e1b6b90ff4a16bf3e819884c95d01f45a92d523d9236e9798a151bfe26c9e4b2de7c7
 EBUILD minuet-18.08.3.ebuild 543 BLAKE2B 9e5d21224aab2a9cf03dd4ee437e411ff1f2d481c2b0fc47219e48bca748092fc56f98197fe6cd5c457619401dcacfa69767baa3784190aca18ed28a68c736a0 SHA512 6a3caebdddec33604726cf23b648a3fd60a3cab9e79fb9380bcd6be333671b8494951e39b43da51f81956aa0d2abe24bb06064bafd5c4bee236a049abde67125
-EBUILD minuet-18.12.0.ebuild 545 BLAKE2B e21c99eaca2af49ea870161f63c54d3abc2458e1e962e0113871e513cbd4218e2412531dbafee55b4cd33009a6dcaf895cad7cb9819abcf019348cb60fa594c1 SHA512 13c2f0861fadfa4d3354a7012101d5f9e5b7e86c4460cf83da2b95343067eeb028282a7fcf9133a55d92c0896fa911a8e6e457a453cbbd33aa943ecee502a06b
+EBUILD minuet-18.12.1.ebuild 605 BLAKE2B 6b2bcde56c140fc770f146e91fedceb667831e40f75fed5519d4c32cf420a374d3551d377ed47e259e681d82c65c9d5c4996bbaec5f5ed778610b5cf23d55ea5 SHA512 f4cbca11128c77f45ba536797688610ab574dfc03269f5756bd4cfd4bb59e31f817cf96c9c32221ad7679a590d4926bf6dad2151f547b299138a3fd379aa9ebc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-18.12.0.ebuild b/kde-apps/minuet/minuet-18.12.0.ebuild
deleted file mode 100644
index 519702b71314..000000000000
--- a/kde-apps/minuet/minuet-18.12.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A KDE Software for Music Education"
-HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtquickcontrols2)
-	media-sound/fluidsynth
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-apps/minuet/minuet-18.12.1.ebuild b/kde-apps/minuet/minuet-18.12.1.ebuild
new file mode 100644
index 000000000000..d9136c0bf4c2
--- /dev/null
+++ b/kde-apps/minuet/minuet-18.12.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A KDE Software for Music Education"
+HOMEPAGE="https://minuet.kde.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtquickcontrols2)
+	media-sound/fluidsynth
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/minuet:4
+"
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 1a5df726b62e..d481d5f4f76d 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 DIST okular-18.08.3.tar.xz 5770760 BLAKE2B e698507b400068abb76ca4030ca57c0c020fe8b0ba7cb4a6e81519ea7cdc24a5a3a26422f4e6b1badeef211723114811ccd81a2180335e37ab0e9e8684f23a01 SHA512 a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2
-DIST okular-18.12.0.tar.xz 6120152 BLAKE2B 2d49b26df64b72ac322ec2d91cc3714a62fdb89e63dd1a826cfc33d6a0c276e4261694738143fa8c55f875f225bb0896f49e4c0fed0dc703e8876c18f281a1e3 SHA512 174b0ee1cdba2d887922c2f432ca873954ccac31c0e668d88d820d5c7c67898fcc20369514bd1efd74e9ec662608d18642ef76e52b46cc0644ac405ef3046268
+DIST okular-18.12.1.tar.xz 6094616 BLAKE2B c605a36e4df5e36f8bc3011674b71c71a08c85751e68c18a94b9d068b1b714d6921fcaf4863bacb0376e341d0e07cd697d94a6cff47c8211a7f7274794df2759 SHA512 7f2505ad65ceb5c2bb35f9c7273e886f3e19ff9232ba4b96f62b3c4c79578bd8d04644a037a9e42ce184d8e06c9b106c0cfe5c67706add3586fc68d6c026569d
 EBUILD okular-18.08.3.ebuild 2935 BLAKE2B 9d1118cae65a8cca51a32f14f68506cd6b46138a443069828dd9b550edb939070aca7b433a22df51db89e7bd633849d989cd6082c43518c7f3a6b4cc8d58a461 SHA512 49de57710e5ecec9d70abe83d3edc78a761e26873652c128ecfe7af2ea835b04c8234fc10bef4b385c862a17c03f9a01d0b41962f78a0345f1be47c52ea698bd
-EBUILD okular-18.12.0.ebuild 2979 BLAKE2B c08007698f1051c4387b488014c6f9d8cff98959aa5286485c53e120a5149044e19873678800794f4a1e77de729465a42c7635d14b71560e2fd0342f06603394 SHA512 24e45cbb9a27124c8b572ae49bdc442f7b90b043e75cda1fc1f63c8848e0d2cb5f5b4b9108ad422b0512ae0470975fea703c424e360e979d0a68c23645551127
+EBUILD okular-18.12.1.ebuild 2979 BLAKE2B 2809e235130de444d37508efdfcc169408652e6c4946067ca22f93877652286c9973e43a55183d0d75071bfc31c30a050265f747502ee1a9ed9fba54e6a2c34e SHA512 c287a63ad446f0bda4abe66f302b61a08db0ff7f21cb61ea09aac3100b28039ccc49e198c3cb0a8600386bcabcd898e74dcd1340d46c201d1a54aaef5a352ed8
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-18.12.0.ebuild b/kde-apps/okular/okular-18.12.0.ebuild
deleted file mode 100644
index 83bf1eabfd3a..000000000000
--- a/kde-apps/okular/okular-18.12.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 kcrash)
-	$(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] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	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}-18.08.0-tests.patch"
-	"${FILESDIR}/${PN}-18.12.0-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-18.12.1.ebuild b/kde-apps/okular/okular-18.12.1.ebuild
new file mode 100644
index 000000000000..a4a52cddb351
--- /dev/null
+++ b/kde-apps/okular/okular-18.12.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 kcrash)
+	$(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] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( $(add_frameworks_dep purpose) )
+	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}-18.08.0-tests.patch"
+	"${FILESDIR}/${PN}-18.12.0-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 8bfcf665c719..c66c86d23895 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-18.08.3.tar.xz 2063968 BLAKE2B 928b5bf39752d4c1f7ea7da657329ed64bd5d0a1583fe9edcf9e652169e4d20e2c5668f679651c365468103ab84111059618190ef5bbd76e84220f5a7f81391d SHA512 fb512f842064755dfb250afc29aa3b7672f350c83c1eeaa9ef0f7d920d87b1f80efd7436b0ea6ff447c307709648009f491e5c403e4228080b8518144b7a23b8
-DIST palapeli-18.12.0.tar.xz 2063840 BLAKE2B ac5b31bd1592b2ac670e2c805ab1b441e16dcf661b43e3872487b1c530dbb958170b8346918a6ebd70ccaf52e7a466891c493f0374967dfee4a837d2d52a36ba SHA512 109f7b4e5457e0fdafef0adc4a9f60817a6675d0a31c24dda1928df12a7a46d2cb4eebfa6d87d96465dddf8d92cf256a19b02eb43d862631e32e496aada32afe
+DIST palapeli-18.12.1.tar.xz 2064784 BLAKE2B a055bce18bf29e09a7439d59ff71b2d99df146c48a153df9604adf8cc2874d2600d028e94007647d9921b14d279c52e2f87ea1cc9472e4cf6dca511f9ddc84a7 SHA512 71c647d6b8858f9b03a6bad8d54c23d3d20343f4adc2afe83be98b5e3472aefc1aa6b69763dd5421ff7bad4b0e177b33a59645fb8a9da03956a9200fa633ecf9
 EBUILD palapeli-18.08.3.ebuild 932 BLAKE2B 875fb7198feb82949a55559ac22d4801224ad9e51b792ae1765f5a40e987456c4237e951c458a851937175c9ed47102ac3b45785cd024105ce65fbe3f190d1bc SHA512 118762bb8343ffe13cd7bee6a6c57308088a00563c5ef4c2a47e711458f589bd431ea558eba8366f727aed54b80f0440df21d13c59c187bf0c2c1419acb3d9a0
-EBUILD palapeli-18.12.0.ebuild 934 BLAKE2B c000412be2904638139de351947d1d109353eab522d81640cf5559548df97842a07b53b5c9d53ee16a1c20e029ccd7f87f432416f0fa46f1bee69af1335ac44d SHA512 7387926a962935334338ac705ee6184679e01246e0f0b377794746c04981bb414453543750acd0a28fb9e09a5fe7d8851364fd227a076a751ef1a4d5a507f376
+EBUILD palapeli-18.12.1.ebuild 934 BLAKE2B 1cf3ffb6e30c22c5e633075e72db7c593fe914ef3143758429b20dfc0b09a714685bc8278c42137575ce3784039e7f1c6fed9a788dbadda0586933a91a565998 SHA512 330a19e62c323f08b624dae51157568ac9fb3988139bbe31c53ec4123744db78998d82b925f3252a67ae6f4456374c5d062f93e45dfe5976da009d12f48ea31f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-18.12.0.ebuild b/kde-apps/palapeli/palapeli-18.12.0.ebuild
deleted file mode 100644
index 818f975ffaee..000000000000
--- a/kde-apps/palapeli/palapeli-18.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/palapeli/palapeli-18.12.1.ebuild b/kde-apps/palapeli/palapeli-18.12.1.ebuild
new file mode 100644
index 000000000000..b5fe1cee13ba
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-18.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 07767985167e..49402a3cd21a 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-18.08.3.tar.xz 8825340 BLAKE2B 0e069ed9b7513be6ad3055aee3566b8a4465e5161a1f6cbbd94c3ca356d30ae9012a3e158e4416fdffc68842bed140f2068601912cbe5e875f4b32cc2c212a63 SHA512 c5c479bcc746cdfeb9d2409c734be5f92c3993a504c57f5c48b78a84d52d9621b2b5acbcdddbc3221c5f2abe0056b84e5edf91238de25f76d0824aa81d9c0a42
-DIST parley-18.12.0.tar.xz 8823468 BLAKE2B a9a800b0933b80299fe58d07dfc37b160f9ebbfe764c3f55468e27b4dad7190317c94e05653233e30904146a9518ce7e9bad853792c363a31718509bb800338a SHA512 1d406f5e0ca5d9c8656b3d44cf5453cf12e500a753360041617a0d78ef39db10c49a65ede564a51a6cbde6bff075b3214b70b22d2791e53b62aa5343fcfb9005
+DIST parley-18.12.1.tar.xz 8823468 BLAKE2B 961fac144c6c14aca36cee304e8e457c10e0da85e3ae22cb46d9bd535b0a5d35b0d28f4039e8973810d7cc13b647b467fa98155e5185663dd141e4e5e71d887b SHA512 38e7689926cb872fbd44157bc83701942a6a6f44934f31c0af040d854afed8ed966e2f0aedfc9fe21b541d794e56c959e8742c6099e621f1f1a3cf9f593f052e
 EBUILD parley-18.08.3.ebuild 1252 BLAKE2B eb843a1d66c4de47df932b2bc6f4cc725faea55519576edacf056dc133af3a76558f26ab5ce8fa8c33fdee393b7ec4a3bafc94b4669a00c42af4147a77dcfc18 SHA512 5ebe3fd3665c661de3e0200c1b7c7e5aafc1cefaf27117c30c5b05a80358e45b0c0f52aada6152feb62e1d557e3be74a7a750d0a63b0254916786a22f929f495
-EBUILD parley-18.12.0.ebuild 1254 BLAKE2B b37c107190eaf7ed2c707731cee772c72664a9bd38db239a3ded26b5b107d7e94a9aeea34a69ee90b802299721ad6db141a6b0f4ede1120d42ec97ff662bd477 SHA512 86a71771294db1c1ad57239e26b2b8a438d74ab6d30b5e1b26d5c7af7b1b0d7c96305484e9a384afb49849eac08bc6a64c5ebcd30caf65be15d834abefa93f0e
+EBUILD parley-18.12.1.ebuild 1254 BLAKE2B cf81770ab019cbfcb1f328d1772763bd2fef9b88f49ffa07253c5f7759fb730dfd3d6f688de0ddb2ef1f039f7b20705840ef463ba517fe017f0ff6787d9e7f12 SHA512 703c4379e834b1b0d9813f1534f4b3ab407cc8e5350e9a8cb17fd7cc890513bddfa37ded679e826069f026aca658d0480ce26b06eaee1e7f1233b1d2409a82c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-18.12.0.ebuild b/kde-apps/parley/parley-18.12.0.ebuild
deleted file mode 100644
index 37357ea9df4c..000000000000
--- a/kde-apps/parley/parley-18.12.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://www.kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtwebengine 'widgets')
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"
diff --git a/kde-apps/parley/parley-18.12.1.ebuild b/kde-apps/parley/parley-18.12.1.ebuild
new file mode 100644
index 000000000000..031b9e735d35
--- /dev/null
+++ b/kde-apps/parley/parley-18.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_DOC_DIR="docs"
+inherit kde5
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://www.kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtwebengine 'widgets')
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+"
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 2de37de89134..a365cad22873 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-18.08.3.tar.xz 1356064 BLAKE2B 03b12621df303d08a6bd9f4c7c5f2ff6f93c8fbd6d2db0bfe96c21f80221acf29182fb26390229836ba21cc11b856229f9bcbcb70ae0ee9883b3d3bdbb792827 SHA512 9abd6a4d7c7bd1ab742fbac0bd5483965565943b90bc0282dc0f4be5333c4b510d862d5a0a3cf5c345bb13bfef7e4df8cfc6507513192f45270dc0437a018115
-DIST picmi-18.12.0.tar.xz 1355948 BLAKE2B ff908012889b4bd7dfb4f28fc3b55150db5200ab2df95ecbf91e5df14605bd90e6cd7923693072c7a032f33b7d3d5330f95017cf1edd280a1be53147c8def9ed SHA512 78ca02b52a9aa3a7762ea87c06c26020708427e690452de475cc61dd1664e0747b88c74381b769b05c96af35da6a5004b7b4d3b8187aa34fa03e0d8d283cf8e2
+DIST picmi-18.12.1.tar.xz 1355900 BLAKE2B 283b3cf05935f7dc4451d39106f14586f395c0fad3865b1e828537d9d3d0c192afa2071ead2af3aeafc3356d55164f394ea4b518044a8ac542ff974fe2a2833c SHA512 f753f9bf2123d543e0d921be243671b42fb530cfe5319130b6d14e9fd0e2bc7444e3aa7c6afd8845cf878ea5736a1c62c430862fe4d158ea5250b34933aff3a8
 EBUILD picmi-18.08.3.ebuild 842 BLAKE2B 8349bf16fccdb2fdb0b33550f52fc03783b22c90ae91ecaac071043d4c41674788065a2177132e4ffa8c30da5b5ce8cea477d812073e46b378b55b3490ee208b SHA512 a412544658ddc2a778fd0bcfaec26170601206f1734d5ae9c85621932b8b1ff7d03c91d1a44600cc53c0a84cb65ada69ae53ce89fa057f0f3ee686088ea608f6
-EBUILD picmi-18.12.0.ebuild 844 BLAKE2B ee8948190483de2d69b03f5d543647341fef89255fe2b28bbeed3f9b6bfd0e6d7cf78e065194f47aed590f814ada7b4ef286aeb600f7d3a496291ce2a16ed1a9 SHA512 38ea868ad94a9b17a388d1a97e25d6a2d655742d485076d6d233949a1cf95f53ff245542be1a03de0d1fd62c85a00dfcdbb1af8e80cdde5de8ad43e5ca42e2bb
+EBUILD picmi-18.12.1.ebuild 844 BLAKE2B 308f80de8a12bdf1dd2d10653d58b7de8d12122d4272618673ec3ea70b2d42205477ae0d0361237d6362f58f4ac5e46a8754b343e1e5d69b84f0fd8874cbfe7a SHA512 c16d843dd238a8a4955aa23109a04639c3bb3265411933fd552e9dc2e69ed935a71f31c9798b251619a9dc1f3aead2ba45f56300d597f03e42a371145e6b6b08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-18.12.0.ebuild b/kde-apps/picmi/picmi-18.12.0.ebuild
deleted file mode 100644
index 9615ae54b77a..000000000000
--- a/kde-apps/picmi/picmi-18.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Nonogram logic game by KDE"
-HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/picmi/picmi-18.12.1.ebuild b/kde-apps/picmi/picmi-18.12.1.ebuild
new file mode 100644
index 000000000000..723c9b859055
--- /dev/null
+++ b/kde-apps/picmi/picmi-18.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Nonogram logic game by KDE"
+HOMEPAGE="https://games.kde.org/game.php?game=picmi"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index f19740ca4570..004167df9f66 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-18.08.3.tar.xz 269628 BLAKE2B b3bf6077d2757613215f3a38b24804d32fc987af57740a7aa73b770ef62823d54240c74b2ef1cf0366012304be115f135605434f5167eca8ebd2e41959de433a SHA512 8047408cd37ad4ea25dc42a6d4cf86d71855b68ec611140f40fc3d149894b54c8a4d4317a45b391dab9a265a3249c1ca1b1ac6521f63a26db0d1c0a2a5a8cc09
-DIST pim-data-exporter-18.12.0.tar.xz 270888 BLAKE2B 8d7bcaab406dbabd4f3fd32c2372e6ff0c99246cccfad78372a7c7451bbc10d76828835addf45c892b283581d4165ffe9d4400cf0d856c897c51f18ff190daeb SHA512 8cf0ab291d0e06b5a412ed2c43f9e468b0276f38663d7c8905d3badf1388f50a52ba0ca93e08f7eb9d66d13b091190783badb13f6df6055caa73199612d18151
+DIST pim-data-exporter-18.12.1.tar.xz 270928 BLAKE2B ee399fdde31375b4da8ed06af552cbf6b8dc97c1c773a138d0752ac3b32b335e3fc9355caabe4cecc80a3e26b15d6c3a97a7a0ae82e6d4093df695a1fe61e592 SHA512 73b0a87453c0241100671c131f17efdb53d48677638f3ebdf46dcaf4ec6c43f5be43b744aeb471b6cc340969952c87ff271d357ec5562724068d1e1fbe2c2bb8
 EBUILD pim-data-exporter-18.08.3.ebuild 1356 BLAKE2B a57523729b823a708c2b9dbc9310566729f961d320523f0889beb3eec2578b8d720981241f0c79c5f071ed30aa087915b847d416893a76f6e2754c4738d584e5 SHA512 152285bf96f1f2541311aa7d538f11c61055019f555821a9d2cb0c3114e57442521d5ad914532196b05893be666b591fa01e1076301537967ed8c2ac7819058a
-EBUILD pim-data-exporter-18.12.0.ebuild 1358 BLAKE2B ede140b70d9dd04b37bfb13f6c85a9a26e9fb3e046fa86be70961964e896a5f4b7463c760323f6693a8365f8bfeb75416ef8dd5123d3a9146702c0adaa329102 SHA512 78dc57c9cb7e3ed9ef87e5d6cac5ed46ee0e2362eed942441ae5307bdb131a12c283008f7c25257a628ec7dce2178f9b1808db467c3c344b9cc11a5231f570af
+EBUILD pim-data-exporter-18.12.1.ebuild 1358 BLAKE2B 642991bb27a6ce73736633751449583426bf5cf0c3427bd3a84232fa32c0263183cec276148f058377a04a4137112cc008fc9828dbf20bcfbb072b90058479f4 SHA512 0464d5121a50cb0a95790414ed7a273ac9f589e5f2e1b79a5c2bf8f8ea3f5e8c69d4aadf0b785f48c05fce3373a92e1c6ffcab6e97c53e09156ee77a26679bfc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.12.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.0.ebuild
deleted file mode 100644
index 992ba691207c..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-18.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-src_test() {
-	# selectiontypetreewidgettest is broken, bug #665690
-	local myctestargs=(
-		-E "(selectiontypetreewidgettest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.12.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.1.ebuild
new file mode 100644
index 000000000000..b4d4231e5b29
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.12.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+src_test() {
+	# selectiontypetreewidgettest is broken, bug #665690
+	local myctestargs=(
+		-E "(selectiontypetreewidgettest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 73905924ec00..22d5741975cd 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-18.08.3.tar.xz 448636 BLAKE2B 9b84bea7d867e95a887f9f1ec024ab6781121da6747422e1070d18f7110b7639e0fe9de465a1a8c1488b64f7b588173137128ca46034804df11d23ec524bc1d7 SHA512 75203cf85d96aced242347ff02072995c1132246d5aed94dfb8a3aba479126be121f6c4988995d7e212f56cf406ea1c65a645b90340ebc28185a1141ec338c52
-DIST pim-sieve-editor-18.12.0.tar.xz 450536 BLAKE2B 34f68c765799522e839860d7ebb325d0cd0a3b1e03f68bda6d9275ef5beda03243241efc701c47b2cec5247ce27a562b60d562f3458668c2a95d5ef97f86dd3a SHA512 d5944dddb22549fb247e7e74b342c348c4e558677b07d21772611cb31681cc3a8ea317a689ff3f4a8e84401dd4c32ce4ca97575d50f03369739fcc363fdd1c90
+DIST pim-sieve-editor-18.12.1.tar.xz 450572 BLAKE2B 883a395716e64652270e32ae68591acf81eb82648b495034a12d5bc391aa767c82ea6568170725becdd2c114edfdf6dfb46d5e1faa855ac1ac1794b0d500d275 SHA512 87fa1a387382332c83df13d107abecd99ee21506d3f2d1a6fcb1415665736f896aed20b84d711f229a58d0c3f5f53d54520ec2159a755d5c6cc52cd15520d056
 EBUILD pim-sieve-editor-18.08.3.ebuild 1144 BLAKE2B 1b3bf5026e7d508bd974a8bfe730730d2572ebacfe3bdf9cb45490f536f66dd516dc5b90982432742b689188e396cf9bbcfc4b7124df9f9566dd3d720927836c SHA512 c6ba36f6367f76d5b69de7107aafc0d553c4beb00703801d8055393d7fb7c85338e3ffc863be0c91ca718000d98bbae09e97819805eb8e757a6b22e4299bf97a
-EBUILD pim-sieve-editor-18.12.0.ebuild 1146 BLAKE2B b3e729a8910c6bb8212716216cefe27147f1ac575f0e562892483a8630e7d2d95e3b5e9f77d24218ed179d1465a58c827e2800ca0d1a47fe00d7e605bb1c603f SHA512 1538ba5757ebc2943838832bdbd82508db79b465312b46d9b63aa53d21e7a27284840c8b4bde66e429fd30d2ae7c51be2e7aa942cb9caad86617cba433fa5a2a
+EBUILD pim-sieve-editor-18.12.1.ebuild 1146 BLAKE2B 48d27515bc97b025d59a1424cb84063ebfa5d34c64a48392fd7a684735f769294df89ed5a2283f8233cc8436660d52d744d9d536faed9003a88e936cf30f1dfb SHA512 cf6e11184f9f182296c1b70e9ffb23c87c089cc5fa0cf0d6a798cb6c131084eef30f40f938256cb954a0f184c4357b0cba3e875c8d7708471e000c300bcfbc28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.0.ebuild
deleted file mode 100644
index c57648cf491c..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="Assistant for editing IMAP Sieve filters"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.1.ebuild
new file mode 100644
index 000000000000..c101bc2528a3
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.12.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Assistant for editing IMAP Sieve filters"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index e0571339befb..61430f1fad8c 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-18.08.3.tar.xz 292804 BLAKE2B ca220c53168fec1dc89fbc640c13becf96b7115fa36175d46b2457a63beedeb30d858e450c9d86e121ebd8e19b1aa932cf468bb62b7957c69319b64b1e409141 SHA512 212862d77d596d7f94a6685f2fdd50d08f26330933ec601e2b8bf1f1f2077e142f55836b8294b2513bf735a18fb21070e078af034056254a4ed65245c1f217fb
-DIST pimcommon-18.12.0.tar.xz 294900 BLAKE2B 7ce13668a4249f51c6b2724d2296de7326a1c221e2ffec19833a879b467cfeac0c8cd75a5531a119ecea0b98909dea0464491927efdcdf0644aaffaedb68193b SHA512 212d1d9e46e834dfa78d780bff0a39452960d98e2bb52743b512c62c15babec25adaae06b57d0c00b02fd7e35ce16090ae5594e2ecaf54b3093a2ba6efd1cf71
+DIST pimcommon-18.12.1.tar.xz 295008 BLAKE2B 8ef2853767e3e87723a014282491b38eb2a88ad340726039efc856688517cf89fd9aec67bdc45ead8d6c0a45c61425ef80685cb62bd56f41a29724719412b871 SHA512 b1da041475e004ff1a9124b8b6d3c2dd403f1e4b7f988451aeeb8a970cb64b3486a9f3c0ed11ef87790eb40e74cb6e2648e0590c1e458a8c23093fa1edfd35e5
 EBUILD pimcommon-18.08.3.ebuild 1501 BLAKE2B ba19c7835d8edc43d49d9cad84667073e7e231de5f9df2719ae2e84b9e8e7dff888bc3d7b904d034c992ee124ff84d9f58b926b1a8b07d251a199627cf37e50e SHA512 9b7ed423a48a0f46e3c19c153b93d564eb6af723653ca8767f7f5865362bc6e73c2dad327fd8a3dc87ca4f0582ae8049479803ffa9add5dee27110a2f30e31c6
-EBUILD pimcommon-18.12.0.ebuild 1667 BLAKE2B f59cca929bff16b5147b9e5a2579f10040eb5689dfbc0e61bc2f266a8eee251097e63ade05b74ce834cb8d547b3abbe4b235c10deb8cc3f56a24adfa335dfa96 SHA512 5f1fca747d882f808b2ec0a77f1cb3be23b141f53632aa8792a73a10c03b3ab2ccc13d9c0037d056af6cdd2daab87af15f572198b26ad296bf6b906ebc432c44
+EBUILD pimcommon-18.12.1.ebuild 1667 BLAKE2B 997e4d0f46f6d81734ce1a99bdd0eabe5213710e529d0bc68496a7a793362edc28315a18301051884db4ba9517de39daae001acadd8e9484d4a38c9ce3778d1c SHA512 d7b2df4260f5798e4baf36f5945f825ef59f5c0373acebba8be8cf7f05aba18aac2708bf9ab23e4084ecae88c8af4438368c97e5be1a00fa36888c398bb27046
 MISC metadata.xml 440 BLAKE2B c55b83f7b60d3baaddaabe967f26ebd46bc02e8c299bb6a08bd2b2dc637aeb9014d1151401dd5818fa638e35a52af07b4f4a1c26f11acaafb12af39395987b8a SHA512 270a30b21908e27b18090298815c52c80c90a6411f16692bb725449217411932627cc3ac530c2838b539e1692ac00972461bd6b016d92e7299588e71913a304a
diff --git a/kde-apps/pimcommon/pimcommon-18.12.0.ebuild b/kde-apps/pimcommon/pimcommon-18.12.0.ebuild
deleted file mode 100644
index ac5b5e6bb3a6..000000000000
--- a/kde-apps/pimcommon/pimcommon-18.12.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="share"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	share? ( $(add_frameworks_dep purpose) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep kmime) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-18.12.1.ebuild b/kde-apps/pimcommon/pimcommon-18.12.1.ebuild
new file mode 100644
index 000000000000..81d7c122d367
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-18.12.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="share"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	share? ( $(add_frameworks_dep purpose) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kmime) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index 10fd046afc9b..6636aada8d7b 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-18.08.3.ebuild 933 BLAKE2B 266310685994a7995223bef87ad77eccf6afcfda4d8e2d1bf310f2d44583ca5b18469b40060ed3cbf9e2955922a1ddcf0f74f03c4a49a0029a71399e750f52eb SHA512 49cf1f871f8304dc37dbc3847163d32d44729d2ca4575559b511a764c1f8a860dae46c2b3342afed1379b1e1042041bc5a19a7672ad5286a3eedb0bf0e435169
-EBUILD plasma-telepathy-meta-18.12.0.ebuild 977 BLAKE2B a374437b09afd02473a542d401cc7956a918df958a19b540caa1e70edfee7e283f3e83025d48c3d631515ecad75dd06c755c7de513bd1388334f00709c98a7ea SHA512 a85150c704755c91773c1a34ad0f08db46fb37b6a2496cdd7f464f4a35f4a4d92ac8de7afcf8783db2adc23e40a8065d684476ecb17a5b06207cf429bccdec5d
+EBUILD plasma-telepathy-meta-18.12.1.ebuild 977 BLAKE2B 5ea80e2ff4aa8e1a159b70433bdbe1841c69e6c9746db6fd1fb04f24a16d0a2557ad7d8b9f37b98567fab2e739d758ef6b7fedf2a45cbfa0ec39409d6a7a2728 SHA512 a5595485b96fece71fe22f3233b84b15e4be61b09bca2ae7293245f46cbb340732ca930b48c1a14681f90001c29af3b8d7d1ef995fa2e0de2bed3948a38775bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
deleted file mode 100644
index 584280dc8cae..000000000000
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Plasma Telepathy client"
-HOMEPAGE="https://community.kde.org/KTp"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-RDEPEND="
-	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
-	>=kde-apps/ktp-approver-${PV}:${SLOT}
-	>=kde-apps/ktp-auth-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-common-internals-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-list-${PV}:${SLOT}
-	>=kde-apps/ktp-contact-runner-${PV}:${SLOT}
-	>=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
-	>=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
-	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
-	>=kde-apps/ktp-send-file-${PV}:${SLOT}
-	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
-	gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	elog "You can configure the accounts in Plasma System Settings"
-	elog "and then add the Instant Messaging plasma applet to access the contact list."
-}
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.1.ebuild
new file mode 100644
index 000000000000..f30f70a34fbc
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Plasma Telepathy client"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="
+	>=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
+	>=kde-apps/ktp-approver-${PV}:${SLOT}
+	>=kde-apps/ktp-auth-handler-${PV}:${SLOT}
+	>=kde-apps/ktp-common-internals-${PV}:${SLOT}
+	>=kde-apps/ktp-contact-list-${PV}:${SLOT}
+	>=kde-apps/ktp-contact-runner-${PV}:${SLOT}
+	>=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
+	>=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
+	>=kde-apps/ktp-kded-module-${PV}:${SLOT}
+	>=kde-apps/ktp-send-file-${PV}:${SLOT}
+	>=kde-apps/ktp-text-ui-${PV}:${SLOT}
+	gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	elog "You can configure the accounts in Plasma System Settings"
+	elog "and then add the Instant Messaging plasma applet to access the contact list."
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 5200f37e4d29..ce7d905f0b3e 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-18.08.3.tar.xz 43176 BLAKE2B 3ba27ec9053232c51fdff0e89cc83821cd41f84b3d34bb3ca47e9801f4b03e923543359e8bd6f734ed4e59019eca93127dee0b1ebb3d98620519a37f0aeee219 SHA512 7181f792ba722a79f32c9d46f9b8fd4d73673ef61fcb48106041739543fdbe408aab83f3a31b2d9033bd15e93494a2a7dacf1f488443eea82c133c3550b519a0
-DIST poxml-18.12.0.tar.xz 43180 BLAKE2B 1c68c04295c97eaae1695f15e1606f5c7f54c44ff284842736a949502728c1442b30b76aa3ac7a25dcace66f1f1fdd38e6c176a4534796d9bc4383b913f4b86f SHA512 b89082d4c170a3c922652401c6afd387993ab0c075ebdbebb1ec50f67bc32f4e6c3d6db6a4b8548a8eea68d4939243026c7c8b23cf872c820284e527644fd390
+DIST poxml-18.12.1.tar.xz 43136 BLAKE2B 30e45538f26eee74402292af3a702c97c35cdc696a53a3b26cc5cd65cb6c2d40f49587bd83ab12569524baf397196c635ec5f563f6fc4cfafc15211b7864a1cb SHA512 34aff39f1e3cef73fda0ca0fb6cc9155611a294137fb16d078470d19092f23abcac408a259eb92f12955b345bb2871b2918b0901e08539572ac2103354ca251c
 EBUILD poxml-18.08.3.ebuild 337 BLAKE2B e9805e3c1840faa8444eace71783f71d3608c926b4bdd0852b40d68dd968cc05a084d637f26368f683750b2864ad75f3d2f72ddca2f0511ed5daf6385f83ab3a SHA512 a51830ef768df22a45eb6f8e636693655b3c10f8bcaf8922677f40b600a70d75ee0dea7a22c652a0eaf1579339e03c9e26c47ce19a34bc5a40997198b23b0b8c
-EBUILD poxml-18.12.0.ebuild 339 BLAKE2B c1c3e6ffeaa626304d53f58cff7df18365400d5e8cc288017bf5d75d5e21ee34ea398416c2a96baaf659d03b306b536fd8447fa2173f546df8a8a1af63c9c79c SHA512 36f49ad16efb6b2ea5f836a13b87f4c3fd4b78b958a5ab40465394aa6de0ede1d7a46ca69a8c0257c079240b960d423315d09fbcd378d89fbf0e6b7da51ed7f1
+EBUILD poxml-18.12.1.ebuild 339 BLAKE2B 4eaddc806bac56085e14f3f59f4398659776b77a6a2db0bdedacd54d04823722f798a5095c995f188636c3830d45bd23b409ba7e3366625ddd5da2f2925eaa57 SHA512 8709eab1ce68449a9af23581d36030653b3665b3176e30431beeca45a151218f7556ba4c974528bd4c5b2c776bf9be9e55dea54e7d487916623b9de045a4a3ba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-18.12.0.ebuild b/kde-apps/poxml/poxml-18.12.0.ebuild
deleted file mode 100644
index 4ddcd2f7d9a6..000000000000
--- a/kde-apps/poxml/poxml-18.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_qt_dep qtxml)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/poxml/poxml-18.12.1.ebuild b/kde-apps/poxml/poxml-18.12.1.ebuild
new file mode 100644
index 000000000000..99de04983062
--- /dev/null
+++ b/kde-apps/poxml/poxml-18.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtxml)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 9f8c3ee8d54b..38bc286d46e9 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
 DIST print-manager-18.08.3.tar.xz 238796 BLAKE2B f3fe67bb2a6b7f2e05b7ed8934ba491a829eff842fdd1f76af3cc376e679826e6ae1f332242d278215828b4842a0bf85b6e22d5b3ffb03d61f01c5f575cfa0d1 SHA512 0727f5e125ac2198276a92acfd881077647ab082b5edc9c4e5211f53dccd19e12b9b6934fd696424e029d5f7de373a194f9c302f587fb0c80af42526cd4a04ad
-DIST print-manager-18.12.0.tar.xz 238876 BLAKE2B 9c80d1af88eb40745774291b5f75175e5efecbbfe8979848b660cf5b8ead44d3b1d01515258ff863434517ca4107712a2e0b47c522027e30a5989b71b477505f SHA512 66652e0644b75bbf16ffcc963fa272901b9130e96998e93c67d6c6914ffe28be581756b7e6b459d0477ed15a7a0ba9f7f6cd1c7938d4124a0443770619cc6541
+DIST print-manager-18.12.1.tar.xz 238868 BLAKE2B c12e90e660f7598f306a46b0aa800fdcad1e2f9a04bec229bcdf0a230b4ac079d5b5aa0a03aa6f8147100e53783a130b5a706a9cfe75a6f528b127163ab2d00b SHA512 e49adbb4118565f632e74e32c987ff2f735688e8091dc8eab8dbcabce0276b1360283e0e37729d13f6d1cfce5b27a78e3c4ac93b464adab07f92ac6b15244171
 EBUILD print-manager-18.08.3.ebuild 1436 BLAKE2B 536af8049cf584e8e551e73687592be1758e586a095efd2b879d0a3789e118636bc931f7a12d0b42eb38de99b982190f401ceacd86255e148a5dcd053fe7ad34 SHA512 8e6d544cff6c081b85a9dc038b1a8774a25990650e1872e897b6878f02333b64c9eabbe2581d32e4b7abbe82ae386074e3d030d56d0eab3fbaf5e851201a17b9
-EBUILD print-manager-18.12.0.ebuild 1478 BLAKE2B b2f2592a423a2716cd44605eacd905a812330025a51eb65334268c505e51fb6c3ea9218c9ff6020c686e013dc196617d4f341f546151a526da3a26094e45b1eb SHA512 d589e806ec3c9521b8d1d13f5f83ff1a6740d70fb3bbcf9cfb253b30e69c1cda320f6b844604db665f10d05d78edddb2cb6a4a544d89570376ba60696cec6a23
+EBUILD print-manager-18.12.1.ebuild 1478 BLAKE2B 530737b34ac1262bafb47995da437da48c4fb42aa8fc1d01f76abad586baa741d4da2299187fc783c9bcea31d9d0b9666425e1aa5023ab8380569b0f96649d58 SHA512 b4c72762f01f63e4ce7eb9ed57f9df9b6e8b6a5df46b3c68090db9b7a7f1d65ab828a23a4ddcba03aac704fcaca2660c0af06af0116a67d2140a4e458f415427
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-18.12.0.ebuild b/kde-apps/print-manager/print-manager-18.12.0.ebuild
deleted file mode 100644
index 6076351f157f..000000000000
--- a/kde-apps/print-manager/print-manager-18.12.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gtk"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
-		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
-		ewarn "an important, though optional, runtime dependency:"
-		ewarn
-		ewarn "app-admin/system-config-printer"
-		ewarn
-		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
-		ewarn "and will show the following error status during runtime:"
-		ewarn
-		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
-		ewarn "was not provided by any .service files'\""
-	fi
-}
diff --git a/kde-apps/print-manager/print-manager-18.12.1.ebuild b/kde-apps/print-manager/print-manager-18.12.1.ebuild
new file mode 100644
index 000000000000..6d021308e98e
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-18.12.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Manage print jobs and printers in Plasma"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-print/cups
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	gtk? ( app-admin/system-config-printer )
+"
+
+pkg_postinst(){
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+	fi
+}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 67f838d65a2f..89f3c603b5e4 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-18.08.3.tar.xz 1513856 BLAKE2B 34700188826787a65d1f73e48b44795f2f4a0fe29305c67789a9786983e4ec3100b4a36adbe325904adb7e342c4838df300551dda0a3c501beb15ea5bd6ead7d SHA512 e45cdb2d14d5b488935a5d5d8cba4f7fe26263793500d1e7f93c07fa547314816bb94a8a00226577cc1aa80eb0a94b76174e429542799ce3d6dbb4935ae3686d
-DIST rocs-18.12.0.tar.xz 1515700 BLAKE2B ba6b96d5908f6b53a8eaefd2e7c0a264a36d8c4366d8cd31eda934e3594e2fe85ede2c85f35da325d4d2207d99bd90657a14e1e7ccdfdb72dd3a769181508a59 SHA512 be69bf9f046344f1ef7acc53fcfca72eaa63d101053cf65aef5143de1453cc61c9f057359ca6ac65db17e2e30e118954fa5e9e10a406a1aa5076e6a284ec7ffc
+DIST rocs-18.12.1.tar.xz 1515576 BLAKE2B 29312880052a5dae48d57c815b452bd467a49c46fd0a8b4701632bfb1e400894e268354762435f7e6277c7dc52b45c5c1bf5d7498d9537eb230b0684fb891e5c SHA512 64517daff01ab9b01bb626d1856b1522e51275520a656b8c6ed463e0b8f93cfd30c7ce91f0413403ea98eb4551e79fdf2c8746522479272e8d0a9ab0b0e8213f
 EBUILD rocs-18.08.3.ebuild 1156 BLAKE2B 1dff519991630fb5293b20edb9ad773e77914d1fdbf8711c3ee24ee442effa37a65c2dfb34c0683f9620acc9bc20b00a1b5c56be697a0d7c9bf79f99d1749886 SHA512 4abf61e662dc16bc5a5be8106df5dd1b2b61bed31cb1df7cba725798d796ef379ae9f4d82681c2b700d9651f428863dc60b12e49d595f64b84d90e3a443f7e49
-EBUILD rocs-18.12.0.ebuild 1158 BLAKE2B 81366523db843c1a4a39c81a2a24a8a897e659270f9ef6794f998cad7af3c8b790fe26770f77f2d667c735e7000b1d6ad505f9a1daa8ce4e5ce4f3b37df2cfd1 SHA512 1624e83a8805062cdc835a66b58b74157d6cdbcd55a91ff42c2e9d8abfa3be14ea7060844597dafadee90de6a555d96f6fba74ca5f59aaeb240c70cbe87779d7
+EBUILD rocs-18.12.1.ebuild 1158 BLAKE2B c3693076cc4f683b5b5d24fd1d5607bbc905b2350a1be37b7e03333c74a0985527b6b15e89e00613a1788ef729657a968c23acdad169c2e586743d410231553f SHA512 34b623abb05eaf6e5f27425c4461a1e5ef6cf81cd37ca92ea91ac80f22c635eee05fa4ecd94534419735f2f40ce931afe8a1256de0f5b2a3793d3fcfc2fd0130
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-18.12.0.ebuild b/kde-apps/rocs/rocs-18.12.0.ebuild
deleted file mode 100644
index 49645ed5de4c..000000000000
--- a/kde-apps/rocs/rocs-18.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://www.kde.org/applications/education/rocs
-https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/rocs/rocs-18.12.1.ebuild b/kde-apps/rocs/rocs-18.12.1.ebuild
new file mode 100644
index 000000000000..ce4beb889760
--- /dev/null
+++ b/kde-apps/rocs/rocs-18.12.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://www.kde.org/applications/education/rocs
+https://edu.kde.org/applications/mathematics/rocs"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.49
+"
+
+RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index de215d5eef93..67d409f03c54 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-18.08.3.tar.xz 10628 BLAKE2B 81e83a269b010aa2ce0194647dbdcd0a40089b8efac6ea123b209449822d458ac42880da60684682cf4fc9e27b47d78e80c59cbddf44926abf2aef2379349aa5 SHA512 98a6d52277b168b2fbaa09a21aeae7c7c98288f1a6b2615039dec2259ddc0147b9133e2498f017b49e6684e83ede69d143a263dce1ee19e963a66e4500d7e126
-DIST signon-kwallet-extension-18.12.0.tar.xz 10636 BLAKE2B 447a20d60e9277bd8c6570118c190efcb625ccaf9beb735aa87e7b5fca286231cd3147c66bdc951f62ee855f6f4e882ddaf0c9ae518572f528fe12736b4e8e84 SHA512 0a6c2cfa127ff360cbc8eab6f5430ac54e48a2b88ec4f050fa48a660792dae993ce00d4484bcbce35e9fa63610371247cce205b3a740be6d9140404afb3e98ee
+DIST signon-kwallet-extension-18.12.1.tar.xz 10628 BLAKE2B 25e161a1e162a80447ad6c06f9b3b464effdd72f697725744e257aba7b49cebf3cf215e8cb126e452a0a92a3f01c078e761b05306d994843d9a5108f7c88e262 SHA512 4ea14d91adda363121bb11583c36a505d3b8db2247e7e688021d955c0851c9810f3d76f7f3a3983fad25b4d58b2623d8f0cfe339b1e7cc4d93c2e6961acf6e88
 EBUILD signon-kwallet-extension-18.08.3.ebuild 322 BLAKE2B d2e4fb859474831e4cd03615314cab72b334c29bb60ddeccdae8c395796b22fd3aa63cd8b7c1f6d464e5a4e2632b9ae9cc9e08f79d6b8ca8cfee5350c217ff4d SHA512 186d8451a269755e2f6d736940f1072daedb6708aa32896de39f7a937580763f1812cc025c73ebf48c85c19d398fa74aaf4fed484f60efa1d288914b031d1ca3
-EBUILD signon-kwallet-extension-18.12.0.ebuild 324 BLAKE2B d4abdcf0cb633688ee5a498e47f37390e51f3f502351ccc218ea0224f46b899a3c7a4e9a8e090f5c25b3967f6fadd6880a66052fa5ab145db3179e5a83e14332 SHA512 d76f1401a1084d7dde771c2bfffd2a6a2504a52dcd612ed6775f2f24e86c7b4f8de2856e856badf80c74a4e75d0cddb306bec4bdf57b42bd6fc529654bcbc478
+EBUILD signon-kwallet-extension-18.12.1.ebuild 324 BLAKE2B 8c979a7a503ade81859cd5d70cffe524975851bdaec3dc40a7c1890b7effa0b85f40e8ae153c22d7dbf46af2f1c2792d8429df53c4cfea0ea19b05846d2e2d7f SHA512 8a00b438e53d3f6337ff9d270d262164844a5ff5831d784f304bbdcd9687cc5e4f2f0a8880a5c9ee0a4f711ee328c224c9c5184b18add274575a9f3689b64ce1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.0.ebuild
deleted file mode 100644
index 9adadd52c0e0..000000000000
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet extension for signond"
-HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-
-DEPEND="
-	$(add_frameworks_dep kwallet)
-	net-libs/signond
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.1.ebuild
new file mode 100644
index 000000000000..441c4197de49
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.12.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet extension for signond"
+HOMEPAGE="https://01.org/gsso/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+
+DEPEND="
+	$(add_frameworks_dep kwallet)
+	net-libs/signond
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 8ce23169bf83..dd6f2240118c 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-18.08.3.tar.xz 1048716 BLAKE2B 9d2bf91cad3821ee0a11132b224c992184bf8ba7ac17d6e136bde332bd0e2d2bddd68724d02411e6a393f5c5695f8ea52c4d95a1682cf818dffbcb005178a1e1 SHA512 edf6f5439af917f6beb8d6063b8d7b1567207f3e84b8e07e2cbcd0c25ced4adf58db2b6ce9794a7dd3c31ff6b31c896df92705d01305b25d9164876605be5a54
-DIST spectacle-18.12.0.tar.xz 1050696 BLAKE2B 650e4939fa88355e634785abfe50aed97c8031acd5c5ee75e357ab2fbeb42343840ded6ab6ce8bef9324f4baa10f7877918358a94287cef048a594ee2c08467f SHA512 8be59f0870314b247c2da76cef89a74a2472936c2bf4790750d150c14d3f859753f8f34ef536ff523caeca2d12adc54a867308e51d2bac90320ee6328133483c
+DIST spectacle-18.12.1.tar.xz 828060 BLAKE2B 0e61b9ca7de02926cb9d564bb2dd93eef51f98c11c4063ca3af9e61640dc1b9a01273e1fcbdf647034c4d4dd0bdc5fbc4301ca0879542e2bb8cabe5acdfa3429 SHA512 b985a88b963f767c9df9af60b8f3a9b56c5b720730d0b7ae0c6365a5d54b361e4a1ffbb7ba1a6100c5b0487665ca6bbdc2a4214331589fc6408b4324c7890a06
 EBUILD spectacle-18.08.3.ebuild 1362 BLAKE2B b26e6024247206d9bc7b06229f95327ff9d6ee1cf6dc25000fafea0e1b9475c0272ab75e247c096d6d3360d94e0eb66198f7f30d7660d2146ef4fecf741c3d36 SHA512 54bc93a6bba9595e29e94790f8ee1dde1b7096f530cabdcec5f2c7f5ecd16afab2d0732f6a3d490425c56063228a2df14cda17e0457872b77c0ba1e9f4d9be8b
-EBUILD spectacle-18.12.0.ebuild 1343 BLAKE2B 77ad62c93619a4535b22738089b506c5787a64969b148826092c61fa0de248ab827328e2c57d45a900a5f271e088a52f2be3df004bca8cc423ee919418a6a4f3 SHA512 ba41020473cf7cba359abb063aa455c07a71a151114df6549f4f1b9305da8909f55a2febec18598c3c75b498fac3d5845f75cedddc7805f06b0380a82e1cbe42
+EBUILD spectacle-18.12.1.ebuild 1343 BLAKE2B 16c38a404d4669a170cd247ca730089c5be2f5f6339bd4eea84e234a5c3ea577083af80534a6a6a67d6803360a67a592dc39e1727f15a92ffc73ecb114fc3eda SHA512 878731a333b379295e2db5617a719fea3df20434fa80cd211ad75997d30f7c8ac3bbc3f7daa022a660aebd2d0d9695d75f9d304c2f306b520e8d67ca22a29ffe
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-18.12.0.ebuild b/kde-apps/spectacle/spectacle-18.12.0.ebuild
deleted file mode 100644
index 07e70a7e13e6..000000000000
--- a/kde-apps/spectacle/spectacle-18.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 knewstuff)
-	$(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 )
-"
-
-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-18.12.1.ebuild b/kde-apps/spectacle/spectacle-18.12.1.ebuild
new file mode 100644
index 000000000000..0e2af1f27fab
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-18.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 knewstuff)
+	$(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 )
+"
+
+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 82850c49264c..4cb62495d825 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-18.08.3.tar.xz 860260 BLAKE2B 3a5c8f7271288aa6def3656fe711d0fd4a1a7089e4696ea074c2a72b3af16cc3f6269b2bf841294d473e30d7ae77786e70388cd1c065b2a1b9afed052f293d41 SHA512 e9d6af9c9aecba86ba751914d4c1ac18b59da8d5b19ccc45d75461bf63a7730c303ddc0289187304891ed589ee5fcf9504edcc326f4e333e2fd6be391a1b6f9d
-DIST step-18.12.0.tar.xz 859340 BLAKE2B eb7c670f89267c67537d86033efdadffd93ca475c905f21304c4eac5106a1af94464bba4ffef8cbb8a053a427085859e82a50bea25f461dc2b0afb1b46361437 SHA512 4975a817f562b2b98dec61c50c32dea6bb32e9e210e4292e5f42533b9ad46f4be0128ea4a29606bc1bf850b4a298e2515782bc4c090fc27078852c7b45aa1ffb
+DIST step-18.12.1.tar.xz 859320 BLAKE2B b5fee7a59c3cefee6527549eee82048fc69fca10ce1a7a6c4b0c5f1294cf01449f1092dc1670b5a76e55e45eb4253bf2ae534af63a45a3445dc3fe01c0c50838 SHA512 3d825eb2666e8565ba33484bd06fa754f6c474ff01a36a9db663d2eeb904e943a6e8dd94789ba367e21a71bf35f166c833f076ef27f8d54ebb27dbd825cbf12b
 EBUILD step-18.08.3.ebuild 1485 BLAKE2B cde34c082c9255b778098a1a380e935778fa59e8ac4e36371c295d037c0c7f979b1eef5dcbc65c278827b40657cdf06d90df2b8dce6746a419ef5326dff4f7eb SHA512 fd6436eca9a85e79eacdddebfe80ce520d0cc5a922c8cb959bfec514d16a1df6becc46340573d2c2d5ab36cb3d4b41804cfdd2715dfb01b5599dbbfcd55c133b
-EBUILD step-18.12.0.ebuild 1405 BLAKE2B bba850c0c9ba142a269e71895d4e6db750568d5c169715202ad00bbca17bab531f3369e32dd6dad114e108aa2b67f5c7c714e4ce2bf59ae6c9db6ec5d8ef8ebe SHA512 0b01cb1e39934de954ccd5ccfdd010065478ac61b7d851105c0600a6cd1c3ddc1eb6dd6cb93409da719a8bae56f85365615dd49c08f072015205440601954f75
+EBUILD step-18.12.1.ebuild 1405 BLAKE2B c8a21d6ebffabb948d51fb46c37105197ffc2df0ec7b9e84b5bf26b12b2e45eb1df74730f2018e6762ebd0c267d169844cf3b869b8db8e81f0d87b8c59bc3fdb SHA512 c951da9853f43baf70d8c4fa85326f646fc0bb077f012889ada05f81ca688a7acf92c43a9dbe6de448a662a886c8190bddf9e7b79632510667d8043b442dc870
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-18.12.0.ebuild b/kde-apps/step/step-18.12.0.ebuild
deleted file mode 100644
index 98db70a0d248..000000000000
--- a/kde-apps/step/step-18.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step/"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gsl nls +qalculate"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/step/step-18.12.1.ebuild b/kde-apps/step/step-18.12.1.ebuild
new file mode 100644
index 000000000000..0b51ebc1edf7
--- /dev/null
+++ b/kde-apps/step/step-18.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://edu.kde.org/step/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gsl nls +qalculate"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-cpp/eigen-3.2:3
+	sci-libs/cln
+	gsl? ( sci-libs/gsl:= )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Drop duplicate upstream
+	sed -e '/find_package.*Xml Test/ s/^/#/' \
+		-i stepcore/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index da340417c99c..fb6a18b8be9a 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-18.08.3.tar.xz 20952 BLAKE2B ef4b8207ebea30ae1da4b55311d78ce614858c058135b16273ed04a2d63f55e3614be39d6675dae2f3bf6fd5c461f39588aefa5669c510ae1595c149d2a6401c SHA512 2bef4ea0f0f14abc1f56492779ac3b83137269730c1b2f240a113a8b85820ba456dc66faa293a9580a44ebc6b235c732194f1c0435bf2a5b0bc4b5b3b0fb7008
-DIST svgpart-18.12.0.tar.xz 20848 BLAKE2B 6095c0dc15679147346864dcfbc243b6173697f8cb17cfeba835ff6a44c5452fa0522b41133b7fe962e4dcdaeda311fe3b8490d3ac6cd08f929c1fdd1a7e6ce9 SHA512 55fd4823c3af66ec33f5b6f3ecaadaed305bafb4b073f38b2ab02bbcc7767d4b011d236ae69399964e3852ed6e4ff56b93d305ed235377401fe06c2fbf569e18
+DIST svgpart-18.12.1.tar.xz 20856 BLAKE2B 55c6175dabc61141160dd9f420d900d5c7f334eddce96c337504d2a32b7a7592d7628a06594bdf8126fbf5e854ec12a6cba783eb0e6196ca33ea3041fc16ad10 SHA512 b05fb3dffe179e552c0d3cad868ad41e482819daf9b0ede58050c9ff10947c376d7527cd045ce4686f4e9d43f0767c74988edd3875ac8769f3c85530f252ab0d
 EBUILD svgpart-18.08.3.ebuild 496 BLAKE2B e156d45b77719bb1fc60a7f95b7201c00c0e4ae28510c7e01fa05503fc304adf695cfb6098d9b637fe947bb502c9a4ba7245ab29580f74fecbcc04ffa61eeb1f SHA512 6cc90d01495b433f1d8534183a395fdbf7665123c1c41dff07fa3ac370da70d6b77dc22f384829180cd7b18746c4dbaaf7294dcfdf1d638c9a335ef09263085e
-EBUILD svgpart-18.12.0.ebuild 498 BLAKE2B d5f7812f44875577d2a93cc904092b8820749fe1e8ce5ed9cbe8c7ba2eed114c5704720e944b13db20f59371984fbde2d0ac69c3edadd8bff63394357b361d96 SHA512 8c2da153b396edcddd1c24150b18166020e268eeba0760b8fb9d1dd1c7c1138ada1e6b089f5e7e84ef6306e36884824fde532e6e5a23947a004689eb6dbc1654
+EBUILD svgpart-18.12.1.ebuild 498 BLAKE2B 0fae2d49b8ddef5a2adbac2b240896625ab035c2c31788747ced0c1e19f89fc1a44edf83037f691124ab958c07b40c45062f732b73c408761870a938ab06d44a SHA512 c369aeea178018c91a5e7cb433c44ac74efa0c65373a1a96767a48e400c689dc7008a633a199d2cdfe6e7f1fbf56631d9f58f0e75bbcb034f013d2b4b8602418
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-18.12.0.ebuild b/kde-apps/svgpart/svgpart-18.12.0.ebuild
deleted file mode 100644
index 3ff6d7c07710..000000000000
--- a/kde-apps/svgpart/svgpart-18.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5
-
-DESCRIPTION="Kpart for viewing SVGs"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/svgpart/svgpart-18.12.1.ebuild b/kde-apps/svgpart/svgpart-18.12.1.ebuild
new file mode 100644
index 000000000000..f22ec4e414f8
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-18.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Kpart for viewing SVGs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 20710b926022..4f88f23ae3e0 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-18.08.3.tar.xz 368368 BLAKE2B f861ac24400e9f126733e74a7c38229436c7fa8ed774567f6d66ab3bcda7e5baedefae390aa1a31aebb48ab450cd0c57b453afa8fa4a3e18c2cbc472326d4e44 SHA512 6a4c44d83327021c241e0473acb1ed0fe8cb0ecd6c45133408448a22973a77ff2a1d52f1a70f97039d5ab835126ed374173c11fcf4f04d7f6b007bf1e67bddfe
-DIST sweeper-18.12.0.tar.xz 368008 BLAKE2B 2fad3ab3fdeadb178d3e2af21734771bdcd612b27bf84bc2d79de6a0ac82646761e069a6896725abe6859244bd2e7cad5f103437de7a8a52a84a65b762b7de58 SHA512 6e9857e7bee662c97529d801c8e0709c6336612cc67b1a3963cd33f74020782ff3d75702dcc2365110ae94595dab40c2b636eb4a946b4c1ab8ef55405451a630
+DIST sweeper-18.12.1.tar.xz 368048 BLAKE2B f8538774ebc742d7a939e01ae2df33afee3ca88b67ebc7b7c41b6e035015a8079adee1b11e108ce0d40c5ca6bcb8d0d921a05986c39196b051b0f959ead218cf SHA512 0f41781d4b761b4228ac5d5b259f5d53744d47e45b3666ac0b111f831e5c27923a8faf4f5d8574e346f8feadb39d4997c846afa0be39df9501b5e20efa459133
 EBUILD sweeper-18.08.3.ebuild 878 BLAKE2B f086b16dceda0da371124d6b32362ab5db85324bda48b3a599f5ac4e7736f24f313e0ed5d684c0de4f31f2d6e637563be96f2ad5e1cbb048694accd092fcf1f7 SHA512 08169419cbc0ab9423bfbdf9ef4245f6a4ce9d2e11e4d661c3031c38697786a054adc5f10b0ac3c059b1cee66e2435be914bf5abb69212e9f88129bf95d69812
-EBUILD sweeper-18.12.0.ebuild 880 BLAKE2B 86a21cb56f0f0846f9277b8084df8de20d2dcb059467cd1d873c47245b01c07c1bbb9d291b01cdf77ef7ad04ce95e5df641792b27484c3f7d08b7f95a1d687b6 SHA512 9c8ae7b4def999030f5ea8e47e06ddb0edfdd7094eafbcf49f67570e15fc9fdf95095f7a66e40404e014716ff8c98c41b61cc8416c4857732877c4b9f19cb1ae
+EBUILD sweeper-18.12.1.ebuild 880 BLAKE2B db0c8cc58aca7dbe213b139694621a3fda450263838b28fd13c0a4b1b5e295c28cabb474d751ba4347143e34b12d0230e535169f64d5c2ed969807bf5637553c SHA512 494d97e7e3b84e3ce3e5d7749b711ac491102ee30a09aa37a83a6513566c5c1e9e6b0db4cdbf10692132403419882eca402839ac733d9b65aabb9d1f9b9f61d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-18.12.0.ebuild b/kde-apps/sweeper/sweeper-18.12.0.ebuild
deleted file mode 100644
index fd89b50704c1..000000000000
--- a/kde-apps/sweeper/sweeper-18.12.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
-https://utils.kde.org/projects/sweeper/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/sweeper/sweeper-18.12.1.ebuild b/kde-apps/sweeper/sweeper-18.12.1.ebuild
new file mode 100644
index 000000000000..63558356b000
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-18.12.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/syndication/Manifest.gz b/kde-apps/syndication/Manifest.gz
deleted file mode 100644
index 425af7e675da..000000000000
--- a/kde-apps/syndication/Manifest.gz
+++ /dev/null
diff --git a/kde-apps/syndication/metadata.xml b/kde-apps/syndication/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-apps/syndication/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index f5c35f41db30..1a2a6093b4b2 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-18.08.3.tar.xz 41284 BLAKE2B e3921df4bca8830779eead63e84f38ab08b28f6e7eb4aedb9e2f0297d9a1c6aa9a068d366501d12f212bf184c169da22b7e4b632b596950d312c4d94abcd92b1 SHA512 3caece3e3cf670077a04aa0bb1a5c77ee2ae3868674a19e4aa105fdc6517cd54f002ecdbb1d494af2a0373a56c362c524427c5b23d6f695119368ecf9252a3bc
-DIST kdegraphics-thumbnailers-18.12.0.tar.xz 41288 BLAKE2B 22f12579b756bf3f7a65154d93605e3ebadeee8005594287dad9048057ad239acdcceca6daa6b125621d5a80c7c1c034e7ad6baf8bc52e238caff05246eca7a8 SHA512 6ae48e1608def399919769fe33adc07feff459477c38a14ce87a0f62a98d260cc02a6339f82141850a8dd1ce9bdbf8340262bc33115368b7726f1a12841b960c
+DIST kdegraphics-thumbnailers-18.12.1.tar.xz 41288 BLAKE2B d69a803090e1631566c0c117eca234e0cb7d5ad35c16aadfd7f4724d0b4aa70f509a8096e3f3a0089fd79db86b6b5e6aa885fe189942ad0c14f71f63720fbc4c SHA512 06cb7995dc9b09133ae9d60d418a266a72899f55f3e02bfd36e988c94264b100829f003c2e5169b558cbc4c84fa3e69481d7d9565d0b7cdba86ae55e5a8495e1
 EBUILD thumbnailers-18.08.3.ebuild 607 BLAKE2B cf754ca4621644e19eb00bf9fc49408a13561c8b0ff307f458c1b26772c1eedad675c99cd5734d5e45797eb6097ffdf2fb1bb472153c70fb9b226239c6549d36 SHA512 52d5bd02f6fd8d15d44388e3d20f95df7d9ee7e2375e25006353dfda5cb4a4a6bbd8c690aec6a9c661c9b3b8d5304041ac3702f4938bc52024f1d2097e1c3335
-EBUILD thumbnailers-18.12.0.ebuild 609 BLAKE2B 5cf3510528fb3ea41e5676a375691271f5c4e7ddeaafc5029e162035dcfb3d62d38792ab593fafe42253d9072fc546f393e6f392e7e693267e835c255f72302c SHA512 4ce1c46a262930935bc7c9815302baf03abe1fed13d7285de61337d80da86b4b1850be1753308dd2357d81962775ab994bbb57ffb8cc82f6909bce86f5c9442e
+EBUILD thumbnailers-18.12.1.ebuild 609 BLAKE2B 2ff2a75d75868c260ca733e94bfbad4c2bb04bf0da6e234096eb478b1d1a9dd69b44edf3a16e8d915d7593ce0d231634a4075c73fad6908a018de78233cdb366 SHA512 e5adc4dba60f7d646076a007d85df4f71140e68fc5f47e8641230ce99c07e972ebf08cec73c0c039498f242cbd05e7b4794c2208d89127c05c3bc2a72af70cad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-18.12.0.ebuild b/kde-apps/thumbnailers/thumbnailers-18.12.0.ebuild
deleted file mode 100644
index 38bdea3583d8..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-18.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4=false
-KMNAME="kdegraphics-thumbnailers"
-inherit kde5
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="raw"
-
-DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	raw? (
-		$(add_kdeapps_dep libkdcraw)
-		$(add_kdeapps_dep libkexiv2)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/thumbnailers/thumbnailers-18.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-18.12.1.ebuild
new file mode 100644
index 000000000000..c587017133d4
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-18.12.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4=false
+KMNAME="kdegraphics-thumbnailers"
+inherit kde5
+
+DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="raw"
+
+DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	raw? (
+		$(add_kdeapps_dep libkdcraw)
+		$(add_kdeapps_dep libkexiv2)
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package raw KF5KExiv2)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index b13571436141..26b94aded9ff 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-18.08.3.tar.xz 3048228 BLAKE2B 0aeb03360ac8633a738f8066816376991bba83569b4c3d5ada61c481a7009866497da6315b6bbe474a180ce779c5421d90e415ac26ebea8ee32cae961250926e SHA512 2aaceb8e351e4a0a13834ce6ad1c8dd5575ea591e4c69ac080ad53798338200fa9768460ee63f7462941e372ddb9458afba8b602843c63c9cad2cee6f763d6b1
-DIST umbrello-18.12.0.tar.xz 3049092 BLAKE2B 005b706c0a920125a2b2c4484c8aaa9f33f38df0aeb75d8ed2bece4480e73d4608de37d6f38f9ecac6fce5971946bff6ace7f766e74410f5b002f34c6ec7e10e SHA512 6cd2baf703614d0674e50a97cfbf64b00a63a4cea18bcfd9be63f5e9ef3949e552bdbc5d6bfc389c47f3ffabd22a99b856433ee6f4ddfa16b732deeb1c804df0
+DIST umbrello-18.12.1.tar.xz 3049400 BLAKE2B aa65bba6a34dd9a0c5941184fc92a177d531e3394f46d36fd62d40cfc5e48f10a8324ea7cf333a8f22cd6570a06c9982b552f2cfe08792de38267729c6374e46 SHA512 3dd28d55a54336700bc2ee5df487a6701a60507d4d5649a577969b9f092d49f70ca5247717b95795c4c3fb3eb8e6ec88da6e79c12fdc959fbb48de27e905a5c4
 EBUILD umbrello-18.08.3.ebuild 1369 BLAKE2B e5dc34a20a9b3747064d73002d6f6d853cf2f6982f82133137f0284732dfa4a73bd48ea3ec8c0038ea330084db0d0491be7f326965d08ff2d53bfd41793704ba SHA512 34179cc8cb4f5cbab83459ee483df4bb0336a40c17fa7af914609b32da9dad92bc458a0fdb078ef6c5a658891976e73fcc2ad6d0c0ac4f296f27c8e8cf5a46e3
-EBUILD umbrello-18.12.0.ebuild 1371 BLAKE2B 36487844d2cb0f983ca193f001fd31d6a4fc52eabc1dc49adc8cc71bb32785c36b37435d2521be4c4c42b29cedc027b698e6444539120b3999281e008e0ef548 SHA512 25323060435a8ec76d5b7bc8f827f31adce2ce9ed6e123d4ede043e7312084e29d3231646a38c13b52b166c73d818472f7ec56e9cbe0fbe46a0da25f38014d26
+EBUILD umbrello-18.12.1.ebuild 1371 BLAKE2B 4bdbeb965ba01e8b454e3593e214d02c786063f321dabbdde8ccb73aef1761d18672daa5d466cd8f8f1c5c82bb2ca4a807d4467926fbcca612ab1d753865d921 SHA512 7713d9d2ccd843adb2a61d32f110446f1b8a545ebc43cc02ee75a42196ba95457747a3f273f465fe136c5810fa7bd1644b8da832a5534b6c220ea9ff24966b67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-18.12.0.ebuild b/kde-apps/umbrello/umbrello-18.12.0.ebuild
deleted file mode 100644
index 4d613c78d05e..000000000000
--- a/kde-apps/umbrello/umbrello-18.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="KDE UML Modeller"
-HOMEPAGE="
-	https://www.kde.org/applications/development/umbrello
-	https://umbrello.kde.org
-"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdelibs4support)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kde4-l10n-17.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/umbrello/umbrello-18.12.1.ebuild b/kde-apps/umbrello/umbrello-18.12.1.ebuild
new file mode 100644
index 000000000000..94b081e2768c
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-18.12.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="KDE UML Modeller"
+HOMEPAGE="
+	https://www.kde.org/applications/development/umbrello
+	https://umbrello.kde.org
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdelibs4support)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index 76e98806abb8..2cabacb74d9b 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-18.08.3.tar.xz 38948 BLAKE2B c846229e80e8ab462a59416241f68d13c5198630e94d2cba795e98e07718fb30ca8f4d05c86dd34dcc43afcbc0a30e173fef3d5c524b93182c14cd1e4c6667ef SHA512 d632a27e51f69667f03119cb0b22f98bfb46e7522874aabc44153aa0ee244ba1d3d513cd72470e35feeab5a35d65a7caaca2cdf49e6a7c7cdc3f124a2692f860
-DIST zeroconf-ioslave-18.12.0.tar.xz 38744 BLAKE2B 5415cada88d081fde8671f927c19438975c9ed9dede0c05db44b1012a6f83250d168c2e61217dec2112a553dfc2b6d1c7f21ee317204843d8191a4adf20c5d2a SHA512 634ddec8e717d7707e1d8068ca36c584559dd681dee75ac4cb58d5bb64e97171382a6f12df7be568adc6e0e4dc4fe979a8b5e49d0b8a4045ab744d70697fd573
+DIST zeroconf-ioslave-18.12.1.tar.xz 38732 BLAKE2B 389516c1f484087cd9c35bc1b61504c2d57c8743f9f6886727de3e0af845d9f5a134895ce63354c6e14f35705d14e3704be6cf9bfcec49eeaa4df146d30500f5 SHA512 0990dc61e932c2ed0ed9d2883e2219732fc861a2648366f94f5c65c38809c48d07440cd8c956454506cf8ef12e93125583260390a24bbea162bfc47b161d313a
 EBUILD zeroconf-ioslave-18.08.3.ebuild 477 BLAKE2B ea6458363dc734a9f58e831ecfe4b539e1ef90e4565f18d4f55aefe41878d3b9e020c19a6919495ed81d3507b2be5581e06246e94ff9b82d9461470ad14c236d SHA512 cd3ca7b5dfb8abdb9dd27447930d60c65b3b1aa0de612b7803898a0a631cf3888b329425732d363a83ac7d809e9c33332d19433ac97fe4f3063b3f9ed9e6e76c
-EBUILD zeroconf-ioslave-18.12.0.ebuild 479 BLAKE2B c82e37f98903de13302e616ce8929732e9787fd65da073e4924e5451eff4d4ef6991e775f94ea788749ce7eeab5805ad37beaf3bf68b8110b412ef376d09c665 SHA512 e3bb87cee8231cf620bc35059816b95b0dea098385d3dbd79142000cf30df2bc13433089bfd23dbd4d1dfb6c8e93dfc45afe3b2a78bf2c6de2cccfeed37c3d11
+EBUILD zeroconf-ioslave-18.12.1.ebuild 479 BLAKE2B be9f35e5e9213b7548501eb5bfb19b4029882e22fd79a7c74c45a47e15faeec0292619923258a99ea7174220972ccf290aff01e0b5dedc127e0f3bded4e9e921 SHA512 300713aaf1ee02001eaf321f68c40659fe91d1ea099245aa6601e59075b5b3783da8307c87f888378e325013d101eac0d34feb1cdd872c15a64d9f76284e8223
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.0.ebuild
deleted file mode 100644
index 142acde12fd6..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kde4-l10n
-"
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.1.ebuild
new file mode 100644
index 000000000000..e9a912f48481
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.12.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d0a4268556d7..f30b345536ce 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 80b8ea15b4b4..e15423a2f5ca 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,7 @@
 DIST attica-5.52.0.tar.xz 62524 BLAKE2B 435b34be8dc9fcc4bd934460da80ccff1e8d63502edc21dc17fcfd9f337ad651140d5b26f9ec1ef24a481322783d543ae833114ad47f7e780fd370e576bc1f3c SHA512 5f5233082695c507263f02877988e069a4c4b03ce51060193401edb18664218fc093964f49bd0b217c860ceea05c389e7a32a51bc7c89bfb1568db2b06b3addd
 DIST attica-5.53.0.tar.xz 62552 BLAKE2B 2c53d58dd1af254d358accf29af513557ec536f02e97e962916d6c27c7149d9fed2d8b6fa596095a92e75837135828f5054a1b3eefcde74dcf0e36c8ba5d16fa SHA512 2529213615db91d0e8f029a61764d208e24cd53fae62787708f55f474302da29f672b0f1067dada941d3fd5e09ec0242e4d14769ed9e608e49cdc97402ddec5c
+DIST attica-5.54.0.tar.xz 62588 BLAKE2B 5a33668ba53ecfb191a31f28b386618d380dd1890cbe986e52029ffb00873f06ef1e140d3ac30128558f07c07b3aa8a65f8801a22fbd8feae4c1e87601fbff3f SHA512 f278423e5bcbd1899d6c41caceee740e3caee01dd1af20303827ec5a807e262e560b068dcb6619f5410ebe815b71b1244ccc453c49956c3bfd1452a88ecf5b18
 EBUILD attica-5.52.0.ebuild 436 BLAKE2B e16f18e00c50f8662711ce7c552b8a82cc1894f46a31588fc6f39ae6b3b353795bef3534d90fa255d0423c60b006ebe89b9a198547b8a369570087e540cb55f4 SHA512 eb17df16c2802d51d6c3b4ce1796c1848a5d248160051443883aad16a9ccd56c37edd8a12b7d572b6803ea2ee0420a09ea68105f8c68e5acd2d2b52a604e11f5
 EBUILD attica-5.53.0.ebuild 438 BLAKE2B 1ef0745c1f36a8663c4464b6c9a407897bfb5405b7e3a0dadab90e149557e26ffd825d2418ba9c85a1172d00ed252db39366cdb530aa7f81801218084fce1cf0 SHA512 c649bc4b04b52d7cb70027c08a3966db6e5ecc1fe319a957079ebff64c1794eac765031f9a3528e729f3bc56f201388fc36684cc1b417642ce52a785125e15a2
+EBUILD attica-5.54.0.ebuild 438 BLAKE2B 6eadf2920ab66f49f8ad57a0373ed952a75322a9447bfaeeb74948e282125c864d65024cf5f3d4d07a8204ede25dd0514d9cb7fcbc6e07ffa5cfc23b47405236 SHA512 0ce8b8cf3661745f1aabcf9dae9a3354bf70824be59f8561e418b36097f180fea0013112f12a5e70c10158db1477531e855637c6f0f6aaa28a02c2ad1b05b0ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.54.0.ebuild b/kde-frameworks/attica/attica-5.54.0.ebuild
new file mode 100644
index 000000000000..0d66671e75f4
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.54.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# requires network access, bug #661230
+	local myctestargs=(
+		-E "(providertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 59be2378503b..57f2b633be39 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,7 @@
 DIST baloo-5.52.0.tar.xz 234820 BLAKE2B fe9ccf929091015eedcf1a87f624618ada69f643c2cff70fe814bd50cd7a2941e7a032cfa805cc030ae2f2fd383e6b3d9313850a0af2909290c6dfb47a060062 SHA512 16cc6bcf966900349dd95f33f2e37f6cf8b19f1f60219f8b797f1575b6e6862faedbf4d9912021d63f2d64ca511ed61dca6c579ddfa16491851d829d12bfd46e
 DIST baloo-5.53.0.tar.xz 235088 BLAKE2B 6bf29155d7039567dbf9910f5e5d9d1689b8544cb8697fa673a9f6a62a84930d643c937261002240d18d18879bd90eecd479f2a12c4a985a58970922c73a72f5 SHA512 b5d21674696807c4b9de99bca44a8444b485d284e9934c91f72f20e5980a05059ac8d2a6a07c6c2913d548302dd0fd3de2d384348383de563d64b9a51809be2b
+DIST baloo-5.54.0.tar.xz 236752 BLAKE2B ff4e94fc0ad72d6d7d2106d493e078934db11d0c439754eceac9470a407f5c82928cc0a451b9101e7cab410d0fad120f5f9d63eb1fcb1ef60c9d05dd057bd20d SHA512 ec610aa2ab6409cf206623e08eb78d7ccc3b278ca94d6f8ba79d6d705459eb5cb9d74ed9ffc4cc20c337582b12517fb59da1570aa689111c0f105746234333de
 EBUILD baloo-5.52.0.ebuild 786 BLAKE2B dc31c80c1c87a12486a5dcfc96d8b5f53dfb38ab2df58b91b498a5bd35f156de9c5cab65142f46bb43b9c74b884577f59a8baef0f47c9b3a8361d32bcfd2eaae SHA512 0b74addc18305e9ea7efcfcbbe0af3e67106406a979d50f3f3e2b949b418c5b177cda664223bed213e245e4648b424a8f2858862f975c1782eb4e765fc756ff4
 EBUILD baloo-5.53.0.ebuild 788 BLAKE2B ccbe022728ecd5e1641d8c842540d6b72007f715b5f71352d167708c18bb8b1cf98ce5a34329361375af8d30b22d18086ea450c9a804f4c749065fac09bc5dfa SHA512 a148dbf51f661bfff25a53d0f19010fba38245c01eae966fa1ac181c221044409647e1f584b5aa583ef9f0660370a374090504af93f3c207e47f26c2d1be0ff5
+EBUILD baloo-5.54.0.ebuild 788 BLAKE2B 9d5a35e713ddd0d10a72924b1477898ba4fbc9e692b668bb7fc9a8a0112c556522cb501d485b8279aeae4c80dd121106130639c669a7d332f26362febfb8cdff SHA512 007c1a6bfe1ea15ddb00509ce8c31654cb45b8f30778cf01273c4eb56d6e728445ca611bc0589defd270daa0041bfb28e91d732e7028e316762560f02640d6d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.54.0.ebuild b/kde-frameworks/baloo/baloo-5.54.0.ebuild
new file mode 100644
index 000000000000..693d35cddcfe
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.54.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-db/lmdb-0.9.17
+"
+RDEPEND="${DEPEND}
+	!kde-frameworks/baloo:4[-minimal(+)]
+"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index d9f37d15fe27..0002dfe3b5c0 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,7 @@
 DIST bluez-qt-5.52.0.tar.xz 80704 BLAKE2B 02fbc3219895570d0c26cd99b384d2e316c3c0a84131e2f060a4789b71517846d3b5c41fb1865ede2924c9b82134d4698cb2f281fe324a7441d25ea40ccc873e SHA512 a8e7f6c9e495f563b3a522f97d3d7f51da51500a1b30b44edeab9cf0ab00f9cac8b945550e42c3889fea45acdac6d2729538b47c3e6cd934c4217a94639966f4
 DIST bluez-qt-5.53.0.tar.xz 80684 BLAKE2B e1c3b246a8f1d82e068cd93da57c8bb701ebdca5be7b17da87aea45b80737702f7d72488aacfa30ab79e8bbe043f0b5b01192f58b23f9664f86e938f6451c542 SHA512 161b242799982d98be5bd141c5979ca09b7bef77f27e5903dc9502acbfca5762136edbf492fdc0100893afe2ae41c9ed21cbe858c9740a34e8b408ec0fe3c158
+DIST bluez-qt-5.54.0.tar.xz 80700 BLAKE2B 3f06d08be6601adb6c8c7b95e66a2d6442a722c74d86b3c17527deeef2fc91458b397d6847789e1521a69073f9f6433c2302c4ba657fc391f0fd9872e2f66517 SHA512 6683f9313b6eef63e27e30a238ba55bd9297a9e1b2353ca9dda9cddc0b5625db1127affaf25c899bff4eccbed8758f667e8b5416ec9cc02ba9ff7cc8dfa01205
 EBUILD bluez-qt-5.52.0.ebuild 629 BLAKE2B f163768e00e7b2cc236278db791bf6e900637a9d075b10bde1ee4a386a94cf30d4390fbc0783bc8641b96f6073018b7cd3ec2147ac79f3b16c98a58d81b8b03c SHA512 2c5605d19be5eb1a4de151add6f51543f2a3f50c3bb5f9e0dd2daed62fa2cad77c79a578d2e39d6f2fb23e66c9b5f9ded18f206d9728e23ba29f9b82fc6a790a
 EBUILD bluez-qt-5.53.0.ebuild 631 BLAKE2B 592a274457d41b2f18223a3df6c75847eb8eb51cdf51e0242ee460b6d1638e9ee535ec11fe60c406fe51481606ad9629e3b0695ba091e616d175f524a4e5d237 SHA512 68d420b23bcad31de27705c417dfbf05c7c40bdfde86fe9556d26e953d98c6aa3171c397fe23d28d5b38024226ea45e31d70b3d2c4977a43bdf088cacd0fee97
+EBUILD bluez-qt-5.54.0.ebuild 631 BLAKE2B e46c776a83c721bf37cb22bbb9dc51a3ea08d2f80f8ad07f6987cd60d676ff9edfbcfe9241b0004575804221e7c70a5443e369aea3c7d4bd305970e6f755a127 SHA512 7cdb463c6e5cadc8e8c9de36ff9e908b32efa35cd7e7467c8d74a71b6e15eeaae4f930ce97c4ce730c2914121b974fe71fdaa9d5b95eacdece8a882c2d8c74b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.54.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.54.0.ebuild
new file mode 100644
index 000000000000..191c90e4dba5
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.54.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, bug 609248; managertest hangs, bug 668196
+	local myctestargs=(
+		-j1
+		-E "(managertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 0e05db1be532..1b42ad3b28d3 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,7 @@
 DIST breeze-icons-5.52.0.tar.xz 1549388 BLAKE2B 4abcd7ccc1a7e0f8eec5e120b8ef61fa0f4e8dcc91eb66fe9088f697ee6896278845d1265df2820091009bea4d9ad2d77b55b699c2d495dbbd3276ef4d591b22 SHA512 774a6c5587bd8c04892d5844bcd820300e98300b0a7e0402d71d40ceb09beb18c6a011e78d0e128a367ddee2847788c5af6708c51d125d0ae68937dcd935562e
 DIST breeze-icons-5.53.0.tar.xz 1555744 BLAKE2B e2666476cbfde58f6e59039686d212e4af3dc139b60618a117534ae7659309533fda2511f9f0e6b258a98575ffe7e5a976857f28b0ff2d54998c3327760ff431 SHA512 3977a21f0461c00f560ba4d4b21e56114bcc152ba2237285b9d52fdcc3cbecff266caae26f9ce05dac6dc6a9366587e89ecae1acc397cea3a7d8a1b9236f63db
+DIST breeze-icons-5.54.0.tar.xz 1591224 BLAKE2B 7a29cd4a5432e58bc118b788ff81bcfcc0acf0f6ac64764a35d15a3f5518cdcf24287f4725aeb89042503eeeb6325b9693aa945d2b574684c7306becd1c58e1f SHA512 60a2f07bcf3e8ce59b3860d4e74411e3b52af16c08ff3213ecdbebca8d1e9a2918ec5b24f67af0dcee0673108a3f2c8f8b6c04d2a829bdaeac300383fdd6dad5
 EBUILD breeze-icons-rcc-5.52.0.ebuild 655 BLAKE2B b4fec87fa401045fda540c8d4cca9132229eb13eb68793a9f83212e6757180d89ad05234dd4c1a08159fe911ee91d3c5ca90864eb5e922b3bb034c66953b73a8 SHA512 049f1ce78bc8666fcca9ce09231dc40f899c2f25bca8f8d6513874e90dc19a2134f24edbf45d0be75bfd8a92617d6cf599444fe90e39628e4c4410172aea8ce2
 EBUILD breeze-icons-rcc-5.53.0.ebuild 657 BLAKE2B 43ff1815b06644d73571b46a5eba42587bc816feb2aad727c63f9865eb2e89ffb00d9b0c3916dfc4e6fce890688311cefff804b907ede7d7a69be73a7684d5f9 SHA512 a6a1229f6c55f68c65fe8f04e67f09939d3c8f6486dbc14f1cb28ba33053b608e28790a9a958237ee84714ea659bcbe776f95bf1dc79be17cf2f2ad7e6e3ffe6
+EBUILD breeze-icons-rcc-5.54.0.ebuild 657 BLAKE2B ba6b9e72d5b9ae6e3bf182e75cb726aebd1aa0ef481e3d653fce420c559658d6a1fdb951ce9cea86e3fb76d7a81dae66d486e82a5cda8e0813106abf0f964266 SHA512 f26ec22f97734fcb3f46e13474989d167d04ed4bfc83134af40984e530dc414fdcac3e00925a333c978b1d36a9a2029e78c34b218f7463c43dd22c3381c980b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.54.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.54.0.ebuild
new file mode 100644
index 000000000000..f76c8a58d0e9
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.54.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+}
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 904b25fb97cf..deac7574d5f1 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,7 @@
 DIST breeze-icons-5.52.0.tar.xz 1549388 BLAKE2B 4abcd7ccc1a7e0f8eec5e120b8ef61fa0f4e8dcc91eb66fe9088f697ee6896278845d1265df2820091009bea4d9ad2d77b55b699c2d495dbbd3276ef4d591b22 SHA512 774a6c5587bd8c04892d5844bcd820300e98300b0a7e0402d71d40ceb09beb18c6a011e78d0e128a367ddee2847788c5af6708c51d125d0ae68937dcd935562e
 DIST breeze-icons-5.53.0.tar.xz 1555744 BLAKE2B e2666476cbfde58f6e59039686d212e4af3dc139b60618a117534ae7659309533fda2511f9f0e6b258a98575ffe7e5a976857f28b0ff2d54998c3327760ff431 SHA512 3977a21f0461c00f560ba4d4b21e56114bcc152ba2237285b9d52fdcc3cbecff266caae26f9ce05dac6dc6a9366587e89ecae1acc397cea3a7d8a1b9236f63db
+DIST breeze-icons-5.54.0.tar.xz 1591224 BLAKE2B 7a29cd4a5432e58bc118b788ff81bcfcc0acf0f6ac64764a35d15a3f5518cdcf24287f4725aeb89042503eeeb6325b9693aa945d2b574684c7306becd1c58e1f SHA512 60a2f07bcf3e8ce59b3860d4e74411e3b52af16c08ff3213ecdbebca8d1e9a2918ec5b24f67af0dcee0673108a3f2c8f8b6c04d2a829bdaeac300383fdd6dad5
 EBUILD breeze-icons-5.52.0.ebuild 617 BLAKE2B 670f3b7d39a9de0cf478ebe9a771d895e77fc5ac1abe5c094c4ab3ba1958ce5f8f1969ec5deb0326a732aab717f17d65c6824de982daee6ec238786123d9c3f3 SHA512 4e71518ae71cc2c9dc459afb03d245f40299f17d992b0fe969de56391eacdb6ce8ed4c17aa57b7751027a9baaaf535b2b280174c00a82f3b8d772293096679e3
 EBUILD breeze-icons-5.53.0.ebuild 619 BLAKE2B 2e179540d4eebe3547d0b1eb5be164baf87b86f44bc0d18c123568249a20d50456eab772b6dd6225caad844634ba53789f1ef20fc16f553738c7ceb50e6def70 SHA512 cd21bef02523742aabe38ffeda9afb790f37ba9f64e4b88520b2f7edc47bbad4de6789701bca5f709925352e372d6fcd8ca95680c4b7b2c179d3acea064c4e7b
+EBUILD breeze-icons-5.54.0.ebuild 619 BLAKE2B 92865dca53d1fe69f05eca79554893ed685b9e20364934e1a44e9eeae2f6f7c866aae1b86ca21d5a113ee6b52f9b06f871960bb9b436db7591ab649767d14fca SHA512 df59a80180e1edbff35e57277cc61e090673582e796096fe51886f348490f19620a1ea937da38c560f2712ab52d04101ef4103444c8fba2ffc43300bbad8445f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.54.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.54.0.ebuild
new file mode 100644
index 000000000000..2fcb7175ca6c
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.54.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~ppc64 ~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
+}
+
+src_test() {
+	# bug: 655586
+	local myctestargs=(
+		-j1
+		-E "(scalable)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 2994d4058ba1..cc15f05aa933 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,6 +2,8 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch 1587 BLAKE2B 48095429a52441e33145ee32c49827de7d9dac339ed520c1d1548a41567452a5a0df1412568f7066196f30e8b62ff49142df277555f5713a29e02b17b2d6fe7d SHA512 aa83832d6cecab6bf5583193b59145139a57e568239d39718018555fe1c36c4d110e825dbaa5fbbf148fd5867a954be71d14e20d5d3a4477ee31017d914c52b0
 DIST extra-cmake-modules-5.52.0.tar.xz 324412 BLAKE2B 36099a820b79e010a3f1616f852e0364e1e72a5553786d35a9a9f5d9452574ab3166179856d76a89d1b801b5e99452c19a6419561f1c9e3e873cb6f5fbf8d3d6 SHA512 f3147f493c24bea3c53a6537ba78ac81e0b8d31162c5d6e12305d318e5f13cdda70ea79d7e9db2a1d834609c7e1a0134e76bcae9f6c9109beaee2c051afbe269
 DIST extra-cmake-modules-5.53.0.tar.xz 324504 BLAKE2B 0337e20330cfd68c3c3d37f285cceaf17b52effa16c9c24568bb05c53b83b5e983f3a7967ea69bd5b852c9854dea14576d244c61233a4a6335019c5079a393d6 SHA512 f760c6040585730dee261cc09b47f7df12cb3e6be6d859f4a5b065641fdf9329bd831e47a9d51d9978d7379501e045614d40b9c55b0f4082222a2e662a0952ea
-EBUILD extra-cmake-modules-5.52.0-r1.ebuild 1436 BLAKE2B e00c1953635a9186071099b757458f8356af632a99fb1ee3a7402a51f9b6a51c27894747bce371202437b0d830ad6e767a71acf3df9eb7951c7d11db7e052f63 SHA512 31df94ee812cd1310e1c07739b9760430a1fcecc1cd414a7d72c65151ab9063ba3130d796a2ebacabba35f0374dd7772f5f0339614fbe321c4291a785fca85a8
-EBUILD extra-cmake-modules-5.53.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
+DIST extra-cmake-modules-5.54.0.tar.xz 324996 BLAKE2B 37ba7eb0b651da5bf18de292a59c9783b7d85801701223580144d366da3621da66ad2c6b8a55479d67e27249784be9994c0cdacdee540e601b34b5ed5d5af863 SHA512 2c592ab659dc2c1167111d394b976f7d008b9c3e8e18aea06001f4852f93d6a0e61c2ea5f6add2680e11f76da9f5f8c437afd350c5d3224cf1e9adba2dd765e1
+EBUILD extra-cmake-modules-5.52.0-r1.ebuild 1459 BLAKE2B 3a17f4acd3f5fd831bb8ee71ee34a2831ff7874bcc96cf43dd72f2b341282944782e1b1f7d8ac8556242b137f49b5284855b99ac37b35a02da5056d3083aa51f SHA512 4514c6acbb496a3bc2b8cde81f76b77c3643cc899340c61a388989faab343ea851c88eddfaf0d1485a7867925a03f2013d2af9969155792d8ff30d387da67bd5
+EBUILD extra-cmake-modules-5.53.0.ebuild 1413 BLAKE2B 30ecbde32b154e6ca17c64b491b372e82f99722ab4ab22e05ed6315139c654d1e17a460c99af3e841269bbfa3f273f7259e7fff3a478051ab11d0f8f17dd16c1 SHA512 429d749868d955b88e69045f3fec48182c5c63c873a43e166b6305ced3c19b0af0d960abe79a99d557d4d62b229357a398ecfecfac3747509f25a5f1baecc72b
+EBUILD extra-cmake-modules-5.54.0.ebuild 1413 BLAKE2B 30ecbde32b154e6ca17c64b491b372e82f99722ab4ab22e05ed6315139c654d1e17a460c99af3e841269bbfa3f273f7259e7fff3a478051ab11d0f8f17dd16c1 SHA512 429d749868d955b88e69045f3fec48182c5c63c873a43e166b6305ced3c19b0af0d960abe79a99d557d4d62b229357a398ecfecfac3747509f25a5f1baecc72b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
index 9f3d2cfead04..50ce271fe961 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
 	)
 	test? (
 		$(add_qt_dep qtcore)
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
index 4f32e710baca..1d15c03c25dd 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ DEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
 	)
 	test? (
 		$(add_qt_dep qtcore)
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild
new file mode 100644
index 000000000000..1d15c03c25dd
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+ECM_KDEINSTALLDIRS="false"
+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 ~amd64-fbsd"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		$(add_qt_dep qthelp)
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.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_QTHELP_DOCS=$(usex doc)
+		-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 )
+
+	kde5_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 c37c7f5e0f54..6c05e38e16f3 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,7 @@
 DIST frameworkintegration-5.52.0.tar.xz 1753012 BLAKE2B a2f050d0243e2ac81bed9637fa58e10e1995db7f582a22e7c1d32f5339f26d4e85a12dde933867178e53b43a965d0702d4c8dc11ab18f8e15c541da381013461 SHA512 cc367f33c56d9fab467d3d5ba8119bb9ce36fdaa3133d4c3ef731dd1b9457497b459d48210cc78ee185e01097c7147829b9c3629c6d611dcc4b419f58e5f6194
 DIST frameworkintegration-5.53.0.tar.xz 1753056 BLAKE2B a34bbded6d35f5bf4347704ca6344060db380e91781425f3daaf589c996d38d613606da4e69e81f1c11d81de1a113d643230c3ffaa892eb29ac897eac0fc7eb8 SHA512 054b851797a09d240abcc6c20f9beec33b331270e50e2760bdff9ec10b52657b76004985ec94b694459ebd729f94d67a2248dfd830c14383b9fa114583ad9d0f
+DIST frameworkintegration-5.54.0.tar.xz 1753080 BLAKE2B 267d6a7692d8d63ca19bf819955cb194c103eb996c0d144e4fa06f2bb5ca9c3a7b80084f4eb23ba94c69fc0004f5c7e5d7c6738b4108b7886903077e1312731f SHA512 9bb0c8a10b342976c21f8840e04f4b9ac60931c804fc0debbddf24b710e97804a2b8d357019840534c4fb4b4b816565a49682b0b09b4fb4d82d7d3467af1bb1f
 EBUILD frameworkintegration-5.52.0.ebuild 1137 BLAKE2B b5fff549ccf12d8cf0abd5853f760e94a857fde04589e25b837942534171cc1bb7e4a3eb5f0d62d12f841ba8dcebd41d57cdf6db890d27c565b3b07c7ba78c09 SHA512 a989bd795d27a8d6eaf173c49def817a89496aabcae8df464fb65e32a90c9529df0b774f9e8382097183b92b63cc5f665d82cc04245bbf7f7df05ff9ce3912fd
 EBUILD frameworkintegration-5.53.0.ebuild 1139 BLAKE2B c4e7644fd5eb26a00f14322d3b079acd9ce44928acb1783d5e1aa2d48d245ac310638f091384e4079e2270a48fe2a8d32aabe2af27ddd7450640857c0fb0ac6a SHA512 ee76276cb64993b9438594747446833139c6a74417f2f25051949a1a214bfe67d1fd0be3ac3deb41eb5e7a90699c5ea66fe97e6c8f005c42a3de748434027d21
+EBUILD frameworkintegration-5.54.0.ebuild 1139 BLAKE2B 540980dc63e49b06eb9a3e4ababdf74357152546b61a5ca468a371c242500e3bcfe69328de592b5ac39def67bb784c35a84036af5b7e2c924e517353813e9f03 SHA512 f74853d55e87a04f4e6817d6955bd977bb79fe286d4a893bbc07a951c97572307055fa44f246cc18fd558ebef43ec2ace4fbb434c4c30b14e0f15ad30c48e5df
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.54.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.54.0.ebuild
new file mode 100644
index 000000000000..1193df01fb71
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.54.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	appstream? (
+		app-admin/packagekit-qt
+		dev-libs/appstream[qt5]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_prepare() {
+	punt_bogus_dep Qt5 DBus
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package appstream packagekitqt5)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 07620ba285db..7424c598144b 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,7 @@
 DIST kactivities-stats-5.52.0.tar.xz 61168 BLAKE2B a66a11882e922f1cbcf41aa23ed3bc6c2d38fc596f1e6053bda41038dce8249eec31adc826aba2c83404bd3241d81e0d7a1ea0d19b1e5e0e193c737cab16b654 SHA512 2f63dda4d80edf39643b8406fbbd76e220fe1db6a6acc061d43dfb19d1886b0dfd962d685daa331794f42b3b8d7ae4fcaf6e463e39f58258ef20aae8c41d3bb2
 DIST kactivities-stats-5.53.0.tar.xz 61136 BLAKE2B 6d32ed59b1cbd06c3c74762cf25b7989b44a655bd11706d4757ad2145d01e6e38f95369e411b183a88c5c7c110effa2321ae7a125fdb1ac10b8dd0d1fef5a01f SHA512 a8857e30a4602e328b7f793dbcefaf6fc2d9c0f85bb7a1b4b852f354678980f5d840f3e7e2939083341b7db4517f9a03e2da711aaaf02b66b150576ae207d56a
+DIST kactivities-stats-5.54.0.tar.xz 61152 BLAKE2B a90bfbb1a6f2ac192023168ccdded8aacd4a4052491c0f0bc46e266f396b76f91cf187d3d2bf8fd7038f980ee96752212c132cdf738e784d42fcb57e9b4e99e6 SHA512 142a8e92bef7069eae70187e1c04a29f65ab4bc12b7e146d21e8da3c4818941af59844e702e9682d8bcd64d6e76b30f012db2cdd1476962b59e0b27c1114c311
 EBUILD kactivities-stats-5.52.0.ebuild 438 BLAKE2B 74f80777f7d9a26e2f258915a7c5c9ff1f552664c955904817f724f312764d506d2bc3e1a92188dd1b8cf58e7be2834f520310485232aa8af9746acc4f29e103 SHA512 3793094877e7642311a69f82f688c6ffdb28a16036012d782a2592ddd70fb2260dfe091bf1eb34adc11770861d056ac6b85f588c5e9026abdf720cfb216c3eed
 EBUILD kactivities-stats-5.53.0.ebuild 440 BLAKE2B bb8feaa5a19cdbd07819b0383e188798a58c8678cf9470478e74e297b83dcf60cb4a6bd2e8d0d9c9bd9caa073fcbced0042aa479f1eaec727c2d3dc3deb78244 SHA512 2ce45e02d5efec66847e0d1d41db0261048a8f38e93ef5ef21f3fbfe0b04f99ec2d13a8e410734bfd9d7e40cd0c2dd0f31542316e914dd9180bfa76a5721f19b
+EBUILD kactivities-stats-5.54.0.ebuild 440 BLAKE2B 34f31ac6a3082115aee1527d154c1deb4bb39399566c85c05cde8eab4977183a9b168402106ca9b0a53b8802d35791cd5cf53f285777dc5e7dd2ed1b95a874e9 SHA512 c2a0668c5cd95a4b2ee3e7e00572051029c4060ab275bde6a2b7723fc18ba4af05c371afc8aff4b67c42d251a0eb616bdaefcf79ed394eea87d49cd178daeb1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.54.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.54.0.ebuild
new file mode 100644
index 000000000000..c728c9f650be
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.54.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for getting the usage statistics collected by the activities service"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtsql)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 8eba94df72c8..8caafe5e0414 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,7 @@
 DIST kactivities-5.52.0.tar.xz 61428 BLAKE2B 5924b96acafc65977949bb396be4f5f53acd63253484531c81879ad308919aafa292f35d1fa4c8676eff30aed92802de2822cfa0d5ecffc42e37c3f66e4661c9 SHA512 73629cb3504d4c75b66dbe2345f5ef1b436a7f8bd1962eb87ef7c1c4838cf1d6fa7bc52d00b381823a5581c9d6072535aa7deb8f710f52fc322e55b2d7f366f0
 DIST kactivities-5.53.0.tar.xz 61432 BLAKE2B 206facfc0823c0acc06dc9fb7ef11a765f4fdf2700638887261ca586e9cc68754c6a40687c2a49e6300941f2968c71780da9cf8f8d9b1b2175d43e4fb180b28e SHA512 2d2945a06d7edd5fca13e8e724644d1abefafbddd1eb0fa84e2d3ca20e901bcbe3d71a908be273ffb09b697f5587a3b98d10fabf9c2a1e1d4275c2a442d6ef09
+DIST kactivities-5.54.0.tar.xz 61416 BLAKE2B cd8de61dcf8df25ef50de39695620f74779309839c43bc69728d939eba3cd84e77c919f18a0ab04f48babea8b55a583b9ef06fa5066ac020994389e34c1aa410 SHA512 d397c087f740e044a14f02bca47da2c267b4c9d9ab8231e240addf41eec6d716fc6d2a85bc3760636a69be55a058ba8d380c4555aa16ba43fff7fd2dfcb20a64
 EBUILD kactivities-5.52.0.ebuild 558 BLAKE2B a5cfd124d5aab88d5090fd6e24cb43810b778cbcb328c5a2154f4b339387cd277ef83fbda772bff7f956ffd0f8808a34e3d96315de7c4cb3994c71bb4af93d0e SHA512 08820334d70b9fba344438c8528dd70310e5b23b4c83550e0793dfb035fbf904c17a9111af601727d20f478be589450ca5edeb4941b82a1d54e2bc67ff870ca6
 EBUILD kactivities-5.53.0.ebuild 560 BLAKE2B 9ea4d5227a7e9562c265e242a310c2721cd3f39fa00d5eaae6a19c9c512a6d5827970aee707faa06f76f84cd698babebb43d89476a54d8e70e51782ec2a0def2 SHA512 44a337272c458f8f1bcfd73a5c0cdf9a9d52e4df4d3b0dae2867d386ffa63f67ff2b1e86cae792a8a5ecb48738555aa76bd1e9d39fa79da473f677a90a3159fb
+EBUILD kactivities-5.54.0.ebuild 560 BLAKE2B 528c228158c10a9970d30a5b26ae96ec0c1b3b97918031047eda5615f49bca4a74b9be05138d05073f2f5030c9c79e0f303cf5c9d159efdbadc97b54d87839c0 SHA512 4bd58aaf7b7ee83579505e9804ffd7a5c78cb0ffd69c1e615f9d9614da2fe18e8b6e8bdbda313415edd674d6cae9060d711558622a45fcadaadf9e5c0892eee8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.54.0.ebuild b/kde-frameworks/kactivities/kactivities-5.54.0.ebuild
new file mode 100644
index 000000000000..846bf6ccc8b7
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative widgets)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kactivitymanagerd)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.54
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 978fe7143ddf..85a9994d840b 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,7 @@
 DIST kapidox-5.52.0.tar.xz 396708 BLAKE2B 20bd13f000c3ad689567aeed2994e21ae792f457b64200703533134c698d6c7e2c21fa554c83ab2920efe4da1ad9fceb3991b7ebac28d22e5968d3f7d0fe0406 SHA512 997e586f7844f4411449e3f983f8aa41d7c8b8e63957a961f99777a6095ab0800851d235a1ec02f4437ee9c561d4420ecefe4c87e8f125cf1047d77e2a29bb77
 DIST kapidox-5.53.0.tar.xz 396652 BLAKE2B 42a24066a6d761afe3cd0a27c2494e5462466c9ed09e3e8c242291882285090b5ce633b35c214ca9f16c0f2c960aa77b3fa9943a87d3ec5ec1af50f78fff121b SHA512 47956f49b72d3851e8fa9cd84ed92bc547b2cc14250b2b2301c929a3ea8871255ff9ecbc5b5180ab8c092324628cea4d488f411d6612b1bea65cbc14ed237ec6
+DIST kapidox-5.54.0.tar.xz 396720 BLAKE2B 71e1a57bd22c75e558b5396b378575a308a5609381077d4f7a1139f436c08aedcb1a4a634cd2f1ef2dcc9588533a2b056db28b0435ec4682d0422a474e33a573 SHA512 f0a02ec42ab8091391dcad42693fe4daad0454ef025c7a81102791b11913fce8e331113da519dbba4c8aa9798dd7d5424055a3358329977d125f89096034e6b8
 EBUILD kapidox-5.52.0.ebuild 609 BLAKE2B 1d26ca8d2bdf15ee2ae35713a5777427248c7f7e09e5f01e133df058a11deafb0c17fe7a4b6d0b1c0a3c77e62c381dca394a127f0c5ae441dbf14aafe00cd7df SHA512 057dd9a54a823501346d4052f81083bbb0698c9e3d09d56ef3fff5a6027df521504d8a56decea93f28cb7463c70e1b1bac1d9a5009426c8b76e1e499d5fec7c0
 EBUILD kapidox-5.53.0.ebuild 611 BLAKE2B 425e77fdd9c16fd97ea5456884063cb1a11b247d3549718f7e7d943bc3d492c5f7f813500d160f55a81bfb2a0a9d1079a7eb2ad4086ae3431ea35923882de4cd SHA512 0d7acc884049ca991a82ece6085e345981495a6f768e940d71d795031f5a2a2328e6acf9deab6e82e309a1c9577367376401d53216385e1f3be80e11b42296a8
+EBUILD kapidox-5.54.0.ebuild 611 BLAKE2B 5b4bf7461637f0ea01c28b55b35b64a0a2e8968df7320dadc3aa58d52cf409acc4d886b0eb322cb303634e65562d1c859ecc831bc8af2b630d49ba1c88365872 SHA512 f797ead6f45647d247f0bfa9d9f9f167a113d099da4b6b17e08fe2e0ee91737b5a7736b5fdd8006eaae7cfb61533353fa285d8c3327fb9ca559b099da775aa3a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.54.0.ebuild b/kde-frameworks/kapidox/kapidox-5.54.0.ebuild
new file mode 100644
index 000000000000..eaef844bbbe9
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.54.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index b832905ad959..e65e84f4ff18 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,7 @@
 DIST karchive-5.52.0.tar.xz 439932 BLAKE2B 484d98c5306ab3f52fe6d5984b5db87457299673f8b0607abad15433c15f1adca1c6dad0324cf62d2735b4942683b6385d6614e5825e42668ee2b999ed94872a SHA512 bc546352b52c23221bad2f18479ad4bd29dd593043a5664046953b222b3e81bbe8f32b386c385a7b2054b8c0abe9e1135142e26b02fea1f997c61f555b5e19a3
 DIST karchive-5.53.0.tar.xz 439952 BLAKE2B ca81dbf4976df9bda3cc82b4845997e440e317d9fcf1dfa4c71aeffca381d0059e0432890d708cff9ea47f89b2053a9c912b2de7009c76ad8b542c4ae828e518 SHA512 a7eaa5fd9a527da698b2fefa64b6ba7092eb3614b679236b741af1df3ce1180f2538b986d61b94811b76648f35b26a825b863146882745977754ec85a3d76e09
+DIST karchive-5.54.0.tar.xz 439964 BLAKE2B 6cee5227c979948c65f3d7e5e1d619deafb3b1494bc1dc83b24b651cad49930c535539a9b870eb9f19aec96331236d1a56d69fc8b3a20fcd108c522c9139f315 SHA512 89172761f5d54967ed72ccf73c3bfff79600f803a31bdb4e1684516e506f57f3b28778b598cfbd6b594b4cbe3af92984c7150ea6837d9a612bcd28db4dbc8657
 EBUILD karchive-5.52.0.ebuild 566 BLAKE2B 6661fe38c5a89c2e216276a0973713fa5cd20c769599c49007967e87b57833786ecfcd54ad0f8ce19307a0c8bbd740c9b6a9f411690217b7587d7c8d06c550b8 SHA512 2036429116579dd827f428d4580e9e4c90caefd2f7a29df7b48e6d29d95a834131372c7dd0482d51796235352a1c94f106ea9970382901d52eae1dd9801b0b95
 EBUILD karchive-5.53.0.ebuild 568 BLAKE2B d36fea7614538e9e92acee2a82193b4edbf10fd6d55b11d54daa886d44ce655cc41b110f4db346e98487bec2d387225b0243de5c15c691a17e3b98061bc4be3c SHA512 93e28684fd7f970dab03c5003c93f99a22caaecb2e8ebffc958b412bd339076f46eb5d98e1d2692316f643f322e7eff19756ae2ca9b08521bda4f336a2a6308d
+EBUILD karchive-5.54.0.ebuild 568 BLAKE2B f9313eb137f3fc6f0ce6d8806e1c7869097b2ec32f21b00445dea1c47e188ffbcb10bac296178a972e21ab2541deb1c82bccce9dd7ca94486572aedd08ddc0b0 SHA512 493b1445aee3036a2e341a15b08efb435b7f86ef6a87cacadedc880da15d77f38ae34883f56d1f7cb05321c511c4a3cd119845cb1f82de57dccc9b9b579ab533
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.54.0.ebuild b/kde-frameworks/karchive/karchive-5.54.0.ebuild
new file mode 100644
index 000000000000..f51446b0b3de
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.54.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 9e6c8746f1cf..155e8c21a181 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,7 @@
 DIST kauth-5.52.0.tar.xz 84716 BLAKE2B 142725f21bb2bbbd985a22f580088dfc8fc399db96295d3b24a65dcb2bac89d9ff0dadef87bcea798f85e858df0f013cc4e849295a537ac2fac7cede92b0f30b SHA512 62b9da8e867f4256b9210ef210cc5d7230064c8c7096f0765061f2e3010cce64abd6d7324daf5a48e952b8bfe38fb5efecd7448e0ec16968dbf27c913dcc8b14
 DIST kauth-5.53.0.tar.xz 84728 BLAKE2B 41d654d2cb4cfd3daca4271d875e430b6a1160a4a8778aae59a16552b92892265d1c18101bccf0f55b7b46d93e87226482963b0233e90783f2f7586af9b79ab4 SHA512 f4b99b0282ff3caafeaf304739ce5c52268c01245e6ea7582a32a85b4afa0addac141a58c9fa66304165dc91269950474ea79623ae934ca673dcec34d3da0629
+DIST kauth-5.54.0.tar.xz 84688 BLAKE2B beba564ccc64af52b772ce827b756fad493e3e4926e6bb8b7b65154bf6b7a1753a211e98dd12c67bba844412610ff08f39b9e34a0aadc6c2fc87f4a25e4090bc SHA512 f75c6f019d708409817a5b64d88033326a7d627cdee00e61280043d5cd8f65731f08d48405f50c7240f18670b25abfeea4b2af5966ebb2ee7e0f56669b5551c2
 EBUILD kauth-5.52.0.ebuild 825 BLAKE2B 6d89078d27be4e2780927b4cf9eaa8cd42d1d2ce49d8861bbe7c41b78d852f4e576becc1887115a6138ba19952887260ea65b0a9c7380ac889dd2acda97d8413 SHA512 b79857de24cdc0f1ecaf5d4fe392b6529fea02e4af1717922c1785567961ca6fbd712c6bdd9febe491f71d329793e257e9ebac9ffae666fac65b2318cb9fe276
 EBUILD kauth-5.53.0.ebuild 827 BLAKE2B 82076b8265361a71c06de84b9e8af0360846b67284efc2aa2f548acb7d6487e58ab9f37ed6490527cafdc2e305bd9af10650d278ba64126953e4ef4ce152f63a SHA512 73ce8063d75e563c79e2c7754394a78b65288ab10e9401640153c315910f18ea51ebeffc568573a7349b3390d55fba14afc7a970febe676288f161fbedb46c50
+EBUILD kauth-5.54.0.ebuild 827 BLAKE2B 2d88f7b76f863a38c80498d188aff6e49b2836b0090b1ade1682a5582ac30611797d8754adcdba994216b2324f510737b64327a959d1927e938e37ac747daa0d SHA512 df48d2425ae32640f362e49405e44625dda2dff9bf0ce565a2cd5d521d23c815ec0076a4035ea0346468658c581acab2d7a9e3aa671cbe4c0fbaf1a694bc64e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.54.0.ebuild b/kde-frameworks/kauth/kauth-5.54.0.ebuild
new file mode 100644
index 000000000000..d2b08d9b8d01
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.54.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	policykit? ( sys-auth/polkit-qt[qt5(+)] )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package policykit PolkitQt5-1)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# KAuthHelperTest test fails, bug 654842
+	local myctestargs=(
+		-E "(KAuthHelperTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 1e9412bb6f0a..05f6e2fa74ce 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,7 @@
 DIST kbookmarks-5.52.0.tar.xz 118304 BLAKE2B 72a11d7469f93f25b53af8c3e64dbb0e4e573081c1c93242eb74bbce444fa477726236270b733df6a20d5aabe78727b3f6730f5a29510dff670bed1282648574 SHA512 210b36b33f1fdaa61e66f58ff1b45b03216f6b62317c63e5b7ed990d9ec484adf068519de83ca28f162e188d10b7c818791dc8a7c6b692a5a780170aefecc282
 DIST kbookmarks-5.53.0.tar.xz 118420 BLAKE2B fc95a7b2436734cc714a4f3faa08d24dd2a454dfc3fe7e9670bddfcdd379107f40c6c77de94a28d15e598f4c3206e7a24fb9b330b35bf2bcc5ce82375fd5033b SHA512 6b0646ddba9c5b1e4d2a0e3e220100fb739d038523f5b6103a94f614aa2fd37544c9fe25cca376645e04819d0cc63a444e412e850a7024c221acf1a56a202c80
+DIST kbookmarks-5.54.0.tar.xz 118432 BLAKE2B da9dd9354faf451415424e02c0de76e5d0c31bb25e8b555ca25792617481ee13ed4dd4a2cc20283da9f677205c462a67bffd00982cd67b69c48ecbfd30eaed74 SHA512 f7c18ee6a0135ac93bbd4034b2c11b6142404a9b5c5872374ee2dc2d5f0cf70288793df4da4be980c0e1bf757ccbfc6ca8a83c490691e80308ec7133eb49c3ba
 EBUILD kbookmarks-5.52.0.ebuild 684 BLAKE2B 115eda6af51d29f16237678a9699076ab474be9b68e00a89e97724db3bc5b09847a0e99cefb547025bf6fb96c720269530f8fea13e087bf9d920ccabc30f0e7b SHA512 ba1fa3172567c028da244d5604bc805ad2dde71d0d3f176b3a1cb7dde97f04504370525aa17327719764196034027c17ce5ed0092cb4fd50758e3d7581caacf2
 EBUILD kbookmarks-5.53.0.ebuild 686 BLAKE2B b73b5ada06ebf38a561654cf00f61dda0a33476d70816c26afa60eb904022a11330ac4f2271e5d1be65fd28ed1c12accc6294de47d8ec452d699dd9d2270f54b SHA512 8d9e0e1aa4da7f9b1a59a760f5a8c13d23a658ab7c7ce8986379c1f35ec451d7047b6ad1bb71fb6ade15d0333d24fd0fa7d0bb7737861e2ddd9abc41ed6d135d
+EBUILD kbookmarks-5.54.0.ebuild 686 BLAKE2B 2b550003ec334ea4d429c66fda64aa07c655e6472d1de05864a2fd7ab51e4b26332ee3d0bd34936f13a35170cec94b0c933d191122d0a6c866869c7a034496d2 SHA512 0e7d581fbe8a7e86ec3a9997d2c48f26f5de2c5c1cddfc7bd14e3c3629ee571d9f23145459c4f4efe6869be8489849d68f0de819459cea479e20e95b32fe94ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.54.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.54.0.ebuild
new file mode 100644
index 000000000000..f02e88f9b96f
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.54.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kconfigwidgets)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 100214e670e3..2ff12b179f06 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,7 @@
 DIST kcmutils-5.52.0.tar.xz 236772 BLAKE2B 3fb682bb6eb270c7ea435fa2491a7ee2fa58032853793a1771959a482a0afa0d59ddf3d93bc25b01819e954f4e77b6b18b8d184066b3c9eb53e556b334e225f8 SHA512 94201af642820b8bf236544db07aa8fcf63b28d05d684034a5753abad989c0c108d805c204f5fcdabb6c75145cd213c9b517f4cf66755477ff5ddfc6c8047861
 DIST kcmutils-5.53.0.tar.xz 236756 BLAKE2B 44c1c99c59e023ac3a1a86a96a17a784d7995c95c82ee7291610c5fd0e006925c08fc4b6810a66c713d40eb453731c6c14c4416405daf7ae0c8a4442fdcba06a SHA512 f7fbd2b994835ff4b0e19bf4bcadb4c226369c8132413b79164a54b2aac8bfaa8905b5ae02276b713b0a3fa62babda383933a89b4ec642001118ea3cf17aeb09
+DIST kcmutils-5.54.0.tar.xz 236896 BLAKE2B f00c99a6f61e3098c9e34da73b02a4a17fe638c35f20e0cdf43d4bcb2bcfc136a77327714f4157267fb6315e947a0824f059dca111e1f518718502479b6ca73b SHA512 dbb8e24a86378ab283cb934fc27caa4dc3a91e3f90d70a12d64bb08dc669427e64469720507265c2cc2276133bbfe4f57c48c7a7498b5f020d503d0fcba9c3ea
 EBUILD kcmutils-5.52.0.ebuild 781 BLAKE2B 90d9353190df0de462a798500810e3c5ea7b8d50ea6062b100db71222f73aee768bc4e449b22a089ccbfbe9d8b9944835485145fdcc1c9229a265066ae7f22f6 SHA512 e04535c3f741774ce273ccfa0a52e91f55cdb3506ee014365db6889cec8c0a862a0178333092d069968a7feae63a43b95e6337f30618694ee6300f43b2fea84c
 EBUILD kcmutils-5.53.0.ebuild 783 BLAKE2B 3973b3d0e8c210ad2c1d22c293c6c0a3b399efe45e4ca298373afd89dae97079fd52cfc94b87e3d9320a45b1e47a4445a9720d113fa2ff686ab60ac4b855e4f5 SHA512 5af10d2f91b5c23961cd70ca3359eb13c9e3d21ebfb7082610a885457dc587a385f8bfe74e816447a64a694edfbbcbb9031afb69afbcaf4fec3135dd25100e41
+EBUILD kcmutils-5.54.0.ebuild 783 BLAKE2B 48ae3ba151380d56989376979db605dea76c6ebc1e39a99ab606b63be717a267ba270cdfcd8ce509b0bd04c72fd5779f56ff13ae7466017598f86dc6f37b9e2b SHA512 9fb3abf7bc6fc24fcf180fba0649ec5c3ebe814071c9b29c57e4a2f507657ebc160173c20d81a4066fb415ad89607201d28afdf9f21871a65b53dc577424e021
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.54.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.54.0.ebuild
new file mode 100644
index 000000000000..74a17ce74b79
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.54.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 0231991ec89f..81a53d6ca04f 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,7 @@
 DIST kcodecs-5.52.0.tar.xz 219988 BLAKE2B 3a984547b3a010f51b87a86a4bb95c999cd44e65630f9838438f6376f14a7948ba6d7b965cff4effc8e68577dd56b34048db2ab299e72b375d31000e96560052 SHA512 8ebba1d317cbed57406f69519bb75d9641120bedec44cde7ea61a20e0b137fbc698119b03ce785aba24510e77f4f60b808dd19277548fad313fe87b1208eba62
 DIST kcodecs-5.53.0.tar.xz 219976 BLAKE2B f6cf09d459b1c0e2922198c339d1dc88555095eec13b754cdd1ad34b7cb9adf03517d30764b9d041de3ed6998a0fff24231dfed4334883882c422e89708488c8 SHA512 5e5d146fcf577a7ec7797caa8770447fa45e4bc8359d1b2a1bae02c15dc133fe1890422d5ef86e5228a0c8647ab0cf404ce7b78b13a1ad640dddf258f1eea1f6
+DIST kcodecs-5.54.0.tar.xz 220128 BLAKE2B 6795b0d032e100b76afc77e80c6856d4e40f314803acf68389ea9688e5c21a4b51576738c5c6405bfd872c1f90677b9521349914823c049ae05c0dad1441e376 SHA512 75e8d3800c0906a437d8d0d957c91d00b423ecb513f1f62d08dcffb1ddf70c65b78f430fc8519334a75f77b15fcb9869d7761ac87fa5936b7a8af88ecaac60ae
 EBUILD kcodecs-5.52.0.ebuild 336 BLAKE2B e4159228320a10b370c300f4ff11aa25b562f45150b0ed70ecbd87243463522eb4d46e06f3a98534c4982d634ba95453086de2b5132f72ca0c8f795a1238936d SHA512 dbdfc1cf35efc544faa19f11c88140f4df1efeaea27c2979302a7c63187f9f84a6a5ba21e5505b607d5a632593ffa39c37cb8b3e15f776ad310aa9275169854a
 EBUILD kcodecs-5.53.0.ebuild 338 BLAKE2B 81dcea1f963613bb796312f15b00e4861c855763f18ef665b5131a7bc5f5a482fa32e8a0ca3a1daef26c3ad8b27721ada4d7ae84ae42763aec000a325e0ff9bf SHA512 62c2330326b972f81d9e3aaa58a63e2a4506f5a3e9e9f9f94f0d3776a83dea5a764e272ee40741f3cc58b5738a9202235cc219931dcd84f311f4b714489ceb9e
+EBUILD kcodecs-5.54.0.ebuild 338 BLAKE2B 012729a135cd0670541e5fca44a092bd5ce993cf8d5eb2e888e81a326d486b2511a07fc33d70e1b7a5f024c7d2956946efcdadff31bc576656ba241b7caa57b2 SHA512 2281c83bf29a2b5e3bff41521e88f0b6f239b28844524050d605069b60f1f08f55cf4476591fc0c060bdef425af6a1af605740fc40c210fbe4e71d12c7ec3c20
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.54.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.54.0.ebuild
new file mode 100644
index 000000000000..c19ae893d260
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.54.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-util/gperf
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 611433c91059..d6da4d5b6be2 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,7 @@
 DIST kcompletion-5.52.0.tar.xz 115364 BLAKE2B c280d3809808cac0d4ddcdcec24c166e12f3f5cfa7aeb7d1982625272ad50ae341f53d5a5d980563cb6ba90576db5bf704bc1de9c0251d8dc635bff55d51da6b SHA512 21de65fa4a72d32d12e948a432006e4846ce7b7ea7760793dd3047465186dde64b51154472fd1507f2908006750566f5fbb609f578e658bf038f90502e96e957
 DIST kcompletion-5.53.0.tar.xz 115448 BLAKE2B 8fa47bc2abd1b41ee545807f60b490db6609f0791c10989c275a4110eb8d7ce6a6c1ce490ad8909ebcfd461e349163b2bae01b2b82a61e4a8048b20928b1bd7f SHA512 10ab7ea8e6f8d301b415920fa1b927f15fa11292e6ac0063c416545bfcbbc8cf0d3d6393b3fc6a6326ae318b8774cadd414e395eb4b2b988ab55c7676e6cbb80
+DIST kcompletion-5.54.0.tar.xz 115440 BLAKE2B 4a20441758d17b8f03bbf96d0772e629af4b421669e1784b1e952ce6ffc2f3441dc20fcbe536bcc8af2f5c039d40c8f47074bb75c0f23bfcb6081eb5e85715d4 SHA512 af813411090d25f85d1b409bd971d9f610cc7c1ce01463f70cf57791af9dafe88957d74be0b63c4ca8f7d2a790c48d34613a03bed03552cae30346576849f654
 EBUILD kcompletion-5.52.0.ebuild 471 BLAKE2B 6abb291d10b93d9613bce21341b98a9c9e92af823657c0c56c9873b96db29dd7b4d7069c5b3b9a9da89e6faded4dbb4791fa12205da5b098eb9c45da5b53f8a3 SHA512 664da2d761fbef653240244419ab2de1e32ca89373d9e38fb61e6f422b81032448621e05912f499eb05f17135ac548497085d0564bba005105f454278645e75c
 EBUILD kcompletion-5.53.0.ebuild 473 BLAKE2B 1a74c4df32a78be26aba04e038a039cb2a0511db87945d36b6dfcddb03773110ddc42c8f59c329b8387d3cbd9eef525946df016ebb9f920b1653150429995b8a SHA512 3414fe3380b7aca40d41fbbe1edb7fe1fa22cda6912d9ff80b00076a4d2645083f7f6244803bae64d3e772994945adb8586f7b0648e43675492d344779c9ce9e
+EBUILD kcompletion-5.54.0.ebuild 473 BLAKE2B a9cc627db7009903b7f5a0855e8fca4bf83d4dc097b1d5736b91c78eea572caeefdefdf3f5ea30efea46d0dbec39be657fc3bc89a0afefcd6b59fa805c0a3e5c SHA512 c3a583d3f49cbd3691c868b78f75d86a90bafcbe4d9cd6337fddb82130935be7b9ea7020c058143809f1bdf92cfe4f6ffd7ea4534861c064327f95d5612610b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcompletion/kcompletion-5.54.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.54.0.ebuild
new file mode 100644
index 000000000000..28bc1e950976
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.54.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 38dbbb811a71..1298a8d917c7 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,7 @@
 DIST kconfig-5.52.0.tar.xz 237900 BLAKE2B d166ded3ee4c47a2fd779bbdd18eda80a2698a77e5c272eb16a4e67e2a73b9980b6e3da4c5e94e704785692258469833bb6a73ccd284577192eb0e573851a965 SHA512 2ecf2e809270679cf7f3d57628e941fd3ee69c70104354582fb57f046c7a0dbf8ab1a23812e0d3636f8f2d846c3ccace81a73c04664464796017617b97ad3250
 DIST kconfig-5.53.0.tar.xz 238024 BLAKE2B 0aaa3ed412b4d1b5e6bb2afbb796cee241d4a79e20a0e89bbef2cebb3bc190733c8bd856546f576d0f8dd67d78934807e8c51595e1a636b5509f0d220e24dbef SHA512 345620f174cb51901be7a521a9bebd147c713b45067dceeb53039abacb1693a62d59a62e23159eef6c9355a283ce0d74c9ed3287ad906d8927fc243bbb5d9566
+DIST kconfig-5.54.0.tar.xz 238464 BLAKE2B 8a0f88c2dfaf04749f6e5486e6337a0be9ab9a9afcd3a041fe395be7b4b0569ec67e50e841f043ca662ee9eadfc943a23a8690c38a8e99c7bb897ac1b3dcaaf2 SHA512 2a35d635db47e3b1e4fa3919ec73190a8d0bb9e82c4a8487ae7b87ba73cb54659e97124c9761de4dc303d8697f8f17b3d27d30b43e47bb870a052be87c843de7
 EBUILD kconfig-5.52.0.ebuild 514 BLAKE2B 756b865ef6c6f09e1f56777bf89e190b434daa2a76c971062bec023f4d4d64a40126e701ecaf4d9f68051577ed8279a22ca1194b281d00181ee5529bde97fa1f SHA512 f7284257060c82f729e50fbc8a0c07df9fc79c966a932a4d78bf09b2351177abca0317c7e482d81ea139d58e1c2876e9ebcef4dcdd69984c68f752f8cab5192b
 EBUILD kconfig-5.53.0.ebuild 516 BLAKE2B ba66cd5d4228e931a9861250862616713acc23eac69504808924df573d7ecce29776c943dd1875c987283f43ab04eb553a782a4546488c705cd9002c1ac07ad5 SHA512 f95111e1205630d9d49bbf324f5728a6d8b91755bf2a239fe08a3842485587953c67d126255948c9e79d2ab4903a11b61ccd5cd3456bea92753e73835917f346
+EBUILD kconfig-5.54.0.ebuild 516 BLAKE2B 5395f756ca813e5930a81172bdc0008766d9cffc951606dbd1dfd874417b54e937364fb3d4a63ff48cb2e17a383d52b34ac9aefd8a485974e065fdb9dfe1767e SHA512 51af672935eedbdf6e8e33601171d1e7f278ae454b1942e05d540f7de7997e5a25985c08c5ac75a1cd484cd772dc9dfea3abfc5d1b9552c06bf15c7a7000279e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.54.0.ebuild b/kde-frameworks/kconfig/kconfig-5.54.0.ebuild
new file mode 100644
index 000000000000..7edcbd74b818
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# bug 560086
+RESTRICT+=" test"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index b817c2266420..221f2684b399 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST kconfigwidgets-5.52.0.tar.xz 373668 BLAKE2B adcf70e4b5898699d32715a871f6d67c08767edef2022e6ef545962566eeef4efc7408c8498e3564157de0a92f3b196916def2fa7cee8be22983462691e49cb8 SHA512 235e092d233b8d11355545411fabd4c29e94d1e8c724868bad600d7da1296b276ffd70361c960883f9c148480b7cf7cad5d6e24354007240f793464272f9dc24
 DIST kconfigwidgets-5.53.0.tar.xz 373704 BLAKE2B 067c74d8656e2eedd3a718b40f7d3345e2afcdaae2e079986b7778719eee9ec4d02be03b4ca1d5c0ea639e9c0798f7ec30999b089f84bd67d1962e4fcf91d721 SHA512 37c9fc84b8a63a53dd209517d1e06508a6bc44005624cda3c10fc43095f588bb27eed6d30f6f020ee410135d3f137736f76a22b97d2ad41ffa4be107171c1af2
+DIST kconfigwidgets-5.54.0.tar.xz 373608 BLAKE2B b8d5c0aa85b1f9741c6898bbb8b81c70698ff6672590190f8de2b067fa1e1a40cc43f557700eec345c35961a2a8f966cda66ef9bb79dbd101d18ae2678212443 SHA512 c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73
 EBUILD kconfigwidgets-5.52.0.ebuild 783 BLAKE2B 1f26c1a45fb9af0a2770ccfdd96ec7499f6db4fd4655c33310b7ae30a6f4740baee967294fa71912840b76aaac39da995d15444e789dabb18b2e2a1300a1911e SHA512 3438d3ec12cb64ce6ac77fa17c91944371e11b1cfb7bbc3f08d21ab8ff5e30360c90244b13d0208d2d0f2c9ce5ac53a37d47f74dbf6f64844aadf59ceb6e190b
 EBUILD kconfigwidgets-5.53.0.ebuild 785 BLAKE2B e7cf6775c171dea56236614120d0ef6c3e0065f2a43b330373c6ccfaae3aef682172f7d8bfb762fe301714eb86ba275c33114d50a480f10eff11ce84e78a2a2d SHA512 427f657baed6230ad3378459017b346fb6d7efccacc591c7745dd8be440501ba96dfe9455ddadfd9abff6861a620ee03fddd1db871f9cad52d81a1232a27a94f
+EBUILD kconfigwidgets-5.54.0.ebuild 785 BLAKE2B 83022f2f4ac2a02f6e7bb7ff12ee66ad6f8ea0ab16f20bd975a616700b41f5c2f22b73cc78b5b702121143a1dc6615c7bbdd35b0a2d2e0b4158fc00a89651e47 SHA512 4d19d36ecae59d4b84e1cd8b31e5c22c220a86074080e19f02c1b3ff0084a0385b56346ca0df46b059b72fba064fdbc234c99e6e591c085dd1ce7e406c29b31b
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.54.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.54.0.ebuild
new file mode 100644
index 000000000000..d8f07ec9498c
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.54.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 415ebbe821c1..9e79260b7637 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,6 +1,8 @@
 AUX kcoreaddons-5.52.0-xdg_cache_home-nospace-crash.patch 2167 BLAKE2B 0460d3d0ef902149b2f40be6f5a1270415eece9b188c5daeb33f8a6bf46e4df55298fb9b8731297fe2f02bc0129cc2a2fd55e8cc4aab537cf15041cde30ad182 SHA512 e6a1fdaaabecea193a55c9768d5efe4cf8562fee20a62e4fed01f1f8a549f3fb40057db6942d5a865acafc34c762524d62319ac2473a48e3e5e9fc0ebbfff34a
 DIST kcoreaddons-5.52.0.tar.xz 351716 BLAKE2B 041ead718713beaea9d87fcdbf124e1379eb3b7f9d6c82e43f60b74d23a87de7f55565b722e63db789eb5b11c0a7cf8b975ae42306297583979d8ab9c5257b49 SHA512 0f82e703e9071645cde95a89a5dd3b12da8a477be5d2e01a70c7f42a749d46d86ef44b4ccd4557bf3e23d1794607fa990eadcef6f4a431b775cbaa909e5b8442
 DIST kcoreaddons-5.53.1.tar.xz 352408 BLAKE2B 17c6402429bd50c9c2beace1cd7a60baa3af06ba01e06ec564319bf40ae31c3d5afd571f15f2cb5149b48f84fbae23fbd09b1f3e84f633101dcfae718a06c881 SHA512 76c5324a4a4fc8be0863eba176762a009df6ade9b736674035aecf98eb5ecb0357d6a218172cbc94da5c4014c6a6d85a3df20345f6c9783535ed6c0b642b8239
+DIST kcoreaddons-5.54.0.tar.xz 359608 BLAKE2B ceb4acda8bfb0d8dfbe31ae693bd069212267d18966be488632981b651d180aca2b4a581d2c73203584da922a698de14ab4a2632dcaf6d269618c0d53e044573 SHA512 8e4a2cd59a0ecdf09317e67aa20b96f37562035beb744d189856094bcb06944e175c78515374a8a090446e63c8174b2a949b744dff36f0e21c455a2cb5df5df9
 EBUILD kcoreaddons-5.52.0-r1.ebuild 813 BLAKE2B c3b431ecbc103ad7f2f82eac493f9d94809394532eb7b5e34100e1c994568bd629901d9b81b24985479ad2cf984bfc25ed2503209196914d58605ac943693000 SHA512 d7bb4ce4253e8d6e9c0206224661d7550d4b31f6a99e86fc82e56ce73b5a3f3953b445fe076c082437ed94933226a4290fe7c739f820875817e0f91b5ef51a7f
 EBUILD kcoreaddons-5.53.1.ebuild 748 BLAKE2B 0d4607796a2ac6177cce05f439bb8bbe7425f6adc52383e6d1f4572034f8463662ec2289db7f1220be054cf0079da2999eb9e3360df2a5816ae3f0809a252585 SHA512 ed023f1ec7d019bc3ec03820bc8d9966d41c86ba738f4e5652c45c426124abc13a2459d94c84677305ea29ff44bf45382de600b9e821cd78f9cadf661bc6c17e
+EBUILD kcoreaddons-5.54.0.ebuild 748 BLAKE2B a769e056354673caedaa2902678eaa1d67b9b70baba0651a7128d8f5c1124e2278b4a651afcc2dc209df352691cae0b275debba54da98e173c378028977d31d1 SHA512 375de64df818b4d13b8e1921499e31fa40354cdcef911548d68c13bd9b0974b48a2811f7ac899b7d97e9b2ab98b56462a0761cc3f73ecd6e1ffaccfc5b8086e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild
new file mode 100644
index 000000000000..0fc33e985d53
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.54.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+	$(add_qt_dep qtcore 'icu')
+	fam? ( virtual/fam )
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-D_KDE4_DEFAULT_HOME_POSTFIX=4
+		$(cmake-utils_use_find_package fam FAM)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bugs: 619656, 632398, 647414, 665682
+	local myctestargs=(
+		-j1
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index e1592b20cd2d..8b3dd3e5eec8 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,7 @@
 DIST kcrash-5.52.0.tar.xz 21960 BLAKE2B 2ac1ef4ac4287eca892f28321f1b2a5650415d5901a4665ab5072f0edf95d673dd6de06247f3d2bcd8ca96ea1e8ea0ce31e5708fde2c83c94f57336980b666aa SHA512 3e951b8cb809e25823c1dc41a736f42a2b413b4d17d91c555def014ae2a38ed4a0ff8297f3977e68d5cfb3445c26126b9212f08e7d1e6ef8aeb01a53e663a0ac
 DIST kcrash-5.53.0.tar.xz 21980 BLAKE2B 75d1046f11685ae1f65c08b6023523ecffc723d8d6601d55af2fda7cb283b129eeb0814b31b2f83fefb47f732aa2858b96c43231ab082508ea85ceda8e73796b SHA512 5be1ea2af440f987397cb2c519c949b90a7a16d7001ef83cb7f9b06f999fdfc9b19f3bc5cc722bd0001b7e03fbbbd793f61b5f3548b319a78ca4289d0cf2a45c
+DIST kcrash-5.54.0.tar.xz 21980 BLAKE2B 85d4d27fb4404f78b6fabe2319f24ab132842ecdca0b82712ddc34e100096f779cb535d322d613ddb019d2aeffcf6acc1502d9ff3096f85629c4e36c66883132 SHA512 1dae5de58b8f91e463af8bf745a474472f2d53d2c2ea3bdbff2477c9220a720df1c7f97400e58a3060f891120ced85bb37f9458a7b17b6c1af1be765c9fea671
 EBUILD kcrash-5.52.0.ebuild 608 BLAKE2B 3e616f147886720a6119d6c5dd199c0374b0ec4dc7735faf879bfea6bbdb1cbd39a374eef72aaedfaecf9c49b41b3e6b0cc3f3f3c9bf262cf7b2f0304d5411e8 SHA512 1b909d4a3d288026730a0cf4a6f4feb72a4f660cb378b78ac9990964e74eddf3de987a586c7a797eafc7045fcc6975a8804fb175a66c804582c07d87a0204d86
 EBUILD kcrash-5.53.0.ebuild 610 BLAKE2B 216ae8151e3d17b8979d5adee2dc91027a9b1310ea5f7f4c590388c7a4becfdbf8749ffbd1d6f1fd131c821353738660906f8831ba00c645696fd6833467fcdf SHA512 29fba5565f6b6fc8bad226866161256fa131499e5ca6c3cb92a866151e0ddedc901e33f703301441e9e933ccc176804deb40c18350a89bfa8e93791730638895
+EBUILD kcrash-5.54.0.ebuild 610 BLAKE2B 82d0eebcbed0fcb85da2741bcb84166090f4dda4f878f94ea3eb43eaf7b09396c404de02c24d907acf7434c7a6f0e4cb49f07043422fb1729001218b67ab1070 SHA512 4fbd0ddd315fbdff58a6af4e001229a0a95472c1ba5a582ea8ec0dc018864d447a03cc1e2609abd5142b51e73ad41031c3c5639347bdda9612938b3d5f1e805d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.54.0.ebuild b/kde-frameworks/kcrash/kcrash-5.54.0.ebuild
new file mode 100644
index 000000000000..bd2fdac2dca2
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.54.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+"
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 25c8416bd1fe..b101c1465def 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kdbusaddons-5.52.0.tar.xz 36948 BLAKE2B 9094295b895c7880fb2d61d1a97c163da6a254186cc572124b63ed7b615e4b8b7a431cc24a5341de5467467e5d56a8ffea55ec97a890e9959940a62037ed54ba SHA512 3cfb4a97e65af365bed3d2b7208ac01bf7f8ed226094caee6bd05fd3c9247a3496fa64d91940687e06bc2209601e7d03efefffc2f79f01b026f5a773ec2f232d
 DIST kdbusaddons-5.53.0.tar.xz 36948 BLAKE2B 7a2d560e542cb160890c1de22045224e34e2ca16eccb13041756cd6584c6e699960caf30d532900d1207cd5013f7e3f9fd55aecca0f1b9da56158e5350e7ccf5 SHA512 f4058cd4892fe46405267ef6bc0db7a59a1c6499182b8a3a528fe341db6de027427b4d2069ee6363a2a6066687eb2786f326f07a3fd553a83807277f82e8c43d
+DIST kdbusaddons-5.54.0.tar.xz 36948 BLAKE2B 9a2491f18a2d60c5e6a3fe758afde523128cec8eb1734a38239a7f63f9b2087cdd9041692aed41067c6bf2912d3868d1c6614ba0c932aaba335b3a5e30bd8830 SHA512 3ed4e8d3861aa894ba895fbec1c792f1f6c35a4d1c1617b367b772076ed1417bceed427e1b9046158cc1f85c0fd0d14b23093f8c3804cae9b5b93508a43deab2
 EBUILD kdbusaddons-5.52.0.ebuild 551 BLAKE2B 7350c2d5ec449d02a5f0078d8b043041d924a259cad400daa8daaa6b2484afab9e8ecf78ae367dd7ad21a4260c788d947bef11dcb6956118862d46991105b7df SHA512 54b9ec8ac265be0246a6062a54b0d7a1afe48984424554484c6fdba4e69922deda761b1dd8783e294c1599905ce270c6a00a247d4d1382d392221a863d4cca6a
 EBUILD kdbusaddons-5.53.0.ebuild 553 BLAKE2B 39bbd7ac48314cfca6de13202c4442e22e808a4b755f5ad5b1cbb23eb0169327e606d145755802f2d4126cfe9b2c0df0aae1eaa08c83bccf0758210cac50bb09 SHA512 6f04cca210aeddabb0e58f599a082b4e09adee7fa6c82ee03d1e02ed3a435dcb893943beb2c2e7a6a3e92ed44f5b036f5a971396d8d17b9a633cc3c6f14945db
+EBUILD kdbusaddons-5.54.0.ebuild 553 BLAKE2B b55d922a2e1725490acedcdbd2519db525e579c0e38c17bfbd9fb8425a934bea92d958f5f446d07023157d09f5feb7c09534385cf502fdb1c09eaa9e79bd43e9 SHA512 d51aa39f071b5697ee755b9717fdb56b2efd941ec94bcee7488c32c222c9caabbe6924de16795fe31cb7bb8df7f81372104e6fdefa8afee3337a24841031ca42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.54.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.54.0.ebuild
new file mode 100644
index 000000000000..32fca2c37c4e
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.54.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications per freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index f70a9d633c76..36197dd7e63b 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,7 @@
 DIST kdeclarative-5.52.0.tar.xz 172156 BLAKE2B 2adc93f0596e772d465e7b7edb4882416f8831f6b390fe0d1662762560724a4156212d0df6939281b30941168fef6263e2ce7d751941e6c8264ca68ab72d69c7 SHA512 3464a45e53ff1cb51b648946d908e8d0aefb3ac8a6fd233afaf5313c1aa265c1bcf27d6ec624388470efadac28e445ad4906371154adf6b099df377324f47f2e
 DIST kdeclarative-5.53.0.tar.xz 172116 BLAKE2B 6b1e4d51aa9e2e2c20815b6ceb7cd9db02741b5ea9e131264b979b3ebf1fcc4d61e2b0a0bce171e8f9ef67bfe0fd69af2f92c6be956ca88ca6d98d54511118f5 SHA512 1b23530a449a20d40c8a150814e01ccace0b1a328333076051c3e261b76d75b5d28b4a020203bf27d4125e34097cb55c25d72d2f53db19fca904db08bef34876
+DIST kdeclarative-5.54.0.tar.xz 172492 BLAKE2B 44afad1dee9e13c768de24ee10640a9333246818685c2106aeb0917cb3af4c105acc643ddb12e42ffba4906fb0aba1933962fddbe20df2569f089c4ec830d1eb SHA512 57a042a3c9be486b9582f133a0d6688758d1ae2dd4079168d3830cbd6b2d656b22d7b1fa321f77c1d14e216e2714984303db943df623b71d29c87d7c410871c2
 EBUILD kdeclarative-5.52.0.ebuild 836 BLAKE2B 76af5733cbed46144b9b1ee65d0c10768a789b755b42cb10acbdbd4813488565697fa2f8437b1542ac1f4939755f72556bb67687df3e8ab4cf03cece37a2eb2c SHA512 1abbc96a42cc1ffb896cfe3e1d0496dca167d439f80f140fe4fbf2f2ce501ba7f0b5d8417abf3a69ed95f5b890bccc3f8268ed87c0a05ddf74f6835a1e3df890
 EBUILD kdeclarative-5.53.0.ebuild 838 BLAKE2B db82cbb0278bf4e755525dd1c57b003f893cb6013bd5d83dd9980ada69c1b5eb4881c6eb4493778f44803c42b13627a24333537b01c3af55e7d50a6c41f54eb9 SHA512 e02d4d2d09ff5f37fc70aa68543ab466d67851e9ef85d3ef3ae1a3b0b18fa7250189e5fa28882c11121d1c4dbea832d1b9531c64d4bfb0d304cc584cebe030ce
+EBUILD kdeclarative-5.54.0.ebuild 763 BLAKE2B 1e26280d01b7558eb46eaa3bceb8a435a321b76485e2789ef6dbb4cf853aaea04755d3147a6c7f77771bf75a1e1b77cd83a231b86d9df4a4bb310fa0a8f724fd SHA512 0bc16fe644417526a267783732bfaa1fff8c19dfcb1b3991f603679b9ed1f2c950dc6c990448b1b6389295cf777f012980a1af6656b8b4c8e2a983742045d39c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.54.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.54.0.ebuild
new file mode 100644
index 000000000000..646bf56e925e
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.54.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 992a08ec297e..e0593b4a2972 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,7 @@
 DIST kded-5.52.0.tar.xz 37916 BLAKE2B 8fefbdf0fd33a4ebe5f25c05d9837f964283fed4de9716cbecbeb8199b2185c385c5530575a13eda179083144967b492d05ac571983c5ba4f93f4fe4fde5a291 SHA512 c2b2178f652359ace6ff0e3a626bb215851980e70ec34f01c26895932c4ea6fc94ea4421a3ebb864e3150fba26f40d53f779f0e9863326e0b12fe5117bf615aa
 DIST kded-5.53.0.tar.xz 37912 BLAKE2B ada11d9077495d7774fabc4944ea79132cd0012d904773a8f2d9da0ef23cc6432926afc46ae236370d832eecbf026c0fadedb692cd714052702b99b84e8740f3 SHA512 5701fee57381731ec17fe1c3de3473950a52eaf73545e756668a06e062b5ca09c8141016f81f07f735febb8600e9db4a0db01c0021fdc60a62c015921e5f8646
+DIST kded-5.54.0.tar.xz 37920 BLAKE2B f46492362cab4fbdf9dce4cfafb196341e403b3ff059751b111f2a3fae2b23c7dec94a4b7fd0bf352209b9e972cb7c47eac0f3b6a2940d30b1be1e2c76ce344f SHA512 696f98b222616200a308c97c04d3fcc1f941bd46bf4ff8913d5d3e95c46f385906dc71c43e55d44938aab21a572786130370b5a1210a811390c356a50a2ccc77
 EBUILD kded-5.52.0.ebuild 725 BLAKE2B fd8a803b23113960be281143673c02a01b095a6cebc9ce5c0f82dc47c42fa32d0ca98072a0fc294ab234b71698b1fff2a9864306d1415ef19c966f60db990d07 SHA512 f4dcf27a37f8821a8e03cfb67f3d0c07373dbd7132d43e29c27cae0312d6830cfd7a67fedbdf8c16d8a35710a7fda991dd1d22890f63a78651be7d1490f08ed3
 EBUILD kded-5.53.0.ebuild 727 BLAKE2B 025c75a5d113abc6819480a2bf0606100a2720d971ed14071a1765c186cc1c2aeb085a209800295ec5bef60a4a53ccc56f4fbb375e9143528c70aff1d18efa23 SHA512 6a4aa131d5cde84e76509a66d1cee387afc8d622dba5197367dd695f7659e5500e24ebb312c82025ac3bdb2e0c57fc7b48c5f0e8c4c47b812f15f7c4e6f3b2e1
+EBUILD kded-5.54.0.ebuild 727 BLAKE2B a2f0a8f1e3df38a0f68f592a01484451d7ad9090ac45987c07ec61178afa4c2e3b84eb9d7a4e6888e902259783dfc5fc0b4aa032ad6532057cbdc03c685ffcbd SHA512 bdadf834e906910d339b74ce0aee1af906d34fcdaf91ff628790a2175f75c46db51c9e2ff0b8f5a435dd5f87e00ca2066c9e9d0cfa86594c55aebf58ff87232e
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.54.0.ebuild b/kde-frameworks/kded/kded-5.54.0.ebuild
new file mode 100644
index 000000000000..9dfa93bc98f7
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.54.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 8c3bc60a4473..38534db97539 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,7 @@
 DIST kdelibs4support-5.52.0.tar.xz 3347432 BLAKE2B 1adcb450cfd3b7abdb7697516d76d0729f0854b30bad0191f9cfafbc1cbb5d417d603b9c4c221fe73bd2e6ab0581b400be06aa849e7b44c6388f363f45c8237d SHA512 b5dd615ffd92a6c30b63cea1c4f8f8c7ca92244dae8b38d5caee4474d9203368007b959d11106a9da99a57b91635175b62c5d03e4237588549fe2ef7e905bbc5
 DIST kdelibs4support-5.53.0.tar.xz 3347456 BLAKE2B f82bc60869a3715d71a46dc0ee5494b1ca7a5d95de5c5ebbee977a3850043bced6c2b9d15ef971e08df1f06255be9c22c3de50998f92010d641b696480aef581 SHA512 f60a2246b08951d0f31fcf9312470b8e4797d206952beeaad094b3983688c1e98926f74d6460e98369f3354604c155a29d1e0e6bed28816d514aac05198705d8
+DIST kdelibs4support-5.54.0.tar.xz 3497156 BLAKE2B e79de91dccda46383512b42e15f6df22811e5d35942efefea2317fbee7bfa5504d3aabd87d7161c51bf71f21c7406af3baa1d7962f4e4e850077c1c41fa24559 SHA512 860c2de36c1a1587c423eaa8f770be254d0458f3c223592ac07f116015ee2f597b913039180bf832e892cfc1060eb3830fe45c786466771441e3a1815a6a5065
 EBUILD kdelibs4support-5.52.0.ebuild 2072 BLAKE2B 6854251f2a77fcc456022d7c44f1abf82529d397ba9e9979a8ccf9098842df26e8bfd3e597d29652d04a279e5a13539246f8662b154d1cf12e10e64c6e8b081f SHA512 ad4a6360bef45f25f2d0c4001bfb92e7e0f52b8929aee80c7849e136d381af55c91e3e021a0bd02bff3f402ec4d444a11bb67a8f7122b038a51bb5233b1e8f16
 EBUILD kdelibs4support-5.53.0.ebuild 2074 BLAKE2B e2c76151fc594b802593041219476943076d5e322749e488f669d79ea930d3579a73a6f9e7ea9343e92a911f50de8f4d2aea1e2e4a00bdbf543892ea2c1a048d SHA512 c132615315ea1fb0b49af97eda838fbc77c6bdf7b3732dfc044f878710c38c4075eeabb73807249ea73503e1f391e1575b28e40f4e471dd6a033835c3c702805
+EBUILD kdelibs4support-5.54.0.ebuild 2074 BLAKE2B 8ee9b077b120cb04b932cd37cb64e8641224e4f4fa99d154f2a8df6a86047e0c00619e2c6ef83629ec2519ed9d988b49483384d78c7350539632a7e31361572c SHA512 a0c2844b6f1d665d129bbd5d7103b3d0d83bb71a95d6fdcace93ffb7d4802bbf0097246b6ed782673244d3a0e7a81b45ee735790d34f28e5eca0a0bf8a96d02b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.54.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.54.0.ebuild
new file mode 100644
index 000000000000..ba85875ed5a1
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.54.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(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 kded)
+	$(add_frameworks_dep kdesignerplugin)
+	$(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 kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	app-text/docbook-xml-dtd:4.2
+	virtual/libintl
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+	dev-lang/perl
+	dev-perl/URI
+	test? ( $(add_qt_dep qtconcurrent) )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kitemmodels)
+	$(add_qt_dep qtxml)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index 64edd364d522..0ba3a0f69094 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,7 @@
 DIST kdesignerplugin-5.52.0.tar.xz 90684 BLAKE2B dc289e5d729f063cbc6c68ffc8e0214f5abca38c27500540299305beeab36c5b89a669697d3033831cb8522141ac837d7c36d02105043e0379aa4f9cc3e8bdd0 SHA512 0ffb936b658b41d8ff665cafa16be807a8d2aebacba13148a17c05a9c1d694e1cb6cfc012a412e5546ba6ed9888ad30499fd191ec403c6aa77bf6247ca53d1cb
 DIST kdesignerplugin-5.53.0.tar.xz 90672 BLAKE2B dadb26e2cf2358898bd37241beaf86ac709492b1412b17ff47df66dfa24d651fbe3812ae6a72cd48e07f4f6acbc2f6daefc5d31832e2d7338daca7f631090c4a SHA512 6008f7be98bf7167f32d4d97ed2dc2140720ee7eb344199b2d424e026049781931442984bee6ee3abed85030c8a8fd11153501a18480d3b97d9bb5238fd814b7
+DIST kdesignerplugin-5.54.0.tar.xz 90688 BLAKE2B e48b1e89f678b5f627c100814c31f95ed45c0654dbdb082c1077fb6587a763046703501ebc1ed5c9ee174eac3cf1425fca8361d48137cb2ac6985f0701c8bad8 SHA512 ac566101b0b991376d31612033a86a8db6bce30734fed3a6022f6d6cfde812b6df6a65f73578ebd6fa31b3954a1af7b134e38bf795b512cf5aa4af684b87c1a7
 EBUILD kdesignerplugin-5.52.0.ebuild 1428 BLAKE2B 9a7afe9869153920bf9d586b9d3c20671f07164b338db44d43a1881b879151016dfef394741d464a6ec03efb8e2b6ec14d547ca9ab1ab9c60f4c70c3c4b441ec SHA512 c60c2a564d4941ac82df7e13096bfa8e1567441b606d2ee1a222d06bdf9f1287ea6a6f232d35618b2f93d00a78b42f94d2b2b39c20b9c6a3d0cb919c6593a3cb
 EBUILD kdesignerplugin-5.53.0.ebuild 1430 BLAKE2B 09474668e9fcc5f7220ffd7bc19a83ed032e11d786839034fce73db4dd2b70bb86355fc17eb4d89d2d50d3be64fc1320dbadb5f4fd64053f92c5ddddab6e0421 SHA512 acbc760bd736a34f2d2ba7c3270c3b46c190dc4afd6bc1f8e0700447e026f4485f881a4658f55305522aca74b71a94afae2ad99ef8cd0e620dff1bfa1370749d
+EBUILD kdesignerplugin-5.54.0.ebuild 1430 BLAKE2B dff578fb2a5800cace5126415861b1e73d2d5752d156c46b6badb14d0f95f4eb8e98ab1963b5ad6107cb6085f36df7f866e082068fa09ab3a8faeb5d124de09d SHA512 1462a3527e0a691a0951d7f1126efa670ec2a87cd83f5edaf9d0fe2fe0a54321ddd74c8d9a2c06ed887c000e92f4b7f9d7421f11c20a8dc2aa95e6d355aa80df
 MISC metadata.xml 402 BLAKE2B c6bd347d2ec708beeff1a5e62dd8b6915a884afb3810841adf5bda651d5fa2caca0f3375e63d01e4af4b87fc955b6df0483d569746ece2d8b79948fd3b009b1f SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.54.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.54.0.ebuild
new file mode 100644
index 000000000000..ee7be53b9176
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.54.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ea994313352a..3052bf9ac080 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,7 @@
 DIST kdesu-5.52.0.tar.xz 44748 BLAKE2B 4ee16bcccbaa02df0cd215bcdecdfdf3b5cb932409c142d7b79a334574fafa58246f5c9bc5c9d8976f95050d61d04d4860de889a6d861e76bc5dff88805d32f4 SHA512 4a79e11301878dad2b611b14f660276d138608e476b2209c7545ab05ced36b7c8133a1e63ee3f5e29343c8c76f79f613a7fcfe69afa4c9c6d0c6f516f35689e7
 DIST kdesu-5.53.0.tar.xz 44756 BLAKE2B 9590e59b1a6973830ab32710d744b0cb7e92666de7700378c646ecee992bcd8613642cbbc7baef2651f320c70f7db136d8101c9a10170e22644a11173d5e77fc SHA512 2f200efb37b0bf7b0d04620fb443a3ec9a1b7282afdf4c083f85ee99ab03b199a6651a88d12c17195fd034ae1b71dcccca34c43787c2dc3cc5962d8300628268
+DIST kdesu-5.54.0.tar.xz 44744 BLAKE2B 4d3148dfd44d0b6b46005dc56203c80a7b153b159cc436e09b72767c765332d2d84e7c278cb82852be218d056176f15ebd5b1f0d1ac5358fe4a3c52a90f19db8 SHA512 6491ec9b13d802fa78917cb95aad80cd3de746fbb37f1fb9bef56a53021be95adb15156352cfc96664fcee0c5ef90a9045e1b2086d2af9b2c657ecc50146285f
 EBUILD kdesu-5.52.0.ebuild 603 BLAKE2B 6b2c3f1ddf26cee8d2de0460ccba31f0bc15c57aefedb045a6adda49060e0773121a0b6504a9c25ed09056ceaf939ced9d9980dbe5bfbc075021ac28a70d0669 SHA512 b1c77a802e49955b255cdb930b8876acdcd766a61fc24e9274250cb7a2a8cce6356c15e14173d433d788af21a7ccbb68652bfda4c2ad8d1c06a8a723d01c1d82
 EBUILD kdesu-5.53.0.ebuild 605 BLAKE2B d8090c66f4a316f85f009f8b342bc25a6e38b69b62ab6b8a8af7eb49acf3158056f833d71f0d22a4b76819e9999705e18771909dc3b43545775f32587b0e0986 SHA512 633724aee814b081f59d8d7aaaac1a9465ef12068d5afc1efdd4dd8f307fe858e885e6ebaccbe415254fc8d695763fdfa6308a45a4fa37914ef3ed9aeca262b8
+EBUILD kdesu-5.54.0.ebuild 605 BLAKE2B 18dbd2b332e1c2bac5992e7d695f23e557b748e5c43c82dd68ec971a8fee8bf3d56f9cb7d57b69cce5fd66511a2282f68890cf637a40606267777a893b68086f SHA512 86d2a54ee136af9d8daafe91fe4560e6f7dc4244c6a3785bcda1575d03aad92b7dfd7a97b8491c9d3b5f8dad9ab027a30ddec4bb90862cc400ef0cef970711ac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.54.0.ebuild b/kde-frameworks/kdesu/kdesu-5.54.0.ebuild
new file mode 100644
index 000000000000..fb66a9b278eb
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.54.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index e3c08d26c647..371549603766 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,7 @@
 DIST kdewebkit-5.52.0.tar.xz 29312 BLAKE2B 3a3f90b3203e7d933d5588a9f991a63187255105f420f3bb63325a319b9edaa337166bbc76c3172a7b909202a78ebc07c2e20b375598ec2ef05627254af4cd6f SHA512 2f79353a5ab9b19d6cd57a5150c9272a5b73906aae7c27499928df6c0a53ad94a8e86a9466e4a5f6188a1eadd4a692e102ef9ec3a8b6b929209c6fcb26d49547
 DIST kdewebkit-5.53.0.tar.xz 29304 BLAKE2B 867c45eb20294b3d2c3f1b2ad4800e550b39387300a60939a14881700485837a060a00d2877945f64b4dd2c99cffc7f4cf84216662286cd0db6a9368b8f2f826 SHA512 faa5f829a88c8bb3c867b17c867415a6b7263860e41c0370387e9884c545d5db7bf2fb194dcb67dae0a513b8bb45fe0b0bda3c653d2b9bdb8e202970e4da941f
+DIST kdewebkit-5.54.0.tar.xz 29312 BLAKE2B a22d15c9f8ec726387e118c748131386227555843c82ad648bf5d0d62274a9775c36674dc0928acfd055f26e8abc1ca9cbdec371dacf0457f4502695825981cd SHA512 6d4a5cede572653db64826d29470e7f2f1ecded97547c4ee49f5ca51e218c22ffeb84dbd0f0953e4e55d993aff617d262cc6f974902c5dc0219642dffb1611f1
 EBUILD kdewebkit-5.52.0.ebuild 659 BLAKE2B bfaeec639d9f4ce60d37050bcb93f48ebd01b26f07d20c996a573a75f053f270a4a48012242ba4cb3c33129e1d40383798583d539d72a27c714f3459eac30260 SHA512 d0ae314a95cb70546f1007602a9bc8180402dc536defecca7a459093779af3040bb789328ec92e589071aa64b1dee27dc4c14c87f507626e5effe56557309574
 EBUILD kdewebkit-5.53.0.ebuild 661 BLAKE2B e0f2d348a95295d4966873eb09d6055b1425b26036c61ea7f79cdb7dbcf9cf7466bcf6c086b4d33302043e242f1dfab1f2ce83d3dd3a0d7eb66961a81ebba189 SHA512 5db06173d5aa80005e67fbe8b0e8f30f46bff2aeb17ad44a8f66ac55c4292f583a10003b228640388398d92b8241b2f2dc90ad559941856f1444369aef631d62
+EBUILD kdewebkit-5.54.0.ebuild 661 BLAKE2B e54a1e9667129f45f6b7b068bd071615e617c2fbc2e993617000ca6df59bd6c861ce6f0d7a94ff5b9b5b050995fa6e4d0059849bf616398bcc96b615d5595804 SHA512 fa69982348a50a4f1471cacd858223b0f52f9dfc34bac28f6e093108db269b9337f0337c31a0d74dacb59257ed63baee436214d0618f935eb49e72d77b346f9c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.54.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.54.0.ebuild
new file mode 100644
index 000000000000..0c20ec05c37a
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.54.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtnetwork)
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index c406ccafecef..3e5f6284b3b7 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,7 @@
 DIST kdnssd-5.52.0.tar.xz 56532 BLAKE2B 38dffeffb60a99e33d9f7fe06ef5e549cbb38e2f911a1981783b5216a5cfeba39ba810a1e74b7fe8bee80ad96c955873a98f58825b3b6e37b5013403f14512d1 SHA512 a1ce2e1e63ef61edcd3ee3376d0065a4094bf4dcaf279c9cff9b72bbdcc553869ccc5b69b419cb10ae7e181d0587a1b21e977ac87277ddaade3c396bf215cebb
 DIST kdnssd-5.53.0.tar.xz 58032 BLAKE2B 14e74b41d1c1fc4b0df24cf80023354836693114698cfae0bbc2470efe499ff7118383df8f4babc889510ab981c8f83dd2a6c5033489042e13350b39387173b8 SHA512 de2349b933e1dd8c1b2dfc04ed4becd9395587ffa9512153d1df2fb6e3ee21fac3ec1db006e356fcb54e475f2510f6e975302f25cce1c44b7008270e903b860f
+DIST kdnssd-5.54.0.tar.xz 58032 BLAKE2B b35d76603bf1ac77c02ad23f71f97f5f61883cfb09253f17a567840b512e47cc5709b1485792e4f8403ae1c80aeb6916b16100a520987b2dbbc524d13513b643 SHA512 984277624e5ecca308101bff788c1dccb7b257801aa16f6430aa8d5e349ff71752081a689c8d10ec316e57c8a37df83bd5a43940c73fb46206cb201cee6c2722
 EBUILD kdnssd-5.52.0.ebuild 597 BLAKE2B b7089f40283cc73f7ee5aa83afdb138e2443e9ddf86090edf597d866787f18166a40c3ce1aabba7acffa61fb044d9009f71ed090bde300e0b4ce1411ef260af0 SHA512 917c22360ec0cf58c02a80111e751075b6dd52506b9b276b048a5a3c0d73b69121c67a7f5ff9eb780e883ad89b5fd01b597486d3a685019df4d8f969940b9cef
 EBUILD kdnssd-5.53.0.ebuild 599 BLAKE2B f7ecfcd63869a8d9eadfe4f76f8938279ef351b7a3b2f40ce0073a989f625bde943902d01d25a34bc4d505bf089ca6dc9005816ab42dddc547cc206fea5b1361 SHA512 027718819604858b5dfdc85ede3659ff268340f8f0b61bb4973972d9438d7ba75bb7d007c7aa2e98adbc71097191e382d65a6687570d98dd5e04403cb4e78296
+EBUILD kdnssd-5.54.0.ebuild 599 BLAKE2B b5d19971b4058802ddda439004668a7d2c7469323861402ea4f39f1cc5cb73869503d76099b4bdd0d8af99dedab499e614de1b5821147190478c2a0708852e3f SHA512 647758e6ef820bfbe7e2a732224025fac9b87d54a6497fa208fa695570b849564bfd2d4feaa821c48e22e8f0fbae706e6b69aae7a1432724c15d22e71212a9fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.54.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.54.0.ebuild
new file mode 100644
index 000000000000..7193ccafae4b
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.54.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+	$(add_qt_dep qtnetwork)
+	zeroconf? (
+		$(add_qt_dep qtdbus)
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+		$(cmake-utils_use_find_package zeroconf Avahi)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 9bbe8f3cf4ec..e34545595245 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,5 +1,7 @@
 DIST kdoctools-5.52.0.tar.xz 424648 BLAKE2B 636593722d5e90d8d8dadffab7291f2e4dacfa4d7b11ddd3b8ce9a740c4f3100cb0dac6c2176fd49da80f8300653bf7cd0d85edd3d5eba0de5c99fe693462d80 SHA512 62be111cf594f8e4c3c1591329e26ebb557d8d65fcdcaba679ee8089e4b473a89921f8f640ff6354b6ba99ba731f2b18dec3054576f0d248d6b4fd75e65172b9
 DIST kdoctools-5.53.0.tar.xz 424780 BLAKE2B 12f2d1dd41af6bb271ac58e1516b4757c3e6cb86a63049519b006578c4278d425c7fa61d3a0b2bb66e1a46f5023ecae0cc48ebdf81d7893aa003058d98ab5ef8 SHA512 a7d096fb9f63639924441eac022af925611c3ede42edab39b06f484ae8b90eccab0f420340842f6688dc1c4bfb707b2e97a1b4273d883df9f82a087ed453a4b8
+DIST kdoctools-5.54.0.tar.xz 424772 BLAKE2B 84ca18c87b2a58370d4681ad88ed2f2effdf1d269a1bf550eed3b10a25997160fdc16fb7b39bc8b9816aa5cb3469467b2ab0448c379a6a6b0f10748cd4ec839a SHA512 b389fd1a7b2ea32d13ddca128ed2cb6375856f1c40f83c29a46e9ed1713de6e28e4415743403de37cf1f8a4ddcba4d7cc1e295e5c50443c4faf02939854f72cb
 EBUILD kdoctools-5.52.0.ebuild 754 BLAKE2B 4cf2d508a13181a4843fad575104f8daeb2161e35e8792cd09870fc999243fb2db67a2144ecc601ece5f26730befd4cee030560e901c0ead6b3d6d524637d566 SHA512 922c9d5841655434dae9858e105336c586115001e5c445dd20133e135df3ea0c13fddd7e69f835da41a675aa1632f3de7f39da77919a155e08c9c68269731b6e
 EBUILD kdoctools-5.53.0.ebuild 659 BLAKE2B efc369a4798c505f6c3da6cc8f5ac1f3dfb9b59832c5c2cbf14e50b5d01889f22596eb7324952f0ffe658a4bf1f175b4a78245cd9c13052d81cdf0c51b2aab23 SHA512 72e49007a80d46707c96d789855ff740a3d1f2f1cb7a0327d7b609a1d91ed2d1c5ee15346abb20a19bfab81e76b5f1107bd1a449b0a3073e4ac6c2696706ff86
+EBUILD kdoctools-5.54.0.ebuild 659 BLAKE2B f5d873bae0150b8a2a45bfa00872f5702f01b528342f6c07b6e5e476d75cf371c740c78eb20fcd7711a6fbde1cf2fbee36daab3d32e4a380800a7f41fbe2e794 SHA512 d905b79cc89bde647179b6d362647166733c52db1a9bb56c4d46821e34859b2d2d6020e36d833d3aac7ce54855005753f8e1218b765592cceb7283df0db510e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild
new file mode 100644
index 000000000000..f37a12e05588
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.54.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/sgml-common
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/URI
+	nls? ( $(add_frameworks_dep ki18n) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package nls KF5I18n)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 322d7af0c50c..ab75df2583fd 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,7 @@
 DIST kemoticons-5.52.0.tar.xz 1695848 BLAKE2B fb68c99c9bf31bd54f19d3caa32cba21741c4dd97d5d1537ba64155e68930f261a81198e60566e6c19de122ff8fc63aaf6bdb4db2e73796e0edfe8f519fa616e SHA512 234adb4deeeb673737f6a9abd78ed4a4c36ff39bc4b97f9f1bfcc859fc472cbb08948e77e85707afcb9bd4171073f57e799a7fb7e2a394764055d20ac5c0fbc9
 DIST kemoticons-5.53.0.tar.xz 1695884 BLAKE2B 8e4219ceaa1c710f9559a00c5486445012e7dbfc192f42277da74d8e6339636bcf43abac0ab6a306107ea425e3f5a4a306b73fdea6f6139b7c743d6579566164 SHA512 07b47185cb20d0c921b4feaeeeb90e00c30d55a7edb75d53abcab5f0fcf0c8f97d1860b2feb8e868fa25d732ecc460ffcd02868294513ab3bf495d70ebd142eb
+DIST kemoticons-5.54.0.tar.xz 1696352 BLAKE2B 74f7d94e229c4ab84450ca5ad16049da8d11a94034cf046484b78190b738f77b014f0c3169a6c2a262e4647d66a1087940f9b93db1e2326bdc2ce94440b461c1 SHA512 3b76a6e92cdc0db08179e35c2728f8729c0b1e15d54d17ccec2f265266535f5bf8edc791530d3e65a1ab2b645fd898cb0dba4dade95490f4a73b90c804719886
 EBUILD kemoticons-5.52.0.ebuild 577 BLAKE2B b4b1b77dc9995cf7800c352d5c48399b23e18d5b4bc31302c441267d9ba9c0bf7016086ddc216c39255daee07b94fea3afc8c6d8f738f0ebe4feda3a3192ee9a SHA512 0da720ccf06ce7e55e781cc0e76883e4b482b736db80c3b108c7df6fb4bc1776872e6d5d553a852a3a0c89391d5550704b04cfc2bc3b340f2857d1382965e667
 EBUILD kemoticons-5.53.0.ebuild 579 BLAKE2B 157103a89d9e7083d76a31504b460fc6391bfcce5e29128d2f83fdaa485073714a12ca1db3318ee7ac048e6ab392a6371df9c81d87cb09ed8b915e6b19fbe760 SHA512 5486c41ebfcf884eba136f5f5658cd6887da037c408dcfbacecdfa09cbf9bdec34abe8783367a8cc3feaeabb19622e1edf574a2d93aa0812efc2d612db8f677a
+EBUILD kemoticons-5.54.0.ebuild 579 BLAKE2B bff38c84c849a54972ab5235116f81979e7374eeaefcca109ae825565e16f91d9f4e436ca7c58b2bcb0027b00fcc6911abbd838c9233c7a887f9787ce8b09e84 SHA512 1f89491d844343a42f1f3757ec94868be8b14e161efd005c45a11654349c085e6405bcb713de6da3fac013dbb2fd0ed2f49b3a8c4cf599cb72fcc49c7e914ba8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.54.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.54.0.ebuild
new file mode 100644
index 000000000000..0bdb827eea87
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 8295e660c9a6..70ffc759371a 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,7 @@
 DIST kfilemetadata-5.52.0.tar.xz 292140 BLAKE2B 73c7bfc34747fc155269a5fc0bf9ddc78d8c29234a34a292eaee8af94e2b4bb6aed819d01f759bf64c0c598356a5be17070f471160c51ebd3be25751dd119f3f SHA512 270c0b9ad16f7a598fe9d0741d29e1def875931de85e9dbf6744f9b040408b762bd7f845172ecf62923ca6a07b551963469fe21a811cfcf341e91ccf1b7c35cc
 DIST kfilemetadata-5.53.0.tar.xz 300164 BLAKE2B 08ba094bae648306af406129393fe2ea2d1843ec97df82dfd5e5b60a86cf9d20f2d2440242825b3df3a153fe2333c562b846def093b251c68952125c008e088a SHA512 1ecd29a468a074489539f22f3cfe4f1ddf330a2bd350a58918755af1361de0109eafe800fc59d502fdd81e9e515638438bc38e8f89e1a34d0366e6e3f0e6384e
+DIST kfilemetadata-5.54.0.tar.xz 302204 BLAKE2B ecf9a4fac9fcf18fc5344fd29eb2e28bebc1e65762c9f62b1e07abf67e2a55bd677b16a02fafa2308a63757f0adcc35e4dac47244a05df067026c0da11553c40 SHA512 bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801
 EBUILD kfilemetadata-5.52.0.ebuild 1629 BLAKE2B fcfcc24660ee4797147052287cf1098d72b2739d57639eb05ed34790ae8389a9e2969f16d17d3c18923278a79d65a7c9c838ad76eef1d1f2c3d64b3597e18d49 SHA512 bb92aaafbb77258dc8129e7268ae1da98db90d92fd11d155d42963f9182e00d2caf96175192edaf5c7225719c28f57b1a412556f44d6febb4eeb36386d6ba854
-EBUILD kfilemetadata-5.53.0.ebuild 1631 BLAKE2B 648c38a0da39798bae1a4c6f271317ce43dd28b6764f0ed67aabe1d50f0f4d28b93099c78bd432ec130b0737a3a5f63c3cf7ad79d429d25f8bd0fc913151bd4c SHA512 e844a45c64fa535166f0438f68e04caa45aa11cdca048730eabe619de03b949ce0f49e47f00f50890325728690e7a69371443b952ab26dc4f7291ee2db5e3092
+EBUILD kfilemetadata-5.53.0-r1.ebuild 1634 BLAKE2B eb48196a85abe6404dfeec9f6e96e8c325ba4c30d6263dfcf71c61f7c9bb6a1b5cacac9236ac6526e75a1f0b0d77a72e4ddd04b236f79ec246b52035437c5024 SHA512 e20b925a37b15187b7b12270821b53ef1fe3edcadfc0b9ff2e67e23b6bb969e348493eb23c21e3d6655ecf12f9f1e7f1401670f0f5162cccc83b95d0fdffecb3
+EBUILD kfilemetadata-5.54.0.ebuild 1634 BLAKE2B 407ef0468768faf21193a8fa8532db3848bbf7d8105271a9857205b166467d5ae80a2d004cf191bd2725337a0fbcf1f263425735f48bb1f070609897142dfa7c SHA512 ebb72e90da36a4b955ea819b5a7b48909b7416f3b686a7f0ee05e9328648f9f32426904bbc9ede78756443a534d0cd6e96fa9ce226ed81fcf9329cd8af0f82c5
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0-r1.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0-r1.ebuild
new file mode 100644
index 000000000000..e6b1c1850329
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux 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-12.2:= )
+		!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 LibExiv2)
+		$(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:"
+		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
+		elog "dev-libs/libxls - indexing of Microsoft Excel files"
+	fi
+}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0.ebuild
deleted file mode 100644
index 7bbb0cfdd63a..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.53.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-inherit kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="epub exif ffmpeg kernel_linux 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-12.2:= )
-		!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:"
-		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
-		elog "dev-libs/libxls - indexing of Microsoft Excel files"
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.54.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.54.0.ebuild
new file mode 100644
index 000000000000..c9f47a45a244
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.54.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg kernel_linux 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-12.2:= )
+		!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 LibExiv2)
+		$(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:"
+		elog "app-text/catdoc - indexing of Microsoft Word or Powerpoint files"
+		elog "dev-libs/libxls - indexing of Microsoft Excel files"
+	fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 24f12b199b82..d488d15be92f 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,7 @@
 DIST kglobalaccel-5.52.0.tar.xz 83856 BLAKE2B 21ce0005b5c88c8a292b1ac61d5ee46f220f9be6ff826278e5c220ea6ad514ea77f1735e1978778157f753e6fb44d206942963cd910c1093ea1e8b9fa637a9b0 SHA512 57bfecd678107046fcf4c58c28663db0bd0d12b36f4d093505dd335ed46a5b25a5baa5370e5b14101f00e2745aef44becfc5abb8ed852cac956dfd907562bf0a
 DIST kglobalaccel-5.53.0.tar.xz 83864 BLAKE2B dbcc627b373713337aed83393cdc9475cad5328c00fc592ad743c9078f24eca33d9adca8aa7b702f4aea1388f158d1343c87d27db63554d9ed488e4b2468b0a9 SHA512 52919405eb7b1ce8f8bd04cd42168df43dd61e547ef664b3e92bbbdfbf30cdbbd35e9b3ff5220174adcbfd0f7af881219999d527bd7998e1c9ebdfbb41e1f191
+DIST kglobalaccel-5.54.0.tar.xz 83848 BLAKE2B a21577a723fd347fad2c5a87800cb300abff66626c2be71fc0645a42d69a9e57bee9ed99ccc070e58af4dea35d2cfaabfa5c14b545a45156dcdae590d22d72d2 SHA512 aaab8ba98ea7229ccd31da07efd21d16e1bd44da9534e05fee73473becc3a7098857335be00c30aa247f15454cb83cc2a0b11ab1c1385c8b682aebf06e0d6fce
 EBUILD kglobalaccel-5.52.0.ebuild 647 BLAKE2B c3bd0ee1643506a2340bce3e1bd68c7d2f997e6660da4ccd99007b1e65fb8088bda60e036b91b860fe0a4037b5b581d436f5656dfbc083f2210fd0f5c08f2464 SHA512 f0d8e52128c7f83ba5829daa8203522c996c3207e268ca58b7cb3ec12d5f5ce10e9db852dbf425fb284e5c6d9081a37833b4855a98aa4d427c11c0f4d703cb6d
 EBUILD kglobalaccel-5.53.0.ebuild 649 BLAKE2B c78383a35384f3afa0b116b79dec5358638aa599e6d34249e1357ee9a11e68161e5a698a701dac3c425d0904af974b5646eb60365db748d2cb18dfca14bc2bac SHA512 2154c0d46656715fbca720faef22189e81cdba37659ff9eccd23ede8bca06ee4b2c1f1fcdaea302a7baf42dfa922c926ed9ac10e18aa84181a109dca402ad510
+EBUILD kglobalaccel-5.54.0.ebuild 649 BLAKE2B 140551ffa141e47aa4f86682c9c9f196e5b886bdb00d61546fec1f25e84225f5c7488baf35d9279de9abe9d0c35448b3b828e0185fe3658a79989dd6a780df94 SHA512 88be532090f26d28ec76469e4adea406c2d30a0a6cb4a323f43b592918194c75f9ffb3106be6787c6cb773387c00aef2c58aab4f75631f390540bd8455aa0ea4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.54.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.54.0.ebuild
new file mode 100644
index 000000000000..7a4b8a590695
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.54.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 7239a3ac8e33..5f8ed38eee30 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kguiaddons-5.52.0.tar.xz 40168 BLAKE2B 126cdefb844a6745c3e1461ff6e2172a3a7b6b13441b4bbb4f3f3613806f6f954e27a4fc2de8e2339cac426245e69adc670e48df0fb70b2402bbed58ec04acbd SHA512 b89013b2f7a75c8258d00956875b87746246a55b16039b789372439bb36ae8c54ca2f3fb893ad1e53a29cead28d50e5c789982f129f1666e29217947c2359c3d
 DIST kguiaddons-5.53.0.tar.xz 40260 BLAKE2B b83f40084508415fcdb72605be628a73dd8b0baed27a38cdbfb688e1818d633253c9b238f8f06df1612b9fab1b73818e4d3a209af42075f0d6239ecbeaac90ee SHA512 1fa60f012c2807abdf87a4fe4e90279f10ff7d9a5fa4db8e931cbebdbfd384c2b194d5324be71c4a3e5ababdb83907ea9563d71a7d2b2f0a0d8b2f39d79a9e8a
+DIST kguiaddons-5.54.0.tar.xz 40244 BLAKE2B 6204141ecb94dfa8b75341fd13476d64b4f62a4ba7107da8262c8a26ce7af4125815cd58d6762bc7571d64402d2f847aca478b326c1e03ecfe4c85dd02381e66 SHA512 660bc3ddb7f9c9ddfd042473b4f7783bc603be72a584f2e180f2060cb4ebacd2644e058595474c5a04fe61570cdac54e65335a4e780b0cfeda2015be140a29e1
 EBUILD kguiaddons-5.52.0.ebuild 428 BLAKE2B 6490aeec284e16661bcaadd39eea287bed2d95143a2090cb1cddc2b0bf4dd02d77dea8e79ae97e3aa6321c4c2b782a996c57a5cecb79b842d347f462984000e7 SHA512 67deacdd2038a546302f9b2afa62d2fc8e6c773cb81dcc5daf6a34d2151720c60e6fb3d5cf21497b862468292ceb4c4a95c904f5b34c30457afcf051ebd38c06
 EBUILD kguiaddons-5.53.0.ebuild 430 BLAKE2B a44b7e7bf3b8471e8eb97c3dd18ad47bc1964d993a28b3906012b560a187af66863692a4bcd75d103b0082144335dd8130fc0542b818e4808031190b9742ddbe SHA512 1735c0515587801593962bf9df1f294aeb2a0de1ce6c7694babeb10655d84ee2da4503496eb775aa3b905b12477ddf1526f94ca55dc0c6f71ecb175933a6b22e
+EBUILD kguiaddons-5.54.0.ebuild 430 BLAKE2B 1cf086668266ff70995c22f5c7281e97ad5ca93559cf03a668a301376b03a65ec7bea2c219592dd2097a1ee463421a4ad930b9aab35558da35d64a07fdc73a1a SHA512 b8a6e9e4d7e1ebbd215bac8006ee29e5557cd6fe4b8fcdaf39bdba90a0a5fe33bf25046a349d02737ffac0e88e777b2ed597a250b784bc98616732c80ca86edb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.54.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.54.0.ebuild
new file mode 100644
index 000000000000..4c2baec73ead
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.54.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+"
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index 9512345e2955..da3e99884284 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,7 @@
 DIST kholidays-5.52.0.tar.xz 202136 BLAKE2B afc2d95f4dd7d63541a796a0f3a21d71008ad3f666b1d9dfaee264431a68485e3e8037723bb3bbf8a834b427a55f0821f45072e9bd25be8bda6ca2505a89fd16 SHA512 098a2560e1c4814f0add048fc43244b3721bee3d50ff29e7f12c70ee6282659463b504094da03628e08f726f37e20f5a0c609fac4d37e6a1a25a3bdde7654b9d
 DIST kholidays-5.53.0.tar.xz 202116 BLAKE2B 74878f2cf66d66534d3b95dfaa2e20a71f6faedc967f00efe3a5a186efda174cc3bd22892b78b5ef05eef2451996e4b6e8b16464bcbdfe9453196ed0d0565b8a SHA512 e89395f054d7bbd16ff1621545d28027eaadb281822abdf80db33ef35c84e41ee02589f1c3a6c90051b7d42927f229bf9820cb8ed94b88a33fe5095b48ece015
+DIST kholidays-5.54.0.tar.xz 202208 BLAKE2B 4efd8f4168db8c265d0d0a9741227f3a70d6916e1734825037f6249f5bc2a98186dfb3864a6b096a63dad145eeb98bffb83c1502fd8ec3ff2b62a893143a721d SHA512 709b229c31cb59692d979d8dc36574997e05d674b2cd14913c620a968b243bbcd88f14e9f488f6aec6615102f713c1b4d34f6b817111396cdfedd470d358a675
 EBUILD kholidays-5.52.0.ebuild 665 BLAKE2B 44892a39412135b55c5c884a04bdb0ff5eaadb9e5319066b58da8759d54c96502a8ccef3f436ed418a2c5870509c6684e7bbbc161674fbae550575a170774021 SHA512 7bf4734a2a61d2a0d6116a9d1b9e9eb32a665f5379d20a671d079d5a0aae814d907a59ab8012f4d566ad0367a1719f7781c1787494c360697129ddc7e7bf3244
 EBUILD kholidays-5.53.0.ebuild 667 BLAKE2B 02d60424c7db2d11db16a956603b94ba88459d3b4abc003780cbf7c5318380f05bcd687b3e5a692077bebbd003ddbaf7ab1e491136bd8db37df2c1337b793c56 SHA512 36e4a7b9f90436c7b395de6cb1f5d655b30ba6bcff0d99025a524097355ef56aafc8e075c5ed6107b1d04d93cb65d34f13f0cbd02263d9a9da93fc7d62d32967
+EBUILD kholidays-5.54.0.ebuild 667 BLAKE2B 414065e15a35ddec4f048650e245cc16049f8e759a7c2cfce58c5236506abf19d45fa3b02b38e48fe18f91e43c6c2117167e2cd44ebdd3fa83dc38b35b3f9a05 SHA512 3d9004979d4ff393f0031f80fbb83ad7b923d20709340173279149cdfa84ed996cd613626117461d8270196ef813c34337040c0c35cd15e1ec90bf8c82db29e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.54.0.ebuild b/kde-frameworks/kholidays/kholidays-5.54.0.ebuild
new file mode 100644
index 000000000000..d4a88b0c314c
--- /dev/null
+++ b/kde-frameworks/kholidays/kholidays-5.54.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 0366e12a828c..7e461f10e240 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,7 @@
 DIST khtml-5.52.0.tar.xz 2077620 BLAKE2B 4aa5fcb2391410810aae732264f4f96056a2a600b175a18ced0d48bcc8eea6b5423ea6f4a056fcb47b6d72173f25c68a21afd7a0eb0a8edf7727861e4fb39b61 SHA512 99010dd06907bcf6c549078f53052fe0cc153fb3c07686b5d3e4d77b8d5fe19fd0bb13a6d17f8e7efe525bf84b2bf9bd3a05948862b5a43de94929f21e0bd69f
 DIST khtml-5.53.0.tar.xz 2077000 BLAKE2B 5aa9c5d2a63100201811e01ab204233cbd02db62349d2b5297ca3f58d3812918195706d1419a1bbd732d0577c2cc56649dcd13ef25921e3ac195e22d89884754 SHA512 5bc50aacf791dea1064945cf1b5aaf634e86c568ff73136b473888a54d4ad3bea239a793b928f1875d5f79654b7072203f21a11b321adf8f686df063b0656240
+DIST khtml-5.54.0.tar.xz 2077240 BLAKE2B 8ffdd0d63aa4abab4eec913270db53da59d7118c4a9bdc22529414cbe72f9c855f5f022aea4469b4744ff8c8545a5dc7dbd813a7468f78b8d8781aaf1d54635d SHA512 622b4c3de23ae3424c9d15651479a7c23fd2011fc81256eba56b9e4b7f7b405b57710903f098475dd46771aaf865b973253a7a16b6074c6aed211c2567d3ff83
 EBUILD khtml-5.52.0.ebuild 1584 BLAKE2B f61a16a08550f0f6056689886964a541be9f186d3958fb10255ab4640c18eab041123bd6454e9e3c3cc3ee85bfc6aaa570804e161eab66b1044338406f5e53c1 SHA512 847bc2096301f9018a61691b76feb4627b65072bdec6433188918dc3d4ad607cbe2665a8d0f0bfc4cf257bbcae8c77b005cc83bb0215bd59b52525eabb8427c4
 EBUILD khtml-5.53.0.ebuild 1586 BLAKE2B c0f52dbaa405c2198b425f492c6a1b8a4017ed7bf58ce44edebb598f2f9d196c9556bc52ab7f1cb49970c492862e83461749386d9beec0e5821ea02fbc8c0706 SHA512 8b15f614957698f038688fedbe047db591e8c94378feac3ffb0f01028cc5ab36b68512ddc534f630b38aae1022b069922889532337d9100f8c1a71e8a2efb8c1
+EBUILD khtml-5.54.0.ebuild 1586 BLAKE2B c4fa52383fceb7b67176c971e77b81839fcfc5f64413ab5b61306cacbcce069ee7ec37a24d128c0dfe428621ddc366cec429bc5a66456e2f7a971b26efe263b7 SHA512 2001ed05d1229be2cd3984a568e2c1dc6cb8875c1a7fca54dd780e16b7d63745c47dea5f0b9de50cb5eeebfe40de69efd7aa4d9779cca5c0222e50334f0d4d29
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.54.0.ebuild b/kde-frameworks/khtml/khtml-5.54.0.ebuild
new file mode 100644
index 000000000000..15a423c5f1bf
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.54.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(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 qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	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? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gperf
+	test? ( $(add_qt_dep qtx11extras) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index f2c731391551..5d883afec4c5 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,5 +1,7 @@
 DIST ki18n-5.52.0.tar.xz 586776 BLAKE2B 4470c9d38716b3fc6fb66c484eafc75ee367fdf4da8f75cca3343186d9cee7680c972e4f20e343e6a175cef0350a9b142ca5f465ce6075ecaa7e0a30635a19b4 SHA512 67bebc2dbc92d4ebe49760b5a7bd5fe0f6e1cbebda35a72ba45722a22790e802ca35e66ffaa648fea79c55a0b7ea4def3deda303279c8c602838500c47e4bd08
 DIST ki18n-5.53.0.tar.xz 586924 BLAKE2B b7b67ba5eae6c54c43823aadd4b12a1ddcdc1e3dc2bcf0449d1e0fb374fb55fa5ca9c6c4995fd8c519cb35b68db7281b2115665c86779452d1b70340ed48589a SHA512 c8cf728926b66255650a7cb6cdd5b70c9a9a8d73ca95f54823f6aebabf4d7551efbe5d8a92831238a7216311006bd174e3b7a1580d985a1d681b4201726ddffb
+DIST ki18n-5.54.0.tar.xz 586796 BLAKE2B 8c7846526e3fbd08f0feab8b3726fb92409cebd8b0ef5c84176941d7258f1089e479d76757ca801b997acb7a2c7e98d1603c6880a7ca01b90cc986b73cd21b7d SHA512 1c974a8445cac7474b989b641b154c131f6231d97979d3c54e04b6182b10f87d3412d9e75503ead09499e83d30e2eafeeff9ddd8683fd2005889e675311a5bb6
 EBUILD ki18n-5.52.0.ebuild 679 BLAKE2B d5535efd59b58297e0a1d1a476aa4bbee2c3616e1aae38688fc81561715e8b1140757de61bdb73dc11d5245d331d44cbed79aeab0e3b252de4d86197dc8ad7ef SHA512 f9b2cf3aa45007b934d30e3dad9362c90142ffed1659c8c8ec89995ec159e34936d27465eac0974fd319f270aab62c5be460310a6a3356842927cf02fbc8fbd7
 EBUILD ki18n-5.53.0.ebuild 681 BLAKE2B d2bc3c0eddffb4b594c34d1b9ee75435626ee0f1cc25555efa11870740a2027c77f9e00651738a9fffcf4f313995b51e43905269b805c55dd231230bfc045e0e SHA512 f45b8922fbb07581f399db049700b532213f359118ff5a4637d996a076929d246fdc9d1f8033128ad6b3bfbf51f1f13aed54e58ba4e9b4725e99a7a8fc376843
+EBUILD ki18n-5.54.0.ebuild 681 BLAKE2B 2c33fdb75860511ea9eb55d5b69aef2fe7460182ef735b1a5ccd675253035c7841f45e4559ec3dfc247fee64bd0affdc1abf9ea8b8bb54e2a89922c5f5c81adc SHA512 4bfe2205380528c61538b1c6661154224d852e8b4d48244f1f261e3be5f593c6c8ec9990e2a378c8978b7f3d38eb08f7e6861b3ee541c0fbce6c93542e9eb42a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.54.0.ebuild b/kde-frameworks/ki18n/ki18n-5.54.0.ebuild
new file mode 100644
index 000000000000..5198c71eb720
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.54.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_qt_dep qtdeclarative)
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 3ea55eda1235..303d7709845c 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,7 @@
 DIST kiconthemes-5.52.0.tar.xz 207584 BLAKE2B 2ae24d0ca562e9c14c286e1c0e45576be34e9890d84221dddee815ebd9098964295f0c5f38c748185ee14cae3cf49036c3044fa4c7dd804b209239e3f4371d5a SHA512 6a77ca06dc4f600e3ab5d3c1a24538423fe9c6f472d07dacbe4d42315e626903206301fd5b5f1a83d74243cfaffcc035e5925138d641b0979aec203ccd55e0ba
 DIST kiconthemes-5.53.0.tar.xz 207456 BLAKE2B 62a6682c55767d11d890a66381f49451730978471e0c0215aa2d9c112d82186577a0cdfeed23bdf7f6e0dcf2b717dc69d6beccf7e554c37c3785752dc18bdf79 SHA512 e920d0f0451b6664c6b1c5823bd9b2715fa5b7c608dd1d27532be9735890d18c9ca69e71287d391af99fd5961fbb003cf22b446dd56ca62838890ef51b4f9cb6
+DIST kiconthemes-5.54.0.tar.xz 207420 BLAKE2B 0ef21e13d04c3b16874194a7c6550a33573faf639fce731d955440b481a335ad797a4c31f7c4e035eae71a7fffa62b2e19f7313b436bc3b89a68cb4fe0c9fe6a SHA512 2a2f053cb2cc1cdab4dc30f42e51431e205a75406079df583c97f2ca39911cc39f9dbb6f56b44138242d7a9e54234dc36280b48859bf3867b805d66da16e4454
 EBUILD kiconthemes-5.52.0.ebuild 661 BLAKE2B fc1662b7447771626dc0a4afe325ba2152affee3821fd0263a2251201366933c9b6bf87c603ac92d5aa4ff1384100c9d6f0f755f27491e1148bd90d29eaf9cad SHA512 4395441c932c18ba05d4b2f58202a9f406a1cf1b96189b59e5650e1ed2a6e4a3553024b0ece376a2255475b05a64eab6108f2d9934cb19daa5a08499b7a82f3a
 EBUILD kiconthemes-5.53.0.ebuild 663 BLAKE2B 90140183f4a5284a1da13b6b4c4d130933cb6a8dd0e3ecdd921cb45ef2bbb41327a05d87b4957cc06a0b75646aacb6cbce1b7b23f00a3071d8ba59d5dec06bbd SHA512 7117d5445e6753d4ca7b191a7ae4637a167d91637648b2dd1bfe6442008850b70abcc1d2ae2c298e746c6565d646543b94f46d9cf1d68d865446dd29740976b7
+EBUILD kiconthemes-5.54.0.ebuild 663 BLAKE2B a1ebcf9b3d6e605f54303e6d695f83e6f2f02990edba4371916bf45d289aaabb2388829fe993740fdc24cf0da7b23848a7b52e274bcc2978c380ab05239a12a4 SHA512 90d4bb654793a2c39e276f39c4f3f08a05c935c5a94eb5109ee6671e3c9451e942962c5b9c09fe02361dec6a9ad006ea880a75beecd1800de0accb7e22d98e18
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.54.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.54.0.ebuild
new file mode 100644
index 000000000000..2ec93c89bcc5
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.54.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test" # bug 574770
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 9341ec9d4abc..9fc4655ea51d 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,7 @@
 DIST kidletime-5.52.0.tar.xz 26600 BLAKE2B 9215fd81790c592fc2e243cd8856281063196fe45d7dfcf92ff2cc50b619683c0942e17d1aabe5bce0d17b505b96d54efbb3440a0293c155c77416bc38640426 SHA512 abab5fd1e4946dc58410c1d446e97835ed1598ed00dfcf708cd4d2e048809c91f91a6b6da425f767e45a83b80506362dd716f70521b0f1b2101750ebb65fc036
 DIST kidletime-5.53.0.tar.xz 26588 BLAKE2B c39ea07494667c39170c78f71671490f0b285265b57101f0538a2e2d9d17d8b23ead10f4d7115fb4cad327d390ec9c68a1c90d895f593c80e8a2b67def1b0ef9 SHA512 d968a437b03f9b6e1f5148e1a23e801ec7b26151704e80cf432dd811d5d54da3709ff523e8951b9247cd04ff6fe54bb7836ee166ed8db982d6d145d1dfa217cd
+DIST kidletime-5.54.0.tar.xz 26608 BLAKE2B 3a64e9966f1b4a6219293392c925bf4adb4cf18dc07c1f72921cb9772de813c6580877227dc6c77ae90ca969beee2471ed462a6a7d96551388ed1afaa60a071e SHA512 accb3192afa4a13b0d545442e89d0875c6a056dca53581a41c6a51dfe6d775eaa6d5e7cd6d75407b882c94a52fe1e38cf4f97636745bb6a15a7dc9b00f7f4693
 EBUILD kidletime-5.52.0.ebuild 851 BLAKE2B 1ace47f031eaebb4e6d2718fe3395e2e87d1a14764289c04acfa3f403a009298e3f3b30a6fef028b966332a36653c58c958a676055b1c582718eb6d938649c86 SHA512 024b21592cd134e3a73c5e24c0481d24ca9a7a3eeaa723c871e9e1c664e63e592dcbe9707c8975067f216ddcd02d1f82aaf77869c5151452f5cd40453e82306c
 EBUILD kidletime-5.53.0.ebuild 853 BLAKE2B d487e2a6856324c47991d8c94f2bcd4b7ea484dc32b4f4c0081a74dfd26330ac8e06b3423f4e3beec89f9e0e1652d28abd485e80e4e78d92a1d67c2be3ef11b9 SHA512 b6e1b4bc56ff53fa8a23d00ccd6d526a45233e87006d7e7fa8295b2e43db73327eb34980a146c5a61d3e7f5b720fa160a74cbf3b5e88781285032187b03dc9eb
+EBUILD kidletime-5.54.0.ebuild 853 BLAKE2B ce8157225480bd4fc5f85bfea843416e083d8e5a607c31b2ba72e38f8b4e43647750ee851b693f3f3f4db3719fe06824274e7e54cc7904e5bf5572ef0afdbf42 SHA512 ab0e002b0ad2ec3b1b3aa69f8881c2b4e02755fa322ee17570bb9664b80776720b5d6fd31ddfc11c9a03cb453f843d2314b4b85c27f1a4079405941f2eee3dbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.54.0.ebuild b/kde-frameworks/kidletime/kidletime-5.54.0.ebuild
new file mode 100644
index 000000000000..a847011334cc
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.54.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X xscreensaver"
+
+REQUIRED_USE="xscreensaver? ( X )"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXext
+	)
+	xscreensaver? (
+		$(add_qt_dep qtdbus)
+		x11-libs/libXScrnSaver
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	if ! use xscreensaver; then
+		sed -i -e "s/\${X11_Xscreensaver_FOUND}/0/" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index e7a15eb86cbf..b0a0bffac044 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,7 @@
 DIST kimageformats-5.52.0.tar.xz 204636 BLAKE2B c043fa9b35a4c9846ea0c1c11172fe36359dcc498d655a48bf6178563328f6030b71f032abd943689e30db65e32b7896785dc51635b51bfd8d21c507938e2063 SHA512 453a4101f29e2785f726e5ea78ba41d889185146a3519df4b6e05db4a6c82fa0f116bdb42d7f7eb186ffcbdf01222292de9e471996341111c14671c0c9ea236c
 DIST kimageformats-5.53.0.tar.xz 203472 BLAKE2B c769537694646ef6a6605941868504e0d2e14f033381341d3f35c049d3a78633e8a4e892e012d8954a04a34131318e893955fbf68f136a2860e82e4305bcf077 SHA512 90f2af9d0a27becc15c0b9d8b63a43a9346a9ae7b06b0674964e6d5ebb80679e4cac8493f004deb233cf6ed95b38d163082c3cdc80851bd4d72a4603acd68d07
+DIST kimageformats-5.54.0.tar.xz 203148 BLAKE2B 4540dcb8748a889d325669b94d398dcece2f4a350e834fac79d6aa3557accc76204842d613c9a1b6ef845826bd89c3f06ed65d7552b57d6c4b8aa4975a5126b7 SHA512 69b61a67a03e0a406cf489a375e77528fcd58f54e2ff6c44924b4b2dff51bea5eb2e3505adb33ed60b423ea092ed549c882d8fc027c92198c5747b0036732750
 EBUILD kimageformats-5.52.0.ebuild 818 BLAKE2B 9fee398a8a0e2d7f879c082e1c07605a19dc192fc66b57aaf11c47e93f25d96fd61ed90214cb3a81131d5fd4c3018a0c75b76c78fb9528977e06b4a107e698e6 SHA512 89b6e249386671ffaac0c585b8048e16d916afa7ff69395d16deece4fef74f9b4ea4ca1f77a4569447191ff93fb88aed9125bd0fead120be38dd6b393bfd3191
 EBUILD kimageformats-5.53.0.ebuild 720 BLAKE2B d593ae5adc85c64f3007c4eef15a4508ed23d6673c39eba15285ebab55eb8fd9657b7aea024abb1a4847ec997e5c38bdc694ce52438800b49608530bbc36f795 SHA512 e1e89f98913df8c89958b7b2ae2f141c571369d96688ede5b6495ecfdf4d04a6514e8d4cf9cea7142dc91a6c9c480b9ac2210cd4fb40003d35689ca6ff2b8ffb
+EBUILD kimageformats-5.54.0.ebuild 720 BLAKE2B f03dd407ba34327f7b62fed214f455ba49688509b87260b39ac2136c8d5e7abd3652d54ec8a04aa55e74387404cb20bc8bcdd2cbd92c1a2c44a2e7760cf16e56 SHA512 8dc67f50347331e8880e5e5ea3b83a76ba3c336aac8d2114a7a728e2d1c0afc3821dbfaa1dc568ab6589650f7a1ff3e48cd9f7da8f648c3135d5cdb0a38dc911
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.54.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.54.0.ebuild
new file mode 100644
index 000000000000..b314e7fc04e6
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.54.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~ppc64 ~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/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 39318fd681ba..956828bc8fd5 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,6 +1,8 @@
 AUX kinit-5.53.0-systemd-240-soft-rlimit.patch 911 BLAKE2B 72ef40bb3635003107a39dcf265eb917c5960cb264d63029f72b65ad0909893017caf9b705ce803f81fa426b8398ceeaaa7d6ca68656fbc3ab24d19e3f30a3fd SHA512 c629bf2b9950782dd1b2723efbda1f91346702d0d85761e16ca64ea2506779e508ee74a57c12d826857b910e2692e42ba854cc4ac688d869ac16dd0f1befa8e0
 DIST kinit-5.52.0.tar.xz 120156 BLAKE2B 01b01be684ab94cff18a39893e9a74207e7ec98b593c6aa88980f50d1637033bf3742a40c092d804c7ca4cd5e87cda18a1c9b43db1c59f43fb7b22dca430e05a SHA512 ae3e1352bd5fa95a10637e26535fede2294b0048ca35efed66d58d687b857ad5605502cbbe2636f1bf193176fcaf8b8a9057c1c572f0776c814641962899b88b
 DIST kinit-5.53.0.tar.xz 120240 BLAKE2B c5d0d8916b62abc79e7c4a095e89949ff5624081970ade81f57b9f9818d276a5f7b7745cab84fdb5128eea51f19404b645b5d863bc9a4a36abc3441aed733ec2 SHA512 52561fb6747bdf229dcf5ea9b84f0df050454c6b587630816184f65d2bb552401dc28eb7ed96209a1ff70374e1033c27de26d143532be5a3998ac69cdadd3f9d
+DIST kinit-5.54.0.tar.xz 120228 BLAKE2B 1dbbc2e49822b1377dec8785648d2baa43e93d77d7190fcf02ff6bbc6b73d47db280d81fbe8311d8fcb32d51ebc8f5f50406e86b4f83f3c92d0951d7cab89473 SHA512 ad7fa0228a4595cce754e65227ab979859827e1773148dd00de95e95ad25d78dae80a4cf04106a1bba5953c6c0acdcaea5e966c83de2f402be33dcc588106ecb
 EBUILD kinit-5.52.0.ebuild 998 BLAKE2B ccd30cf750d176e49f0c7ffaa894be38816c7fd8e11a4487b233067298811d6c46eee18b23d22c946ae64365fa8fc7ab9dea0a26e162c83d3bf074d6713dd933 SHA512 e870751ae3e985a8ba808dc7c94466549bf79846d2b46260373ca80f9205ddcd808e9aafb76fe9d76ce0197b5fe98072f05f2c57ba4088371548b6e9b3df05bd
 EBUILD kinit-5.53.0-r1.ebuild 1062 BLAKE2B f95f4efa8ac061285e03537158babb2011b7ade77bb85c59fa980114478d157d33ea13e90208a01c03c79ddce2103da17ce6f0ecabca1d5f2ce9dc00e8b7d34d SHA512 de5561a319c922ea61fdfbee771ad220312ac64cf67201b3530ca096de17fb1a7ceff5a41e830fdfc82e1e27cc3321eb8a8de56b64d2993a73c9ae7f1b7e5579
+EBUILD kinit-5.54.0.ebuild 1000 BLAKE2B a9261a843f61b223b36a196c18564d70d0d5670a906195a8d58dde2a3b11e4481e5bfadb96e37e5af785ce7efb1bbc48efaa24e8bbc4edfbee18810904a0b989 SHA512 33d1243593dfd2319e0db61859123af3195021d1b8838537e8701cb584215e4fed5ff8e85816591314fa7ef3399ecdd413e5953eeda7867f7c230354220f373e
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.54.0.ebuild b/kde-frameworks/kinit/kinit-5.54.0.ebuild
new file mode 100644
index 000000000000..feeb6e977630
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.54.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+caps +man X"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	caps? ( sys-libs/libcap )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+		$(cmake-utils_use_find_package man KF5DocTools)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 428b90e1cb53..77ba86b49587 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,9 @@
 AUX kio-5.52.0-sendfile.patch 3571 BLAKE2B ef2ce58c2e0c00a6982c52462f0124bfa3396d5f75174ee646fa99023d1d580cf6bf4f5fbee051b2358406e2dd6da863c1b757dcabdfa5e919c1bc0130598023 SHA512 694dc4f737b52a5b1f014a824aea7c97e0f50886db9e53152e3d42359f974ae1a2abada6cc1ab41816149b410e548e705fd46f1fd11e148e8ecf027c8ec7e990
+AUX kio-5.54.0-elapsedtime.patch 1202 BLAKE2B 0074dfb3c504288f58109756d3dc540e1cca7e79520122115b73095dbed342e9dd78a5a2ec41aa6b0d6695c31869f2850bed3cd2bda7efe540fb281a3cd60391 SHA512 36e03672af0fd8703be89a3e1b3dc5cc88c47b0cc63e75fcdce1e0f5126537a216da4f7ce103ddb423224e3ef51d5a136eced1d2239f85bdda46905932e374cd
 DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc SHA512 b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36
 DIST kio-5.53.0.tar.xz 3143732 BLAKE2B 89be51cf5270b978fe4e8f28a590b1ad2b39fcb50843d51b99ced22dc5d3b91958975a48110b38a9138ef77f7b618deb6f9f769f403dbee2d31dec1d89717b3c SHA512 121e87c1a0fe17c4b3f1102af34ef65e867efba5e352549da830f874420e8f2b4ee30f27281cbd844617f3d9bf15fa6dfc3548ae86366c70b8ea4e083bee103d
+DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d
 EBUILD kio-5.52.0-r1.ebuild 2000 BLAKE2B ab775c026509590e2459340293666fba63d963d391217e344fee45f283327874f326aea670280bf25670d617ac1a3f8eaa0130e134487f1ac03193fead1b2e71 SHA512 59fa067468a6048af3e0151a4b4522afd6ea5afbcd155b3c20e18c1926fa9f9cfd027b2b41ecb5b3433bec6b2f13466ae7e67124c1c93a894b5092ba5b6b0af4
 EBUILD kio-5.53.0.ebuild 1955 BLAKE2B f1d5fdf44f0a9b845d24f8e49a6817ea34c6328242481900f1ccb3578b3f3cf75e2527cc36d4823b93c9cb043d7e153eaa8dee301130bd0f4f966a2a2619ac90 SHA512 13ca85fe2e6a7e98537ff7c5d781762b96eeb8411e3460b62c48d12fe31ca743012675635ca9319c6eaa5a51ef341fbe6f201eb93e6507ef239af6726b843b7e
+EBUILD kio-5.54.0.ebuild 2073 BLAKE2B 804e180f11b84d7e58af5570f02cf712f250cda50ad5766ec531719a1733c98094e4d1780b02ec4cd8c74ac60609b5994a6c99250ac38f8ca645885362083ba6 SHA512 034184d34c18909ac61a2f7058dfc90a66bfb306143644073c7c14a3e445ef1a47deccccf60253e1c1ce6e49dcc7baa574e969f9f5b5fa7c92db0652ca95cca7
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
new file mode 100644
index 000000000000..d18347fb63d4
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
@@ -0,0 +1,38 @@
+From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 10 Jan 2019 16:03:06 +0000
+Subject: Fix elapsed time check
+
+Summary:
+To match the code it was refactored from it should be checking the code
+since the last time we checked calcSpeed, not since the job started.
+
+CCBUG: 402665
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D18158
+---
+ src/core/slaveinterface.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp
+index 6eb2b08..d79b498 100644
+--- a/src/core/slaveinterface.cpp
++++ b/src/core/slaveinterface.cpp
+@@ -103,7 +103,9 @@ void SlaveInterface::calcSpeed()
+     // using first and last item from the list.
+ 
+     const qint64 elapsed_time = d->elapsed_timer.elapsed();
+-    if (elapsed_time >= 900) {
++    const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time;
++
++    if (elapsed_time - last_time >= 900) {
+         if (d->transfer_details.count() == max_count) {
+             d->transfer_details.removeFirst();
+         }
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kio/kio-5.54.0.ebuild b/kde-frameworks/kio/kio-5.54.0.ebuild
new file mode 100644
index 000000000000..3256957d5aad
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.54.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# drop qtnetwork subslot operator when QT_MINIMAL >= 5.12.0
+RDEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(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_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl' '' '5=')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index f8296e063c59..8d325e3afce6 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,7 @@
 DIST kirigami2-5.52.0.tar.xz 121592 BLAKE2B 17882a910b1f55af501c14cc780c6f6057da9afde5b80cb8bb48f82935e13cd612c853dea3e0709073e20a277783e4194cdb4f280a035f7a5ef01cbd589c91eb SHA512 431b1f91aab2bdb4ddf74cb870c3deb6cc67a99252affea06228536eeb39b50fb15e54c6918c6a045c37066055b9f261e130dabc195da2e47287be8dbe14ce55
 DIST kirigami2-5.53.0.tar.xz 124124 BLAKE2B 9952018813c6fae9e28a3576d755d06f076b37ad9fddc6a0c05690e99f196b372b54c59f37d63b6bdbc015b4062102d6ed33da923c3121111a0eeeec9a51bada SHA512 bbaee166b90b1449f174e8b8a1580068a0b03694dda20b4c29c2f960c1a39863eb85db7cac09c9350d4844a72a1c59e4e5593e8f507be0397f382c6512922787
+DIST kirigami2-5.54.0.tar.xz 125784 BLAKE2B 7aff7446f578514bf28bf02cd10e84d203690d09c9033f79cd1b8ed42d3c3ab6f02cc65bf94b18193e9366a257b98897d893e65097ad35f9c017682bcf09595f SHA512 c85dbc8790faed84e7b59f703966f4404fe6a7c7d7e83ba4ae6d6469cd01d2a594aa7b5fbda460839df504a23a38b1881748c9a21071cc68de050e3760f25406
 EBUILD kirigami-5.52.0.ebuild 926 BLAKE2B e513bb1b5916895125cf41cb5261829ef11027628c938c3b78ff37c6ad1eb7b62d05d7c83f2672fd8929c13e7ff82429d33c8a5d7ad60b7f3c5877351ab071fe SHA512 c40993cc6f2074c3e5333cc6e3f66ce26039ad46fd26d827386014ecc5ef9dd7973dc3281a6c6d3b048dc3badda83c7a9ebabb0ff82dcf95a9e7721b3a1d7f66
 EBUILD kirigami-5.53.0.ebuild 928 BLAKE2B 4a19edb99a477a9b7b865f2a351c614f6152a1be807e9610552d7559f819e38fcbcb8acc337a1d636e07f396caad45f0fe2a13aa15922acf4fbe617584088095 SHA512 55112ab5c94fdc44b3e4c0637666b785294b667631f71f57205f587dc498c47a16e19f4aa418e05ba3f76c1afbf46bc488fe83d08a6e365fe201bceaaf9fe6c5
+EBUILD kirigami-5.54.0.ebuild 853 BLAKE2B d1bb80fbf68d9ff558b136cf8e688ddea5fca729a3864659088d05b0b8ef8458b7f64191b4d5d4135ff4402283e26a6ad3cc4557c9f5ba9617352905e7c4fb20 SHA512 ef0a9792ba039cb403cf479229d6471bb024fcbe5a32381b744c101f19cd5db11719f88592f2ce87a85817ccc8ddaa7c7c3def76d05f95512c665f8d652ee9a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.54.0.ebuild b/kde-frameworks/kirigami/kirigami-5.54.0.ebuild
new file mode 100644
index 000000000000..cc8a913c62f7
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.54.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="false"
+KDE_TEST="true"
+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 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(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 4d8adc386e19..fb86953b7a76 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,7 @@
 DIST kitemmodels-5.52.0.tar.xz 390160 BLAKE2B 5b4e85fbbe117443e39e237771121601a6016990297b9253d592885c1f0cd8cb99fd3880f72c8650b0eaca58771d9a9f23e28c1fef1fa22c3d86335274946aca SHA512 8c5806e6e88f7ccff904e3a305c8eaf77a86b54191a28876b51e397b497bc6f4e543a776ea15b52c4169541ea7e03e51341d64c08f3ed0aed6e0b2d2629d31ee
 DIST kitemmodels-5.53.0.tar.xz 389920 BLAKE2B c523db4f3612dc40122fffd46775d59ca0ef7aca583fe629610efa8c0005d92cbb795442970cf476b69bc2b4b81096893863920cc560311c2826dccd4a974bdc SHA512 59a4551506e4fb353b12ea80450f917e79e1293af4a2ef60398f20fd888c5979bd39f64d7692314a0a1800ca88dbb7f309415266fe81406817d588417c041212
+DIST kitemmodels-5.54.0.tar.xz 389708 BLAKE2B 3e3c7cca454c4d0177bf2109ad3a31841c24f4624fca13dee10ba1fe996f9cb8984cca5f09ce4489daf75175fdb55ae2b1cf3d21d749a14774de7325777564d6 SHA512 fc2941ef7e48a72a6c08cbbe78b1cf16c4b0e6f06c692386d8ce6ea7ec323b067b051d3489aa8fb0c0f02e5d92a8937f6b5013c04211851f6507da30e5811475
 EBUILD kitemmodels-5.52.0.ebuild 350 BLAKE2B a769fd2d0074c18bfa41734dfb5ce0d9a3b1b8eac30bc2f0318b72c37ff892edfae6d59ee45267960c5703f724955f43d92a0bb09badfc51cbfee53147c9517f SHA512 3ad9a064d01a71e7fa34f5c1f454ff181ecd8646c7111225a3ed29c1cc59d3af4dc8596024615c5c7b1c357ee07344b56ba8ef5bd1b3197ff051652059ce137e
 EBUILD kitemmodels-5.53.0.ebuild 352 BLAKE2B 933b7434e51f433f24eebcd4d26567ba83c0c9954123b3f1ac89d46651d38b589a558127ce0d4beb770ff724dfb5e9835e9f83e687625e4a5ee7b78cd0bcae01 SHA512 83319266e1a9ec8dcf5882b288f7682ebec3a1d32ed01b1d698bf59721da1b1223f35b568234e94d8ad669f8b50beb3ca6166106fe272a67fa6486ad06c48eb9
+EBUILD kitemmodels-5.54.0.ebuild 352 BLAKE2B 8fce919821b93ea80b7719a86b7c7dc8ee31d042abaa271da79ea6bc8e15a3497f7281adab7115d3791c923228e48be003dee224b6d0a37ba47633f46d6abdd3 SHA512 cb643d8c10b23ef3bc8f9dda43fa7a822bb1cc04f66e0b59a3d81e275fec4106c837b551fd9ec79085d54230528f96314b3f289c615490c05705bf126b6af58d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.54.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.54.0.ebuild
new file mode 100644
index 000000000000..137170a230e3
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.54.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="test? ( $(add_qt_dep qtwidgets) )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index bd39da2f951c..d0c3936fdfa7 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,7 @@
 DIST kitemviews-5.52.0.tar.xz 75024 BLAKE2B 5da37252bf56188baa41af73095ac19aecee87465be9776756d95f175f6c4d6336a031120b495edfbf8dad15b82f3f4c6ddf468b8a782c246f3b002d4e915ad9 SHA512 09840ce85ea479f920ed99e48be6159893b1236e4966157d2f92f48008618209806ee0d49356a940038680ff4e480069f38b7e803dab7561568295fe066ecab7
 DIST kitemviews-5.53.0.tar.xz 75000 BLAKE2B 0889253594d7c447409ead315f50e5a6b83f71175b838b923a1be7adffa3071080c3213419c28886342832b91743add6c5bf97ab43687c8b75b49f1221fd36d0 SHA512 4c51fab6a2587888c8bb5400c47500d1ab626565da1591f9897de0c9410b98261dd164cadbfca9b2b46ce3d43f862573d1a27e69b51a3df0ca7c4fefd53ba071
+DIST kitemviews-5.54.0.tar.xz 75028 BLAKE2B 287c81744c555025330b1cd8dd9a36a1a571466ad69a6a1dbe436e9ad0f64fc61ec3837c302b3f483a3ca17c5083d03bb05f8a687da13a5ce35f8903aac096e8 SHA512 2e664c0a05ae9e52fae93ecb509a64e1996a286c91083aed61f367dc0b4d0d51f2929ba10288be9a08dacae9c3f36953836812ef9097e3dce970830ed22fc794
 EBUILD kitemviews-5.52.0.ebuild 402 BLAKE2B 4c953adc32048b7173ae143b6670c91eafb19b8c792980869cf19d720e81c2b1445aa83cca6c2db44dca7ef464c556cfb0053d7c5b150251f4c45fde31bfa4c6 SHA512 1d7a2a44a46a758badb61c0df9a2d134a57282a607e0bb0769e014cca6f60510ebdda6496f09c71509d2cabf1cac83092c4a301fa8c977ef3904101e96eb22e6
 EBUILD kitemviews-5.53.0.ebuild 404 BLAKE2B 28ded3b075c2b1a30f16be601d8f7f5e657c430c2a7c8d2638bbc9f317b343be09b447e7df534493867805c71e47bfc0a7a7736fc68148aa2c54c6da51311351 SHA512 b0da8e4e3954356c72b5fcb8fdeed854250bd943110db59f061a58e440a85e5cb1274b39433c3c75687b7b19919ee71e2aef1d247066ff6ac08d9ffe3db97a02
+EBUILD kitemviews-5.54.0.ebuild 404 BLAKE2B c60492bec4a5d3865b48629ab95ff515be3b5a0468906b43b54bd09e63490217d933b4b4aa180897a0ba343144524147fdb270560bc1065b694b819351b399c4 SHA512 6e5e959fe9f25f6a3201a694b4c7614b5e03670494a3f2f8b1f3dcb8370ca3b0be1e730c46451a6261192b1a2723d7a6db97780f296c286dcb87727eba30a927
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemviews/kitemviews-5.54.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.54.0.ebuild
new file mode 100644
index 000000000000..8194a1f5b880
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.54.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+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/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index c966e08ead36..f507ab6e8d80 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST kjobwidgets-5.52.0.tar.xz 87308 BLAKE2B e0c1a32158d8646a87903c3b45223041b3de1ac1311800762f97fbc1f2ab9de9ba3ee0fe2f969eeb98de4233e649a3605e2ed00f55eb29e86c1fae371fddaeb1 SHA512 7cb0439f004f4ede9842e09cb5ef959933b0014a0efa72be6021ec38fad19aae999de1ba87848794829fb2edac0b85f1b18b545b0baad0707d71aa1f73af478b
 DIST kjobwidgets-5.53.0.tar.xz 87252 BLAKE2B f673ff3107175aa8f97c47e71d731f1a7bf0fed19ebb9192729c6d1a52e8addfa4cdbde4eb5bb5db2a357de20ef3c8295e83ddd2dab162dd4293bfd4e6f7a4aa SHA512 a9fa67d35d119e43677bcf4a910050623fdec1088fa57a42e7e7f47e3089c7cc18382a679cbd374678a95403b1741973333c50b39ae7db683df4de1576a0cf92
+DIST kjobwidgets-5.54.0.tar.xz 87256 BLAKE2B acf38c6f4ee6136b328d1a3c374cf2043886a6670c95a7fd6af753af3dc895e3e725508747e0575ccdaff46736b0fcaebda30f773b6af75265f0c85d3b1c7785 SHA512 2b5eb64557611f400c4d5cc12c5e062a2ea2bd84e17fdceb34c4fa16d746fa04443bde5961f1c01713ca2a61e1b39172723ca58b6c45888d13650ee752be9701
 EBUILD kjobwidgets-5.52.0.ebuild 678 BLAKE2B 2d4fb26fb5506096c19f57fa506b69da3f2836693ce1cababadfcf06a75a0d663b88a7677280ff6f57737e0891b382a1e93dc915d19688093b8c5e2eae2befb8 SHA512 bcb87196226008e64da4429b9fc25eb925ac4b640258cc481662978c1185e06a739f877cee831d233fbdff02cbe84cb299367d18aa77aa6265d879301e9ef115
 EBUILD kjobwidgets-5.53.0.ebuild 680 BLAKE2B fad0972ab9ecf804261c3eb23abb86499730b84007fc780eee37e180d02d72a1ad1952e50cbcf5b0a10c15637ffa92a20f531c04e672ba26df5efd41e3330d59 SHA512 97d1732eadd6a7aeb769787c5e97e318a3fecd19725c56a2a80c2832b281174bb5627abffeb8c65cc594525e5578173791dfd7314759fb3d6c5b486cf7f6cb43
+EBUILD kjobwidgets-5.54.0.ebuild 680 BLAKE2B 473327652c7837a6d1a026cdf386ac54eaa429eff70d21b176b6cacc4559af5d79ac5c2c0af6771d56cc9e2b6cebcde7f51d63eb32a3074e6332fa8528e8c153 SHA512 ab07427ba90f7f43c4950bd28bb6382025f8b68a85344e3e4f810642d79b995348bf2e3dd1375d5d92ce8ed21907109fbeaebdea043ee8e177e028a7cce21d37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.54.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.54.0.ebuild
new file mode 100644
index 000000000000..e119d854f745
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.54.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index eaf8805bf800..4851f753e412 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,7 @@
 DIST kjs-5.52.0.tar.xz 294856 BLAKE2B b95518ba968a0d65e318270ae7ac5438703e16354aef2bd22ef2b312a150b473a965a897fab2014275c691bcf8734fd5e97ad40459a083207337358cf4fe77b7 SHA512 9c6ea92978cc9c1e57a193ea64fa314f73d2c5cfc14a89b98cf722d8f25429c5b91a3541d5b2e46e3def0adfd2da93c318ec3850cd109654d8af3074de929fb7
 DIST kjs-5.53.0.tar.xz 294908 BLAKE2B 6b0b4e171facd82469519e65b394cdca9e0f6b1607923ef3da95a443f50e13a7f2615eaeabee76ce6c26ea211f2f0120b8de735533ab9030a7b4b657ae78e347 SHA512 b3da62272cef66761bb49f861a715d8a90023520094013d66333a736352d38ad0d8cd378724c41df58d81dc005de915629b754b0de844ecfecbec0c6ed9eb69f
+DIST kjs-5.54.0.tar.xz 294940 BLAKE2B b839b055ef4ac4eba43ecc7862c22b9ba3449fb5cd79f46e873ced94bc9cff72bd618b0301a6e7d7780c3d51ee52ae65fb4a8a20d46cab954b1259c6bd0c6bae SHA512 22ad1133cfe8f5186cfdc517a8bf07eba8ac3f19dea62e2f77d1ba9d34d655d26d195d2929a40180d755efcb7814339fb976090373bdc393fbf5ef6cab8d5d32
 EBUILD kjs-5.52.0.ebuild 376 BLAKE2B 133f4c9a82bb04f1ff30303aa0dbc475112e61c619ba4fb7e905647b13a70d07fa043bb8999548afe68469172e720b32bc86ae2e3a3dbd26f1ddfa36feb2ac0e SHA512 830cfc834d170fbf71dc1539e6e42b5b049c6b63a2d88c7615e70ea9eb58c4f80f0e932fb9b977a47c6100182aea23f8a43cefc5d6d33495c3bccc76e13e536c
 EBUILD kjs-5.53.0.ebuild 378 BLAKE2B 140ac15ca60dde35af42bcb105feb7ea1cee010bc6d6ad6ab80828f100d225651dfd556f860292aed57f829b2430661c3a9f536ff410998ada992e5bf2d75260 SHA512 e5a8a986a79535b917b62a426ebb7bcbcccea41b8eb57f5a172c1d3bd19715889fe9f0baf981d555cc54e317e4d0931fb239728b1d0638667387395a13764cd9
+EBUILD kjs-5.54.0.ebuild 378 BLAKE2B 7c5a16000ca11b98472635c0e69ba96bb8f1e4239c564c76694f21ee54257a9a6fdd48b97edf17adb9c97cf20d4cec437a2c2a591166e4f876c2707ab96537f5 SHA512 7faa240a40305675bced5470606ad6edc0f661f1f38496ba0ee99322d1da2d3b8061fcfb159adfea660d67c1e88e73683adf4f9f0ba390d22f0511893c73236d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.54.0.ebuild b/kde-frameworks/kjs/kjs-5.54.0.ebuild
new file mode 100644
index 000000000000..d68d61a21f5e
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.54.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ca3cc7a1fcb4..f5134625d6a3 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,7 @@
 DIST kjsembed-5.52.0.tar.xz 169472 BLAKE2B 871b0ac1d808a2b31b631a9bcf6e145b55b4108381d765f115fc2a50e429731fd8f48c71255ab52dbf90de5e99464912c7bd4b6d823407cdb232ebda272d38ff SHA512 0841109086737572bf3a4dc0f24e262f2c56dbd800193923402b7c6df2213fb7489b23467abf70539642ecf3cbcdadd30e3692c6a0fa31e8ce34be102a3e3067
 DIST kjsembed-5.53.0.tar.xz 169456 BLAKE2B 21a616c50a2146cc392da0a4007ad5df019b6bc83dc4754fc8f0ce7ee4e99cfc065d93ff9c774f11e4d8ba718c3e23dee15649c13d3678be373420811405bcbf SHA512 2b301f27bcb2bca8648d691f94181e9235c1dc04d3a1f402d35ee06faeef404dad1d5acf2d0842c61b3faf961e85dbc26d8af8f0420d6742ab0055f9de67278f
+DIST kjsembed-5.54.0.tar.xz 169436 BLAKE2B 1ad694ff4299ac24615d255dc3ec8f0a8d29e47d3903f61a6852f2fa18dc4f162304171e4a87828f1ae48263af5aa879d8a1f0e379e843034366dca4cda549f4 SHA512 d6aa8a20eabbb918ead0388be23701cbcbce87eb72a4048064d7f6d1137dc9cd618cb53dd5a756bda0a143ae8423cf9167901a5dbc3acba312d3257e873c4713
 EBUILD kjsembed-5.52.0.ebuild 511 BLAKE2B b844dad119dd692174405646e97ccf6bff0318f86ab5ba474bc1805dc3296fd713572ac0e977b5fbf5e56fb2b7286269ecede4f4d8a4d3a4d96de3cc3fcc40e8 SHA512 6d4ec621af84ed0adb504b5d91b754611938757e3c70214994572e71ddc67de0277df6d74e615e411f8e2dcdbada8709b71f441fd294bf7fff43fc3fe1e30558
 EBUILD kjsembed-5.53.0.ebuild 513 BLAKE2B 19f7578ff64ea02c8187788cf080d0b49ef16d8094e30a4b99ef48390753037a2fc0a7d55f6fcdc405e37668e476e3f49992a3a7fce4dc491676ec1cfc2e21a2 SHA512 48abd914b5ed61f60aceb9f52ce6734169df235675908e9addef13063dc438e9fcf4f985c76e9ef46fcaa149adeff24d597c791c55fdd6908cf06a315b2344e1
+EBUILD kjsembed-5.54.0.ebuild 513 BLAKE2B da46b7a3c6d7580be59b495ae83b8f6e7b4d32f0f26cafbe7b0f092410b5a0876d7791016869844e04291c04b85642e1b95cf30d8d1738abe771204ecd31fe76 SHA512 c3dbee8ad50acd9ce7924b3f96da7da6b101fae7839ed5eeb93f2b460bd53431c75696921e34f140d1f71f79289cfdddef69a9f046adcd5df28144daa61d5e4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.54.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.54.0.ebuild
new file mode 100644
index 000000000000..bc6e42848ffa
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 e40536666638..a4ac8d134a8d 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,7 @@
 DIST kmediaplayer-5.52.0.tar.xz 9528 BLAKE2B 4585d990156f28e3a3341e131d67ef0b0d9f0634d2cbc030985cee6e889d39e262ff71f512f54864472cb9896243cfa5c21ea3e4f5385a1a7d20c166134e392b SHA512 2d667cdc3034da9cc522f6305b0a623be6dde3a1d7d34ced5d2f261470fe6b8420069551d368032b47e20c48b39abad61f1cfd0febc532b39594e74b5667f311
 DIST kmediaplayer-5.53.0.tar.xz 9520 BLAKE2B 118143abfed5295ed0923f568f580f3cfabd01988333028c8601077756f41519c4b56fe841954fc50cb8ee38d58bd5a2977cab78176d0b0ee9d4137f1a84be8e SHA512 d8717265e97c0ec7213936f7c20368d25562b44a1f497ebb1fa4247f742e31d2fa2be43f534f49a12e3dfcc5877c7cb1d4b3e2ede41c3f7f0e69657cf4d4e269
+DIST kmediaplayer-5.54.0.tar.xz 9520 BLAKE2B 174836710374c578e6b3df5006c40c2c7afc4e6847e185e36387174fa563f3d5ec11ffed06ea61916874b84a1869b1542a93a6f3b6b2314a2e1e84735d9dbbd0 SHA512 c49db70a8bc7a27cb49917eb83fa9e15666d25b5e641babc0af424910c73ae646d63767c5c5bef28db60489bfa52456d736e0d6f0ae04b1fd2a4d8d3027e1ba7
 EBUILD kmediaplayer-5.52.0.ebuild 450 BLAKE2B 657ddfb30d38d7ead8253011af54887ffcc3025562e8114582cf88060fad4ff2c8e289804ff818f346579511f3bf959033d79245de62ca4143c6406224f0dde2 SHA512 d59b3cf3597f8218ba1009fbebf45fd94e19e2b08a351915763fb307fd3d53d999e96a67bee30eb565a7dd63dc83dde737151aceb022c4b1deecb6027aef4cb0
 EBUILD kmediaplayer-5.53.0.ebuild 452 BLAKE2B 0fac3ae0909c2cfb84df11e34a12c5e5e6c98c66c1174b89badc53a2ec7dfd9379d3ff6588b482171351e0e0413393173555cd70f226864943008a157980dee5 SHA512 ccec284fd53d8595de7887fc855a17f60b4f032b2a8d169b30aea765d1844ee614aec0651f608f0503206fa2b313d5b625dd629ea182a822b6bc1ab32bd87279
+EBUILD kmediaplayer-5.54.0.ebuild 452 BLAKE2B bdbb71783db9d5c7c51dfb0a91c5c25b9ab52508e8dcd0bb8c80829f3fbcebf9925362b48d858d808c1b649e3c5e8d41311f887495c30fca1b9659958dd7604b SHA512 e999bfc1b690a639da467cba4b856c169ce0ab776241c517a018bac5c37d210e5947d0320a20f881736d2640e7f23da8712311a22e8a72b1fefaf662a013d626
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.54.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.54.0.ebuild
new file mode 100644
index 000000000000..fb9cdc60b2dc
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.54.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 95b60c1f29ae..325ef887cd39 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,7 @@
 DIST knewstuff-5.52.0.tar.xz 1007888 BLAKE2B e292a1f7dc4461e38df798b5150b6e4ca77a233e64b6e127642d23475f0b9f3ebb4c83fbc3667486c0be0d0507550f5a6a29a2684228667b40901f534f1e1c36 SHA512 96655a5586e3ddb09e78b70b550969bdb0b7ee2c0946402a0e68a8d75fab3b5070c0ce05ad3d2122ce948bdc4e87b466f1ba6fe1cdf841beba2ae9b26e361711
 DIST knewstuff-5.53.0.tar.xz 1008760 BLAKE2B 6b676009b892ad1a7ff902250396f67d27826ffb14bf20a04c9a9eee846aed76ba9324a272f0becc8fb0084b7ed37cc4f47ed3e1172ba6bc1f570d52c3dde2f4 SHA512 7976e8a6da68563a51e7318f9168d4f295a29f406471ced2a2fddb38d304bdd4416b4312b718b6ea5aaa8c14e82d96d09e8f8b755cb308cfa8710c3a97ff51b7
+DIST knewstuff-5.54.0.tar.xz 1008916 BLAKE2B 55f28e58275568fbd393bac45e1426c33632f2058673d5730eb04c2be3343d22cb065f0b0c47303ece26dbba609372348dec48db8ceb981b78d2925ae1149f1a SHA512 96fd8100c78e7d4f9c0ca26ad12587f952455b302ae195184e6fb0ae601b2806668cf2b6dca012e08441622fd72e99c30a52fe901d7af60c4b59701d72b1196a
 EBUILD knewstuff-5.52.0.ebuild 894 BLAKE2B a3e8403744604b23c793e2ce1a5064b34a6ab29a94b9a5f04b593b0902aaa6c6844b22533fdc7a76e779df4e83c9b9a23ca7893944e95c025dc5fe51175ae105 SHA512 cbb6c515ab28d0191d517f8a6a63e7701749072b739ebdb3f5ad282c48ebdebd730410aff4f38e5f7f0d46ca78fa394e8a6c10b646d1f727d6d66c99fea5943c
 EBUILD knewstuff-5.53.0.ebuild 896 BLAKE2B 57e3dada573845201cf72f1752a1760134fbcb547c1495ea5f981974a8ca66e435a7437cf7c0cbfd59dbdcce35f2aa67eb3b2be00c3375f1d677832eb83de83a SHA512 6eeb723794f0ffa58fdf22a77e38c4b674caef97a4537ddee3ea6ab229ce1764416abd134beabd3e43dba1a93ab1507406325eec12fef1801dbac79821bc4285
+EBUILD knewstuff-5.54.0.ebuild 896 BLAKE2B 0461a78631d170c1f688c5403aabf69dcdb87b872f0713fb56aa885c98202ccb08e257e7ac72196b56e2797459f10dcfc33d325999097928bae0afb1fbec1e20 SHA512 b380f487a3cad3f80055db252d51f9d2aaa7c98fae8ccbb98ab110c58444081217e8311f000c36c1665ae43cb6e7e0e65e8bf1d01e35204a6f8ce8abdc63c9df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.54.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.54.0.ebuild
new file mode 100644
index 000000000000..791f870e776d
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.54.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 1a0fe4b89fe8..3e73484cc0bd 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,7 @@
 DIST knotifications-5.52.0.tar.xz 102836 BLAKE2B 04f9538001d44f85247c442cf4bee8b41f51881b28e2c26153ed56af6dbf89dd897df7345028a7741a9ebce5ac8489245cd34a5cde7fa18b167943b1c33542ff SHA512 c595088859170c17819d0b6eee75b39166bf247e47ae675685b55df542981b0bb8757ca8428852b0f5ad85f0f1ffd59d682f561534581ebd43ee90abc4c8ba39
 DIST knotifications-5.53.0.tar.xz 102992 BLAKE2B 69ffb0606694d48ba819fb14ff65c99fbef5f2bf287dd05935a201d79bab888318cf8b99816d413717c9371ad520a010a994501b6473d35223496f6eb5e48be6 SHA512 188e05ca70868a99393804c558115f4f31a0d135174ceeac032b04aa45eb81238017eb8e6977735e110492d30244f193322e9148f8d9e9d0e77999e0fbd235fb
+DIST knotifications-5.54.0.tar.xz 105860 BLAKE2B 3365a177461a694fd7fc9ef07eda4a31c5a6c9d5711a5729bd8b88102a04ee9a2d6e0649f401d8b835edf2af5bbe22894c06f8703e1c2c7a20fa6b679f296492 SHA512 66098068d707f4b5b5147b2e02dec7b4a11c95af1dcc02ec933d1b5b63d8dab1e7776a34aae80cfb5671ae7e27cfd50dad5566e26152fb94de076384b77cdcfa
 EBUILD knotifications-5.52.0.ebuild 1086 BLAKE2B 0f560daa34aa82e259ab4f332bdabf68282532e38382a190083303d986e6a1c940189d75e96618859d41236b6c12a6576cc01971edb6994a1f16e48335d1c75a SHA512 e2289076be297a5cd7fd723c58c91c797baebe23658fcc069385d87a4345e5e2d87dc391ecc4893ffe9784241d50a54bc94dd3337eacb63afb55020390d99b4f
 EBUILD knotifications-5.53.0.ebuild 1088 BLAKE2B 87d73bb251a23ac0bef8825a516cff1e00e12261ca471e7f1ece8b8c0891cf38d69f1e6df0741540520866a935bc5d2f574a28c5abe3a66af1cdfdc09d52084b SHA512 fdcebae58d6eecfc21084be1ba28743064ffe6bd6f29f3945945ec2acb5aa793428595f888d8b97bb6a64e63b0f61ad9f96d3a0e346db4bc013f4655d36bebaa
+EBUILD knotifications-5.54.0.ebuild 1088 BLAKE2B 0bbe51d25c3935dc748f0e6f0bf9350a48c44826061ffed681db4a5eff6686703c66686ad94bb368149146767d10fe0e7faf0fc6fb187f3ca2964f168eb6d7fd SHA512 e2d180f39c50f90df5deb0810176fb8cecffdfe7ab3cd68c2038e5118bd4b14d37895f604e9672deb48cadf49e0054e81fc2dc4f37f4eabde4d802268351da4e
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.54.0.ebuild b/kde-frameworks/knotifications/knotifications-5.54.0.ebuild
new file mode 100644
index 000000000000..6b87b33524f4
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.54.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	speech? ( $(add_qt_dep qtspeech) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package !phonon Canberra)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 812edb7de176..dae714976211 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,6 +1,8 @@
 AUX knotifyconfig-5.53.0-phonon-optional.patch 1473 BLAKE2B 10feddd1082c2a14f55f70ebf464f9e41abc7cbb8b1c8b811c623e3ffaa61feb3350b4f09b30f2e69a33356a081be84fa23410ae6130c98af7e920bab3447921 SHA512 3c841ec69d8ee9b50dd010258487fac1cf7d8f15894b36ce3c8534f5b7793100b8719ca21728d3fee56ea51c1260fd57f646d0f1ae76597e7758846d809ad646
 DIST knotifyconfig-5.52.0.tar.xz 83572 BLAKE2B c1cfaeb01460005592b2efccd4623249dded6e5d629f9287d99fef224f47e9c903cb6f4c29110a45795597aa5fd425e8d5d4a83926753dece7ef847c7e2e7aa5 SHA512 ee02d6d54b4f35d6142b742397962d9d64925893da69d41b5faa2f9993fbddcf438e11a54417fc55f9e3f0ee4177559ef55817eaa860c4dccfce86ed6b481e58
 DIST knotifyconfig-5.53.0.tar.xz 83544 BLAKE2B 5788992eb5ef448c40ad21b9b628e02f0516719a97431b28374b65845350047b4a00fad03a40278718a26d1ae3f02b33f072d95ca8f1ada92187c195ec325176 SHA512 5f54556c57559707905f5e7ef684004dce7354bb11387bc19e38da91bcfd6ea1edbf65b97b31926f3613e9db98efc013987daaa74a821564f57cbb91a88f1c36
+DIST knotifyconfig-5.54.0.tar.xz 83564 BLAKE2B 9d509549ac3ac45fcda5fa1143e5ee81af093cce5ef08f90b8717472b6163f7c363034f3a6f4f7a5e1b48ccdc74ef7082a85fc3100b296d6d03ff854d93d4c6f SHA512 f9ae7eab977be273ed12a56e903b324986794d286409aed657af22c09ba7e623f3590779916481a4c80f606abeb9ab37cf544e74a9254290b10b89abb43c7573
 EBUILD knotifyconfig-5.52.0.ebuild 533 BLAKE2B e2263c67ccd2731b3b70951bc65a484b56e946a06a37b650c4a86b31d1eb4229c56f131bbff401d9a155dfe36b9fa26bed2850e9f4526aec46cf9dac6859f42f SHA512 13ba145e32d3ae2f192ac8d62f6eea5b5c1b16ad5a94630efa98659790379b33a558d5473fed38ba6683137a7aeddb9f4387a96a09113aa758efd2d2b9310b23
 EBUILD knotifyconfig-5.53.0.ebuild 589 BLAKE2B b3014715520ecc986dabfa0274404146f9327783f86e7ddd5f429bf55481381236ae831724fece69c640fd09b6caf8c375d580a252f4102fb2dee56d332d2461 SHA512 1b75df77ed408bb93dd9382664f3f4336168caf690be67c9591a1e1b68c4b728330a024bf80ef903a9eb6fd5bd7efc6cfe597eb17efdadd9f6c8a992e9315a65
+EBUILD knotifyconfig-5.54.0.ebuild 535 BLAKE2B f7a55e2af2ee9a7e940c2f185057d885a0aa5283bd7f0ee53a2199e49ae91eea9bf51e3d8b4961f10a0c68fbe2f791e64bc16ad40954791b663bcfb82bca5925 SHA512 851271f691878cc17cfb6d6a4ddd4796eaa04013fbaee49f0014919ab96679272b56f951d87926d9bcb88a43f1bd902d87ac956fbdf2ebc31533ed4300cefc5a
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.54.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.54.0.ebuild
new file mode 100644
index 000000000000..3015105e9f2f
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.54.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	phonon? ( media-libs/phonon[qt5(+)] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index d1adb81a8d28..06f0bd99ea0e 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,7 @@
 DIST kpackage-5.52.0.tar.xz 132372 BLAKE2B c70d20e1ced6067fc35bed7894a4741e40545e423de0cb101a809917aeb8a2707bfb4c5a56f75fc0a942e3c8631871645d4fb1014d0f6922bba9a49925fc8be9 SHA512 6db698fd82d2f5f73e7e514d727cb4edd7d2fba3cc8a5ec928e4b718c4c74fb658ef84944f6af7983900ca859f4167e71fee1eb52bbca3e711b1913e271d2897
 DIST kpackage-5.53.0.tar.xz 132624 BLAKE2B 993f154e1b64ed02de84528383be132bc4b9cf44579a29b4dc3453cfb9e2d28999772ce8edb9a612acecbb125dd168aded34fde3ffbd30d87a00714963c40644 SHA512 3ecc1819dd0c116111bb91eab12bdfa737a85d0efe36a935ac9d475c841fb9259f68d1c57cbe7e810406f8c0e46632eb4c1422b98bf71f612cf4258b85509d77
+DIST kpackage-5.54.0.tar.xz 132812 BLAKE2B e4a788c305b193132767820fc17465a216cb1faf929eae7ed97500d0beb5bc3c7d63269d5b2fddbb3445f3824168ddc90ff78685aa1ca6eb0771754563c9cd12 SHA512 d26f5dad3634a442d55bae94903ec6d781fa1984a780eec4b1f9ea0f9d3ae50b0defd3ddb078d7b0410626250ded1ee1e5ca1f5ea7ecee1ede4a0ef30463a8c8
 EBUILD kpackage-5.52.0.ebuild 653 BLAKE2B 48288cb2683b34cd139af595d8dfbde0fd25dcbc266ae511d52456933ceb624624255b01db589d565f879eb0c0e636756a21d748eac41fcf38fa34ffb8b5295d SHA512 5046549e33345ce6ef8b795bd703ad76fa0b82b2bc9f40fd513ca4683dd1e15f8cc4961cd9abb0c64cebfa1941d361be8bbdc6c3d8993d8a40e2948c91eb85d5
 EBUILD kpackage-5.53.0.ebuild 655 BLAKE2B fba42929942e88519fdb9f821fb76d6b3f71c0ad6a49bb45286db389149fb0c914a2ea3f29f06e9106107ee9ae36aac239102efb39697e76242a622cf801b63b SHA512 ba786d8746ba3038954c7c3e770a20f150d28f9e60d73746c7d889969caa390b657b1e47852c5b07a6e6d424d88011a7901d6c07c8bd2c5ef186264c02ffa044
+EBUILD kpackage-5.54.0.ebuild 655 BLAKE2B 710def12e80219c507c98b1f449688c0a5653f2255e85f18059907282b7a9a056ed5f28b1afc0b31409477c8032996bf44dc2de211e1fd2d925fa4ed170c93b1 SHA512 8372a1b30ce0e0889972e443dee4cee91520546877ba7a986b390d952b63e3d67a216ab4d24ebc42b87a7dee07e772aca0fa7d2e791a4dea2f90b7b0a2a64248
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.54.0.ebuild b/kde-frameworks/kpackage/kpackage-5.54.0.ebuild
new file mode 100644
index 000000000000..6675f508bcbc
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.54.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="man"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	#bug 650214
+	local myctestargs=( -E "(plasma-plasmoidpackagetest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index f08b37f2c4a5..1b47c93098cf 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,7 @@
 DIST kparts-5.52.0.tar.xz 175788 BLAKE2B 852c2b09e2b96cbdf0156610e14bc4f117810c548a4d811e67658f595a4e3bcc9e462a930847f89e6ac80a66ac1e4638381bd48d3ff6b4a5500f71cbe83c0d18 SHA512 6f1e1aca216bc794cd55f299f464e376d9b3e9c54fe54d1c30e5a931ec38cf9c7a20934ad099e6f1a5f6c0b6272d78590dc46b99dcecb6510572cbbd91a6bad1
 DIST kparts-5.53.0.tar.xz 175788 BLAKE2B 00a375a4e2a7b42f3a885aee753216923c7b115681dd840067af606d22ae33ff95fb088d41bd4298089608160a2c6f29ce0268a16114c58599d3c9449e88198a SHA512 1158f9779836655dbfad7444cfa4116a4f4d6c82425557e3ee394b240636d229200b5a50e855c174882cff301dcdb80a1f85f05fbcce206c1d450a528743d0bc
+DIST kparts-5.54.0.tar.xz 175800 BLAKE2B b4527bd534349e64db108cc39384086fe480f3d357eb2d190ef0dc988660ff08167c72cdc4386688bdd7646973fb81673552584504d3c445294800b4174507a3 SHA512 607a9a89b9d3b4434a46fe84fd13588bb2d99a43b6cc7a85abc1c336613834743f0b6ef832f31126cbf3a0ea6260c8e889927d7cc9d7cb0ad61215d1c6c4e272
 EBUILD kparts-5.52.0.ebuild 711 BLAKE2B 1aeff59ad279e93bcfd057d62e92566dde41086dc28a20f7054f53df1692f9488c071bfbdd4a8d4ec93cf2f11ddd2f1329429efe09610fc2a2f1c3590612bf97 SHA512 b79c8da363eec776ad225b646aea80d09502248817d0a1029ad18a784243c34d75c9f77851b7dc70fe7f940669ac477d97be3a2fbee563e7047f0a812f9282b1
 EBUILD kparts-5.53.0.ebuild 713 BLAKE2B 9e2b6526fa17f0a765547ab3b57ce33652daa3b0f1a819dd092f2fa1cd88290de42e3707f08fbd4efe24cddb62866f2cdc2a0770f0c0fffd024ac91385949caa SHA512 afdc3790d9249c40493212c04708e60fed69fa002280392ccb84c23c141e0956a69b2a94108e21f2c76129a8a1ea0898f68e83af351ee082701b070e16f8d0d7
+EBUILD kparts-5.54.0.ebuild 713 BLAKE2B 17966ef648e5f577986d189e103e6ff80b6c9390fcd5b3db0f7e5643f07061087e365c093d91d75cd2267736d1d422f45bc420985ea8854aaa5947afd064eb23 SHA512 68f3b33073359b54b7dcaf096640626af19754f095beb0e7027f1b6e4fdf0df234cfed6146f3ab3081d6de198c088c79d7a1e36aacc580adfa85fd22efc93830
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.54.0.ebuild b/kde-frameworks/kparts/kparts-5.54.0.ebuild
new file mode 100644
index 000000000000..8606cb107466
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.54.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 11bb278a102c..bab5797bb3f1 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,7 @@
 DIST kpeople-5.52.0.tar.xz 60400 BLAKE2B d7c628e795dfe5542793c71148e1775fe61a4f6ff42c7d0e9d284a682f965a960b6f3d64fc44e3a6be9a6f5f1f3f3ef597f28ab5c284cee326d9b7346e713992 SHA512 edebc67d49366d01e99992cffad492fb5b10bb9d822dd3a275ebbe50d2d50e5ff725727eee45bf1fc0ac73793be7223b2dffb260b636e5c504ead4e70581a2c9
 DIST kpeople-5.53.0.tar.xz 60404 BLAKE2B 9d19bc66b64a9aa16869271ca648ffa3ab3ee98e5e2bd30d9a95a892d7060a910825770af8d4efc9ea3241f24f17fcac21eb8dbe6caadce4091c68c68c53178f SHA512 be8361c86b9bf9c6175601d7fffb68bcd889e811c747a93328c8362fe73fbd5e3c14e2b1bbe1c3d280cdaec87a887a1d50544cce11957ec060c04ab975753a2d
+DIST kpeople-5.54.0.tar.xz 60412 BLAKE2B 580a72a0ae7aad05d07a265f26d9de5659c5d90281ce50f81ab23b7d10e4c3eaf10e412d4dd6b208309de1c7a010f6bc0bca0e192bb7a545fde3be935a2a4dac SHA512 8f4709cfb256eb7f836d64ee5dcec9962323a8d2d4b362a01fb140af53b7b16db5dd6bd4c8246af67086bee4e2baa9b40e66e877486900c32eb51cb3483a899c
 EBUILD kpeople-5.52.0.ebuild 802 BLAKE2B dbe786bdd7aed22fe6e1032ad3982365ff9b5923a68ddd7f8a58d81981f8dcf552f6f198938fc8a24902d20449ac612fccd5ed9525287cb068504fbd90ca6a96 SHA512 1f5dd02876b6a1b71cd401043a91719f9d4d3b3ef075b7eb41f3c573c5ec324e9f873374363370645ef82eadf412e4535715d3ad8b09e9067cca1916cd0093be
 EBUILD kpeople-5.53.0.ebuild 804 BLAKE2B eb758bc585cb94ea6e100e47070a5f39eb733f3ff1cdbddfb923cd97b528a626fc1367135362dcf30db7a3ae1b9e14efe00662b8fe9fa70cb429c1587688f8d4 SHA512 54c0797d4baedc7c463a4218cbc46d476a68ddeaefdc4b2d38013606ebec804a68192a56c8c4e492ffe3c3b8069025c162409da1a47a6b4425443feef52bd2ab
+EBUILD kpeople-5.54.0.ebuild 804 BLAKE2B 34b4849506d1f826f2b5c62e35d3f59ba1b22dc95bf36087a6501bdb96f539a96bb8481f4d10f19f9f842c69ae9567d74b4b87463f3a22c1207277336f848ee9 SHA512 cb22e2eb66d2366d656a97a3b46bc7e51563d84df55d854124696adc3961d0f0f18528cac2a47536621a7dacc4993f1f7a64999e2245aeb590660662a777e3d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.54.0.ebuild b/kde-frameworks/kpeople/kpeople-5.54.0.ebuild
new file mode 100644
index 000000000000..f9e32780c0bf
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.54.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://cgit.kde.org/kpeople.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!net-libs/kpeople:5
+"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 93a572d85a12..d633920d785a 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,7 @@
 DIST kplotting-5.52.0.tar.xz 29764 BLAKE2B 0abe8d881e3b128a03f5b3d3c3ba9ea7d1a0a78c670628a861abe41340bde0ecb7fe8f3a60be96da0219191980928ab158e357dd338008c98db2e26388dafdcf SHA512 2fd925ebe040a37ce5f86f06ba8613cc1b738c2d6e8711920f6ae4833625fc098c0acf3937bc03c92be91f68aed5162f86e65abaf4289da07e1bac2d7bffac63
 DIST kplotting-5.53.0.tar.xz 29740 BLAKE2B 9191e29a79d82f16702d30847304b0b2bc3d5f5e019e5b9dd151e2bf22f2a7e723001d3097f15e88cd05434f9fc4be86644e30345a054ba608fdff7d4c14b40b SHA512 b2537c9ab9144fe0313a5ae7ab57f3d1c1fe41275b3654b944caf27d01169efd396d3f2bdbe385aec71ae5eeb859c3f34d2b3cd444fe79408452d2a364c8a10c
+DIST kplotting-5.54.0.tar.xz 29752 BLAKE2B 3ad2fffcec0f878f1fa24810d9a3794f09cf53faf893dd4b9fa2aee01f1308fcf8b788eeb23f00dd04aa49a2bc962df60836e6003bd2f36580530bcfbc0ff7a8 SHA512 85cec93bd25a673bcaed993c9130529c1f16e726b3c40f84395f1c2e4810b85503dc3f015ef5cdc1289b793cc19abd956d54a61c2f8e1626ab73b9112107b61d
 EBUILD kplotting-5.52.0.ebuild 353 BLAKE2B 8d842117a6b28dd487da52ff191e0b5faa1448838dc179acb81787199b8ea82bb58e266bd3184bb96e9d0707378d428ac0a188f682fcaa308d8c89f398e14eaa SHA512 62b0d52b2453df950a7d7fe433069d1a360d5d361b625b558662b6e0f47be4e90ad3e5ac24dcf1d94d061eae1fe4cff6e4bb2fdef8ab37c7d4854a1085c073e7
 EBUILD kplotting-5.53.0.ebuild 355 BLAKE2B 9370a128b4b705f1486940ccf733421f5bc7d774583562453dd2e20e5b112b7ae18dc9026247cf0c9bebd2326dcb5ee4d63c1cfd2e9bf672d3f10829dd25e399 SHA512 da5b1f706ae3d19ce28fe02c107ae2ea4d15460e0fd957e27987dec5f4de44af6171665303f6e93afbc7a680cee8194348dae733fa80f0b51df09d997a067458
+EBUILD kplotting-5.54.0.ebuild 355 BLAKE2B 3ac58f3a437b978a10451bea65ffc9f0ad5c4a9272061b653df8c6371a8ff466a72da1ee048ffc1b201ae7b34aef5f2706f56c57f94c4ceecb66e27ac0b7b05e SHA512 9fd6853b284af910c76815e180e1d3a8e6a4a4b807a1d03a30d6ccc9ec5099c025f35932f58408801aa1045c166753de11b322197bdb8efd4512a9483abb3097
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kplotting/kplotting-5.54.0.ebuild b/kde-frameworks/kplotting/kplotting-5.54.0.ebuild
new file mode 100644
index 000000000000..a1018d72bb21
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.54.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index e6eb2bc00b92..c80f0032f9d0 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,7 @@
 DIST kpty-5.52.0.tar.xz 58032 BLAKE2B 52dddb1c6d2b999876865172009f560c0312068bfff3e3c9eeab4809afcb2fee04bfe734242a47ce6d8f6305e1e55ea272879faee7a7bb1670efde8481e182b7 SHA512 8580fa72268a18ecc029d95e24d5a8556a5cf955f729843ed3d061c19d44b6faf6681923c658a9d7dfe0253e941c4129c59ed1c0c761ebb83361b80699263e77
 DIST kpty-5.53.0.tar.xz 58048 BLAKE2B d8f141517236e566c6eef42e5b37e8e790c59dc814121f369261638d201be90f048004591fd0b13730338919baa28fbadf6f88664828382c316a57f347f3db91 SHA512 fe589759f3c4b2bf3941adfd76064a15d20dc9838290dfb9421de30f8d06696da6f0d952f1bc49148bdd492b7278010e1628736729557ec33cf3c06440a09849
+DIST kpty-5.54.0.tar.xz 58052 BLAKE2B 7dc7f0c337f2fa7bae1e7cc7bca8dcfb8d046a4ae7ac45cdfcea1efc097102c11e4320b45e718094d6a0d70a25629f7ea5885d3dcc9eb071fed825dfaa97e7de SHA512 1eb83b3034d950a7561a043f68eea17322f6547a19f399bd500c9ce28bdf02b86d60ed6b4aa976ae4b75cb674ebaa3e4c9c1642601d4470b884ba4ca0ba249c6
 EBUILD kpty-5.52.0.ebuild 505 BLAKE2B 840171c707ba9cf323988fefe073f440abc8eeaba03fe72f710bb1bca5ce466aa123593a28b97819b07339c2f24e71afe2099f8cc0c2a5ef365420eac49b11bf SHA512 11dbd09aa09704cf77e12f53fdbd199416428cb3bbb89e20d3f1cf80a6a52b6b8ecfab3d6fcb7de75a34e48b1622d711033d0b2c0730aeb36109a8292d0c7f29
 EBUILD kpty-5.53.0.ebuild 507 BLAKE2B 47d8a5f9597fc16b8d213d5a36c13b23e78ee3c2bcb9c0c51188507c56ef712556c17a8531aa1a4947bc54daa2bf6ccf344b0781f7d0dbd8719bd2cbbdd024f4 SHA512 990fea8abbae2634e2324e3bb92bb011acf45bcde7dba029de6e70325c22738f60a8a1e2a5ffae26f80c531164e3002e960d11ca0d1eb5218fadac6f4e7b1e78
+EBUILD kpty-5.54.0.ebuild 507 BLAKE2B ee5bd9f91d399b6a1c1b27624102627086d7c5b10ffe5d2d6dd29231d00cbbce8e41bff029f4dcda5a710d64ea9fed6b3e47571f2bd6d0684fb5fd12551f08da SHA512 cea15199d2af557834fd5b718d80ccec3ca3304aeb4f6c4f29a8cf0d9300c618252f4cda459e41e2cadb7df026298526dca9c8b0a95bbfa278fa08e0f579e983
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.54.0.ebuild b/kde-frameworks/kpty/kpty-5.54.0.ebuild
new file mode 100644
index 000000000000..6d3f26dab1cd
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUTEMPTER_EXECUTABLE="${EPREFIX}/usr/sbin/utempter"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 1daf05df67a0..a97263e5bb82 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,7 @@
 DIST kross-5.52.0.tar.xz 127516 BLAKE2B 605cdcd70c1af320fd4b3e64588ae606c715ad8450ee5f82d8c8dc517d4b522d444eca760e9d70e1b1ba3e26dcc45c9f4e7d035e3f73427827de05f66c1f4485 SHA512 6641fa38612767d67bf8b0ff00864d03caee337f00418071c5d0a959513a85ed60a11ec8f6ba1b333ac4da259d432d2b3f3dd0e71c55056489779256d6b7bc71
 DIST kross-5.53.0.tar.xz 127492 BLAKE2B da872911160238e975d30007e7cc71b6e5a8170917e383d0534c6afc76806423b0d64b97bf284c5a9b8c0f1aca15fad1fec7fffdd684f271e464eca987aef0e4 SHA512 3d11057cb3ed7598024f6dc397941a646aa18b26bc37345af6384be87bf78ae95c3c5fa7fd854b1540e05f0f2b35d7c49ac65f10da9aa4afbf070f7b56429f14
+DIST kross-5.54.0.tar.xz 127504 BLAKE2B 4cf980a692e313b1b4d1ccd679d7460c55b0271df3e534abc59518d08562d45afb656a88b576416a9157d2b82152e95db6fa6eaaf404abe7df9b9eb0e4ffab72 SHA512 eefae897541d4d6c9b1920452a2172c390328a1ecc5a9cf765b8a46f07b8bcf5563727957ed6e3e0da243c4b6550e2aaef78b705af3035be8b6e2d73e193f11b
 EBUILD kross-5.52.0.ebuild 727 BLAKE2B 5efd009693e7a41dbc1d67453ab88d9ccc7daf1edfed42917bb48b6b6a42f5eb302d2f5d274ba73db97c18f02af328c29eea71b9dd64605b3d48b82d113ce2a1 SHA512 932d655dc2646701e9f19e534a57c6f99caf4ecbd14f7248be559b3b46d9d977a6f50b60c408485e7ae6aef9173aabb249db61968e9df947ae919e6479b09f23
 EBUILD kross-5.53.0.ebuild 729 BLAKE2B 5d95597fd897093a29618b10fd72a2393683af5a99278dca1d6bc1b06b69f64b4aecf7b2561a070fda709668c207ac312d9d014e69855715e0d6ca47b36782a2 SHA512 3d39df383502137e2fb01239a9b299e94a1c15b2b4a19e756488b2520658f50534c82f78971991ad609037f870b985a9600f2f623b6d5208176110d91c4b4697
+EBUILD kross-5.54.0.ebuild 729 BLAKE2B b9a8d0ca52f97d91f27fdb840a00a9cb30ac6218ba58b165b51ccbb67db16937b5c7984bd45e6c948f00c0d032a150eb5574faae5e063ef8b1e7dd7bfdcc37c6 SHA512 9e8c5dcd6063b1d41823977bba2a727b60467d97976ca2ccb101b40ed42c5a2fa778a015673c3e3710ed59d746b1f718da3c17d446921020184ab32e943f5bae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.54.0.ebuild b/kde-frameworks/kross/kross-5.54.0.ebuild
new file mode 100644
index 000000000000..b26a43e0fdcc
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.54.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(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_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index b063ba79ee37..754b40823ba0 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,7 @@
 DIST krunner-5.52.0.tar.xz 61876 BLAKE2B fe0f6bef071a88a02866e537dfaf646e5668391d52b559d5fca119e6f28d4adaf24aa8856a03418b41484de13fd0fae591beea284b83e9ee9492b9d46125f311 SHA512 688d99e8375319b36ecd2781bb14beda76a9c27b5d8e172be098776d71b35aed265c83e46d49a7be03bbd80ae117b2c03fcd8cae8206e7444f0194bf941d73e5
 DIST krunner-5.53.0.tar.xz 61912 BLAKE2B 77490826e7c5fb562b2fb98dd2e6863402399a3a2ae3360fd23c554f1660dba6b0c88469b0a5065f642b15ae335facf45bfca6770fb6dafbe488c81a73d66b0d SHA512 d249d6586fca4f6d89bc5fbb699ef9bbdd80e89033a47a0ec5ec6ba66c1f7d832194964075a9300bd854e67e9ae29c4e1796f8b9c1ba99cef59b3e0cbaab2048
+DIST krunner-5.54.0.tar.xz 61908 BLAKE2B 6c6342d3d5c007be8eca32174cd76de470b83bc511ca4885f79200df280fd8a2708221ace36e89b413429a14737de0bf4d0832aa9f56ab55f4cae26708d901bb SHA512 1ed1590424736d0d38249740435e6a1e289089bdb650b5fc7eaff05c86e296b372a1dc7833f7fbaa8dcf1ca33653d6ff1241929abf8795f87e73ab85ac6299b1
 EBUILD krunner-5.52.0.ebuild 778 BLAKE2B 1369fca3dbc8c6853b83f99a22180e9b9b9b455d0f4bfb4094f83ea7cacec125f840456b580670eaf0eadb4a5f04af7524883f194fb3b8c850128a839190a20f SHA512 c3fb94a39e46ece3d629e5d6b20f47209cf4e478a8edc4300928918dd562a662dc4c7bde2b4ecfd9ef45423436d4603245b7d44237282b5e5ca3a2e13ae4d4b7
 EBUILD krunner-5.53.0.ebuild 780 BLAKE2B 3a7f2df360a7b9e5fadcb0533a002b6581ca048cbcec1b1d3332f51f2fbfa20a65e84b54ffe38aa5542e7bcdff3c578cc585fbba3ecdda792dbd994564abc89d SHA512 5f88c27fc1eb570da40ea9c263b586684a5ab4f6afbba4447fa4b124cfb13a30ac587c3490f0636287078923f1d6149bc86b6450db2931d385dd937b0f4ab57b
+EBUILD krunner-5.54.0.ebuild 780 BLAKE2B 66faecbf17d8ff6f5860d60ad6d9bfd895477f927e5c1246b336e9c69f969c3393f520df083438c29fcb2b9c964135e5af4ec3f427bae80a13b867e671e37301 SHA512 352a0a2632abf9b84dec60acef10b77dff7a40b8b6dfd1cc8ce1fd907006545b238d6af5465878b3715b22e2e397bf11dddcc534be411fb92efa967b78bda8c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.54.0.ebuild b/kde-frameworks/krunner/krunner-5.54.0.ebuild
new file mode 100644
index 000000000000..05bbd25b54f1
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.54.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	kde5_src_test
+}
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index dd58581dfdec..9849600dac26 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,7 @@
 DIST kservice-5.52.0.tar.xz 250632 BLAKE2B c53b11ee0757528b06268869bd57a62b026e58875f401cdee7d2461ee71f87591b37dc5d81eb02285aeaa72412176abd82d7349d6926c7c583d46b4eb4b549f1 SHA512 7c3ba6dab342c6c86b849d88dba0f160871a619fb7f3c3abaa9ccd4ead3687c909ea15ccf3accb5304e9d1f702d4a416b971f0b88c19f07604c08881288e4e35
 DIST kservice-5.53.0.tar.xz 250628 BLAKE2B fa102c88cdf8b6d01735bbbc252ff2119d478395fcedd9f8d066bc1b61269010dc6a9206a71ecd8f3605048cdc42d5528c3217945eb3e8554db5763380ba079d SHA512 f47a9a6916fe8f0166bc2c64b8b7141366ebccda07ac7bf03c48f1c45db128578f794ad67b89721761f072f175942644523d797a3f32e92c0be1d3f9ea8156e7
+DIST kservice-5.54.0.tar.xz 250588 BLAKE2B 8817af30e47bc2fa0d71f1d942b5860202379ac473af99429dec94e0ed6c1896a467712fadfc8c2f002b5e03119649b97f6ba3b00e066280dd452486360c9b14 SHA512 df64846676aa7877a34d245adb612b938eaa220e30f58ae9ea7800e97e1278f83b6777a8e65a3841535b450145dce194c45c5d3fad1c366d334f4cdfe8058475
 EBUILD kservice-5.52.0.ebuild 938 BLAKE2B 6937daf7ae15ce325ec5b3825d40155bf4c2268b1bb1578c3349b36b9bf2fa673495b7e1bd3339d247fe6295c4c262cab2aa768db93103d113f63c47c9f0635c SHA512 c35ad1eff57752485a6e4bc1d2d2ef98ad7d8f17d10b4a7f12e178feda465679ce22945d9ae6b651d57d84166f28363fd65749e242200e3e4fe4f93edff273fa
 EBUILD kservice-5.53.0.ebuild 940 BLAKE2B 6a386ae460a75735f5aefc1e98e37e436e5a6272b45ebdee569b72eb36d61a048fcfb8f357e7fdc9e7be19115c757c0869c283f4842e90432476803e5a7b5189 SHA512 836adacf0118b40398315d090acbc13b4183812e142b0fb69da9de78c589072026676d3a9232ce5dcf2ca7e1c504cd1c60f87db0f305764cb272b8f9313fb73c
+EBUILD kservice-5.54.0.ebuild 940 BLAKE2B 3f8c6a7a841f0ee182ab73570331b00140e1761a5cbecb77fa0f59a0ae99da158d96b7f4422465bc6752c43a2d1b81ee915c9dbc51fc8a3a59e66d694fa4355a SHA512 edfde4a7685fbca2abc1419c0a6e339982e746a0fdd91da30c6e1498d73cc4ca59e9b41d8d5c5a62bfbdae6c36de75f9df488db7bda9d1bfa3d9265e9f9a0406
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.54.0.ebuild b/kde-frameworks/kservice/kservice-5.54.0.ebuild
new file mode 100644
index 000000000000..243afdb3ae73
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.54.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Advanced plugin and service introspection"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	man? ( $(add_frameworks_dep kdoctools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# bug 596316
+	dosym kf5-applications.menu /etc/xdg/menus/applications.menu
+}
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 6ea9b5d3408f..5532c587d80f 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,7 @@
 DIST ktexteditor-5.52.0.tar.xz 2251064 BLAKE2B f605b3fbcdaacb131587f1b8f4f9f9ece10c0a7fa55413ea210eacc5b28e2787461a5892524b383b4f4ae1c71a1dd1939d488d3d41b099e3157398ec180d480d SHA512 98442415124e4202d13ec99e84f9ff260bff959efdd7703555eecb74594c93125e83180fbb5527d216d5ef57da60055e89b48f331ddf0e2024f7686c78c6b7f0
 DIST ktexteditor-5.53.0.tar.xz 2261344 BLAKE2B 1d64498e793a00739624de96d92577c10e3de70d8824fd0ed3090393e7a1b76d5d7346b8d4e1ec7626ded53b4737dfe82b9b70a5ac479dd00a6ada7b2ca54098 SHA512 40b294e251d22762482e28f8b16e6438a93c9d4c4e358fd6f2922a56fff87399c4a229e89ca8df40245eaf0f2626d39cb34527f882232e01fd56747fd0adf3a6
+DIST ktexteditor-5.54.0.tar.xz 2264380 BLAKE2B 576176595c80b79f4bbe58e17304c7a9168be2723f01e7f1c51f67970bea9a9169084b074e754957c2e77c134df837226e85ff3b3a0a149005240520595de116 SHA512 8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500
 EBUILD ktexteditor-5.52.0.ebuild 1393 BLAKE2B 3c7fcd8fb2c151ffb9e3318ca158c2e49fffa87649001a5414bcde06e99f20a3af2c094568014d90696365ee6d82370234f69b683dbc7ef4c87a8a7c010adfba SHA512 3ff4074be64290ad4062723033b5174b3cf828d6c52580339fa123712e93b9bf5ddf448e28261cf6bda053770e8c071281c4d7fb3fd90bcd1df23d63c72d6333
 EBUILD ktexteditor-5.53.0.ebuild 1395 BLAKE2B b4be6ac4af75375ed216a680e467b88cb002a803ee3fbe64f2e9d7c69fe8a17cebe9e88ba8fe5ccee276b2e29bbdb4d0a94c57fe9aa98a51ada0911d19302ce1 SHA512 e829402126d57b4794a42e0899735b82e35dc9a2615d2a6eda997ab28c8fd4a1c1bb005488e901bec314bbf5c669bb862ac900acc0fcb9217d6cbd76fc73e6aa
+EBUILD ktexteditor-5.54.0.ebuild 1395 BLAKE2B 5312d70dfa9ff4807aea72342db176460b9b622082808a6bff3ff372aad8d2c8a3b58daa3a78b71d847a69b2d774ad6fdd40d3c34c865bf27571fd92c371e473 SHA512 50f3b031102a7d59a1a5d0f8914b8bb1bf3bfbe758eb4865c7adf63f0006fc0dec00be009b6e54f7ade014348aeaf67ad4d3565a0defc96ff0778a0fb2e31eff
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild
new file mode 100644
index 000000000000..34ec8dadb4fe
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editorconfig? ( app-text/editorconfig-core-c )
+	git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editorconfig EditorConfig)
+		$(cmake-utils_use_find_package git LibGit2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index c8ff5b398cea..5d62b1efec9d 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,7 @@
 DIST ktextwidgets-5.52.0.tar.xz 308580 BLAKE2B 97e3c527a6895e431825f0feabac5d1ba8e4d6456c5383cb0a75ee770af0619ea12d82d35ac5a0a15f6e9145d921dcff63b8a393d4eec65e2e38c1cc009f0c21 SHA512 043afc71b6357ea5c256ea0ee13819a7590debf2dfb7dda958ca4c3f89ccfaf20cee1445a93cd11bc8de6db0e8d04af43118ad327e72be2622fc673cf23d3a36
 DIST ktextwidgets-5.53.0.tar.xz 307928 BLAKE2B 7e4798e4c32d30e8bf74e732e743151a8425ebb4169b2de537d28f85afa4ae2d9c89c8bed9573c6cd3697e9568b93988cdf3ff9b569c120f4341db10b787d353 SHA512 230ad30fef23cad743e7c45fbc3f88d2b235647e1c4d039ad3f93ac33463c37e9bc78382f60bca6808c00469240ff71c487d49b027508f76d5d6c6454f0786e9
+DIST ktextwidgets-5.54.0.tar.xz 308088 BLAKE2B 9f95b511b2e46e07313e8615d765400d724085b82749fa3e6383de11360199512475541d10aefb587ffcda53d74786689749acf5e4e2f202979a14f1ec8de6e6 SHA512 0a3e12a422bb8aa1c79cf96cbd95d7544ba812e12b9a9b838efc014336e56c3f21bce80084ec9ed3c164b317dd9588db3ef28a729b01bdd05e9ea024d47ce767
 EBUILD ktextwidgets-5.52.0.ebuild 896 BLAKE2B c4c0689d5032f8896bd2412ec9779d351d1eef72a227a13b3a1f0b485088609333cf2c2a884ac717948a2827045d82995a5de4d1e168e0227b3b58e8eee23345 SHA512 cd67d350a79129b5850850eaf7b5f0597aadd574da64cd7b24e7c6a36c522466b04f814905e970c04f6cc2b9e6aaed5d557f451fdb7a9682db422a3fd3025ec6
 EBUILD ktextwidgets-5.53.0.ebuild 898 BLAKE2B 5624a11e67d15fd026a1d24a66710b86b3b7d4d8b73d5b0fe40a67ef0f9fb98e4d9fed2d210ddfc038aa8b84d56f5249ab2339bcc7b5a9f351dda59e5071a9c8 SHA512 e7ed6777c18549ffae9cf0d3470b1d2d918f1b510cbd02a75e7f49b71576ad1066f243e02fc3c7e594846bcfa1d5584dc74b7a6437090fa714014d40d15f4aea
+EBUILD ktextwidgets-5.54.0.ebuild 898 BLAKE2B 099503f62d07154a6a0a99434c7c015756584accf6c2bdbf35a0bc592821cde8d4876f988f5b562c27e5c197415c143f7301d48c2f0aeb6e03c88469021bbed4 SHA512 21c8d3099ded50f3880abd7e479f83472511c5a3e5d24d3a5812a8436c19b947bd716a6d16cd5674f2a90acc1c903322e86ae2cf4840bc88c838ce4e028873dd
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.54.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.54.0.ebuild
new file mode 100644
index 000000000000..c42f4456edab
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.54.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 23b7fca45245..eb6b33ee7f53 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,7 @@
 DIST kunitconversion-5.52.0.tar.xz 767176 BLAKE2B f50c520cd0d23d43190cc4ef38560b2b75256bcce5bff8a507659c533572ba9de774c4d8aea848bd97c2418fde46a87db6d35778b4c2a48446f3f7655485ccd8 SHA512 f7eac193f00335dd3316d4ffca9b1a7f310815ab8f34095f95eb3a1e8f15fb95093c799587550d0ba22d359b6bfe77706e0093a155dd9f6b2f26cc05971b8600
 DIST kunitconversion-5.53.0.tar.xz 772772 BLAKE2B 32e4e07d40853337a22c7a74cb858c5d33a85e3f531b293fd12e934833cad3a630e4857d828403e1665cfd04d61e33a2487a9a75b227c381fd294024e79d6948 SHA512 b10717612862737622edfa19e8fdddd44f49f716618184bc2b2d51ae37fbea36aeb246721335c2a998f0f2efa730077bdb5799b19f3a6402ac90e0822f8b2c54
+DIST kunitconversion-5.54.0.tar.xz 773152 BLAKE2B acc4c5be7f5e969c3df9bf7f7298e4031da4ced72e9e8989f0020880a69dd8078bed120f858f075d25b64dc6c9d846ac3186d50c158a2599deae09583fea34ec SHA512 657b13bf4d49fcceab6005ccbbe439f011be5865ac95c3a06317edda8f2fca90cda2dcb8d415235f2edf4af3616ab35e55a9b40b94d29d0dbfc6b5e74fc3fbb5
 EBUILD kunitconversion-5.52.0.ebuild 439 BLAKE2B fa6559bab3ac907fb7602a75641466bb661e7383169fd7d71a40036a957eab1f150dbfdef9093ace73153e231b24e9a8c283b5f42f6ae4ee940c4922e728a51f SHA512 66361e223b382f238020015f2401ca0997552abe610e935bc43eb3f51c4becb79070d2823680960628e031cecb609caa16a83cfc6c8d6b6533877d17747120b6
 EBUILD kunitconversion-5.53.0.ebuild 441 BLAKE2B 0def497643da74ecb345a060aa183429c678aade63a8587677a0004e6b733ad28b8e1c85e358ca1f0ef47dd92745bb110202ab9ab8ff6c91fa0e455a1f50e5f3 SHA512 ccf85d9169559828bf61c915b0475da4572fe60e9d8966dfadc5d29b03a0c8c51c80e5d2bfb93374051f21d7930e05d31f893857039f9ac7234c335464479eca
+EBUILD kunitconversion-5.54.0.ebuild 441 BLAKE2B ddedc221704b04103d6f1a712de930050cb8673cdde68b429c68a0c8a28573ef95e9d8c393b809376c2a697f47f2e6c3d6adf637dcf670a53484d35a3c61b267 SHA512 45a4702421308d896a376e5a88e194b6947d18bf1f373f4342c519574d7da6e2b9ada896af191c371e77ed6a93f73419f97017f4ba279336004872742ab86959
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.54.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.54.0.ebuild
new file mode 100644
index 000000000000..3854bc297eb2
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtnetwork)
+"
+DEPEND="${RDEPEND}"
+
+src_test() {
+	# bug 623938 - needs internet connection
+	local myctestargs=(
+		-E "(convertertest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 953d1cf7152d..2e248e264a1f 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,7 @@
 DIST kwallet-5.52.0.tar.xz 307640 BLAKE2B b42db55543198217a55185b619117583d327be5e1c022a953861dd0f67ec37bc84153a5c345256270dafaba9b40ad607ac9c33d0bab05358e1c1ade20820d3ec SHA512 63a84d0016b59297274f55eba901e0219e6c38bd6316007edda94cddd496488b4baa35c7cb38447bde70f65c35bedbe2aa5ce21b68a6a1574cf6275f62073ca6
 DIST kwallet-5.53.0.tar.xz 307664 BLAKE2B e0b58a75f9bbc7d502af5bb02429382614f626150dba81716a5b994683f84b444cf065aa28b173280c37fcb86fd7014200724c6d3911a884145fd230ab9268d2 SHA512 25d3a8d00c6b7cc3504a9dfa71aaaca1bbff63a8bac6181a1723b538061757c395b6b899ee4dae670bd458ae3621d9b5f74e7dd6c3be047325c44c5a06c8a821
+DIST kwallet-5.54.0.tar.xz 307696 BLAKE2B 9d1f8b719edcd708b780127ea5294abe8c3e2bb4081eaabefb28fce787cdd8b528aee37ff661744b0db1b33d586f022f94f15d2717428ce24238699147985d67 SHA512 f30ceda97180a562853923a0ad1cefbadbed51bbbf4b29405bbe85ccae3dc815053903367ba3638e7a7293eda7fbb7df88f527d6176fc6c2286088c38ce0069a
 EBUILD kwallet-5.52.0.ebuild 1571 BLAKE2B a3fc8fbf93b2d846048d5dc9746b6956d816247c937e9af2f0c7d8619cbdd13df3c6beeaadbe2e0859fa8cb6d9d85999dcc09debbd44f9c8c56dd870bd33888e SHA512 9881c2a2560f824133ea0b26e7ee9df4f47bab14ae2f25b5df992e55568fa19f8c39f5dfac36b34eafae9881f9eac3c0814a6eee4b557cbcfc016468b313ee38
 EBUILD kwallet-5.53.0.ebuild 1573 BLAKE2B e5bd9dc3cdc27268e52d085ddec6a31307e0bde8174b47b76fc72f0c6d843d1c1c1bd685619ac5c43adf373db8d1f15e4577f2973f2e65999a976f81b27b79d9 SHA512 b65a9a87d9c77cba8e32b7ed01a1775da5e1d7f3eeba38f4e06e6af85dc2bfce02cd15d41923442f272c58091605dae4b7673f99e2f4348c2f006e3b08e03a83
+EBUILD kwallet-5.54.0.ebuild 1573 BLAKE2B a3f73b662f4980b3db9a6b87602690bc1e86a6504ad35f0703ebcb041b8792f79883794a7e91451d1a0a9c13a4db8f1b3afd93751de980492a1d1cb0d7bace90 SHA512 581c46d5cf57cbce2def4b60c65ff6667d3a23f01c37d35195acf634df8c42bdeec54011043409be1b343dce65731f408924a58c682ec910d51999c4bcdc8b35
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.54.0.ebuild b/kde-frameworks/kwallet/kwallet-5.54.0.ebuild
new file mode 100644
index 000000000000..61acdc1c8b64
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.54.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gpg +man"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libgcrypt:0=
+	gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] )
+"
+DEPEND="${RDEPEND}
+	man? ( $(add_frameworks_dep kdoctools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package man KF5DocTools)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then
+		elog
+		elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login."
+		elog "Install kde-apps/kwalletmanager:5 to manage your kwallet."
+		elog
+	fi
+	if has_version "kde-apps/kwalletd"; then
+		elog "Starting with 5.34.0-r1, ${PN} is able to serve applications"
+		elog "that still require old kwalletd4. After migration has finished,"
+		elog "kde-apps/kwalletd can be removed."
+	fi
+	elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"
+}
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 22e61c405078..30d7dafd112e 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,7 @@
 DIST kwayland-5.52.0.tar.xz 333408 BLAKE2B a72ebacf6dde9ea8ae0895a761dd8faf471ff5fcd707e384b6535fe5b1744180cd4b8759427c84e40329e47d54fd905bb4bd02f12219b327ff72da1dafa26853 SHA512 db36b42e491bf25faf45aa0c5b6b924558e8472f616ae70132bf48ca30fc620ce090690e01111d6cdd01ad3b9b0dbed45f1685c28aa67cb337e9eeb66575098c
 DIST kwayland-5.53.0.tar.xz 333456 BLAKE2B 457c610ddf1c0414f232cb45b9d23f3f28ff17a1cbb3de40a3dfca68ff27658892c986eba9d17f533eb2da82802b1a007add9d9c06c35328f7454fe8374832c0 SHA512 bdc12dffc89251e827fd41e57097b43d6516306cbca4a6a7b45208bef11fce64394c9f1f712bb918cdefe0b09679968ae8b2527a7f21d733b86c7babc85b8080
+DIST kwayland-5.54.0.tar.xz 338316 BLAKE2B c7a69100832a4d0513c6c1f0d212e4e9205bdb46a8ecfff1c3822c3bb7f3b54cd536ba081f35d715cf7e17876b61e24654068e77d5422777905cf4d9acd0014f SHA512 8b6eaa2f57b09857447f702e2e0f253413edd6938459d407437aac7dddf1313002f6c4c4f32df861c723479fdf4642084a360cd6406729cb42c627f488ac6aa7
 EBUILD kwayland-5.52.0.ebuild 574 BLAKE2B 378a61cd4fa50ab88b54d6ac93d68bbcee8257f2d5f4b5fe18b3a31aae2b27048cd05d04034fc3759561394fc5afe9368b61a29193f16b1b4934e7a4cfd54026 SHA512 2a737741652c2df67a4f7b322278f62da3d911bc82e3f28d79584ba298f0f7e4bbfb7479ecfb92b2c42eeef8318b5296f4f0d60522944e258de516f48fa9d6a8
 EBUILD kwayland-5.53.0.ebuild 576 BLAKE2B ee3a6ac0598b1d0821de7ba1f18ebe46e783f12f602edc2ce4bbea2dbe0d589c0160d45ec4b8f93d87b35f0dd00bd07d52a5d6adcf3db69221599ae9f5297e1a SHA512 4954ce722238052ef6f485afec845fa015d938224a1d39b6d81d72e8fd31118424f0ef16b36a79089b5741f24cf463c9bb66052ec2c9afa4a3dfe77285ca2701
+EBUILD kwayland-5.54.0.ebuild 576 BLAKE2B 726f5ff5533d6e6bfde311a514b1dfe88c6a2ec5b5871d779445e418d1ea62d0e701e19504d6faa50e7b6e6e4f9ffe9d02fabb1913bd1ad2fdc522d3acad72fe SHA512 d01d7d2c4953300bf6a24432d1251a87318a6d0acbceeba0255da42f87a4cd9fa50dbc56f6dfe420cc02a84668bc53029ce3a2430faa332bcc0c3afbcedaa5b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.54.0.ebuild b/kde-frameworks/kwayland/kwayland-5.54.0.ebuild
new file mode 100644
index 000000000000..b2fc71edaf4c
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.54.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://cgit.kde.org/kwayland.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui 'egl')
+	>=dev-libs/wayland-1.13.0
+	media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtwayland 'egl(+)')
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 86ea48f4c4b4..7863aa6b403a 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,7 @@
 DIST kwidgetsaddons-5.52.0.tar.xz 2185380 BLAKE2B 6307774cc9d6c41d45b9c5fc97a2c72d52065970dee54f6871df49f5f8ce9ffcb62277eef031466ed7ced83ad6941de61f424d03affff00111dcbada24a7ceb0 SHA512 86f2f32ab3071358c6d2887fcf0105a3d84d60e2e58898a48857776cc42e0a2c45d53d786879449fed79fd86dd58b2a9ae2053b7b254fb3590222e915e533cd3
 DIST kwidgetsaddons-5.53.0.tar.xz 2187316 BLAKE2B 0997f0065ef1a067e4abfa0339efc5e08eda31275fae9cf38cb26a8ebc5e6246b4dabcefce2be25372c35214d1c6d7137badff867a4d94650900150ffa67a34c SHA512 1f28d4802ee037a79f39da413c89ad471ad26dfea848e000659f85ad0a78d463f96135907dabd631bb98f86f39e8d16b56cc74c38be8a85b1d7e8c6da23e8c43
+DIST kwidgetsaddons-5.54.0.tar.xz 2187048 BLAKE2B fba80432f00154ed4811d70b693d13d3dfee5c5dcebd3a3c8b3403ed5119e0289f10efdb8579be302ae2c2b6bb17853f20ac4c337fe78dbe042ee2cace00f8a4 SHA512 e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8
 EBUILD kwidgetsaddons-5.52.0.ebuild 522 BLAKE2B 0875eb8feea99bfe3e18fc121d3fa3b457ef62351959926c50cd16cf0f9629087c89e7940f56e6c1ed4d446d66db434b37797c76a2992994bd34c81157d0c579 SHA512 d1abbc7350ed8ed8523e14f758bb714d88b83b84d56aa552e02c123c611a9d5a65149420442b80240513dcb9118bc903140eb2179ff884a659bc967dba71710e
 EBUILD kwidgetsaddons-5.53.0.ebuild 524 BLAKE2B b7d714386fa4e7ffb4b082190dd89e0994e2a834d7d39f431afa636dfc336732a798152e8f37630b0d1fe474de37e09b911161c642bdaf52a25e77a24815baec SHA512 7bd844c1c417b292ebd2918e7ba500cab7ff5ba10627207a4f27cc9824145199e56242f573f0a4ddc0695608b6e61144e41aa31a308432821f4daf11e3d6e93e
+EBUILD kwidgetsaddons-5.54.0.ebuild 524 BLAKE2B 84db784a57f04cbd14d04a502ac416314dfa8e42996e2c111d0ab450cda4c00bd5c2be770f3413733b8b15c556bafb2167922f8df03ed171fbaff8628c5525f8 SHA512 2036f8a1d36b67a09e1b882cf34ec3fb4e2a46a5eff3d6588adcd2d37c9bdf2d2dae548109d417fbbe4017d7ba93f2ab9c9d004eba1ff32cc4c8ae8173f49ba6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0.ebuild
new file mode 100644
index 000000000000..456bd678d4a3
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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) )
+"
+
+src_test() {
+	# bug 650216, 653186
+	local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
+	kde5_src_test
+}
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 332418a64408..e7194d8313d7 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,7 @@
 DIST kwindowsystem-5.52.0.tar.xz 169764 BLAKE2B 986cc65ec3d3eb9bf22181b1acac817dcd932762c7a807b166f8c8775df182b7a87a69e17a8df73c60336919775ad377a6a3a2d51f50e95383e8e2722ddd37e1 SHA512 fa24a29cc814c226cb3f80784f8e07ffdcfe77e03ad3f010ea0b9da3365ca24416c3f3d920fdc557688c3a5a1465cdb946a8dde7962b3bc15dca0a58785fc098
 DIST kwindowsystem-5.53.0.tar.xz 169740 BLAKE2B 9b9cbea9a3028b8e9e30c1139cce609d2a14aceaf9e2bfe8f27343e18e7c740e05e48b12280540144d84529c1b4bd65b9772920c8fcfc6172afeb0464bb76617 SHA512 5032629e1af3cf4c0704e8a7d9751dba538d6bca3a6553e1f22cd1d9b7a7d5d62b4ba851f870d98bfae3344b4f99f45883fa8d05a0f8d93ecc91ec28bb676417
+DIST kwindowsystem-5.54.0.tar.xz 169772 BLAKE2B 0aadf9bde45f6bd3532fd9eb411bcca3a059449d673ed6af3f493ddf260496d5b115e70f7935a059abf34b58445066e333b4351385846556308fd5b364333f8d SHA512 144181636b5f272a4a248bfa90ebc2410ab4b0adca034b086ce86fc208d63607f00f1b8e2193647d5fc72c696f3b02d5d718a3125d4703c548e7a8a85da47690
 EBUILD kwindowsystem-5.52.0.ebuild 763 BLAKE2B 73a983e5efe873a42b52449d8078685b66990242b837f054ab874e50fae53ed54338f5a73845aa8039e367b5a7f0733fd1ecfe79b1a1a7373892b5529c8564a5 SHA512 d0dc1cf26f862272a602602ef917e42186ad9d2236d3be3386db69ddc5dee92aa31ea87e10e50ff3ef5fa55f4cadafba444e3b76632d36cd4d99fe15e7bdf3b2
 EBUILD kwindowsystem-5.53.0.ebuild 765 BLAKE2B 2bdb74883bdc0402cc9cf4acb4ac9b9dbc22bd8665b0e145c5defd8ffc9843e60aaa642d9c90b20db9c142934ade738fb7abcfc1adc8f4221964a076b131e01b SHA512 37fa1947e6514924d578d55a3cb5f69e932b6bf98992423655255a853345b5ced2af9811a46262443e70bde6aa01c737122335e53a6e3df243b9b049747d7263
+EBUILD kwindowsystem-5.54.0.ebuild 765 BLAKE2B b24745ce493c26f5c745e725d8b679b91eac7ea54ccdaba20247dc242ee54fb86fd4781e99403b0fc28c0392a0ef4cdb92ef1d2ae9abb09a7ae51c175e069eee SHA512 36121aa1284d4b0bfa53463b443955b290dc9782b9047bb64802b33a87b83e7c40d54963322d8ebef65a3c7e21e9419e0b408592cb6e00bd5776b03b66602f95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.54.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.54.0.ebuild
new file mode 100644
index 000000000000..9235b0a16e79
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.54.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to properties and features of the window manager"
+LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 1e13ab61fd92..e8811a3be4f2 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,7 @@
 DIST kxmlgui-5.52.0.tar.xz 868824 BLAKE2B b83639a9e5fb7fc3f841f943636f51860350b4f9e45864b60835a44e6a61412149a9702db70abd30a33af439a0e13f09a4cbbdab094875543d906042fd41cb0c SHA512 cad39799e4649a6607ba6f10928c02e68d6e7c9420b4f401fcb55fa10a7b74a2304ba226680fb50fa674207b10e9dec0fcba7233e74e514c7dbac5df4a020f8b
 DIST kxmlgui-5.53.0.tar.xz 869296 BLAKE2B d699c21520e4cf48b91b72d35d310e18f8c085c497419332adfef884cee1e05d1d15f780f4b61888aa787780512c5821135b789654ced9d29baeb53c61a2d003 SHA512 65258e0844d62f2e7054e6075269f2819d5cb3845b71e9bb87755c042b80fe699f086de84f9a051aec3644f5216040f23eab8b119b20ee2fb5323b8296f68eae
+DIST kxmlgui-5.54.0.tar.xz 869308 BLAKE2B f9f19452444074e2ce78f7a8c902b9703e0532974659ac5a34898debe52cd6dd05752c4923a9d1afe9606e628cb696ff59f0a5b78ad6d13f75c077b9bbde35e9 SHA512 bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5
 EBUILD kxmlgui-5.52.0.ebuild 1221 BLAKE2B acdaccd9ec7f22fda28b1d27ed9821184a1554a28c0e5df772aa9242203bda66edc342defb7cd60b3a2cc1fb07ddbd46c09930eafdc881d230ef2db710e6e453 SHA512 bac10638129d1cff3b7653bb25a4b4f87bbd0ce43e8dd5f192979da6626134b7cbd95ff08d4f0be364f984054e8fe8260d5f986af28df8e040de3324c29f2d75
 EBUILD kxmlgui-5.53.0.ebuild 1223 BLAKE2B 6653e08ffd32b47bba5e770655b9cf181bc9a4091df2418019a7179d362b65f7b4da47091da92e3b93e84138d2da8be473f5b979358dc760f1b67877c692c45c SHA512 f6e1870e9b39243bada3dea938bcc1f5e875ee85cb508bf7c551f0f6efaa9eba122b88fe60c9128b93c8d7dd09b0461387d47551c9834fa34d16cc5b8582fcce
+EBUILD kxmlgui-5.54.0.ebuild 1223 BLAKE2B 899515fee4a20f349a0b5b635201af4595078c4555ebaa71d3f290907104bb5cd05e288ad757e67a16de151f4b71f5d0019611cdab4712c33261eddd6f8021a1 SHA512 90bc5dce670864cb90373e5110988a406f83c07cda34a9c688bff2e4f1598d3705554ea87debbebd037855582b98f44c0bbd0f984d581cc5caa3db1f96b658e2
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.54.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.54.0.ebuild
new file mode 100644
index 000000000000..b83fe649dbde
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.54.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+# slot op: includes QtCore/private/qlocale_p.h
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore '' '' '5=')
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package attica KF5Attica)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 2e4fa83a95bd..5674f79bba0f 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,7 @@
 DIST kxmlrpcclient-5.52.0.tar.xz 29380 BLAKE2B 8333595084dd4be00d03d9ba2df397947c526e5973768fc99387ed64849a248217577192ebbe653f3be834955ff71d624c3835b76ce95513a5c7b3568ac93d45 SHA512 c25bad253e71910466028959575a6f7e164563775f6c8b99aefe8c313387360a359d467ffa35698f5b28397963982daebeebee3f8fd0e9627c56263319a4e20d
 DIST kxmlrpcclient-5.53.0.tar.xz 29404 BLAKE2B 50e2a87d3bb254c2cbd9d668fdb556b7d5e7dea3867cfa3555c7aa2f66b74cf604712d42dab02bd9e5648b9036e76a070db5e922b8b09366c15e86e9fb2d70a4 SHA512 ca25471316fcf0f4e789a4673e8ed40bd98feea7a4502628b3be38dabf557618bb385f483748d49e0de3987e1670a3cb9f342cb9684bc012a460c5ba633ba965
+DIST kxmlrpcclient-5.54.0.tar.xz 29412 BLAKE2B 83acd4503ef0bdbe40dd7e733ef829c3661dda1a57dcf6da8030815bb1172ddc7da49209f81e472659cf11f910719040aeed7c36b418f522418569ed0b6a121b SHA512 853f1a4c79a1fca278e2eb7d5c53aa47e4998276112428ec9cb3388c73eb9dcc4374510890ffbfc0ad52812622fae73ed4fd871e053dc4663d8ccd1883b76a83
 EBUILD kxmlrpcclient-5.52.0.ebuild 423 BLAKE2B d8d7e89a6d25819415e1bb192702f58c31fd785d606eeed6246ff2661027f18c023e3e924b9cd857af8e0185123c42c62d029b1ab0d853a013d5f785055a09fd SHA512 581a27566b2acde930a48367fcbd323d95f796a669962ece8646b6237bb658b838c33eae263ed3230ae7c31d44c50d01276a049071f45390e6dbc2bfc4f6b391
 EBUILD kxmlrpcclient-5.53.0.ebuild 425 BLAKE2B 4a137ba61febb18a157082f61b65c57a4ce6bf20dc4117bf598c5f09dc1ca3259310352040b442d5eccc771faf6aa4cd5d5d7c1d341f59a4dd12a15f0e033aca SHA512 9f606c3bbeae72cdf322b13525cff2a1c475a62aa6540d07dc7da38a558be8c9c5037e392dd8bedff0d2171e9e3c649d706866f479fafdc3ce4cbd5b8d766dee
+EBUILD kxmlrpcclient-5.54.0.ebuild 425 BLAKE2B d525fb6706998e61f6cc198e45f0fcd0258dc20d8f826fd167f3a404d29b6f721012b40f85daabe31b9b9e67eece38c1cd7615e686cd12610e35312c84a31bdc SHA512 85dd096c55e7d34aa7a993ef5105499ab8d6bb179eab50084044b4f9da99200287c25e3632cef01ab1af0ffb69ddb926d45e41d0d7195f298c541c6bfa746b72
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.54.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.54.0.ebuild
new file mode 100644
index 000000000000..7d9dc2406d5b
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.54.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index 7d0642b77a93..90889f10f0c2 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,7 @@
 DIST modemmanager-qt-5.52.0.tar.xz 101288 BLAKE2B 405430090af7b4341d6fa50eabfdd1893d34aa881b528bc20b1a3ec86bac2fb003f1d839d055aa9b1f19f7c5d97ed30a64df8ee294bcf27363e0dd3411752869 SHA512 7c438c65b493e030599f5fabdc5b60f806cce07cd9a7b95c66620ab17bd35e21547d11ed62cae1516d8fa9e476a039d269777febbfe507327d01bcf158917ea5
 DIST modemmanager-qt-5.53.0.tar.xz 101284 BLAKE2B 8a9d1d8d824dfbdf526ee1d4495f40e77d74c7df20857638cf1cf06af1584279d4d3821b4a6818387a9eee8835645ac2578ea5291412676c070099f7b48aa005 SHA512 fa70996528f8462d9926bf7df5b6f1008654c759a2532ec382e41ea7ff7de33bf16b281c5ca322435a7f5399e7e0753fbc36cd00b9ef5de791c7309a7d9c2452
+DIST modemmanager-qt-5.54.0.tar.xz 101316 BLAKE2B 3b75be8961b8dff79b3d576d0fcbea7df4a6031d77a73d7d87e27c92a2c46b36c2e980294d18c3f146bc9a7c628f97668d744e684e6920093151f53c3dfe8a89 SHA512 240b1d4bf268be62bab4b81bba9f99c3a021694bee0692ff5c1e35d806864752f08478af79c3b38bd39022a670beb51d8a7568cf91c9648e37a150d8b1fc3666
 EBUILD modemmanager-qt-5.52.0.ebuild 390 BLAKE2B acbe17f0b9db037b2e7b596ad420fab293d73a08b22ad81bdc5ab6f7dd67d1fb25a9df1ddb7012be7172a78632c2c4f00dc9c35e29481a5150ac2053404d0f20 SHA512 bf0384b7fdbe9c3504a8de4bc630012264ad0ed225b6058c4274d79b4dfd21c1506feba38c478656fa83bd4b39d8c1b1c2ce886d2683b434961f2d030e36e9c9
 EBUILD modemmanager-qt-5.53.0.ebuild 392 BLAKE2B 7e714e8ed87d6ea7a60ed91e98588b7cc1b6d41e802abb9dfd818234f271bacf3291426744b8486035443796ef7629c1566ec6952cd001b8e31e541a3cfacb17 SHA512 47330b10690dc1a7d624f593d059d8c2f48cb335516d372993839db6e116a9261738c6322e972d8b441984ea89e93732e4c62cfaa85a79c5d0792f6ab472ef9b
+EBUILD modemmanager-qt-5.54.0.ebuild 392 BLAKE2B 64f01de51605f7b4fdb4b0f8e428188ee218507dad2b5a457c6eca460b3ea2b7108c48aae70b5d0e9e68eee1015297fb30263e415d30cc451f0e8041687b1b8f SHA512 8f5cf16bc42283f8babc64c6dced317af728ba2f742630e30b9f564669a4e25d419cc5d79413809c4e141866d8920f9f91e454af671f40b39d6a2b17e1bcfbfa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.54.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.54.0.ebuild
new file mode 100644
index 000000000000..678f4b5e72b9
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.54.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtxml)
+	net-misc/modemmanager
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# requires running environment
+RESTRICT+=" test"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 451be7eadf7f..476135dd8187 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,7 @@
 DIST networkmanager-qt-5.52.0.tar.xz 166476 BLAKE2B 001fc9f200bb3e0f2bdd060287ece98e36658e898540c5d852e9121cacbe0f59ebb6f92cbd77392100c18668fa8a7a36950ca568907b0d4449771d22de50534c SHA512 b0b45fadc5e4b0f2e043333f786c1c7cac1a9455e15e818155b92b7e16ebad0354421c5c19897b1732536b0532a452cb8d6d80a64c2b8cf635a5f5b18afd0da0
 DIST networkmanager-qt-5.53.0.tar.xz 172156 BLAKE2B 2fa1f340f8afcd8f632af4e8896217e4037370aacd2de128ebbdc9735beb0ba68d67f2df3304de68d429443fd4c93ea1220b1ebd15cce410d0a131a5e01b9862 SHA512 99851eedef5bf3eb56adfdee7a3dac193a86f3acea346122395fa0c0bd3937ebfbbc4f628a21adcc528debf002ae7f7ae4d932fc5ebb5c3ad5131caec28e13a9
+DIST networkmanager-qt-5.54.0.tar.xz 180540 BLAKE2B e8962fe16fb47f04cbcd23f013f1a9156a900410f3ad92fa8538d208628b78dbea9337c764f05dfdede793ae9831f9f27b057adc7e993e60fdae8cd693ec2176 SHA512 3111e19d358cc8d395a60de1ed9d0a0d360f2994a0dd33c838ba4f01995e4e03c0fb2bb28b50d76ea36a7707ad25576c3e1fdcfefd0c1e5f8b54ce5f652fb6b1
 EBUILD networkmanager-qt-5.52.0.ebuild 684 BLAKE2B f4d7d1d757cf954d7f7835ffa65ae27ce8cd62817180a995ae019eabd004566d1abac4d2bf824018c8822fddb06e0c2e91a8717c7938e95b035561992544976f SHA512 97a6a6e780512f9689d4eddc9d71f3f5c25ab81066ecb2bcb6ca01f125034f94612cb9ff4e306de0cd78da49cbd9e988fc5567255df8748f822e5a4f7c3f5319
 EBUILD networkmanager-qt-5.53.0.ebuild 707 BLAKE2B 796f243879baf2c18a7a504ba3489adfda63d5646003fd75061280bc9482ece3c55a8ec56eeacbaee447cc1216236bdc56a3f6b578de4c6d014192f4986f3245 SHA512 14db18c2263a0a1e03ea43499674bca6d9e56b16ece5b69e9c5f9518d05730cccdfaddf1b1ea48e86af794df948600b3f02a1aa8eab697ab39aff57c33d59322
+EBUILD networkmanager-qt-5.54.0.ebuild 709 BLAKE2B 9577cb308ab62725b564267f8fe0fbcce899782e35a90c217d8dfb1e8e525e1df6b99b60e47acd24dcc143ef220ee93a2ec25edc4ac9492d162ca1e67f311159 SHA512 23daf52081298d512046c44f49842ca787e8b2790166db4fe1e89db365712cc39ae6e2cb4d5001f70c9983297f87938c5fad5672ffd87e2974226c45f2bce260
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.54.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.54.0.ebuild
new file mode 100644
index 000000000000..b55ea9c7bd70
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.54.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="teamd"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtnetwork)
+	>=net-misc/networkmanager-1.4.0-r1[teamd=]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnm-qt:5
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[consolekit]
+		>=net-misc/networkmanager-1.4.0-r1[elogind]
+		>=net-misc/networkmanager-1.4.0-r1[systemd]
+	)
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index 38be58dfc6d0..108cf5cec341 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,7 @@
 DIST oxygen-icons5-5.52.0.tar.xz 236766368 BLAKE2B 984928a899f83f2526031fc5f2b25f206759ebdc686d26e2a29a77db33ae124a273aa90b962e04eff6ba326d8d530d4ec5430fdbaea404e243221ac4ec431888 SHA512 4552966bdd4ffa078c3b06fa6c39caa685fddb57e9f3af50a1ca7ebe8e2778bf0068deedf7aeae7e40eeaf8d34fd3fbc630f8a62c001e5b50dea2eee1b344029
 DIST oxygen-icons5-5.53.0.tar.xz 236762900 BLAKE2B aab7c7fb8863fbc892bcb2958b063f1e936ad2fed646633378c9551a4d304669138441e7a9cee6fcb34bb2d9575b6c9c4a5c520b1aecc8128daaf23b6c09237f SHA512 20621a7e6d035d4646a179fcc7b45566ed388a42549f67f060b7a2bd9b10ebaedb0aac5761f95def97a348d2d3c27697d110600cc0daaedadd96df6d80f6eccc
+DIST oxygen-icons5-5.54.0.tar.xz 236759924 BLAKE2B 388f38920e7dcab970783101d88732c12af468921b0f8cd7d7c6ec6d3f0fe8141a20e4a55d8f41504959a7a4f273eba652cf1d00721c3ddcdf903f696e7ef587 SHA512 5ae34015aebff31cab3192905c388ac5a75c67e7b24ba3bb12075edf6f6cb013f9ace837ea8dd4ef7c5174e27ea1b84e418b34eb983648943c4063dd076d6ccb
 EBUILD oxygen-icons-5.52.0.ebuild 530 BLAKE2B 71442f1aa23ee32624f1febd647fc0dc56d1c706c609a394a20543cb44651c90f71745d1377c8a45d5fdf9963f3315dece3cd3506096376792ec0689d3b8a190 SHA512 04c860f76ac91c67827699d326e05c2331f1d894bbbffa0471ca18de0ebe5d610de7ec3e4d4dacc677c58ac79fd4374b71f83d1e4b5eed09f89af36b5a32c1ab
 EBUILD oxygen-icons-5.53.0.ebuild 532 BLAKE2B 5e6e4cb48dbb7447717ce2e3b734aff3137f9761b6d7a0bd3008cbaf0fb36a1264527e4871c2def92341c0a294d10f712223c01f22141571665d5f98d8d95a4b SHA512 a96e4454c0ca75bb0493c81d1968e30e346354cfc3ad14b05354230b0e5d8a03be5bddee88c695ef1fcf842d559733f3f10549dfc2389fe762690ee8fb09691d
+EBUILD oxygen-icons-5.54.0.ebuild 532 BLAKE2B e5465760e2d2d0a3193329bb8b3e6ed9381604013edd3c4af228065cc2a290ed5257d2df0ed73a0837fc834c2ff63221a02c06775ab6097611edac22bc307309 SHA512 73789f95ad1d3b4199f7a2c347d904b19f63486d6f873c770490360486a551f64b66773ed6c7a2a76b7ced8a256ce083f6282347af3005774eb7b07ac2c64134
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.54.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.54.0.ebuild
new file mode 100644
index 000000000000..0b27065e328f
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.54.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="true"
+KMNAME="oxygen-icons5"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND="
+	!kde-apps/kdepim-icons:4
+	!kde-frameworks/oxygen-icons:4
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index f4198cbb1a9c..d9b2b6fd7ce6 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,7 @@
 DIST plasma-framework-5.52.0.tar.xz 4629948 BLAKE2B 8d5cfe4dc4bf9aa5a53b7a745782e33a1c7ac75be3c979399abc4efc23e2d730e0f312ad7a95120c27132ea1c1569e41fcc0f2877dc8e4f13889dc6d00a635be SHA512 ab48ae771b8b4b30ab21ed3504d92e4e4fb69539e9a9a8deafebfd036ba672777c8a9eece05049f2d8dc49774c5c42124519a7a9545c1e3370a414b4b2342096
 DIST plasma-framework-5.53.0.tar.xz 4630584 BLAKE2B e59f6d2107b40c98a01c75429fdabdd9f4c20731b6b603511bfdeab71a09fdeee959ee1fae982d6c86474c401c476cdf0017dc8ff2882b7e9d74fd5b47ce4869 SHA512 d589e3ce6db8757ef61fbbf1ee0ea238486956c5f999dc9759d8623535f749c827940721253b1e8ec20d6b41131ec4696589b432347e8583804e32e1b0f4c8ab
+DIST plasma-framework-5.54.0.tar.xz 4631204 BLAKE2B c7c68f96524be0bc359b0f4b36c79c2d581a8659a53ab432ad64bbeec00b4004630170d2354a887e0ae6d2c15c50d9895fbb5f27def6d8574fd051e5f1612551 SHA512 618f2beb3b8a25cacf7c11339ba15cae10db461c61e278a5ba845e9afac7e9edb48fde16bd78b4bb7d16c07001f8d9fbdbf5bfd58593488a544fa183b3df8c15
 EBUILD plasma-5.52.0.ebuild 1648 BLAKE2B 746cb12f267a9487f40d68c7f901484fdae455391809ff25f2e1df27b6fe6fe7fef3976668f05b6d7a344e641f2dd4f33663f22a4bb0cd887468493f089622fe SHA512 c567758a6c38f77750f5ac96409d1e2170448797c384fc64c259e9fe6bce54f152a548b29ad7ef64c36687d04585bd0dcc0942b0c74d56d7d713e68c9b9797f5
 EBUILD plasma-5.53.0.ebuild 1650 BLAKE2B ecbdd2b25170944dfd861eec172c8a48bfad5299f2faa7282542603a7dd6c4088797bee865e3e7ccb18fa381f02fdd60cf50c1d61ec7956d3507a4e813a482e6 SHA512 804255302fa36d6d12e1bb10244f6b4c87f27d7e1ce90f337caaaca85a3a8d202b4605f0176f146ce932606614d73f009f89560cc17853115b1d81b15df78ab7
+EBUILD plasma-5.54.0.ebuild 1650 BLAKE2B fceb2976a225696cd6aec7dd84733610058234371139f60c1b9d771dd5b898343af52376fcfc5e655d477fa2da884fe02d9534bacc4843c63139879e525fffde SHA512 449da30076319119c8fda1d359e06f8d16d663b1db0dcebcda2b1608c3d084b1326c7f8fa6c8617070d885135fd7dfb995a565f154ef6ad768879030f778ee87
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.54.0.ebuild b/kde-frameworks/plasma/plasma-5.54.0.ebuild
new file mode 100644
index 000000000000..f1d6e2255b4b
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.54.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gles2 wayland X"
+
+RDEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kirigami)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	!gles2? ( virtual/opengl )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package !gles2 OpenGL)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+		$(cmake-utils_use_find_package X XCB)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 03fa52b258e0..5cc8dbc4679b 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,7 @@
 DIST prison-5.52.0.tar.xz 41756 BLAKE2B d2aedf3cbe591d435218836b191579b6df00ece15e5f4526e13128e63531f83cb43ffc21248ee2b06d4e169525d77bee5031a073094a49f5843d94b626203186 SHA512 5592e99865d491fef36aa10552245f555aaf12a9bc0b17e2df44efb091ac1d06fb1ada647c63c33a1df32737f34943202db6a286b714a1bfb63fa0180a433797
 DIST prison-5.53.0.tar.xz 41744 BLAKE2B 1c0d88b38471d00b9d7fdc2ee3cc74cb9c18756ce757c847f2590ba338ef77a949c19d57aeab7ff0a5463255d3d61b953cad8275f47989571c53c3e54109f592 SHA512 405d23f8e4c036d731f1d5d5878592e369816c2163a11f7f367ddd34ec511047e9d2e13b0315928cd816d354332d96b450d3b1e15a80bdc485f54b872daa49bf
+DIST prison-5.54.0.tar.xz 41736 BLAKE2B d973df4f269ca25e43f0c93b6d941c80020c64d7ea0ae58fd72129c57f9139f92a2f9d8d8fd37398d7e522c3edb96be5b09accd02f22b4688061be963f0b4a5c SHA512 6ffdeb4c8196a9ec6c845ebe1d58801c02d570f831bf5c1a2bd8f30d048cc0d62aa8e8273fc8db4689c6ac45caa35906bad82b211e58108b7ed8cf42649acf16
 EBUILD prison-5.52.0.ebuild 530 BLAKE2B 0f373c9e776c89236655cea0f738d03bae43e0b453cf289fe6492de611cb64b7a41171e060e91017e31aa53d6ddd8a91050c411b1d1d0a030c7b1341508c134f SHA512 830828297d23c07b5978b406b2df45d9ff22061d6d98ffa0c20c1d38be7d966a234d5c9cae6a95388f02504c12db27da45999de0421b2f24f4427d4e27af0cea
 EBUILD prison-5.53.0.ebuild 532 BLAKE2B 0c4ce086acdefb35779043f0869c88dbc51c9775a6b0b66a242bb558f1b37da210c83a78c6d723ba92576fe982bf299164a63bb4def98156a149f3b4470f07f9 SHA512 736c47808b68e4b26558103c848f8f3d905fe7c545977750e2321328f91f6ce17d4b59050437c9642e39c70da834cadc4a65c15ac5d516b3a971757dc45db46e
+EBUILD prison-5.54.0.ebuild 532 BLAKE2B c3b5ee5d9a63d5720abacca734e1eff8e21c369792893df238e319a60030de148c450b0ce2d8bb13f8ac540e624e242d54cbc885d014a7f933b801e84e391fe3 SHA512 171e85ad2cc59c745e5ede9ea5054d350cdd688a8f22b88b39c5620a1eb0be46c201fede9c09aee33c029dc2d7c1eb51e978b69e98caaded1c67afb8b4d9ca6b
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.54.0.ebuild b/kde-frameworks/prison/prison-5.54.0.ebuild
new file mode 100644
index 000000000000..399b320a7630
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.54.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="QRCode and data matrix barcode library"
+HOMEPAGE="https://cgit.kde.org/prison.git"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="qml"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+	qml? ( $(add_qt_dep qtdeclarative) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package qml Qt5Quick)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index 146d854914dc..0be8cce20c62 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,5 +1,7 @@
 DIST purpose-5.52.0.tar.xz 141344 BLAKE2B 36abefc85beaee31c4d0ce10ba793deee9616025ca33339ac3ea7deb7f8e221c4a67c2dc0e6c74c588054c99e8745cd55dace97d6be63d07d07131e7f47a72b1 SHA512 e5704a42fb8f344f25bec7366c07b41eb7867a30c9a395ebccda106ce88838e4d9f8a4ed9038bf84be820904c3cd25ee6b0c9f5cde829b49b1f5d1544b27fa46
 DIST purpose-5.53.0.tar.xz 141932 BLAKE2B 29d69e4d51eeb98e0c0bb2e90c79bd72634719604cf3fa5cb216fca94cd4f85d57cd8c5be74a0e36e8e37c203555de186c09bdea68736a0d0b8d91180c9f5139 SHA512 b0faac18def838ae11e13778d6e45edeb8d95b2d64878cec53af76aee6a8fb90e5590299818cac070c64585e324bbaebbea1749e949c7df766a604c60c48c9b7
+DIST purpose-5.54.0.tar.xz 142684 BLAKE2B 51dd914668d05513bc325305ac6c23e083b3a18f070681db04149732362a81199fdae89f9e5b00d711a68465ba32fd0c0e41e75f2c175db266a1b07ef2be749d SHA512 548b42fee675f112dfa1d6fd8ab1c8944190417f3d27d7ebbce6826bb50bdc9c560b02c665a51d0ac5e37fcbf0778318a03bad31cae076dc6c53f2139786edbb
 EBUILD purpose-5.52.0.ebuild 996 BLAKE2B eee76ea7e39e4228946ec7e275bea63b556715ae7cc7f96d63c9b88c7cb19fdf7a212cbfd939ad52e43126b1b76a20a5ca757c9fc7173d788c2bb84da2512dfb SHA512 3dccb1964ecd4bed21333d7d5defdffb96179729e508f1711353970a0278c6287fdbd7e0dfa4fd854ee9550cec5647b2c445e7a27cddf3ba3778fc5e86e18d77
 EBUILD purpose-5.53.0.ebuild 998 BLAKE2B 329f98215b13f61e2b5cadc3d36cef8eabb830da988c4c9117eeb7916c01831a5f6d2c4be6404ab04b79cfbd729dc1a2ce61ac0fbf879a228848e41e8b0d1ef9 SHA512 d9d5bcc67fd1e0ad126586e7d315cbd13b6e4a89747bc000fb6d523dc8b69a8886e0fa398f0c1edec8ecb31c86231c2ee2fa6e97b6dbd439d68f1e9df00448d1
+EBUILD purpose-5.54.0.ebuild 998 BLAKE2B d9f788186b683950ccce75d6844d751ca8a678786068780595a32aa8aa98f7b14b47a43b510a850b7011d3944330004fd26401c5e6ac6950609b018ee0123c04 SHA512 2b98156a4bbaf89c499b01d10d2c1e5414bae8f0ad21b6c973f8c7102b663f1a2cbced7bc9140b94b43bb9c627051d91738a74e092c68ea421e636462bce331d
 MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d
diff --git a/kde-frameworks/purpose/purpose-5.54.0.ebuild b/kde-frameworks/purpose/purpose-5.54.0.ebuild
new file mode 100644
index 000000000000..a58740878753
--- /dev/null
+++ b/kde-frameworks/purpose/purpose-5.54.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "Optional runtime dependency:"
+		elog "kde-misc/kdeconnect[app] (send through KDE Connect)"
+	fi
+}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index fea0597c6100..3fcf407473d3 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,7 @@
 DIST qqc2-desktop-style-5.52.0.tar.xz 41188 BLAKE2B 1b7d3573b549a22584b863a58e1540c9f339c2d0c1f41d41db09116b96c4727b38663756126545de9c72eb7dde7d4cf11e3f8ad6c4880d16d36fd57834ce3ea2 SHA512 c5d9994fae90f9ce60b89c51ec7cbba6e7f11837e1e613547e57c9e9db9d2be8ee7b01a90fa5ed74eaaef0cf3d3a6d525b19148d67b76f44f412dea8bcb21081
 DIST qqc2-desktop-style-5.53.0.tar.xz 42956 BLAKE2B 976bb9f17bffe38f9c09ab809771916243e4d68e93350f4b390428ccbd07745eab2e3e58d967b776c35ecb985ff225aed2c9981beede21c1dc12a1fc0ff8e19b SHA512 cac95752b78b315281e5d79b449cd5287081e51afcd7f7320d741875baac39ad8d79ac11ccf4c7655288bf077481edd9a845e364cab0bfe36b883e3ae22db90d
+DIST qqc2-desktop-style-5.54.0.tar.xz 42988 BLAKE2B 4261647c105db742db369d40de99e1eb7749341ab0e28b48dda4e3a40cfdd174d1927156b11b2acbe775de84c9d0e8a96f5e7992fb489c28a41439f3a2a47ce1 SHA512 3e6881c15051d29819ac8c6d44df6333a1ff79f723866debcf362e70275e4d50fb4e4d6f4b5beb2e58464c024ff01b829887678d4503ceb6c387a704e4b81b66
 EBUILD qqc2-desktop-style-5.52.0.ebuild 584 BLAKE2B 3cfe1e3160d20b32913eed192465b028453d7a4769c0a4c44fa292ab8538f6c8ef523b26bc5a9a585d6f62899df52888dfc870734bd6b213ed020585f9c5b8a2 SHA512 3e2ad7325061e0d8e3cab705b14442e3e9fecbd6d147a9a5233d7b7bc2716e4496e192a513d15288545c8cfc5451494c5dfae6519b039afb972659fa807400ae
 EBUILD qqc2-desktop-style-5.53.0.ebuild 586 BLAKE2B 02b41d639466e5b547c9744ade682d730e34ca769b873b83b14343f425c7ae9fdd167ffb628221791ade2c998765dca4123783f91aa613869ab11b0d28d6eacb SHA512 f3ece6269b2059f3f7fe9c390cbb27a98fac1826f333e0290d3dfe462585b9d9de371bc45f872eb3c996843156f0a9dec76b1871beca6b6e88644bca1c138c7a
+EBUILD qqc2-desktop-style-5.54.0.ebuild 586 BLAKE2B 4b5e0bb6667bf6395bddf8e83d5b61d648cda83eed1f67bc886a983fd989a2510209077c73ea3ed863c2feb6137fc2f85a9708ed032e2f0940e653de3f027473 SHA512 5a0b57fe7f385aa033d1b854f70ee6cf2a7d06e4f904fb2454a1caee693d5729b19733cca54fb303166599bd2632152e3429be4f2aaf507dc8704b6fcf49021d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.54.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.54.0.ebuild
new file mode 100644
index 000000000000..b670190f2b1e
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.54.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtdeclarative '' '' '5=')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtquickcontrols2)
+"
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index cec6fdb00247..2b61a843d267 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,7 @@
 DIST solid-5.52.0.tar.xz 258144 BLAKE2B 8c317d15cc547348e1691f0d4b8bd7525c37f6cb4cfd840485dd7b4aed0cc3b3800118f378187b1590aedee7f43f69bfd2a6450639554d23c98e8f47512678ea SHA512 baae7fd654e6da92d634ff76a94db1da3eb9dce6bd66634c84d00c7d8e5c20ca98713a8802d92e834b1760bd4058b3432598934b22b3c5456ae43506803b0384
 DIST solid-5.53.0.tar.xz 257904 BLAKE2B f6736ec4662feb23168c94df8eca32bece95f1c20336826b819064d3b26f97396b8099021d1b075d6a8344d25116bbdea6d8cfcb0aba53724f5ce642fbf86902 SHA512 598559f76cb6bf8cb4012126e20beae2cc29caae3636fe285877c408b09317722e1c96f6d252783ea6ceebe95a084f84d0db1a4250afb56268c7d58b3056d207
+DIST solid-5.54.0.tar.xz 258112 BLAKE2B e4d364746be5e540854d6f30fe62b06964dba8fb3ec3a5e9f4a58c5ff319080f8b36162acebeb531bc88f0f7afa2300907f21da57d0db154f138141b714d4879 SHA512 5728b617d5d6ec6acc71cd4707ab25e3c753c9616c2b5b1d4b1c66899faa526b395c206c3d3b3f36cb4e2f005f1267c12c9f73cf4d9fffd486eae64fbf78d855
 EBUILD solid-5.52.0.ebuild 717 BLAKE2B 685da0d08ad58fdc17a08987991852fc29c842eb9356c1c79a15f442d2258e224bc53ffb57baac1714cbab0b34324647013172c25d36cbb630f19f3b70cb19ff SHA512 1d24c20e390729b7c1d28ba49f8da9e071534b4121cf65212c7261a7a9f7b73b19ab7366e5f3288ec4b6ee43a87725882f59195d255918a1cef0cb54816db72d
 EBUILD solid-5.53.0.ebuild 719 BLAKE2B dd5447b46a1f13c8fbe9c58908b91fbf85fc5b48e829e673c5c8d3cf97efec5aca2898e03114068ec99063f2d100cac9bc610fc5192ff282cc4210e25526c3df SHA512 769fdd74ac0837dc0d527cf509d772badbebe62a7b79790bc34608d44d0864753535963b59868244069a0ecb25f97f37599df6afa1b03737708dd40d47f5761f
+EBUILD solid-5.54.0.ebuild 756 BLAKE2B 79e70c0a4b6131824d7833334a0ac14926fc9e2454df324afb510d18254b99e4883189a6be815545a4fc35dd6ea73fdf056c9e07d6d004b86718692fe08e5e23 SHA512 3c7f6e6210c14bd004c1507d6a95717097a5b2469a20e06449efc85ed385d8393d9f79af3f18dc9cb9eda833ae6b1e05bbe221ce52087736d79f48e882d4cf10
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.54.0.ebuild b/kde-frameworks/solid/solid-5.54.0.ebuild
new file mode 100644
index 000000000000..6646d6a0d8db
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.54.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-fs/udisks:2
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtconcurrent) )
+"
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
+		elog "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 297c78a63956..8c4d2b4e10d7 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,7 @@
 DIST sonnet-5.52.0.tar.xz 285692 BLAKE2B 0c85a2e39e2dffa9a2a6d09fcc4cd7bb2e63f93cae95a6602bab363d4c53593d35ed13776805f085d7737002eb7a195cc7b697cc687729998a581a6df1445068 SHA512 165645d9fc8ea4f3e373d6b585a8a54f2e13fc6c4f265a2806c8325e52c9e55a1806a0a439fa9c31733306aa11dc04d43e484805ee1e881600e010cb6f4fcf99
 DIST sonnet-5.53.0.tar.xz 285516 BLAKE2B a3c3c4c9fd5d54408c523a8e022f4eb5ddd40ed84505073932fba99850d2a7f6632670c8de4bf54ac75559b00de2147cf6ca12e1c4fb6bcb7cc54a6161af310a SHA512 b3e138bf1f3a4133b50fddfce43c7135e853956f22fab278456d7004b8b625c128dce439b122b1706320a02595d52dae4eecbbc80971139279a72206f34c67f1
+DIST sonnet-5.54.0.tar.xz 286720 BLAKE2B 6e603c8381ea5081f72896b12a7bca7d5eae6d8dac311f6120adad90a5c062b2707fa0276b2dd893eb3ce069fb4d0d2de63ad974e2ab8bf8e795a0d8cadc1a7c SHA512 fe7551fb65fe896a872c3f0af4ce1c60f4b974f993465b5ae7b3eea219a0964f7ae5107aa9346884ffd37c95b4bf7ea0bed05592245978c07fd633af88eeca88
 EBUILD sonnet-5.52.0.ebuild 695 BLAKE2B 235124bbd82cef5408c40a21aa3f87687b12de412d608412c1882ecc5e90285a9841f36ad3dba43fb4ea9784ae75af59d69266fca07abddd0c782a17d959aded SHA512 d313908be9dbcf84a40db0eb215e257eb698dd4f10d537a23ac1c394fea6e28c9cf7cddebee36a788d642ea2d4e351c5d3166990591bc9af5cb8d54848dff355
 EBUILD sonnet-5.53.0.ebuild 697 BLAKE2B 0c8ccd7babbed6b2076fafff9e7ada6095c02fe278ccd39d83b0dc3b9afd994878589e7617bceedf26924ac51d1428a2f49985ac7233fe7db16aa3fdfd72e0f1 SHA512 64f85bbb7d4334f12009610236c341b744cd4fecb161e50b551a75866e73e66838ecc00df7cc1f56dff959ce6e1612245e1fd7026dd17b494c9a01a16596df87
+EBUILD sonnet-5.54.0.ebuild 697 BLAKE2B 4f207c294e7aceed6e40a4e20296606b0ee2fb5d1b9759cf3ec4e389d3d1da5e888337c708a1adbbfcbd5986148f571f142f0a046867a6e2e4b974cdcee753bf SHA512 fd730f409579f4f568e175994367850b829a807e4ac97d291794f34b6f1a55fe40c8d7b645e46c46a3bdac51c4c1d403fc261190299ea467909ca338bd146732
 MISC metadata.xml 426 BLAKE2B ae2511b818ef6c330062e792c4f0bf503fd73d0c42d93965f6b3535d6610a75229c6de627e1be5046e95ffbb055b5c1c07c5cb4eb8e824354d9d3e7ddc6ff8a4 SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5
diff --git a/kde-frameworks/sonnet/sonnet-5.54.0.ebuild b/kde-frameworks/sonnet/sonnet-5.54.0.ebuild
new file mode 100644
index 000000000000..91d1c0fcb553
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.54.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="aspell +hunspell nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aspell ASPELL)
+		$(cmake-utils_use_find_package hunspell HUNSPELL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 1b6a0b6269a1..1fcb7eda0e5e 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,7 @@
 DIST syndication-5.52.0.tar.xz 159420 BLAKE2B 53594058d7739ab84e28188f76ad67711ce7ee42a0335559c0fc9e88ce5e987d2265956899b63e0bdd2130baf99b16dfffad6d1470b93b7f74f65d4e7b85fc7f SHA512 807b92e611acc5480afb0bf81eada0fce13faddc3665b0b5b94454531f7123023b46d8ae3577de9dc79e8e7e5ba945e53e1f1cd206b36f33cca25038ea98e795
 DIST syndication-5.53.0.tar.xz 159440 BLAKE2B 7b98e455730aed5a772816bbf8123b7dc6e6998a36979a941122353c7118192511e82062c84090cccfdaa379f9e9f01e5a2589c5bdeaaf204a0f1d5641c729d3 SHA512 41892df65bfb55e705efddd20fbc06327931dad6d87ad0b2b3553a0814a54d07910903c7b8c650589ae569d1de1782c0c73ae065eea9403bd46c4a29e454f8e0
+DIST syndication-5.54.0.tar.xz 159448 BLAKE2B 9d081e5be3bfefa1578f26ad3e936e58d35319e30644038994ad971b1eb44f22cb4982ffe3307a27b70cfd1b4619991d551616ffba9cf2b6546c46b47d930555 SHA512 ec7638fb4b015d8379f1016c228dacfa485110f371bf443f6f6a75e47a6493b777b8ea6094d7fd7b251fd4cbc3cdec709c8d68724ebcdee00179a2214df66681
 EBUILD syndication-5.52.0.ebuild 475 BLAKE2B 6abd6bb20d3083e22e31643ec5874b03d339a9ceb92dfedbe81b5a53ad6f43f529f18d71962750a1890854db330904f8ffc9f23b43ac640370ba2d953ba1cb4b SHA512 d39d7941348c75fac8cb22e0f70f464fcd9f497550fb3b92f07ec2d537effaf87f480277a50ec448c3da27c4b148706ccc318a7293978a0487d52ad803c6eed6
 EBUILD syndication-5.53.0.ebuild 458 BLAKE2B d8295f01e7e61632ef11d8e36838f6a26a9d700d55ace4820fd627fd81c4a525118ea8ff60825bf9a8294b9f0b34512f50b967db3b59095620de5cf48943acf2 SHA512 9e3a369264212ed10825c0d6e7750c608bba58348105ed7ee04bb9814741248e8c342c2b905db1712ff93ad2aa466394d587559e847741b02814596afdc84600
+EBUILD syndication-5.54.0.ebuild 458 BLAKE2B 6d03d575e1e50b998eea89755491f06c6dc358cd2bd322cf155b9fca63e9b3f9b4b12152a0e289e08761d6653ecc01b9b157ed0edead3dccf8c757e9fd1f8ce9 SHA512 f57a19ba7e35513bc34afe1e451ec46700d432cd2c986ff48a4a63b1cfb88a753296b57a6fd5e155c7dca0cb382eae3d03a12a18b8f8fb39fb34ef8a1113c06d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.54.0.ebuild b/kde-frameworks/syndication/syndication-5.54.0.ebuild
new file mode 100644
index 000000000000..d1140d44c462
--- /dev/null
+++ b/kde-frameworks/syndication/syndication-5.54.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		$(add_qt_dep qtnetwork)
+		$(add_qt_dep qtwidgets)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/syndication
+"
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index c48bf0205a5b..a19b2eba7e9b 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,7 @@
 DIST syntax-highlighting-5.52.0.tar.xz 1294268 BLAKE2B d61808d707472262a20e0882053569437fb4ee08705a7f4a9a6c2fd42284af6f0b67992443d201edc908825b22adeb9bd8a8fdb5cd8b66d5e7c439acb5cb65a3 SHA512 8d11159b13b610026a66959db86277dbffa7ebcffcd94554fb6d3a643f5f6e70242c8b9674ee3a8bbfc54f3458059cb48b806ad4a86c8fd4c198003b0be9ea63
 DIST syntax-highlighting-5.53.0.tar.xz 1319284 BLAKE2B 1bb445534b39ae298c4192399d22b70c841ee7eb40173a43554880cd04c0da753b5c0c0dbea7a53536b3ea3181aaac4e5ee95935c7f16250a193d767763b6d03 SHA512 9c75466c0f6e8188911d9eb26b85fcae5f061a4b9ed6c6bd23d2bf3df6681bdc55a1739f1d57f6874e927671794a5a8018a7716f7e6842bc33e284cbb030ecf4
+DIST syntax-highlighting-5.54.0.tar.xz 1354320 BLAKE2B 741d309137c0ad469d48cce709bd373c46184af6d44577b8293b8672ac69d0bbf6b0c949c5ff2201749fe8cca08d415520c3e9d5fdbe5e9c035eb2651cfdea8c SHA512 b789db79a75c5bddcabd2e18e04122c91f096df190dee891b6c3441ea79feeb1aee683dda3fb81663cbb0f3a6d16cee52c51664b28bb9e0fe42c70af2c685eae
 EBUILD syntax-highlighting-5.52.0.ebuild 522 BLAKE2B 69b4f0c2977a30606e04e174494d46fe18c7ff4ed9bc1ebe0ddf1e7f87e95b25623f584d343d6d1c494622a9d64ea85f035a3fadbade3f873d7a4e0f04b498b4 SHA512 332834b4e2abc7c502c33ee8f0064e87336897966f93c5beb360d2400b61afebdb86ab025dbdf59fb881068f0a2ab847e3ff670469f7f50cc46794e708059d21
 EBUILD syntax-highlighting-5.53.0.ebuild 524 BLAKE2B ff6ea63252ba2768fb5efaba995340110e220d53def120b6fe53e9715ee972eac7aad79ce72ce930e088bf3ef0cfeb1b96155f75b9bda6d4ca5fe3369ffd95ca SHA512 49687bcf27f8346d41d73375ba8422135e8c4aae2537756efc26ec2a6b2aeb11edc55336dd9e36d8e8737eee7428c1155560d676c107d26a0af0fc3a61abd805
+EBUILD syntax-highlighting-5.54.0.ebuild 524 BLAKE2B bf371ff9e283e38adde0cdefead0e78332b8918cb77a641e1b1a616f05d48f6bc802f555f8b8bc42eb309aaba30a7e7dd5a0b6ee3634bae381224c2a3c6133bc SHA512 e79bd44dda555f3dc4ad61af336f6040625321e45421d7214d1782977f13f961770009b32eb4d34edcac169f96676f43dc95a5821d8cd6e80fa006554608011c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.54.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.54.0.ebuild
new file mode 100644
index 000000000000..a8ff643ba92e
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.54.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxmlpatterns)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_install() {
+	kde5_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index b24d6ab0f26d..5734a4b13632 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,7 @@
 DIST threadweaver-5.52.0.tar.xz 1409556 BLAKE2B a64f3f7027bfa928f0bf1c8d397b6030318cbdbb103a84bf005ae4f4ad13cd34cda4f6c939e2f7eacc96ea2d0016ce9a8ae35628582dd561b48b51eafc07cf52 SHA512 a798369463f7108e679e2c8e02cb6096eab94f4d62f299846a89ec47fc35392e4b0841f7f5974400ab3f3af1d2ada06b55b76e3f212c907a73036226e7110724
 DIST threadweaver-5.53.0.tar.xz 1409548 BLAKE2B ee3f3c7a00335bc6a9acd3855df4e24986e7cf2e44bd7ac5706dcd07acb8dc557c2af1f8c6174a083fc6b460dc63edc048d494aad9905f66b36a2eefee9cceba SHA512 b8605a30462213216e7442a4a1de2f37d7e5e75acbbc237c2ec6a82e04c0c68b7db6ba2f4f5bd32041a02b2237c814db5f80166006e38f69cf07f6bfbfa75970
+DIST threadweaver-5.54.0.tar.xz 1409544 BLAKE2B 68a90bc266951e9a571af8454fa4e8aced950daf236a96774e91ded6aae8350992f3c3fdd4dd5ea7249c799d484ae7005fb0b7a8810fe4acf339cc364607979a SHA512 aaea9474d1015748600c97ec18d2cac888b468ce6fe66e9c7c8ca4f0a176795839ad74df2a5292bd4ba6004ed6f563825d3be00f87fd56124de0e8765e11c842
 EBUILD threadweaver-5.52.0.ebuild 348 BLAKE2B a55c8a97b7380aa14fdf59e974ba678c25086dc6d308c5745f8751de157e1451a8f9ea02ec616c92bdcff9ab9eef765f0cced88c5a71a0a9bb17c4833e45884a SHA512 53c19ae2d3571a3a91c1342495236e46c37f7a17a99494727f7b65a805f2ff26eee3c3a051f352949fca5960c5f3666f0d997e44dd19c728d31f1a5933af45f6
 EBUILD threadweaver-5.53.0.ebuild 350 BLAKE2B d7b7bd33894f7ee3ac12718bab35b877059304fe5e3bdc7ff8d1d89b55f8392f12b60d39ddf9b056f4785b45ca073092e299ce9d5bdca89915e6d4592850f929 SHA512 fcb9120e32bdd780174438db65f12545c7fc4d10b56011098ea0057764c6c266b290b6431c15d1ae6ac31869eb175ef2f5e0d6e78c4d42a3efaf306e27336075
+EBUILD threadweaver-5.54.0.ebuild 350 BLAKE2B f2408cd84edeb99cbe460140e5e27a544d9908d84b1e58c6d79d3ded54754d7570c4b3e112799595a9051b0deba3ab2a80dea83be5039079e877ea5a72bacbdb SHA512 2f46c5bd97660567559408490cb94890ce85bfe20fee9f6b85368648e367052e0e70389695d91951083dde19303d8cdf1f9d697d6318b7b1fd96ca25af3c0f1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.54.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.54.0.ebuild
new file mode 100644
index 000000000000..8ad78a0c584d
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.54.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+src_prepare() {
+	cmake_comment_add_subdirectory benchmarks
+	kde5_src_prepare
+}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index ad847c2802f3..61b0fdf02ca2 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index 2b1d2df857e5..eb2864f2c7a8 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -2,4 +2,4 @@ DIST yakuake-3.0.5-patches.tar.xz 4996 BLAKE2B 0ffef1bf066b962c73ef6a28251d9abf3
 DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
 EBUILD yakuake-3.0.5-r1.ebuild 1656 BLAKE2B 661256837a1088cf77bd4add37bfcc0808c486384a6984597f7cca228ea88e7e3261410f8ba91fcb3fe4b247cf5244d58f00288fb9d6a570ad5ba5c9847e2e69 SHA512 74d0ef1a11542e69ad0cf8f539320b42e42fcae08952be6411a979320016c6bbc3d6a0fe5764710f7bd6cbaf0b64a54aa6c4899c5bfe3367532901e8d34197b8
 EBUILD yakuake-3.0.5.ebuild 1214 BLAKE2B 795fdc5b109297743f947b585ba3cf5e10e1d8401933ca706ef99b68690071c3ce15594b929725cd52b0219bce3216efff979b2d3059015850be043ae1afef82 SHA512 f0e56b25047da712af7094963d03a16d4ed4355c5f56c4e70cbb6dc0932ed056048bb7e047ad290cbbcdea08deff39d362c2658d83b569756236e291af0011b3
-MISC metadata.xml 383 BLAKE2B db422d540aa7006da39c659e964473381fe16466c6296e73178621333b4a883faf82b2ed3c2066ca985260399b0ca0727caefe34471962e199efbe5f6525a612 SHA512 eefabc65f332cc3a81a31d9f21f17ec9fe4c7e4f5a198b040563bfdf350a5cb036bf0e3be79a6ea17146f3cd61d67ca4a1feb12dfce5b9e85c48c40716c677b8
+MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-misc/yakuake/metadata.xml b/kde-misc/yakuake/metadata.xml
index b62c302261a7..af7db56fcb83 100644
--- a/kde-misc/yakuake/metadata.xml
+++ b/kde-misc/yakuake/metadata.xml
@@ -5,6 +5,11 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<longdescription>
+		YaKuake is Yet Another Kuake terminal emulator. It drops down on a configurable
+		key press (defaults to F12) with a konsole window, supports multiple tabs,
+		tabs, multiple screens and mouse wheel tab navigation amongst other features.
+	</longdescription>
 	<use>
 		<flag name="absolute-position">Use <pkg>kde-frameworks/kwayland</pkg> for absolute window positioning in KWin</flag>
 	</use>
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b0bb0e30d4ef..4eb2dc6742b3 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index ae796bb5ec0c..3861ea17ebe0 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.14.3.tar.xz 158780 BLAKE2B 83437d1dd778b1d46d6024f2d244326d0b46433ca8f0d6a0370a487c09924057912f6725f0fedaec9eeab2db65cce500ce2492a65e4b6f11bd88518a38e2c3d5 SHA512 62fc66b2d5dfdf32bc64c14b871a097a38772ba7d5c25970753930b796c23f51c5f928167bed7dfe028118b5914c6f9af1c885ba1cc1d7432834ce14004b4f28
-DIST bluedevil-5.14.4.tar.xz 158224 BLAKE2B 7d9c4677acd0033349c63cb5ef5d847d9af5e24c858a59cba92d8e548e07180e2fcc8858fa95df05505c06e86488c02999e6e45631741e2ad7ed5b1e782f0853 SHA512 cb6547f821561871e289ace4ee35fc78c3ca9773244de1dc5eaa30cc2e5b7b76019033da4746515f04f7517475c8c66093b6bb95bd211d2b674aaa8bc073eca8
+DIST bluedevil-5.14.5.tar.xz 158260 BLAKE2B 1a8fdd9804a852413eba0315c0f97f7b0f5abb4f96568c182596595501c15e33dee713b0989f2b4c10b2441d1ca350c617a41d0fc5a1877f5142d91b6f288e28 SHA512 9327ce7824339fdec42e7a0268fe5a8a100a150e4b1932e9c6a0aca9d3f5bb9b3a153490cf1f6613a459841b775f6648ccc55176addc024761b4d70462eeb3d0
 EBUILD bluedevil-5.14.3.ebuild 1000 BLAKE2B ae24cdb385be828dc093718fca7e665d59705c1bd5c0e68539d805c93312593e1c0faa1450117bf90d67195847103e60809e615a659f99ea5b90e7cf9af0186d SHA512 aff9ebfde627daba4ffd50853d0094ef17ed0daaa67a9a2c9aa8e689faef80a932d9888eb8d5eaf4c46cb35720e018ee1f6adf00ebfb1ee5cb6b4b997b71517c
-EBUILD bluedevil-5.14.4.ebuild 1002 BLAKE2B b9fa570a7d1466a8d0dbae4375ae14c17f4eb7a2c7d7aa226312eb4ae8359ed93c68fd11e947ff9643434595ed51392637da4cebda53ee31a956647bf92dbdc6 SHA512 751c20afa02eea679c1335a7a03d139cfab691dc5aff7d3dbd5c004414b340c85a0d785b66610b47b1708779148bd0244da740721c252f0ff71fa71e102da89d
+EBUILD bluedevil-5.14.5.ebuild 1002 BLAKE2B 42e51cd125d3b4c860ebd4a08f5eda2ebfc805225746465766991f3632bff94841df14794843b335ceb780f23b5983f387d020f1fd72ea60ca7d9432a301c47a SHA512 129a85411f7f729520b1219a453c9b6b9114dd7eadde7f6bdc702802f3788629cd8d40d3e6aba078bc279ca664b240c6f00ad6b2835324144f929b99a56799eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.14.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.4.ebuild
deleted file mode 100644
index 76d93a8664bc..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.14.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	x11-misc/shared-mime-info
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!app-mobilephone/obexd
-	!app-mobilephone/obex-data-server
-	!kde-plasma/bluedevil:4
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild
new file mode 100644
index 000000000000..73fee1340a0f
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.14.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep bluez-qt)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!app-mobilephone/obexd
+	!app-mobilephone/obex-data-server
+	!kde-plasma/bluedevil:4
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 40077aeed5e5..65ce9cb98bb6 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.14.3.tar.xz 3146484 BLAKE2B 71e6aa9fccfdd7a9b87634ae22ef98a4ec4ee14bd1e196ddd32cb5b333d6a342261016e6e6416d8b1be112c3f12706232600e792fffca97f533f720904e7990f SHA512 ad1df5c705f3e3e548b37f33989049e08b695a1f96af4cdf8b7dca3a3907c284757b5c7961f95f2a220af2f538aed526ef9c5207a271aad55aae56a2b431eed4
-DIST breeze-grub-5.14.4.tar.xz 3136996 BLAKE2B 5e944bfc0e460925b71979dd9f27697e364f1226bf46f754a28475b3c8aafad111f1cdb0b70a7936b3b5621992b48f4d9a074a1b54a2081fa4d7eee01b6e219e SHA512 60eb7baa14ca1f03a5bbf14e15b2ded613720c942c94607b04ad0db886f57d4af930f62dbdcdbff5a48e39854b0417e4be6a86b8a97786b04c6f078a1dc3ef76
+DIST breeze-grub-5.14.5.tar.xz 3130276 BLAKE2B c067915194e87b244125a38af0ccd16eede5204b74e5783d7c339b11ed522a38cc0c1f3808750a74297b9060ff693b070994d8e05665a20c793d2a1652a0951b SHA512 a921e27b29dfd9f2eb65a3fbb84c812a750d7823281aee698dab07d5f7bb1e7461c70130e7d4437b6dc6839aaa0994276665f2fe3be6b1cd96a331736029ee2b
 EBUILD breeze-grub-5.14.3.ebuild 395 BLAKE2B e2f50203ab90e827b795517cc78687709a4640fa4aebae9393028e034edf020c9f1f733f40d2d8bba25e90de74f1110bbb540ab952bea9c2d3d84f4460110805 SHA512 5a715e8f1cb375aa739abca75fbf6ac04d31ae262397852c9bd9c83deaea273c04cada022b9cbeac12b1e8fabd8f1483d9b0c0fc8aa8be995cffc4bf2b6c4a56
-EBUILD breeze-grub-5.14.4.ebuild 397 BLAKE2B 3febab083c865fca1d4f4f0ba3a74c7769abbcc6ff8b1c1937d7b27d1bb68c36c32d83feb5c1b0cba8229b3b752e65c700d0c50c3dbe2e1022e644ae3d0e4717 SHA512 ffae08a1cd3f271958186e2a8d6462f82524282774e25d0ee2be22ed953f988e877b49160c8bec5273c7e1d45cb803ccccf43007b205395b79502e61126146ba
+EBUILD breeze-grub-5.14.5.ebuild 397 BLAKE2B 3eadbd99986e743a85f9797cc9406d9e5bd854564c0df834cb52918a29091ba515adb6b860d8f7430824fcc219df91385db1ac9118060237524cf1a9a9126142 SHA512 2785e125e0520f61e37c34773b2c576f43bcb05018de309b84552c240d90ad7f3b453bdc65142c559ee941af757f587bdbe9163633331e22ff6d747ee748b768
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.14.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.4.ebuild
deleted file mode 100644
index f4acf4be1bf2..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.14.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for GRUB"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild
new file mode 100644
index 000000000000..ba5367062bda
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.14.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index fc273e29158a..378fbe6fbfa0 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.14.3.tar.xz 202364 BLAKE2B 399a6cf0f68e9876c02b5c627740436e775dfc50c806e0413b6e66d53a1bfc62a670168d2027e4943c5cfa17e36fcb3873a9575cde87a44961ab14dde19fb402 SHA512 9330fdc88c7407cbf236ac83046dfae7fbcb61798ed5a1c440a35da12cbed72a7fc7cb0d496ad0dde943b4918a8deb8bc45411a304e926546042b58c19e7b019
-DIST breeze-gtk-5.14.4.tar.xz 202436 BLAKE2B 80f44a02c1f00e3efab7c7e05fc0f24efb5ab3a31ae81e03967dca78d167e55761f5b0c492e57d625707d5423d1f14559731c4222101fd54a5ac78e2cd8338a1 SHA512 d1772293cacf38e6a212216411a752dd37bf44e335293df2320d98da586311663d49f919afb486208e9149285057f4a2297ff0eee8f4ee1c3fd8193f4bcfaf91
+DIST breeze-gtk-5.14.5.tar.xz 202408 BLAKE2B e2055710f8ba551c190ca5922be413cccee32afcc591cccee10f5d3952f46e04e7af09fa0bd0bf85770bec80ec0a3793e7493b0884e1d48d1d787ff0d3cccd9d SHA512 3e8ad24851b84821b8894d4bea33a9ecb7bbfc312d5d4aa246520d5a5fa4dbf77a5f6b7a34f69dd9692fbeadf5246ebe44d0a57fee171b3903cbfd1356a632c5
 EBUILD breeze-gtk-5.14.3.ebuild 293 BLAKE2B d9d54477dfc648beee79f0d3fc8f41ce2f64d2fa7bf543047b274c6438d3acc15333370824b02305854f97c78b8cf01b92208075cb3cf611500bf2d3fccd2a1d SHA512 6060ac57b44200b58c0918b870bb2684db92a8ac27a3d6905ec1d4a03064ccc23274295b16ca4c284f0ec0f0583f79ecb76680ad61d0c9ee593399e48fe1d9ed
-EBUILD breeze-gtk-5.14.4.ebuild 295 BLAKE2B 2b7e92e9b4f94e48e4348d7282f6d5b85a43cc73ab1c9cc251a5c815bce2e02db0d5972625160a7a0be15ca0e4775206b45c01942f47ba54b17158252ef6b292 SHA512 61e384a5273bbd114206c5d97e0d9cb7845c439cfcb6af04387f724db9d0a67470e0baf93a5b6c5772769a8a3d5564b48d38966520b6671cd2fd26ffefc72b5a
+EBUILD breeze-gtk-5.14.5.ebuild 295 BLAKE2B 2e3adca8b431642ff91cf92baf8516d730efceefa02d8068d26b427d9dec45367cf180cec3c81c3b74ed71c030d457446a1483481a8ebf33d0bd474a2efb633b SHA512 157aa3696dee031f34d96dabd358d30dbcfc5f86fc920fc5526cf66975e26727e0a936c225d9f551dfbc249cc8630869ac3df02c02fb2268ad69c51d78b5f6e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.4.ebuild
deleted file mode 100644
index db173c4e00ad..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.14.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild
new file mode 100644
index 000000000000..076cde699a2d
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.14.5.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 83a1b1f79b83..1cfcfaee617c 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.14.3.tar.xz 105456 BLAKE2B 4c9315a56a26d86930d9de2397c767599ac795cb5198c67ea04971d2103af6587b22996612e2a958339d592db264b04b08d7a65d3e6293155e3753883e5b4f38 SHA512 9a35a1c9c0ceaaaebec1dfcb9bb7deaa2279bcd3a189a07c3623e0107537eb917ad15f3c9c54fdf32a3ba9effd61b556b05f1189b655ce9feea6bb0bf9b25bf9
-DIST breeze-plymouth-5.14.4.tar.xz 105464 BLAKE2B d6ea1cac3f053c95d235e5655f05828038a55a81fb8d95855791c9b2931bfaca5553fc8ca8256264e0e9624ff69372c5e81b5f7441ae334095594a5a3053a48a SHA512 4c42b6b447cb10b0272a0409c1328ca25b3252010ec9c931c5ddb3cfbf496b30c6f7113495e35cfd6846b2a4632eb25a6df507c494aeec4a3609e67dd2f8125e
+DIST breeze-plymouth-5.14.5.tar.xz 105440 BLAKE2B 54a2bb0243f8a6ef068b3b9164edd906ce6d1cc9b4152b9a64628cda43c0b3ab99d2a454c86f878db32df1744415d564b38b0c370dd1198940d8432b2f02999d SHA512 540770481c9dfa2e2d927faa847133f1c8a9999c3fc4b846bb6d81b17447f2ed72b7855607fa0892fb81e61f04e702f168bf40fce75c1e839788946f94c7419f
 EBUILD breeze-plymouth-5.14.3.ebuild 456 BLAKE2B 9fa46794fcf92612c6a5d614c3724f8966c8ce621414cb96a3f464134f66d8442eaaf825ae945cff3133c1f693b931838a5bba3ee411188433451b8f70e4015b SHA512 dcf5b7e2ae15564d72743405e82a22444249b2b84363e679a69725943dc8c31d461d4d1c1e6ec043cb398f6738a073814dfeb197e1bb91246b94b710d4f167d5
-EBUILD breeze-plymouth-5.14.4.ebuild 458 BLAKE2B a04331117d068ed5010052bc283650d54b440dd5c0c63b2234c4dbd9529f27400c4e0cd2a5c1ac64f99a0b5c4d89f33832394e994a27e906b53d215609a7227a SHA512 afb3957f90e84d46ff625340040710be2cb8ee03641d8e96bb854cdfd2c1a0a4dbb733f2136db52a8e38783250cf978eb911fe5262224d3092409c56cf5d0dfa
+EBUILD breeze-plymouth-5.14.5.ebuild 458 BLAKE2B abed337ade560186aeca86d92122944667cbdf5ecab61d1a40c87f6e53078b97f8f599928d7f37187d6167b069e7188a0be818ffbe8c6b81bb10449bc7cf50e0 SHA512 f5b766089ebd59f75e9cb1a7be2676170715318791dbd5bbf06b2f4428bf458ec1d10aa07b4108ed2c8a39a7d40aec1f4471d50986bb4c7d50947e021e42479f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.4.ebuild
deleted file mode 100644
index d29fe284129b..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Breeze theme for Plymouth"
-LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="sys-boot/plymouth"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep extra-cmake-modules)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild
new file mode 100644
index 000000000000..05ddd00e8e72
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep extra-cmake-modules)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index f3b72d4c5148..059cdb78c6a5 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.14.3.tar.xz 24905232 BLAKE2B 278e332298478666f833df99187202d0286db0296ee90cbcb56cbde80e75e5e342fcede11ac7166cf2009e0855d2bdf2ff5cdda4ea8fbe9e56b00d2a384d8583 SHA512 070d9477802ecd9f9427976b48c841982d660aa1e59c59a3dce92f11e87e80ea0f418114e70a8231ba97031d854a856d67c2c72bed02b92cc8ccc93852a4c8ac
-DIST breeze-5.14.4.tar.xz 24932808 BLAKE2B fcb3eea89d46389dcd98f7f292d1632b9c99c09f9b36e1f08a6dde3ab9b336efeff0a7acb8bf94b42b96a03493e9f9d73a7d5320bc48435a27b027af77290516 SHA512 fdc074c101684c0d09223b62c3d89d4db6c2869aca16ddf6e5928c7f16246a1b274190370abbcd585dd5a1db9e8def882a2b38033cd3976d3fd9e7112d61224f
+DIST breeze-5.14.5.tar.xz 24932044 BLAKE2B 51d8a888fd926ae26da7d67aff55786ab9d1d63578f6ff0ef0a8b09e88c74b9cb61aef235bd7a1e9b8f18b5eb09fd92dd6dd9f2bcd404e80d09c10bd6038b778 SHA512 46cff196ffd6e0284b8e9af327e7ed3f10851f208b6c7c900821d69bc98dfe74e9f2aed392ff930966c610a711d0b0c0a47c9fc647474ce596ce2f8a24ed0dd3
 EBUILD breeze-5.14.3.ebuild 1148 BLAKE2B be7068e654fda27174168693583c707d231824ee46f7e8582dfeb5be59ac480bf01a72338265d58f188ca97474d7410643e6654e2dc21e202a1c4e466ca6256f SHA512 04a5045f69ea69dd9b1737acae68e6267178ad81af071d4ff3b8fc57dbb6a2651b2b5eec7fba83f935703423cbef8c3d65a6f5b5d6202d6af476fda634d7e673
-EBUILD breeze-5.14.4.ebuild 1150 BLAKE2B 55c6d6c280f386e0d212b39cbc08d15fd1770d6e82b39d0467ac35040fe7d13f64149d8e7322f0d74b4750084083c28c1706446bbe3749c5da19bafd3965c595 SHA512 fb3ef1d488ca133055b006667ef2445dced6423cf72010ac9f81fe705be683ef33752ed75dcbbd7a6e820192e0234570bc8da14392e41cb42f58e6b7118e6d17
+EBUILD breeze-5.14.5.ebuild 1150 BLAKE2B 44b135eacdb721537008b75b18aca0a4a1c5bb2ce06f895bc6aba56858fedcd854190efb8f3e74b075f3c73ec864ea4ead58f616c6cef2deb9d818facc38e6ac SHA512 67409c6325e5b2bc2e58a175f527a32892ef4e4a8b6f3de61a59895c838eba1d8eda6b8b3f804ab8286a138c02dff1fb81388c802b1d265f2560b422ee84ada4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.14.4.ebuild b/kde-plasma/breeze/breeze-5.14.4.ebuild
deleted file mode 100644
index 01c8eb140ba2..000000000000
--- a/kde-plasma/breeze/breeze-5.14.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="wayland X"
-
-RDEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sci-libs/fftw:3.0=
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kpackage)
-"
-PDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.14.5.ebuild b/kde-plasma/breeze/breeze-5.14.5.ebuild
new file mode 100644
index 000000000000..ad49ffc96014
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.14.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland X"
+
+RDEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sci-libs/fftw:3.0=
+	wayland? ( $(add_frameworks_dep kwayland) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kpackage)
+"
+PDEPEND="
+	$(add_frameworks_dep breeze-icons)
+	$(add_plasma_dep kde-cli-tools)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X XCB)
+	)
+	kde5_src_configure
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 92f9e3ffc4fa..f21f092099de 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.14.3.tar.xz 740084 BLAKE2B 350876d0f67fdb1a4a9c45a11026bb37b9084f1f2c2e5a7701400e2af07e93bff89b71f8659f8ebb21c448257922a7bc2d6f8c4018cdca605842cbe21d70242a SHA512 3b6d64061073c795e3bea1c0ac168f1dbeeab709b8e067d3c862151a83899c031d3c06c063c509f604a8db58f5247f4c369dd39c971a89267783c0e170cc48eb
-DIST drkonqi-5.14.4.tar.xz 737576 BLAKE2B 57fc50971fcb51f3971b4e81ca8fbe955c22751e170e5f7ef81573fa6deb1c12af697b7f5a86f65f577a09bbe9c9efd3cc140017630f24747a9c4afcfabebbcd SHA512 b53eec9b0da6c5255d9329dc1a6f53e8dcabc00f7f1f673d881fe135cda30653a28853d882c0eb17056eb597c9c918412097c51dd38867facd9004c29cad1bee
+DIST drkonqi-5.14.5.tar.xz 737580 BLAKE2B 1bb0ee7a70df8740feb6838bae7679c4acff4bf976e85a733da102db9716efcee5fd4f314f3877607ce600123b6452694a8fa528ea87a41f49d76b3bdb46f975 SHA512 8985ab8fae82e16fce6d604fcf6e4a393e1a147061f09eaaca6cd048fe9cba47cc9959013fc912b3829a9aaf3c471941597c5d1d3630f243fa1871e387757b36
 EBUILD drkonqi-5.14.3.ebuild 1361 BLAKE2B 52bc9be741dd861148babd2a3f339e5f849965f0e3c56285d6a7a177a8d07b1f735b40d0eef573f45b0238c43494a7914331d404b9b014eab9f7362c50ac3383 SHA512 f7290f14dcdbb839bdf29a32d6bc7e47460f0591088970045e55e4924640621f5da0859c97b66563e487b8bd9b7f62a4c01e30efb96a56b93c737d73d714cd99
-EBUILD drkonqi-5.14.4.ebuild 1363 BLAKE2B 454dea4965ff89fba7fc42a371bab4eb7c65d3c2be24780f87de0cef1b140d57de7c4cabc1471eccc95e53d78a95a70f725130acbbdf0be8346d2da2583fa6b0 SHA512 8677d6c97c0e611588555184855662791a8b113f5a421ce5f7cbdda68a953a3687d4c0dd0230433253ff7c118a74b92c51595ebaf0999567790c0680ec87235e
+EBUILD drkonqi-5.14.5.ebuild 1363 BLAKE2B 5d12dce18576573c69e2c782b674901bc7af2a7076b6f8517dc25f865344947ae12946589696e46f88af3e3b5e6485a0613f8f44533a6bd7daf6bb7872bfc1bc SHA512 9d9806aaec0e8ae68fed21b46d73fe973dadc628f68753c03bbef53a3bbdb03509df136fa5211d99a0864a9de035623b36f4b51e59e6c83a95e982265bc9fdff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.14.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.4.ebuild
deleted file mode 100644
index 24237e3982c7..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.14.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(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 kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/drkonqi:4
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild
new file mode 100644
index 000000000000..0e4420a05247
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.14.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(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 kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/drkonqi:4
+	!<kde-plasma/plasma-workspace-5.10.95:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index d217eb23e110..8af600d3ca15 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.14.3.tar.xz 86148 BLAKE2B 27d574a8b0197b017139aaff4b77dceee44f92bec3b4988a3030caa72f87f42d5f47da7d1090170fc4cfbb7b2114cb2eb5252e3ac7ea76926ca58aa3a9d88024 SHA512 1f293709a86cac57557542fc4b545bc11e3df7f868500b5d8be4107b4a80a0c04d50ed5fc94709e6a630017fe2c3122e082faa7c2d12fbdd4f6666d5de2bb68a
-DIST kactivitymanagerd-5.14.4.tar.xz 85056 BLAKE2B efcc5fda94d4283b004152f33c42d2fa16cf4881f410f56a19fce03c51a1ed90ba027338a1f6bca099da4511cd2110a4a8153f1906cce0f134107fbfb9a478e2 SHA512 d2f14c335fcc3ca34cccec2e6022ba225b24a236dc9244a08cdafa4dba0ece6b815c208e533d6315d3bb7bf1d21b84a150f0eb7d2428db2f9d18e8161adc0dfc
+DIST kactivitymanagerd-5.14.5.tar.xz 84964 BLAKE2B 555c4becb239aa6d04a60319f3360e054af2de43745de86e1c47451434eadd1fdf1c93b44fcd8fb50e44942b8aee15d9b4fd40b36d6aa2d369c77388f61569e1 SHA512 a2eeb45c260eb11714f73f534867a5c6c1c5f4d8c14fdab71251f570b212ed6549f94f214a836d486d952f0b8b1effb346ad49f60a6d66edf84d977457d9a0af
 EBUILD kactivitymanagerd-5.14.3.ebuild 871 BLAKE2B f57fb55ef563b00e44e62a58ed7796bcf83829e80c06c8eb238eba1d22ac952d25436b3740973d5cf6dc01ac716babed5cc885f506b26d6cc14021ed721db3df SHA512 7752de14eb38cd03184b28a835eb129cd03ca5f29f081ffacd95d29ac1a410ec65ebd9d89d291add89438b233f08edc3c64570af3b7c1fd2ba6a6a34d33019a8
-EBUILD kactivitymanagerd-5.14.4.ebuild 873 BLAKE2B cd05bc9772960d90e9a75dd8f5209c3454f4ae19b68fc51a65e830d425180434ab7b0fba2d5ab62ce373958cbe5fa36116364dbbc9268b1a86977cc3fe04c990 SHA512 e50a2ee216569db33bbfbc3292526463a5289d62ade22ea14ce1881d6fb737dbb7c6fa88354e830a8dd745e4cc40b228281e58119ea045759530c871709ec8c1
+EBUILD kactivitymanagerd-5.14.5.ebuild 873 BLAKE2B da7c90ef5ef535f002f3294aa895ef8e1db0fa2fc61a731ff37078ce3b21a3fc60338c5f41ebd0cbd9894a14bb5bd3364ef0ed9c8353067b228282ad63d381c5 SHA512 504d4a3a29f10a7704fd506e63b16cf3eb2be6ff85f1e962515e1b3df87fb529fb3f4e778e76bba6349262d6551a49a5b0c07bad70ccbcabfcdc3cd658be96c2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.4.ebuild
deleted file mode 100644
index ae81bff8738a..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-	!kde-plasma/kactivitymanagerd:4
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild
new file mode 100644
index 000000000000..ff13d6ca802a
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-frameworks/kactivities-4.13.3-r2:4
+	!kde-plasma/kactivitymanagerd:4
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index bf9e7f99e574..9ff58d17b548 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.14.3.tar.xz 587012 BLAKE2B a5fcc690d21f246d7cd2f7eaba0dae7368e63b6efee4080919f2816baf2381e112cf31f00228591f166061ab1871136ed97af8dfe8bf9dc58d29f8555adcf89c SHA512 4578bbf6bbaf266a19c317945f33b3c9c2c3290855287947382be04a7f66e9e7da4bd8970994786e2d3cf1b4ef26a065f960b89a81dbdbd5263813fae19f114c
-DIST kde-cli-tools-5.14.4.tar.xz 584956 BLAKE2B a8f47868c8e84926ba8de9eff03eb48b0b7a806a18cab1f78e270e3969a594745c60ff839726a4d4a5aa8f6d8b15a0e8a5f96cea43632ff80c7f21a6fe199854 SHA512 34f10c9d8d7dc2d9e8e5a46a5ba3c41922877aa3c00fec10371521d8fa8eeebd9d8fa8b9c23527c0e2ccb419b39623de0166bde534b4cb9434e2b12cac98898a
+DIST kde-cli-tools-5.14.5.tar.xz 584812 BLAKE2B 0a690b72a9218d675d518a43d46baf7d462e425164ae0b9f42b0e6109c9da693b1521e151c72992d387257a107eba3ccb2fc83aab1537d55592305e58e572a6b SHA512 fba3fe47bb1b7faf67fa9edc39640629ad0689c99964a48162166401d342dddcf82a19078f76d9d92c4892cde302a5c9c578e0c2a852fa321216c2c3498a2428
 EBUILD kde-cli-tools-5.14.3.ebuild 1507 BLAKE2B 3ecbb3267c90079b6ac5aab5093d79ca29bad16061bbde3c8dcfc81030dd1e1632d135dec4f8eec2e9f7de627fdf548b9f709efaebf5faec6682a2d931a4b37a SHA512 94c6f8906bcffb60461df5ab3026cb847981ae928b6cd3bba78cb5eb8934e8ef1676883e2fd4c07753775fe5e2973e14d55534820180d47759fb211f884113e2
-EBUILD kde-cli-tools-5.14.4.ebuild 1509 BLAKE2B 076846ca9f1b4e1824a0fad03467c5dea90f30f24003a30417403808a6945259204f38206e36065eca6baa8c5945283c4ff821e7f78bb1a644dd9cc8d7c9fed5 SHA512 499e1f63675563303e766ff29ac847c5e53e0df79d5fe929a185a731c19fc6ef72cde1b0e50520e3e02e564f2a613d227367651002bd0661d28c047f70eba798
+EBUILD kde-cli-tools-5.14.5.ebuild 1509 BLAKE2B d4eada0483f1d11c2bd8d44ade02baaa85ab6d30fb40401cb7ab1136756facc3b48a5167d3ce6dec2781ff162cc76944408a0dd1c5de30dd75d1bf45eb619abc SHA512 a8afec031a7881bf290854c7e51a0dbe8d54a6e8019a01c9249fe041b8a14c75d3c1e23ff741044aaab907d3a6d5a4fb28a259e2d3903fd7056c50dfb1469361
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.4.ebuild
deleted file mode 100644
index 17d3c1b59aa6..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+kdesu X"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdesu
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild
new file mode 100644
index 000000000000..80a59a522f62
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdesu
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 870d081e7acd..6ec0ef34875d 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.14.3.tar.xz 157292 BLAKE2B fd060e1810058472e24a82819c2b3b737637d8a5430912e22511085c0c361ccc5f355f7d1235d9514dabdaede799528f5522fd83b452c33e06689c70ada3502e SHA512 5c8d14d77cd6707d32f09361247445ff4399bb7331125d795bf2046bd7f8467c374ad68a11899bcc1592c9c207a4f94e9ef523074184550577c9c85fa7de49ef
-DIST kde-gtk-config-5.14.4.tar.xz 156960 BLAKE2B 43c986887746c3e7ad1ccf9220d0f9356e3b32c2064267e94df3994f128df05712d4dc594b753afa90780597336501206fa367542593a9dd9660212fadeb403e SHA512 37c00a7fe1e7b6d5c502c1a075617187daca3a43657ed119b16e498002f3a3f23beb53062391c825d6bbd48374cfd6a9334d98bc5046a9561f93da89a32428db
+DIST kde-gtk-config-5.14.5.tar.xz 157032 BLAKE2B b13e44fbe1ea048e58b98f1396528372f74545effa145b65a71709f1e7732c0ed48111e52eaafc544d180678e411df20786a0f9cfee1557c1df873b4630e380f SHA512 3bb350307cabf44a27dcc3be95c8d2c15049be80f3c3fb127ddaaf9880acb850f10126347fba07868bfa9424d5e1c92b580687aa356be2869ff36684a15d8563
 EBUILD kde-gtk-config-5.14.3.ebuild 1248 BLAKE2B 359c3fc33950aa3404e967a424ca291e6124d6c883f2ac575e47e5a8380dc05756c8ad751ce966a28dd8c6151edd185086b30eb02e817c7628ec6f3815c9d602 SHA512 5677f6138507e3385114b0175a09c7c3dbcde35a4f42c52d5caa6a2640dbf1261145cd726d9e75d1009aa9dda699c2eb9aee3f5ffaed0bb3ab0f1d612ac91e61
-EBUILD kde-gtk-config-5.14.4.ebuild 1250 BLAKE2B cf644941d9c39c06b92c15681c1ccc664348fc9a5b570adb097bc0bfbfde918ba18cf2db9765a00170963953d1c26774e5dfe1dcf83f397c842dcea1accfbb6b SHA512 179a58fb4268b33c4d7e9e06c07cb4f6c17fe4ed2e2f448a680385f4995ee38dfd06783217067ca961a3a8358d835a4724b46a573a9b2f850c718912777c110d
+EBUILD kde-gtk-config-5.14.5.ebuild 1250 BLAKE2B 8effbe3ae2a70a88d0b8b57b713573ace1db80224b963a8bb94f90c70e0cc39338ef43e4ff5e991548d6bf9e58d097cd54a0c0765a3c492fc6c443e9ac71b9af SHA512 ffc558e4819e7cc8c0c6148144d5485c3f20d5177a73d8545c482bd4032c72c282ac9a53365855a1b0774d8cf8511f7cd6649be8902b11d8efa0193a5fe4b000
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.4.ebuild
deleted file mode 100644
index 1539d7482fb2..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kde-gtk-config:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild
new file mode 100644
index 000000000000..1b8010dcde5d
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kde-gtk-config:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index d97944979380..d9c424d35997 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.14.3.tar.xz 42196 BLAKE2B 4fc93f64d151d83c539ba7f1504c5f44b12d9a3e6c804e702c31ecdd0d8f67cdac2f8c4b71b19eefb49de2bf7333c0891102084279907f35cef06ee02a587650 SHA512 f43368fbb4799c12452232b1a8d28d5befaaa81922f7b189192a73343dd5a4ce21f5ff9b779cf552cabd95a4721ef2d937518f34759d3cdc90c76d3152ec5915
-DIST kdecoration-5.14.4.tar.xz 42084 BLAKE2B 75696d96602a6b089d4ab32751cba9299a219c82075260f723393e62071bdb5a843d34de7d40ecd011c90356706b1d8df6caa741304bf6707a273c09516bb744 SHA512 9349c0470f1c82db4730a6381355e8d9b8a2e2144b442050747901bcff5dcc9c9bcc4f701f1859dbdc3d64c893c9db4fe81293465bf675fd5f3f9235396461d6
+DIST kdecoration-5.14.5.tar.xz 42236 BLAKE2B 5d541e977e971e64c2906535ed1232d8c7b293f3b3caad203e1c80e6c33018befeef056b4c28720a7acc23e1775513fbf87cd11e491f80409a046e359c524d9b SHA512 c5e06b46c009722eae68495142445e276a979010259f728f7df326e7e5dfba280d90a0ceee6a482a333c1bc1e8106ed5c6f9f25bb86eac15755ac1a5e357abb5
 EBUILD kdecoration-5.14.3.ebuild 397 BLAKE2B b2f4d2dcb70014e6bc805630f3c8c2f9173560199f3efc1767a79805a6f884a8296798a4b5b305837502eaca00e6bb6828d3a2cb4383c207b8f21b444b9d674d SHA512 23ea27dc54a6edea8002dc4bc746948bd90ffc191caa67b05bee71f6eba82d6f87e00891f7274fc769c04c9f9a6cb352ba397b92b391544f68c8cef9e1ffb7d4
-EBUILD kdecoration-5.14.4.ebuild 399 BLAKE2B a681952fefba3334297db2f9676dccbe07c43cdfcb747b282b5f2d79e66631265d7cea6472f977548cda6fe141a90203a0aac8a3c8809274144476f734e5b61b SHA512 fc1f7a4af711c65d16dedba39aef5eca0028fc18692ccf304b6e3ecd9cbc1e19d761306a8ac8473da952837b2efddab9b278a4c41b08615d759fab602210a7cc
+EBUILD kdecoration-5.14.5.ebuild 399 BLAKE2B 89c1a9c9e0811834dbf6b8a4755abf6f100d235fe3ee8da5d005f4a46bd695fa4db51efdf874451b2461dfdc74da015f668d0c8bb003a4c8de578bc71e488900 SHA512 3958314cc5d49d33d270bf76456716a81f9692d27ed8e1593d44e2b67fb40b9d4fef2a8f08a17ade6ecd945409db9b3df1ce4bff686923c2d004fc5131416108
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.14.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.4.ebuild
deleted file mode 100644
index 70d8cc5af3cc..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.14.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild
new file mode 100644
index 000000000000..5c1e09f4315a
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.14.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index ecf971481200..8b5deb1b8b8a 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.14.3.tar.xz 603632 BLAKE2B 77ad5c876efa8e13f790b0b822afa43b79d3187955580e31611cfbc5a1e93d9a5905128a0057dccd28f6ddd45e5636207a8833896f51a6bed8fbd723e19d79f0 SHA512 dd53e18d6fd25e6fa17863aa80bd648e1526b72b852de10cf37363c722879244cb9ad22dc98932ddbcf96321b71acb36c8ecdecb2a7c3304e55346d5da08a704
-DIST kdeplasma-addons-5.14.4.tar.xz 603044 BLAKE2B f4bd695418ecd3bb5df7161d33c4fc8eb816e5060c237f1c8a58af1109b0cbfedad067ca9ee4e337e48350d84f4c416fcd25e14aaf382832fe9db0929b875cc1 SHA512 bd0ed041ba39b6244a76e3fff4d2c9beecaeaad5cca8afe01ba1c854e33fb285a641fa51a319abbb2e995657c9a3a374a5e0352c784a472323dd8a1daf1cfdb1
+DIST kdeplasma-addons-5.14.5.tar.xz 603588 BLAKE2B 0323ae26e0e55b7a75571c1cfbd88dfeb221f1aa706623abb21f900ebdd56bd9f3ac521b91c129ab99c046932353ba5079e72d3fad09a131ac1417c8783736a5 SHA512 f6d0203231598b161991b7bbd6bbbe4504831195d5d892c302212cd86067156cb17bc4632e7dd8a951747f98dd84312a3c70eb477bfb16a13a118de07cc1615e
 EBUILD kdeplasma-addons-5.14.3.ebuild 1528 BLAKE2B 5e362cc1de9a4fc54ef92105ed7ae5948b007f85c79cca6a32cf9bea0fcb502f630cb6e425a7626bf663a2e490b807364ee6d2d60ef9d9540be79f284cfcadb0 SHA512 940e16fd11eea3f95f78748787346348b0018adad101f276bcbbf46ab674dd9fd72ec39d3684dc0fea1bf8dd5b170cf119882d62dec4b781e1caa14d7bd0a1fb
-EBUILD kdeplasma-addons-5.14.4.ebuild 1530 BLAKE2B 443c48a62487aad24e509cffd35884d934a6a2d200135f48ab1fba4c4ca65633960fd6854977db1b27769dc6428234ad94eb5109a9e2d6dee1e9ed484f0fd0ac SHA512 e53859bb48192ec97cf3c3927f6ca61e08a4ff4bf181d75667a3cc03d88bc74832cb6594b7155f5f5afd94cbbb98e5f540c3df14478354acba2ca5fe387cd49d
+EBUILD kdeplasma-addons-5.14.5.ebuild 1530 BLAKE2B 8f6da78d0ec0067bfd2701207e60ed35b88e9258245fb8303cc8f5c2d242f33c7e9348113504b6febae568c051a18185087df8fce8ca70776074d26524bb4ef7 SHA512 dcba129fef601f7e1c6e1f833dc792e27a9375d4223d8ee8bbfae4041f6aef3af1ef8ad3db7c3bfccc03cb9aa108022258cefaebd097191eecbf7a3099f21fa5
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.4.ebuild
deleted file mode 100644
index 6f6b95203db0..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="share webengine"
-
-DEPEND="
-	$(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 kdeclarative)
-	$(add_frameworks_dep kholidays)
-	$(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_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	share? ( $(add_frameworks_dep purpose) )
-	webengine? ( $(add_qt_dep qtwebengine) )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	!kde-plasma/kdeplasma-addons:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild
new file mode 100644
index 000000000000..5fca0fcb6cf3
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="share webengine"
+
+DEPEND="
+	$(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 kdeclarative)
+	$(add_frameworks_dep kholidays)
+	$(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_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	share? ( $(add_frameworks_dep purpose) )
+	webengine? ( $(add_qt_dep qtwebengine) )
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	!kde-plasma/kdeplasma-addons:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 9a0a173e8c8c..27692dbeb9c7 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.14.3.tar.xz 79512 BLAKE2B 055e260d53f068e8faf6f2349d620e29cbae0c3b2b556f203175178b05906ee12ddbbd135bcd396b097030f2bf0bf9a83f4191150bae9f3dc53e32188ac0bb22 SHA512 aaf35fa7c502cc12a47819ef3a13f7fab9fdf4ee88fbe4c8d7af2e087eca055aa9c15f0ebacd5ed8454678d4f97581a4c27e05a5c908af0eeda2678dc361b36f
-DIST kgamma5-5.14.4.tar.xz 79168 BLAKE2B 735d8048c3d8a68e0fab36bd3a784efeb1130e081b6c752ee704962b920d94acd4ed49416e8144ddf3de76c6333f7bdb75c4c42785ddec4d5a64ae5cebaa9c3e SHA512 016a10b0d400c2b6932aaae7c676878b865c60062461cea7a9d42cd386bfe75caa17ef9beb324a3827878fcee957479fd19bd009266e955a100a1a3739935d4f
+DIST kgamma5-5.14.5.tar.xz 79228 BLAKE2B f151c1943ae38b8d2a5b2f02e6b36456eaa70adaab7df720dacb23cc48e6f37bfd118273b9b0c13d0db27c5908a99e6553e1a7e9a2e3cce5b98c36b7042de396 SHA512 5d62c170f15f3859b5fddbc3a1f223e5989b1e379d7a855ee77d8482867485f27727beb94758776d1416472b7eacebd5f32819fe2123c32c87efb9fad7876584
 EBUILD kgamma-5.14.3.ebuild 528 BLAKE2B b9f0585c5320e1634e8f84c5af13ce228d52d7f1795260ef68993cf9b50bd77677169ed3849acc25a7a89012db06ca6396397ff517a6a5d8905fa85e065f94b5 SHA512 2d674f16b9bc26b6ec972551d5b0388d93fb4b3a1cdb95354d098f623fb27d8956a1d6f7a168255eeae22f307643d06a4a299041eb41bf3eb286ba0d55cee5b8
-EBUILD kgamma-5.14.4.ebuild 530 BLAKE2B 40ad28b4e072728c03eef6b07dd1a7c9a39e1884525e08c5399c47ad5755a01ee530e3a45e2efa775ec0136d6753db053cf0193a6d667fa1b96bc7a173aaaf86 SHA512 c09099806b6d3d11af221713da8c0b9ea3976b1d3c2fe58c2865cf942e75be55ae2ee5a502ade01e04cc494a11502d04114e1e80d7b5edab81d9c3c499f0b53a
+EBUILD kgamma-5.14.5.ebuild 530 BLAKE2B a837a5f793e3307f7499ac3dc8f41d35e2fe7b1107906293fe10efb48b4ab6c77ae7fc9afc56392181f6376f3e0e2efb3268c8aec78b71f13d758095bc7617c8 SHA512 f10da5722efa7e8983f96520022a39f31ba5f1121331dda39d3b5b2a936bde0f9df220b63156531e0d401598deab8cb28a6150feb93d437c2ddab00c8c6bb900
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.14.4.ebuild b/kde-plasma/kgamma/kgamma-5.14.4.ebuild
deleted file mode 100644
index 565f164eabb2..000000000000
--- a/kde-plasma/kgamma/kgamma-5.14.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.14.5.ebuild b/kde-plasma/kgamma/kgamma-5.14.5.ebuild
new file mode 100644
index 000000000000..0ec32aa811f4
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.14.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 5c235c8a1f69..ecf994b69d52 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.14.3.tar.xz 1380280 BLAKE2B bc292790fbf68ccf97e4c77dc0aadedf2c31e0cce4095c90cd59133083da0103d6056950a7937c38565ef90922a463dbae26c4dbdf3dc3d1a7f1b6f7066a6543 SHA512 81a1e6fd2def3babf2a48026021266d091f935468309fc34fbc36bb8338e8e138b4c9e029d272a240399cefc8a87ed78a0a53fb546cf87656f5477dde29d7ee5
-DIST khotkeys-5.14.4.tar.xz 1380668 BLAKE2B b69fec7fb438b043c1309921c248b362dbc70cbf1973f4128531636117f0f007e197aed53d5de837251ea89ee16131dcf58bc183854a7bc61024e8afa64aa35a SHA512 c9367b29a92037b6a3d4dab46c1e5ba59016ecc6bb4fd28d92cf8ef230e83a9545199740a6f5bfed944b7c286bf74a4720a0c0e9cb9e307a931980fe3b1630ef
+DIST khotkeys-5.14.5.tar.xz 1380612 BLAKE2B 1a38a436a35f0c45d807938be4682436c317d429f402091cb0785c1aef3c50c2e96356bb3a56e8f6399c0162bb9ccd3944f903458be70ac2d5bd8109d017d701 SHA512 d588112f501f5bcf5d09238d585a74ef4995d8c09244c46d4f70853764bb909eae25031d9ee180df3d96d512045179295ebe525c8490f18fcb2fd868d96c91b5
 EBUILD khotkeys-5.14.3.ebuild 1119 BLAKE2B 930559cb775ae5d58a5c86d2bde11855af7714a11c087322c558ae3440a855494fc8b9c7597a4b4ad4b669fd4397362c0e88abff4929b638bb40063b8deccf02 SHA512 b63ca0eab623244b30fa1df86dbe588612920dcbdf87a5b699999f4b951fb0aead4e449089cd494754245d8e6c031b123eda4d2b4ab097c1afd01c4771268f90
-EBUILD khotkeys-5.14.4.ebuild 1121 BLAKE2B 78b7a3f65f9a7cc492318afb2d8b0874b54a8954747a45c36eec6a948b5e4f02f301cd3aad5c84572a4b1482f46a0185b6e6455a798704a4dd9e77d3e6fcd7ec SHA512 b10c0775a3d7e675366b8eab28df46a15479ecb90de31ffc7796c7ef0078981d53d2545cd35710e8d34bc639012993bd033d6ef2017bd47d6fc71a80093a9846
+EBUILD khotkeys-5.14.5.ebuild 1121 BLAKE2B c2ee929cc651798c39367348cb8056c0946131c514d188f69262dd8e91338461be31041ba2ce8fb36c9fd2d976696522a088b3eb2398e8fe72d92f6096a873ce SHA512 c6a01efd770f0930731ab468af445c9ee3a67ed62f829d1f8fb9ea0615c7505949767c9e68ddff284f42e07c56106921eefbc49007006d69cb70946bc9d9eea0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.14.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.4.ebuild
deleted file mode 100644
index 8c367afdae32..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.14.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-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 kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/khotkeys:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild
new file mode 100644
index 000000000000..bbdd1a2d65e4
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.14.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+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 kdelibs4support X)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/khotkeys:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index d374a0e20f7c..314283ded32c 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.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
-DIST kinfocenter-5.14.4.tar.xz 1323228 BLAKE2B d8700729d232d4ac9a30477925a83ffad758b4cf76d0ad19bf6af0874f0a0cb33cc40f3d16f17587ff5db8b9cc449031237fe1f2edb9bb174b4944b2adddbe65 SHA512 4f418e19a6368fc816b93a57d8b38eae366fdf5cb6cc28cbc6de675e96e04a796de0bc433b81830ba1c4d796bb0484a0f2723abed7b02134cbd1e7ad98e18493
+DIST kinfocenter-5.14.5.tar.xz 1323212 BLAKE2B cf248445aec1320e18f11e58d9e02a95b1535446bc207ed75b76d18ca81af12feac221cf847bf73ecb4e0036432e6055c2801b34b9673ae289330468b2184c94 SHA512 df38b40eef89d4b4a6e7f6e5e72325122c5ed924fa01dd59e6d99ffef61a9bcd89e11dac8412ea0a95ecc0b68469cad6921ad529a247b59aaab3dc7a7d09a04c
 EBUILD kinfocenter-5.14.3.ebuild 2484 BLAKE2B 6893355e5e305ac324fdfd5c7277b83d105286826c3aade3605f3662e7805c9effcad153a7ff26b357e1e254631567560067443fb1684648e321f8aa64288e8d SHA512 ca0dcbe3eac5131c437ec38730650a753cc0928d24253f292dd5976c13992b980222782e83376dcd6e3567e208db5681a700d87bceaa0bc1ebab172a9c498653
-EBUILD kinfocenter-5.14.4.ebuild 2486 BLAKE2B 29066ef7f8728450df3f929701b81e5969b54e9c02849f60785442455b3389c95246d6d1d5ae6c27a476543b0972a7daa04ee7da44c701e5fe6c03addc6cf60e SHA512 8ecb8f56cc56b69bc1990a021c22c9be003c9a3afefa7c4ce105b8639b2d27a1da723c84079c2729a017fa0bab8cbac01b92a592508a8df744146f8c0d324517
+EBUILD kinfocenter-5.14.5.ebuild 2557 BLAKE2B 5968095aa0fed5cab2e05ed31635abb1d3b373ff9a9539646d9b197cde30a0a86bb54a267f41cee786118476591c371f3a4512a0bcc8e78a422d1d22728e09b7 SHA512 58e4f3bfe83a22eb3bcdd1bb644d7cabba64fd38b2452d66d2beb6106cf17fd81bae32692350d3416e0684d8fdd64a7af127d0806b8f339ef2f6cda7e8ad838a
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.4.ebuild
deleted file mode 100644
index 962d97c0f61a..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="A utility that provides information about a computer system"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gles2 ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
-
-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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtquickcontrols)
-	!kde-apps/kcontrol:4
-	!kde-misc/about-distro
-	!kde-plasma/kinfocenter:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
-	fi
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if ! has_version "net-fs/nfs-utils"; then
-		elog "Installing net-fs/nfs-utils will enable the NFS information module."
-	fi
-	if ! has_version "net-fs/samba"; then
-		elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
new file mode 100644
index 000000000000..18e67662aa0e
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+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 kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		$(add_qt_dep qtgui 'gles2=')
+		media-libs/mesa[gles2?]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		$(add_frameworks_dep kwayland)
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtquickcontrols)
+	!kde-apps/kcontrol:4
+	!kde-misc/about-distro
+	!kde-plasma/kinfocenter:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ieee1394 RAW1394)
+		$(cmake-utils_use_find_package pci PCIUTILS)
+		$(cmake-utils_use_find_package wayland EGL)
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2]"; then
+		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
+	fi
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version "net-fs/nfs-utils"; then
+			elog "Installing net-fs/nfs-utils will enable the NFS information module."
+		fi
+		if ! has_version "net-fs/samba"; then
+			elog "Installing net-fs/samba will enable the Samba status information module."
+		fi
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 01bddacb8b50..a1f5f0a03662 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.14.3.tar.xz 770680 BLAKE2B 27bcd385c3e3b82585c96cf07f2040db2774f71729f7e52ea58d919375502e86fe47677d90df3acffdaf6e99dc91632beea7f801e00cba50a08cf9b33af77238 SHA512 889651562d92874ee62e6edd4d9ab119af5ba301262602d52ccc811faffaee0f89ba909bbd2645f062fa060ab58252206f34c73b7b5924f0e22d16e07a7a31e0
-DIST kmenuedit-5.14.4.tar.xz 771152 BLAKE2B 55cdf6389338a3a1428be477593a506e8b45a1eff72bcdb8d255ba0a7849739c3be4e4e9f26d8e2cacef6ff00649d16bc738cecf6cc7adfd8b42a9a943bf8bc2 SHA512 6c6a9bfe5c97099b9919a9260520b42c5d3900b5ae25d96915b5f6ee20b65b73c6cd95d08857774a0623c44a4330e761d501f15381c248bc0ddb6361eba7d60c
+DIST kmenuedit-5.14.5.tar.xz 771176 BLAKE2B 13f210340600baeefb171925f51f962d6323022cf52ea4f7e4fe1e3996eb5164981af0a9e12aed886a076ce7dfabfa56c63d03602723cf4536cf294dde2f155e SHA512 4a54ccc1dfd23266a2db4929e0690c5d773934e133d2854183880c2ad3915eac94ae147cdf75a97309d21f6c3b3702d9f6bb682cb7b05f84892ff86a211f6b33
 EBUILD kmenuedit-5.14.3.ebuild 1104 BLAKE2B 2293a1f87f0f2f3eae65ff7c0eb7860b7efee5a13b144a16a80f5350b64e48692b7640739ae35c56acdf780c93942ecf348243dc8801ef7433a7ab16c8740d71 SHA512 d566f8473834fa0cdff14e27727135b90dcf00ddb67ae535406da9a9809e2bff529c831a578ce023abf5700febefad23af19763aa0468d4e70b27580f072c9e2
-EBUILD kmenuedit-5.14.4.ebuild 1106 BLAKE2B adde8c530e509d9a7869ae75d0948653e458173755a0427844c5bf9f4399de16b54ed42319ade0b5c749e495dc4a35d2b1eeff9dfd3af0fe34ffb65c63a8c57a SHA512 246dc5915c40881e06722f48b11a54fbd4ba227ea1ebaf55a01109dc94016dd053d79ff96a45450f0dcc93b413e482e72f98edaacb5f4d7a5bc945effdbf2f22
+EBUILD kmenuedit-5.14.5.ebuild 1106 BLAKE2B bc8692f0d51d23bc66486c9c69e7321f5db9a802c0252017a1d872f051e88c825ffbaa5d3eaa445d7ea859b79c6ef075210cee3d2ff3f027cdb9f5dc256ab8d6 SHA512 30d234bf4e842cf94854a346332440b4c6dabca3823db1723bf074b68d66170a659a07ee4648dfded111d9c46fef414c0e13d4e86cf8b8f725fb095c40ea01ad
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.4.ebuild
deleted file mode 100644
index 80d15906b3b4..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.14.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+hotkeys"
-
-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 kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kinit)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/kmenuedit:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild
new file mode 100644
index 000000000000..594c6adf0b98
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.14.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+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 kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kinit)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/kmenuedit:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index c9c9fc3da46e..28a91817164d 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.14.3.tar.xz 122344 BLAKE2B 7a0861586440eb4c03b632bd665ffb0e1afb9b7ebe78a120af855c53c06c8fb08a02532f4686221144b75fc8a7fccb3a37bd11729c7a9ffbda2549f29f5606a0 SHA512 f0331d8ec7cf7868ada1b537ba1b89cec2938e11cc0148722f0ddcf193e2067e73cf41955309bbb0779095df1836f27a105963c8840dfc01615d04c61c23ab82
-DIST kscreen-5.14.4.tar.xz 122648 BLAKE2B 20bac09cd35be047c80295eef5140f2268a68f95e4346d5b880c195b691db208d80b79879ef1a407e6307b28c0ef7a11a6a2e99b9217359ea2b51c38b25786d7 SHA512 a481d48ab9b7ef1da76971eb0dcef3efce3eb8b84740756147590c8f5647e6310529192e3b8e2f7ace2eab1485a91e4532c49796fc08c1ea947753e485eb2231
+DIST kscreen-5.14.5.tar.xz 123964 BLAKE2B 0bf6488c2dbc1d9fc0c21b55d0bd5362aa7600e6ece480ac75ae41e8890420bbf6c8c5f9b38c42f42de8432a30900d5473356a448667e8296129fa8621926fe0 SHA512 d53c9d9f8071f32903c807f4c9c842602eb7b9bc914969b9f23e5283b8bbba5eff64f84c0b5df48374487e84bf83f70f160618325890aaf018d35b2f590893a4
 EBUILD kscreen-5.14.3.ebuild 961 BLAKE2B dcaee56613bc4da6e50b1f361d641f76c5f6cf9d601fd1ab4b10d9baf2f7916cac57b50748515e53e4e1875bcc79d13d2e3b6ea1af8fcf5b22fe07fedc405922 SHA512 4683e05789274ebfeb5b2cb66f12cd765c319750491368c05a5803d563d4339c0bc1e412c1eb298eaf2d45886c739770376034437f0a58cef7b8fea3ee6baf43
-EBUILD kscreen-5.14.4.ebuild 963 BLAKE2B 7086dafd20f9bfee3390329c9794e02d23b2e2b94c43e2b2e0f1b0ca575e802a959f32073b52394abe95268ac5adb418a1db8f5dda4c07dc9d617d4f51832f0e SHA512 a33a2043c80d195a0bba65805d0c2cc754b8bc02eeee634584df42117f9602f00d755295f606ae6a1a91636ad5f0346137cb73287b89f9aa12c7328afc4caf5c
+EBUILD kscreen-5.14.5.ebuild 963 BLAKE2B 172d4afbac574d2f3b565ec102f39cbf6b3dd2402b4eb5a496b3d74ca5208bcfa17bcc4ce79babc74a8afaef067b36bd41663558a433b73742f71948a5068ac5 SHA512 728a11e06d6bd2f9fc841ce97b0d96b77c4458badb78bcf2020978ea8e033ef4831d46673bce8d63579d941b8376e66fdccbf266f22079f37b2142cd07a16073
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.14.4.ebuild b/kde-plasma/kscreen/kscreen-5.14.4.ebuild
deleted file mode 100644
index 188f27af4978..000000000000
--- a/kde-plasma/kscreen/kscreen-5.14.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-	!kde-plasma/kscreen:4
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.14.5.ebuild b/kde-plasma/kscreen/kscreen-5.14.5.ebuild
new file mode 100644
index 000000000000..00a0714bc01e
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.14.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep libkscreen)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	$(add_qt_dep qtgraphicaleffects)
+	!kde-plasma/kscreen:4
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index a656c4bfc457..0a22d41f72c4 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,8 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-AUX kscreenlocker-consolekit-unlock.patch 792 BLAKE2B 65ada31a191a5ae478a8a5edf27d0555ab4e81a20dbfb128cff1de520386f914b9730f22bb709be97f0ab9a38c9aba1d0a4596039b2438325ad55ea3969f7fea SHA512 21f06f101a9a04a80393a040d29506de8b4de129f3c6433d5455245ec6a9dca9630a59338612396032bd66e345fb59fb78bcd1b486b5d46138be616da632ff18
 DIST kscreenlocker-5.14.3.tar.xz 122280 BLAKE2B 03182f4ffa11727606221e8c0c77f610c18ced1392ac0059e743074cb80cb80b35cc0a5e82f6cc3457df493599e0223b5bb2bef134c45e780ba7ecb649496772 SHA512 186f693a931936658624274c7de77e8cb06c433355932a17a6c600c6cf349f848b90642b613c786c0585f050599a545d0e596d81968a6ec0b7188eb34a6e2a71
-DIST kscreenlocker-5.14.4.tar.xz 122128 BLAKE2B 8a6e6caba1c93b50f7ebed7f50e21eaffcff457a9bfb96de82e67cd1de44ed25a793a66fec3f495b3ead26f5f710f9297d332bf6dd1c5e8d19ba07f9ea004b59 SHA512 ec6a8f768ef20cdf07f278ce6bf6b63537b44fee4f4f460aeee428df9734b3d660ec2c409640b250bcf246b5acccf404d369f7826c61dcd4fb2546130a417151
+DIST kscreenlocker-5.14.5.tar.xz 122232 BLAKE2B 652d8f2981231278d8890d2599466a86ca8530c44a2b6379631d575c457a573031672529313921fd87fbef6859302d8364ebf4769430941326e9c2ecc0d5196e SHA512 49348f137645333484be93922ec167403c74fce751294dbd02ffeedde6279ff0a0db8abc12153541612d4aeb6d6ed646b7f5ab22b78a8b80ae5eb37fa16f0e1d
 EBUILD kscreenlocker-5.14.3.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
-EBUILD kscreenlocker-5.14.4.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kscreenlocker-5.14.5.ebuild 2226 BLAKE2B 595e91d46af9d0cf4d1f6d38b6878928fa33e3087ee85f6e279c3eadb9abe63e2dc0fec56be9225ae2362c65fd717c96a7dde88769d1ca1122b86b2672df0826 SHA512 9d06c2f5b3eb9884547ef2578aeb49ba91f61c98e32d808a5d2a3f024cbdb7547bce6ef24c92aac7b43f3b99585ec1cc9cca4253e9ad5088845e13366f6c9c34
+MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch b/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch
deleted file mode 100644
index b0e4011d2b88..000000000000
--- a/kde-plasma/kscreenlocker/files/kscreenlocker-consolekit-unlock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/abstractlocker.cpp
-+++ b/abstractlocker.cpp
-@@ -52,9 +52,8 @@ void BackgroundWindow::paintEvent(QPaintEvent* )
-         auto text = ki18n("The screen locker is broken and unlocking is not possible anymore.\n"
-                           "In order to unlock switch to a virtual terminal (e.g. Ctrl+Alt+F2),\n"
-                           "log in and execute the command:\n\n"
--                          "loginctl unlock-session %1\n\n"
-+                          "ck-unlock-session\n\n"
-                           "Afterwards switch back to the running session (Ctrl+Alt+F%2).");
--        text = text.subs(QString::fromLocal8Bit(qgetenv("XDG_SESSION_ID")));
-         text = text.subs(QString::fromLocal8Bit(qgetenv("XDG_VTNR")));
-         p.setPen(Qt::white);
-         QFont f = p.font();
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.4.ebuild
deleted file mode 100644
index ab0f95ec9ebe..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
new file mode 100644
index 000000000000..67cc582043f0
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="consolekit +pam seccomp"
+
+REQUIRED_USE="seccomp? ( pam )"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	dev-libs/wayland
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	consolekit? ( sys-auth/consolekit )
+	pam? ( virtual/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kcheckpass-4.11.22-r1:4
+	!kde-plasma/kdebase-pam:0
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	use test || sed -i \
+		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	kde5_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package consolekit loginctl)
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake-utils_use_find_package pam PAM)
+		$(cmake-utils_use_find_package seccomp Seccomp)
+	)
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 2fdbf33d963d..7c59355b622c 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="consolekit">Support for killing the screenlocker when <pkg>sys-auth/consolekit</pkg> is the session tracker</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 0b4c32af838d..4944cd9ccdf3 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.14.3.tar.xz 21400 BLAKE2B 86606d6de13b785a5b78cbd08e588d88057818b91799aedecee5514e88a34c4cfc4b1cc0910d0ff145963aa74f979f80d17146342f5fc4e64a794cb85f701a0a SHA512 d4aa1870c9e484e8e855d701585076e6ff25af6647e3c97075b3296a4a7603b32833e147dcd8c42073c67ffa9fff77b2f65697bb5885529ce0fd17e29dbe8e76
-DIST ksshaskpass-5.14.4.tar.xz 21304 BLAKE2B 43e6130dc10da10dc90e6408cc66f7a252df3d68544151b787c4818e587748a9f513616c614d167e3f11001c7125deab2376b5e3d346d7322cf8e7bb93c4aca1 SHA512 e838243f8f9186db81992b939dc300d52f4462b2038fecb85cdee5b107e53bff19c0ae359a18340215516a2c663dda02c3b11a7e0e0a839b4453b173be97969a
+DIST ksshaskpass-5.14.5.tar.xz 21332 BLAKE2B a29b1fc2802925759eaf1b9ff8dec7dd0dddcf67b2093fd6b8a9bccb112264a9f01cbc8b42e707b9782cd3efe9d272ae9ca573e3e084f5a3dfe632d88be52104 SHA512 5517193df92ad868d06bcc8f353bfd38932d0a96d98e6af38d3714478233ea91771cbb7b075e76c133d595812643a0e2fea6a6086be94845a252c215b243b37f
 EBUILD ksshaskpass-5.14.3.ebuild 1232 BLAKE2B 9a8faea2a76e168fd052f95f1f02f3c4537691216c86b9273f00166c6ee992fd2fe46f71f142a994bf0cc04b62da14e111af94deb821bb6ced1078adc149d91c SHA512 272d172e50b43ade2fac038ad57abd105f2c111f3f8b9a67053994602f21959fef32151683e94a692acb91424cf546dfd7f38e0d6bd9cbfea2e65099e5945a68
-EBUILD ksshaskpass-5.14.4.ebuild 1234 BLAKE2B af4b8b990dbdf6859d3ed3c562fddecb9c8f8f1a6c80cfa81761ba25eb3a5723e37acea2cba8d2de7272d8390ff8bf43be32f6d5bd5b8a21c625827ca5ed60e8 SHA512 0bf20c17fd6b2230a83f03c9118f6da22155eea8d5feb9d04dbc5dab04dd1f45fe9df13f7a7dd1f88e32d45724d64ba6cced92e56dd4172968507196677a308a
+EBUILD ksshaskpass-5.14.5.ebuild 1234 BLAKE2B 712c1e67d4fcea410a680e7c2f9bf691a3fcd3786d0f439cc094160c3d8c10704b0c72e47a6f298ccdf688ac2353bbfa8c7c47b90904a31fb37fc7b5190628c1 SHA512 36c7b256fbd075040659162ab3188e864447576f5eff077f249f9a685047dad25ea5171b808a7c6e567f5497433b57f130abad9a8014fb8dfe3fd54efbdbdeda
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.4.ebuild
deleted file mode 100644
index 058e2fe8d646..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.14.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="
-	${DEPEND}
-	!kde-plasma/ksshaskpass:4
-"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild
new file mode 100644
index 000000000000..ebf909cacf25
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.14.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
+HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="
+	${DEPEND}
+	!kde-plasma/ksshaskpass:4
+"
+
+src_install() {
+	kde5_src_install
+
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog ""
+	elog "In order to have ssh-agent start at kde startup,"
+	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
+	elog "the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
+	elog "properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/plasma/startup/05-ksshaskpass.sh"
+	elog ""
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 03b0c0f1565a..4bd9ef06ce77 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.14.3.tar.xz 501720 BLAKE2B b3b4ef98ba78c3c30fa76b6914ed93d5a002b1806fc59ad778b27082eb39acdafb68f815743f88cf4d43a4c10cc2de4070603ae5ee18d93a25e7299f0cd0839e SHA512 aa1d2007ffe0b4ad30e3e54a98cb56980d7666a36c879039952a2e589fe054ee773d3b495fbf3605777ed616e90f6f959ade3768e874f45f44223666b398de25
-DIST ksysguard-5.14.4.tar.xz 501544 BLAKE2B c71f517cb923043519f3ce1fffaf0f583e7a10dcdc8ef1125b68771e0aabade329d8b67349b9228990e1c2ef0c7a85d6f42746e670bb2fd4bd21380e27b91a12 SHA512 af59db3d8efd50516e4800e21d6eb6d5236d214b5fb9831065947e803e54a603187d113b3b3582d35be16031d86bc2a374e1440baa943ea421af1d8455400870
+DIST ksysguard-5.14.5.tar.xz 501624 BLAKE2B 1d2a19d268653768affce6c746340fc1ab3e5f77cca939e6ec58f9e4285d51bffb0026f65489db54d43799df95983288d6d59d38c52aec2f63f3d668b94757db SHA512 fb04538b500f3d3dd0a3f6fa1a0adf1d3a72e2647bb48eebff8fac2c00d5f3a1de18cf4ea35bb6daa210976514bfe3d8adf8a6785d279535b0e2b4b82f25ba67
 EBUILD ksysguard-5.14.3.ebuild 1142 BLAKE2B 1ae2650c7333856eb2231fd390bf2cad08e44fb0a38fe1a65672c33c057cef95b29da5e66e1cfb50d57017a03d3e58cbb18d5a63e451c0483ed5a31f94a180c7 SHA512 2a16fb1c69e2111accf48b77d5db3b9e02acfd5d56e98cf605fb8362430f2de311d190cee56b3a23af14ec2f146b3935056b1d55f5d87934f3b2953018310000
-EBUILD ksysguard-5.14.4.ebuild 1144 BLAKE2B 0c52d43a8109e0a64046981e938c56a08e6dd04cf2b89408bb18fa5c631d1b2bf5057b776ea6a3a7438c32c3dd332a72c86c6b9fee03215beef6c65ef8ac1fd8 SHA512 c3018b69fb44c321fcb1d18c2f9ce67ab43f6ad42598221f99ecedf7b231dfc6321b401991748e05fbb3a64a048a99ca2c13935e90390e485425388a01bcc5a6
+EBUILD ksysguard-5.14.5.ebuild 1144 BLAKE2B 25121a3474d3fa43875cb7f0613b19124531a1b59d437a386f1849b6f14b86aeaebf8d408d4c4d938da43746aef5b183c9738192e83ca8c97877d540001401f8 SHA512 736d6b2990b79b2442266cfae71b2eb88e9625c26b4bce9f06490f5324ff7e9c6ee2da5f7e5a5807507eea2b58aab6dde503875867041dc95a19ac34828cab86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.14.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.4.ebuild
deleted file mode 100644
index d0954458dbc6..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.14.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="lm_sensors"
-
-DEPEND="
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(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)
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/ksysguard:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild
new file mode 100644
index 000000000000..9e4106a07d7f
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.14.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="lm_sensors"
+
+DEPEND="
+	$(add_plasma_dep libksysguard '-minimal(-)')
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(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)
+	lm_sensors? ( sys-apps/lm_sensors:= )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/ksysguard:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package lm_sensors Sensors)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 69bb98cbd173..b0e75930b103 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.14.3.tar.xz 19104 BLAKE2B a804e6786cfc860af1c2de17348cb128a9f7922c1399d50fc69382ef139e959e54bde36b8d46f3995b4800de12ea79528a6ef0f3df45d5cf9d7fb4a26b15fc35 SHA512 b6011aa8dbff209e7645f3a6f8ce2c8bc33239bd91c756cc3baa8555f6339f20c7d5c9efae7f5fbb8c85844973b5be28833b513f4432e7cfe39e8fec78032298
-DIST kwallet-pam-5.14.4.tar.xz 19124 BLAKE2B c37101f942d5bdb40e73f7b54dfc397385f4f3da3fb2361228aee48426021dcac6f185409d5f348dd9db9089261afe234674369fb66cb65ed07ebccaef6192fa SHA512 64a3c1cf819e20a56afc7cd4d27ee9f3ddf490a33c579031d8542bb3d125c48b1a2081f1351b5bdf1dbd6739eb3dadc2c31e323a2b90d232ceffcccbf6d6cd89
+DIST kwallet-pam-5.14.5.tar.xz 19120 BLAKE2B 61d049e49be42028833d60c6da30d31b80d0e3e2842e7ad281c1062d18202116d7044ac8311e8bed5e2f6430eb8e1fdfc7bda24309b322c9ced1eb8f0d45aa64 SHA512 ea841e20bcb948418129d94f938e76b46360c6d6bc9d49b882b6c29997fe8fc5257d245e02f7462490a03d2cc2a49749568a085bec297da4fc7caa8f14acf5cf
 EBUILD kwallet-pam-5.14.3.ebuild 634 BLAKE2B 6b5579b199117b038aca09f3dfe63fca5236898afa0cebd1addcfea6c8595f4dd07be70b4b8502365ee1859e51f1b261603d355bbba1a4347203e52bd78f2c11 SHA512 82b08b8ff6f2a7b946079022df4ad79ba4b91a4e90a148e841573d12bea136a0fba23ed103f519201baa2d0edf6a8c506739e74b6e413d0e92559daee182a02a
-EBUILD kwallet-pam-5.14.4.ebuild 636 BLAKE2B fe3125630255c0c44cd930b734bbc5ebc90212da6970b523ab62e630ce647940117dda1352fe56b8b436985b5008c7374e322660018ab99e554f0cc0019ed8ac SHA512 8ca71ade573c03303fd7bbcf99b77cd220d73f467e05837c361dd0f154f68c65d82262ee299acb7378aaab90afce12cf68d2e1d7e647911821964cd6ea2fd4d4
+EBUILD kwallet-pam-5.14.5.ebuild 636 BLAKE2B d347de54967d000b6df3f719eceee41ad436a8640afb2b437e5da95436445a6646394447cf05f62ba6038f5c896f439221d30aad8ff00c3a1b6f9fc64b13d4a8 SHA512 7ffd7db3cd9af330ca313de50394841857bc3c679389dd763e9de8a6e6c6dc61fde8b841c42a462518f7ce4cfe8278e074db7108aa8ce80ec2d97114ce93dce6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.4.ebuild
deleted file mode 100644
index 810eaac889ae..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.14.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	virtual/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-		-DKWALLET4=0
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild
new file mode 100644
index 000000000000..a3318b9c7b11
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.14.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet PAM module to not enter password again"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	virtual/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+		-DKWALLET4=0
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 1495169058ed..a709707e0a05 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.14.3.tar.xz 18812 BLAKE2B 8eaa74c417dc2841b54e1ce2e2c6dda5328bf584e6b103527932709fa737cce91359f0a5255b5d01f8d234efef02bf07c97e5068c18af35dfe2845b34e196fcb SHA512 844dfd0ed6568a18b74e86752a636e216e0198203bbf51c0061b9fdd0a16c974d1bb0bbdb728ace53c6e72a0f5127b4bd90284b71983c323d093f5a54919a6da
-DIST kwayland-integration-5.14.4.tar.xz 18704 BLAKE2B dbbf250868c6c95442519befd5ec31c7407809326ab94287580f817c1d23825c7196235a8859af163ede2f72d40153d1b031fe0ecc4e5149622a99066362d27d SHA512 5917d4067f4c5fdaff09dfb0c2926c53b37c2973f593a00803429dcc66d7588574bf3776b039da88240d414426cc8786c9cfabca4b895483e172db95c6d7fdf7
+DIST kwayland-integration-5.14.5.tar.xz 18704 BLAKE2B 56669ba9cc8644aa1a613bc35756c317809889494e0b033b805e91bef9fa4b4721e91a5f2a108f314fa6f6b62fd12d5b96d7f912612b3a6c4836ba54a56a1838 SHA512 0e0d5ba23c8e9417160f985298e71d3693b01c5cc1773a0f9c9f173e14ab568b1701ec23daf8e07e95666ac3a680eb8f476eb0e96b6d89aa6f4f761e52704b20
 EBUILD kwayland-integration-5.14.3.ebuild 548 BLAKE2B 9d8e2af5fa2566b48ba28ca4b33afb3aa65aecf7a1037e0f4e0862dd3987908a7ae7400c4afc7d7583ce4e5498992117fcad0d3738f82c84f61e5597cefd061f SHA512 86269a21c856102cc3a28e8098f90b9aa9b718927b0e606ec3b3e70c35a2c49b36bed0c0531fcf45a7291b1636017feaf51e120898bc0a63264367cc3a5db0d4
-EBUILD kwayland-integration-5.14.4.ebuild 550 BLAKE2B c7de75d5310ffddefa6461776930138134f129b299271fef3a2b897acabec78eec246ea38e65460048e7651becde83421c8be451033454b431930d9cfd3d0acb SHA512 353e4887a84f91825336e0220563f29ebd488d357c2d084039374a2d7fba4b4b9040f5a81e77b3e42b757b014debea44ddf1d5804cc82d1595be35381605fb03
+EBUILD kwayland-integration-5.14.5.ebuild 550 BLAKE2B f5e8ebd5f0c3191442399d8fa406d3ae6c98bda9fddeebd264015ac7f8c1674a2176975d56d607f84afdb8d7a772e88a8fa126878f533d6ff88aee4beed51208 SHA512 6cb4461dcb63d8eba0868c0a1b553c6587acdfbd55d0b9fa46500b0c9d593453cd6e89a1a6c8529fb10213a21b91e23214844f966f270790bed461dd9318341b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.4.ebuild
deleted file mode 100644
index b90d203594da..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.14.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild
new file mode 100644
index 000000000000..84eea10a2ba0
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.14.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 110250d2519e..ea08b2931562 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -3,7 +3,7 @@ AUX kwin-5.14.3-resizewindows-crash.patch 2671 BLAKE2B 8be2d2d0a5e28a550c3c01f00
 AUX kwin-5.14.3-virtualdesktop-crash.patch 4668 BLAKE2B 6f405123b019d45b76dbabe4e114cc02c97d1cc9776119828b87f292b6d21b238074d04bc7ca0eb473ea4675d38fa9926a94c9247b8eba1ea5ed581b3e6c75ad SHA512 4c4914cbec8b45212346c5ce58338189ffc035e490cfd6173a4db138eb36011fcf9ff61899b9f057df5b460e83f74776065f8c45cf4bf3f6c599410740190027
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.14.3.tar.xz 6573740 BLAKE2B 53d80cf2e2bdb8b74421badddf2c3c7620ddaf337a8f91239c5de8a74efb7c3f4cce1bddda722a93f0d5a89e7639015b3207fb3b5ef483be2781ca742f742d29 SHA512 4ba7a6cc02c1a5e94f4d08c6c72968ecf1e1c72fb9f047e2db014a525d3f6e30b8e16d1dc2043f077e3f63b67362355c456295f7962e1661d667c01e0b22626c
-DIST kwin-5.14.4.tar.xz 6572116 BLAKE2B 65e596756b1a3e7a5c3374ccbe7cd7822b67f1a722828e399c25801bd6d58a493bb3dabfb33ab152a105e1c531a131f6bb2e719638102c30219eefee4d2064a7 SHA512 08cc8532b8553aa3cbe3639362aa9009972df566ba50766ac815a626dcc598cefbfb9b7a5b133ebc0f598b89906575ded785e60cee19a93b2a61fa0a02e3dda9
+DIST kwin-5.14.5.tar.xz 6563208 BLAKE2B 693f82408352a17e97fb1fd81ac78a2c14e7e417347fab4028df0bb6f30e0fc7e0bd976fb90c9e441b98cb9ab00aaa1e1c39087baa76a532fc4a575aedc656fe SHA512 b098d131bb2117c6f96950b14896a60e46d3de858ba537e91890405d10e40e20fce26644dfb55d8b01136c8a8f4c30d825beaaaded9be49aeba1b70bfc945546
 EBUILD kwin-5.14.3-r1.ebuild 2775 BLAKE2B b2839b1baaa70ed7758aa8842ae8df4ab8c89336f7e15566b77bdf89edcb2f8635bb8d9fe8262b9d2157f71c38dbf97df30bf1f9bb46d30a18c70b795e54192d SHA512 8c49a9e496e3a8bfc33d1cbb1a146efd54a27ecc264e0130d2fcbdb3a9f8395f2453c50ae331976439c8389e2204ac2407f04699b224488911bdd08eb52cd019
-EBUILD kwin-5.14.4.ebuild 2633 BLAKE2B b250135395b592bf38f073284691a62570952393c8e10f7bbabb513f4a12155a65a2d49c35ce9ea22ef02c3ebac645680001b12541cb79cb7666dc936f2db288 SHA512 e6395ce7a4ff1fb1784b2eb34847b36b1c3e890a743f146174c87dedfd3e7663baee2353eb2d2fcec1f9751de90d6726c158e2b8fef04699f5503d2423925e1f
+EBUILD kwin-5.14.5.ebuild 2633 BLAKE2B 3a9894bb818f9a8d04f99574cceee80be1fed3740286d06273607d9a0d91756e7902521eef8339ced4b3fbe897dfbbb406bf2a325cb9b268a77530292010cf0e SHA512 05944e75a255ef24fd902d738d0a398f51b1c8a4ac43775df6f5c4a6e44e09929805b1693c5aef7aab1ff591f2459c5969cb2774cad4549a1a10228004572ab0
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.14.4.ebuild b/kde-plasma/kwin/kwin-5.14.4.ebuild
deleted file mode 100644
index d144e2c92230..000000000000
--- a/kde-plasma/kwin/kwin-5.14.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE window manager"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel '' '' '5=')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime '' '' '5=')
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=' '' '5=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsensors)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.9
-	>=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 )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtvirtualkeyboard)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-	!kde-plasma/kwin:4
-	!kde-plasma/systemsettings:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.14.5.ebuild b/kde-plasma/kwin/kwin-5.14.5.ebuild
new file mode 100644
index 000000000000..cfd36c06b840
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.14.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gles2 multimedia"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel '' '' '5=')
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime '' '' '5=')
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem X)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kdecoration)
+	$(add_plasma_dep kscreenlocker)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=' '' '5=')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsensors)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=dev-libs/libinput-1.9
+	>=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 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtvirtualkeyboard)
+	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
+	!kde-plasma/kwin:4
+	!kde-plasma/systemsettings:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep qtconcurrent)
+	x11-base/xorg-proto
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 42f065e9535a..2a50250c9fe0 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.14.3.tar.xz 20116 BLAKE2B 62857079674003d4f2116532bdd38efa543e3b7e3450498dddcfddf2c69640e0b4c582d8175effccadb80194a56187632f24d066194ef709400bc771e04d86bd SHA512 ed39586685b8f1dc7acda6b8de88fe3d68abb613bd0b4574f4994dc177f29ca696989eae3a8c2c249bc2386761f836a43c5b9cf7d5768f1a80b0907e95635759
-DIST kwrited-5.14.4.tar.xz 20012 BLAKE2B 773efce7c98a79961143f7f9c9102b14c37b5e35f9cc78fcf964da1e08a53253268d3c66b566226a134caa5e684c8a0f404ab7ba4b890511ed275eee5b7f83c9 SHA512 b4975de2bd1cc6cc7b22f47ab544fa1db551ed217fceaa985fb7fbcee66500c54ebc1d29e61dea6b579d9392441a80753edbd7a8977b6a260cad96e6beae6852
+DIST kwrited-5.14.5.tar.xz 20000 BLAKE2B 220f600b92f5e1190a415ae6eb4a934813059bef2a2d7cade9fcb2690d2eba26c2da551c0d59a351cc3c3f0e95a9e11aa62fe0a046c9a4cc3e25fec8e8451006 SHA512 4b4274b05f4dfa9b178c7446784889ee63a9ba0f84ecfd26c3f465d3f3ab54b91ee3373f0ca7d2e4be81f5d46704b36ce8406f0df3d6e523d9d1d59db50b3b3c
 EBUILD kwrited-5.14.3.ebuild 498 BLAKE2B 0db3fd21597e047f00139c47ed86fe95edd619297a8978fad6d8fddda42b77ef8fa789703b01a068095e732701ac898a9ba67652335be701bb733901ef23775f SHA512 948320270ed0b36200342fd010548a9d15e6ee9ae36c352f708f2d1c3ed0bcbdc1ce33568d2497e00aec97302ef166b29ca9ce95dabc8cebf644326905ba00e3
-EBUILD kwrited-5.14.4.ebuild 500 BLAKE2B 5d82763b4852630218501c6b0062cbcf3e5e6bdcc33fb877ea36a21d5c998aa4fe215645b2a1c99e4f6c8f148585f506692730c35c0e50db005e56b1f87952ea SHA512 4c61a3a7bece70118f83fef0e810952e2c2c0f51a18ac9bd3c9ee72e3612bcd2c8cb0c6b7d26e4dff6215cc32bbdcec85d6c3eec547216ffa676293e38b229fd
+EBUILD kwrited-5.14.5.ebuild 500 BLAKE2B 955ff614adc3e5b4aa13a1c0008aa598b57611d0637c3318b71873eb8a62b27a43a32aa4290521759a4d575bd2f025bd2b69fbaebc0c02b7eb579dfce2264965 SHA512 4f2050eed9941c4dd48a8dbef16beb5114159c08c9056ddd48aee186203034d6db01f5488cb0504a4167a7fdfea75c02620d8350b22e72e73ab15df43826285d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.14.4.ebuild b/kde-plasma/kwrited/kwrited-5.14.4.ebuild
deleted file mode 100644
index 96a55b0edb5e..000000000000
--- a/kde-plasma/kwrited/kwrited-5.14.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/kwrited:4
-"
diff --git a/kde-plasma/kwrited/kwrited-5.14.5.ebuild b/kde-plasma/kwrited/kwrited-5.14.5.ebuild
new file mode 100644
index 000000000000..c0f34d667fd7
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.14.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpty)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/kwrited:4
+"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 241afd1561ea..3b37323f3e6c 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.14.3.tar.xz 80060 BLAKE2B 39014ab27f0ef6ac9c7e24785247b8ae3307f306a0375996193ce457a126ffbe8bc22e0144cefe71a01242be4a147d3bfadf39bbd0bf5f691ac6ce15bc6500f8 SHA512 c909291132e362f8408f0696f08d3fdff70d56ab8d128b68d4984626d1bb19f274cb3b84f08e2af7c0c0fde3eaee12689c1aa9a5fa267406b51d1d2d02a82d54
-DIST libkscreen-5.14.4.tar.xz 80108 BLAKE2B 0ec935349647ac653e2b92bd882082b5682458ed83ee82e0745252682e942edfcdc2ae5cc2c1249dc4da086861a4b039dddd0b4f4f1bb4ec2cfd398ac372c44e SHA512 6f50be0e3b07eda71deab051b22b908601381b881539b9aeb6343b993570b8dc010b2c7c3820be0cfa879140e2275b96e293d92fd760807e9448c4a421248eb5
+DIST libkscreen-5.14.5.tar.xz 80124 BLAKE2B 89d2925fce1acb267cde70b231ae0a6a5b01aaa64e323751ee4ee4ad0d2eda1114ff582c0b1ee7c8c487fcab8597ecd60c8303c628e768b32628dd51a2369c39 SHA512 de83b98771548e96a2addfd9426624f47d3000e328ccb78011b6b7c9f8f9004c66954eb16848f73cb779cebfa40d7aeeb13fc98ab4b4f8966dfd88ccfd475276
 EBUILD libkscreen-5.14.3.ebuild 516 BLAKE2B c4814c20f3d693deb2f3288e9ec00a75162bc897b6ce9f58d7b2ad42bf214a7843c014c8fb933f087e5a5bc8ed7600678613f351f97cd2b3cf0bcddb3f2dbeb8 SHA512 5fb6ded81474cc36423c509fde791ea5f6abd73ed5dad178ff685b41c5d940bf29913e0d553540b76c67bb9a9a91cc4e62fb8743f4056fe667c9d6b6b73a9610
-EBUILD libkscreen-5.14.4.ebuild 518 BLAKE2B 8d12851d9145ffc8cb894e2559fe7f986949a61380086717e2dd578e5b5df96ed1cdd121beb077f1472bb82731d15ca4677a55211d2a1ec80200ad8e2f9d70ca SHA512 418b4cb5a5a7964d4adf6f2907243b234b2c4c540895447461090032a88e13c97e0d5f64482549237cbd01ac9e5bcc1229f80cab02ebec15af299c2ede2e1e68
+EBUILD libkscreen-5.14.5.ebuild 518 BLAKE2B ecb3a28a648a64b73a65dec37c71e43f00718ece99e6a8c9dcbf554782e2f3aac496849c29a835520cc2b69a1ac62a4208e445d652e0e06034f74a3dabbd05ee SHA512 d5254eea98088f5174028a7f7bfca21e62b1e116e14567cbb54bebfe5ba964f288acbe3d63cf82dfc875e9101bcfa065ffb64b67f351167f5b4f8ff0e1c4a00e
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.14.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.4.ebuild
deleted file mode 100644
index f695808b3a3a..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.14.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	!x11-libs/libkscreen:5
-"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild
new file mode 100644
index 000000000000..251cb60bf63d
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.14.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma screen management library"
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kwayland)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	!x11-libs/libkscreen:5
+"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 3ccd22a84964..07ada51fc3aa 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST libksysguard-5.14.3.tar.xz 576328 BLAKE2B fa10444f1c08f1ba70f4fcd32591714736d2fe7982685c705e90f662c402ad5194edf00b1a6ce425bf8b25f5d4a91a88092408b3cce2ae6a40b49d13805cca7d SHA512 b561ad796ccf290176d116b8c5c9845d07a76e3f089bf578cf4a9cb2ef323dfb848c5011d084da0e3f548e3d92b57c732db0d4c93b79b7aee5085d8df2516467
-DIST libksysguard-5.14.4.tar.xz 575564 BLAKE2B 9201a7be4aae02c1dba1e8f96f3ac932f8eb116a44c42870a532d75c445ee0e67eb5e4c56056b3b975f7c1afd535065eb33a3cb55215f8dcc655ca85b6c4b092 SHA512 8d0309164ef159c680fda35216d1ca7579753d5160ef2fef6a76bf0b278e5aeddb53fefdd5d2ef6f43c206c0b0f6683b1495dbe0d429bea760c41cca0551f07c
+DIST libksysguard-5.14.5.tar.xz 575532 BLAKE2B 2977f15fd038cb270c0ae3d171b5c9d0cf1bd4ef726ef6d66495a30003f349f787cf0520bcc43561fd72b022253406a4dd7baebcc59da76fd71ab21094758370 SHA512 42a5fed2abd28a08c4926513ff950be9a672423078017d2e71aa8dba5ccd80b522779a76a403e5baa0434bd547028289a715b1764fdc2166ee27c95981249ea4
 EBUILD libksysguard-5.14.3.ebuild 1216 BLAKE2B 8601dddd670306841db2a37eaa896045c9d7ba65e3da1c29990ca6d24a37ef9d871e921dd68db93918282e5bd6bd50c6f52a7a1797532f79efa72224a9cc7495 SHA512 43856ca403522dfa273dd04c464ef3e83e731005d984bca9bc9f2ad627dfefc8b0d701d5497bd347c4eced8d25e37f7065058825bc9806f670b9d79cf59e4238
-EBUILD libksysguard-5.14.4.ebuild 1218 BLAKE2B ec13dee57c73c0829e274f91d8d8bbbf985c9c1de07d3a80484e4bcd9b50db0f9ef65d7c318f4fab423ad3c7413e6bfd8eec8280cdb2173e175b64194cde7aa7 SHA512 1392456794b6b23b7f3488617f9a7042cc27dee09b2295771c5323237de4bbb5ae1f96f5025f21e5ac1531d65db86140032c671daf30e10ac1e7d8ac4df9fba1
+EBUILD libksysguard-5.14.5.ebuild 1218 BLAKE2B 4727f63b097ec34d957647fef8fa3bc844f5126a30a6c03c7d73393c50999c9f143442d69ebbbcb03dc3b2752741c85f382a9643ac0a7af5db4e9609c384c66a SHA512 4059a8a9d9348a6f6237ed42bce6c709b4b964a3418db797a38df760d916144183351a4ff18277b7cd6f034aeaeef8fdff28900e2a61f3c94aa2c6e13e9ee25f
 MISC metadata.xml 373 BLAKE2B 63fe12e91ac593fed3eef538f3fd765b880de105bdd2fd839bd6cc5cf01f811a57391f0397962d2b22ec69a7b408aa9b6a8060d40f3aa3d5a003135d9b58c5b9 SHA512 26110007d8a82dd742327178c9aa0dbe40ed1ef47b46e6ef62d2cd5d53f25d6d95a56052f5dd4247a583f25a794b5d2f4db56ced1742857dfbe55b31397c3e7c
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.4.ebuild
deleted file mode 100644
index 73a7633dfb95..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.14.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="minimal webkit X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	webkit? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild
new file mode 100644
index 000000000000..c576277702ae
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.14.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="minimal webkit X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	webkit? ( $(add_qt_dep qtwebkit) )
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/ksysguard:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	!minimal? ( $(add_frameworks_dep plasma) )
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 213f053d53c7..521865978a0f 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,6 @@
 AUX libkworkspace-5.14.2-standalone.patch 3399 BLAKE2B 3e36f83f6112f00fa1864759ad5094450072df9aa726d88b102fc5694a1662b0b62d1cf7361ef08c9070439a581b40794e14cd2d17e85399d1cacb788f44ed8b SHA512 d2cfde759df79776daec10a8108e6bd20c89f94db8eaeebac23844a9240f08c8e53254905632f100b4c31f48070162de1736109d05f8abadeba71f8124662a2f
 DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
-DIST plasma-workspace-5.14.4.tar.xz 4572780 BLAKE2B c0c59acdd4622949ec87e91e827595c048c3f736e27a2f7c649765aee3bbd7ef00ccba7909dd456881bf4cf382adbff3019be2a4f9d098591f8781399aee9902 SHA512 017b2b8d52c243072ffd6b7b4a766ed27d055dae36f6cf9d10e4f06748555680b55ebdae6db07a043b18359c391bf294f0bc0e601f26e5cd12b532fffcb07645
+DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
 EBUILD libkworkspace-5.14.3.ebuild 1444 BLAKE2B 2ab401d104d4021f12ff6819d1cdc9749f24d224e1e712f9eb7c662dfb41eba36f8695ff4784567b8b7c6fc2d30ea2bc2c1ba9f5336c00a01dc975acf59bdfc7 SHA512 8cf30d752255475838f74f6088de9686338b7af5d1ce1a57d25e11119274a8f7e63004dece705fecc5f09aa18ecdf3e7a539ddd5c28a119e1fb7f25487767f94
-EBUILD libkworkspace-5.14.4.ebuild 1446 BLAKE2B f60febf91a21ad40eb3293a1536ca4ec2c0f69584dc816a5c3fb9ee36b7c70bbdb98413352792ee391919181f4ea49e6e156c7e8af9d890cebc17301b4c7c78b SHA512 046cae35c700833dce1370194b71e980f0aa2c77950a3f4115c32e607c138a70a106d7d17253e351ab7c7a99b23744adf35d5963659f71dc47a8cf60c6331ee8
+EBUILD libkworkspace-5.14.5.ebuild 1446 BLAKE2B e8dfb07f9fc62484f2c11843cbc3c82040d2901a8dab77bb1820136034b2201e1421dee0c1fa5c095cc6148caa8e5c28923a4011462871bd52d3185c104f90f6 SHA512 c1aeda5be12daad2811136eb0cb305e140896d80857fdeaca9e7fd63c376fdeeee7c867a67a461286891810f56aef16790c472ecce8aa8c955cbbdf1ba8b21f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.4.ebuild
deleted file mode 100644
index dac6b01edb2c..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.14.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.11.1"
-KDE_TEST="true"
-KMNAME="plasma-workspace"
-inherit kde5
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kwin)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/libkworkspace:4
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	kde5_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/${PV}/" \
-		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
-		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild
new file mode 100644
index 000000000000..88f82bb097a1
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.14.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.50.0"
+QT_MINIMAL="5.11.1"
+KDE_TEST="true"
+KMNAME="plasma-workspace"
+inherit kde5
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kwin)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-plasma/libkworkspace:4
+	!<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
+
+src_prepare() {
+	# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
+		rm -rf po/*/docs || die
+		cp -a ../po ./ || die
+	fi
+	kde5_src_prepare
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ki18n_install(po)
+		_EOF_
+	fi
+
+	sed -e "/set/s/GENTOO_PV/${PV}/" \
+		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
+		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index f5e39a2e8ddc..3c4f7613c2e8 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.14.3.tar.xz 57924 BLAKE2B f7dc799dcab3981bcefc488fcf1e221e450d45f5c706a595e86ee58db26c8bee9aa0a090f75c8cdff895a64280aeed1e962537a9e34f5a1142f0b3bf574e6070 SHA512 3ede4995eb258e15aeac4b87a8eab5502abfbfaa921f1a1c3414329b79ec3cb65c916b37313e5bca398a1e8ca8347919c2ff464b74b87834f2dfa6b943950775
-DIST milou-5.14.4.tar.xz 57644 BLAKE2B 452ef73255c4318c7f27afad10c40a65dcd0176e1623e4c38ccdfa2e1c5e230d4979ebacc1f016653a1d492b5cff8ae9935c363b10c574a62dd9c9f75860a39f SHA512 9e98881751e4377be07d14f63933bd309e7548dc92d14255f0dc39159fb2fb971366b35ecf354c18679c281c2ec47b06f48966061f20e4840ce5dd8f49bac8bf
+DIST milou-5.14.5.tar.xz 57628 BLAKE2B a3882d48a71d86a60056c25b991ec629ff23be7d2fd7f756faa84eb50ffb52d0e77231858e8bcfff0660b36806af5a295025eabf98330620b25fb22efec2240a SHA512 ed77a9550df216bf6a62ddc5af4c9d73a2a453a12f927c8964465eef8d4e60c1ac870e8e59215a0e0c288caf40f5714c904dcb9daa2054de94329fa781c1294f
 EBUILD milou-5.14.3.ebuild 689 BLAKE2B 9faf782e98a3274aa1fd218ceacaf0e989a8cf664a9ea829d4bbd30f0f9fef519ff8903b3c392f438549e738b4b9f9f8c96a61cb53607c72d2d5a62738814167 SHA512 fe2cbab7a6140410fe09753562da399ee96a8bbbecb45df55d4f5d2a2492246a63696b310247e223ed493846745da5cfc1667289b3c53da7273efca74f397855
-EBUILD milou-5.14.4.ebuild 691 BLAKE2B 4a05bc5bbfbbb85f6efa0dfe88252e94cfb472fa4f40b3833a1f897effbad9bbe15fe2cb6621650d44fda8bed6acee17e5f5dd646257161c940c570220c23ce2 SHA512 b313762669ff6b53c59624010976b3e57208dc2147438defe5b40d6e0de583ef85257b1c93ede443eba1ea053a533c0738b36f5efd05123562c7f25a1470c87e
+EBUILD milou-5.14.5.ebuild 691 BLAKE2B 758d309dcd632bc067a80f6987628c377311f273d83ebe92bea0cc0b23888391d5b9a0527307bdd578da15948d7ad661da2c653076ab37cfe2ed55a4affe34ff SHA512 00fc10627aa42564a3bf4a6b40d6705006495ab114616437ca7c00b80b0c38c750ba29efa56bd9cfc09336882d004c9d453fbb531476567babca5f48082825a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.14.4.ebuild b/kde-plasma/milou/milou-5.14.4.ebuild
deleted file mode 100644
index 81a234b2a3d2..000000000000
--- a/kde-plasma/milou/milou-5.14.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/milou:4
-"
diff --git a/kde-plasma/milou/milou-5.14.5.ebuild b/kde-plasma/milou/milou-5.14.5.ebuild
new file mode 100644
index 000000000000..a07cff567f93
--- /dev/null
+++ b/kde-plasma/milou/milou-5.14.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+inherit kde5
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://cgit.kde.org/milou.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/milou:4
+"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 6cc399f6efd7..ccc6e8f1ca7e 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.14.3.tar.xz 4479292 BLAKE2B 5c1a0c9b3abd7c5823081b7a1b69d510ebab297a9573c066285107ebedeb23a1eb7ccf6811e11322278d5f4940dfa7ff5273a59610f7ec97883b3e4100f74516 SHA512 9ea74fed0228d9431cef6e51fb24a7c59c4070055ae10ee87b25c04b01c7652df97bb7f09b62402cfa71ad27936905b9db3a1a69f73710f40683c5b33a302336
-DIST oxygen-5.14.4.tar.xz 4468560 BLAKE2B e67f7cd832fbd04e2d8c0f3c5e3157d36bd77e590379cfa40f6f881167831c0a30af846ff1cb663242c976e09b5338ac15c9ed578e95db7dd701389f8f140b34 SHA512 bc7362a90507730a4e7a7f8a0bafaabc47789c6cbd3b42931349abf2584abad77603fe4c6c1d49e6ca7c09a408c0620008dadf448f335985003bc4d1a23bf76b
+DIST oxygen-5.14.5.tar.xz 4467780 BLAKE2B e43f1663f16f1c0886f43ced1c8382254144eed256ad80e4c9eb025a11c1e4cb5f3a543cc61f3ae7dcf30f6519ce4857ae1ddffda607b411c43b404504c9faf6 SHA512 b4cab5dbce0828e7a080cb458b00603ddebf9bb4ce5fce9ccf07a0dcee030ee268b9a6c53592035eb15251edb4ccf14dcf0fa921370f76d4cbcca355400d479d
 EBUILD oxygen-5.14.3.ebuild 1126 BLAKE2B f8b7d7d2c24bf53b4fc84e0344bfe0c216082fbe93c0589e0700262cdc3a78fc7545624fbe09899488e6e4ee392d9ac00a0c54c40e31a4bccaba778bbe04ee1f SHA512 6bd1874df00cf07a3a3bbe5394b38fbf3eef8de9186fed427fc169bb60e2a1c5497d268318285d8e28763aab1a0c1321187a55a179ff9b3cf26243948734c71b
-EBUILD oxygen-5.14.4.ebuild 1128 BLAKE2B 585a30ac1f1a228eff53a5874984b7bb05cf260120fdfc8ab3e09c8444f9fcb548b88798dc30730dcfb7094e486a2ce9e60dba884ff60a747a84704b5843addc SHA512 a0e4bb462a0541c0ae6f7572a5374f5a28531e0a70e07d5f7b85e15ba09973e8633f538c71014ec9e2db9a2199c248b819ec71e547bf899b4b31423e73431240
+EBUILD oxygen-5.14.5.ebuild 1128 BLAKE2B d2b042b4b54dfbc2ea4532c56ffb01ac7cb92dc10fb0b530eace42cdd91c5db10779fdd39609eb5ca4acd66e0afbb68c060446d40fc7c3199318b766175247cf SHA512 0a2be80a403ac0bcad6061247b24be0266c8a6ad6cd53a3e1e759427d4e9fcb5c8a5393472efed8206e9828a47c8ecbd9e9c4313cdf26ea5341f3dc15b2af814
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.14.4.ebuild b/kde-plasma/oxygen/oxygen-5.14.4.ebuild
deleted file mode 100644
index d45e10e9fae1..000000000000
--- a/kde-plasma/oxygen/oxygen-5.14.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/kdebase-cursors:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.14.5.ebuild b/kde-plasma/oxygen/oxygen-5.14.5.ebuild
new file mode 100644
index 000000000000..c1c4116f67ba
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.14.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep frameworkintegration)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_plasma_dep kdecoration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	wayland? ( $(add_frameworks_dep kwayland) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/kdebase-cursors:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index b0feb2114fd5..81be1f382d49 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.14.3.tar.xz 109220 BLAKE2B e91a246576ca1ef92098b44204ab7e4622731759eb9657608cbd0dcd83cbd51768009b677cacc8129fd6268341bc4c8893f92b1613f45f579e601f5b732691c2 SHA512 e2fdf6d2a6a84467f8f17e3d498dab8f27ef6167e913ae28723bbf7aaa21f61a549cb88e102362382dcbeb420b305163484dcd2b01fa476182da2fa37d1b83fa
-DIST plasma-browser-integration-5.14.4.tar.xz 109676 BLAKE2B b92d23e68160d1c9c18e44507a48a6e49bd913e063470c14f6b453202fd79cd91ea5080c7b0971452f19287177dbc11b816e1a7824c7b079642155bf6130e0d9 SHA512 eb16c2a141a2be7c1bb498974a494e6105f7078d7e67f8cb5a39b1b5b89000e24bd31c3640d65bec1188ec3de0b702a96fd4123dbfc5904db2a55ba1a59bd8c0
+DIST plasma-browser-integration-5.14.5.tar.xz 109844 BLAKE2B f9461ffffc3c8427154ba6f2a8d75c53be5569b5e7ed42638f411f7006dc3d7c7da89f170309ed73ebde073a40d025ecaf979c09f200d44f9cef737a53496308 SHA512 d1f607fa02fc2a1f609c1f8dc12f84d820f830451765e665dc1b7bd94e2f366460d12298b6458b8257f418f02cdd561c90e5d811839a5ef1554269d3691e4a72
 EBUILD plasma-browser-integration-5.14.3.ebuild 783 BLAKE2B 11695a608f0454350bff1806c6752e4534c512e4cbf180120723ece5ed4e0ea7f069ce03aac284d56459f590561030f9c21b95670e1f554eeaf9e60cfdcf5898 SHA512 d81d285e60124d22f2737e398cb864a8c19a13ce33ccceeca580bb2520c631bf59594123838e3b40087bb049a6be72dd87ba8fab248345c3e0f4cb2631d21e41
-EBUILD plasma-browser-integration-5.14.4.ebuild 785 BLAKE2B 7d0dac4a36f7ce66600d24f8d28a2017332e5ba3972ddd45ef715eeea686c74622de968976a8e02ca220cec17d916be36fa383c497a5e0db364eaa0cf03e60b4 SHA512 519611bbbfa79fd4d7e6c3d61a32455e7f14704b80246976786ff9ac1b6739f2e1892dc9784fef5a8cf643420c3c3cb1a952a23d8c3b68b3b9e68b4668c4079f
+EBUILD plasma-browser-integration-5.14.5.ebuild 785 BLAKE2B 8e313dc2f50ae203d6478057faed4f013a4ea909ac27f73d0bba4d397d7da924566774ea1a9629151d1972c40368646bcf720c12ff41b4665f717aba97fc5695 SHA512 234146fe5bbb2a1717d88060534f6153b2b1f3260736c956123b552f696f8f04d8b89d4fab95732d98be4d4ed140dce737110fc03a5bce412804b24e1b68a927
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.4.ebuild
deleted file mode 100644
index 997ee820c5c4..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild
new file mode 100644
index 000000000000..40116d1cdb36
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 648bfbf69e18..8e03bf1db863 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.14.3.tar.xz 9141312 BLAKE2B f6be5a432abac3835b7a6102a755f7bfc8809ef851c498ecc57ca2026fadcf7aebc2cf5c4e8b11198551cdaca04eff0607fd0d7ebcfd47a33fb4fd739e1eaf42 SHA512 52ce17321a0dd153446e9e334102ab2f6579e84595c53641864a660969ae410272f4762b345397fd00e9f6e936ce097e179d0b69a62341fa97b7b6b0b1ec38bd
-DIST plasma-desktop-5.14.4.1.tar.xz 9139608 BLAKE2B b30e27031ac93f031010261fd064d774d5cd1e88be470f4f174a4dd2dda7f6c2af359c6be25671c5c0408ec9a71a6a6aed595b25dc4b5432bb35432b63f8cd34 SHA512 92404c766eddaf97f5ba6e76edfd3320eb21e787202aa8aadc76e4c1f613f455a669a9fc09fe3d19e90e46c39a4bf55185d3e2ef99f7f79adb7afe3f63e7bbdc
+DIST plasma-desktop-5.14.5.tar.xz 9149560 BLAKE2B 09e65ddd964f250ae7f82c193eed9161856a3bb6f2dbe34dc7b52dc54f614c3e3c4a91da78751362d03a9bc5c89c1039fdf3f6a4e378bca3955f992c4ec651fb SHA512 c195189e34906dbab9f3793b866aa7537b2d968c4390851b39da8fe900c26d3691d5229e70eaab8d9fd782da3bd2381c63f91b435f2da592d5c6300b1a1a5726
 EBUILD plasma-desktop-5.14.3.ebuild 3855 BLAKE2B 94aac2ed142295424fcbd016980b1f73e11c5ba63ea5b5e46df9fc2e93e94043469cd1e2ba819d5fee2bd3581d296030a4d4e29f4d1b3e963aeacaf3f7148d1a SHA512 5e8898d2b675e46d362099f22da89eb027332e384e3298a8b6971cc96bac04f026c71f14dc76da1e83a298d5ea27027009ad95847487fc2aa46f7b62cddcf60d
-EBUILD plasma-desktop-5.14.4.1.ebuild 3857 BLAKE2B 542d45e834e2d7baf5d55ce7a21cd9dbf4778acaa460031e456d02fed9640cd1eeedf708ee39b277707ac28e93c30958caa74423c09dd8b9ad24cea466e33761 SHA512 72a0c88a8374f7453e3b043f9e55b862321dfeb183c7b710d71eb1ec3cd1ab259a51a4d2e631936f8eb5207dbc5e0b26112fac840749a3c3406f70d4d3328091
+EBUILD plasma-desktop-5.14.5.ebuild 3857 BLAKE2B d5dd91c8b3f8d2ddd3e16d6019f9791cb4b4681a9eff99b741a45cfc21fa61dedf93acb9e34998794a594e704664f9e10cc78b94395b8138010706b20efc7c1f SHA512 2e8eb1fcdf3560fbc434ff5a60ff91a19b1cffa1ddf6410569e8a575eedcf2c78aaa7e090805746d77f6df7246a5834394373230b4082f0206557ec4a2d1d64f
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
deleted file mode 100644
index 5e79908a990d..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.4.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(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 knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	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-0.12.2[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild
new file mode 100644
index 000000000000..e6474b3532f7
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep attica)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(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 kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kded)
+	$(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 knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep plasma-workspace)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	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-0.12.2[qt5] )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		$(add_qt_dep qtx11extras)
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_frameworks_dep baloo) )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep qqc2-desktop-style)
+	$(add_plasma_dep breeze)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep oxygen)
+	$(add_qt_dep qtgraphicaleffects)
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!kde-apps/kcontrol
+	!<kde-apps/kde4-l10n-17.08.1-r1
+	!kde-apps/knetattach[handbook]
+	!kde-misc/kcm-touchpad
+	!kde-plasma/plasma-desktop:4
+	!kde-plasma/plasma-workspace:4
+	!kde-plasma/solid-actions-kcm:4
+	!kde-plasma/systemsettings:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package mouse XorgLibinput)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index a26c09a4237b..b0fa32d46fa4 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.14.3.tar.xz 54088 BLAKE2B 743e4e1083339f3b78cffbd66a54d0363c05b2ca0dd3e456c180b0a39b880c9f6f07fd522e1993e35247dbaaeb330671da44462a0e156c84cfc10619ed642e98 SHA512 8078936e3db9c24a5ea05aaa826b5a69a4f12ae36e7c7e958776dc5b1d12d1d29a45a7f4ebd4f030409f7ecdb40e1f1a57bc859bd75a1ed6106ed74a122b2e23
-DIST plasma-integration-5.14.4.tar.xz 54180 BLAKE2B 4c0be1d2e0aa28ad66ed1c9ee2d12005cc688250b0674951304749e688434d5de04c739e5ec3166c4bd3b39d59a61853d2ae245607aa930d38554f1efdd1878f SHA512 6ec1846ead6164ac285128d1881a914d711d4c839edca449961af413606adbe622d741514f88d63b7393931864d3f325293d4950e37934e69f4e6bb7ff5305ac
+DIST plasma-integration-5.14.5.tar.xz 54192 BLAKE2B f032456177475eb9db60dd8d1499693dbd35480df3e2150e1a073da82a41d934459d52620ac4ff7cc52d64473b38da3ab2e66b433ab89be18d746014d6936153 SHA512 6169066cf8afc96f7a595a0ac1c54785ea8f7cfbd609d30b8aa8a12586256575746318765c92038c18ab976ee064a190b1131f01f4c336e13d71a1cdfa719429
 EBUILD plasma-integration-5.14.3.ebuild 1059 BLAKE2B 2d8482f0b2d54b8fea3fba458bd20c5d264c93802ae6f78b52cb66f86bdb4f6e0e735df195f70b5f3c49e02cbaef5c9de156d5783e8af2e720182af99a3226e2 SHA512 a0e0ba1ea30047b4ea7889205682a9ed4bbcade21d839d8819e792f0d44eaf8f7ed26874d38066197b6885aee638d8936d3fc76385c1274c9ea304658c6d6a34
-EBUILD plasma-integration-5.14.4.ebuild 1061 BLAKE2B 14611b6b1f13dd66ae38b0dd7d4a00eaa73f4a6d91de342d8edc4452db38dab95c57638e578f8e48c3c060e66e83bca5dec909bc1e69c12faca828e2c461d1a3 SHA512 59c7a3a6651bc89eee90be6a5f63f9d12caade04fb947a5e96e838a8058201d8fcd4626150c47c80af70d55d881c179db8d72fdd75022cd83ed6eb1ea134d7d9
+EBUILD plasma-integration-5.14.5.ebuild 1061 BLAKE2B bdf267c2c682ada4d87efeb5e342b2b2c0f59e40f8addd26ded9d36a93ea63c72d9af447aa9f7d08ed9bd25667f9e792acb00a16c3b544790363752c5c9641d9 SHA512 cc001d857df8023b9a3139018ef22980d2337832de5d08f461f448b0dc1778c870026cb0bdec62b901bfacf12d26af20f511112c79c5614472d644230cd51561
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.4.ebuild
deleted file mode 100644
index 7a6f1d7272c4..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.14.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild
new file mode 100644
index 000000000000..7dd94729902d
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.14.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep breeze)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui 'dbus' '' '5=')
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 0bf603ce7213..d0def32be546 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.14.3-r1.ebuild 3328 BLAKE2B 544555fb9e28331dc86489a2edc6154496f4301de7ef67996d60ce442d8fd486ed41361e4633b6b656994fb7a6be4ddd1b59240300bc83b87f7276caf4011ecd SHA512 bf7155b71dfb9629072ac8b325fa9c424d099e8b68739d0ffd9575c9ec1ee21df20a08921f92fb8a2b91ced2040674619b6bd061cab3029114529427d65a67e0
-EBUILD plasma-meta-5.14.4.ebuild 3330 BLAKE2B 40ca9f720467c414ef13f59adb2ce2e1fbb2f8de86fe7635828e47c25f5e2b73e42eb5606513e08d3f045f34e5ce2d8233271743946cc43e9a4458c354c88477 SHA512 52dc303ebd37b4e53786c5cbeb978a782855f7e6751b87625a14b4a2b1d61c44f243a4001b5260fab936bb464dfa44d22f5089e739cb9b167974e28ad51d0364
+EBUILD plasma-meta-5.14.5.ebuild 3685 BLAKE2B e5fbd052ae54559b432786834eadefe4662f8c4335531fa8a8e8857ffae64ff6d1a1c10acae18d41822fbc46952828dd1b7af52376c0552e341bbb1402f661ef SHA512 ab0ff11d9ae36cbcd590a499ad5052176d16b00c0a8a37148520220ae0895cdf7fdeb5a06fcdee4a79c72aa6b6a9cd3c753bcf3b4cad06804bd6682b13279d84
 MISC metadata.xml 1656 BLAKE2B ca6cffa3becb923ebb5e5feefb43215ec30f95f4745275ecf6da10185b2d7715ca74dae6ae757d835370a933754ff0d703fcdeef22766596618a48d8a5849528 SHA512 a4a469d477efc111210f5afa647741666eaebd303688c7e297b1c191ca312d9ac129887055ab95e0750338a5e4e9316aff0f1c62da8b40959fce9e5873683005
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild
deleted file mode 100644
index 4d68b770cf6e..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.14.4.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-functions
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://www.kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook
-+legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-RDEPEND="
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep drkonqi)
-	$(add_plasma_dep kactivitymanagerd)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kdeplasma-addons)
-	$(add_plasma_dep kgamma)
-	$(add_plasma_dep khotkeys)
-	$(add_plasma_dep kinfocenter)
-	$(add_plasma_dep kmenuedit)
-	$(add_plasma_dep kscreen)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep ksshaskpass)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep kwayland-integration)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep kwrited)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep oxygen)
-	$(add_plasma_dep plasma-desktop)
-	$(add_plasma_dep plasma-integration)
-	$(add_plasma_dep plasma-workspace)
-	$(add_plasma_dep polkit-kde-agent)
-	$(add_plasma_dep powerdevil)
-	$(add_plasma_dep systemsettings)
-	$(add_plasma_dep user-manager)
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( $(add_plasma_dep bluedevil) )
-	browser-integration? ( $(add_plasma_dep plasma-browser-integration) )
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		pm-utils? ( sys-power/pm-utils )
-	)
-	crypt? ( $(add_plasma_dep plasma-vault) )
-	display-manager? (
-		sddm? (
-			$(add_plasma_dep sddm-kcm)
-			x11-misc/sddm[consolekit?,elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( $(add_plasma_dep breeze-grub) )
-	gtk? (
-		$(add_plasma_dep breeze-gtk)
-		$(add_plasma_dep kde-gtk-config)
-	)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-	legacy-systray? ( $(add_plasma_dep xembed-sni-proxy) )
-	networkmanager? (
-		$(add_plasma_dep plasma-nm)
-		net-misc/networkmanager[consolekit?,elogind?,systemd?]
-	)
-	pam? (
-		$(add_plasma_dep kwallet-pam)
-		sys-auth/pambase[consolekit?,elogind?,systemd?]
-	)
-	plymouth? (
-		$(add_plasma_dep breeze-plymouth)
-		$(add_plasma_dep plymouth-kcm)
-	)
-	pulseaudio? ( $(add_plasma_dep plasma-pa) )
-	sdk? ( $(add_plasma_dep plasma-sdk) )
-	wallpapers? ( $(add_plasma_dep plasma-workspace-wallpapers) )
-"
-
-pkg_postinst() {
-	local i selected use_pkg_map=(
-		consolekit:sys-auth/consolekit
-		elogind:sys-auth/elogind
-		systemd:sys-apps/systemd
-	)
-	for i in ${use_pkg_map[@]}; do
-		use ${i%:*} && selected="${i%:*}"
-	done
-	for i in ${use_pkg_map[@]}; do
-		if ! use ${i%:*} && has_version ${i#*:}; then
-			ewarn "An existing installation of ${i#*:} was detected even though"
-			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
-			ewarn "There can only be one session manager at runtime, otherwise random issues"
-			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
-			ewarn "or package.use and remove ${i#*:} before raising bugs."
-			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-		fi
-	done
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
new file mode 100644
index 000000000000..17439dc7faa1
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.14.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://www.kde.org/plasma-desktop"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook
++legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers"
+
+REQUIRED_USE="?? ( consolekit elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/drkonqi-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	>=kde-plasma/user-manager-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[elogind?,systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		pm-utils? ( sys-power/pm-utils )
+	)
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[consolekit?,elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[consolekit?,elogind?,systemd?]
+	)
+	pam? (
+		>=kde-plasma/kwallet-pam-${PV}:${SLOT}
+		sys-auth/pambase[consolekit?,elogind?,systemd?]
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	local i selected use_pkg_map=(
+		consolekit:sys-auth/consolekit
+		elogind:sys-auth/elogind
+		systemd:sys-apps/systemd
+	)
+	for i in ${use_pkg_map[@]}; do
+		use ${i%:*} && selected="${i%:*}"
+	done
+	for i in ${use_pkg_map[@]}; do
+		if ! use ${i%:*} && has_version ${i#*:}; then
+			ewarn "An existing installation of ${i#*:} was detected even though"
+			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
+			ewarn "There can only be one session manager at runtime, otherwise random issues"
+			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
+			ewarn "or package.use and remove ${i#*:} before raising bugs."
+			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+		fi
+	done
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index a9792f1f6460..1887da7d8757 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-nm-5.14.3.tar.xz 718288 BLAKE2B 6fc68e0bf8661519889bead3b816cd51159dd1f48fb4243e4e8adb2097d9297d33d8246947ac92170d0290855f8b80f344d1f456e24c1f2007fa5333b3fc7bea SHA512 6337c35407074c649645df447b0502fce853115514e28fd216be0738bb35c86c3ec8313780ef6d7e4df3836c44851d644a07190c2333a1bb583e612056bc22a2
-DIST plasma-nm-5.14.4.tar.xz 720820 BLAKE2B 2d608da282990ecd3d0dd4ae50c9f930880a5bb07f2f095f38019ea59efff70925c938e71d282ce18ad4d7e5d30006cd9d54ca7f3bcda0ca9b929dc36579b83c SHA512 a0bf08c4d700b00a32209b76eed75d95dfdc2271308c16181d54a234f5b0b18636beff6172cba3c0398aa14eaab5c2ae14054cc3239a8388329e14e8ed044ec1
+DIST plasma-nm-5.14.5.tar.xz 721144 BLAKE2B f9537e742be74b50ffeecee007ef91d93d108b566cf081cb4d25bc4d62c98847a74e7e69ec01b2f10e4e75eac4bc75cef90a3a47ad5ad199cec9f20c31bdaf20 SHA512 54667ff01db16bfadc1663dcf51668aed4eabcb70c3903538044bb478aeb4625d27777df13867cdf03048b6575a540de5c7baaef9e2dc2c41f458d2800daba96
 EBUILD plasma-nm-5.14.3.ebuild 1986 BLAKE2B ef531c575d820a2ba42700797d85c9f332d6177ff8e98a1ea8e84d07e47cdba1bc959137daed51f2fe75243fc594373260a8ae3c55b7899820ecf1ac3e6b7488 SHA512 335999283e760276943c4f66712e87ab73b0bf5200f4fe0eaa015df34570ee0436f787fa67a139c8341afbebf19de6a19f1b5bd51af5ba2b456ca01b84871942
-EBUILD plasma-nm-5.14.4.ebuild 1988 BLAKE2B 713c3bc61990bd985d1f2681a0b2e1f7f90272fc1913a901003ab079ea05652e423cc5c49b4596ea8cea814fe0e45866b04fcd59570bd757fdae37c9723e2f01 SHA512 a52d8a25ed14d6f78e3fa1f2250ab086f37eb3b2b047c7bd55c78e311229eb1059e0097ee598f5bd5eb232804d28c72ad77845858076ffc133afc3b104957aff
+EBUILD plasma-nm-5.14.5.ebuild 1988 BLAKE2B 190cfbec91b3fb929f5c2bf827222dd4f6f86a06977a06e3f899c37eaac3db5e163723f791f94a008b8a3c2b9d4838ccfb702b04438f2763b6719ebee2895943 SHA512 d0a130f8a1a50c2a05fdc69a9ddddea1cef621c6213f27340362c0d1ab641820cda881432accc2b0795c05e929c4f87663a85a40448dc604a08ba8f18e128cfd
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild
deleted file mode 100644
index 86195daf5637..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
new file mode 100644
index 000000000000..19d1e4607a8f
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		$(add_frameworks_dep modemmanager-qt)
+		$(add_qt_dep qtxml)
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		$(add_qt_dep qtxml)
+		net-misc/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-plasma/plasma-nm:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 448e29b46995..7aad26e8c989 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-pa-5.13.3-automagic_gconf.patch 530 BLAKE2B 49fa6547b997c0f31627941b333c30ce0ba1165910c235a8319e4855fc5b5acb8c8355b47cd87e57aa49d1f320ed9d6b395887376ef55a5098c436bcfa7d4e4a SHA512 5baaeafc2e4426251d445f954ce25b6561e9e5e36064f803068d8d60d6186cecc4d7eb97da20406160c166800bfa4e54543566f21ac4afa398c3cf4588d23546
 DIST plasma-pa-5.14.3.tar.xz 94724 BLAKE2B 5f4088ca4278852af15575c00a973b1d32563b39f05a6cc8eee0962e728e662b4e4862134dedf860167a6535fcc225807c2d3a6fe859058b5dcc12cd441e06a3 SHA512 174eb9449188e3b97c0476874ee79f8f54074c9dc40c47c09cebe680af1539cd8f144c2d6afe79b821e44c22eb9049e1aa8232cf01895d5d4e8e3a02ae973df5
-DIST plasma-pa-5.14.4.tar.xz 94372 BLAKE2B 987e04d9914344fa8d32d0842c07f86ecb51f4003f58b6e114e206c879807ddd8f7df13421f338ef99e0bf04bc06e292a6d2b8c1e10f4d898da2ae7b09769c9b SHA512 d0cc765a474fa87dbb0bc62d4201c848b13ba02a35438ab484346f3473cef06189638e5a5342916f3a14fefb1f336ccf8472fbe89f6a9ca2331db9c3a28cd90e
+DIST plasma-pa-5.14.5.tar.xz 94368 BLAKE2B a8a1bf8ef2b6a9496941f4a35bfb1e92a4cf7a8d3b9ea014cff6d04ab7b01f0c3e12433eafd3a0f529f9391624e82f0d5f7a6314b8b717e58cb733636c18a1fc SHA512 436ef77d61d37bc4cb166ebffbbd0b0f51780008e902f791af66bebd0429f8cda608674790c87e89ddd40dd614eeb61eeb11e173c02f43d03cab420a2ffa196c
 EBUILD plasma-pa-5.14.3.ebuild 669 BLAKE2B 68f4d9cf4f99b934091ff0acb7ea55eaa873655e414d2a048a35ac70addac92d33395fc5ddc5648b36ad84c6363db9bfd57208e79917482e775d2a0eebc1a69d SHA512 fc13b99dc294a9d93af8406ca8184947daf7ec8ad27e9c8e30f9d5683de816be95c7b1de40c4b6a41b166156b664e8122910d1f6da60a83718dfcb3ea4c58293
-EBUILD plasma-pa-5.14.4.ebuild 671 BLAKE2B 8cec8ca0b78f429fc9166a534ff4a3c766c6044caf4ce675d358098e4e5f20111a5fa540d54c7cd106846dc749a80bba61287e47683ed713e798c0d77ae06c1e SHA512 3230807d48f12604bfb5ab916fc4b41aa253dcb7dc086d69e5f944a01e4c7a339410bc85e76032744592921aaeb37c6391ae0e4728901a45484146ae0fd8e536
+EBUILD plasma-pa-5.14.5.ebuild 671 BLAKE2B 0972d1683560410850adffd9b106046d9e0c1a9eff7ab9484b8fcd1feecb78d044878df4a85ea7ea17501dba1e4d9f7d376d0a2fa01a29dc29dc3a5e76498753 SHA512 7a8469f29ed8463a0e17c75ee3c31ddec4d2d931fcd3037afebfb53943904b6dae1159feed6e23a6cb2af0eb7c114250498e1b9425889ab53b89dd1dfe5c7abc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.4.ebuild
deleted file mode 100644
index 3977835041a0..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.14.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild
new file mode 100644
index 000000000000..42aace8869bf
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.14.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 4d46b358a4aa..dd32f87001af 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.14.3.tar.xz 250856 BLAKE2B 4607654ebc9a0eaabc7f4a0cc5ea2bb697d6dac90131aae4b4366febfa23a44e73910d14890b6bd64d8fc36ce16fd12b4220fb17862cbf00186004ec0d3ec15c SHA512 9610abafb27147a398fb5bff28f2aa3ec367cf062fb1804e987da410786086c8f8c8d6def464b2924ebe24b37c2369d5f75e5c8c12f412b68e398cdb8682ca35
-DIST plasma-sdk-5.14.4.tar.xz 250352 BLAKE2B ddc54119543146a5c2738c9d9bc1d9fe0b7829e042ff780432eb316d482b74ba23a1312a6f0490b219cf5cb98c282eefd51787381d988fdcb2025429e3f4dc75 SHA512 d20a3444daec03e80e77711674372db2f864551ef2c0097db6fce202198d8e47931566aee02c851a65084aadf1a0e66ea5afd4de18732ed690abf930779d8588
+DIST plasma-sdk-5.14.5.tar.xz 250236 BLAKE2B a635ce3f32dfcb83d89ebcc546b407f51b41cab4afb134ef26792b5de188cee17be946fdf24c635cec2603b8b524782e69148a1872decd89266241a70d1c8cfd SHA512 b4ef6eadd49e027009090bbaa7d1af476b6d1fb8bea68df2381442bfbc2405d324319bc25c41060d4dab8517a6549e507790413d77f7406d7cc02a6ae7aeec39
 EBUILD plasma-sdk-5.14.3.ebuild 966 BLAKE2B 4f97db8570b3c006ca9a2b888ce432cc91a9264338f9c25c0e5172aa13d0903839e8554f897dc52d66e64c47d4d5bbe439ca8b7479ca19836d3e76867d1f2fd8 SHA512 4b970f6dac09c3c6beecb795dc9e3a213a54090b28b7108de33bc33d2c23a2455b206eede7ebb04b5846a7fd0c95261efca969275a045ca100de9df65a103118
-EBUILD plasma-sdk-5.14.4.ebuild 968 BLAKE2B 001a3be301ad9a4c3446df888067896509e1e3b1ddd653e787374d43dde7fee60102577e5231bc804e32be58c7d29632f0e6a197261ce2f71767a73b7ffefb49 SHA512 ff9ec61fbd4f90423dd37571b0b7f325ffc68320183e9db21c3f22b32575c61199532eb163329bc48b288c1480c30c7f8dfd2f565d3777bd06b707fb6195559d
+EBUILD plasma-sdk-5.14.5.ebuild 968 BLAKE2B d7cb2badb871af30cb42bc1d62cf107dd852c9ff2b9e42037f2d9dbc7820e689446b42204f4cf8cf373cc8531d64de27e38c6c1cc9e95b1e972452a71b31ddc9 SHA512 cb6adb8466cf7dcd3f8041cc09a7fc520d99141b0747c6c013af47f79a5ed8f0b6cc1491b9e9a0b5d43e37319b766b0eebad4017df8fc6ebef219371493fbe48
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.4.ebuild
deleted file mode 100644
index 334020a60fd3..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.14.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!dev-util/plasmate
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild
new file mode 100644
index 000000000000..6435381c22b7
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.14.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Useful applications for Plasma development"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!dev-util/plasmate
+	$(add_frameworks_dep kirigami)
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index dec442e1ebf5..f3525d9d1eda 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.14.3.tar.xz 121448 BLAKE2B 554ad3ce9699ae937c5bb0759f994a4cbf53d72606e9eb6fae5bd39136be3c47a4fa5aecb9eda335f13e939fb349d37088e389ea7036ad97ed348837a3197e11 SHA512 243c9201644f0c1408f5911e21eacd447d2f13133fec6bfdd540fdc7e49afd59fc0f5c090d315b6b48bfcd42848fb6f2d9738c14701f8815e719c6e1f18a1456
-DIST plasma-vault-5.14.4.tar.xz 120612 BLAKE2B 5a765537202863100e148ddf8b50ce3dfa5c1bd75b43bb17efe0fd3822967f61695e7f12ac86c7adec26b70e6d737e24738930b647ca9f3ea3a51364d876b4f4 SHA512 87775543da9927a84d3f1a1f8fd567a758703bcebb723a0fbc8766482e575d8fc0f6be9b30e78233ac16f8bdd1867f02ffa0e0ab5891f030a0696ba30c06158a
+DIST plasma-vault-5.14.5.tar.xz 120944 BLAKE2B 2f47095f47d46dabd58e7ed753da3cc57ffeef71a1a6692f2f795df56678b133f941487b8afa2c4f70e0ac7497bb7f474a9b8f666a0bf41c3d57ca0564aaf524 SHA512 8ac7e59f0b41b66af1ca73a939c77907622090ace7b2812d7de7e12d5a80d740ffae2eb667a8e3223ea34198a425d3dd83c0c21e5e055c4d3bc32232d9f8d26d
 EBUILD plasma-vault-5.14.3.ebuild 1071 BLAKE2B a889ddfde73eb0abaf4e224bc398a707b48ea6f8bacd405b82a516fefcb8f7a105f5306b9bd644b0f481e2e918c59d1a9225370b94a6a892dca6618f3bf80aca SHA512 ba68590eb31fd416c4218c89b943af386f17be7b52a8ef663428fcd1f13375299b3516547b25572b4e4c1c322a3b95959b78f5943dfc3241634954aff8418c47
-EBUILD plasma-vault-5.14.4.ebuild 1073 BLAKE2B 214470e62ad0800c231c907dc29aefee6b3fc34637680e8c57949a0e89810b7076e95eb75e3e98f5c666faef690336485194290bee367c10daff9c8b1e181594 SHA512 023b791cc132616ca2db3cac07d70d7d87c196cf423495a36a6d650bb84792ba4f1393bf3c973a6d13e251828661fb674989311363d860c0ec2754f2ae9f4951
+EBUILD plasma-vault-5.14.5.ebuild 1073 BLAKE2B 36c64034315534742b76a5c62a776ff5a35d921ef67e98e317aeb0660a00aa314cd5b80d3fff62217e3d49fe3cb2f06abf31132232e90754bc63454b1d5a06e6 SHA512 26dc793d624605cf73b27275ea7bd9d6e40dd7523fc4dcf52ed6b8a4648fe47b6ee7a760dad3076f9249833b1e1c87a3658c0090bce25a7b07cc818e75411515
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild
deleted file mode 100644
index 29978f62b899..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.14.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="networkmanager"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild
new file mode 100644
index 000000000000..fa87d69ead75
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep plasma)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 9b39127537be..00bc82636595 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.14.3.tar.xz 45915252 BLAKE2B bb1a8676bad8747512884dd35fcfa2ecd8b8fa76ecc55a9e81b34ced6df36a1663e220ef2551ba9ca75b998b54d1599429efc4da22fd37a85ea369c99ecd9a25 SHA512 6dd8dcf7c7e24eb905eefd347527bd4132187b5cf2a26d3d2f40306c95d1565e36bcc27b349f6db9a7960cbf9ef3ab5c36b77e73e48bed8fba13e352ef85b981
-DIST plasma-workspace-wallpapers-5.14.4.tar.xz 45915540 BLAKE2B f928934708fae37d960af30db36e4ab2add2b85f2570b6bc40408a15d65dd3bb22127332fd3c4c3cf12ee4561dfaf5dcfaff8da188eda14da628e6515b35f784 SHA512 0ecd89eac59c78b56259a04ac7fcb860aab3cc12d0bdde7b0fc357b33705fd9f7b96f79db60ca4cb83f0983615472c11b6590ae7f35f1e7a16fc10caef0707f0
+DIST plasma-workspace-wallpapers-5.14.5.tar.xz 45915040 BLAKE2B cd55b0f52f4479583341af64cfd73122055402d25220339c4210d273b06ecff4d121c91b877aec523d89859f434c6221376c1ef6b9e2fe3e4d8426f72d0464c6 SHA512 6bee195adfdcee3ede62ba4bbb8d26ce90ea646570110ea5260ea433c565160ceaded996e32662538d931022a0ed1e0cb9b1578657b9e6350d8d193b412c8c35
 EBUILD plasma-workspace-wallpapers-5.14.3.ebuild 356 BLAKE2B 2d7224e97cb39e96d7c66faffe0590d352b088d0db6355249d5924694a2ecb86c7750da8074593371f7e36d931f49e293fdef5d580f292ed76d7486f20947b0d SHA512 c6e72282f36335820a10c7f3994374c390dd6dcdf9cd64e0d058154480917c8d10c007316e2f6aa63176e6f2b970e159266b4acad01e6a4ef031c901053ef287
-EBUILD plasma-workspace-wallpapers-5.14.4.ebuild 358 BLAKE2B ace058f23a929df749c8a4c0b825c49d08358efe9dde431ec44afb59a6e616fd624c3e2472c8c829ce93df49df81f5c9fca7ec2dce162d6b4f22f87989405206 SHA512 ecbedc1bc9f7248b6cd97ad585b259073b2849b81678d2b084a4baca6fe229f8f7b31f23e2915acfae774fbc41270d6f528bee10fe29d4d4d360c3ef5fbd84b7
+EBUILD plasma-workspace-wallpapers-5.14.5.ebuild 358 BLAKE2B fd78abd7d53907aa66ce273ddd814baeb4511e3209049f0e7619e931936b13c72fea12b32fdfbd7d9d897fa5ea021afb7ba45ef60a5bfd9419bb9f9fdd4d08c5 SHA512 d7cf67a315373604c82c54107a5b778896290ac4471b79bfe878ec8ae0005ac2c96c10bb6fa48445b3eb4d7fd494357de289c28e2b108c3bdf11cf7fdb1ce595
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.4.ebuild
deleted file mode 100644
index 2155e5536b19..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND=""
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild
new file mode 100644
index 000000000000..a2c4404144f7
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Additional wallpapers for the Plasma workspace"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND=""
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index e8faf953d815..67747fdeb5c8 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,7 +5,7 @@ AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
 DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
-DIST plasma-workspace-5.14.4.tar.xz 4572780 BLAKE2B c0c59acdd4622949ec87e91e827595c048c3f736e27a2f7c649765aee3bbd7ef00ccba7909dd456881bf4cf382adbff3019be2a4f9d098591f8781399aee9902 SHA512 017b2b8d52c243072ffd6b7b4a766ed27d055dae36f6cf9d10e4f06748555680b55ebdae6db07a043b18359c391bf294f0bc0e601f26e5cd12b532fffcb07645
+DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
 EBUILD plasma-workspace-5.14.3.ebuild 5000 BLAKE2B 68a4683d732fedc92e5713e12e2b5cb39deb4470fd75884242bd0b6af6f4ecd3b03937f9f7f6aee4f49f9e89515aec84ef747380f16883e0ce17babe8b9fd87f SHA512 c9d44afe6712f5fbe0042adbb339a8d8e6885c90cbbf5e2bb744c25454d291a1094b6125236fffc3bedf0c1d0347c670b916baa3cffc796664601fd103931c2f
-EBUILD plasma-workspace-5.14.4.ebuild 5002 BLAKE2B 8e127a06bb281a74079f5454c359cef9d4b549c27fa9153fc84d6bf4011cc761072db814a8d8aba612448cee4bbf29db88b75705eb6c952509d42b167143486d SHA512 5379b76933fa0ad1ae8ccc220aebf4d427ff3cbd5178af623dcd2fe1aedbea6bd4410da41b5563ef0e806ef7c6d333527656a45ced3ef61350a1c0ecff51038c
+EBUILD plasma-workspace-5.14.5.ebuild 5002 BLAKE2B f3bd027c6221cfd4fb42d84a78d0f6ee37b1a6995094f238c59b5c1d685bb115669cd461759c8af4fc1e55631d11c47c134c85a947b24735e4f69058627c1fc4 SHA512 5fc11ec0cb20e6db09dcddf663b14fa11fe5193eccfda6f298990d2b112e441043a0b54ea75ee98810ec29651329385a7cff5c2a937db82ae81f5d2ef73f35d2
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.4.ebuild
deleted file mode 100644
index af53d274efc4..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(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) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(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 )
-	!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
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(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
-
-	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"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
new file mode 100644
index 000000000000..6b8b720cd49c
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(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) )
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_frameworks_dep kdesu)
+	$(add_kdeapps_dep kio-extras)
+	$(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 )
+	!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
+"
+PDEPEND="
+	$(add_plasma_dep kde-cli-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
+	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
+	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		$(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
+
+	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"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 6502e73a1026..276e82388a72 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.14.3.tar.xz 39660 BLAKE2B 2f183a2348820b2214089b01ebd6e827fa0221347f84f696a6cdae5e4c84363297c01c07b571d5a97b5930e12de8fe797da2275f413717266d769fed3e2ebde6 SHA512 6024b44cb0c567d405c398f33bb242c1256032660e4a7f2a575db4c7b70bf3b35de8ae3491a76be96b9de9e24dcd84d3345797a2978dbbcc53c96c312b4e4d59
-DIST plymouth-kcm-5.14.4.tar.xz 39488 BLAKE2B b2d9e820aeac1c3c77c5a856001a0fe384a54de3a1f5140cc515e392208b55c1e7411ed1d14f31d7769b76e6d1d48a913f0fd8321b62bcc0f666c7dfd7755998 SHA512 f46e168b0ffb1da1893055f91f8f173bc66d6eae2986dce1e32364869131fe42d45d6ac81452b9eb6f1d9b396a77df098fbf855a8a191c0d45e00ddd67b1703e
+DIST plymouth-kcm-5.14.5.tar.xz 39488 BLAKE2B 83221255b8ece21b01a7a117aeb31148a8eacd3e856fb92fc73f304f1a9d2cb488758f945275eb1d8a84cb42eaa4a8b6a33fe69e9a7b6855b5d6a9a9329e9099 SHA512 cd90ebbce2a383bf38e886f96ce75290008ce8721092bd3950b8f097f3920341e6a874577359538bdcdb4fd180f59bc24f068a17038412b2623649b1b8ce5440
 EBUILD plymouth-kcm-5.14.3.ebuild 793 BLAKE2B e7cb7e051691e704a791840619bb39a76b44e96a49e2a9939e6364dd6b8b519070b8a9be5e6cc43d8887233e09db8ce2ffa9a6c4b479c3528af924ab24c0e046 SHA512 42b399b00bd2e0dafc6660d46f3ce736ca2718075626fa7a0d84fca656da4a5a3b13f9df55b5b6289c990da35bff1b0de88999e095783b9c873f7254db12aa25
-EBUILD plymouth-kcm-5.14.4.ebuild 795 BLAKE2B db3593eb2d5ca72d5a5899a9aa0679e6c66ccc47a8b1a3082414670fa09a4bcd590b629de1091ff125c587fb1b5d6d189b80f7df7f78eccdc0b74e5df7c85a2a SHA512 ffe3a65f9ac30cd8b4bd322db4e3f40e39a235cdf34911a2b5c21d0e2256db003977030b1bc3a7a2442eba7fe43661cf07aa18e3297366aec9a08be535a2f578
+EBUILD plymouth-kcm-5.14.5.ebuild 795 BLAKE2B 08f8040ac861581a9ed1641c6cac4bcad0f13691b0a391f9bb1bf5adbb49d5af1d2120923b33f3ba4a83ee9e3f8bb5a27a2d6e01e3d98a6c2e64a8c14c5681f4 SHA512 07e61081d0b1318564c65482c16c96c41d007b7e9ea7b11724e3de7d2d80ddd369da38e9e827c78b55213d2fa8cec9479d2c7913e1a1f7a342d7ed86766169cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.4.ebuild
deleted file mode 100644
index 706f828d0e4b..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild
new file mode 100644
index 000000000000..181fd57c711e
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BOGUS=1
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtwidgets)
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 41f91b2df09c..42c5843763e3 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.14.3.tar.xz 42844 BLAKE2B 29518813e2a6642282cf7151f632aba3e9573edcfa73fbb8a11498dbac575f76802edb29d37199cd6d203e4750c31591d23d65d2e2259b908b7bdc6d1d2ba33b SHA512 6c4f616a11a2f741bdb85f7146f604ef9a9c89b957ca5507f5bc9ec8b5c3848f5392d886340ff4f089655c1fdcb144eb82f12d43102ce163333adbd2629ea445
-DIST polkit-kde-agent-1-5.14.4.tar.xz 42616 BLAKE2B f1353a3cc840862f7ec97726ca71fadc1c17b8b9056b4deb96cdc6ecb49b91900a43eef9d51c46e7ff06f7e1972621cf8ccde2cb7bd35d3014846b852a4c9fc0 SHA512 bafc29898d2d297789cd48edf7676fc0c392e5cb621fcc3e488cc200547e266859df505edc82683afc778fb5c8ca0ff2207d13f25e4aba25262735cb761da858
+DIST polkit-kde-agent-1-5.14.5.tar.xz 42680 BLAKE2B a423f9ea905164bf8fb9eb5f29b8efc68759492ee93f3122f876ab1e7f2e2b6d254f81e0cdb7906ae81a74f7aad928c226993944dbedf7ff3baa838793a827bc SHA512 09999aca1a3a206088a86119b4bd1db3fd2d51932c99da9480d9784f9cceb9e580851249f9384cca785f852e9ae98d921e5094808aebcbcb333027b1179e6f36
 EBUILD polkit-kde-agent-5.14.3.ebuild 716 BLAKE2B 175e6017de9f3916f115a6d5efdf0fe8d7d34b7d59bbd6bd5aca4080019b8badb93068163539fb11431d3296334b667ec4ae6faaaf3ec8ff57c730dc137299b7 SHA512 4aaac34629da6450b1ff0b224b56d3cc67c04f84f3b9052b2c391088892e8a9015526fba36e136bf43dba3e966d3697178f2290f75c26d36b4904519c88d45c7
-EBUILD polkit-kde-agent-5.14.4.ebuild 718 BLAKE2B 63dd1d5081f35993a1442ae960a58aacb27d9bb58deb324881963017aeb671680ce6f352ca6a3de7c2e55c1757d945dd7c47e23cb76b80db4cd8e4816ffd8f77 SHA512 6aef96dc797b6b80a451965cc80cd198b073663b21e244e5bec78ce46c15a04b7c33cf1d755e542ebef9ae1d2537e2bfe59c2dec221329e7b14c645356ad974d
+EBUILD polkit-kde-agent-5.14.5.ebuild 718 BLAKE2B e1edd36889dee5280410f80998382c7ad2b44cb02e10a4803187296f421397b46c6cf6af7c52b587802a639725593e33c837ec64ca55f338a4ab70baa39e9d50 SHA512 2a2d317b68e1909c9db36053ae2e47231153806571aaf82af511c6b69eab0435ba3d18bf2040b10e75c7e75b869d8e06bfed63550cddc30df2f96beab72be107
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.4.ebuild
deleted file mode 100644
index 82a821b2fd12..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://www.kde.org"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild
new file mode 100644
index 000000000000..da5e23e63648
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="${PN}-1"
+inherit kde5
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://www.kde.org"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	!sys-auth/polkit-kde-agent:4[-minimal(-)]
+	!sys-auth/polkit-kde-agent:5
+"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index ff193dfa3865..23afec37d0a6 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.14.3.tar.xz 599436 BLAKE2B 0d971be6e007cb1c7e29534f45ec6942ed6172acc9700a6a9d7c7eff4c93fd32313824e3ac05a35fee2cffe9e8f024798db2887c015b00a5c1b1eb61a2c35b7a SHA512 2dd9482efef0bfe407bef2f48e57a08d00a74238d19b2bd6c2874ed602a90e30c15e17ea114ae368fbfa3a9fb914207758dcee2f5d0d6340e7eddebebfd6064a
-DIST powerdevil-5.14.4.tar.xz 599800 BLAKE2B a7f7486229c99b55ef152fca111877dcdc42ef1c0084b676b527775990323845d29e3d738420026e95c119b08627d68d7ed8dced528d68c9f2de989289d20284 SHA512 c47fef07892ab206f9ff813e802aa77f648d760757d1d8d68c34a8f73f19009be8264c91f802ebf15b7d8a6223b2d32aedac0991c49dd2588c45d98439bf519e
+DIST powerdevil-5.14.5.tar.xz 599712 BLAKE2B cdf266c76c5c19bfa8730a06c2089bcd856bb2e402c8d0b9059de546e2211335d4875cb75d195733760d5f3268004f2aed545641017f5a415f0be2088e68ff06 SHA512 b71d70889eacbe684173c43035c7e80c840437adebdd0d707065ce7ed707e1c763d3505be53f97cba255432d6a8194f567859059a82086a0225f9cd1ec953f06
 EBUILD powerdevil-5.14.3-r1.ebuild 1661 BLAKE2B 2706ddfa98e351ec71ecc5f912715b84634d8bd08fd1a0bc09a5f16dd59f448f910f90d5cc814a8ad9712157411da2a75972a6479b3bc5e8006ecd3af426affa SHA512 f40eacc4af420eb6f585320d866c91968acf02b29c5bcd15c3c5e9e2b7dfa8d4a9079ef1732489ac56ee3757ab988a33764c62677baa6f8cd00ee4c8e9ac81a1
-EBUILD powerdevil-5.14.4.ebuild 1663 BLAKE2B 4836b39c4b01041bd70e64259eb134dcbe7857814474075c43f68be705f6bfd99b692b2ef0803d9eea209d9176698ad3c9e1c26d7a86a8d51bdeb2221049bbe5 SHA512 bf6d0a41021dc282eaff6f223d40591687a5a5766018667e50b48ce2f6dcefd44ac47db5121ad8c6ae33649d0904741141a0c965f4b1dad776c317a75b9ffd1e
+EBUILD powerdevil-5.14.5.ebuild 1663 BLAKE2B 262159b60e4659570ee074c3bb18e797cf4de682263f655b53f9f78cdf9316a8485069d522948e18a2ea5239636e31bb7a40a754ee71ad9b4d3dc5e74ea0fb17 SHA512 66453087ba06d6b5e10c5993815dced1bc42bf16e75ca13bd55890e337fd63ad2f35144a1c19a7906a15375eb286e401380fc2e5f6a02f343c16dc523bd7e8f4
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.14.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.4.ebuild
deleted file mode 100644
index 192b30965b93..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.14.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=sys-power/upower-0.9.23
-	!kde-plasma/powerdevil:4
-	!kde-plasma/systemsettings:4[handbook]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild
new file mode 100644
index 000000000000..8a279ddbd882
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.14.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://cgit.kde.org/powerdevil.git"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="brightness-control +wireless"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth policykit)
+	$(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 kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwayland)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep libkscreen)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		$(add_frameworks_dep bluez-qt)
+		$(add_frameworks_dep networkmanager-qt)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	>=sys-power/upower-0.9.23
+	!kde-plasma/powerdevil:4
+	!kde-plasma/systemsettings:4[handbook]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DDCUTIL=$(usex brightness-control)
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 5e8a423822d4..e56061cb9fa0 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.14.3.tar.xz 60940 BLAKE2B 2cb3594e935a3010d23b33f333eae52e24ee987536e42e21ec3fcd28b428761d21d799e5ef589439e5fd271835b3c3bc0d762ad2e450e82ba2a202120fa1a267 SHA512 0458a6e624e3d882f0e42d5c8a1b14d030d33fab463dd5cb46149e4e70604f1563dd075efe89561d68372f768b1c2045f9c1cb23e59e23f07ddd702a293038be
-DIST sddm-kcm-5.14.4.tar.xz 60976 BLAKE2B fbe59038dc67d1e337e94fc5440b46a83f85e055f157dd814a5bcc97eff3027ae1239bbeab0fb0e29e936463e4916d31e51a1f5aab1fd8e1a731c51baf0f1378 SHA512 e7c564c326f35627fb6d0860449e442dc58003ccf91a567a60987c5fc67509f9b20566b69bc54bf902bb37d30f847549d63824efea62a7d1db6edcc17bab6b4a
+DIST sddm-kcm-5.14.5.tar.xz 60956 BLAKE2B 8dab5119e4f9d1a0bb81b2e75417e9b0d7e0202d372bcd514678a1b9a284724011b34c13ce5dda2c7cabddf49e2dde736c611ea77904b9bef3e87caad4014365 SHA512 f86bed5234be5025ffd601b6424787d170828b763933e2a23357d890b9e6be5156bcb580c4a1f9370722aaeb114065f780118eaab29467275361cb64db23cb60
 EBUILD sddm-kcm-5.14.3.ebuild 900 BLAKE2B d4d51baed84e1dfec66c30b925b1543341c91ae37afd0952056f9aeef46eb3c7a6817396a77db40d2722c986edc6adf1496910ef83323da8e153c1eaa15e0456 SHA512 cb4409d69fd8582e0af5bb35129fddcdb3915cde289cad4ff149902ceb725d8656fec351609eb634955ef2e97728f2776b60ffd9ab0a2b765fb6ddb2ac385b20
-EBUILD sddm-kcm-5.14.4.ebuild 902 BLAKE2B 1d6711b71cf60cdddc3d0526c50a62074030faf5af9b46b723e1636214ea2542ff3d21346f8147842e6e6e3d7bec66a54b541ddc8d8945fa518ad455eae36b74 SHA512 7a8fe09bfd1c865ca5836f3269a6e0a6b48c31d0c49aa7d97243996832ec1980e4e3ce59e2c5f102b5bc41c1df161a480ed321721360485ffc4481fe82b9531e
+EBUILD sddm-kcm-5.14.5.ebuild 902 BLAKE2B 83f7d5a79008f2746e22cbbe64403de9e9fa8ad76caa357810c16a2de460657ebad0db9edc5e67375ea836dd27cc9dbf156537e0945b1ece2a6e98fd2f0cc6c7 SHA512 718e274effbe28f2f8422955fac048226b3ca952242dec463c9036fa977c8dc0948193991e5d23b9b61e43d86e6d8326d4413a9b71730e38f06d741bc8d6bbe6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.4.ebuild
deleted file mode 100644
index f9f397cf9666..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.14.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-	!kde-misc/sddm-kcm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild
new file mode 100644
index 000000000000..91d4cb64a265
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.14.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libX11
+	x11-libs/libXcursor
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXfixes
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	x11-misc/sddm
+	!kde-misc/sddm-kcm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index edaf55508f4e..fed9fe349842 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.14.3.tar.xz 179616 BLAKE2B 51cc7b15042acd9768345b32b6534b3e7de1160175c40c068b454ce8014ff3222cd40e95c3d82c9223d8b2e7fc952eac18e4934aa62f15392271a4cccfe653a0 SHA512 a6330a0955a5b569600525e4170d413ce0f804ca5ecd4b27383358347f0edefa38cee8ff5fc2b78364781b1f5f125012c68b300db8ec2afea54c5265d8a6c5d7
-DIST systemsettings-5.14.4.tar.xz 179340 BLAKE2B 6c21f9d3231792fd1c0ad044f5df1aacd450bdea0a00bac0bf72cae1d88d0c65ced9fde99e4856a111c186b3bc692a159b33c96ce320b49ec7841ff52f755022 SHA512 1cac862546b5cccef9a269132212a5dcfe370cba5b95f3cd8d5d64333c07e8813a55fe39d6d6d6d1fdfe0f05cd725535e864defd592dcbbde289fb80db670bfd
+DIST systemsettings-5.14.5.tar.xz 179364 BLAKE2B 3f39b5b109a09a08e12612095188879161939c1e47984e9fee1295a0ca5a29f4eb519a2302f6465448eb67f57bc7a8b37201eb67e5302e580dc4ca3db6b03872 SHA512 7d933b73489c60214edfd26d525f3dcbe7eebe1802345f40033010cb96da516491c0a403a8c2318a53593789f1122e8b7c10e17f0d506b6d1a8f58c904b197ff
 EBUILD systemsettings-5.14.3.ebuild 1348 BLAKE2B 756a08b5d7f3e13bc476df8bf880e262accc222d28517b1894dcff15cfc949f5a990d7f16bdf5f4d5bc8c59a6c160a1ae710368afd8b4b79c60349e7459c1296 SHA512 3e48176418d09c94caf0866153395acf9f3be716200715bf838ed7d85de22d1c888f8bb7598f36d6a2c095c439ecddbe4baa3d628fd4de0d52941d46a25df0e9
-EBUILD systemsettings-5.14.4.ebuild 1350 BLAKE2B 1c39131a11e90e9dd1db2e860e004b9d665b4e75d79ae3d8e3767e64f0e90229ac90cf2db5908cac8d02417a323f48415bcd44e6bd9e0c15aa4e9568b1efbf77 SHA512 ef445de99108019be6a96dfa1bacab4bf0ec8dde5aa896a2e3bd806d04509502a8e47733de91a99871a4c251ccd84287baae4abb2bb5069bf6a39c2b49c0b2b6
+EBUILD systemsettings-5.14.5.ebuild 1350 BLAKE2B d7ede7a99d35c1bc2a1909b7efed7789083287b1974746fef49492fd9b5adbd89456357470acb9a9f64ebb169737682029e8f6cb73d84b55d1497d0fb42514be SHA512 580874c39f651bb35310cdb470ea6949a03b2e0e43823aeb3a2875a84cee094b7e83afd16014f70d7894520c219ac2260bfc4fd69cba26d743e4459dd62e122e
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.14.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.4.ebuild
deleted file mode 100644
index 0c360f318bc0..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.14.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="System settings utility"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="classic gtk"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(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 ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/systemsettings:4
-	$(add_frameworks_dep kirigami)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild
new file mode 100644
index 000000000000..d40f3c882be8
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.14.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="System settings utility"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="classic gtk"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(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 ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kpackage)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_plasma_dep libkworkspace)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	classic? ( $(add_frameworks_dep khtml) )
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/systemsettings:4
+	$(add_frameworks_dep kirigami)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package classic KF5KHtml)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 9bf81ba2ba86..cca4d0592d54 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.14.3.tar.xz 546476 BLAKE2B a602da00ab782468645a4d33ba5f5dfbc2b8a61d7c039e7e2736cbc9e4930477f03c9e7e741ff6974c4b58a62d51e7e6f89863f5e48f7be69ffbb5a65362413c SHA512 6b5f2780cbbdad77c546bc27cc5e2a95eb54cba5b46961656026a2fcaf470b9c413450dfbd96f1d5a6f19c480c27a0d7990cfe9bd9717d28a82cb790c8d066c3
-DIST user-manager-5.14.4.tar.xz 545848 BLAKE2B 86fdc4db0608927f45d234f3d54c7211a210c23291b019200765d4482a7712cf1745aba0053e372bff61b09ebfa00caafca8aef0b7f4acadee69bf4e2382a99f SHA512 0d943e9505d07ab27c20d6b9bd714e0bf5bc2626d29bfde81ccaee6062a093be15f670f0fc523f560aa614277d03033e40426c0058be8e7a982422ba0cf6cf23
+DIST user-manager-5.14.5.tar.xz 546088 BLAKE2B 40663446c2c5f7d67c29ef482e9991455eef2d835534d9856e6f6922af3cb16e9580bd37503593b90ffdc5af80b571f555c3aee73f5bba64f615448635f9efbf SHA512 24077a3e834fc63f52b2dfc61a8cdb852601754e914545ca038e2dd058935d8a780ab6240b70b085ca4ef4c36be174305816da8b7040fc6f54705f20ef3c1bb6
 EBUILD user-manager-5.14.3.ebuild 692 BLAKE2B 0a36109e441fc42c07a4046b08afc65a25db0f2b2f47c62b3b4a87ab15d412818ce18777d36adfa1498b99fd83f9461f1ad467b4aeb692f1f7206ff539786b74 SHA512 9926be5b944b20a4cc7a04ac9a39e0788b1a17cfeee0efe4d6d7eb0b1a803ea90292b5f58a0b5c29b4dc1b795828f548e0eb43a7a117322fca4da5c7313aa895
-EBUILD user-manager-5.14.4.ebuild 694 BLAKE2B cef454ae8c7eb463fe520f948942285a3b70975a52b8998161dc909a5a06c74f39934f61af6d3f281a336d6ed2dd6bec518b73a4cc924ecd7c084ab45175514f SHA512 9695f473e4edd249011aab1bbfbb5408dc7dca38aa976ec0336d58d762bc857abcf943effda7161860346e2662cd4e03d7dec4ffb3f5cf60a7ad803952df18ae
+EBUILD user-manager-5.14.5.ebuild 694 BLAKE2B a1efe79760330222237c0bbd3dba9d751beb0f9d3f123d23bd5a08c1316dbb1ade71b1a4bb1ca9cfb007d4f76813b097953ef1190fa4ab43d146c21743326c50 SHA512 55b014f46ac0266e563ed4fd00a9f9f1035798ac8fa1f0cda80089f8a7cc763939b1d22bb9183f72b2d9d82a766fddce62f86dde8ac3033cedc48f3892a969ac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.14.4.ebuild b/kde-plasma/user-manager/user-manager-5.14.4.ebuild
deleted file mode 100644
index 69e0ce78d83e..000000000000
--- a/kde-plasma/user-manager/user-manager-5.14.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.14.5.ebuild b/kde-plasma/user-manager/user-manager-5.14.5.ebuild
new file mode 100644
index 000000000000..719b8b033d88
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.14.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index aaaaf972b1b6..45a7ecdeaad7 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.2-standalone.patch 2006 BLAKE2B 92efa283f3ddcc0997bcdcf082c7d28f0bdb8c40d5689672c1c46fcd9a4637ef7b85562fa06f120ec27a31139fd7e25a6ea89fad37a75f54d92bc417a3b8dcce SHA512 cb1dcffac66b51806b83e2254d0adf00008dd276520babf15a52b58c1d6b4fe7441032c80f968bb1988d7657c2c644041f8dbd20e7d794a22cd7781a252941f2
 DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
-DIST plasma-workspace-5.14.4.tar.xz 4572780 BLAKE2B c0c59acdd4622949ec87e91e827595c048c3f736e27a2f7c649765aee3bbd7ef00ccba7909dd456881bf4cf382adbff3019be2a4f9d098591f8781399aee9902 SHA512 017b2b8d52c243072ffd6b7b4a766ed27d055dae36f6cf9d10e4f06748555680b55ebdae6db07a043b18359c391bf294f0bc0e601f26e5cd12b532fffcb07645
+DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
 EBUILD xembed-sni-proxy-5.14.3.ebuild 1075 BLAKE2B c3d0e8084ebacf4ee31e1447150caee65dcc01227eaceb7cae8b00038e8561e4fc8c0b88d47d759e89a162e862747ed7249db1e21c1f8cf4ae69442304bde6ea SHA512 35d2f49b722f7dbf7c683229258c50e2485720e92e9a515879276cb9c3d97c06236cfc627ae3de7c8401500cde840985249781c8d786f50035001668efe81339
-EBUILD xembed-sni-proxy-5.14.4.ebuild 1077 BLAKE2B c940766e4243540f48db48655122a9a2751e8d23945b8f18ed6d6a3e69d05d8826d539fede617ae413f2698a63770c1fead94f14256f1aa8f709ae3a09db172f SHA512 e467e67964bdd8b9f2d254d358f692866024b7eda8b5f833639943d742b740e9a4b345b079de8f2f73e617bca5e72993753eb135437f6e89621eacbd4462e99c
+EBUILD xembed-sni-proxy-5.14.5.ebuild 1077 BLAKE2B 640760f9c8b881b9774f99cd0f6703166a894480f2007e42c51d0157fe2d3e6bd062aca42815b8da7f1b3ca86f1b624761de4470e62c15518e6582940e97fe29 SHA512 f960102b870c870ac252a177f93f7a00bda8ac7021d11ea46ed23553eb95fe32200acc6b5645a1e665a42b30671442643d8deec370c0badc331a1093e378cec6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.4.ebuild
deleted file mode 100644
index 74322bcb6432..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FRAMEWORKS_MINIMAL="5.50.0"
-QT_MINIMAL="5.9.6"
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/${PV}/" \
-		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
-		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
new file mode 100644
index 000000000000..b141c1e8b942
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.50.0"
+QT_MINIMAL="5.9.6"
+KDE_AUTODEPS="false"
+KMNAME="plasma-workspace"
+inherit kde5
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/${PV}/" \
+		-e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
+		-e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 9cb3103a8370..6b8acf73f3fc 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/lxqt-common/Manifest.gz b/lxqt-base/lxqt-common/Manifest.gz
deleted file mode 100644
index b89ec4bed2eb..000000000000
--- a/lxqt-base/lxqt-common/Manifest.gz
+++ /dev/null
diff --git a/lxqt-base/lxqt-common/metadata.xml b/lxqt-base/lxqt-common/metadata.xml
deleted file mode 100644
index a40a83a9c6a9..000000000000
--- a/lxqt-base/lxqt-common/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>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 07571ae51f25..ead399d0dd21 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index 5a1b99aee88a..68dab3cafa8f 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -3,8 +3,8 @@ DIST cone-0.92.tar.bz2 3774451 BLAKE2B 3686ca90249f38c0be83138bf310802f5a5ea1e06
 DIST cone-0.95.tar.bz2 3748331 BLAKE2B 9461cc28afb255e7ca4080e4c876f5391e916c493b6596b0bfc0ec2d0cedb837d10cbd6904cd49b0b425e5edddd42c123b952725339b7388fb5a2debd72c04c1 SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a
 DIST cone-0.96.tar.bz2 3752115 BLAKE2B d4548083f86adc096534750e69db648d24fc5b643961041df04257d71f4e8af2c3456948f9227e652d2bdc80f65948bf8b543c3eba738187e17d6d9f5c424e28 SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e
 DIST cone-1.0.tar.bz2 3793288 BLAKE2B e2c8aa91adfff77d3f0207a3caca5d13ebae8c9455402c296a98364708acd3d4138ea4642044b2dfe396eaef18c3b90ebf0ef3702bc73351a4317219a4c28863 SHA512 6fc30158cebed62b0598787d53e1936b50a32b6590266e93dbacbd63371d4fa8e43ffe95e0f4ee51991e2d892b26c1531b563203e45108815f05a091b7051161
-EBUILD cone-0.92.ebuild 1205 BLAKE2B 56dddf9144e2a28e656a0926d3eb01114f0c1bd491e295453db4b3d37a8ef5e7eb59f59990dc6ee3373f1bb1c33162e8b01d725afa908e8e4c93108389821cf1 SHA512 35c9ca13e4450fa5e7123989c3e9cdfb078d3de74b415ae55ce262de7180b313cec985cf2fbd2083e4719e54fda43541ea4df44160f2f55cdda558a0b59a0dac
-EBUILD cone-0.95.ebuild 1221 BLAKE2B a9c887d3c02a756b016ef2ef4b494c352414e85562396959d3f2c24dff0db9f2916a62835970b1d5cbe6dabb7f51ae8c43776a286c87be82b790f639098c65a3 SHA512 2f511541c7b2cb23b50ba27ceb51686d0b16eb00e8dfe049f0aa6413153bf4c7b3db6be5c8b3b1d3f1ac6745b6fb779b762e4572e1bec11ae14b99be358876bc
-EBUILD cone-0.96.ebuild 1219 BLAKE2B 6682df0ccda6731aa09ac57254b8837a43e4fdb44892c7c5bc72eee30f85a0d3aab2b4278f20bdd55752cc9b2be89f375e0c20f6a842f5e82f9b10afdb171fac SHA512 3c77e9379cf36d209c29ce202ffdbeb1a1308bc58748d81212865fce2348213c1ec4404642ee57396cf16b625da92b02b8a949241fba73127f535f6be848f5fc
+EBUILD cone-0.92.ebuild 1203 BLAKE2B 8f178b8e745d42a35003db91d7dfa9d1a6972216e98cc041bee1e9c28a60c9c6542efc0dd30924cefcc10de9714dcd3989e72c7c17887a871f9855b0fc602035 SHA512 364fa555ecc58cc312ca4dba20b86cb6a6765591854522e4ee218886d7acf4822a9152c64c31b9c51186487fb86aba737c121961c9fc1e22d0116f6cb70f21ff
+EBUILD cone-0.95.ebuild 1219 BLAKE2B e09eca9f51ebfb0150e0c733e566b2fdd4b6367fa4e5bf1e45c7a76ebaee0d2b4fe50b276f1fb9d18f1aa8bb1fe51b01ef2f3b83b87627037b233ba70439ba6e SHA512 d4d493937662020b042a2792d050747ee8884de0a1c9cb8d7f83b859eca42de48cc81cb4fe9aac9bd0f0334dabcc0065fff002366e655ea9cd75283077f7d444
+EBUILD cone-0.96.ebuild 1217 BLAKE2B 7bbaccc1cdbc9724333cc87c04abe9987a4f1322a803023e3f8ab622f4e8e5798f1ce589221f6da6a88d4ed1e100164aa8efde942280c9b5df77bad2e1c81435 SHA512 861cdbc8e75fb0b68a7a7d97f53dbef80acb1d6ceba1d2ea2345ebca2779af081445dc5d53e5cb4f867ebfec21b93d2ade0d8fcfc0dfe7b4c8bbc371e734e3ab
 EBUILD cone-1.0.ebuild 1714 BLAKE2B 6bf758f20974643d00423919e722d9db6ef32cb31a798c0ab665dd851f7f83e0770451e925a7b469eea37e47013161b15bff9a741556250c6c5fc346f636379c SHA512 565554bd82a108a7fac16981fd3ea61d01f5b2b53ca6e3184a0ab67ee922f1cafb4ee425558f8bd6aa58f763ef066260ddda34a284d3e5ce6a403d974cb6afca
 MISC metadata.xml 321 BLAKE2B 1b4f72d7e3b334f295e2952a680130ec7ab532a2c7ffa4af7a21f7dc0691aa537e90132631e0a10fa6cf1c6f162067aa1e6cafe07343352fdd890b36a09a1018 SHA512 fd5c4e74049cbed26f1c75602a0e7f1e42654c5e179bd90d311f745ce93eecaec21682d77b3fc560cd8876298893a72df195e1b90a20cda3dc2538622d110b6d
diff --git a/mail-client/cone/cone-0.92.ebuild b/mail-client/cone/cone-0.92.ebuild
index 788f47ec24ee..ac1484a77c5f 100644
--- a/mail-client/cone/cone-0.92.ebuild
+++ b/mail-client/cone/cone-0.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="crypt fam gnutls idn ipv6 ldap"
 
-RDEPEND=">=dev-libs/openssl-0.9.6:*
+RDEPEND=">=dev-libs/openssl-0.9.6:0=
 	dev-libs/libxml2
 	sys-libs/ncurses
 	>=net-libs/courier-unicode-1.2
diff --git a/mail-client/cone/cone-0.95.ebuild b/mail-client/cone/cone-0.95.ebuild
index 255538f548c6..612dca33218c 100644
--- a/mail-client/cone/cone-0.95.ebuild
+++ b/mail-client/cone/cone-0.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="crypt fam gnutls idn ipv6 ldap"
 
-RDEPEND=">=dev-libs/openssl-0.9.6:*
+RDEPEND=">=dev-libs/openssl-0.9.6:0=
 	dev-libs/libxml2
 	sys-libs/ncurses:=
 	>=net-libs/courier-unicode-1.2
diff --git a/mail-client/cone/cone-0.96.ebuild b/mail-client/cone/cone-0.96.ebuild
index d3e487679909..8f7516ca655d 100644
--- a/mail-client/cone/cone-0.96.ebuild
+++ b/mail-client/cone/cone-0.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="crypt fam gnutls idn ipv6 ldap"
 
-RDEPEND=">=dev-libs/openssl-0.9.6:*
+RDEPEND=">=dev-libs/openssl-0.9.6:0=
 	dev-libs/libxml2
 	sys-libs/ncurses:=
 	>=net-libs/courier-unicode-2
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index ff4e1fea80d9..1dff33f78500 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,10 +2,11 @@ AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f
 AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
 DIST mutt-1.10.1.tar.gz 4255890 BLAKE2B 2a0e7629c42ba11ec5c3686d9c17e283ed9cb1f9874decec9453cf01ae0780c7993ac0104db7987571f27c04e408c1eff47d3b73918eb9754c253b6249ad48f4 SHA512 13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726
 DIST mutt-1.11.1.tar.gz 4579062 BLAKE2B e0bc0fffbed0f9df36d0773ccc1032d797d2d693f315976ceaf7e21f7d22f027e5b7e857e2c3a1fe90e66f4764235b0394f8f0addf7a310b1a3200812f5c55eb SHA512 dc6cfe5c2aa23650c362a8b9c1a13c0d65902e71f8effd517304f183fcc1d1fddf7df1e0b8be5547b847c75afe3732b198353559e2c947839a009be38b087de0
+DIST mutt-1.11.2.tar.gz 4579279 BLAKE2B 6bb03c14c2a2a13a149d3c333169d69d2844d98d7545abce6fd959761ee19b6be77f0138a7551dabb5e033e635ef08d8d4e810034c9008e30f168fd38a893e99 SHA512 6428ea5decf89ae023533247dbc1b6b492673c6e2a9f7c499e8546a1648e5219bf9e5f52ba252381e9c7c843521853633bc0cd6cf2149f9a972f70e5e06d6f7d
 DIST mutt-gentoo-1.10.1-patches-r0.tar.xz 108396 BLAKE2B 86edca04154f96efce27543326f8610dffba0085c7d69e82a7ac5f48ae9cd6662bcf6afa0e55b3d83ec054ee2eb86dff70b0c15a5170f41cc57887e17a661406 SHA512 1e0675803abc2bc116ef6e726f5009c43b0fb7bbf9bd3141a7cbbded51033695ddcc5228612f228cd19dae4181719e756a85e3fa2c8c9a9a4a9aefb4170bd5f5
-DIST mutt-gentoo-1.10.1-patches-r1.tar.xz 108416 BLAKE2B 22383f7d2f4ad405d6e691104d925b9547897f5bd730b5c573e8ac2d6902b0efa70432db077539122baff8d542964caa6204e6f09c235fe3454c30cf2a72af85 SHA512 ae23ddf13508ab565f6023544add7e2f8cf3d6b2e1cc64aa66f8b38fdabb2c1e3ca17c9b65ffab795428568c1d8eaf088f5dc823d377a9de4773c29bce228a33
-DIST mutt-gentoo-1.11.1-patches-r0.tar.xz 108864 BLAKE2B 22d2fca8395ad0a6aaec8c2ede7acd011408df5c2d71ece29077355ee83ad694440286793f609734b2231e7ce8f9f785ad9f4a3ba8045670971e59addeec7c3e SHA512 ba6923ed11b3d92a71a93e6bb296083648f32fbb0801faa0ac1d4f1ea0fd97fa65eb1abd057bd231f55b7896838c03cd981564ccad0376f38be0a4ce264723be
-EBUILD mutt-1.10.1-r1.ebuild 9194 BLAKE2B da9d4600117ea3feda606c584b80cb2d29d18a978287cdd325443c80edecf7be31cf9e691f9d27dda42ff4faac9caf73181ec57f215207b1e272570e69393c44 SHA512 383bea4158740cbe594b73811b34d5d09668a54852411afc4dea4c1c68dced92158694c6a994df07cdc177b40c06f8d270d77ac7589267c8905c8a11cbe4d196
-EBUILD mutt-1.10.1.ebuild 9186 BLAKE2B c7a021dea37478bfd55c1987cbc3387cbf84e9be2d83441e6e3349a39ff6343ebd8cf7f4d864bb6565ddbf8681175dbc8d052e88aae5b4d886c97d2b00b52e76 SHA512 4531b6ab5e7cde1e90fc155869cd6c5fb102d8b9b2638d23262430fa252eb491d45c06c74666044bbe6e4f4be210f3fc5268f5f7afc901370fab5f4430ff3fe8
-EBUILD mutt-1.11.1.ebuild 9191 BLAKE2B b169430f19d635e93328eac63a1bf1ea6378b8fa104918b384a4d3cb6922b880c970d653be9a4331c04ffc7a0b37f482714ec18ea7bd05cf56071d67ede41ddf SHA512 795e77a1d851dc5f3414cd8088de3221001157128d83bbb5db680ac1c84fc8630aad83c5d02a0f0b04fa43d0740ec6c3df23df64c4a03c2627887937b862d2ec
+DIST mutt-gentoo-1.11.1-patches-r2.tar.xz 107204 BLAKE2B 8064e466b7e1bbf6a6ccea3c1e4749bfd360b5f2a481d2f708ed0eb77dc421dc7c93ac3d4528bd253fb52b1beb91112e8ec38d1ab7c15120e2e854564a592ae5 SHA512 c7ddc28f05062cfbb13d6f385cfe420bb78b57a6b0b871b9bc468c70e4f68f810948cfbafebb88c3d5e5e787bb9432b3f9cad486b22ae6d54023e42144436148
+DIST mutt-gentoo-1.11.2-patches-r1.tar.xz 107784 BLAKE2B b48fba367c0f848cf0d93f6e719da69341a188623c959d0cb2f1f29a258ffa593fba3c5cf374d1825090e1c7e02d3f39b245049e906a0a21bfc1f95af90fd724 SHA512 8ea0743c419fcfea0a5d48feb4b045de6b15e7faba8c5d17ffa28287727dfa4e80abac3272ecc62e965a9a35ef14ff0dc730a63133b97344d0e504697316f29e
+EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
+EBUILD mutt-1.11.1-r2.ebuild 9465 BLAKE2B 51353a7eb0ee7cd6f8e12c5320bbb94693d66c00067f19d5cf74e9b96d6536ba6d83ed01e73d276b3d95dd6ec73a25d232c5f3ad2804c2cec3911839082319b4 SHA512 db08486c09688f4022ddc396aab1a1faab19f8d9ed4838df591c352f3ac166e274ad85b6efa984d3f8b206b78a7ee38128a7bf53f6508816999e7fe3c2be42bb
+EBUILD mutt-1.11.2-r1.ebuild 9465 BLAKE2B 9428dcce9c36e85acab9748da77333f83861fe5ccb3af9aa496b68e819aec1629ba95f6576a4a5988ffb7b6774a45362c9d44206826ea3c1f32b50f06c3c2af6 SHA512 f6a9ed44d57149977e0c1c5199cfbdff9f6bda540a63eb7955413a005cc3901ce4a25e8cb2957c5f4eb2cded95f398ebcc2d71f6befb35880968c26482d5f56c
 MISC metadata.xml 1809 BLAKE2B 55772e2ff845cd7106179138fcb98c96eb4e3b6a40adf43fee91119d0c8608853f10aa1c32cfe44ff6bbde858670411fa78a9ba33cfb9a34d320d3c9f34ad8d9 SHA512 fca920e7ee455ce8991635f46a1badd4f4a191a21fdaffffea78cabfdb556ad23ca3eaed6dc8474b239a7e71d7610590c3df8b697a996fefbf01143c94bfc36a
diff --git a/mail-client/mutt/mutt-1.10.1-r1.ebuild b/mail-client/mutt/mutt-1.10.1-r1.ebuild
deleted file mode 100644
index c23817e7155b..000000000000
--- a/mail-client/mutt/mutt-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r1"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	nntp?             ( ssl )
-	smime?            ( ssl !gnutls )
-	smime_classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp nntp ) )
-	kerberos?         ( || ( imap pop smtp nntp ) )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	notmuch?       ( net-mail/notmuch:= )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	crypt? ( app-crypt/gnupg )
-	pgp_classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		# clumpsy blocks for transition period of USE-flag renames
-		$(use crypt         && use_enable crypt pgp)
-		$(use pgp_classic   && use_enable pgp_classic pgp)
-		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
-
-		$(use smime         && use_enable smime)
-		$(use smime_classic && use_enable smime_classic smime)
-		$(use !smime && use !smime_classic && echo "--disable-smime")
-
-		$(use gpg           && use_enable gpg gpgme)
-		$(use gpgme         && use_enable gpgme)
-		$(use !gpg && use !gpgme && echo "--disable-gpgme")
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-		$(use_enable notmuch)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable nntp)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn)
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--with-regex"
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > mutt.1 || die
-		cp doc/muttrc.man muttrc.5 || die
-		doman mutt.1 muttrc.5
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-	if use crypt || use gpg || use smime ; then
-		ewarn "Please note that the crypto related USE-flags of mutt have changed."
-		ewarn "To remove some unclarity, the following USE-flags are renamed:"
-		ewarn "(see https://bugs.gentoo.org/637176)"
-		ewarn "  crypt -> pgp_classic"
-		ewarn "  gpg   -> gpgme"
-		ewarn "  smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release.  Please update your package.use"
-		if use gpg && ( use crypt || use smime ) ; then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-	if use gpgme ; then
-		ewarn "Note: in order for Mutt to actually use the gpgme backend"
-		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
-		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
-	fi
-}
diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild
index fbd14407b225..2dd27636988e 100644
--- a/mail-client/mutt/mutt-1.10.1.ebuild
+++ b/mail-client/mutt/mutt-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,7 +28,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # yes, we overdepend on the backend impls here, hopefully one day we can
 # have REQUIRED_USE do what it is made for again. bug #607360
 CDEPEND="
diff --git a/mail-client/mutt/mutt-1.11.1-r2.ebuild b/mail-client/mutt/mutt-1.11.1-r2.ebuild
new file mode 100644
index 000000000000..9471fe0aa43d
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.1-r2.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r2"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/637176)"
+		ewarn "  crypt -> pgp_classic"
+		ewarn "  gpg   -> gpgme"
+		ewarn "  smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release.  Please update your package.use"
+		if use gpg && ( use crypt || use smime ) ; then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.11.1.ebuild b/mail-client/mutt/mutt-1.11.1.ebuild
deleted file mode 100644
index 84e3dc40704b..000000000000
--- a/mail-client/mutt/mutt-1.11.1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
-	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
-	imap?             ( ssl )
-	pop?              ( ssl )
-	nntp?             ( ssl )
-	smime?            ( ssl !gnutls )
-	smime_classic?    ( ssl !gnutls )
-	smtp?             ( ssl sasl )
-	sasl?             ( || ( imap pop smtp nntp ) )
-	kerberos?         ( || ( imap pop smtp nntp ) )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
-	app-misc/mime-types
-
-	berkdb?        ( >=sys-libs/db-4:= )
-	gdbm?          ( sys-libs/gdbm )
-	lmdb?          ( dev-db/lmdb:= )
-	qdbm?          ( dev-db/qdbm )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-
-	ssl? (
-		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
-		!gnutls? (
-			libressl? ( dev-libs/libressl:= )
-			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-		)
-	)
-
-	nls?           ( virtual/libintl )
-	sasl?          ( >=dev-libs/cyrus-sasl-2 )
-	kerberos?      ( virtual/krb5 )
-	idn?           ( net-dns/libidn2 )
-	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
-	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
-	notmuch?       ( net-mail/notmuch:= )
-	slang?         ( sys-libs/slang )
-	!slang?        ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
-	crypt? ( app-crypt/gnupg )
-	pgp_classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
-	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
-	if use !vanilla ; then
-		# apply patches
-		export EPATCH_FORCE="yes"
-		export EPATCH_SUFFIX="patch"
-		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
-		local patches=(
-			patches-mutt
-			bugs-gentoo
-			features-common
-			features-extra
-			gentoo
-		)
-		local patchset
-		for patchset in "${patches[@]}" ; do
-			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
-			einfo "Patches for ${PATCHSET} patchset ${patchset}"
-			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
-				|| die "patchset ${patchset} failed"
-		done
-		# add some explanation as to why not to go upstream
-		sed -i \
-			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
-			main.c || die "Failed to add bug instructions"
-	fi
-
-	local upatches=
-	# allow user patches
-	eapply_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	local patchset=
-	use vanilla || patchset=", ${PATCHSET}"
-	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# signing and encryption
-		# clumpsy blocks for transition period of USE-flag renames
-		$(use crypt         && use_enable crypt pgp)
-		$(use pgp_classic   && use_enable pgp_classic pgp)
-		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
-
-		$(use smime         && use_enable smime)
-		$(use smime_classic && use_enable smime_classic smime)
-		$(use !smime && use !smime_classic && echo "--disable-smime")
-
-		$(use gpg           && use_enable gpg gpgme)
-		$(use gpgme         && use_enable gpgme)
-		$(use !gpg && use !gpgme && echo "--disable-gpgme")
-
-		# features
-		$(use_enable debug)
-		$(use_enable doc)
-		$(use_enable nls)
-		$(use_enable notmuch)
-
-		# protocols
-		$(use_enable imap)
-		$(use_enable pop)
-		$(use_enable nntp)
-		$(use_enable smtp)
-
-		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
-		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
-		$(use !ssl &&                echo --without-gnutls --without-ssl)
-
-		$(use_with sasl)
-		$(use_with idn)
-		$(use_with kerberos gss)
-		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
-		"$(use_with !slang curses "${EPREFIX}"/usr)"
-
-		"--enable-compressed"
-		"--enable-external-dotlock"
-		"--enable-nfs-fix"
-		"--enable-sidebar"
-		"--sysconfdir=${EPREFIX}/etc/${PN}"
-		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		"--with-regex"
-		"--with-exec-shell=${EPREFIX}/bin/sh"
-	)
-
-	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
-		# arrows in index view do not show when using wchar_t
-		# or misalign due to wrong computations
-		myconf+=( "--without-wc-funcs" )
-	fi
-
-	# note: REQUIRED_USE should have selected only one of these, but for
-	# bug #607360 we're forced to allow multiple.  For that reason, this
-	# list is ordered to preference, and only the first is taken.
-	local hcaches=(
-		"lmdb"
-		"qdbm"
-		"tokyocabinet"
-		"gdbm"
-		"berkdb:bdb"
-	)
-	local ucache hcache lcache
-	for hcache in "${hcaches[@]}" ; do
-		if use ${hcache%%:*} ; then
-			ucache=${hcache}
-			break
-		fi
-	done
-	if [[ -n ${ucache} ]] ; then
-		myconf+=( "--enable-hcache" )
-	else
-		myconf+=( "--disable-hcache" )
-	fi
-	for hcache in "${hcaches[@]}" ; do
-		[[ ${hcache} == ${ucache} ]] \
-			&& myconf+=( "--with-${hcache#*:}" ) \
-			|| myconf+=( "--without-${hcache#*:}" )
-	done
-
-	if use mbox; then
-		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
-	else
-		myconf+=( "--with-homespool=Maildir" )
-	fi
-
-	econf "${myconf[@]}" || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > mutt.1 || die
-		cp doc/muttrc.man muttrc.5 || die
-		doman mutt.1 muttrc.5
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-	if use crypt || use gpg || use smime ; then
-		ewarn "Please note that the crypto related USE-flags of mutt have changed."
-		ewarn "To remove some unclarity, the following USE-flags are renamed:"
-		ewarn "(see https://bugs.gentoo.org/637176)"
-		ewarn "  crypt -> pgp_classic"
-		ewarn "  gpg   -> gpgme"
-		ewarn "  smime -> smime_classic"
-		ewarn "The old USE flags still work but their use is deprecated and will"
-		ewarn "be removed in a future release.  Please update your package.use"
-		if use gpg && ( use crypt || use smime ) ; then
-			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
-			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
-			ewarn "  and smime_classic (old smime) from your USE-flags and"
-			ewarn "  only enable gpgme."
-		fi
-	fi
-	if use gpgme ; then
-		ewarn "Note: in order for Mutt to actually use the gpgme backend"
-		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
-		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
-	fi
-}
diff --git a/mail-client/mutt/mutt-1.11.2-r1.ebuild b/mail-client/mutt/mutt-1.11.2-r1.ebuild
new file mode 100644
index 000000000000..a33f730ccdb5
--- /dev/null
+++ b/mail-client/mutt/mutt-1.11.2-r1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic autotools
+
+PATCHREV="r1"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+	hcache?           ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+	imap?             ( ssl )
+	pop?              ( ssl )
+	nntp?             ( ssl )
+	smime?            ( ssl !gnutls )
+	smime_classic?    ( ssl !gnutls )
+	smtp?             ( ssl sasl )
+	sasl?             ( || ( imap pop smtp nntp ) )
+	kerberos?         ( || ( imap pop smtp nntp ) )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+	app-misc/mime-types
+	virtual/libiconv
+
+	berkdb?        ( >=sys-libs/db-4:= )
+	gdbm?          ( sys-libs/gdbm )
+	lmdb?          ( dev-db/lmdb:= )
+	qdbm?          ( dev-db/qdbm )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+
+	ssl? (
+		gnutls?    ( >=net-libs/gnutls-1.0.17:= )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:= )
+			!libressl? ( >=dev-libs/openssl-0.9.6:0= )
+		)
+	)
+
+	nls?           ( virtual/libintl )
+	sasl?          ( >=dev-libs/cyrus-sasl-2 )
+	kerberos?      ( virtual/krb5 )
+	idn?           ( net-dns/libidn2 )
+	gpg?           ( >=app-crypt/gpgme-0.9.0:= )
+	gpgme?         ( >=app-crypt/gpgme-0.9.0:= )
+	notmuch?       ( net-mail/notmuch:= )
+	slang?         ( sys-libs/slang )
+	!slang?        ( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+	smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
+	crypt? ( app-crypt/gnupg )
+	pgp_classic? ( app-crypt/gnupg )
+"
+
+src_prepare() {
+	local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
+
+	if use !vanilla ; then
+		# apply patches
+		export EPATCH_FORCE="yes"
+		export EPATCH_SUFFIX="patch"
+		# http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
+		local patches=(
+			patches-mutt
+			bugs-gentoo
+			features-common
+			features-extra
+			gentoo
+		)
+		local patchset
+		for patchset in "${patches[@]}" ; do
+			[[ -d "${PATCHDIR}/${patchset}" ]] || continue
+			einfo "Patches for ${PATCHSET} patchset ${patchset}"
+			EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
+				|| die "patchset ${patchset} failed"
+		done
+		# add some explanation as to why not to go upstream
+		sed -i \
+			-e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
+			main.c || die "Failed to add bug instructions"
+	fi
+
+	local upatches=
+	# allow user patches
+	eapply_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	local patchset=
+	use vanilla || patchset=", ${PATCHSET}"
+	sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# signing and encryption
+		# clumpsy blocks for transition period of USE-flag renames
+		$(use crypt         && use_enable crypt pgp)
+		$(use pgp_classic   && use_enable pgp_classic pgp)
+		$(use !crypt && use !pgp_classic && echo "--disable-pgp")
+
+		$(use smime         && use_enable smime)
+		$(use smime_classic && use_enable smime_classic smime)
+		$(use !smime && use !smime_classic && echo "--disable-smime")
+
+		$(use gpg           && use_enable gpg gpgme)
+		$(use gpgme         && use_enable gpgme)
+		$(use !gpg && use !gpgme && echo "--disable-gpgme")
+
+		# features
+		$(use_enable debug)
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable notmuch)
+
+		# protocols
+		$(use_enable imap)
+		$(use_enable pop)
+		$(use_enable nntp)
+		$(use_enable smtp)
+
+		$(use  ssl && use  gnutls && echo --with-gnutls    --without-ssl)
+		$(use  ssl && use !gnutls && echo --without-gnutls --with-ssl   )
+		$(use !ssl &&                echo --without-gnutls --without-ssl)
+
+		$(use_with sasl)
+		$(use_with idn idn2) --without-idn  # avoid automagic libidn dep
+		$(use_with kerberos gss)
+		"$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
+		"$(use_with !slang curses "${EPREFIX}"/usr)"
+
+		"--enable-compressed"
+		"--enable-external-dotlock"
+		"--enable-iconv"
+		"--enable-nfs-fix"
+		"--enable-sidebar"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		"--with-regex"
+		"--with-exec-shell=${EPREFIX}/bin/sh"
+	)
+
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
+		# arrows in index view do not show when using wchar_t
+		# or misalign due to wrong computations
+		myconf+=( "--without-wc-funcs" )
+	fi
+
+	# note: REQUIRED_USE should have selected only one of these, but for
+	# bug #607360 we're forced to allow multiple.  For that reason, this
+	# list is ordered to preference, and only the first is taken.
+	local hcaches=(
+		"lmdb"
+		"qdbm"
+		"tokyocabinet"
+		"gdbm"
+		"berkdb:bdb"
+	)
+	local ucache hcache lcache
+	for hcache in "${hcaches[@]}" ; do
+		if use ${hcache%%:*} ; then
+			ucache=${hcache}
+			break
+		fi
+	done
+	if [[ -n ${ucache} ]] ; then
+		myconf+=( "--enable-hcache" )
+	else
+		myconf+=( "--disable-hcache" )
+	fi
+	for hcache in "${hcaches[@]}" ; do
+		[[ ${hcache} == ${ucache} ]] \
+			&& myconf+=( "--with-${hcache#*:}" ) \
+			|| myconf+=( "--without-${hcache#*:}" )
+	done
+
+	if use mbox; then
+		myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
+	else
+		myconf+=( "--with-homespool=Maildir" )
+	fi
+
+	econf "${myconf[@]}" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym "${EPREFIX}"/etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1 || die
+		cp doc/muttrc.man muttrc.5 || die
+		doman mutt.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	else
+		ewarn "This release removes the conditional date feature in favour"
+		ewarn "of Dynamic \$index_format Content, see:"
+		ewarn "  http://www.mutt.org/doc/manual/#index-format-hook"
+	fi
+	if use crypt || use gpg || use smime ; then
+		ewarn "Please note that the crypto related USE-flags of mutt have changed."
+		ewarn "To remove some unclarity, the following USE-flags are renamed:"
+		ewarn "(see https://bugs.gentoo.org/637176)"
+		ewarn "  crypt -> pgp_classic"
+		ewarn "  gpg   -> gpgme"
+		ewarn "  smime -> smime_classic"
+		ewarn "The old USE flags still work but their use is deprecated and will"
+		ewarn "be removed in a future release.  Please update your package.use"
+		if use gpg && ( use crypt || use smime ) ; then
+			ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+			ewarn "  support.  You can probably remove pgp_classic (old crypt)"
+			ewarn "  and smime_classic (old smime) from your USE-flags and"
+			ewarn "  only enable gpgme."
+		fi
+	fi
+	if use gpgme ; then
+		ewarn "Note: in order for Mutt to actually use the gpgme backend"
+		ewarn "      you MUST include 'set crypt_use_gpgme=yes' in .muttrc"
+		ewarn "      https://dev.mutt.org/doc/manual.html#crypt-use-gpgme"
+	fi
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ec56d77c921a..7778c9971055 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 463ad132a0b9..8db1cf030f3c 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -11,6 +11,5 @@ AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca0
 DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
 EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a
-EBUILD amavisd-new-2.11.1-r1.ebuild 4949 BLAKE2B f0dc3dd57190d24752fe09be30b3c9299e7fdb591347548adea000b2ab2f8a5bc7b6ec66f76eb6046da4bd1857e2f7e6e017899fb466d9ea784dec2481a44308 SHA512 57cb159e9e4da2b6e2393039c85bbd534b275744cb435b0879bee2a3fcf41a86531e154be591281c4e51c066de52a1a75259fcc988de1582e7d1db0156f0db56
-EBUILD amavisd-new-2.11.1-r2.ebuild 5220 BLAKE2B b0488be1475b10b25582a3b020a8a8517c5e9062eb7ddcfd4790e3b36f29e8c0b8893f9183436ba0021d1507a11e73347bc537179bf9d281d5eb1c2938f894ae SHA512 12dbe4d2b83a4c12c98170224ba69f4c3d16d65db6c761beb5400f3c6709da8e0b71c24e1b9dd859dcb0728d92b727276f16e1de0d676db3a4418e6f59d985c0
+EBUILD amavisd-new-2.11.1-r3.ebuild 5203 BLAKE2B a36ab3dd37f5d1a49a8ac2acb0e43568d837bf238d2d4380c925f32d8ce7b69e73bcb59b4ee8ee234aa8ae29a2768c6af6bb1eea8905ffddd1a3cd1ad01daa64 SHA512 271ed5e8d12f8c71fc12738f5c69419d2b166de3afd53d7f9f34d02356cc3cd7d07c665ad2226d45d327952d9bba069e09b8a4d55ca9879157b968e09f96480a
 MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
deleted file mode 100644
index d436def3bdbe..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
-PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.10.0"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/Net-Server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	dev-perl/Net-LibIDN
-	dev-perl/File-LibMagic
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/perl-File-Temp
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-${P}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
-	# see https://bugs.gentoo.org/603582
-	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
-
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-			"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer amavisd-status
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
-		dodoc AMAVIS-MIB.txt
-		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema ${PN}.schema || die
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dodoc -r README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
deleted file mode 100644
index 1767bdefc4a6..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="High-performance interface between the MTA and content checkers"
-HOMEPAGE="https://gitlab.com/amavis/amavis"
-SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.10.0"
-
-RDEPEND="${DEPEND}
-	>=sys-apps/coreutils-5.0-r3
-	app-arch/cpio
-	app-arch/gzip
-	app-arch/bzip2
-	app-arch/arc
-	app-arch/cabextract
-	app-arch/freeze
-	app-arch/lha
-	app-arch/lrzip
-	app-arch/lzop
-	app-arch/ncompress
-	app-arch/p7zip
-	app-arch/pax
-	app-arch/unarj
-	app-arch/unrar
-	app-arch/xz-utils
-	app-arch/zoo
-	net-mail/ripole
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	net-mail/tnef
-	virtual/perl-MIME-Base64
-	>=dev-perl/MIME-tools-5.415
-	>=dev-perl/MailTools-1.58
-	>=dev-perl/Net-Server-0.91
-	virtual/perl-Digest-MD5
-	dev-perl/IO-stringy
-	virtual/perl-IO-Socket-IP
-	>=virtual/perl-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	dev-perl/Net-LibIDN
-	dev-perl/File-LibMagic
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/perl-File-Temp
-	dev-perl/Net-SSLeay
-	dev-perl/IO-Socket-SSL
-	virtual/mta
-	clamav? ( app-antivirus/clamav )
-	ldap? ( >=dev-perl/perl-ldap-0.33 )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	razor? ( mail-filter/razor )
-	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/amavis-${P}"
-
-pkg_setup() {
-	# Create the user beforehand so that we can install the config file
-	# (and some directories) with group "amavis" in src_install().
-	enewgroup amavis
-	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
-}
-
-src_prepare() {
-	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
-	# see https://bugs.gentoo.org/603582
-	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
-
-	if use courier ; then
-		eapply -p0 amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		eapply -p0 amavisd-new-qmqpqq.patch
-	fi
-
-	# We need to fix the daemon_user and daemon_group in amavis-mc even
-	# though we're going to run it in the foreground, because it calls
-	# "drop_priv" unconditionally and will crash if its user/group
-	# doesn't exist.
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file - dkim"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
-			|| die "missing conf file - zmq"
-	fi
-
-	if ! use spamassassin ; then
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-			"${S}/amavisd.conf" || die "missing conf file - sa"
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
-				 amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-
-		if use zmq ; then
-			dosbin amavisd-snmp-subagent-zmq
-			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
-					 amavisd-snmp-subagent-zmq
-		fi
-	fi
-
-	if use zmq ; then
-		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
-	fi
-
-	if use ldap ; then
-		dodir /etc/openldap/schema
-		insinto /etc/openldap/schema
-		newins LDAP.schema "${PN}.schema"
-	fi
-
-	# The config file should be root:amavis so that the amavis user can
-	# read (only) it after dropping privileges. And of course he should
-	# own everything in his home directory.
-	insinto /etc
-	insopts -m0640 -g amavis
-	doins amavisd.conf
-
-	# Implementation detail? Keepdir calls dodir under the hood.
-	diropts -o amavis -g amavis
-	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
-
-	# BEWARE:
-	#
-	# Anything below this line is using the mangled insopts/diropts from
-	# above!
-	#
-
-	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
-
-	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
-
-	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
-		amavisd.conf-default amavisd-custom.conf
-
-	docinto README_FILES
-	dodoc README_FILES/README*
-	dodoc -r README_FILES/*.{html,css}
-	docinto README_FILES/images
-	dodoc README_FILES/images/*.png
-	docinto README_FILES/images/callouts
-	dodoc README_FILES/images/callouts/*.png
-
-	docinto test-messages
-	dodoc test-messages/README
-	dodoc test-messages/sample.tar.gz.compl
-}
-
-pkg_preinst() {
-	# TODO: the following is done as root, but should probably be done
-	# as the amavis user.
-	if use razor ; then
-		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
-			elog "Setting up initial razor config files..."
-
-			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
-			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
-		fi
-	fi
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
new file mode 100644
index 000000000000..fb89008a1ca2
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/perl-5.10.0"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/cabextract
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	net-mail/ripole
+	>=dev-perl/Archive-Zip-1.14
+	>=virtual/perl-IO-Compress-1.35
+	>=virtual/perl-Compress-Raw-Zlib-2.017
+	net-mail/tnef
+	virtual/perl-MIME-Base64
+	>=dev-perl/MIME-tools-5.415
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/Net-Server-0.91
+	virtual/perl-Digest-MD5
+	dev-perl/IO-stringy
+	virtual/perl-IO-Socket-IP
+	>=virtual/perl-Time-HiRes-1.49
+	dev-perl/Unix-Syslog
+	dev-perl/Net-LibIDN
+	dev-perl/File-LibMagic
+	>=sys-libs/db-4.4.20
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	>=dev-perl/Mail-DKIM-0.31
+	virtual/perl-File-Temp
+	dev-perl/Net-SSLeay
+	dev-perl/IO-Socket-SSL
+	virtual/mta
+	clamav? ( app-antivirus/clamav )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	razor? ( mail-filter/razor )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/amavis-${P}"
+
+pkg_setup() {
+	# Create the user beforehand so that we can install the config file
+	# (and some directories) with group "amavis" in src_install().
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
+
+src_prepare() {
+	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
+	# see https://bugs.gentoo.org/603582
+	eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
+
+	if use courier ; then
+		eapply -p0 amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		eapply -p0 amavisd-new-qmqpqq.patch
+	fi
+
+	# We need to fix the daemon_user and daemon_group in amavis-mc even
+	# though we're going to run it in the foreground, because it calls
+	# "drop_priv" unconditionally and will crash if its user/group
+	# doesn't exist.
+	sed -i  \
+		-e '/daemon/s/vscan/amavis/' \
+		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+		"${S}/amavisd.conf" "${S}/amavis-mc" || die "missing conf file"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if use zmq ; then
+		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+			|| die "missing conf file - zmq"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+			"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
+				 amavisd-snmp-subagent
+		dodoc AMAVIS-MIB.txt
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
+	fi
+
+	if use zmq ; then
+		dosbin amavis-services amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
+	fi
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		newins LDAP.schema "${PN}.schema"
+	fi
+
+	# The config file should be root:amavis so that the amavis user can
+	# read (only) it after dropping privileges. And of course he should
+	# own everything in his home directory.
+	insinto /etc
+	insopts -m0640 -g amavis
+	doins amavisd.conf
+
+	# Implementation detail? Keepdir calls dodir under the hood.
+	diropts -o amavis -g amavis
+	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
+
+	# BEWARE:
+	#
+	# Anything below this line is using the mangled insopts/diropts from
+	# above!
+	#
+
+	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
+
+	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
+
+	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+		amavisd.conf-default amavisd-custom.conf
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dodoc -r README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+}
+
+pkg_preinst() {
+	# TODO: the following is done as root, but should probably be done
+	# as the amavis user.
+	if use razor ; then
+		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+			elog "Setting up initial razor config files..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+}
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index e64ae8a892e1..d2418bb7f6fd 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,5 +4,5 @@ AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc962
 DIST dcc-1.3.154.tar.Z 1711292 BLAKE2B 3e53488e718b13a1c36c1531f552ee811f42b274f4c24f26b484bd2b184fa3c34e0241be82aad1f6fa1a7a485fc172efdfea1dd7938fe190d9bbffa711f20abf SHA512 703bd3de44ccff3f318239dc2ca26a285f83ae0340a91391bcc5b719c298e77c8122d1502665350ddfc9fb14f12d9b6a56cba422ff8985db9cee6c91091fb987
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.154.ebuild 4358 BLAKE2B 0e3b69bf36dc2a6f8f58eac9638c76648b825a2d9deee643e1a4ae174b34ce150a885fc115284aad0dc817743355f07bb450a75e62b5942172fc6d812c943c37 SHA512 d22050cdf0e5ab84a524c62e3752faa5a2bd986a57ee3ac643f56bf8ff5c7501b396d9a81f3788652e4f0c3229ae9c5bb7a45646bc903fac7b636670a0748508
-EBUILD dcc-1.3.158.ebuild 4355 BLAKE2B db260571a46aed8ade1ffcc14ccf3ab77eb729eef6bdac34c92005087e26052793ad53ff355279ef7c7841b4d9d4dfe7124a155a4845828d5abcd64845b487ca SHA512 e74657b3ac0746564ac784de51f21306ec6765408a0ae4c04a09e5c027efad0d80e03430c991f87f03ca91a6fa8e5dbdedb51b32f82dd1e8325e832d62f672e7
+EBUILD dcc-1.3.158.ebuild 4351 BLAKE2B e95eb22145d2e7af6a5cb8cccedce16ffd5965e3334dd7f90e829c504ceb54ffb89f373d16e4ae2cd78a3a8336b0d28e42508849e022a3bd333eb70794fb68ec SHA512 7934e9494707f325e8836d3be51b329590f4439ea72076a5589a2ffdccbd2128cdd14e19d7286eeb712d85cbd2d54681bf219922919483bca2de16de22ed853b
 MISC metadata.xml 417 BLAKE2B b1228d8060b3a3ce26e0a301089873d253bdee3e4e5fa785db1aef00528dbf3b786d3f2acd0d810b707fca436384cf26e67b5cfad63c912d3e6ae5cc374562e8 SHA512 8a17fc0c9502d8e21389a520cba60b482593a89064fb913a87b1c4fc73d20f0652948f848c803f22923a0873ed213025db2663effa584c800a9fe6b3a29f9339
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 80d5dcb71c67..e007b2d85ba1 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 62ef2fa87893..9feac3510616 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -2,5 +2,5 @@ AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
 EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r3.ebuild 1931 BLAKE2B fec3907fd7080e4269f09168e92b1e604c2c83d22fa4acae9aa36e8939205807e7ff50a887d55f5b5a57455a5accd2fb5b2b903d3efb65afa025145941692a86 SHA512 fe2aa744f937f40f8be53c48a902f5c4711cf5f8ea7261a5bfaea30d39c2bec960cd4d74d3404de0a93ebf2ce9185f346e61b40e18728d876698964069fee833
+EBUILD gld-1.7-r3.ebuild 1929 BLAKE2B c2a3e3266e8c292a02287aa57899cb59a4e8945c54db46902b55f1c1d6959cdd7ea740b7977f6bcb00a81f910a206c26f5ecc10fa02de71c991fd9b17241d89a SHA512 7bd8f2401b6fb94bcfb98cb0b8bad2ed89e76df04f0fee17e738c574a823021f533811961889cce7778b05cf2b333e34d36fea71b241164e6d045272cce75f9e
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/mail-filter/gld/gld-1.7-r3.ebuild b/mail-filter/gld/gld-1.7-r3.ebuild
index 24fe380c91f3..90926c4222af 100644
--- a/mail-filter/gld/gld-1.7-r3.ebuild
+++ b/mail-filter/gld/gld-1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libressl postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	!postgres? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:*[server] )"
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 22d8339e4d36..2588a6a04a2d 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,8 +1,8 @@
 DIST imapfilter-2.5.4.tar.gz 52585 BLAKE2B c23ace9d5c4642ea7455406886dc0a045bb954d6edfa92e9c14b08b9f4500a1b9b3d566b3fef0967a920766f200d30bd8810f18ad6584e27177845243bcf4140 SHA512 33d8cc822a4ccd02ede6df7f30b5d2893088b352b9d1900df6597fd6443ae51ceb9ff22cd0100f9ec9e28dc84ac294bb717e0a85c4670677dfb09b5e5da76915
 DIST imapfilter-2.5.6.tar.gz 53579 BLAKE2B a62900f29d6a1056985e41e4ba4d36c193ef2cbe44c870f2e6b5d2fe012320c5d872605f579149b1e5b4ba2f96ebc823f8a5e7df795b29415fe76ca8388a381e SHA512 98bca5cea00cdbbd0bcb3b98c381ae75ec43a3b6651a171cce47df38948d6d7f043f5bd6f42c8f9e30297db17f5d542bb0174dfbd46fc83d25cb5ea6e60d962c
 DIST imapfilter-2.5.7.tar.gz 54861 BLAKE2B 24c8fdd32c946cd446fa8fc0aa6bc855c82ddb7cabacae6537b98a4a02a39531d74d5137893f1718fa031de73debe04778f54540c4130877d1e9300022db4121 SHA512 9297e98812312fbf2c92aa5477bdfecb522048e45b4bc4922e312bd89a72b020a98f5547e3f0882ae665c24db21e6995eda839b762947adc48bc413ab0c882f1
-EBUILD imapfilter-2.5.4.ebuild 793 BLAKE2B 8d3dd760bed913f82a8cc0c1e8d58455c0a2d3c17f0a660e8cd83c857231183f18eb430177328c5e49ddeef8e7a90585a75f7dd724b62ace00128c7629644b7d SHA512 8f6fd50fabb3e7996c4c5ffc8a3de5506b45320cf60ddf9761fa0d51f8ba15959a2a696279449bdabf6f328ac048dc894f42cb0c776b3b92801e512d5cd9d706
-EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B 7cdd82c5f306c48de016846dfdb7cb952c63d96c278a226d89400f3500ebb67d23e34c12db5cf324de5b691780627b3015d757f7016beed94f22e9acf166b955 SHA512 6c0d6b884e3993f06cc16d9d8fe7085397f80233262163fe5f1642924511cbe1bcf2152bb1ae250ec0520e844530dbf66d5de7d4313789989be407728057c3b1
-EBUILD imapfilter-2.5.7-r1.ebuild 879 BLAKE2B f8a33d644ff8e3c8d601a576f5a470008f701b1e67aac3301c73383165d382c8d66e7795616e8d8dab3b040318675e747d7eb6a6e045aefd0507ca734c7e2cde SHA512 e139264c30735ce0f57f89b07dc91abb926726a6fa3418fb2001a3e3dc41b9fa1ba13a99f4ee7493772cae36806b4fe86187e86c9648fa203145e4ec5baabab6
-EBUILD imapfilter-2.5.7.ebuild 812 BLAKE2B a8b2d8e5a9ae68d69ecd5068725401c9982dde795fdb75aeb9496cab3a392e6a92f3e658ee1027f336eb6a7dabb4d3b6c6c990825717801c191914f6cea44210 SHA512 6d7fac38d8383bcc8b184fadf6e9a9e86c6278dc16e18f88eda5e21c4acfab1a16749ae206f376a42082030254eea466697ae0468d912c69722c6161aeaae501
+EBUILD imapfilter-2.5.4.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
+EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
+EBUILD imapfilter-2.5.7-r1.ebuild 877 BLAKE2B df18f8c5ebee719cc1c858d6d1a46eedc063acd013f00929f5e28789f3c055fc6179494e8b2b15a113ab9aa37e58c6405c3ca232fdc38a340013678ff7a8c10e SHA512 690908c780a1a8c6cfd2515623ea495a23e0c62a305f83a53f82ff54951aeff5c792a80232d15ce1fe4c1166f8ccdf4168aeef8066798734a8879d58ac487d54
+EBUILD imapfilter-2.5.7.ebuild 810 BLAKE2B 6497e07d3def2c187cb91678444b5f4a510363dda35fef39fc7d1632a458ecf88bf98fe3bc2d8da3aef64f811d18bb0f578c749c1e27e61bd532752456421735 SHA512 c597b163d3e81ce0a468cde8eb8448bad789053bf5b935df035d55c964b1f67145f5befde51bd01b8821a07a36c06097b771435728df7b3e8bd3da5327afd9f6
 MISC metadata.xml 326 BLAKE2B 543654a3c3b9467c7cfb7bffc75022a9d37256e98cdcb57e6bf6f6249ba26caad17d1bfa4d1e58921ebc3947011e4c9f994477ba1105cef2bab2a5a26b503f81 SHA512 6165c1ddbb6368df4efcb1eae82e454df078865810366c7f62dabd3c84eb426f18208b49cc02d54acc9961e7ff4a0d4b825b720386d80122662b1ed98ecfd936
diff --git a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
index ef51fa3defeb..78c29f258103 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild b/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
index 57e302b6f299..78c29f258103 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	>=dev-lang/lua-5.1"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
index 65f218891503..e0489a8fead9 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libressl"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	dev-libs/libpcre
 	dev-lang/lua:*"
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
index 3f0bcd1d9fc3..790a22454336 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="dev-libs/openssl:0
+RDEPEND="dev-libs/openssl:0=
 	dev-libs/libpcre
 	dev-lang/lua:*"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest
index b41d84d8f5d1..a3c4eee7643a 100644
--- a/mail-filter/libdkim/Manifest
+++ b/mail-filter/libdkim/Manifest
@@ -10,6 +10,6 @@ AUX patches/fix_warnings.patch 9483 BLAKE2B 8a0eb57a22712348adcadb7fb09f4375f9c1
 AUX patches/series 34 BLAKE2B 8975814e5d91240964865f029c4e1b985b95796b20c6bd49a6e7213b0bf36a9a68cf68fdd444511ff9f6a27489844ce8804aaa1c6ead4a7e7a4f8ed6a8bd9cad SHA512 d2ba14924b9d56a2fb92ced7cc3186f061b0c9f4a7f3c6976e5051ac459998413667d7d5d7352eb05561f0f711fa104d78c7bbb47c193a383a9a5ce4ba6f44d0
 AUX patches/strtok_r.patch 3378 BLAKE2B f245cb047e8699084a25f1389834c0a2730bf09d013d038a8a539937336622259fd34c363c8671639150eab8c3d61784c9920e05227b3b92be6fc23967743a61 SHA512 ef6e5576ab1158e1bc05dfa20e686462e09461da870a41557d736848ea876c449e4064e7e44ba2e64647538c03208eaee06389f050feaa07cc615d547f7e061b
 DIST libdkim-1.0.21.zip 55049 BLAKE2B f7481bc41a2f43357a67aa9f6e251634f1c2850fd1dfe3c4a4e0ea64341a3625ff0e393e039d679784c8c1ce349ee7063511f988ff6cf6d5b7acfc7c9633f9da SHA512 3996c64398151dc9c07d357e8f3ac9b94e3c8d06ce5d83ebbe546416f361349d869b0b73216f28d0b732319731f31e61afd9eab0f540471760b944a90130a094
-EBUILD libdkim-1.0.21-r3.ebuild 1159 BLAKE2B 4005bbb6ac5b6cefe2ccb057e37d6fc16061987d123eaa6591be5de5bf389b482d627731a861aa0fcbe99e0a133d9637d4a5b89133d7b7f722b804b140521778 SHA512 439632cb76e30aa54834ae9a36d8e909100281d4d6f43700ff0ab61f61d7385f519a1ec45fd0d7c39cf47efc59eb6125ab70d212725d2d8cce92841f3b6663d4
+EBUILD libdkim-1.0.21-r3.ebuild 1157 BLAKE2B 240cc29463de8eaeb956368ca5af6f9161fc81bec9102744b1c91b81e89c6ddcf923ffa229ed282a09b7fff4d35a9033b66c57eeaacb9a00b38b786ee1bfe8c3 SHA512 883f7771388d591b3b64a132088b56abf5f40406252f856cb8fbcd2610bf6cee0c42192a9cb498bda62d2ea80bd302939876a49eabc198953e8d446c04b66101
 EBUILD libdkim-1.0.21-r4.ebuild 1078 BLAKE2B d381feec1ff7b56cf0750516318dd25f14956a836406c632bef830247849d9822423e2f37ed7863e26a62e2cf68e9a8c2af9f85802d3a454af58946e4a5c503a SHA512 790c84a98900be44aa11bed8f3b7e1f95db049b6fc4f685ae99085a1332898fc1789817585174ae7e880908184d84488fbd31dafb6ad21351b17207abfc3bcc3
 MISC metadata.xml 249 BLAKE2B 84210e21cccad244171f7fc855596c16abacf300aec5087825ccdfd4245a2a04f46dc99fbad2ae1998071511941f89380089cb1bf4d9e80111ecac1a5f157a03 SHA512 a2be284cf2f4e9a6c84979c88c89dc591d63b1c9093f63a72e96c7a725660467e69f780a7e6e586ec8e2665a8ae1b687cdec7cf79c16fbbd693dc5156c3f413b
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
index 86a1e2d444f9..d6a2a309bf8d 100644
--- a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
+++ b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="libressl static-libs"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0 )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	app-arch/unzip"
 RDEPEND="
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index a338dceee8f7..6821b97d1bd5 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -4,8 +4,6 @@ AUX opendkim-r1.service 516 BLAKE2B 738fd145b6e6c62d76bdb45a6f782c1dfacb1623a658
 AUX opendkim.init.r3 1430 BLAKE2B a09484ef2123f9d7096211c1539eab5fda14ff1f36a291c2f6366781ad868d43028bae60eb4e3676380f3c830a350cf53c6cb42837f56160c5b9c59d1f7e261b SHA512 d0a5985ffac171774664d4f619924f25c462d5829e8281b8ff643c22918295d513cf6e0e3a335c550c378b6d4739604539585f2ca809172a090f15d5c1294cf4
 AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47ae67533a94c67371aa12963c347361056939cc18492612f067102eca09166de6aa83d1b0541d4a8e6 SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
-EBUILD opendkim-2.10.3-r2.ebuild 6175 BLAKE2B 05595a7b01903c41fb9ca88b02ee7a9cce42782f79ed0b9ef66df0983c732bd2f3556bbc8236a5ce92bf04fe7baeb6f9c756c5a580a9fde3650cf1b2b1bced8d SHA512 35a36a6a9ad16b322faf0d51356e7c0401900f8f98dadfbf0ea9c884665baa404b9ca3ebf22af160c5ef03a08a60775b379897a61b7102d178214b3424eb38b4
 EBUILD opendkim-2.10.3-r3.ebuild 6086 BLAKE2B f1473a7605c8ebb73170498ce826ce0b6a630c5109a0661a6a3226aa25d06fad04fc621b9b8c3931f47f497bbaae1cf2273fdb101c2c805aef6921283ee5f8e4 SHA512 4601d56f81230dca6753b3793b0392c1b05365706d1f97961f6bbe5172cbeebb2fa4b914390460b7872e9aca72e44c6b89ba6ea71c2c40504a1e8343d84bf74d
 EBUILD opendkim-2.10.3-r4.ebuild 6125 BLAKE2B f5e860bf2e5ca784c9b7d5b325d5ad2ea991a0b568507645753192ed2b8c85feb192b40f5ebcfe07e13884770a3161ca17fc5af66c84da07dffb1e9f1180bbec SHA512 d47ef5280f95272f7cf6087c1a5c67325564cf8058b083aa0b7b85b3b1f1a634f3a770ee2e08eeb0b428f04a24cc26a8ae7c43d04d5b83f9378d7f57e7cd3758
-EBUILD opendkim-2.10.3.ebuild 6095 BLAKE2B 9711f8fc38d5539b6d7b736aae3716c19ccdd0cd309ba70cab1b9a13d899899ef332d1883a90b85481b1bb2176fa26b12338c8885466a19c18b3ee836711b287 SHA512 36bf472733dca5a49ee41bde1317a4a0c4de519f7490f0c506437223080ef158b9172d51d6db81ed9555a3a1e9fbc31cd5fab9fa3eb05d928dc474d779b9d14e
 MISC metadata.xml 1576 BLAKE2B 055ffde1fc3b21a129056d4a457a40ffcc72aa06ded28068165ef67e5af180ac422dec4bf1a395d97fe31987da3426a007044e3c6d3424f08c944c04f26e2007 SHA512 8595e50d9a6775a337a06d7ca32c00d6b37c862eba46c5edfe895230d89cd8952fccca8ad0ed98483b7d47318c6178a11d0ee33070f731d31960c8c20fb10cb7
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
deleted file mode 100644
index 83fbee2e61f9..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3-r2.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua:* )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
deleted file mode 100644
index 19bee906d0e1..000000000000
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools db-use eutils systemd user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.8.0
-#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz"
-
-DESCRIPTION="A milter-based application to provide DKIM signing and verification"
-HOMEPAGE="http://opendkim.org"
-SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
-
-LICENSE="Sendmail-Open-Source BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-	dev-libs/libbsd
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
-	lua? ( dev-lang/lua:* )
-	ldap? ( net-nds/openldap )
-	lmdb? ( dev-db/lmdb )
-	memcached? ( dev-libs/libmemcached )
-	sasl? ( dev-libs/cyrus-sasl )
-	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
-	!unbound? ( net-libs/ldns )
-	gnutls? ( >=net-libs/gnutls-2.11.7 )"
-
-RDEPEND="${DEPEND}
-	sys-process/psmisc
-	selinux? ( sec-policy/selinux-dkim )
-"
-
-REQUIRED_USE="sasl? ( ldap )"
-
-pkg_setup() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_prepare() {
-	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
-	       -e 's:/var/db/opendkim:/var/lib/opendkim:g' \
-	       -e 's:/etc/mail:/etc/opendkim:g' \
-	       -e 's:mailnull:milter:g' \
-	       -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \
-		   opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
-		   stats/opendkim-reportstats{,.in} || die
-
-	sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
-		|| die
-
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua
-	sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use berkdb ; then
-		myconf=$(db_includedir)
-		myconf="--with-db-incdir=${myconf#-I}"
-		myconf+=" --enable-popauth"
-		myconf+=" --enable-query_cache"
-		myconf+=" --enable-stats"
-	fi
-	if use unbound; then
-		myconf+=" --with-unbound"
-	else
-		myconf+=" --with-ldns"
-	fi
-	if use ldap; then
-		myconf+=" $(use_with sasl)"
-	fi
-	econf \
-		$(use_with berkdb db) \
-		$(use_with opendbx odbx) \
-		$(use_with lua) \
-		$(use_enable lua rbl) \
-		$(use_with ldap openldap) \
-		$(use_with lmdb) \
-		$(use_enable poll) \
-		$(use_enable static-libs static) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		${myconf} \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--enable-filter \
-		--enable-atps \
-		--enable-identity_header \
-		--enable-rate_limit \
-		--enable-resign \
-		--enable-replace_rules \
-		--enable-default_sender \
-		--enable-sender_macro \
-		--enable-vbr \
-		--disable-live-testing
-		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
-		#--disable-rpath
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dosbin stats/opendkim-reportstats
-
-	newinitd "${FILESDIR}/opendkim.init.r3" opendkim
-	systemd_dounit "${FILESDIR}/opendkim.service"
-
-	dodir /etc/opendkim /var/lib/opendkim
-	fowners milter:milter /var/lib/opendkim
-
-	# default configuration
-	if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then
-		grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \
-			> "${D}"/etc/opendkim/opendkim.conf
-		if use unbound; then
-			echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf
-		fi
-		echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf
-		if use berkdb; then
-			echo Statistics /var/lib/opendkim/stats.dat >> \
-				"${D}"/etc/opendkim/opendkim.conf
-		fi
-	fi
-
-	use static-libs || find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSION} ]]; then
-		elog "If you want to sign your mail messages and need some help"
-		elog "please run:"
-		elog "  emerge --config ${CATEGORY}/${PN}"
-		elog "It will help you create your key and give you hints on how"
-		elog "to configure your DNS and MTA."
-
-		ewarn "Make sure your MTA has r/w access to the socket file."
-		ewarn "This can be done either by setting UMask to 002 and adding MTA's user"
-		ewarn "to milter group or you can simply set UMask to 000."
-	fi
-}
-
-pkg_config() {
-	local selector keysize pubkey
-
-	read -p "Enter the selector name (default ${HOSTNAME}): " selector
-	[[ -n "${selector}" ]] || selector=${HOSTNAME}
-	if [[ -z "${selector}" ]]; then
-		eerror "Oddly enough, you don't have a HOSTNAME."
-		return 1
-	fi
-	if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then
-		ewarn "The private key for this selector already exists."
-	else
-		keysize=1024
-		# generate the private and public keys
-		opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \
-			-s ${selector} -d '(your domain)' && \
-			chown milter:milter \
-			"${ROOT}"etc/opendkim/"${selector}".private || \
-				{ eerror "Failed to create private and public keys." ; return 1; }
-		chmod go-r "${ROOT}"etc/opendkim/"${selector}".private
-	fi
-
-	# opendkim selector configuration
-	echo
-	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
-	einfo "  Keyfile /etc/opendkim/${selector}.private"
-	einfo "  Selector ${selector}"
-
-	# MTA configuration
-	echo
-	einfo "If you are using Postfix, add following lines to your main.cf:"
-	einfo "  smtpd_milters     = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock"
-	einfo "  and read http://www.postfix.org/MILTER_README.html"
-
-	# DNS configuration
-	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
-	cat "${ROOT}"etc/opendkim/${selector}.txt
-	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
-	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
-}
diff --git a/mail-filter/policyd/Manifest b/mail-filter/policyd/Manifest
index 62ea66fbca60..86659ec0553f 100644
--- a/mail-filter/policyd/Manifest
+++ b/mail-filter/policyd/Manifest
@@ -5,5 +5,5 @@ AUX policyd.confd 61 BLAKE2B d39d4e5894dbc1164d29bf7e3fccc19c4247fd6a0f09c09f07e
 AUX policyd.rc 443 BLAKE2B 1135a6ab78cda5cb03cbed9d18773ab91237db217feaa0867dc0a9793f44f72d97033f77c78f94eb58b11a7f42071f59705088bf0b8e21cb8c8020a1bf6cf05b SHA512 32f2dec8b9067bcf219ee4edec2b36d010cadc34a018e6597339b238b21db7782975d12098d1232854b70e19bbdbe355bc8c4f23a5675ecc6171eeca81bfa69c
 DIST policyd-1.82.tar.gz 68372 BLAKE2B 39603b025235d3a68401e8cf9b357d224515f5308f1b86bf84d1231157ac2d5c2ca4dc00cc9deefdd03cdb4ffc214a8ebe5582e299f05b79a471e93238e36cff SHA512 08de114736620d5f1c11f7183135ecf4589c2d6258dee486b5f4f5a9156e4feabd7eaf19fa09428e79d5d5c72ac4757c83af86f43a7547030b1a59cb368e82a8
 EBUILD policyd-1.82-r1.ebuild 1974 BLAKE2B 9467c9cb11441d4e528717b1c01abb878b18f02e0321c3195c4ae359ca413ed16d4abb28c54834494661ee92124f7ccb9da8439048c2ee0f75e48b7bbf3b44e9 SHA512 17c253ac9d1f3c0b8e2eccb320e1fc3df627014828fbc4c95f3438b67a27075fb703eb42c806644dd6e9741450b897aaca11e1799255a257269513fd228caf2b
-EBUILD policyd-1.82-r2.ebuild 2012 BLAKE2B acf486a4b8b4b39415c94cadb56bc10020a7b7bc268f5e717724b3cdaeeb3ed31373d49516ac786f9756a8453983b502f6e5d838530cc92d15fb97adab8bcf29 SHA512 12c74c85941fca22caadf4d8e1dc8b64b7562a784f2611507039cd4c5582addd3e8e8fc6f6a0f41cb70915510ab9b64f9df6a59bf89f23bdf3486e6e5c329a59
+EBUILD policyd-1.82-r2.ebuild 2012 BLAKE2B 3476d80843b047cb3f91dbb2715594a4a12bb1b250eaf0e2f1dc4776f3bfdd2c807d866f6db425edcc019e5061e2d7854a6fbd2b59db2718f0f5e1a018bfb792 SHA512 bca8d2d5aa6e86f28a1f91397c3cd1b331105f73a14a9c732a89cca94b104069c950245ad23c1d3dcd109ebcd542479c08dc8506992019c17bbacb0a36e5b58e
 MISC metadata.xml 331 BLAKE2B 2a54160dd40023392bf403418c358eb93eb1a591010d9184352ed74cb0c8688276a3026b4287dc47d4173f2472df56f35c422d8483796d264d85edcd1367e8b9 SHA512 5241c40be23d5183ef4d5d07901ce582e98a404da73cb5bbac6f51767d028b870315ef3dea6db0341fca1697b9f4d2b2b4a7ad99cd8e1ca9d601b3743ad677e8
diff --git a/mail-filter/policyd/policyd-1.82-r2.ebuild b/mail-filter/policyd/policyd-1.82-r2.ebuild
index b472846f713d..1e145672a007 100644
--- a/mail-filter/policyd/policyd-1.82-r2.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="libressl"
 DEPEND="virtual/mysql
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index b7ee5dfeb804..47546b4482a2 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,5 +1,5 @@
 AUX popfile 715 BLAKE2B 071dd14e37401ab0c5c25d644f55275fbf59bd9dba5bca39202f27338492603a95c023fe1288c507f76f78d4c0137580d8a279c4738247f8b507b3090318a313 SHA512 a802f753de335552a0b54da98baaad07ceda1da83f0c082d4e2204c90378c35ca5f34bfee1f7beaf11ee6795b7287dcf3db07eedf958665134064dfd9168fae2
 DIST popfile-1.1.3.zip 523431 BLAKE2B cf084e572bf0d8da7d4ce4435f7df9c527ebb0d6714f9b5ac2c2d8701231f452989de048e24bdd7cec2483466ed20f1ed9aa84255f7606a9ffb2bb06bf05b30c SHA512 0e3ed3d67d2c2b456643335dd030a51e890bb371c5b8cf9eed9fac350a2536b8884eeffff78fcb27b99c39711505df533ee3ded5b40714fb46e54c2d25b3dda9
 EBUILD popfile-1.1.3-r1.ebuild 1121 BLAKE2B 591b689643bab0fb5c4b192732eb4ad2221b14577862fecb63f18331417feda567d0fd16bcff279338cc2cd36852748ead54062788af676c684c0dbcdea36c36 SHA512 72ed23bb8be7e51b20baf540fa4fce83d611966de7c1dd528edef72087a8ca4e729c79caa7e87f4dece3567912a4d4d38e057708bc854b402956c03ddb3bdfd1
-EBUILD popfile-1.1.3.ebuild 1059 BLAKE2B 99bd36b8930cba8c2306c49534dc7fcc01f4951db16bc12f7762dcba637929902e0a1179bc76b7d709bb7f65ea53a07738460e698b787c50e9280a2cd87917e9 SHA512 1a7ed343d807f7288249a2217fbe9d21ad2125bdc81e714c69d510c96d56115e510bbeb8beb841a565acbfec24b3b320575de86897af243cba4f501ed533d842
+EBUILD popfile-1.1.3.ebuild 1058 BLAKE2B 1713631777762f13a14d5b75cab280044951f2d910fba8803458f3095125994f888ac15bcfa73a62b9d1cae982500a3f5431e536575e590b5ee1295c9711f588 SHA512 f6055e02d18329e3113e4eb56351d7ab78dd2fe09be5345b465e0e561edc84eaa35755c259108ed71428ee2e90023739f5086ae9ad88bb8e28f220f58f939555
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/popfile/popfile-1.1.3.ebuild b/mail-filter/popfile/popfile-1.1.3.ebuild
index 2c438d39d840..21e54839f75d 100644
--- a/mail-filter/popfile/popfile-1.1.3.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ RDEPEND="virtual/perl-Digest-MD5
 		dev-perl/Text-Kakasi )
 	mysql? ( dev-perl/DBD-mysql	)
 	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ssl? ( dev-libs/openssl
+	ssl? ( dev-libs/openssl:0
 		dev-perl/IO-Socket-SSL
 		dev-perl/Net-SSLeay )
 	xmlrpc? ( dev-perl/PlRPC )"
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest
index f5b87b33f017..df39853fa68e 100644
--- a/mail-filter/sid-milter/Manifest
+++ b/mail-filter/sid-milter/Manifest
@@ -5,5 +5,5 @@ AUX sid-milter-1.0.0-as-needed.patch 1213 BLAKE2B 9ad17c0011c3e8acb8cb419652560b
 AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 BLAKE2B e1a7c26af42372fd58c3fcfc282bedd11e21959bacfb5163bef4f8b72e363c69c96d84c2f9dcae682c96d157e575540e3863bf7abe28312f831d1954703cec55 SHA512 b920806c3b0a3baa5581b028ae291e22281810c680b2cca82c12635690b3acfbb76fbce656324042ffbc536e17214699291720ec4bf0c7a5138bd6ab9283c79e
 DIST sid-milter-1.0.0.tar.gz 351161 BLAKE2B 152472577addbebf549ccc17f96e3e4d7bb645ab7924fe1b1ffa8361f0629851143818b1fe0d856ad72b097037482198152dab20e6e39f2fe8b374263de5653b SHA512 599eae36b7708e045e3f120cd6b4215906ea954b5f10be520d917404a02cf0b03d79b8fcf9543080288a9ab8e436b393c8b6340d2b1edced3d4fb827ff4c30dc
 EBUILD sid-milter-1.0.0-r6.ebuild 1743 BLAKE2B 68de5b445bbaff3e40bf7fe6306b3d8a02d27d3797b12546c54b74b9c32d168134a7bb3a04d82868aa8d1cbd94fc8336917b558ea8e38fc24e123df20a97fab0 SHA512 9479ca6315d83737f98be70e8c990048f23678d06a02936be1a1f0ac54945d972bdcce31fedf306835950eac0c1d76d2fa6921068a4d6fbaca37deea828aeda7
-EBUILD sid-milter-1.0.0-r7.ebuild 1807 BLAKE2B 744cc848622512147bb4386925eb896952b651a898fac064cbbee80f0ed5a2b2739d84e11fbefcfe2786050e40779e71efe376c7183c9a1487a164d66c341c73 SHA512 8aa3144840a8d73bac90309306d3c2d0eec0d60065f7bf6370aeb43fb734e791d9491f0f70269d44f717d46d1f079fe5056686b277449f55363e7a50aafe85e9
+EBUILD sid-milter-1.0.0-r7.ebuild 1807 BLAKE2B 0b369987fded1688ddbd536b65def4e5bc9f27f73fd0c642ea436d46cdb2aa851766879f9c97ba5a4e5419021f3db36c54a8f319c5a1f84c02b0354e4551a177 SHA512 3dc900634efcf2c44819e8b1d256fc90c1fbc8efde3932bb840e8fbbd3a8a561d33109991bb031acb5fd08636b4911c00b3f46ec1c13e75527b6e080fca7706d
 MISC metadata.xml 519 BLAKE2B 12f727054a736e7232695462ac1bd97cf30d7c86b26b3ae8779d4306b9d1fe236f115f19d12396078f3bef29af891022ad97e810be3ff5d03f108f4b697eb703 SHA512 d7e99dc5571665d707b79fed4020f109fc09eb5b01952ac01dbe53bf5f6278b0e8c667cb99d00cccbd9ba79a26b7791d0aa780c8bf0b20f14cb3ddb7adb48e39
diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
index 44343e54c357..9c8ac171f4bf 100644
--- a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
+++ b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 libressl"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	>=sys-libs/db-3.2:*
 	|| ( mail-filter/libmilter mail-mta/sendmail )"
 RDEPEND="${DEPEND}
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index 5814c057c9fb..459366cfec4e 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,7 +1,7 @@
 AUX spamdyke-4.3.0-gcc46.patch 237 BLAKE2B c60cfe8f6680b246268fd769c30eb81acf2d87a04ef08c73b70b7e9cdb1b052d1e9b5eac6c6160855a2d2b03852ed0726ab9251ec7306813141fedcef8560ac2 SHA512 3714399437215680057a2266added2c158f015da518f4e00021f7a1492c287fdf8db4875b0c5f7e242782cc40f676dca9f610931047a7d23f8bdd5876e629846
 DIST spamdyke-4.3.0.tgz 525399 BLAKE2B 46e3fd1508ea91d925675186ec2555e63a9d22d2fe07d9417fb5a151af76bae22676410dd6c648696621fe80d34c6e87f845b581a0db09b7b19f45e46d656f09 SHA512 6ba4b440e6d20e677c39439c78037ae3e2ff291bde7f48500a4e2eac8a3f17eeb7230b8ded7feee60c66f01b6aec2d259eb2d9a5794535860345957b1102d118
 DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-4.3.0-r1.ebuild 2215 BLAKE2B 8f7390a44a86a1a709291e73372a3f9f50070688f3cabd30b9392b2750f89f84b774aeed339592ecef61853339126fc197c4cf7207164c5568604f547b5b7d51 SHA512 9ed4ff5d87c2af68fe75941636df32e4e502d44bb997ffe0a392dcf4a5caad979aabdfabb3932e31292f850771c4e3be59686e61b9d8f761cee03dbce13f6229
-EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 099d6099cf2c7c99a0ad1ceecaf45d9d8915f1f81cae26c270f2a81a00331b5d78c29fde34691cf9d2146e97c2269943618d30c402a4a89625395826465ed8e9 SHA512 36be65f2dc8efcb42a8f4c00c36f1974d553ea7a36c3e93ee36b838b72ae1f2faed316bd4682af958e0b38e588477cf65aef4581abe4efc2a01b9f4f00fd45b0
-EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B d40224facc1047e3e4209fb9ca4902243fe504db27a90333d95bf7ab51ddc50a23a9de7b8e8bc5ffaad4ec8d637ce07f1b4ab7ead62a27c397c8c7480a404886 SHA512 6f96e89dacb6987256150de1ad7ade3041a40561d77400816ab1c14b5cfde1eb4dc434aa85ee96029fe113efc4103fb30362e1be33bddfa7025d9a944287f643
+EBUILD spamdyke-4.3.0-r1.ebuild 2215 BLAKE2B df58eba17d1fca388545717ae5c0a362ae4f632f5953255a787c2f9ccb897d2092524620cb1bb6c65449286d8cd7a164e9a49c3a12ce97d8d31436940f3e4aa3 SHA512 f02d5e1038e98f170e43382883c6c293613e4111dfda5a81f22a20102038de6f672c4244af571d02a558496e77f2f34e8957893fe095a50954a0ea119d638c53
+EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 2bd0569c7dae493461da8b4b136b5524f88686ef14fd22b02f908cf56ac3de51288706d3f3cf634a6430feb8b06de41ccdb497e7cf37aabb1db9e0e79862cb63 SHA512 107d9bc05b9cb2edbc559463e2458538700e4f4428afe9c76c654677fc125e1d98b6c0f7421793dc627fa25f7a215ccbbc73554144682cb69929575080da1168
+EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B 01fecf83c74b474f52c9fff6903c9f2f1124182b7c9c3629cd1fac9f8048115299cdf15fed0104135a352f00599d465238c32afc1de5ddb897793b2040ae2cb4 SHA512 21210746356b7cb995ad4e650b75b9ae9bbda1ee1f4a3bc8c09b94d983724002b530e730ccdd56a055478a4888383ebac7c0bb82c17caa2cbfb094b875b0aff0
 MISC metadata.xml 773 BLAKE2B 2792a130eb5180f3b9e6b23d97692cd24a6feb05ac5d260e753b27800c8e6182fbf5a8201a4b6f64ee6211b6fd0d805a1ed5c4c0316e58a0f143d5b002ea9fbc SHA512 a54127931e0e83ec0ef1ffbabbe39ed84502e9228cc6f13c0cf89dc7fdc33efd43e593a1a983930b86d0234f4bf18c44ef89d42e3ad614406adaab3150538f19
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
index a91c7403a927..02c6a579d924 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,8 +16,8 @@ IUSE="libressl +ssl"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)"
 RDEPEND="${DEPEND}
 	virtual/qmail"
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
index 14564e0a21c3..24eabfe02920 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
 	virtual/qmail"
 
diff --git a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
index 9be8f12fbc65..c084bef63444 100644
--- a/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
+++ b/mail-filter/spamdyke/spamdyke-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,8 +16,8 @@ IUSE="libressl +ssl"
 
 DEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)"
 
 RDEPEND="
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index fd8e11ef72e2..1e523eac4790 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 06b51faec7e1..32d4a10566e9 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -5,8 +5,10 @@ AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7
 DIST courier-0.75.0.tar.bz2 6970339 BLAKE2B 2c2f9900ab0370eff8b1a62759295e2d0598153075ea9a2f832d59272c5a21d5ab912fc852c7e75d7510d5ddf2d1484e830e6bf57c6952839f8688f174b6f27d SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6
 DIST courier-0.76.4.tar.bz2 7237424 BLAKE2B 7dbfb43cef75ed5187e044130c6cb793848791956a8531fcc54ae7a444e475c16219816c2ad7834e3b5349cf945f59023f0b9e2415c7c64352b5aa71eaf00bbd SHA512 6350ef5e30bd1e4921350bf3a09de0b56513530852c93f9a06e23625e49ae09d7ff26558da1f816a5bb492579afb5c1cbcf7573199bf898a039cd3607e847c30
 DIST courier-0.78.2.tar.bz2 7379529 BLAKE2B 5ba1ef013e513b269746999b2dd75f37fe8a9f1d87a51b61db1a8100c9a5cd022039462c235d35a95cf14ac5c406becf0f5d4f9344462e862045dc7333b7a0b7 SHA512 376de08cbaf9c2c74cd79e5d42680d8d6c31ecf0b0ef014f4152aa857224ba3e6d9e0f91b5097d15dcb5de9a5603a4707bc9b78902a5934c0a0ca68b74212055
-EBUILD courier-0.75.0-r1.ebuild 9427 BLAKE2B 2c79ee832a5c23990cf3c676a84bdfe0ec4dec2cc62baceee062f6948fabd39f214b6df76546d3987094ca71ccadfe3e4129b4ab980054f6f09188f5051dbf23 SHA512 f2f24fc78ef2865f2734802004abbcad11fd78ff11ec3ea4f9a5a9599c227553bb3c4f73225aef46dba28961e4c9113f722fc1ec9d9bebd23f83097efa4ea866
-EBUILD courier-0.75.0.ebuild 9322 BLAKE2B 5baacc0b69ae5c84269f86b1292f65ede233fbc4b97c81498627182b9dff5f7dd8256f29cbb8115d478bd4e82a0fb4e03b8adc84e6b6cada2f1e058e41e3cce3 SHA512 11c0d1f278d13d0ff77691f48065c289870545414161e35fd10dd95c429a1e2adc97f1cef3da578211468ec46b74fa7b698a8fbf6205c1bd7b05b1f71c6b9434
+DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
+EBUILD courier-0.75.0-r1.ebuild 9430 BLAKE2B 7bb9c5b9fe5a8f50ec6c17a9c4b99e2e07ad63fb60c5375f72891cb4b8075eba953a45519609798c7b62da1bd5359462481afe65f6e5f3d90e583d08886f1538 SHA512 ac92980554eabfc6c9787519a8bccef2dc0db2bb83306618f0d2ab3b0d7e44fc3dfc58f9f2d679b41dfee2cc20eb371fa23dd6a37ff06f4d8c8e10cf68fe17a3
+EBUILD courier-0.75.0.ebuild 9325 BLAKE2B 7103206f2ba73b4acc5097ab7e14595013c051042f64ec42b4a3c2b3430d7830638cef2386c38495fafbd8eb2002396b853a1eb43548fce6460541f3b8724823 SHA512 71aa350b36bb024805fd56adcb56b30a100d5cf0ce5da1bf14027dd51d8abf4d933a6153064e0f688b80019771e427d689d59bdc1e5839f600013c9fb8f5af18
 EBUILD courier-0.76.4.ebuild 9327 BLAKE2B 6daccaf5e311202f157887017b63e5e890595ed73a0c52cd87e1ddcf0b3d31666c4bbd443116868efe9b555661b94da8c575d1cb21dabf6c3fe64248f2488ec3 SHA512 91a9cf8f9f2953b97793e6c1fe3db0e3e0eeb81692a8604eef46736b58584235bff3194db8d4de2d062e4d90a267c2e578623f8a2c4e710b7092273096672a90
 EBUILD courier-0.78.2.ebuild 9326 BLAKE2B 67554fcb0129810772ff951205ea84f640fb24da44a2b65f87535b14069e58868f7c7c55e77f6533a5530710954eb4c3d8d5545191f190c13ca95b4f95da6628 SHA512 e4993a1480d23f2b75400626d9f5ba0ef5f212ed44181383ced92c3648ed99efe59d684128c55296240c80f85ff42d7161412856f7eea2754f319078278fcf0f
+EBUILD courier-1.0.5.ebuild 9545 BLAKE2B 9e3d067c95ebe4f034485bfecce091d472f0f3837a04af8d39ac5d5030e92c4422049d737f760ee25813cac241e3feac41acc9d8513f8d13f57b50d56f157c89 SHA512 6a6889d94e3f1dbf0dd9e07b329b515031a2dcd87355ab484fd42a1300775b61e5b0b56d752f407d4de77bebc5483248cb3e7f689f36ff11dd1c67e2efbc5af9
 MISC metadata.xml 860 BLAKE2B 7d4e6eed638b9c07079d56a5c195a27d77ede8f9be9400b2f7158214f6d065c836422ef64110e3ff580be7c1936ef6c470f4ed6ca7cbe6e2744487fd6bb637a2 SHA512 00c4c31649f17ac2fba94122762bcd4c2f9b57ad3117645c1f0607d6d214ecd6c9c789a7b2d48b1945472e38da49257ea2903b1abec3294cfecbc25ff4501c7e
diff --git a/mail-mta/courier/courier-0.75.0-r1.ebuild b/mail-mta/courier/courier-0.75.0-r1.ebuild
index 6ace61ccecb1..7a2173aee9f0 100644
--- a/mail-mta/courier/courier-0.75.0-r1.ebuild
+++ b/mail-mta/courier/courier-0.75.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies:
 # ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
 IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 REQUIRED_USE="?? ( gnutls libressl )"
diff --git a/mail-mta/courier/courier-0.75.0.ebuild b/mail-mta/courier/courier-0.75.0.ebuild
index 0365834aafe8..3e048db1fd84 100644
--- a/mail-mta/courier/courier-0.75.0.ebuild
+++ b/mail-mta/courier/courier-0.75.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,14 +11,14 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies:
 # ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc s390 sparc x86"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail gnutls"
 
 DEPEND="
 	>=net-libs/courier-authlib-0.66.3
 	>=net-libs/courier-unicode-1.3
-	!gnutls? ( dev-libs/openssl:= )
+	!gnutls? ( dev-libs/openssl:0= )
 	gnutls? ( net-libs/gnutls )
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
new file mode 100644
index 000000000000..ac78da64e520
--- /dev/null
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+REQUIRED_USE="?? ( gnutls libressl )"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.69.0-r1
+	>=net-libs/courier-unicode-2.1
+	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
+	libressl? ( dev-libs/libressl:= )
+	gnutls? ( net-libs/gnutls )
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check || die "Make check failed."
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+
+	ewarn "If you are updating from pre-1.0 courier versions to"
+	ewarn "1.x versions you may need to update your maildir's"
+	ewarn "to the new Unicode format, see also:"
+	ewarn "https://www.courier-mta.org/maildirmake.html"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [ "${ROOT}" = "/" ] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e7837fbeba41..78e808c08f2a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -19,5 +19,5 @@ AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076ae
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51 SHA512 35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980 SHA512 82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.91-r2.ebuild 13165 BLAKE2B 4c761085db467d091e4f4d142251dba3117c57280834afb2b191430ea3a7f724c1ea89c34cc6972c3285b296ea4435be6b18f8ba20e429151d587959784629d3 SHA512 7d39187c28e3900ceb23044bac50ed31dd7a3d527148dbfdea19d8e1355b912ef647a2d01869210916177fa20b33b88caa5df4b2ec6a2b4bdb3a4836d0839121
+EBUILD exim-4.91-r2.ebuild 13174 BLAKE2B 32323bcef3062c34a21b71504492802355ed5efec68f931f7dfc2f429f94508fc936d2a9efbf0f04b1e4a2e66a43bee6018c02efab8404f1962fdbf3217b6291 SHA512 8e01eca662614c49d7abd0cd644b0938ddf75b8e5fb4a1d28c4c229ef147f652e11439a1665a883917716c58e2e2346a702d547bab0fb9c70908a33375eb99db
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91-r2.ebuild b/mail-mta/exim/exim-4.91-r2.ebuild
index d8caa901fa0b..111f05cbcc34 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -307,7 +307,7 @@ src_configure() {
 	fi
 
 	# Transport post-delivery actions
-	if ! use tpda; then
+	if use !tpda && use !dane; then
 		# EVENT is enabled by default
 		cat >> Makefile <<- EOC
 			DISABLE_EVENT=yes
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 86160371d2ac..7b3adfd1dc16 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -2,10 +2,8 @@ AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121
 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7
 DIST msmtp-1.6.6.tar.xz 283744 BLAKE2B 41745d9f20a33b0e4c6f7eee3ad5897c5a555a8cd1e27eb0bf7d347054d072b9eadfc7a31583e12a4f35f071aa710bb403980cba0e06920f65fdb727c786447b SHA512 30f33648b66a6b230cd38d0eee4c916a631a51bddcc1a15c9f7b324305506cb83b9c95f95def9150d0b783d38000db409981331b3c6a756232f0ce49e9b343ab
 DIST msmtp-1.6.8.tar.xz 294872 BLAKE2B 156237dcc10c320ef15b368ebfe823d6f30f1a740061c5846878a8e478c1f3a3129c52af8327995933ecb15cd8cec0c18a3104993b030bcbfa09e3b0b6c2a58b SHA512 58ccdb6f16ab31959aeb1929c11f820219d4be062edca209c5986e4e0932d718f6f39c81727d05cd448779cedc4ab3e7bb557ce9f5dd3e7cc95e0aa5c3b623bf
-DIST msmtp-1.8.0.tar.xz 302680 BLAKE2B 41537a883dd59e1f2281c0428aa57af985a74aeaa9aad34bdce882c3cca79ad65a796b6ef509c7546079d8f3e647eb493481ddbd5f7781a92c560986cb9958a9 SHA512 986cf8ceca847b857f3884fcef26202429b3099820aa20e4e458768a80421bfb163d8aab9d950da2190ae0e2e95bafb80f4c2647d28dbd470d78c439bfba4f77
 DIST msmtp-1.8.1.tar.xz 303112 BLAKE2B 6de6c566a0de0f680f354066d1613b3b15be95c24098bdf7019e3f0289f5bce8478d2de65bf5711863617d41eb23b14b6157e25b92fce60f1cd4d33f4a593810 SHA512 00c5d8b810d48c171fc975115911c4cdf3e18efb91448800bdab320d0f850f4893343b436899722d3b9c82e3781c3e103dc31175c89a5c867511c14df5b9785a
 EBUILD msmtp-1.6.6-r1.ebuild 2973 BLAKE2B a2de4fd365a0ec85eab8334bf7c7087d57d91219c82921dd2adbb99b8985475dc50943ae95669f0a788cac0f9bb980b2b62faa96d28b2e1e16a91f4be8544420 SHA512 4ff1b8c2dd5d385a8915d0e1d8d1c6568cc98dde74a02aa83dd20c89c65ef1ceacfc544e6a488ac519b16582675a773dfb13fe7c6bed6f269e37dab7fc6abbd6
 EBUILD msmtp-1.6.8-r2.ebuild 2999 BLAKE2B f1d854c4a48b6f6bcb226c6e281413f0dc72132c8948f1a6cc64dcbc6f0e2640ba27f6141ef1011666ca43ca44389de729420524669c77437d1cdd73ffaef624 SHA512 91c41e3c8f3847e8cfd3687044a5ddb7d5faac89f96b5cca0488bc24f6470033b406449304df4e6ebf7ec954fbb6f3c9fa55d8e77a92fcfd79ab532b23d31735
-EBUILD msmtp-1.8.0-r1.ebuild 3375 BLAKE2B f5bd8ce13fa045ece116dabeb2aa773e7fca74b92b7f835d776553806625ab0cc24205fa36a8166683dd21d5c8f04019b9eadb76477db5938df2594ff7f4aa73 SHA512 c63ccd3e1400efb426dfeab145fb4a0c5ceb23fd58b71463a268108eb7d00ab82ff8cd73b010a9c1ec9426102c804d5e2e3f5d12004dc5c2542af43a279bacc9
-EBUILD msmtp-1.8.1.ebuild 3375 BLAKE2B f5bd8ce13fa045ece116dabeb2aa773e7fca74b92b7f835d776553806625ab0cc24205fa36a8166683dd21d5c8f04019b9eadb76477db5938df2594ff7f4aa73 SHA512 c63ccd3e1400efb426dfeab145fb4a0c5ceb23fd58b71463a268108eb7d00ab82ff8cd73b010a9c1ec9426102c804d5e2e3f5d12004dc5c2542af43a279bacc9
+EBUILD msmtp-1.8.1-r1.ebuild 3395 BLAKE2B b786a7d3477fce4658fd2f8e9709cf073cc015a0860c418563b9636b91c2563861b0ee43f6cf87efc4158a6836e13f4b186eafc82a0a07284cefcf76b576b800 SHA512 e6f3d57e499819b687200013090ee96351e50febf55370be080d0777a482c727fd583fcb59edb824b9f46a0a907bd42af501ac856cc6d8684df0f1c5a76f619b
 MISC metadata.xml 463 BLAKE2B 111797850e3ea08adfbe2affc11aa24050e85e8d8ad516c4181fe7f74b43d7c2429c4bf1e7f389b7b1a050317ab2e351a80d5b3205ebe2e85424359a514fb9dd SHA512 c9bc80afca5b0783a37f1654f9535c420cf19543c3e74dfe42627e2fed9d28b5c2b35542859806607d36d1ff85411d7bdf4f67d46f8a779892cba22cd11ef5cb
diff --git a/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild
deleted file mode 100644
index 07cedc460ef4..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib user
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="${DEPEND}
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dodir /usr/sbin
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym msmtp /usr/bin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_preinst() {
-	if use daemon ; then
-		enewuser msmtpd
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/msmtp/msmtp-1.8.1-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..94bbeb282bd5
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.1-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps multilib user
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="https://marlam.de/msmtp/"
+SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
+
+# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
+# USE="daemon" in order to set the caps we need.
+REQUIRED_USE="daemon? ( filecaps )"
+
+# Upstream discourages usage of openssl. See also
+# https://marlam.de/msmtp/news/openssl-discouraged/
+DEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls[idn?] )
+	!ssl? ( idn? ( net-dns/libidn2:= ) )
+"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	mta? (
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/mini-qmail
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/qmail-ldap
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+		!<mail-mta/ssmtp-2.64-r2
+		!>=mail-mta/ssmtp-2.64-r2[mta]
+	)
+"
+
+BDEPEND="${DEPEND}
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-gai-idn
+		$(use_enable nls)
+		$(use_with daemon msmtpd)
+		$(use_with gnome-keyring libsecret)
+		$(use_with idn libidn)
+		$(use_with sasl libgsasl)
+		$(use_with ssl tls gnutls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use daemon ; then
+		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
+		newinitd "${FILESDIR}"/msmtpd.init msmtpd
+		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
+	fi
+
+	if use doc ; then
+		dodoc doc/msmtp.{html,pdf}
+	fi
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		dosym msmtp /usr/bin/sendmail
+		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/msmtp.vim
+	fi
+
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
+	src_install_contrib find_alias find_alias_for_msmtp.sh
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
+	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
+}
+
+pkg_preinst() {
+	if use daemon ; then
+		enewuser msmtpd
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/${subdir}
+	insinto ${dir}
+	exeinto ${dir}
+	for i in ${bins} ; do
+		doexe scripts/${subdir}/${i}
+	done
+	for i in ${docs} ; do
+		newdoc scripts/${subdir}/${i} ${subdir}.${i}
+	done
+}
diff --git a/mail-mta/msmtp/msmtp-1.8.1.ebuild b/mail-mta/msmtp/msmtp-1.8.1.ebuild
deleted file mode 100644
index 07cedc460ef4..000000000000
--- a/mail-mta/msmtp/msmtp-1.8.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps multilib user
-
-DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
-HOMEPAGE="https://marlam.de/msmtp/"
-SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
-
-# fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
-# USE="daemon" in order to set the caps we need.
-REQUIRED_USE="daemon? ( filecaps )"
-
-# Upstream discourages usage of openssl. See also
-# https://marlam.de/msmtp/news/openssl-discouraged/
-DEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	nls? ( virtual/libintl )
-	sasl? ( virtual/gsasl )
-	ssl? ( net-libs/gnutls[idn?] )
-	!ssl? ( idn? ( net-dns/libidn2:= ) )
-"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase
-	mta? (
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/opensmtpd
-		!<mail-mta/ssmtp-2.64-r2
-		!>=mail-mta/ssmtp-2.64-r2[mta]
-	)
-"
-
-BDEPEND="${DEPEND}
-	doc? ( virtual/texi2dvi )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
-
-src_prepare() {
-	# Use default Gentoo location for mail aliases
-	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
-
-	default
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with daemon msmtpd)
-		$(use_with gnome-keyring libsecret)
-		$(use_with idn libidn)
-		$(use_with sasl libgsasl)
-		$(use_with ssl tls gnutls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc ; then
-		cd doc || die
-		emake html pdf
-	fi
-}
-
-src_install() {
-	default
-
-	if use daemon ; then
-		fcaps CAP_NET_BIND_SERVICE usr/bin/msmtpd
-		newinitd "${FILESDIR}"/msmtpd.init msmtpd
-		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
-	fi
-
-	if use doc ; then
-		dodoc doc/msmtp.{html,pdf}
-	fi
-
-	if use mta ; then
-		dodir /usr/sbin
-		dosym ../bin/msmtp /usr/sbin/sendmail
-		dosym msmtp /usr/bin/sendmail
-		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/vim/msmtp.vim
-	fi
-
-	insinto /etc
-	newins doc/msmtprc-system.example msmtprc
-
-	src_install_contrib find_alias find_alias_for_msmtp.sh
-	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
-	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
-}
-
-pkg_preinst() {
-	if use daemon ; then
-		enewuser msmtpd
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
-		einfo "In addition, per user configuration files can be placed"
-		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
-		einfo "/usr/share/doc/${PF}/ for an example."
-	fi
-}
-
-src_install_contrib() {
-	subdir="$1"
-	bins="$2"
-	docs="$3"
-	local dir=/usr/share/${PN}/${subdir}
-	insinto ${dir}
-	exeinto ${dir}
-	for i in ${bins} ; do
-		doexe scripts/${subdir}/${i}
-	done
-	for i in ${docs} ; do
-		newdoc scripts/${subdir}/${i} ${subdir}.${i}
-	done
-}
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 07e3b02dfc98..58ce89091295 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -12,10 +12,10 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8
 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
-EBUILD netqmail-1.06-r1.ebuild 3690 BLAKE2B 3d514287afda99937a2aebc46474bc5df1236f1976bf6b1946a84d1d50e84871b13c73a883b1bc3b749b4fc5265d38234780d1649ea12262777b66e866dc8c2e SHA512 f609b723de624a87863eb152739439a0ec9fe73ac0f451b3ba0d767e79c94264212db0c67fa6561c6760ef72fa840edca3ad4c3535423f7665ea0d62b3050dac
-EBUILD netqmail-1.06-r2.ebuild 3953 BLAKE2B 5736dddbfacf0aca8271630f6a3be3868d8c551f94908033ef6ace94c54b6233ee35e3f1289bf3c57ad61a9cb557541d88c57e97e4f8dd7ef6b6c62f159cc195 SHA512 3cffc0efc1d4e2a0aa9c33a67db7c2f2afb000f2b87e87805d1b2a028e3664e49cbea0a03dcfc5903512bb82fddc50d3db6b2df30edd69a7648cc9ccfff7dafa
-EBUILD netqmail-1.06-r3.ebuild 4027 BLAKE2B e8ba26645946ab2d610267074e4cec3bf785edcc630bb8bca1c3d9b91906f08c647a8e0030edf04bb533b36bf60f4c01a919e03d30f7d173df4f693dd9b3826e SHA512 aff0744852e34f905bdc6f8d2e43faff84af611b4406b823e6e41b6fcaf8336a099620ff766841341a588db7719505a379425b6ecb860b1ffec78732c0d095cd
-EBUILD netqmail-1.06-r4.ebuild 4170 BLAKE2B 6894ea4942a278ef74bb924b4b4e62b2278831bb0a3d3596bb314fe42c850956b8b36df6953cadb58c931fe181ef53f9ab2d70dba906c3b57b4067eecfb0aa4a SHA512 85c3b07f2a42396f61ddcda6393f2db8253e62cc1ac7e15e15839f2f61e71298d74aaff38905907320c4b13f24ad49ea7f7130aa5bd2e0309cf8e3914c966db5
-EBUILD netqmail-1.06-r5.ebuild 4308 BLAKE2B 38decdce0607cc9c4402b744d04b4969e1cc983d7b600bfbf3364ebbc4fb774de82a0719708246803ec8218771e0d3921e5b7e81560f2a092b241fee37408181 SHA512 83b4ada94ccd29c97ceb81c97b5f2e932fba156b6b534866853d8cc0cd15853c8e82faaf0ebc32dc535459ff0d3b6391c4660cb108b9165bfefccc8b67577375
+EBUILD netqmail-1.06-r1.ebuild 3690 BLAKE2B 465dd29fbad9fa020018589fdcaa0577365d15bd77d61de2460978133955219d72cda0d0e014aaaba9ec9896cc5e90f6eb0f459d9554b371b3825b0142f7fe7d SHA512 8bc13f48f13911de7e6f76e97e28147ffbd8af57a22731782b2efcfbdd83d3e8170d1dae16fe6b3d9114c711a16e842de05de180bbdbbee5ae7e08dc10ef0ebd
+EBUILD netqmail-1.06-r2.ebuild 3953 BLAKE2B c701571c5335fb0216637c39d75716111766f8a2105ea288cee15c2a8c15d94362c2b070c1db504aaf0f8a2a4a4a8ea3d748509f8431f6b485efe4c7aab81469 SHA512 91018888011256a241dc3add7a215452fab26847a61efbf14e6667d333a318afe07ce38b3ebeddcc6cdd482161e67d8020b431b8d95e79389344b63659c938b0
+EBUILD netqmail-1.06-r3.ebuild 4027 BLAKE2B dad4bdfce69b861637be5506b9d2009180935762d037c3983074b9264af375852889d862e5b45c60a3a866fc964b37e5472fa78e930f5339d9303503579486af SHA512 99c61e96b3ad9f72ca1b3ff1396c1305224fa16b935de9548a4be37ea9b289561d8d12c25b5b707ab91a98a6493f9a1e79301f1be4fbcf6c7ac8c322d3affbaf
+EBUILD netqmail-1.06-r4.ebuild 4170 BLAKE2B 88d8467144b059b8e0b107ba5b12da1cb9317c6935a0b67f0edce9a2260a3192542435c8a7e9d85b60ac41548744040a051783f07a0c669d53edda9864351e98 SHA512 be362585dc8d28650be5204d29c27c40b25afb9a3cb5857df1c91b2b3450f7e623c0bd3aa739fada3113ae3a61a35b31f4f7ddf9477d9f56389541eb97875b20
+EBUILD netqmail-1.06-r5.ebuild 4308 BLAKE2B 745b2fe2507c845a376c03c85915a4a443ef21371f5e26339d3eec67ba3889ae8e603e9e9df01f2a6bfa0686f1069fd0e8acd24872e76813053c38f47251cc94 SHA512 929ebe1e12aa1d2acea7bf9136daa70008f701b7d3203a8157ca879380861e9d901991dafe740d2229635aa07cbc50fb0526a2318fa1bf26ffa559f5bae913e4
 EBUILD netqmail-1.06.ebuild 3297 BLAKE2B c6a5507c86bd219f4725044c4d2dbd717718d3db9db369d61c17b023d4d86da14648775c6d6d56b974fd611642ff7a19bb3b3d2558e0a15d6856765c2f2df8b9 SHA512 ae0d6e2ad2ff1f53c054d1f585990f4e4c00ee1ca0ff249ed5644d6fd84e9f1032ed18dafcee6ea843e336cb58c39c569bd210ccd7ee700b93bd386025e1a25b
 MISC metadata.xml 555 BLAKE2B 5f151e2b07d6c26b0d4445bb0577af01374934d94cdccc099e18730736f8d05829e287ad63b5cbd249e9e29d2fa99b50dd5c2100001e3369a5ef0b8963ba130e SHA512 dec725506e819558500bc86ce215370a6576bfe47baae06da3e12315fbd0395d2d8237d85e41996d6e5b11878bfe7ed2e1bbeb81061351b3bb9729749f702eba
diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
index 1ae9ddbc91b1..2241f6b302f1 100644
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -42,7 +42,7 @@ RESTRICT="test"
 DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="
 	!mail-mta/courier
diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 77aa72ee1424..7ea91d792421 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,7 +44,7 @@ RESTRICT="test"
 DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	sys-apps/groff
 "
 RDEPEND="
diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
index d939d63049c3..c75b1f3991f0 100644
--- a/mail-mta/netqmail/netqmail-1.06-r3.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -45,8 +45,8 @@ DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	sys-apps/groff
 "
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 71b8eb49f7ca..04bb94458c05 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -45,8 +45,8 @@ DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	sys-apps/gentoo-functions
 	sys-apps/groff
diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index 54751d00c833..b5fb32e8e3b1 100644
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -48,8 +48,8 @@ DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	sys-apps/gentoo-functions
 	sys-apps/groff
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 3b2601ea74fc..77f635bf66df 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -1,9 +1,11 @@
+AUX opensmtpd-6.0.3_p1-fix-crash-on-auth.patch 1130 BLAKE2B ca2a207549056dc729c34d394ffcc6b3f565ca3963a7c9b56f9f2a2ed68997f2839716945c412f6ba2340931297a8e0afeebae93ef6d767ec251dbe66b196a05 SHA512 23558294281527c679c563f35103ccaac04efa4c62a1494e9907480c38a554b551b86a838204df8a314f7fa86452cbf816690abedf3b5c0179758a9205616c38
+AUX opensmtpd-6.0.3_p1-openssl_1.1.patch 21039 BLAKE2B 05e6e416f8253bb42d3d0cb213c14d2d07ec8d6beee3058621ac41f7a3815562098be4e5eed863d78443d08ad55f70a94d0c9c031630e87a73388510f4e42c55 SHA512 7e6567889ca823ada283153861806e69cee0185d6dc98aa15675c18ee81d2e118e9bc3a9848551b9f49e772de38234b7d4170e66fb6e6b932a50654b5d9a3806
 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37
 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
 DIST opensmtpd-6.4.0p1.tar.gz 718638 BLAKE2B 23c1c286a865efcbd16461ec8930f5325a6e164a58ceb7bbe0feb9088bcf615b7fd7e2eb6820bcde161864c476087b39c289c75ea5ca0b18c46710f9723b3dd7 SHA512 c60dbac857925041769104adae33393f526a328767e19bc78d06e45a13b7dd50f3eefdaa3811b8da330c24a670e98da74e18af5ac486266dade6255a6f3b5135
-EBUILD opensmtpd-6.0.3_p1.ebuild 2118 BLAKE2B 495035e86ae34e04f0d68ae4d82227351b72cebb7e214b36e50d1c6cf5cefffe9cb2fef41f6214c723a141bca87460983889e20f8b3335872a43f13920f36744 SHA512 6a8aafcfd54d7bb3c11f745a8a8d46a861a129777302add1f54cda396320677cb12e993b097aefc0d5ff081febc93b85fe32d6caece03f0c9a0dadeb7ace0d81
+EBUILD opensmtpd-6.0.3_p1-r1.ebuild 2212 BLAKE2B 95f84100d0fe2f277626682673af2a8fc2244bbe65fed568e77af0562117615e17b567ae1882b65aaf9ae55cf24b89f8d5fe08cdbb0b12e1339f9f7f1f8f13a2 SHA512 fa1ec0814e76537dafa599aa79ae7dfcbf56f766e3338d89f47a6c0ca7d34b020ce502d156028022a8408d3d35cfa35be5b11ecdc31272734a443434b66b439b
 EBUILD opensmtpd-6.4.0_p1.ebuild 2062 BLAKE2B aa407d9d5a94c1b3243cd6c9994b1698b1ea2449d52239d118a7c1071404055edea6e1e29fa2edfaf6c9629d63889d8f577ffc5857d060cf6bb4ae384c67df7e SHA512 e040f564469f5b50927d7a7c0e6e78e8d2cb206b9c5e26ba71fc562ec43f0857db04d21280857f2ee1960ecac4828b1aec1b0ae7dd2021787b171e1cdd4dfe55
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch
new file mode 100644
index 000000000000..c20b5e0a0ef9
--- /dev/null
+++ b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch
@@ -0,0 +1,43 @@
+From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001
+From: johannes <johannes.brechtmann@gmail.com>
+Date: Wed, 21 Feb 2018 23:57:11 +0100
+Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL
+ check
+
+---
+ openbsd-compat/crypt_checkpass.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c
+index dafd2dae..d10b3a57 100644
+--- a/openbsd-compat/crypt_checkpass.c
++++ b/openbsd-compat/crypt_checkpass.c
+@@ -1,5 +1,6 @@
+ /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */
+ 
++#include "includes.h"
+ #include <errno.h>
+ #ifdef HAVE_CRYPT_H
+ #include <crypt.h>
+@@ -10,6 +11,8 @@
+ int
+ crypt_checkpass(const char *pass, const char *goodhash)
+ {
++	char *c;
++
+ 	if (goodhash == NULL)
+ 		goto fail;
+ 
+@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash)
+ 	if (strlen(goodhash) == 0 && strlen(pass) == 0)
+ 		return 0;
+ 
+-	if (strcmp(crypt(pass, goodhash), goodhash) == 0)
++	c = crypt(pass, goodhash);
++	if (c == NULL)
++		goto fail;
++
++	if (strcmp(c, goodhash) == 0)
+ 		return 0;
+ 
+ fail:
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch
new file mode 100644
index 000000000000..40a62ae92519
--- /dev/null
+++ b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch
@@ -0,0 +1,722 @@
+Description: Enable support for OpenSSL 1.1
+Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+        Ryan Kavanagh <rak@debian.org>
+Origin: Debian
+Bug: https://github.com/OpenSMTPD/OpenSMTPD/issues/738
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859544
+Forwarded: https://github.com/OpenSMTPD/OpenSMTPD/pull/825
+Last-Update: 2018-03-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/openbsd-compat/libressl.c b/openbsd-compat/libressl.c
+index f4f2b52e..d06e006f 100644
+--- a/openbsd-compat/libressl.c
++++ b/openbsd-compat/libressl.c
+@@ -81,14 +81,14 @@ SSL_CTX_use_certificate_chain(SSL_CTX *ctx, char *buf, off_t len)
+ 	x = ca = NULL;
+ 
+ 	if ((in = BIO_new_mem_buf(buf, len)) == NULL) {
+-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_BUF_LIB);
++		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);
+ 		goto end;
+ 	}
+ 
+ 	if ((x = PEM_read_bio_X509(in, NULL,
+-		    ctx->default_passwd_callback,
+-		    ctx->default_passwd_callback_userdata)) == NULL) {
+-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_PEM_LIB);
++		    SSL_CTX_get_default_passwd_cb(ctx),
++		    SSL_CTX_get_default_passwd_cb_userdata(ctx))) == NULL) {
++		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB);
+ 		goto end;
+ 	}
+ 
+@@ -99,14 +99,11 @@ SSL_CTX_use_certificate_chain(SSL_CTX *ctx, char *buf, off_t len)
+ 	 * the CA certificates.
+ 	 */
+ 
+-	if (ctx->extra_certs != NULL) {
+-		sk_X509_pop_free(ctx->extra_certs, X509_free);
+-		ctx->extra_certs = NULL;
+-	}
++	SSL_CTX_clear_extra_chain_certs(ctx);
+ 
+ 	while ((ca = PEM_read_bio_X509(in, NULL,
+-		    ctx->default_passwd_callback,
+-		    ctx->default_passwd_callback_userdata)) != NULL) {
++		    SSL_CTX_get_default_passwd_cb(ctx),
++		    SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) {
+ 
+ 		if (!SSL_CTX_add_extra_chain_cert(ctx, ca))
+ 			goto end;
+diff --git a/smtpd/ca.c b/smtpd/ca.c
+index e383c6a1..29a44b9b 100644
+--- a/smtpd/ca.c
++++ b/smtpd/ca.c
+@@ -170,6 +170,190 @@ ca_verify_cb(int ok, X509_STORE_CTX *ctx)
+ 	return ok;
+ }
+ 
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++
++static int RSA_meth_get_flags(RSA_METHOD *meth)
++{
++	return meth->flags;
++}
++
++static int RSA_meth_set_flags(RSA_METHOD *meth, int flags)
++{
++	meth->flags = flags;
++	return 1;
++}
++
++static void *RSA_meth_get0_app_data(const RSA_METHOD *meth)
++{
++	return meth->app_data;
++}
++
++static int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)
++{
++	meth->app_data = app_data;
++	return 1;
++}
++
++static int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))
++(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
++{
++	return meth->rsa_pub_enc;
++}
++
++static int RSA_meth_set_pub_enc(RSA_METHOD *meth,
++	int (*pub_enc) (int flen, const unsigned char *from,
++			unsigned char *to, RSA *rsa,
++			int padding))
++{
++	meth->rsa_pub_enc = pub_enc;
++	return 1;
++}
++
++static int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))
++(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
++{
++	return meth->rsa_pub_dec;
++}
++
++static int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))
++(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
++{
++	return meth->rsa_priv_enc;
++}
++
++int RSA_meth_set_priv_enc(RSA_METHOD *meth,
++  int (*priv_enc) (int flen, const unsigned char *from,
++  unsigned char *to, RSA *rsa, int padding))
++{
++	meth->rsa_priv_enc = priv_enc;
++	return 1;
++}
++
++static int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))
++(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)
++{
++	return meth->rsa_priv_dec;
++}
++
++static int RSA_meth_set_priv_dec(RSA_METHOD *meth,
++  int (*priv_dec) (int flen, const unsigned char *from,
++  unsigned char *to, RSA *rsa, int padding))
++{
++	meth->rsa_priv_dec = priv_dec;
++	return 1;
++}
++
++static int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
++  (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
++{
++	return meth->rsa_mod_exp;
++}
++
++static int RSA_meth_set_mod_exp(RSA_METHOD *meth,
++  int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx))
++{
++	meth->rsa_mod_exp = mod_exp;
++	return 1;
++}
++
++static int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))
++(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
++{
++	return meth->bn_mod_exp;
++}
++
++static int RSA_meth_set_bn_mod_exp(RSA_METHOD *meth, int (*bn_mod_exp)
++  (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
++   BN_CTX *ctx, BN_MONT_CTX *m_ctx))
++{
++	meth->bn_mod_exp = bn_mod_exp;
++	return 1;
++}
++
++static int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa)
++{
++	return meth->init;
++}
++
++static int RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa))
++{
++	meth->init = init;
++	return 1;
++}
++
++static int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa)
++{
++	return meth->finish;
++}
++
++static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
++{
++	meth->finish = finish;
++	return 1;
++}
++
++static int (*RSA_meth_get_keygen(const RSA_METHOD *meth))
++  (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
++{
++	return meth->rsa_keygen;
++}
++
++static int RSA_meth_set_keygen(RSA_METHOD *meth, int (*keygen)
++  (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb))
++{
++	meth->rsa_keygen = keygen;
++	return 1;
++}
++
++static int (*RSA_meth_get_verify(const RSA_METHOD *meth))
++  (int dtype, const unsigned char *m,
++   unsigned int m_length, const unsigned char *sigbuf,
++   unsigned int siglen, const RSA *rsa)
++{
++	if (meth->flags & RSA_FLAG_SIGN_VER)
++		return meth->rsa_verify;
++	return NULL;
++}
++
++static int (*RSA_meth_get_sign(const RSA_METHOD *meth))
++  (int type,
++   const unsigned char *m, unsigned int m_length,
++   unsigned char *sigret, unsigned int *siglen,
++   const RSA *rsa)
++{
++	if (meth->flags & RSA_FLAG_SIGN_VER)
++		return meth->rsa_sign;
++	return NULL;
++}
++
++static int RSA_meth_set_pub_dec(RSA_METHOD *meth,
++ int (*pub_dec) (int flen, const unsigned char *from,
++   unsigned char *to, RSA *rsa, int padding))
++{
++	meth->rsa_pub_dec = pub_dec;
++	return 1;
++}
++
++static RSA_METHOD *RSA_meth_new(const char *name, int flags)
++{
++	RSA_METHOD *meth = malloc(sizeof(*meth));
++
++	if (meth != NULL) {
++		memset(meth, 0, sizeof(*meth));
++		meth->flags = flags;
++
++		meth->name = strdup(name);
++		if (meth->name != NULL)
++			return meth;
++
++		free(meth);
++	}
++
++	return NULL;
++}
++
++#endif
++
+ int
+ ca_X509_verify(void *certificate, void *chain, const char *CAfile,
+     const char *CRLfile, const char **errstr)
+@@ -201,7 +385,7 @@ end:
+ 	*errstr = NULL;
+ 	if (ret != 1) {
+ 		if (xsc)
+-			*errstr = X509_verify_cert_error_string(xsc->error);
++			*errstr = X509_verify_cert_error_string(X509_STORE_CTX_get_error(xsc));
+ 		else if (ERR_peek_last_error())
+ 			*errstr = ERR_error_string(ERR_peek_last_error(), NULL);
+ 	}
+@@ -302,24 +486,9 @@ ca_imsg(struct mproc *p, struct imsg *imsg)
+  * RSA privsep engine (called from unprivileged processes)
+  */
+ 
+-const RSA_METHOD *rsa_default = NULL;
+-
+-static RSA_METHOD rsae_method = {
+-	"RSA privsep engine",
+-	rsae_pub_enc,
+-	rsae_pub_dec,
+-	rsae_priv_enc,
+-	rsae_priv_dec,
+-	rsae_mod_exp,
+-	rsae_bn_mod_exp,
+-	rsae_init,
+-	rsae_finish,
+-	0,
+-	NULL,
+-	NULL,
+-	NULL,
+-	rsae_keygen
+-};
++static const RSA_METHOD *rsa_default = NULL;
++
++static const char *rsae_method_name = "RSA privsep engine";
+ 
+ static int
+ rsae_send_imsg(int flen, const unsigned char *from, unsigned char *to,
+@@ -404,7 +573,7 @@ rsae_pub_enc(int flen,const unsigned char *from, unsigned char *to, RSA *rsa,
+     int padding)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	return (rsa_default->rsa_pub_enc(flen, from, to, rsa, padding));
++	return (RSA_meth_get_pub_enc(rsa_default)(flen, from, to, rsa, padding));
+ }
+ 
+ static int
+@@ -412,7 +581,7 @@ rsae_pub_dec(int flen,const unsigned char *from, unsigned char *to, RSA *rsa,
+     int padding)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	return (rsa_default->rsa_pub_dec(flen, from, to, rsa, padding));
++	return (RSA_meth_get_pub_dec(rsa_default)(flen, from, to, rsa, padding));
+ }
+ 
+ static int
+@@ -424,7 +593,7 @@ rsae_priv_enc(int flen, const unsigned char *from, unsigned char *to, RSA *rsa,
+ 		return (rsae_send_imsg(flen, from, to, rsa, padding,
+ 		    IMSG_CA_PRIVENC));
+ 	}
+-	return (rsa_default->rsa_priv_enc(flen, from, to, rsa, padding));
++	return (RSA_meth_get_priv_enc(rsa_default)(flen, from, to, rsa, padding));
+ }
+ 
+ static int
+@@ -436,14 +605,14 @@ rsae_priv_dec(int flen, const unsigned char *from, unsigned char *to, RSA *rsa,
+ 		return (rsae_send_imsg(flen, from, to, rsa, padding,
+ 		    IMSG_CA_PRIVDEC));
+ 	}
+-	return (rsa_default->rsa_priv_dec(flen, from, to, rsa, padding));
++	return (RSA_meth_get_priv_dec(rsa_default)(flen, from, to, rsa, padding));
+ }
+ 
+ static int
+ rsae_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	return (rsa_default->rsa_mod_exp(r0, I, rsa, ctx));
++	return (RSA_meth_get_mod_exp(rsa_default)(r0, I, rsa, ctx));
+ }
+ 
+ static int
+@@ -451,34 +620,36 @@ rsae_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+     const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	return (rsa_default->bn_mod_exp(r, a, p, m, ctx, m_ctx));
++	return (RSA_meth_get_bn_mod_exp(rsa_default)(r, a, p, m, ctx, m_ctx));
+ }
+ 
+ static int
+ rsae_init(RSA *rsa)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	if (rsa_default->init == NULL)
++	if (RSA_meth_get_init(rsa_default) == NULL)
+ 		return (1);
+-	return (rsa_default->init(rsa));
++	return (RSA_meth_get_init(rsa_default)(rsa));
+ }
+ 
+ static int
+ rsae_finish(RSA *rsa)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	if (rsa_default->finish == NULL)
++	if (RSA_meth_get_finish(rsa_default) == NULL)
+ 		return (1);
+-	return (rsa_default->finish(rsa));
++	return (RSA_meth_get_finish(rsa_default)(rsa));
+ }
+ 
+ static int
+ rsae_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)
+ {
+ 	log_debug("debug: %s: %s", proc_name(smtpd_process), __func__);
+-	return (rsa_default->rsa_keygen(rsa, bits, e, cb));
++	return (RSA_meth_get_keygen(rsa_default)(rsa, bits, e, cb));
+ }
+ 
++static RSA_METHOD *rsae_method;
++
+ void
+ ca_engine_init(void)
+ {
+@@ -490,7 +661,7 @@ ca_engine_init(void)
+ 			errstr = "ENGINE_new";
+ 			goto fail;
+ 		}
+-		if (!ENGINE_set_name(e, rsae_method.name)) {
++		if (!ENGINE_set_name(e, rsae_method_name)) {
+ 			errstr = "ENGINE_set_name";
+ 			goto fail;
+ 		}
+@@ -503,25 +674,58 @@ ca_engine_init(void)
+ 		goto fail;
+ 	}
+ 
++	rsae_method = RSA_meth_new(rsae_method_name, 0);
++	if (!rsae_method) {
++		errstr = "RSA_meth_new";
++		goto fail;
++	}
++
+ 	if ((name = ENGINE_get_name(e)) == NULL)
+ 		name = "unknown RSA engine";
+ 
+ 	log_debug("debug: %s: using %s", __func__, name);
+ 
+-	if (rsa_default->flags & RSA_FLAG_SIGN_VER)
++	if (RSA_meth_get_sign(rsa_default) ||
++	    RSA_meth_get_verify(rsa_default))
+ 		fatalx("unsupported RSA engine");
+ 
+-	if (rsa_default->rsa_mod_exp == NULL)
+-		rsae_method.rsa_mod_exp = NULL;
+-	if (rsa_default->bn_mod_exp == NULL)
+-		rsae_method.bn_mod_exp = NULL;
+-	if (rsa_default->rsa_keygen == NULL)
+-		rsae_method.rsa_keygen = NULL;
+-	rsae_method.flags = rsa_default->flags |
+-	    RSA_METHOD_FLAG_NO_CHECK;
+-	rsae_method.app_data = rsa_default->app_data;
+-
+-	if (!ENGINE_set_RSA(e, &rsae_method)) {
++	errstr = "Setting callback";
++	if (!RSA_meth_set_pub_enc(rsae_method, rsae_pub_enc))
++		goto fail;
++        if (!RSA_meth_set_pub_dec(rsae_method, rsae_pub_dec))
++		goto fail;
++        if (!RSA_meth_set_priv_enc(rsae_method, rsae_priv_enc))
++		goto fail;
++        if (!RSA_meth_set_priv_dec(rsae_method, rsae_priv_dec))
++		goto fail;
++
++	if (RSA_meth_get_mod_exp(rsa_default)) {
++		if (!RSA_meth_set_mod_exp(rsae_method, rsae_mod_exp))
++			goto fail;
++	}
++
++	if (RSA_meth_get_bn_mod_exp(rsa_default))
++		if (!RSA_meth_set_bn_mod_exp(rsae_method, rsae_bn_mod_exp))
++			goto fail;
++        if (!RSA_meth_set_init(rsae_method, rsae_init))
++		goto fail;
++        if (!RSA_meth_set_finish(rsae_method, rsae_finish))
++		goto fail;
++
++	if (RSA_meth_get_keygen(rsa_default)) {
++		if (!RSA_meth_set_keygen(rsae_method, rsae_keygen))
++			goto fail;
++	}
++
++	if (!RSA_meth_set_flags(rsae_method,
++			   RSA_meth_get_flags(rsa_default) |
++			   RSA_METHOD_FLAG_NO_CHECK))
++		goto fail;
++
++	if (!RSA_meth_set0_app_data(rsae_method, RSA_meth_get0_app_data(rsa_default)))
++		goto fail;
++
++	if (!ENGINE_set_RSA(e, rsae_method)) {
+ 		errstr = "ENGINE_set_RSA";
+ 		goto fail;
+ 	}
+diff --git a/smtpd/crypto.c b/smtpd/crypto.c
+index 76f98807..01452851 100644
+--- a/smtpd/crypto.c
++++ b/smtpd/crypto.c
+@@ -64,7 +64,7 @@ crypto_setup(const char *key, size_t len)
+ int
+ crypto_encrypt_file(FILE * in, FILE * out)
+ {
+-	EVP_CIPHER_CTX	ctx;
++	EVP_CIPHER_CTX	*ctx;
+ 	uint8_t		ibuf[CRYPTO_BUFFER_SIZE];
+ 	uint8_t		obuf[CRYPTO_BUFFER_SIZE];
+ 	uint8_t		iv[IV_SIZE];
+@@ -91,12 +91,14 @@ crypto_encrypt_file(FILE * in, FILE * out)
+ 	if ((w = fwrite(iv, 1, sizeof iv, out)) != sizeof iv)
+ 		return 0;
+ 
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
++        ctx = EVP_CIPHER_CTX_new();
++        if (!ctx)
++                return 0;
++	EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
+ 
+ 	/* encrypt until end of file */
+ 	while ((r = fread(ibuf, 1, CRYPTO_BUFFER_SIZE, in)) != 0) {
+-		if (!EVP_EncryptUpdate(&ctx, obuf, &len, ibuf, r))
++		if (!EVP_EncryptUpdate(ctx, obuf, &len, ibuf, r))
+ 			goto end;
+ 		if (len && (w = fwrite(obuf, len, 1, out)) != 1)
+ 			goto end;
+@@ -105,13 +107,13 @@ crypto_encrypt_file(FILE * in, FILE * out)
+ 		goto end;
+ 
+ 	/* finalize and write last chunk if any */
+-	if (!EVP_EncryptFinal_ex(&ctx, obuf, &len))
++	if (!EVP_EncryptFinal_ex(ctx, obuf, &len))
+ 		goto end;
+ 	if (len && (w = fwrite(obuf, len, 1, out)) != 1)
+ 		goto end;
+ 
+ 	/* get and append tag */
+-	EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag);
++	EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag);
+ 	if ((w = fwrite(tag, sizeof tag, 1, out)) != 1)
+ 		goto end;
+ 
+@@ -119,14 +121,14 @@ crypto_encrypt_file(FILE * in, FILE * out)
+ 	ret = 1;
+ 
+ end:
+-	EVP_CIPHER_CTX_cleanup(&ctx);
++	EVP_CIPHER_CTX_free(ctx);
+ 	return ret;
+ }
+ 
+ int
+ crypto_decrypt_file(FILE * in, FILE * out)
+ {
+-	EVP_CIPHER_CTX	ctx;
++	EVP_CIPHER_CTX	*ctx;
+ 	uint8_t		ibuf[CRYPTO_BUFFER_SIZE];
+ 	uint8_t		obuf[CRYPTO_BUFFER_SIZE];
+ 	uint8_t		iv[IV_SIZE];
+@@ -171,11 +173,13 @@ crypto_decrypt_file(FILE * in, FILE * out)
+ 	sz -= sizeof tag;
+ 
+ 
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
++        ctx = EVP_CIPHER_CTX_new();
++        if (!ctx)
++                return 0;
++	EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
+ 
+ 	/* set expected tag */
+-	EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag);
++	EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag);
+ 
+ 	/* decrypt until end of ciphertext */
+ 	while (sz) {
+@@ -185,7 +189,7 @@ crypto_decrypt_file(FILE * in, FILE * out)
+ 			r = fread(ibuf, 1, sz, in);
+ 		if (!r)
+ 			break;
+-		if (!EVP_DecryptUpdate(&ctx, obuf, &len, ibuf, r))
++		if (!EVP_DecryptUpdate(ctx, obuf, &len, ibuf, r))
+ 			goto end;
+ 		if (len && (w = fwrite(obuf, len, 1, out)) != 1)
+ 			goto end;
+@@ -195,7 +199,7 @@ crypto_decrypt_file(FILE * in, FILE * out)
+ 		goto end;
+ 
+ 	/* finalize, write last chunk if any and perform authentication check */
+-	if (!EVP_DecryptFinal_ex(&ctx, obuf, &len))
++	if (!EVP_DecryptFinal_ex(ctx, obuf, &len))
+ 		goto end;
+ 	if (len && (w = fwrite(obuf, len, 1, out)) != 1)
+ 		goto end;
+@@ -204,14 +208,14 @@ crypto_decrypt_file(FILE * in, FILE * out)
+ 	ret = 1;
+ 
+ end:
+-	EVP_CIPHER_CTX_cleanup(&ctx);
++	EVP_CIPHER_CTX_free(ctx);
+ 	return ret;
+ }
+ 
+ size_t
+ crypto_encrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen)
+ {
+-	EVP_CIPHER_CTX	ctx;
++	EVP_CIPHER_CTX	*ctx;
+ 	uint8_t		iv[IV_SIZE];
+ 	uint8_t		tag[GCM_TAG_SIZE];
+ 	uint8_t		version = API_VERSION;
+@@ -239,33 +243,35 @@ crypto_encrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen)
+ 	memcpy(out + len, iv, sizeof iv);
+ 	len += sizeof iv;
+ 
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
++        ctx = EVP_CIPHER_CTX_new();
++        if (!ctx)
++                return 0;
++	EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
+ 
+ 	/* encrypt buffer */
+-	if (!EVP_EncryptUpdate(&ctx, out + len, &olen, in, inlen))
++	if (!EVP_EncryptUpdate(ctx, out + len, &olen, in, inlen))
+ 		goto end;
+ 	len += olen;
+ 
+ 	/* finalize and write last chunk if any */
+-	if (!EVP_EncryptFinal_ex(&ctx, out + len, &olen))
++	if (!EVP_EncryptFinal_ex(ctx, out + len, &olen))
+ 		goto end;
+ 	len += olen;
+ 
+ 	/* get and append tag */
+-	EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag);
++	EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag);
+ 	memcpy(out + len, tag, sizeof tag);
+ 	ret = len + sizeof tag;
+ 
+ end:
+-	EVP_CIPHER_CTX_cleanup(&ctx);
++	EVP_CIPHER_CTX_cleanup(ctx);
+ 	return ret;
+ }
+ 
+ size_t
+ crypto_decrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen)
+ {
+-	EVP_CIPHER_CTX	ctx;
++	EVP_CIPHER_CTX	*ctx;
+ 	uint8_t		iv[IV_SIZE];
+ 	uint8_t		tag[GCM_TAG_SIZE];
+ 	int		olen;
+@@ -292,24 +298,26 @@ crypto_decrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen)
+ 	inlen -= sizeof iv;
+ 	in += sizeof iv;
+ 
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
++        ctx = EVP_CIPHER_CTX_new();
++        if (!ctx)
++                return 0;
++	EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv);
+ 
+ 	/* set expected tag */
+-	EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag);
++	EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag);
+ 
+ 	/* decrypt buffer */
+-	if (!EVP_DecryptUpdate(&ctx, out, &olen, in, inlen))
++	if (!EVP_DecryptUpdate(ctx, out, &olen, in, inlen))
+ 		goto end;
+ 	len += olen;
+ 
+ 	/* finalize, write last chunk if any and perform authentication check */
+-	if (!EVP_DecryptFinal_ex(&ctx, out + len, &olen))
++	if (!EVP_DecryptFinal_ex(ctx, out + len, &olen))
+ 		goto end;
+ 	ret = len + olen;
+ 
+ end:
+-	EVP_CIPHER_CTX_cleanup(&ctx);
++	EVP_CIPHER_CTX_cleanup(ctx);
+ 	return ret;
+ }
+ 
+diff --git a/smtpd/libressl.c b/smtpd/libressl.c
+index 57d74389..db78d943 100644
+--- a/smtpd/libressl.c
++++ b/smtpd/libressl.c
+@@ -94,10 +94,10 @@ ssl_ctx_use_certificate_chain_bio(SSL_CTX *ctx, BIO *in)
+ 
+ 	ERR_clear_error(); /* clear error stack for SSL_CTX_use_certificate() */
+ 
+-	x = PEM_read_bio_X509_AUX(in, NULL, ctx->default_passwd_callback,
+-	    ctx->default_passwd_callback_userdata);
++	x = PEM_read_bio_X509_AUX(in, NULL, SSL_CTX_get_default_passwd_cb(ctx),
++	    SSL_CTX_get_default_passwd_cb_userdata(ctx));
+ 	if (x == NULL) {
+-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_PEM_LIB);
++		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB);
+ 		goto end;
+ 	}
+ 
+@@ -115,14 +115,11 @@ ssl_ctx_use_certificate_chain_bio(SSL_CTX *ctx, BIO *in)
+ 		int r;
+ 		unsigned long err;
+ 
+-		if (ctx->extra_certs != NULL) {
+-			sk_X509_pop_free(ctx->extra_certs, X509_free);
+-			ctx->extra_certs = NULL;
+-		}
++		SSL_CTX_clear_extra_chain_certs(ctx);
+ 
+ 		while ((ca = PEM_read_bio_X509(in, NULL,
+-		    ctx->default_passwd_callback,
+-		    ctx->default_passwd_callback_userdata)) != NULL) {
++		    SSL_CTX_get_default_passwd_cb(ctx),
++		    SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) {
+ 			r = SSL_CTX_add_extra_chain_cert(ctx, ca);
+ 			if (!r) {
+ 				X509_free(ca);
+@@ -160,7 +157,7 @@ SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len)
+ 
+ 	in = BIO_new_mem_buf(buf, len);
+ 	if (in == NULL) {
+-		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_BUF_LIB);
++		SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB);
+ 		goto end;
+ 	}
+ 
+diff --git a/smtpd/ssl.c b/smtpd/ssl.c
+index b88360eb..0c93d87e 100644
+--- a/smtpd/ssl.c
++++ b/smtpd/ssl.c
+@@ -425,7 +425,7 @@ ssl_ctx_fake_private_key(SSL_CTX *ctx, const void *data, size_t datalen,
+ 	 */
+ 	ret = SSL_CTX_use_PrivateKey(ctx, pkey);
+ 	if (!ret)
+-		SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_SSL_LIB);
++		SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_SYS_LIB);
+ 
+ 	if (pkeyptr != NULL)
+ 		*pkeyptr = pkey;
+diff --git a/smtpd/ssl.h b/smtpd/ssl.h
+index 90f018d0..553120d4 100644
+--- a/smtpd/ssl.h
++++ b/smtpd/ssl.h
+@@ -73,3 +73,17 @@ void	SSL_CTX_set_ecdh_auto(SSL_CTX *, int);
+ void	SSL_CTX_set_dh_auto(SSL_CTX *, int);
+ #endif
+ int SSL_CTX_use_certificate_chain_mem(SSL_CTX *, void *, int);
++
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
++
++static inline pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx)
++{
++	return ctx->default_passwd_callback;
++}
++
++static inline void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx)
++{
++	return ctx->default_passwd_callback_userdata;
++}
++
++#endif
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
new file mode 100644
index 000000000000..48e538cad47e
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="https://www.opensmtpd.org"
+SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libressl pam +mta"
+
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+		elibc_musl? ( sys-libs/fts-standalone )
+		sys-libs/zlib
+		pam? ( virtual/pam )
+		sys-libs/db:=
+		dev-libs/libevent
+		app-misc/ca-certificates
+		net-mail/mailbase
+		net-libs/libasr
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/mini-qmail
+		!mail-mta/msmtp[mta]
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/qmail-ldap
+		!mail-mta/sendmail
+		!mail-mta/ssmtp[mta]
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_}
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-on-auth.patch"
+	"${FILESDIR}/${P}-openssl_1.1.patch"
+)
+
+src_configure() {
+	tc-export AR
+	AR="$(which "$AR")" econf \
+		--with-table-db \
+		--with-user-smtpd=smtpd \
+		--with-user-queue=smtpq \
+		--with-group-queue=smtpq \
+		--with-path-socket=/run \
+		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
+		--sysconfdir=/etc/opensmtpd \
+		$(use_with pam auth-pam)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/smtpd.initd smtpd
+	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
+	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+	dosym /usr/sbin/smtpctl /usr/sbin/makemap
+	dosym /usr/sbin/smtpctl /usr/sbin/newaliases
+	if use mta ; then
+		dodir /usr/sbin
+		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
+		dosym /usr/sbin/smtpctl /usr/bin/sendmail
+		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
+	fi
+}
+
+pkg_preinst() {
+	enewgroup smtpd 25
+	enewuser smtpd 25 -1 /var/empty smtpd
+	enewgroup smtpq 252
+	enewuser smtpq 252 -1 /var/empty smtpq
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
+	einfo "Redis, and many other useful addons and filters are"
+	einfo "available in the mail-filter/opensmtpd-extras package."
+	einfo
+}
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
deleted file mode 100644
index b8e388fa4fe1..000000000000
--- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
-
-DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
-HOMEPAGE="https://www.opensmtpd.org"
-SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
-
-LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libressl pam +mta"
-
-DEPEND="!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		elibc_musl? ( sys-libs/fts-standalone )
-		sys-libs/zlib
-		pam? ( virtual/pam )
-		sys-libs/db:=
-		dev-libs/libevent
-		app-misc/ca-certificates
-		net-mail/mailbase
-		net-libs/libasr
-		!mail-mta/courier
-		!mail-mta/esmtp
-		!mail-mta/exim
-		!mail-mta/mini-qmail
-		!mail-mta/msmtp[mta]
-		!mail-mta/netqmail
-		!mail-mta/nullmailer
-		!mail-mta/postfix
-		!mail-mta/qmail-ldap
-		!mail-mta/sendmail
-		!mail-mta/ssmtp[mta]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_}
-
-src_configure() {
-	tc-export AR
-	AR="$(which "$AR")" econf \
-		--with-table-db \
-		--with-user-smtpd=smtpd \
-		--with-user-queue=smtpq \
-		--with-group-queue=smtpq \
-		--with-path-socket=/run \
-		--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
-		--sysconfdir=/etc/opensmtpd \
-		$(use_with pam auth-pam)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/smtpd.initd smtpd
-	systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
-	use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
-	dosym /usr/sbin/smtpctl /usr/sbin/makemap
-	dosym /usr/sbin/smtpctl /usr/sbin/newaliases
-	if use mta ; then
-		dodir /usr/sbin
-		dosym /usr/sbin/smtpctl /usr/sbin/sendmail
-		dosym /usr/sbin/smtpctl /usr/bin/sendmail
-		dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
-	fi
-}
-
-pkg_preinst() {
-	enewgroup smtpd 25
-	enewuser smtpd 25 -1 /var/empty smtpd
-	enewgroup smtpq 252
-	enewuser smtpq 252 -1 /var/empty smtpq
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
-	einfo "Redis, and many other useful addons and filters are"
-	einfo "available in the mail-filter/opensmtpd-extras package."
-	einfo
-}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d4467f1d35b1..3c43e5039163 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -13,7 +13,7 @@ DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
 DIST postfix-3.3.2.tar.gz 4429452 BLAKE2B 8cbb4ea6626da1fdb78a3f4e5c546b6a335fe7e5727c2f7eb3f14e2b28791165857112e6af4698eae7e38339232fed722e238e289fef40bd1091b3048a543f7f SHA512 df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f
-DIST postfix-3.4-20181202.tar.gz 4508807 BLAKE2B d83e138e42250cc6da839f7a11f57e4b4697468b9f3aa47f5c04f5664d35f4b5929096e74d443891bbaa9143826ef809e2dc5d83892ce22d13ce1c4c89e3d8cf SHA512 c0af172a02d1aba1d24c6243d0d8966c93b50aa394e7db835bfd25ef10569be2e634a7bc927c4ef8c74b78712771f01ccbf784abe265d1692a3e0450ec7367cd
+DIST postfix-3.4-20190106.tar.gz 4511160 BLAKE2B 2ed751e6a7099285b3acfabb838b6e20a0d7db5d173348530fbc0eda82485db12efab20aa7b0b40795ad40aa8559143dd8ca3951603c7b935bfba3e0b889516c SHA512 ac6f162c0325cb88f48ae0d661becf769e5e725207b83667b02a64875b05f68db1892d6e457e48f7392329aabf03dacd57feea92a27b1f3e79373d990a8e4ccd
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8728 BLAKE2B 6170156f1dded2c727b6e2979e45d9d8e6ad77ef456e4e7da8491b03cfabe7fda627f77dc6090ca7285891619f77c5d3546c45536b25356641f5fa37c23f27d4 SHA512 e59ed518a63a41937e1ff8e68fe811bb13abbefbb6c0ff8ab7655434e8f297a18e7da0adb61442f46e8cee87dcd680909be148f1d5f1f75525f2080819eaa75e
 EBUILD postfix-3.1.6.ebuild 8659 BLAKE2B 6183a1dfb91e139881f95f0ca14a913e4671add67fac8aa09592b5e49897fd2d2dbeb5ee2403d81b5987b57959c626b2fe58f31f061ac29c9755865f51882fdc SHA512 3495dfd446a00555018aa2854c1a8131a47de01bd11436b0097b18dacb1d4730ba2dc582f2656fe2529522ff5e28989cfe2d88b4007e426c9374d6e40eace203
@@ -22,5 +22,5 @@ EBUILD postfix-3.2.6.ebuild 8416 BLAKE2B ed735012a5d79a5e13281b7e645c0040f20af8f
 EBUILD postfix-3.3.1-r1.ebuild 8406 BLAKE2B 0242059df542da99a0cf2c4d5e4e54da5cd2b714b0f3d826179d827d13d3d548c59aa7e9ae0a0ff0c9eed864553fcbda1c460d4b6f8f9fe68e135facd028ab5e SHA512 dd62306944ffc38a7fc3e8cd1020638176ea66ba3c80acbd0528ca87c332a34045e1480cb3866a7865a009c834056979188566cf9c93339fc38a463b542b5faf
 EBUILD postfix-3.3.1.ebuild 8423 BLAKE2B 7abc1da7d8cf5c7ea1f13146e11b1b6f4f6536238b95b873060a5f73a808caf2eb2c618d0bad1d786b2e2459e4dca99864d1fff490190e55880bd0568167aac0 SHA512 3a29c0952518b3a7cdae90abeb8be7e4774b2ce0bf5e621a11f0e61f913c6be4b3fdc7177e536748372e14accb8b4217882c407c9c169dd422c7be0405b9537f
 EBUILD postfix-3.3.2.ebuild 8717 BLAKE2B 6a46973c36cea7daa996a2ca829d5d26c44806673a5d55777be4306b7ce19a309dbf0405efafd3af064c192039c4afe956cc9c6827636924ff03b4c9cfe5c68d SHA512 3843f65dfdb523663d8f9d771e97752d14952afea657f450052a960a90bf4bac7e91a8650deaa974913bb85aa09583ef5344839c73e503313285caac5c83daa9
-EBUILD postfix-3.4_pre20181202.ebuild 8720 BLAKE2B e94df6e31de7c18fafef31cc3f20b08a8e3cac44b0f32b8260afc478cef8658bbbad3e5d8871beedf2b0eedb6d4f1d9e6bd4c09bd3eb67042c6b56a05d13b612 SHA512 c78208a7b94ea7ec81db73bee69b216c3ced0ec50776b3b40410f482aba9f863d7d314c1d2c234512d99c9406cfb2d05831809045ad895dd43898389f3f6a18a
+EBUILD postfix-3.4_pre20190106.ebuild 8720 BLAKE2B d5017f810c364afcafeb2f683617fe6ef747b014171ec8a2dff852708efd2f239904594c711f882a4632b1e1866e974860661915ff136668f5033d5e11a7dfbc SHA512 8cbc4d456d53f3638c9fb510ff7357c40b822807039a54eee8efa51cbe9aeda32f08bf0fdeedb9dee4429f4652b012777b755889a7cf7655c85acc2085765cfa
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.4_pre20181202.ebuild b/mail-mta/postfix/postfix-3.4_pre20181202.ebuild
deleted file mode 100644
index b3e3bf4624be..000000000000
--- a/mail-mta/postfix/postfix-3.4_pre20181202.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( virtual/mysql )
-	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-	eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
-		"${FILESDIR}/${PN}-libressl-runtime.patch" \
-		"${FILESDIR}/${PN}-libressl-eccurve.patch" \
-		"${FILESDIR}/${PN}-libressl-session-tickets.patch"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.4_pre20190106.ebuild b/mail-mta/postfix/postfix-3.4_pre20190106.ebuild
new file mode 100644
index 000000000000..206450dcb939
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.4_pre20190106.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	nis? ( net-libs/libnsl )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+		"${FILESDIR}/${PN}-libressl-runtime.patch" \
+		"${FILESDIR}/${PN}-libressl-eccurve.patch" \
+		"${FILESDIR}/${PN}-libressl-session-tickets.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 40ab733d8ca6..efd545095940 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -10,6 +10,6 @@ AUX sendmail.service 353 BLAKE2B 9ae842fd4cd5f12ad54359772880bffe7e96f51f6b1e05e
 AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add0908c035a958dc34ebe15941a37add15f24116e3cf2779bf003d965baae10dbbcafdb61f0af453227 SHA512 82d9bbb233e6ffbcef411f8a8184b47aea27f3dc0b41ace053e0107e05a5fe6929d9dd76d3d1baf0ce43be78dc46f40888ad0c93e4f126f6ce0c0372007a262d
 AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
 DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
-EBUILD sendmail-8.14.9-r1.ebuild 7110 BLAKE2B cfa8435b164146d77131032251d487f5010e3adb72abfda8cfba8e3abe89ead9de0ff8b424670b566e245cd80c0d448c501b984dbfc76d5bf86b699937ad11b7 SHA512 3392d8cc6f5370958a22055cd403c9730b17e28a2388bb87264edbd264ddf117ca1c43a3623ba70126542dd63cfe5a611a3a6c1bfc15fda4dc4a3a2bc08f8652
-EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B 5ee34da2aa9d1cee4f9ff7521b4b70e654d678efb64f62e9b99d3f32b12e1c4ca1e6788445080b1a09d32b047313af0009ef7762977fd981d0f8b97130653064 SHA512 bb29cee737f08e55e672315ac0dfa26d660dcbdf2dec2b6cd648596449ff837be654890c14f68fd13612d3d799ea084af3bd55a514ab5c67ef0ae4ba9273ced2
+EBUILD sendmail-8.14.9-r1.ebuild 7110 BLAKE2B bb8f35fdfc6a63c590445984a3ac1fca444106af6cfe0199d1293d63dab6fd39fecbe25e658b8cb626df6ebb08855c645d9ea58b64341797aca775fb05e0c660 SHA512 1a64fb6d117712ff0371663db3bf514f5e1e5b09d033e4539159385aa8adf52adffefdaddd0d7a084b6991a373470c4f795f850a5ecca7b1bc7d1305f18c1782
+EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B 61e6ba9e7b36ae1dfc4e733cd201c50c8655a57184e8d092a9282bbb8db33d636622978df6241897ef8246cb21d5f13a9536313898b937e51753aeec3654719b SHA512 1039f0200eb87e2c5c8f0416f0a512584932bd21bb1f3b7aeb8cef7c8b9e779c7ff4c376018eaa89a1105057a38d6ce063b291e0cec612dc3fc8f1a583b224f1
 MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
diff --git a/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild b/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild
index 01104843e2bd..6b54b50e57a8 100644
--- a/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,8 +18,8 @@ DEPEND="net-mail/mailbase
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 	ldap? ( net-nds/openldap )
 	>=sys-libs/db-3.2
diff --git a/mail-mta/sendmail/sendmail-8.14.9.ebuild b/mail-mta/sendmail/sendmail-8.14.9.ebuild
index d356bfab013b..36016a1d8c95 100644
--- a/mail-mta/sendmail/sendmail-8.14.9.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,7 @@ DEPEND="net-mail/mailbase
 	sys-devel/m4
 	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:0= )
 	ldap? ( net-nds/openldap )
 	>=sys-libs/db-3.2
 	!net-mail/vacation
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 6e0bcfc5b624..4a40795088ff 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 50ac03e38397..04bb473ad5cf 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.0.25.tar.xz 351768 BLAKE2B cfdd7570c99db9e75658369df9eb243ddb6290dfe8017bcff12edf876134ba185083e70676369962a2a9f35365e92268625b47da286aca640927fb7a47073295 SHA512 c09c3ecb3d4c50f613234398fabd327ca92b8abbc27082e8e98f2944f3dd9f0c2ff4c022ff5e5503a86e724bb8e2fbf6cd081f8a29e91b4209f5bf0e32168c3e
 DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 EBUILD cantarell-0.0.25.ebuild 641 BLAKE2B 6b42a567d4f3e9c39954865a322b561ffd0a1c5652fbfff951a42376fb26f737b062ecea048edfe553323910dd6f2ac0b0b0c72d030c5dd466a60b9fd49a7ebf SHA512 a7de207b7637b77982e1aaf5a2091afca6012a6f6f7b53a4f172ffea87a063e37a511380fb5354b6e912a0875391f43a28b7c6f41302cbb1fcb36206de95fc16
-EBUILD cantarell-0.101.ebuild 1258 BLAKE2B 8dcc538146be8782a787809fe27a88f98a817bc2f23e647e7f6e2bcfebab157737b412752eb4f0e103baa7cbe834810083e43f0ecdeaf8db545cc1df9649ff12 SHA512 d7228b34b32e926911b5c8d200d8f323480f6fd244d037c743eb34900ada32d4ca6465e3b0976c62030a7745bcecb46a78ce92580763bb58673aee436fe2daa3
+EBUILD cantarell-0.101.ebuild 1257 BLAKE2B d15ca7d6cc7850ba457beccadd83e49ec2620d085956de26c8e54dce8a11f3c4e677905c0e8e0dfc6931bae287b7e394cd5edeb1bb99e8a79c89a3ead87550cf SHA512 158e28809080dd294030f2c4c81d315bc319d4f998aecba0d436f2084d623f8c1a40855f2e4bcafda1bb3b7c120aebd66e0533597fad41dc565ff1b7dd671463
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
index b17446c96fd3..1f065b111b71 100644
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ b/media-fonts/cantarell/cantarell-0.101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 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=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index a41b780b817b..08bc7832a052 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,3 +1,3 @@
 DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
-EBUILD glass-tty-vt220-001.3.ebuild 572 BLAKE2B 8740e70c6d10fe612a4242b77b00cbb96f0a9edfa3ad1dfe5825c060f7261007a4f4c22e948e6eeeca3304d1de1a71c7869857438d47937f24b293e1b660248a SHA512 1d0d1c9bd022b3cc58afdc37cef4e8bf7ca69629bd5d725edb4e2fee63175426a877a9968e216a9ca9de92873338bd9513af9a4878c67f82cb0174f3d5b0868e
+EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 4950e808e21d9729d741b17d6c51c5766d5c05777c1749b66463f287c9ecadf1ee0c3065d368a80ce94eb0acfeb6f3240fdfe88e8dae4dde665746adb638ff8a SHA512 de4b9991e5597c22efecfe95fde6ef053317939341f6bd65117767ab9eaf367fa93d51ada3df56857ec1c789682f1bbe5349ea68714a76ffa31ba17eea013adc
 MISC metadata.xml 857 BLAKE2B 2c79eff84b11bae387c6d591fb90551c6e6f5b31d72f14925a135c23b62c95e9e4ba81513a3ccfa44eda0da20fc2b0e432268b122dae09197e89cc7ffa97f671 SHA512 c5bc22dc0a7bb56da981b7eb9b1403f937a51f9d6e646dd6693db24aa7bb8064d206f0b51ab07f8f1358b4039c87957c6f33bca608d74880375081456e70f5cd
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
index a73acda67581..704b5cb1b0f5 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Hacking with Style: TrueType VT220 Font"
 HOMEPAGE="http://sensi.org/~svo/glasstty/"
 SRC_URI="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-${PV}.ttf"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="freedist"
 SLOT="0"
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index f0f5ed460827..9672527157ca 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,5 @@
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
+DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a SHA512 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
 EBUILD terminus-font-4.46.ebuild 2632 BLAKE2B f6212bbc817ce13639f59588a6770a63da9b8cdab9e634af2d40cf8dc43d76e94f5ea6b6bc5e1a06a131b412bd39b69462760675f35c7bd16d433c0beeb3e6c4 SHA512 5520eef30caf534abce1c5db60fa3181441ef4d8392342fd4046914fb833b47db4866dd8ddbc4b029dacf702c2cb9c4b8f31d56c80c96070f47a9882b9875c4e
+EBUILD terminus-font-4.47.ebuild 2639 BLAKE2B 0a92d8bd6f7e2ac20553765d1de74f03f1d4ac12636897cd21df8d9dd68c672d9d9e936586ef834e40278e336476e691e5670f119618288706dd09b92914f085 SHA512 1f203215affee738b7f1ed1a5b67fea5b379ffcd0007838577291c1103bc8d596ef8842c5dbd1105496b41ceb034af49bf9e48c77613f91b34b2edc7328100fc
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
new file mode 100644
index 000000000000..d5e7073c67f4
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit font python-any-r1
+
+DESCRIPTION="A clean fixed font for the console and X11"
+HOMEPAGE="http://terminus-font.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="OFL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
+	ru-dv +ru-g ru-i ru-k"
+
+DEPEND="app-arch/gzip
+	${PYTHON_DEPEND}
+	virtual/awk
+	pcf? ( x11-apps/bdftopcf )"
+RDEPEND=""
+
+FONTDIR=/usr/share/fonts/terminus
+FONT_CONF=( 75-yes-terminus.conf )
+DOCS=( README README-BG AUTHORS CHANGES )
+
+REQUIRED_USE="X? ( pcf )"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+
+	# Upstream patches. Some of them are suggested to be applied by default
+	# dv - de NOT like latin g, but like caps greek delta
+	#      ve NOT like greek beta, but like caps latin B
+	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
+	# ka - small ka NOT like minimised caps latin K, but like small latin k
+	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
+	use center-tilde 	&& eapply "${S}"/alt/td1.diff
+	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
+	use ru-i     		&& eapply "${S}"/alt/ij1.diff
+	use ru-k     		&& eapply "${S}"/alt/ka2.diff
+	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
+	use ru-g     		&& eapply "${S}"/alt/ge2.diff
+	use quote    		&& eapply "${S}"/alt/gq2.diff
+}
+
+src_configure() {
+	local configure_args=(
+		--prefix="${EPREFIX}"/usr
+		--psfdir="${EPREFIX}"/usr/share/consolefonts
+		--x11dir="${EPREFIX}"/${FONTDIR}
+	)
+	# selfwritten configure script
+	./configure "${configure_args[@]}" || die
+}
+
+src_compile() {
+	local args=(
+		$(usex psf 'psf psf-vgaw' '')
+		$(usex pcf 'pcf pcf-8bit' '')
+	)
+	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
+}
+
+src_install() {
+	local args=(
+		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
+		$(usex pcf 'install-pcf' '')
+	)
+	# Set the CHECKDIR to a dummy location so we always get the same set of
+	# files installed regardless of what is in / or ROOT or wherever.
+	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
+
+	# Remove trans files that the kbd package takes care of installing.
+	rm -f "${ED}"/usr/share/consoletrans/*.trans
+
+	if use pcf-unicode-only; then
+		# Only the ter-x* fonts are unicode (ISO-10646-1) based
+		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
+	fi
+
+	font_src_install
+
+	einstalldocs
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index dfe837a978e2..d599e09d4751 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index d41098d981fe..ba29bdaa050c 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,6 +1,6 @@
 AUX cura-3.3.0-fix-install-paths.patch 1663 BLAKE2B 293bdecb0e6ef130e80bc078f89470908bdc74f9ede901405e8b99953dc5927986d51db3f3494004c44ea543621328c24860ff3ab0c1ff4452d2347f082a53fb SHA512 0c42638c0f0f0cc108c0aec19b0319037c4a17ac4fc6d05920191a927ee32ea4901ca4cb2ae5473c3ded2afbcabd2cad55b6cbaf3ad986ad205fc22936c31fa2
-DIST cura-3.3.1.tar.gz 21045888 BLAKE2B 6298a291498fb7930970fdb15827e5698011e69c69326e07ecaf5440994b099aa3ce9ee2540b968ffaff1ad47a58ef76bc7c5c003e92b710d81fc649e4fc825a SHA512 7b05885213828f0c297c7798b4bf7ea5967902893b5743b424d65d3a0c88804ed208c3d0361b92cade8ad31a42d1aff3a07eb4d2effa15597f942603a2d2bf63
 DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee6ac012141eac1b7332046790e2e85c4e643c1ebb13ceded6024cd52aeab2bcd0db555db8f355a7b568bed728 SHA512 5d1935c923173a5ea6d3a95181d61c8deffbb51f3ee4f3e4cb2c5a58f79581d3dd9adc6a9583e6ca0ab5da4c36b63695d7479e67d1237c132354616aa990e3c1
-EBUILD cura-3.3.1.ebuild 1560 BLAKE2B e2f15c15c760602a8512020f830273d188c680d3521b210c5b88c91d9770ae11b7378cddd275f719b0333b9d1d94b866112e82444e6a2bdd143ec0e4679e1507 SHA512 c8422f406a785356c2ff06a5616a38874fcdcb726a25249b16f942eabbba5fe0cf6d1b6a511424adbad53727c526714dc39af898494e6abd46b0382dffd2b0b5
+DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 EBUILD cura-3.4.1.ebuild 1678 BLAKE2B 5c05b4777d95bf1427f4314e7cd6790a0879ce55da89a8b04cc2a7a991f55cdd1b6fd61f454a59986e743ff7209cb8437382b92ac689245687b82da155c71ea9 SHA512 25c727be6b867f5af5baadc1718ea3492aa80679a0bb5331794fb8ea19af10af6e2da5d6a7908d9e8e0ba4aca2d9cda46baf2c2abd5c5bbe5fef95933ac2ecdb
+EBUILD cura-3.6.0.ebuild 1675 BLAKE2B 2ba6d31604abc1bd1a6e9f128b0d892c7dc12b0ad65210a8d504104fff2662d28a2f0df5d4825826e53b7b88ce78ef9c690fe64cd866f7db2741e4d7432c11e1 SHA512 43e21fbf81985e482fbccab4d679bc5d3e2539f7b6b2cf585ad4cb7b207246efa3fdca59a0ef2d2a999c6491c071deafe418a0c9de372a9df9a9e15791c5f840
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.3.1.ebuild b/media-gfx/cura/cura-3.3.1.ebuild
deleted file mode 100644
index b2a58d65a582..000000000000
--- a/media-gfx/cura/cura-3.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
new file mode 100644
index 000000000000..379309b70d65
--- /dev/null
+++ b/media-gfx/cura/cura-3.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils fdo-mime gnome2-utils python-single-r1
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
+	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index 00491e1efb6c..519140d78e54 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,5 +1,5 @@
-DIST curaengine-3.3.0.tar.gz 935367 BLAKE2B c02fa8ac5d79f6506dad91967f46add0b22b585cfb9931d67e34a033a59ba828722782f7fcf590ef45aa645b3c5dcb92416dbb5ef321fd5bf19935b2b5f1d4e7 SHA512 14b1961c90ec8ecad6fadfb992b72a4e05f3fa6c9a7b580812f90410c655db9d5798d46aa17311c216631daae1c21f6255c6fc4a0d903a91091e0a7a63642f70
 DIST curaengine-3.4.1.tar.gz 949312 BLAKE2B 4902575c40002ab49e3ef13c94c8531b6975ff62e58012dc48744e2d27e9d1767e8f7768250179a374ed24da5a5e2085e9c194068ad6ffb98fff0595a314f7b0 SHA512 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
-EBUILD curaengine-3.3.0.ebuild 864 BLAKE2B 46798444b183df3a6ac8d849f21cde7eba678a0bac6469fb74eb7f65493413446ea8662b2b5de1c2938c14d60ddca660d5b7e53a3f4a5af01024c2712c67cbd1 SHA512 a8a1c307ac9575f0ffde948c8e33c1deb6f6cd0c4210a6772a7faf3d76761a16f93002238270dca8faaed413e1af8ae33774d24032fe4a67a6fcbda94a0e7c50
-EBUILD curaengine-3.4.1.ebuild 864 BLAKE2B 46798444b183df3a6ac8d849f21cde7eba678a0bac6469fb74eb7f65493413446ea8662b2b5de1c2938c14d60ddca660d5b7e53a3f4a5af01024c2712c67cbd1 SHA512 a8a1c307ac9575f0ffde948c8e33c1deb6f6cd0c4210a6772a7faf3d76761a16f93002238270dca8faaed413e1af8ae33774d24032fe4a67a6fcbda94a0e7c50
+DIST curaengine-3.6.0.tar.gz 1390109 BLAKE2B a0a6b8016bb5fa2f772634a671fc391df45875fc36cdf100f00ce34b9d5495f32986c473b1ba4c184cb77e50a64e2648c5d4f31053790182e657b0c981e1412c SHA512 340dad4c697fb0d7b633091715a904ae7df8973626e217ae2528d0121723c07a6cf0bbc740b9ad9980f3b288fa690c9c3ee43d90914264855dace007bbb334c8
+EBUILD curaengine-3.4.1.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
+EBUILD curaengine-3.6.0.ebuild 875 BLAKE2B 943c5d77bb91f833a42005edff60824935bc9cc0d6707035ee5ab2fe29d8d631c51fc7678b96dbebf468ea2e5bbb9cfb233999ffaadcf9f196ec824ba2f3d83f SHA512 4ec5e4cb05f236ff9052ecf6455967d05ae668002d255af0d8435960080882ec687de6d7547074d4fee1fd435a04796a26dc4bcdd595ad5748e8d3b0c052f39e
 MISC metadata.xml 862 BLAKE2B 233eef15a865c598451d8a6100a8dc99f4c9a4c4ae4f8692a473ad2b8de5c2bc5216052b2bbf698e98f1c7f8156512084beaebc6148b9bc333d5c09d9bfda3ba SHA512 92e4cf75b949ac201537780bc5acf295720da8a342f6d882e2ca3b36aaa5691a3df31e6cf79e44b25f88d2f1177a1b6227165cbe8b9da8762b35560927239382
diff --git a/media-gfx/curaengine/curaengine-3.3.0.ebuild b/media-gfx/curaengine/curaengine-3.3.0.ebuild
deleted file mode 100644
index 2f945665c4a1..000000000000
--- a/media-gfx/curaengine/curaengine-3.3.0.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 cmake-utils
-
-MY_PN="CuraEngine"
-
-DESCRIPTION="A 3D model slicing engine for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-	if use doc; then
-		doxygen
-		mv docs/html . || die
-		find html -name '*.md5' -or -name '*.map' -delete || die
-		DOCS+=( html )
-	fi
-}
diff --git a/media-gfx/curaengine/curaengine-3.4.1.ebuild b/media-gfx/curaengine/curaengine-3.4.1.ebuild
index 2f945665c4a1..00cac9e508c9 100644
--- a/media-gfx/curaengine/curaengine-3.4.1.ebuild
+++ b/media-gfx/curaengine/curaengine-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,8 @@ IUSE="doc test"
 
 RDEPEND="${PYTHON_DEPS}
 	~dev-libs/libarcus-${PV}:*
-	dev-libs/protobuf"
+	dev-libs/protobuf
+	dev-libs/stb"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
diff --git a/media-gfx/curaengine/curaengine-3.6.0.ebuild b/media-gfx/curaengine/curaengine-3.6.0.ebuild
new file mode 100644
index 000000000000..00cac9e508c9
--- /dev/null
+++ b/media-gfx/curaengine/curaengine-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="CuraEngine"
+
+DESCRIPTION="A 3D model slicing engine for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/CuraEngine"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:*
+	dev-libs/protobuf
+	dev-libs/stb"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" )
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_make
+	if use doc; then
+		doxygen
+		mv docs/html . || die
+		find html -name '*.md5' -or -name '*.map' -delete || die
+		DOCS+=( html )
+	fi
+}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 796fe1ace89e..a11e7f19a6d4 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -2,7 +2,7 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3
 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483
 AUX exiv2-0.27.0-png-broken-icc-profile.patch 1699 BLAKE2B e9d019d3d885198e9945a387325435618f200dcac5a70cc96a6151f9ba8036609162fd93a7857cb8677bb7c1d3fe250f9750b8d7e660f34e31e50e3bc15e71a1 SHA512 8cb9b1f4129161861aee384e634433e3fa82aa933804d5f63de95475f6f6658f7b2f63fca1da624ea7b634f71cde5ee0de7e0466247d687494383d001df92ace
 DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
-DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4
+DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c
 EBUILD exiv2-0.26_p20180811-r3.ebuild 2954 BLAKE2B 06ad8b544150e1f5d4f1a305d78ab3ff7772b7c797e67e47ce01a233d0afee514d7660921c33b43634da60883b2adba119a80830c2493ad01800bd9b05b34072 SHA512 172e65b6210cb383afee4f344d585fae40dc7af1b7bb5d8dd2e5acbd7fcb4086b4caca998ce3627aefb4be3f8e4cebcaef24ccfb67d61d580b674fee50b24627
-EBUILD exiv2-0.27.0.ebuild 2820 BLAKE2B 2b1f2ebe29471d06010bab528c33e04884bdb8340f70babdf133dc688b4d7cff22fdb3f8ac612f2260adf91f48528aa2dc918aee573483ad1615fc5668e547a1 SHA512 99fbcb120caa5bb211a4cd29e0718fbfc8ca3f10224dc059e8ba82f06ec324c27288e6eca3be50351a0c6efb880632ba6bceaaea8c98d30fd27dd67f96636082
+EBUILD exiv2-0.27.0-r1.ebuild 2478 BLAKE2B 222de85c2aed562cacd97bb736ac36a32d94f4124d0a84480be759c536cf44f25be479fab56a6a3cc364d67d2a12285add8f0efc4a7363bb523c85d3521dbedb SHA512 f0eaf5875cf114d6dec924f0cf28abec0a086b3312ab4edf618d9d54e23639a423f37a281737b263f88b356059d92bb4d69f6f874e7b3ae033ff8ae9d2ce090d
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
new file mode 100644
index 000000000000..4582b1acd6f2
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+	inherit git-r3
+else
+	SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+RDEPEND="
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	webready? (
+		net-libs/libssh[${MULTILIB_USEDEP}]
+		net-misc/curl[${MULTILIB_USEDEP}]
+	)
+	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+		virtual/pkgconfig
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+S="${S}-Source"
+
+PATCHES=(
+	# pending upstream
+	"${FILESDIR}"/${P}-png-broken-icc-profile.patch
+)
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# FIXME @upstream:
+	einfo "Converting doc/cmd.txt to UTF-8"
+	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+	if use doc; then
+		einfo "Updating doxygen config"
+		doxygen &>/dev/null -u config/Doxyfile || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DEXIV2_BUILD_SAMPLES=NO
+		-DEXIV2_BUILD_PO=$(usex nls)
+		-DEXIV2_ENABLE_NLS=$(usex nls)
+		-DEXIV2_ENABLE_PNG=$(usex png)
+		-DEXIV2_ENABLE_CURL=$(usex webready)
+		-DEXIV2_ENABLE_SSH=$(usex webready)
+		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
+		-DEXIV2_ENABLE_XMP=$(usex xmp)
+		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && emake -j1 doc
+	fi
+}
+
+multilib_src_install_all() {
+	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+	use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc samples/*.cpp
+	fi
+}
diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0.ebuild
deleted file mode 100644
index f59464a6685d..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	inherit git-r3
-else
-	SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="doc examples nls +png webready +xmp"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	# pending upstream
-	"${FILESDIR}"/${P}-png-broken-icc-profile.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	# FIXME @upstream: MacOS cruft is getting installed, don't let it in...
-	# https://github.com/Exiv2/exiv2/issues/620
-	tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null ||
-		elog "${my_tar}: tar extract command failed at least partially - continuing"
-	mv "${P}-Source" "${S}" || die "Failed to create source dir ${S}"
-}
-
-src_prepare() {
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_BUILD_SAMPLES=NO
-		-DEXIV2_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		$(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 0f99ce45d1e6..af2527309d7b 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,5 +1,5 @@
-DIST fdm-materials-3.3.0.tar.gz 20460 BLAKE2B 31f8c65b702a414da7ce51bddb2d8523ef65bcdfa12caa6effbb6fadc11a90511b11a6844ae8ee679ff0fed3d3c6e3cf634245ab6c7489a8202f3c9799ecd655 SHA512 e66283616eec7de22c3e1e782683c15991e6def66d79aba0357c6dcafa7ee0b3bbf6aa24f685da68b7215d68ee90b5fac602ccae9027a651609ca5e423d429d6
 DIST fdm-materials-3.4.1.tar.gz 20852 BLAKE2B 7ad125e62c1a1cf2a05440c6ef593bf5115e6998d1a2d190063eaaadf8b9d0d93a1c98a1f2fdf672657e2c47159cc49ba6402e47ef5b55b880a8f0a7bffc9969 SHA512 c635bb3d3875e10abdc8f54c22ee74abf678cf8409ebeda6f083ac368025f90bd1871f9b13ad94c843f80073e0ae20d1dc08e80bed37ea7e2bfb3161d8ee8f0d
-EBUILD fdm-materials-3.3.0.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
+DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfeff9ba5cc8d9986ad672f95fe864007c931ef37d38c8702201d286c1cdb9770ab5709e364335833fd40c8c1e4c0f68f SHA512 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
+EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
 MISC metadata.xml 865 BLAKE2B faf20efb80033c67c5b6cacbb3679368e6f7e8a63587aebb6a5e1569a2594620d3b657f14baee3bc39046993a0e285ccd3a02e888bd19bd885735f5a731b16fc SHA512 a083d711722c5896ebe0b9f2f8d5084e3e8fb2456c8b201eb2aae775c2e6a0b8a596a6e37f8b0e2015ed0e5095b05331257f916a77ca4df739af82d9a3802738
diff --git a/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild
deleted file mode 100644
index a11c9629a10d..000000000000
--- a/media-gfx/fdm-materials/fdm-materials-3.3.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN="fdm_materials"
-
-DESCRIPTION="FDM materials for media-gfx/cura"
-HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild b/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
new file mode 100644
index 000000000000..8d5efda44626
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-3.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 6b1c978b069d..1c74cefa2b96 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,7 +1,8 @@
 AUX geeqie-1.3-stdstring.patch 2247 BLAKE2B 4569351aff9f524c17b9ad08634406e21d6e1b88921e12e320f5a618665aad9287b05d4d16d90f3a701fb7de73514005dfd5bf7d09e87313a97cc594849a9b2b SHA512 f26122a1419f795393174340f0e4a5b341d8341664840347730a8b19b1956d4c684b6a5a5183357250364a040eacc18267aab272789ac65ece9ece56d6b2dadf
+AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
 DIST geeqie-1.3.tar.xz 1141820 BLAKE2B 7a8639a136797c85d1bf96567ed0cae74c5cd0dacb8fac4832ffcb31ead372ac100948f9b65332d749500327c6ec3e7cb195da15980eaf0771ca6b55879dd8e4 SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
 EBUILD geeqie-1.3-r1.ebuild 1941 BLAKE2B 2ac0dfaa649219e597b6128fd65cc435edb9fb90f6e1c44defa821f9c282b18c208a3553d11dba175b69806f674b9baa0c2348dd7988971adbeb14d43d521e50 SHA512 9116a91a9459f59c9dab49bfd40b29f57ad042ae740d29809cfd55b6df829c73327ef28e1c8a69cee3b14fee2962edc5b002f2f26adb8c0d72ea1f61c17dc91b
-EBUILD geeqie-1.4-r1.ebuild 2281 BLAKE2B 71725dd5756b6d4c9db5d109a9f2dc0aa1ecdedacb789a836f139406375fa51938aab8c3ebbc43a93d253207e9591e5e27e404efdd30df9fd8fe3c7148514eb2 SHA512 b6a157767a61bb3bc22107600c6b2e3a55a63d9eabac113da06001d95a740b706da327617ced4ab65ed4cf0ff2861a931020546a3d132d619e7aa5f63d801d8e
-EBUILD geeqie-9999.ebuild 2218 BLAKE2B 57fbda4f14ebb13fe997b551fb35333324152cd2105b5d24a2ce0e8e77b415498dad9406fbe4635ce066d5a27381041df8afc68618a89473f9532288decb4e91 SHA512 84977bd2b8573df4f93f70597decb6b5ab487924c8c0a1718669a566e30f767eed3069dc74a9fcbdc2841bb19b5d0045cb81887c6d79388bc92a9d5cc3a74bb4
+EBUILD geeqie-1.4-r1.ebuild 2367 BLAKE2B bca36e24f57330c1d9993c191326cb9e204663770a885904fad177a4f3f18394bfaa07f88ed659a9771b25ad2e34e01de219dbac5e487c16d9dbc193399e7ea9 SHA512 f6fdf9420db3861bb2e533b0319bfd147c4b6fe6c5e1201c54a557c112d9f4843b4d80a037894ff7656d724e7a2026b8b095ef0cb63e4d580c161c32946c87f5
+EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
new file mode 100644
index 000000000000..b9a3bde0db2e
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-1.4-exiv2-0.27.patch
@@ -0,0 +1,80 @@
+From 13859e2ec3a1afc74f109cfffdf0de39030cde86 Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
+Date: Wed, 2 Jan 2019 01:04:45 +0100
+Subject: [PATCH] fix build against exiv2-0.27.x
+
+fixes #654
+---
+ src/exiv2.cc | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index b3c80657..f40b725e 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -22,17 +22,27 @@
+ 
+ #ifdef HAVE_EXIV2
+ 
++// Don't include the <exiv2/version.hpp> file directly
++// Early Exiv2 versions didn't have version.hpp and the macros.
++#include <exiv2/exiv2.hpp>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
+ #include <iostream>
+ #include <string>
+ 
+ // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
++#ifdef EXIV2_VERSION
+ #ifndef EXIV2_TEST_VERSION
+-# define EXIV2_TEST_VERSION(major,minor,patch) \
++#define EXIV2_TEST_VERSION(major,minor,patch) \
+ 	( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )
+ #endif
++#else
++#define EXIV2_TEST_VERSION(major,minor,patch) (false)
++#endif
+ 
++#if EXIV2_TEST_VERSION(0,27,0)
++#define HAVE_EXIV2_ERROR_CODE
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -40,6 +50,10 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ 
++#if EXIV2_TEST_VERSION(0,27,0)
++#define EXV_PACKAGE "exiv2"
++#endif
++
+ #if !EXIV2_TEST_VERSION(0,17,90)
+ #include <exiv2/tiffparser.hpp>
+ #include <exiv2/tiffcomposite.hpp>
+@@ -374,7 +388,11 @@
+ #endif
+ 			Exiv2::Image *image = imageData_->image();
+ 
+-			if (!image) Exiv2::Error(21);
++#ifdef HAVE_EXIV2_ERROR_CODE
++			if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
++#else
++			if (!image) throw Exiv2::Error(21);
++#endif
+ 			image->setExifData(exifData_);
+ 			image->setIptcData(iptcData_);
+ #if EXIV2_TEST_VERSION(0,16,0)
+@@ -394,8 +412,12 @@
+ 			sidecar->setXmpData(xmpData_);
+ 			sidecar->writeMetadata();
+ #else
++#ifdef HAVE_EXIV2_ERROR_CODE
++			throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp");
++#else
+ 			throw Exiv2::Error(3, "xmp");
+ #endif
++#endif
+ 			}
+ 	}
+ 
diff --git a/media-gfx/geeqie/geeqie-1.4-r1.ebuild b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
index 3080dded12b0..d98bed393028 100644
--- a/media-gfx/geeqie/geeqie-1.4-r1.ebuild
+++ b/media-gfx/geeqie/geeqie-1.4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit autotools xdg-utils
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
@@ -13,28 +14,32 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
 
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
+RDEPEND="
 	virtual/libintl
 	doc? ( app-text/gnome-doc-utils )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	map? ( media-libs/libchamplain:0.12 )
+	tiff? ( media-libs/tiff:0 )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	dev-util/glib-utils
 	dev-util/intltool
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 REQUIRED_USE="gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674044
+
 src_prepare() {
 	default
 
diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild
index a4b9efab87e3..e7ca05a8bf03 100644
--- a/media-gfx/geeqie/geeqie-9999.ebuild
+++ b/media-gfx/geeqie/geeqie-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3 xdg-utils
 
 DESCRIPTION="A lightweight GTK image viewer forked from GQview"
@@ -13,26 +14,29 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map tiff xmp"
 
-RDEPEND="gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
+RDEPEND="
 	virtual/libintl
 	doc? ( app-text/gnome-doc-utils )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	lcms? ( media-libs/lcms:2 )
 	lirc? ( app-misc/lirc )
 	lua? ( >=dev-lang/lua-5.1:= )
 	map? ( media-libs/libchamplain:0.12 )
+	tiff? ( media-libs/tiff:0 )
 	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
-	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
 	dev-util/intltool
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 REQUIRED_USE="gpu-accel? ( gtk3 )
 	map? ( gpu-accel )"
@@ -47,7 +51,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--disable-dependency-tracking
+	local myeconfargs=(
+		--disable-dependency-tracking
 		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug debug-log)
 		$(use_enable ffmpegthumbnailer)
@@ -58,15 +63,16 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable lirc)
 		$(use_enable map)
-		$(use_enable tiff)"
+		$(use_enable tiff)
+	)
 
 	if use exif || use xmp; then
-		myconf="${myconf} --enable-exiv2"
+		myeconfargs+=( --enable-exiv2 )
 	else
-		myconf="${myconf} --disable-exiv2"
+		myeconfargs+=( --disable-exiv2)
 	fi
 
-	econf ${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 1f4e1505ec1c..20c90d8405c6 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,8 +1,6 @@
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
-DIST graphite2-1.3.12.tgz 6667293 BLAKE2B 5008cdc6336af6d846b7d14640b1b8987eb46ff8ff25ee518f2b5cd0576dff2430fb6c83527a6ead6759e73d26fb706b98488aadacefc01f3d6138a91c32b541 SHA512 fdb5a08a64dba1bc6e830e6b7a079daaa7ee009571d159ff0edf6bcfb7dd668f60773b872f1c8636bc70e6559e1a870e1649008b4764b02e12dad0add504e664
 DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131
 EBUILD graphite2-1.3.10.ebuild 2499 BLAKE2B cdfabfaeecaf58e032422d60adf6ee349ec2bdba70313138d4dd4e88e258ba9868a31a4f56109a043846e2aaf7dd242468bd49244ebf28c3b3a9cb0b2d085300 SHA512 43b767dbed5273118dd9cd42a505e659217989f4165dd41e971df02ce6042f1c8476e06eda60b66023f02df3a41b0bfe8b63df88b2035d70ccd2d5fe36a7e4ac
-EBUILD graphite2-1.3.12-r1.ebuild 2632 BLAKE2B 6ac75fbd8226f136a2387abf8dcfa183b712beda65731c1b0276bc48cb180824d9cda1e0280a0e078018f3d3af02d7dd4def31da03dca5c5780edb6b1e631570 SHA512 a163933c9aa34f167df37f3cb601834831b9bb825d68dce644e1da49e6e246cb5f4327fa645c868af21752ad01d217ac3659e1a7d66c125b1bfd7212fca5abcb
 EBUILD graphite2-1.3.13.ebuild 2672 BLAKE2B 422e9d56b0169ed9ceb3d97717d2b30280c78c83f2cf88f53ab8ce62fd35ef03c039f84744f17c4d55a5b1a7b3c714e80e35b60a51ad83041d70a7926f9a79bb SHA512 1818debfe7402c1778990e0bb713814f5aaf6ff10a47b4763024d5dc308c0e5698534571876c608ad29b70d96a1e2e91afda656867cd0c699466056200cdf721
 MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380
diff --git a/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
deleted file mode 100644
index f13ec6df7f35..000000000000
--- a/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit perl-module python-any-r1 cmake-multilib
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="perl test"
-
-RDEPEND="
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
-	perl? (
-		dev-perl/Module-Build
-		dev-perl/Locale-Maketext-Lexicon
-		)
-	test? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		$(python_gen_any_dep '
-			dev-python/fonttools[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		perl? ( virtual/perl-Test-Simple )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-)
-
-pkg_setup() {
-	use perl && perl_set_version
-	use test && python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# make tests optional
-	if ! use test; then
-		sed -i \
-			-e '/tests/d' \
-			CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
-		"-DGRAPHITE2_VM_TYPE=direct"
-		# https://sourceforge.net/p/silgraphite/bugs/49/
-		$([[ ${CHOST} == powerpc*-apple* ]] && \
-			echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
-	)
-
-	cmake-utils_src_configure
-
-	# fix perl linking
-	if multilib_is_native_abi && use perl; then
-		# we rely on the fact that cmake-utils_src_configure sets BUILD_DIR
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
-			"${S}"/contrib/perl/Build.PL || die
-	fi
-}
-
-src_compile() {
-	cmake-multilib_src_compile
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_configure
-		perl-module_src_compile
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		cmake-utils_src_test
-	else
-		einfo Cannot test since python is not multilib.
-	fi
-}
-
-src_test() {
-	cmake-multilib_src_test
-	if use perl; then
-		# Perl tests fail due to missing POD coverage...
-		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
-		cd contrib/perl || die
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	cmake-multilib_src_install
-	if use perl; then
-		cd contrib/perl || die
-		perl-module_src_install
-		perl_delete_localpod
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 36900d82a2e3..1d7cd798b16a 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,6 @@
+AUX gthumb-3.6.2-exiv2-0.27.patch 1004 BLAKE2B e351a67d8fbbfd0c13b26ca575a34528ef29f6d6b2a7ede9b0f16a5835f502bf24e8415f597146abde875e5dbd93fd1fec126a6bbb27d4b0f9881fe9c823ceb5 SHA512 e6f4549526d745d7fa0f42175508be7f6b5ffc9258a5b59a31f45e8c095870b13a0da55c50635723abe6235cf983b7730677906bbb16acf99e58447cc72d8c3d
 DIST gthumb-3.6.1.tar.xz 3415564 BLAKE2B 363c1c927557f69a4dc0980174b31dd414267c0110205b4406f7fbf02953fd9ad00255d327363c6dcab663e10401b42a7aa23bc33796e944540ad21e778db67d SHA512 8b545626b041f91b8a3ad9caa5930aa431529f660c5a705efff667c78ddccd25683e598f7b1fc08f8e73553cedec00f0187387833e6081f504fc67ebd86f7a42
 DIST gthumb-3.6.2.tar.xz 3423044 BLAKE2B ff5fd805c07c969f8e50960cdd36df9b3ef9ddedcaca66578416fc4f602fedf4f1698fec54cda77521c88774e8e309b996123ade9a633df1ffc34bb60cef0ff5 SHA512 5fc5cc43b16b51438403fbb986286d5e66575162be7b4cf35931dd0c41273933f78c210aaf2379e0a2574df6f7f7b2d532d87ce37fbc6369b65331bac338a454
 EBUILD gthumb-3.6.1.ebuild 2595 BLAKE2B 64912212a1e032ee927272bd77fee83367a678569d7ef58b67e27629404019b5fd101445973a81a870563c756f49de3ee290a9ae50a50abc0b61e913bc02f4ce SHA512 4f7ab17a2331dc0b592a267254d70e7f80d3ecd66aa069200500acf8488f0bdbbfdd1874829468556e25d71c38a0e7d6ead8d894e5085ee68100abe9bfd4c424
-EBUILD gthumb-3.6.2.ebuild 2594 BLAKE2B a6c6a68c0914793b7cde5cc13e730944a0e3476dbfe6f2d47a4e61e3d60d2217dadd42e44355ac59f492422493d02c8ba35cb0ddc8dbd32635c6807f50bfefe3 SHA512 fea6507344884d23a5f298d98295f17b220d1987612f9f027ab07df1d06649acad8ce0bffad57ab1cfbe7ce18f6d85ae2e120195f6dd2cb9d1b2a653a75fcf3c
+EBUILD gthumb-3.6.2.ebuild 2656 BLAKE2B 752a1054f960587ac1d9f9a149f6628adc033315310dfad48a7d45112b63fc636f2947986f3d5429348dccb68c9cae09a4590da41ed12a2e6dfb1e41797f7670 SHA512 d2fce54146d41acaf321fb450d2898d550b31388cac17dbfb9e1b58de487438a2cd4fa6e22c4a927b3eef68bae39e66aa67e9c671af575b26869c198793ac1ad
 MISC metadata.xml 573 BLAKE2B 889924db658e5280c09c581c76fe0d90d7306a454f0ad462131d87164cc4791a0002f17a2eb191c11f61959d93539d4ea5dd22b66d8879ceee259f30e0a268c8 SHA512 e9daac77f6276d354005dc123ba92053139c264a19dedbf4b79b6d3df7aea00e95330bb182b960d2606a65f6c8d68e19e82cb699999b9ede4fad1dd8cbaab16e
diff --git a/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
new file mode 100644
index 000000000000..2bd8b94c3c11
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-3.6.2-exiv2-0.27.patch
@@ -0,0 +1,31 @@
+Patch kindly borrowed from Mageia.
+
+* asturm@gentoo.org: Dropped unnecessary and backwards incompatible
+xmp_exiv2.hpp include.
+
+https://gitlab.gnome.org/GNOME/gthumb/issues/30
+
+diff -Nru a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
+--- a/extensions/exiv2_tools/exiv2-utils.cpp	2018-06-17 08:24:44.000000000 +0200
++++ b/extensions/exiv2_tools/exiv2-utils.cpp	2018-12-31 15:51:50.912329232 +0100
+@@ -32,7 +32,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <iomanip>
+-#include <exiv2/xmp.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <gthumb.h>
+ #include "exiv2-utils.h"
+ 
+@@ -1073,7 +1073,11 @@
+ 
+ 	try {
+ 		if (exifData.empty()) {
++#if EXIV2_TEST_VERSION(0,27,0)
++			throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
++#else
+ 			throw Exiv2::Error(1, " No Exif data found in the file");
++#endif
+ 		}
+ 		Exiv2::ExifData::const_iterator end = exifData.end();
+ 		for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild
index 1eab1eda6c7d..fa3de15b5f1b 100644
--- a/media-gfx/gthumb/gthumb-3.6.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
 # eautoreconf needs:
 #	gnome-base/gnome-common
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092
+
 src_prepare() {
 	# Remove unwanted CFLAGS added with USE=debug
 	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3ea13f40742c..d698340ae13d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,8 @@
-AUX imagemagick-6.9.10.16-fix-MagickCore-config.patch 831 BLAKE2B 87421ba8c9d9bd2e45955c4650bbb14552eea2676d87217603618f4a82fb49b884da16a89f0f084440dff9c16dfa64198db2c6f5d6722d7f2daad173932d20fa SHA512 3d6644019414ce9a14ea9794a1a3608dc7be12e9bccb920ffa804c2209fee06705ba8c8342592f313e54d074b79a6364387f2d5945c4fbe56b80a13ee323eb01
-AUX imagemagick-6.9.10.21-fix-ReadHEICImage.patch 499 BLAKE2B 1fb776d084971758d743747676ce96d4845afc772457f784a126dd3d3b7db09353e69cc4ab8d5e43a48de4c5bfdaaed9b01f68c2bd397b95a966ed70606079fc SHA512 a4b989d952b776ac855bd9eb13e29c7c1f0cf274c2fdd9694fcce569bd5a1c9f8829705024c67ce9efc107d36be5d7ccff2822ffd31ce4efc4103d4f419b22b4
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-16.tar.xz 8929036 BLAKE2B 1eb3150c5725d96bb2a9f9f7c07b5037e3da7e8f3871a9ae448352a967e5d8f5ccffdb7c27b608e4d6d9c8c13f7e8a219760292b6b191d37378c17ff182a2d09 SHA512 0adc57158260797df6db68256e87848135b52eba91dc65978e255061e3b22bfe7b3fbee3626ee8fb0183d37649143f0a46cbcbd6e090604cc4bb8e0752255fbd
-DIST ImageMagick-6.9.10-19.tar.xz 8934480 BLAKE2B d456acd5c40e7149839f7fea93826ce67c8a34b45b2435e2e6e35cdf3487163e47eddc9e81d251ba75d7c7125b5cb67ca58a945f380cc2bda90d9e6b4a6271eb SHA512 17cad58549b7e195693ce8f7c4dc936136792be10a15f47af66b60c3db2c4580b56d413d3034dd597d6e9c36f01d6b9b277bfd7c3b0828792e03ff5e8803dd40
-DIST ImageMagick-6.9.10-21.tar.xz 8936048 BLAKE2B 28e522ff0a107526ff46149df8bbf7dfd93f1adacd714eacf43925b24375db005176255f5fccdad4b709d2133301a670abbfb46c93dfabcd1ec28d58074e7817 SHA512 6e3849eaab1cf9abd8ccbff32b6ece27e3bc6f9a5707737b0f9676adbed5d1ddbb352e94b8d25d66d9cccc6689f9b17731d053305310084a3a15fe13fb973e25
-DIST ImageMagick-7.0.8-16.tar.xz 8646148 BLAKE2B 5a9c287164f99886c411cbb1416aaa72bdf527ba3be097a0ea6638cc6b0ae383057acab09974c7d3954a2985ec39e0ce4f6d6a2423ff4bb020d011bd1988c337 SHA512 fbc0b0410702c15352989652c055e4e1a099878e30b859c75322e162eccd384cabb98e14cac14e3fb2c902f25f80a5b62f94380ef78f891731980de9a40b6867
-DIST ImageMagick-7.0.8-19.tar.xz 8652452 BLAKE2B 0b6507ce98a7a609b834b00fc709fc6d25266716b74eea0ff1f0208daa9966aced70294c92e181fc21e43426cfd40a4614e12e7bd1c89ff74dbd65739d3bdbeb SHA512 f00ee21a8367202ea4bb25c99894679bbc3c2dd0c0e644292b8565bfda41cd8b0a8aa45bde85066347dc182bf8396de39166556a357d91383cc0fab8f9182276
-DIST ImageMagick-7.0.8-21.tar.xz 8650808 BLAKE2B 5fb6902b71d7ec3db372e7fe9afefcd49ca1d1fe8a30ed5c952193c7a4bc55ef564ba96e32a353d912ce1a38132abeead513695ad6ff7464cd925cd0a8fb554c SHA512 91ae18896ea2d64f540328aba6ed97dd1102cf16fe256b8f304eb8964b3063e83e66df67a805db6d6c99980ae125a6d96172faa03f821df330b62d01a919eeef
-EBUILD imagemagick-6.9.10.16-r1.ebuild 6938 BLAKE2B 64aa7128cd3b932654f1d0e355cb8447f02f997cda9c177ad2e3b0905ccde30e3e4b3e4a6297b4f03ef68f161f999f78359470500943f886e994f9519f9a3d3b SHA512 ceb36ea8997802ea03082329f074f0e123c410750446cd248fce01425ea45f5e990b1c47d7506007aefa81ee7f4ffd412f2fb0977b24bda952e4df44955b8c7a
-EBUILD imagemagick-6.9.10.19.ebuild 6892 BLAKE2B d925550c450fabe11f11cf817c25e4aa3c1b25b0ca1dcae4910b8112fa8a38ed625260743046736ce23cd27b299974b22239607e9c68496262e43e5cd19da0c2 SHA512 6005a9964507d87fd0c0c1e1d1daa10e5503740ba9474f1659f7bd4255f5cc22ef8137baf3e1e61c6f9d0c93eef403637cf91833397a6a2ab16f15a7bbd48e58
-EBUILD imagemagick-6.9.10.21.ebuild 6948 BLAKE2B 8fd66ced69f92f30d55917cdaf239e38675d77909b44251700f9fdd93d07ed2546f217444a3c2bd02a1153bda9de8c42df64d2c18e194c3d2406d67a1c6414a3 SHA512 fd9dc0b47713733b76a9ef91075982b39c191eb1ae872a4910526f092532f9ce6d31cb13ef8fd85e92529821606e98186b6b17a586416163b882b2336d033e9e
-EBUILD imagemagick-7.0.8.16.ebuild 7151 BLAKE2B 100dad30713a78c3aa72a939874e295bf3c55c3015ddf833d6c5bf696448af666a5088451e3ce83d2549216041675df5d3034517172fa5bb4d7005674b37394d SHA512 7fa1d1eb8715f8cb8d674fb7c619743970dfe8ca8e7e744448fb569442242aa703e7f8d1c568e73147dcece484db1031311529b7b0482b9c2ae9c83282d02d1e
-EBUILD imagemagick-7.0.8.19.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
-EBUILD imagemagick-7.0.8.21.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
+DIST ImageMagick-6.9.10-23.tar.xz 8941044 BLAKE2B 7fd7dc8dcff32d87eb02b6590600813e8c7359b3e8e36fdf4eae9abdaf39941c1f5b4fef398cbf271777c630f7f4d1b149a1685ce34af3607c839facde89cc09 SHA512 b46405916b6beb7048fd0a82426bd890d56584f910092753dd788124006687167321757b3c9a469bcfba7d38e7162ddcd977918f605e6e87c28895eadecc0063
+DIST ImageMagick-7.0.8-23.tar.xz 8636148 BLAKE2B 6db61c1fa8481fe27311211371f626e8f0fbb544cb5bddb51dc62e0ca70aa72faa942a43cea173a1a86980d2798baee50130982bf67ba9b6cf2892935b36d66c SHA512 8063903d9992d89db302f9f95acdf112d3d38609289af5fcef66acf7f684b3223fea64829a0f6dd15f71f6b6b52f74d3c716c2217ffd83558c5b8a4b7a4aec3f
+EBUILD imagemagick-6.9.10.23.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-7.0.8.23.ebuild 7151 BLAKE2B 2a45d3c2bf28fa0c18a7d7b2b81f9b41a208bf74e84a8bd0fd9630380f432e4a2ee27911b83a7a2ebd86c828105754d6b092a6205b4fc2d22ac79824c62e9069 SHA512 49dec8a319fef02989b7ad27a3553688f720391f670525f5d89dc34722eaab3fb2dbadf7e5ebd0565193020e54e0509fd171a2505f79a99b1eaa263daddd405b
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
 MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch b/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch
deleted file mode 100644
index 1fce48d48660..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-6.9.10.16-fix-MagickCore-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 02701e96029c4e2a9902685a9aca84ae21ab1c4c Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Fri, 14 Dec 2018 02:03:07 +0300
-Subject: [PATCH] Remove non-existing "-config" option from pkg-config
-
-This bug produces "Unknown option -config" error.
----
- magick/MagickCore-config.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/magick/MagickCore-config.in b/magick/MagickCore-config.in
-index 94bc87b95..e56f34a76 100644
---- a/magick/MagickCore-config.in
-+++ b/magick/MagickCore-config.in
-@@ -38,7 +38,7 @@ while test $# -gt 0; do
-       echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
-       ;;
-     --cflags)
--      @PKG_CONFIG@ -config --cflags MagickCore
-+      @PKG_CONFIG@ --cflags MagickCore
-       ;;
-     --cxxflags)
-       @PKG_CONFIG@ --cflags MagickCore
diff --git a/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch b/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch
deleted file mode 100644
index f3a382b98938..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-6.9.10.21-fix-ReadHEICImage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/ImageMagick/ImageMagick6/issues/33
-
---- a/coders/heic.c
-+++ b/coders/heic.c
-@@ -317,7 +317,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info,
-     image pixels. ReadImage processes "exif:Orientation" expecting pixels to be
-     oriented accordingly. However, in HEIF the pixels are NOT rotated.
-    */
--  SetImageProperty(image, "exif:Orientation", "1", exception);
-+  SetImageProperty(image, "exif:Orientation", "1");
-   return(GetFirstImageInList(image));
- }
- #endif
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.16-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.16-r1.ebuild
deleted file mode 100644
index a658d37a58de..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.16-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-fix-MagickCore-config.patch
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild
deleted file mode 100644
index 51d1439ebc56..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.19.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild
deleted file mode 100644
index d5e650ac2cea..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.21.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-ReadHEICImage.patch )
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.23.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.23.ebuild
new file mode 100644
index 000000000000..b6bca9ea8b20
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.23.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.16.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.16.ebuild
deleted file mode 100644
index c8f205eafd0f..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.16.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild
deleted file mode 100644
index 91e101eeefc0..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.19.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild
deleted file mode 100644
index 91e101eeefc0..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.21.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.23.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.23.ebuild
new file mode 100644
index 000000000000..3b3fc7c8d30d
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.23.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 25eaa9903192..e0f649076e9a 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,14 +5,7 @@ AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d
-AUX inkscape-0.92.3-poppler-0.64-2.patch 5692 BLAKE2B 17791aa18b04262214b9e504eb5ced2731ae7dec029329c5f57670339f9c5ec018013a16bb8bd65a18852183d2ef89ba59d942b0832974ca27f2f4aeae325e0f SHA512 48c3466ba1ee01a05b6b644096b286a4047923b13e0f0ddbbd3a06100a82dc26ac43a401d252f4b63b062ee2e10c546b595dd2d6c8a1885a5c1349a84ad73412
-AUX inkscape-0.92.3-poppler-0.64.patch 4493 BLAKE2B 3ee9635cf8b287c1a530a8a70876c92c1e941e6d89a9a74e4f6bb3fdd445bc60a47c8adb6f567f8bc539241c0884ca093add00ede19dfba3220ffcccde0a5384 SHA512 dbfc28ec5dd7b96c7994ab57bcde95baa57ec600d2ec5458c242273407d822f0947d8fd2ef0ce7ac07125f108314a25eb1646aaad474fa150e3010031c1807bb
-AUX inkscape-0.92.3-poppler-0.65.patch 904 BLAKE2B cd31960bf20fbc3cff762949d435838864ebff18dbcef99a658ed5732a3c7fe647c2a7e4b15bdf79a6c445f523dd2b7c19b3c3bc71cc656f0dabfc2bf5ce7ce4 SHA512 38887caacfd8c37f017b8b9c3a6de09aaa1d1ea7caffe9ab91d234b162a36bb4fc19e4985acd9a120929f4941126be31fc9d51a84628803157746834b60de8bb
-AUX inkscape-0.92.3-poppler-0.69.patch 15760 BLAKE2B 5efe38900e8954232ecf2336b1d84c2c1ce78a4c3044dd8d0eb5dbc1222307da0411dd4ee7b0c4cc4ddf882e87b81cf6a410c1384d274bc86cdf650dc4969b0a SHA512 ba153fa5fbcad7ed86dd63511aae191200c227a7f812dbf01d8f474b71eb65d38ce2baee889ae984be02d31453578841d24c236fdbdd781d7075c326caadaaa0
-AUX inkscape-0.92.3-poppler-0.71.patch 947 BLAKE2B eac6ad73f72da8cfd8e0d7cab5977a7586161ff5db455b1c42a87fc5f6aa0a2241fa0cf7857ef0abad6404bf52d5030514bf1318b2c7dfda32bddb5b42625de9 SHA512 b53a1319608a57d2fb11db0659e11ab38b69932d2a54136550d1a16ffc1b072aeddf6507a6ea58c3d6d43c0599397868c66046e7fadfdbd2a87d63b90819fdbd
-DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
-DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
+DIST inkscape-0.92.3-poppler-patches.tar.xz 7508 BLAKE2B afb639e9149256d0a7d534c28f3c51cb6adf0bfdb458be1c729475f235cd363e3e6b50033f7d377eaeae9f564b33e710ac01fc323821f5b4a97ffc73edc342a5 SHA512 0011ca503e786520c756ff4578c0db55aadf907bf6479837fa35e7a035695ff7e0aaf8f878f5354730ac75808d36c5e34ae15d32a1af37134ce881edd810c4a5
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
-EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
-EBUILD inkscape-0.92.3-r1.ebuild 4070 BLAKE2B 740861b67fba0f9b7cb37ceb5019c55a581a37b7e419289fe444df0484f21b637cd523d5b5a76425798f5701f96477fb58b92ab06969a4441b4a9da01b5afc3a SHA512 48b64d03cabcfd5b8430ece46fe68b366bec787e0f16852f874a7e275089062f50250008f9330f83c1ee5c21a141bee5d2e3ed8324a628cffd91674abc5b134a
+EBUILD inkscape-0.92.3-r1.ebuild 4181 BLAKE2B 2d5fa7b8383efe738659803d9bbbacaf4f633143ae4fd05e8b08b9878521930dfa404e34c05be48b83bd011449c0889c504979ca1eb144677ead6fdddc9f3483 SHA512 51fed179cbb906be5deb6e75ed28c4c5da47ea8db5215634cf687c952c31beae3149e2e3a9084ca75a6690e387dae6e5866b3070c38769f46f3f0a517a09f74f
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch
deleted file mode 100644
index 4608bc79ecde..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64-2.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 66d05776ea2d403f2f48437f70d096a09724dfec Mon Sep 17 00:00:00 2001
-From: Eduard Braun <eduard.braun2@gmx.de>
-Date: Wed, 5 Sep 2018 00:31:06 +0200
-Subject: [PATCH] Modified fix for compatibility with poppler 0.64
-
-This is slightly uglier than f0697de012598ea84edafea9a326e5e101eccd2a
-but avoids duplicating strings (which is unnecessary and leaked memory).
-
-It's also closer to what upstream intended with the changes in 0.64.
-
-(cherry picked from commit 722e121361d0f784083d10e897155b7d4e44e515)
----
- .../internal/pdfinput/pdf-parser.cpp          | 19 ++++++++++++++++---
- src/extension/internal/pdfinput/pdf-parser.h  |  6 ++++++
- .../internal/pdfinput/svg-builder.cpp         |  6 +++---
- src/extension/internal/pdfinput/svg-builder.h |  4 ++--
- 4 files changed, 27 insertions(+), 8 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index a3aa3213a1..ea9f902e09 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -36,6 +36,7 @@ extern "C" {
- #include "pdf-parser.h"
- #include "util/units.h"
- 
-+#include "glib/poppler-features.h"
- #include "goo/gmem.h"
- #include "goo/GooString.h"
- #include "GlobalParams.h"
-@@ -2581,7 +2582,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
-   }
- }
- 
-+#if POPPLER_CHECK_VERSION(0,64,0)
- void PdfParser::doShowText(const GooString *s) {
-+#else
-+void PdfParser::doShowText(GooString *s) {
-+#endif
-   GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-@@ -2594,7 +2599,11 @@ void PdfParser::doShowText(const GooString *s) {
-   Object charProc;
-   Dict *resDict;
-   Parser *oldParser;
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+  const char *p;
-+#else
-   char *p;
-+#endif
-   int len, n, uLen;
- 
-   font = state->getFont();
-@@ -2630,7 +2639,7 @@ void PdfParser::doShowText(const GooString *s) {
-     double lineX = state->getLineX();
-     double lineY = state->getLineY();
-     oldParser = parser;
--    p = g_strdup(s->getCString());
-+    p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-@@ -2685,7 +2694,7 @@ void PdfParser::doShowText(const GooString *s) {
- 
-   } else {
-     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
--    p = g_strdup(s->getCString());
-+    p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-@@ -2731,7 +2740,11 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
- {
-   Object obj1, obj2, obj3, refObj;
- 
--  char *name = g_strdup(args[0].getName());
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+  const char *name = args[0].getName();
-+#else
-+  char *name = args[0].getName();
-+#endif
- #if defined(POPPLER_NEW_OBJECT_API)
-   if ((obj1 = res->lookupXObject(name)).isNull()) {
- #else
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index f985b15cad..ed28274f42 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -25,6 +25,7 @@ namespace Inkscape {
- // TODO clean up and remove using:
- using Inkscape::Extension::Internal::SvgBuilder;
- 
-+#include "glib/poppler-features.h"
- #include "goo/gtypes.h"
- #include "Object.h"
- 
-@@ -287,7 +288,12 @@ private:
-   void opMoveShowText(Object args[], int numArgs);
-   void opMoveSetShowText(Object args[], int numArgs);
-   void opShowSpaceText(Object args[], int numArgs);
-+#if POPPLER_CHECK_VERSION(0,64,0)
-   void doShowText(const GooString *s);
-+#else
-+  void doShowText(GooString *s);
-+#endif
-+  
- 
-   // XObject operators
-   void opXObject(Object args[], int numArgs);
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 617861928d..767c8af4d4 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) {
-     GfxFont *font = state->getFont();
-     // Store original name
-     if (font->getName()) {
--        _font_specification = g_strdup(font->getName()->getCString());
-+        _font_specification = font->getName()->getCString();
-     } else {
--        _font_specification = (char*) "Arial";
-+        _font_specification = "Arial";
-     }
- 
-     // Prune the font name to get the correct font family name
-@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) {
-     char *font_family = NULL;
-     char *font_style = NULL;
-     char *font_style_lowercase = NULL;
--    char *plus_sign = strstr(_font_specification, "+");
-+    const char *plus_sign = strstr(_font_specification, "+");
-     if (plus_sign) {
-         font_family = g_strdup(plus_sign + 1);
-         _font_specification = plus_sign + 1;
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index ed2a4d48e0..55daacee74 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -80,7 +80,7 @@ struct SvgGlyph {
-     bool style_changed;  // Set to true if style has to be reset
-     SPCSSAttr *style;
-     int render_mode;    // Text render mode
--    char *font_specification;   // Pointer to current font specification
-+    const char *font_specification;   // Pointer to current font specification
- };
- 
- /**
-@@ -202,7 +202,7 @@ private:
- 
-     SPCSSAttr *_font_style;          // Current font style
-     GfxFont *_current_font;
--    char *_font_specification;
-+    const char *_font_specification;
-     double _font_scaling;
-     bool _need_font_update;
-     Geom::Affine _text_matrix;
--- 
-2.19.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
deleted file mode 100644
index b31786add1b3..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.64.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From f0697de012598ea84edafea9a326e5e101eccd2a Mon Sep 17 00:00:00 2001
-From: Eduard Braun <eduard.braun2@gmx.de>
-Date: Tue, 24 Apr 2018 19:18:26 +0200
-Subject: [PATCH] Fix compilation with poppler 0.64
-
-(cherry picked from commit a600c6438fef2f4c06f9a4a7d933d99fb054a973)
----
- src/extension/internal/pdfinput/pdf-parser.cpp  | 10 +++++-----
- src/extension/internal/pdfinput/pdf-parser.h    |  2 +-
- src/extension/internal/pdfinput/svg-builder.cpp |  4 ++--
- src/extension/internal/pdfinput/svg-builder.h   |  3 +--
- 4 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 604b7f8079..721524e10a 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
-   }
- }
- 
--void PdfParser::doShowText(GooString *s) {
-+void PdfParser::doShowText(const GooString *s) {
-   GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
-   font = state->getFont();
-   wMode = font->getWMode();
- 
--  builder->beginString(state, s);
-+  builder->beginString(state);
- 
-   // handle a Type 3 char
-   if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
-@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
-     double lineX = state->getLineX();
-     double lineY = state->getLineY();
-     oldParser = parser;
--    p = s->getCString();
-+    p = g_strdup(s->getCString());
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
- 
-   } else {
-     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
--    p = s->getCString();
-+    p = g_strdup(s->getCString());
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
-@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
- {
-   Object obj1, obj2, obj3, refObj;
- 
--  char *name = args[0].getName();
-+  char *name = g_strdup(args[0].getName());
- #if defined(POPPLER_NEW_OBJECT_API)
-   if ((obj1 = res->lookupXObject(name)).isNull()) {
- #else
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index e28fecc2e1..f985b15cad 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -287,7 +287,7 @@ private:
-   void opMoveShowText(Object args[], int numArgs);
-   void opMoveSetShowText(Object args[], int numArgs);
-   void opShowSpaceText(Object args[], int numArgs);
--  void doShowText(GooString *s);
-+  void doShowText(const GooString *s);
- 
-   // XObject operators
-   void opXObject(Object args[], int numArgs);
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index a448be6397..617861928d 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
-     GfxFont *font = state->getFont();
-     // Store original name
-     if (font->getName()) {
--        _font_specification = font->getName()->getCString();
-+        _font_specification = g_strdup(font->getName()->getCString());
-     } else {
-         _font_specification = (char*) "Arial";
-     }
-@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
-     _glyphs.clear();
- }
- 
--void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
-+void SvgBuilder::beginString(GfxState *state) {
-     if (_need_font_update) {
-         updateFont(state);
-     }
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index ad15c9c06f..ed2a4d48e0 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -29,7 +29,6 @@ namespace Inkscape {
- #include <glibmm/ustring.h>
- 
- #include "CharTypes.h"
--class GooString;
- class Function;
- class GfxState;
- struct GfxColor;
-@@ -136,7 +135,7 @@ public:
-     void clearSoftMask(GfxState *state);
- 
-     // Text handling
--    void beginString(GfxState *state, GooString *s);
-+    void beginString(GfxState *state);
-     void endString(GfxState *state);
-     void addChar(GfxState *state, double x, double y,
-                  double dx, double dy,
--- 
-2.17.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
deleted file mode 100644
index 86d9e48396df..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001
-From: Jan Palus <atler@pld-linux.org>
-Date: Fri, 25 May 2018 00:30:17 +0200
-Subject: [PATCH] Fix compilation with poppler 0.65.0
-
-replace unused includes with one that is actually used
-
-Signed-off-by: Jan Palus <atler@pld-linux.org>
----
- src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index 6c498f9..caaeca1 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -37,8 +37,7 @@ extern "C" {
- #include "util/units.h"
- 
- #include "goo/gmem.h"
--#include "goo/GooTimer.h"
--#include "goo/GooHash.h"
-+#include "goo/GooString.h"
- #include "GlobalParams.h"
- #include "CharTypes.h"
- #include "Object.h"
--- 
-2.17.0
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
deleted file mode 100644
index 593ba242db4d..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.69.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-From 96781f5cea8af9777d87e056506b2bce660c397e Mon Sep 17 00:00:00 2001
-From: Thomas Holder <thomas@thomas-holder.de>
-Date: Fri, 28 Sep 2018 18:05:30 +0000
-Subject: [PATCH] fix 1789208 poppler 0.69
-
----
- CMakeScripts/DefineDependsandFlags.cmake      | 12 -----
- src/extension/internal/pdfinput/pdf-input.cpp |  2 +-
- src/extension/internal/pdfinput/pdf-input.h   |  1 +
- .../internal/pdfinput/pdf-parser.cpp          | 46 ++++++++-----------
- src/extension/internal/pdfinput/pdf-parser.h  | 12 +++--
- .../pdfinput/poppler-transition-api.h         | 39 ++++++++++++++++
- .../internal/pdfinput/svg-builder.cpp         | 22 ++++-----
- src/extension/internal/pdfinput/svg-builder.h |  3 +-
- 8 files changed, 80 insertions(+), 57 deletions(-)
- create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
-
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
-index c0fce145be..c1244055d5 100644
---- a/CMakeScripts/DefineDependsandFlags.cmake
-+++ b/CMakeScripts/DefineDependsandFlags.cmake
-@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
- 		set(HAVE_POPPLER_GLIB ON)
- 	    endif()
- 	endif()
--	if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
--		POPPLER_VERSION VERSION_EQUAL   "0.26.0")
--	    set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
--	endif()
--	if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
--		POPPLER_VERSION VERSION_EQUAL   "0.29.0")
--	    set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
--	endif()
--	if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
--		POPPLER_VERSION VERSION_EQUAL   "0.58.0")
--            set(POPPLER_NEW_OBJECT_API ON)
--	endif()
-     else()
- 	set(ENABLE_POPPLER_CAIRO OFF)
-     endif()
-diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
-index e3115620e3..9621e306a0 100644
---- a/src/extension/internal/pdfinput/pdf-input.cpp
-+++ b/src/extension/internal/pdfinput/pdf-input.cpp
-@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
-             dlg->getImportSettings(prefs);
- 
-         // Apply crop settings
--        PDFRectangle *clipToBox = NULL;
-+        _POPPLER_CONST PDFRectangle *clipToBox = NULL;
-         double crop_setting;
-         sp_repr_get_double(prefs, "cropTo", &crop_setting);
- 
-diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
-index 6e36603c31..73bbfe2a71 100644
---- a/src/extension/internal/pdfinput/pdf-input.h
-+++ b/src/extension/internal/pdfinput/pdf-input.h
-@@ -15,6 +15,7 @@
- #endif
- 
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
- 
- #include <gtkmm/dialog.h>
- 
-diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
-index ea9f902e09..4a7fd8a5e5 100644
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
-                      int /*pageNum*/,
- 		     int rotate,
- 		     Dict *resDict,
--                     PDFRectangle *box,
--		     PDFRectangle *cropBox) :
-+                     _POPPLER_CONST PDFRectangle *box,
-+                     _POPPLER_CONST PDFRectangle *cropBox) :
-     xref(xrefA),
-     builder(builderA),
-     subPage(gFalse),
-@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
-   builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
-                            Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
- 
--  double *ctm = state->getCTM();
-+  const double *ctm = state->getCTM();
-   double scaledCTM[6];
-   for (int i = 0; i < 6; ++i) {
-     baseMatrix[i] = ctm[i];
-@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
- PdfParser::PdfParser(XRef *xrefA,
- 		     Inkscape::Extension::Internal::SvgBuilder *builderA,
-                      Dict *resDict,
--		     PDFRectangle *box) :
-+		     _POPPLER_CONST PDFRectangle *box) :
-     xref(xrefA),
-     builder(builderA),
-     subPage(gTrue),
-@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
- 
- void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
-   PdfOperator *op;
--  char *name;
-+  const char *name;
-   Object *argPtr;
-   int i;
- 
-@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
-   (this->*op->func)(argPtr, numArgs);
- }
- 
--PdfOperator* PdfParser::findOp(char *name) {
-+PdfOperator* PdfParser::findOp(const char *name) {
-   int a = -1;
-   int b = numOps;
-   int cmp = -1;
-@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
-                                              GBool stroke, GBool eoFill) {
-   GfxShading *shading;
-   GfxPath *savedPath;
--  double *ctm, *btm, *ptm;
-+  const double *ctm, *btm, *ptm;
-   double m[6], ictm[6], m1[6];
-   double xMin, yMin, xMax, yMax;
-   double det;
-@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
-   GfxColor color0M, color1M, colorM0, colorM1, colorMM;
-   GfxColor colors2[4];
-   double functionColorDelta = colorDeltas[pdfFunctionShading-1];
--  double *matrix;
-+  const double *matrix;
-   double xM, yM;
-   int nComps, i, j;
- 
-@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
-   }
- }
- 
--void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
-+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
-   GfxPatch patch00 = blankPatch();
-   GfxPatch patch01 = blankPatch();
-   GfxPatch patch10 = blankPatch();
-@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
-   double x, y, dx, dy, tdx, tdy;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
--  double *mat;
-+  const double *mat;
-   Object charProc;
-   Dict *resDict;
-   Parser *oldParser;
-@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
- Stream *PdfParser::buildImageStream() {
-   Object dict;
-   Object obj;
--  char *key;
-   Stream *str;
- 
-   // build dictionary
-@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
-       obj.free();
- #endif
-     } else {
--      key = copyString(obj.getName());
--#if defined(POPPLER_NEW_OBJECT_API)
--      obj = parser->getObj();
--#else
--      obj.free();
--      parser->getObj(&obj);
--#endif
--      if (obj.isEOF() || obj.isError()) {
--	gfree(key);
-+      Object obj2;
-+      _POPPLER_CALL(obj2, parser->getObj);
-+      if (obj2.isEOF() || obj2.isError()) {
-+        _POPPLER_FREE(obj);
- 	break;
-       }
--#if defined(POPPLER_NEW_OBJECT_API)
--      dict.dictAdd(key, std::move(obj));
-+      _POPPLER_DICTADD(dict, obj.getName(), obj2);
-+      _POPPLER_FREE(obj);
-+      _POPPLER_FREE(obj2);
-     }
--    obj = parser->getObj();
--#else
--      dict.dictAdd(key, &obj);
--    }
--    parser->getObj(&obj);
--#endif
-+    _POPPLER_CALL(obj, parser->getObj);
-   }
-   if (obj.isEOF()) {
-     error(errSyntaxError, getPos(), "End of file in inline image");
-diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
-index ed28274f42..0a04c81d46 100644
---- a/src/extension/internal/pdfinput/pdf-parser.h
-+++ b/src/extension/internal/pdfinput/pdf-parser.h
-@@ -9,6 +9,7 @@
- #define PDF_PARSER_H
- 
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma interface
-@@ -128,11 +129,14 @@ public:
- 
-   // Constructor for regular output.
-   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
--            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
-+            Dict *resDict,
-+            _POPPLER_CONST PDFRectangle *box,
-+            _POPPLER_CONST PDFRectangle *cropBox);
- 
-   // Constructor for a sub-page object.
-   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
--            Dict *resDict, PDFRectangle *box);
-+            Dict *resDict,
-+            _POPPLER_CONST PDFRectangle *box);
- 
-   virtual ~PdfParser();
- 
-@@ -186,7 +190,7 @@ private:
- 
-   void go(GBool topLevel);
-   void execOp(Object *cmd, Object args[], int numArgs);
--  PdfOperator *findOp(char *name);
-+  PdfOperator *findOp(const char *name);
-   GBool checkArg(Object *arg, TchkType type);
-   int getPos();
- 
-@@ -257,7 +261,7 @@ private:
- 			   double x2, double y2, GfxColor *color2,
- 			   int nComps, int depth);
-   void doPatchMeshShFill(GfxPatchMeshShading *shading);
--  void fillPatch(GfxPatch *patch, int nComps, int depth);
-+  void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
-   void doEndPath();
- 
-   // path clipping operators
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-new file mode 100644
-index 0000000000..898e64bf2b
---- /dev/null
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -0,0 +1,39 @@
-+#ifndef SEEN_POPPLER_TRANSITION_API_H
-+#define SEEN_POPPLER_TRANSITION_API_H
-+
-+#include <glib/poppler-features.h>
-+
-+#if POPPLER_CHECK_VERSION(0,70,0)
-+#define _POPPLER_CONST const
-+#else
-+#define _POPPLER_CONST
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0,69,0)
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
-+#elif POPPLER_CHECK_VERSION(0,58,0)
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
-+#else
-+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0,58,0)
-+#define POPPLER_NEW_OBJECT_API
-+#define _POPPLER_FREE(obj)
-+#define _POPPLER_CALL(ret, func) (ret = func())
-+#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
-+#else
-+#define _POPPLER_FREE(obj) (obj).free()
-+#define _POPPLER_CALL(ret, func) (*func(&ret))
-+#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0, 29, 0)
-+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
-+#endif
-+
-+#if POPPLER_CHECK_VERSION(0, 25, 0)
-+#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
-+#endif
-+
-+#endif
-diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
-index 767c8af4d4..d449d1af52 100644
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
-     if ( pattern != NULL ) {
-         if ( pattern->getType() == 2 ) {  // Shading pattern
-             GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
--            double *ptm;
-+            const double *ptm;
-             double m[6] = {1, 0, 0, 1, 0, 0};
-             double det;
- 
-@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
- 
-     Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
-     // Set pattern transform matrix
--    double *p2u = tiling_pattern->getMatrix();
-+    const double *p2u = tiling_pattern->getMatrix();
-     double m[6] = {1, 0, 0, 1, 0, 0};
-     double det;
-     det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];    // see LP Bug 1168908
-@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
-     pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
-     // Set pattern tiling
-     // FIXME: don't ignore XStep and YStep
--    double *bbox = tiling_pattern->getBBox();
-+    const double *bbox = tiling_pattern->getBBox();
-     sp_repr_set_svg_double(pattern_node, "x", 0.0);
-     sp_repr_set_svg_double(pattern_node, "y", 0.0);
-     sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
-@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
-  */
- gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
-     Inkscape::XML::Node *gradient;
--    Function *func;
-+    _POPPLER_CONST Function *func;
-     int num_funcs;
-     bool extend0, extend1;
- 
-@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
- 
- #define INT_EPSILON 8
- bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
--                                   Function *func) {
-+                                   _POPPLER_CONST Function *func) {
-     int type = func->getType();
-     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
-         GfxRGB stop1, stop2;
-@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
-             _addStopToGradient(gradient, 1.0, &stop2, 1.0);
-         }
-     } else if ( type == 3 ) { // Stitching
--        StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
--        double *bounds = stitchingFunc->getBounds();
--        double *encode = stitchingFunc->getEncode();
-+        auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
-+        const double *bounds = stitchingFunc->getBounds();
-+        const double *encode = stitchingFunc->getEncode();
-         int num_funcs = stitchingFunc->getNumFuncs();
- 
-         // Add stops from all the stitched functions
-@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
-             svgGetShadingColorRGB(shading, bounds[i + 1], &color);
-             // Add stops
-             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
--                double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
-+                double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
-                 if (expE > 1.0) {
-                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
-                     if (encode[2*i] == 0) {    // normal sequence
-@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
-     Inkscape::CSSOStringStream os_font_size;
-     double css_font_size = _font_scaling * state->getFontSize();
-     if ( font->getType() == fontType3 ) {
--        double *font_matrix = font->getFontMatrix();
-+        const double *font_matrix = font->getFontMatrix();
-         if ( font_matrix[0] != 0.0 ) {
-             css_font_size *= font_matrix[3] / font_matrix[0];
-         }
-@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
- void SvgBuilder::updateTextMatrix(GfxState *state) {
-     _flushText();
-     // Update text matrix
--    double *text_matrix = state->getTextMat();
-+    const double *text_matrix = state->getTextMat();
-     double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
-     double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
-     double max_scale;
-diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
-index 55daacee74..34b42e17b8 100644
---- a/src/extension/internal/pdfinput/svg-builder.h
-+++ b/src/extension/internal/pdfinput/svg-builder.h
-@@ -15,6 +15,7 @@
- #endif
- 
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
- 
- class SPDocument;
- namespace Inkscape {
-@@ -174,7 +175,7 @@ private:
-     void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
-                             GfxRGB *color, double opacity);
-     bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
--                           Function *func);
-+                           _POPPLER_CONST Function *func);
-     gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
-                                 bool is_stroke=false);
-     // Image/mask creation
--- 
-2.19.1
-
diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
deleted file mode 100644
index fe6ee81260cf..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.71.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 493aa253fe5c5b1879c0aa26bdad0aa84ba5d6db Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 7 Nov 2018 16:36:22 +0100
-Subject: [PATCH] Fix build with poppler-0.71.0
-
-Fix blatantly backported from
-https://launchpadlibrarian.net/396085203/inkscape-poppler-v071.patch
----
- src/extension/internal/pdfinput/poppler-transition-api.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
-index 6ed911b04b..4437052593 100644
---- a/src/extension/internal/pdfinput/poppler-transition-api.h
-+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
-@@ -3,6 +3,12 @@
- 
- #include <glib/poppler-features.h>
- 
-+#if POPPLER_CHECK_VERSION(0,71,0)
-+typedef bool GBool;
-+#define gTrue true
-+#define gFalse false
-+#endif
-+
- #if POPPLER_CHECK_VERSION(0,70,0)
- #define _POPPLER_CONST const
- #else
--- 
-2.19.1
-
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
deleted file mode 100644
index be1c0511d2c6..000000000000
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ /dev/null
@@ -1,176 +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="xml"
-
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P=${P/_/}
-
-DESCRIPTION="A SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.48
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		media-libs/libcdr
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		media-libs/libvisio
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${DISTDIR}/${PN}-0.92.1-poppler.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable exif) \
-		$(use_enable jpeg) \
-		$(use_enable lcms) \
-		--enable-poppler-cairo \
-		$(use_enable wpg) \
-		$(use_enable visio) \
-		$(use_enable cdr) \
-		$(use_enable dbus dbusapi) \
-		$(use_enable imagemagick magick) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with inkjar) \
-		$(use_with spell gtkspell) \
-		$(use_with spell aspell)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	python_optimize "${ED}"/usr/share/${PN}/extensions
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index f07d0bbf1f7d..82f1004b75f5 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,8 @@ MY_P="${P/_/}"
 
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
+	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -98,11 +99,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
 	"${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.69.patch"
-	"${FILESDIR}/${PN}-0.92.3-poppler-0.71.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.64.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.65.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.64-2.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.69.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.71.patch"
+	"${WORKDIR}/${PN}-0.92.3-poppler-0.72.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index 7baa8d81ca4f..24d6f36aeddb 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,5 +1,7 @@
 DIST iscan-data_1.36.0-1.tar.gz 100218 BLAKE2B 7731266ae58b44541ca9e39621026aa667707cb46774e8199711e627d773fc1029fecb401de2df7746a476a162774ec1eeec75b9d0bfda82567ccef706547baa SHA512 a9711264c852dd4bdcdb10c1153f725a111bd74b03705c99265b6692bf47236c6e4f5e7e4813991eb5991deb198adeee272c8c3eb53da641ba189d923916d3cb
 DIST iscan-data_1.37.0-3.tar.gz 100499 BLAKE2B 8710a69702306b50bb4d9a21a924dd9bf14748b5310ecbe53d7b4ba24bf47122da9c4bfb57a0769f166aa1ce9c732a943703fe1bfafb9500636654f480026f28 SHA512 051b5a3de2af3d621a3ebc181314809edd25598d3d2dc3868abd3423562aa5c2c00808c5e22ada6253588036b4072644dcf979012645c1ae580e9f701544bd40
+DIST iscan-data_1.39.0-1.tar.gz 100793 BLAKE2B 690ce06ed82e817658bd05611a66f9bf6d895bdc17185c585c83c0a8b9c020f0354f782bf991dd4913336799a75d3d424085624e488ca4a77f797088a327fda6 SHA512 15e456d5e64bfe9bea77c3f2a349a2e50c4d8a8cbd1347dfac4ef1f692793561d0d3d32fb3cec10176f013d3b0e46f62d6d24f0870c199088e2e65ec82b4326a
 EBUILD iscan-data-1.36.0.1.ebuild 1265 BLAKE2B 9309392140cf44bbe93ea0f5cf917dcb58656080b8b5cd3088aa080f310f422bb4998c66e532c7dd23bf10da9ed498b83f2446982c7158019df0f37a48ccf0b7 SHA512 4dd435ffc75204b5a87d7dbd144cffe96ee92a25e6bbd5fb19680eac5cf192404d252c5582b4acaf24cb2fe764f25611ab2bd16a4cf63b58ab758166b3315c1a
 EBUILD iscan-data-1.37.0.3.ebuild 1072 BLAKE2B 3aa8ea569f8bfbe597f80cd3ac63437fdcc9a3e3fb19ac3b729c866e366b64719fe99d1913ef8dbcb5b0d848c64114c4f80ebe588308db1d2ac7185c521f4be0 SHA512 0212c3a6f9e5cdab4915c274f06fc7c61392d7a22426184ab8ec5b7f38fc79c32d08ee0949136c2637c863fd9f873c8482ada9f7103647f0b0a99e4378e8f478
+EBUILD iscan-data-1.39.0.1.ebuild 1008 BLAKE2B 06febefb6b2d82435f2556210bac6ce2272e5fd27ea190a76b362754a5c3cff0250b47edb54c881ab842d9388453df4569a7df12d1f94340f40bf2ba06a2a091 SHA512 4a37fcfe31ca7ae1c40c4e2e01fc26280e697c98acc4d940639c8b284ffa763648539bc68133402958c2a312954381cf8afb5e33118e35b87e37a8f282211fee
 MISC metadata.xml 609 BLAKE2B e0c2521d9bd70daf3bca54713178819db98aea387bc4a6b41c682d044656229ab5cdf2bd3212bd61faabdb5d600dfeb8fa445f57eb0247d694a59b35a663b6b2 SHA512 32ede245d749b0be045e45a5c8a6f68f9487d807f8777c0da84fd93b20ca11aa1ec3d132d2b24a7a58802a112b71ace82fa03f3e618a9d66bc99101eefb7b5df
diff --git a/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
new file mode 100644
index 000000000000..e9b6501a2b6c
--- /dev/null
+++ b/media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Image Scan! for Linux data files"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+DEPEND="
+	udev? (
+		dev-libs/libxslt
+		media-gfx/sane-backends
+	)"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+DOCS=( NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS )
+
+src_install() {
+	ewarn "Some profiles automatically enable udev which will cause install"
+	ewarn "to fail if media-gfx/sane-backends is not already installed."
+	default
+
+	if use udev; then
+	# create udev rules
+		local rulesdir=$(get_udevdir)/rules.d
+		dodir ${rulesdir}
+		"${D}/usr/$(get_libdir)/iscan-data/make-policy-file" \
+			--force --mode udev \
+			-d "${D}/usr/share/iscan-data/epkowa.desc" \
+			-o "${D}${rulesdir}/99-iscan.rules" || die
+	fi
+}
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index c8b69f1de45b..a990ee17c1c0 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -4,8 +4,10 @@ AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9f
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
 DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
+DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.2.2-r1.ebuild 4489 BLAKE2B ed29cfe8ed1f9394e12051b00ed32b86def372a6b04a185bf827e4851e3b386cbf892dd4e5ec82b17658964de8d3a9d2288daaff09955ac7179989b3d1c6405f SHA512 adb0808b9a1be643d18913b08d207cef5f732ee233628446772452dadf99967c1e339018029804cc7d967e52d77232a85146144a055272cb6b5336bc8497d7e0
 EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
+EBUILD iscan-2.30.3.1.ebuild 3454 BLAKE2B dc9b8bff1b3efebacdebf1b721b4e611a90da1839d99d184affa50d43d4d2645b03c4820c60255a55068d131a9b61a2a471221feaf04a27f56edd466fb30afd5 SHA512 f251562a61678622e378c219735d9a2491eafcd6a7dc7aa71de93e2b0303f42ec8099c8ea99e398e545e2b41fc34c44de43fa858383f03433fce928db7b81c4a
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
new file mode 100644
index 000000000000..84029550db4e
--- /dev/null
+++ b/media-gfx/iscan/iscan-2.30.3.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_DOC="userg_revQ"
+inherit autotools desktop flag-o-matic
+
+# HINTS:
+# -> non-free modules are x86 and amd64 only
+# -> iscan frontend needs non-free modules
+# -> sane-epkowa should be usable on every arch
+# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
+# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
+
+# FIXME:
+# iscan doesn't compile w/o libusb, this should be fixed somehow.
+
+# TODO:
+# (re)add closed-source binary modules which are needed for some scanners.
+
+DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
+	doc? (
+		https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
+		l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
+	)"
+
+LICENSE="GPL-2 AVASYS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gimp l10n_ja X"
+
+REQUIRED_USE="gimp? ( X )"
+
+DEPEND="
+	dev-libs/libxml2
+	media-gfx/sane-backends
+	virtual/libusb:1
+	virtual/udev
+	gimp? ( media-gfx/gimp )
+	X? (
+		dev-libs/glib:2
+		media-libs/libpng:=
+		media-libs/tiff:=
+		virtual/jpeg:=
+		x11-libs/gtk+:2
+	)
+"
+RDEPEND="${DEPEND}
+	media-gfx/iscan-data
+"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( sys-devel/gettext )
+"
+
+# Upstream ships broken sanity test
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
+	"${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
+	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
+	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
+	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
+)
+
+QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+src_prepare() {
+	default
+
+	if ! use X; then
+		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
+			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE	# needed for 'strndup'
+	replace-flags "-O[0-9s]" "-O1"	# fix selector box bug 388073
+
+	local myeconfargs=(
+		--enable-dependency-reduction
+		--disable-static
+		$(use_enable gimp)
+		$(use_enable X frontend)
+		$(use_enable X jpeg)
+		$(use_enable X png)
+		$(use_enable X tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	use l10n_ja && DOCS+=( {NEWS,README}.ja )
+	use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
+	default
+
+	# install sane config
+	insinto /etc/sane.d
+	doins backend/epkowa.conf
+
+	# link iscan so it is seen as a plugin in gimp
+	if use gimp; then
+		local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		dodir "${plugindir}"
+		dosym /usr/bin/iscan "${plugindir}"/iscan
+	fi
+
+	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
+}
+
+pkg_postinst() {
+	local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
+	local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
+
+	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
+		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
+		elog "Then edit ${EPKOWA_CONF} to suit your needs."
+	else
+		echo "epkowa" >> ${DLL_CONF} || die
+		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
+		elog "Please edit ${EPKOWA_CONF} to suit your needs."
+	fi
+}
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 9a4da0573fb2..3617f7ff907f 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,4 +1,3 @@
-AUX kgraphviewer-2.4.2-unused-dependency.patch 1421 BLAKE2B 92206b24d8fff9efbca0a5e847b856fbea313429f0c922107dd23d07bd2868ea24b9849d79cd0e858e95b20d91bf3595c2aa127f9645ae19ee9e9f2e7d69be57 SHA512 f54c2b1806da3e12988e88d593f0a09414ff9574a9f6df0bdaacb340127824292a29425791cfb3ccdff99c03ca1cba0940e3bd8bb49a59c2954ef192cd03facf
 DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d
 EBUILD kgraphviewer-2.4.3.ebuild 971 BLAKE2B cd38fbfe2c701f736ec608f1c3f658dc315254f398bc1b82a88b72588408dedfbfff09d392b43aaf86eaf39f1833cae9373f029d65d37fc2235ed438cc8bf53b SHA512 33d7d4e16eb680de6dd39b2e93bed30ddf28bcb35ff20ccf804bf81daf04e4fbbb609e7e8aa6be9c2b562d1a4fd7901cf2858124f32938687521b7907dacbfb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch
deleted file mode 100644
index 32dc4a084c8d..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.2-unused-dependency.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From aa8937f6774846112a0dfa980d77d91398056c99 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Mon, 12 Mar 2018 15:57:49 +1100
-Subject: [PATCH] Remove unused dependency.
-
----
- CMakeLists.txt          | 1 -
- src/part/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1a23cb..f6fb447 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     CoreAddons
-     DocTools
-     Parts
--    KIO
-     WidgetsAddons
-     IconThemes
- )
-diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
-index 65a31e7..0e70be8 100644
---- a/src/part/CMakeLists.txt
-+++ b/src/part/CMakeLists.txt
-@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} )
- 
- add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS})
- 
--target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::KIOWidgets KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
-+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES})
- 
- set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer )
- 
--- 
-2.16.1
-
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index cf72e5ca5b5b..0145e8d61f4f 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,4 @@
+AUX kphotoalbum-5.4-exiv2-0.27.patch 1687 BLAKE2B b1d94b96200dc3e750e76c1e8567061ee6fa693478aa82556f24ef805365653eb90d72252b0a26d24b9b8a224f767ca56710e0d52701a71d82e41d3651e86d17 SHA512 768e7c1e31e4472dc304eae85bf8ba73bc590cd7817c486ae9051f0a25eb333f9054dea81187230b816381c6299e6bf374e1d6455db9b7d2532490b6f1f934f7
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
-EBUILD kphotoalbum-5.4.ebuild 1522 BLAKE2B cf41ba05300b2cb3f210b7bea9f37646780694bb234abd58aa9995ac6f82b37c9fa075367e891252657a37c852a570f4e3c17fb42e62e0a0e0ab89521b95ef84 SHA512 0be6c52c90397e7e2ce363b0bbe70b4b4c416bfc0d2100d5e41e2006f042047348ddb67e5dc0b071c54dff186390a63edee0ece6c1ff5d8b88cfe42a597047d7
+EBUILD kphotoalbum-5.4.ebuild 1571 BLAKE2B 7699730f48c3f1d037a0349c444c3876eaf3accd0001954812778f18efa03de768753f8bb0c095ebe5ee6e09d302d5baec993b10ca0d18de2a7f1cfdccaf5b91 SHA512 7441a62ee268bab25149cc26b46fe9d636c2720c0fc56696181557e46813c7d30b921d48922bc4bed1d36b385f6109de92bb8e0894c94624104a6b66af8e10fa
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
new file mode 100644
index 000000000000..7b7f612b94f9
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
@@ -0,0 +1,61 @@
+From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 30 Dec 2018 23:36:24 +0100
+Subject: Use Exiv2 0.27 if available.
+
+Beginning with version 0.27, Exiv2 ships with cmake package config
+files.
+---
+ CMakeLists.txt | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3012f7a..5dcc29c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,17 @@ if(JPEG_FOUND)
+     include_directories(${JPEG_INCLUDE_DIR})
+ endif()
+ 
+-find_package(Exiv2 REQUIRED)
++### 2018-12-30 jzarl
++# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed
++# and only find_package(exiv2) should be used
++find_package(exiv2 CONFIG QUIET)
++if(exiv2_FOUND)
++    # search againg with REQUIRED, so that the feature summary correctly shows exiv as required dependency
++    find_package(exiv2 CONFIG REQUIRED)
++    set(EXIV2_LIBRARIES exiv2lib)
++else()
++    find_package(Exiv2 REQUIRED)
++endif()
+ 
+ find_package(KF5Kipi 5.1.0)
+ set_package_properties(KF5Kipi
+-- 
+cgit v1.1
+From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 30 Dec 2018 23:43:14 +0100
+Subject: Fix compilation with exiv2 0.27
+
+---
+ Exif/Info.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Exif/Info.cpp b/Exif/Info.cpp
+index be4c88f..9545360 100644
+--- a/Exif/Info.cpp
++++ b/Exif/Info.cpp
+@@ -28,7 +28,8 @@
+ #include <QFile>
+ 
+ #include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exv_conf.h>
++#include <exiv2/version.hpp>
+ 
+ using namespace Exif;
+ 
+-- 
+cgit v1.1
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index ce7c3284e2af..6aaff0db9146 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -49,6 +49,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( ChangeLog README )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 64f4820b8b8f..9e20e6caff3d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,8 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
-AUX krita-4.1.7-exiv2-0.27.patch 14937 BLAKE2B 9ccfbb4fd023895aff49a9cff0f4e30b687b2285881d7fe489ac546589f44c722a36279b16ec2efa8b4c1c86a37494768565e8c5137f5894a84df5944cdd0b60 SHA512 d48928a86fcb6b7d80c79fb17fe20c6be46184e9ca67755723633c3a340127af336f1c1c845a8a6861d4967cbff32f61cbf5f6398c7868a4dcf158f29b67cbd6
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
+DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2
-EBUILD krita-4.1.7.ebuild 3280 BLAKE2B d95bac7e59fda438c564500330f7f291dcb04b4772a050af065d3d45dca7660a7726ce5cc7bf7c329c4983ccf86bdf7b6aac4292db5ebadf6a6a1cacefa44967 SHA512 0aaabe637dfeb809b36fd32ef572344439021f2d0432ee08e342447d5ccc404028c73bbd63877c334c76b3ca22a8c2f4a21196459af1bc09d7a065bc3bea3411
+EBUILD krita-4.1.7-r1.ebuild 3458 BLAKE2B 698c3974fc2d55c1dbb6ddd6b5d16272528943e71f42ae7425bcbb6de9076b5e431de317543d21725cbf13e0787e686972c5c603e914ecadb984aaac3a10f665 SHA512 c0b8ae87e32b963053f9f9a1d29b1a0ff990ac5c1a24b1bffc3e97218e3b66c77202ef0f3b4c082a87e844350de6f89bef35f5c2c19534f5b1e277ba3f8e5a8a
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
deleted file mode 100644
index 41b290852eb5..000000000000
--- a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 27 Dec 2018 22:40:44 +0100
-Subject: [PATCH] Fix building against exiv2-0.27
-
-Summary:
-Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
-
-Thanks-to: Boudewijn Rempt <boud@valdyas.org>
-for final fix to kis_xmp_io.cpp.
-
-CCBUG: 402566
-
-Test Plan: Built fine against exiv2-0.26 and exiv2-0.27.
-
-Reviewers: #krita, rempt
-
-Reviewed By: #krita, rempt
-
-Subscribers: pino
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D17810
----
- CMakeLists.txt                    |   6 +-
- cmake/modules/FindLibExiv2.cmake  | 115 ++++++++++++++++++++++++++++++
- libs/ui/CMakeLists.txt            |   3 +-
- libs/ui/kisexiv2/kis_exif_io.cpp  |  14 ++--
- libs/ui/kisexiv2/kis_exiv2.h      |   2 +-
- libs/ui/kisexiv2/kis_iptc_io.cpp  |   4 +-
- libs/ui/kisexiv2/kis_xmp_io.cpp   |   6 +-
- plugins/impex/jpeg/CMakeLists.txt |   5 +-
- 8 files changed, 130 insertions(+), 25 deletions(-)
- create mode 100644 cmake/modules/FindLibExiv2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5558088200..b2d2cd497e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES
- ##
- ## Test for exiv2
- ##
--find_package(Exiv2 0.16 REQUIRED)
--set_package_properties(Exiv2 PROPERTIES
--    DESCRIPTION "Image metadata library and tools"
--    URL "http://www.exiv2.org"
--    PURPOSE "Required by Krita")
-+find_package(LibExiv2 0.16 REQUIRED)
- 
- ##
- ## Test for lcms
-diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake
-new file mode 100644
-index 0000000000..935cee2c55
---- /dev/null
-+++ b/cmake/modules/FindLibExiv2.cmake
-@@ -0,0 +1,115 @@
-+#.rst:
-+# FindLibExiv2
-+# ------------
-+#
-+# Try to find the Exiv2 library.
-+#
-+# This will define the following variables:
-+#
-+# ``LibExiv2_FOUND``
-+#     System has LibExiv2.
-+#
-+# ``LibExiv2_VERSION``
-+#     The version of LibExiv2.
-+#
-+# ``LibExiv2_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if
-+#     the target is not used for linking.
-+#
-+# ``LibExiv2_LIBRARIES``
-+#     The LibExiv2 library.
-+#     This can be passed to target_link_libraries() instead of
-+#     the ``LibExiv2::LibExiv2`` target
-+#
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
-+# will be available:
-+#
-+# ``LibExiv2::LibExiv2``
-+#     The Exiv2 library
-+#
-+# Since 5.53.0.
-+#
-+#=============================================================================
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_EXIV2 QUIET exiv2)
-+
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
-+    HINTS ${PC_EXIV2_INCLUDEDIR}
-+)
-+
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
-+    HINTS ${PC_EXIV2_LIBRARY_DIRS}
-+)
-+
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
-+
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
-+    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
-+    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
-+        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
-+            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
-+            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
-+            if(EXIV2_MAJOR_VERSION_MATCH)
-+                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
-+            endif()
-+        endif()
-+    endforeach()
-+
-+    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibExiv2
-+    FOUND_VAR LibExiv2_FOUND
-+    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
-+    VERSION_VAR  LibExiv2_VERSION
-+)
-+
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
-+
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
-+    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
-+    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
-+        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(LibExiv2 PROPERTIES
-+    URL "http://www.exiv2.org"
-+    DESCRIPTION "Image metadata support"
-+)
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
-index f14d3591bc..ff57f53158 100644
---- a/libs/ui/CMakeLists.txt
-+++ b/libs/ui/CMakeLists.txt
-@@ -1,6 +1,5 @@
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -544,7 +543,7 @@ add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
- generate_export_header(kritaui BASE_NAME kritaui)
- 
- target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
--                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
-+                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2
- )
- 
- if (HAVE_QT_MULTIMEDIA)
-diff --git a/libs/ui/kisexiv2/kis_exif_io.cpp b/libs/ui/kisexiv2/kis_exif_io.cpp
-index 1a01fedf33..4a7857aa9c 100644
---- a/libs/ui/kisexiv2/kis_exif_io.cpp
-+++ b/libs/ui/kisexiv2/kis_exif_io.cpp
-@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     if (entry.value().asArray().size() > 0) {
-                         creator = entry.value().asArray()[0];
-                     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
--
- #endif
-                 } else if (exivKey == "Exif.Photo.OECF") {
-                     v = kmdOECFStructureToExifOECF(entry.value());
-@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
-                     QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
-                     if (langArr.contains("x-default")) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
- #endif
-                     } else if (langArr.size() > 0) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
-@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     }
-                 } else {
-                     dbgMetaData << exifKey.tag();
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
-@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-             dbgMetaData << "exiv error " << e.what();
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = exifData.copy();
-     ioDevice->write((const char*) rawData.pData_, rawData.size_);
- #else
-@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::ExifData exifData;
-     Exiv2::ByteOrder byteOrder;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
-     byteOrder = exifData.byteOrder();
- #else
-@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-         dbgKrita << "Received unknown exception trying to parse exiv data";
-         return false;
-     }
--
- #endif
-     dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
-     dbgMetaData << "There are" << exifData.count() << " entries in the exif section";
-diff --git a/libs/ui/kisexiv2/kis_exiv2.h b/libs/ui/kisexiv2/kis_exiv2.h
-index 9343265f1e..6b66aa7852 100644
---- a/libs/ui/kisexiv2/kis_exiv2.h
-+++ b/libs/ui/kisexiv2/kis_exiv2.h
-@@ -21,7 +21,7 @@
- 
- 
- #include <metadata/kis_meta_data_value.h>
--#include <exiv2/value.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "kritaui_export.h"
- 
- /// Convert an exiv value to a KisMetaData value
-diff --git a/libs/ui/kisexiv2/kis_iptc_io.cpp b/libs/ui/kisexiv2/kis_iptc_io.cpp
-index d2eb7c9b2f..0ac881f61b 100644
---- a/libs/ui/kisexiv2/kis_iptc_io.cpp
-+++ b/libs/ui/kisexiv2/kis_iptc_io.cpp
-@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-             }
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = iptcData.copy();
- #else
-     Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData);
-@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-     ioDevice->open(QIODevice::ReadOnly);
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::IptcData iptcData;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     iptcData.load((const Exiv2::byte*)arr.data(), arr.size());
- #else
-     Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size());
-diff --git a/libs/ui/kisexiv2/kis_xmp_io.cpp b/libs/ui/kisexiv2/kis_xmp_io.cpp
-index c4663efe7d..72fa5c5d38 100644
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp
-@@ -17,7 +17,6 @@
- #include "kis_xmp_io.h"
- 
- #include <string>
--#include <exiv2/xmp.hpp>
- 
- #include "kis_exiv2.h"
- 
-@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-                 const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
-                 Q_ASSERT(xav);
-                 QList<KisMetaData::Value> array;
--                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
--                        it != xav->value_.end(); ++it) {
--                    QString value = it->c_str();
-+                for (int i = 0; i < xav->size(); ++i) {
-+                    QString value = QString::fromStdString(xav->toString(i));
-                     if (parser) {
-                         array.push_back(parser->parse(value));
-                     } else {
-diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
-index 347e46dbe3..50edb05c96 100644
---- a/plugins/impex/jpeg/CMakeLists.txt
-+++ b/plugins/impex/jpeg/CMakeLists.txt
-@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
- include_directories(
-     ${ICCJPEG_SOURCE_DIR}
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES
- 
- add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES})
- 
--target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegimport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES kis_wdg_options_jpeg.ui )
- 
- add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES})
- 
--target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegexport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- install( PROGRAMS  krita_jpeg.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
--- 
-2.20.1
-
diff --git a/media-gfx/krita/krita-4.1.7-r1.ebuild b/media-gfx/krita/krita-4.1.7-r1.ebuild
new file mode 100644
index 000000000000..9a37a3abbdb5
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.7-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.11.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz
+		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: Drop subslot operator when QTBUG is fixed:
+# https://bugreports.qt.io/browse/QTBUG-72488
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(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 '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+	"${WORKDIR}/${P}-exiv2-0.27.patch"
+	"${WORKDIR}/${P}-resize-hud.patch"
+	"${WORKDIR}/${P}-overview-docker.patch"
+	"${WORKDIR}/${P}-assert-error.patch"
+)
+
+S="${S}.101"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7.ebuild
deleted file mode 100644
index efe9923bc337..000000000000
--- a/media-gfx/krita/krita-4.1.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: Drop subslot operator when QTBUG is fixed:
-# https://bugreports.qt.io/browse/QTBUG-72488
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(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 '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-	"${FILESDIR}/${P}-exiv2-0.27.patch"
-)
-
-S="${S}.101"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 5d9a171ee8b3..19bf5d54ec15 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,5 +3,5 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
-EBUILD libimagequant-2.12.2.ebuild 1445 BLAKE2B 5c9e32c997db0c6551fc94ca12e1bed60555967f08495406edf1d35232adcda9f2f8c9b10d0ff62ef0ebd5e61a494808e2d364450c7a0a70f78eadde18a1488b SHA512 ef68d3065ba9ad164f2fa3e61c5b046e2dbd3edc9d78e7d270351874cf4ecef053802e9b6d38db45c843b571774db0fc8ff88ab3b92f52303a5c63faa76a880d
+EBUILD libimagequant-2.12.2.ebuild 1452 BLAKE2B 4fd7cc6bbd9acdc610af8791a32b6cd34ffff66893ab61e0e682fe6f9a1eebdf3783934febef879b7ab732cfd09d441dac95c053d1f222add132c08b632cf610 SHA512 a9cf5dcd24c59900cfff173abbbaf98261fbf75efa03d685f6c9b893674eb501f2701d2b25e28eedb08f7a4408a49cc9a7cfa061db779a10ea72e6cf9e841508
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index 1cfe04f72c2b..e3a6a6b40254 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 1f14baebbeb0..a065de09e4ef 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -16,6 +16,8 @@ AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093b
 AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19
 AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
+AUX 2016.12/meshlab-2016.12-qprintable.patch 898 BLAKE2B 1a4802e758f8c7d29839eae49d5450b4d199011544223da7d7791045d44f2b2d71f7189d0cb655204d77736e63988079eeb64876411c62f09646887dae30aff8 SHA512 12836928f1848048afe769188285cc5a0a4e23b7d63f9c12ebae0298296607167d8e6198ea779cc475ca2cd39903c4a37dc77b20c928c49cddae1b4ee2fe2a7f
+AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb74da2a916fb6a8a01354be819d43fd960913f96863d8d3696a23440e8857081560326b78538446426d676f6d0c52b42fe3bc20ae1ca SHA512 ad9613bdafa1f812f4fd6b36a215b78416b2143af6ae96bc6c40d81eee47e16c0d2e62a7b292367333ff99b09f84630f1a9b5ba59d9a1ef3209a3caa28f1f5f6
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
 AUX 2016.12/remove-io_TXT.patch 416 BLAKE2B 60aa9c033a4902c4a9acb76b1ac130076cfdef314ac57a144c0a83d59e1d7f2aa5e55c01c41ba671661cdeef249aa09e021085440214910c8153fa6303833c2f SHA512 2ff0391e5c0bd171bb06fc61cbe84112f5e480667f7a7caacbb3b3a0e566c6c2f31f443d8c6026298c3a86bf2979db534989b4eab368baaee67491b95e76723a
@@ -23,4 +25,5 @@ DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 EBUILD meshlab-2016.12-r2.ebuild 3499 BLAKE2B 091b524a914ae4e97ddeb36d280e00cfcfe73562528f701dc979bbe8b48d993ee542c3e62f02e21093c678d7c99918f18705f011db51fc376c64a384d4534123 SHA512 ca7e94c0b96acaedcbce13456e4cba2e58d8f98bbd1b0fe860703776c9c31d30658b05ad81c172a79fb1dadd06f5eb51156ff4bc44f4ac97e8f4159e162e11f0
 EBUILD meshlab-2016.12-r3.ebuild 3541 BLAKE2B fa43f8db5d083a4ff06cf5ed7063916c0c751db887b6c1dc99fd22c788c05460a4caa6f3ee9c846e6812a5ccc2b537f05a4b9655e7282ca9fdf18db3d1039d44 SHA512 c821471fc31987425988cc65112b8945f2b22f159ba43ad4a1028b52bfeba346e268f4209b6a032c01192180db10e3154497f5658442be1e01c29f768cb63e99
+EBUILD meshlab-2016.12-r4.ebuild 3627 BLAKE2B 3b2919f0861a6cabb15013b48cbb4c17e5ad2ab6c89b1f2d5926b8b62316df17a3278fb011b816f42fd215453895c37ebaaba5432eed8af736d1f1ea77715db4 SHA512 b8957fe1bf8e48e764a6b78830a40936315bef60c084bc62f07832d31fa6c29c2cb7d50de4dbec66aa874c16f6e837290b9b23a6f904a7a6312d0689861e511e
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
new file mode 100644
index 000000000000..61965baa9a9a
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
@@ -0,0 +1,20 @@
+--- a/meshlabserver/mainserver.cpp
++++ b/meshlabserver/mainserver.cpp
+@@ -897,7 +897,7 @@
+     }
+ 
+ 	if (meshDocument.size() < outmeshlist.size())
+-		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size()));
++		fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size());
+ 	else
+ 	{
+ 		for (int ii = 0; ii < outmeshlist.size(); ++ii)
+@@ -911,7 +911,7 @@
+ 					fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename));
+ 			}
+ 			else
+-				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
++				fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
+ 		}
+ 
+ 	}
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
new file mode 100644
index 000000000000..0991bfc71e15
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
@@ -0,0 +1,22 @@
+--- a/meshlabplugins/render_gdp/shaderDialog.h
++++ b/meshlabplugins/render_gdp/shaderDialog.h
+@@ -32,6 +32,8 @@
+ #include "shaderStructs.h"
+ #include "ui_shaderDialog.h"
+ #include <QMap>
++#include <QLineEdit>
++#include <QSlider>
+ 
+ class QGLWidget;
+ 
+--- a/meshlabplugins/edit_paint/paintbox.cpp
++++ b/meshlabplugins/edit_paint/paintbox.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include "paintbox.h"
+ #include <QFileDialog>
++#include <QAction>
+ 
+ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
+ {
+ 
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
new file mode 100644
index 000000000000..b9df6e46bbc5
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
+HOMEPAGE="http://www.meshlab.net"
+VCG_VERSION="1.0.1"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	 https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal"
+DEPEND="dev-cpp/eigen:3
+	dev-cpp/muParser
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5
+	dev-qt/qtxmlpatterns:5
+	>=media-gfx/jhead-3.00-r2
+	media-libs/glew:0
+	media-libs/qhull
+	=media-libs/lib3ds-1*
+	media-libs/openctm
+	sci-libs/levmar
+	sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-${PV}/src"
+
+PATCHES=(
+		"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+		#remove ot working plugins
+		"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+		"${FILESDIR}/${PV}/remove-io_TXT.patch"
+		#since structure synth doesn't seem to be compiling
+		"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+		#this has been fixed in the tree
+		"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+		#this causes segfaults
+		"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+		#for when we use minimal
+		"${FILESDIR}/${PV}/0001-compile-server.patch"
+		"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+		"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+		"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+		"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+		"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+		"${FILESDIR}/${PV}/0001-use-external-glew.patch"
+		#cause gnu stack quickstart related qa
+		"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+		"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+		"${FILESDIR}/${PV}/${P}-align1.patch"
+		"${FILESDIR}/${PV}/${P}-align2.patch"
+		"${FILESDIR}/${PV}/${P}-asString.patch"
+		"${FILESDIR}/${PV}/${P}-qprintable.patch"
+		"${FILESDIR}/${PV}/${P}-qt-includes.patch"
+	)
+
+src_prepare(){
+	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
+	default
+	#proof of patchset
+	#remove libs that are being used from the system
+	rm -r "external/lib3ds-1.3.0" || die "rm failed"
+	rm -r "external/OpenCTM-1.0.3" || die "rm failed"
+	rm -r "external/muparser_v132" || die "rm failed"
+	rm -r "external/muparser_v225" || die "rm failed"
+	rm -r "external/bzip2-1.0.5" || die "rm failed"
+	rm -r "external/jhead-2.95" || die "rm failed"
+	rm -r "external/glew-1.5.1" || die "rm failed"
+	rm -r "external/glew-1.7.0" || die "rm failed"
+	#we still depend on lm.h
+	#rm -r "external"
+	rm -r "distrib/plugins/U3D_W32" || die
+	rm -r "distrib/plugins/U3D_OSX" || die
+
+	# Fix bug 638796
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
+}
+
+src_configure() {
+	use minimal || eqmake5 -r meshlab_full.pro
+	use minimal && eqmake5 -r meshlab_mini.pro
+}
+
+src_install() {
+	dobin distrib/{meshlab,meshlabserver}
+	dolib distrib/libcommon.so.1.0.0
+	dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
+	dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
+	exeinto /usr/$(get_libdir)/meshlab/plugins
+	doexe distrib/plugins/*.so
+	insinto /usr/share/meshlab/shaders
+	doins -r distrib/shaders/*
+	insinto /usr/share/meshlab/plugins
+	doins -r distrib/plugins/*
+	insinto /usr/share/meshlab/textures
+	doins -r distrib/textures/*
+	insinto /usr/share/meshlab/sample
+	doins -r distrib/sample/*
+	newicon "${S}"/meshlab/images/eye512.png "${PN}".png
+	make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index 69f598f17bde..b0ed20fb76a4 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -3,7 +3,7 @@ AUX nomacs-3.8.1-qt-5.11.patch 4507 BLAKE2B 5473253ebd9405ee31dc8fa230dc3548f15f
 DIST nomacs-3.10.2.tar.gz 32302506 BLAKE2B 14f9eb9188f74c91cf088bac757a4023f6590bc05687b4809794a70bdd1e2dbcc2b58ad65062db14cfec9f4c639ceb21e64df19f1c1584256ee9586ab588d8af SHA512 977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd
 DIST nomacs-3.12.tar.gz 1736648 BLAKE2B 533e18dec4be5d945213ccd629262a2cbae1eba93599f43be0a98d32d0b54d9caad7d963809f2fc9bb5c1ba682a39f44763b5d04e50c6e86658f6cd84324f3d2 SHA512 4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119
 DIST nomacs-3.8.1.tar.gz 32184536 BLAKE2B 3ba4e0b0220797991c5999164e27fb3c57218d87d17858f5cf6098d8b91ddd0b3330836642999ce953f3ce9b538dcb35ecb48400f94f11805cd8eedeed05b110 SHA512 ff27570bc15096d0e331ad2c871b2f504a414927b8e64166668dedbbbc41f8cd031d9fb142c89c22cff76bf79156f93decf1038e30eecfc3de3e328a325f0134
-EBUILD nomacs-3.10.2.ebuild 1753 BLAKE2B 83873ae4347c1241de2fe0ff82a25189422e747379dade0a9133dca36ed669b78da12a3c98a49d40db7450893b31c8134072210afeaca9cd7378ec4a9b48dd6a SHA512 0b21878384690aff25570114cc1b9a32cf2024d8c95ba92aee61da1a5abde45698678e75e8a2fd49c75077cdea853b5343c47696042258cf9c718f6bda20b442
+EBUILD nomacs-3.10.2.ebuild 1749 BLAKE2B 27219ed51ad2a7a727b0327e2ce5548a56c659d395ac669fee561e7ba381f9064c7c3d2c5ecb25279a0d856aff0bb9a05ab55256df9f8171854ba3d425b4bef4 SHA512 cf513315746d6a1e4c2089e25f6a5c510ebb68d8d463f1c0d3d00bdfac3ef8f83d086788f925200b32c1d5fdc31ac77b281aab50b49bca4532541ff304716cb3
 EBUILD nomacs-3.12.ebuild 1341 BLAKE2B 66c969a82102d950b72e0b2fdce39d4970bf4fe8b3d36ac2e751f6e31616f551f2bb6615c4586236de9fd7b0ce374f9da2e2c3eb4af6f28783ccc87a7b3c9af5 SHA512 7edc9b02d4721c46be37d77aad4912a65081098c50084753ab501974033dc3bc383860b7a4a7667eeacbd12a0c60a41a9c5a511b2ba1eae692dfd71ad44cc6f0
 EBUILD nomacs-3.8.1.ebuild 1733 BLAKE2B 52eaaba8455349581f26a583159df4ad8494e68fca503fa1659455dea921a9829145e2ac4302e36325fc33fc77424b6b263191995f7d8be7ab8a9051f9eb7860 SHA512 894b46f2662f472253b281b007018caace584076517bd010908a506533b7b299325a4fd5c43443096b66bcd9a80a976b43a05c2938caca5748cf684b17986ec4
 MISC metadata.xml 658 BLAKE2B 72c4850c61d0aa0c068870eb15f33471279182f0b4fb09a18f24b4a497df4f0928492a2cb24d6f47bd6adc54f3e8be95d937c65f95db01dfc5a4bda83830e3ea SHA512 7388bf834b7483835054cf4550984916a6ccd56902d7992b24f83affd39e2aac8a50599b81370f85683882425c93bfd081fffa5f7e693b6d1683b5429be1cae0
diff --git a/media-gfx/nomacs/nomacs-3.10.2.ebuild b/media-gfx/nomacs/nomacs-3.10.2.ebuild
index bd6b71e7f273..049b159eda8b 100644
--- a/media-gfx/nomacs/nomacs-3.10.2.ebuild
+++ b/media-gfx/nomacs/nomacs-3.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 IUSE="+jpeg +opencv raw tiff zip"
 
 REQUIRED_USE="
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 7afa414a018f..49ad7dfa3723 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -2,5 +2,5 @@ AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e7
 DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a
-EBUILD photoqt-1.7.1.ebuild 1413 BLAKE2B 74faf1e176770f1b8f965a96b8e4be9c730ea791c951152be9ade3523e35c898e56d439699841d7f44407aa3a9cf9e2b11c3c1de5cf45915bb0571f3813a4828 SHA512 86f48c17776705332b504df6ba1ea5cf354ba597252884cbd693f69a3a13e86aaadeec6804dde92faa99c1c95b334d6ddf49a00299ed4abb908cd5073260df47
+EBUILD photoqt-1.7.1.ebuild 1412 BLAKE2B a06a7833c31cda115dd5d0cb9005947e3a2bb44f3a45f7412751fa4cf0b365b6766a06488f4a7596c878f2872cca2e306e4d563e461b18277077a05e5d653a2b SHA512 cee04e12943c117d3a5cbe8932a65d7f691ea8fb5f1b8b33cc72a598f81ec4f6a38291be127b683b052935dacfaa945e4c8bd63aef2221b79da81f7bd828403f
 MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index a865dab8014b..9abea34299ff 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="devil exif freeimage graphicsmagick pdf raw"
 
 RDEPEND="
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index b4ebe54b971f..9ba2fff57db4 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,5 @@
-DIST rawtherapee-5.2.tar.xz 10819936 BLAKE2B 6f4474fdf86efe177861a1a4da2178f75c3589b9d5649d43f7b70a13e51c9658af74fbaea4528e5dc34287b8109cc30608028ca348eb2186d7a2452322139169 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d
-DIST rawtherapee-5.3.tar.xz 11042548 BLAKE2B 7e0697fc0c0e8b3078ccf1f9079a4adebf7c12e8e91e1d5499f304e93bda1d025540d3744b719535133f249941e2b4dcee98189d20e3009eceeb8531252bfd1a SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284
 DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
-EBUILD rawtherapee-5.2.ebuild 1645 BLAKE2B 1de2629c455de8965ad83b68a0f32f40fb40e6c9d65dea1c6b1f5b0da9862530f11d35475bc4e0412df943fd602a9fbda6ff5cbeb0a185ac95bd07db06ba2079 SHA512 3f06920c09a7b487bc2779ca665bab242469129af57f6bebdee9169eacddedb01cc68e81971406632557b3ce75452fc314fb3a3539b11b6fcf878d334cd4fbc1
-EBUILD rawtherapee-5.3.ebuild 1667 BLAKE2B c6ba0b5a19be035fca4cfefbf466e029b8eccf8ed677eed0adf3a0d251935836dc533762f52aee0cfed285b0f0c612e376aa2e162fbdf575e6e613ca7f19830e SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a
+DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
+EBUILD rawtherapee-5.5.ebuild 1632 BLAKE2B 9532c517460e30fa307d47ce83fb41c2722b178b6b560b70c13dbfbd75f233261f6b1eaa30711a131e801d44b181b1a121cf98e3e7801d842a6801fe345180e9 SHA512 eb553e9e10586745cdb200ddf69915d122c2a06cc0347894b697c9400d18053965670a3258092fa996004b21f16f054cf8b072020369adf91c8c0861b9b9eee1
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
deleted file mode 100644
index 652e35577aef..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.2.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 cmake-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-
-MY_P=${P/_rc/-rc}
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="x11-libs/gtk+:3
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk3]
-	media-libs/tiff:0
-	media-libs/libpng:0
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-cpp/gtkmm:3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	# https://github.com/vivo75/vivovl/issues/2
-	if [[ $(get-flag -O3) != "-O3" ]] ; then
-		ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
-		ewarn "see bug#606896#c2"
-		ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		ewarn "for suggestion on how to change environment for a single package"
-	fi
-}
-
-src_configure() {
-	filter-flags -ffast-math
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.3.ebuild b/media-gfx/rawtherapee/rawtherapee-5.3.ebuild
deleted file mode 100644
index a345df7ead1c..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-
-MY_P=${P/_rc/-rc}
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="openmp"
-
-RDEPEND="x11-libs/gtk+:3
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk3]
-	media-libs/tiff:0
-	media-libs/libpng:0
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	media-libs/lensfun
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-cpp/gtkmm:3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	# https://github.com/vivo75/vivovl/issues/2
-	if [[ $(get-flag -O3) != "-O3" ]] ; then
-		ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
-		ewarn "see bug#606896#c2"
-		ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		ewarn "for suggestion on how to change environment for a single package"
-	fi
-}
-
-src_configure() {
-	filter-flags -ffast-math
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.5.ebuild b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
new file mode 100644
index 000000000000..0994a1f97e03
--- /dev/null
+++ b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
+
+MY_P=${P/_rc/-rc}
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="openmp"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libsigc++:2
+	media-libs/lcms:2
+	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-cpp/gtkmm:3.0
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	# upstream tested that "fast-math" give wrong results, so filter it
+	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
+	filter-flags -ffast-math
+	# -Ofast enable "fast-math" both in gcc and clang
+	replace-flags -Ofast -O3
+	# In case we add an ebuild for klt we can (i)use that one,
+	# see http://cecas.clemson.edu/~stb/klt/
+	local mycmakeargs=(
+		-DOPTION_OMP=$(usex openmp)
+		-DDOCDIR=/usr/share/doc/${PF}
+		-DCREDITSDIR=/usr/share/${PN}
+		-DLICENCEDIR=/usr/share/${PN}
+		-DCACHE_NAME_SUFFIX=""
+		-DWITH_SYSTEM_KLT="off"
+	)
+	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/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 201c2ba651f2..6fd205fa64d8 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -3,5 +3,6 @@ AUX zbar-0.10-python-crash.patch 604 BLAKE2B 463f23b6338455b0029fce845fcbb02168c
 AUX zbar-0.10-v4l2-uvcvideo.patch 1487 BLAKE2B 61486465183a50ee0e515d6232923c63819e707d4a429a653f94ea6b7f404e8a5ab54602e074df0fab3f0188c50e8f4fc12a6ac5a63509484d7cd24925bb1957 SHA512 6a53eb54ed3ad83cacb9a09d0b119550d364e586990725f0a423a180fab790e18c2c6d8201d185a51bd26ea3955018416b2993fbdb5e5a555e13183b3bce7b1a
 AUX zbar-0.10_p20121015-ImageMagick-7.patch 1135 BLAKE2B 103cfe85d547cd3087a08676abdfd5966b9b4dd32de4c35e1aee144247af8562e6425d65d170fcb98bcb43e0bc18dcd39d4cf3baf46eea4a1c81814a14946bb0 SHA512 c67dee821338d0bbb54b3c4b22a75616e876ad56e5bbcaad856fe16b39ef3e07b7b80dcb6c25023857ebd561c55ac4faab144fa4ead05424df24d5af7c2509dc
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
+EBUILD zbar-0.20.1-r1.ebuild 3725 BLAKE2B afedede5b3120e473e3d72d15f386a4931d318c096d338f070b65d7dbf9f722d6d292b5759b5a7d9f13e040ff7f54ff444e9c1d3603f0aa23333b770ab18fdd1 SHA512 182b93701cc615df4db4aa83e8ff8fe38ecafb2aa376ae69d3ee89f9fd86e0036e6f2bc8ce20c2ef9c52808bf815831b4e7ae3a7b8608c093fe92ce61dd4b4e4
 EBUILD zbar-0.20.1.ebuild 3691 BLAKE2B 189ed71aaefad1f83cf257ff7963198abb196fc0ada528f303f2d10ebe6564351c256328716dbf0f58a84cd02c2ec5acf64a505dff9611adb91f3ef68d1603d1 SHA512 6e9bc1e749fefc3d0502b5115f6f0f64ba70035916df793c0110d259d1a91f122dd34c11c2b387a192b7a0df2d7d59fd39955b8a900af9b423b93ed5cf78b4e4
 MISC metadata.xml 353 BLAKE2B 7b2ecbdb282d7be372b33efc762ff91d574edf1f176e65c300a2a1cdab0d9c86a12be1d4c49f48a684237eb265ee7491ef9bebbfd62a6005246031f7271b7e32 SHA512 8547b611ca96a01ec0d6dcd01c61203984af10306223a77071fe9be348d1ca7ceb290c4160ca9eb8ebc04227caa9b9f5bf3d3d436b97f140fc534fbd3236826c
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
new file mode 100644
index 000000000000..a374101200a2
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/junit:4
+			dev-java/hamcrest-core:1.3
+		)
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
+	fi
+
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
+	java-pkg-opt-2_src_prepare
+
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
+	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+		-i java/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with gtk)
+		$(multilib_native_use_with graphicsmagick graphicsmagick)
+		$(multilib_native_use_with imagemagick)
+		$(multilib_native_use_with java)
+		$(use_with jpeg)
+		$(multilib_native_use_with python python2)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+			if use test ; then # bug 629078
+				java-pkg_append_ CLASSPATH .
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+			fi
+		fi
+		if use qt5; then
+			myeconfargs+=(
+				$(use_with qt5 qt)
+				$(use_with qt5)
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+			myeconfargs+=( --without-qt )
+	fi
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems
+	# https://bugs.gentoo.org/672184
+	mkdir gtk pygtk qt test zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1c61531ec395..69bd6c8b48be 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 5b0b87353e9c..6a7ec58c85dd 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,5 +1,6 @@
 AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
+AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49bd650fe065b2ccc4f9ee70a191b8fc22f3fe2501b54ac8fb2dbdb4630958f68585895c4f813a67495690a8d830d4879 SHA512 8783c04c765c3f28afd0b94603056e4a28a968f329f8814f60b074327dbd0f22e0e124df17223f04f840fdbdb5db7c9b868ccb90062902699df44b59c3b91060
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
@@ -9,6 +10,7 @@ DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee039
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
+EBUILD allegro-4.4.2-r2.ebuild 2590 BLAKE2B 11772937e0a9b43f9ed52a26467ac5ac219caaca7f2171df009bf33047d0596750c9ee2a92b3cb322a49bcac5067ae43e5d696b88cb020fca82773a0f5ba07ba SHA512 9929afa8ea5647e957ee1070b304fb1ac0532a9261569c93d29addfcc6a9fd342249cdcd0d4595cdce6862c6dae8109b6096481c5ddb4e04e0ab4b07e2f68252
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
new file mode 100644
index 000000000000..19cd6bed639b
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils desktop
+
+DESCRIPTION="cross-platform multimedia library"
+HOMEPAGE="https://liballeg.org/"
+SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
+
+LICENSE="Allegro MIT GPL-2+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0= )
+	svga? ( media-libs/svgalib )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+		opengl? (
+			virtual/glu
+			virtual/opengl
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-rpath.patch
+	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
+	"${FILESDIR}"/${P}-glibc228.patch               # bug 670781
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i \
+		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
+		docs/CMakeLists.txt || die
+}
+
+src_configure() {
+	# WANT_LINUX_CONSOLE is by default OFF
+	# WANT_EXAMPLES doesn't install anything
+	local mycmakeargs=(
+		-DDOCDIR=share/doc
+		-DINFODIR=share/info
+		-DMANDIR=share/man
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_EXAMPLES=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JPGALLEG=$(usex jpeg)
+		-DWANT_LINUX_CONSOLE=OFF
+		-DWANT_LINUX_FBCON=$(usex fbcon)
+		-DWANT_LINUX_SVGALIB=$(usex svga)
+		-DWANT_LINUX_VGA=$(usex vga)
+		-DWANT_LOADPNG=$(usex png)
+		-DWANT_LOGG=$(usex vorbis)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TOOLS=$(usex X)
+		-DWANT_X11=$(usex X)
+	)
+
+	if use X; then
+		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
+	else
+		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	rm -r docs/html/{build,tmpfile.txt} || die
+	local HTML_DOCS=( docs/html/. )
+
+	cmake-utils_src_install
+
+	#176020 (init_dialog.3), #409305 (key.3)
+	pushd docs/man >/dev/null
+	local manpage
+	for manpage in $(ls -d *.3); do
+		newman ${manpage} ${PN}-${manpage}
+	done
+	popd >/dev/null
+
+	if use X; then
+		newbin setup/setup ${PN}-setup
+		insinto /usr/share/${PN}
+		doins {keyboard,language,setup/setup}.dat
+		newicon misc/icon.png ${PN}.png
+		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
+	fi
+}
diff --git a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
new file mode 100644
index 000000000000..afcdf5100c5e
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
@@ -0,0 +1,41 @@
+From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <andreas@ronnquist.net>
+Date: Wed, 12 Dec 2018 16:39:23 +0100
+Subject: [PATCH] Remove f* variants of fixed math functions
+
+Removing functions that conflicts with later glibc implementations,
+people should use fix* variants instead.
+(Simply use fixadd instead of fadd).
+---
+ include/allegro/alcompat.h | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
+index d31ab5b6d..c9536839d 100644
+--- a/include/allegro/alcompat.h
++++ b/include/allegro/alcompat.h
+@@ -40,24 +40,6 @@
+       #endif
+    #endif
+ 
+-   #ifndef ALLEGRO_NO_FIX_ALIASES
+-      AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
+-      AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
+-      AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
+-      AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
+-      AL_ALIAS(int fceil(fixed x), fixceil(x))
+-      AL_ALIAS(int ffloor(fixed x), fixfloor(x))
+-      AL_ALIAS(fixed fcos(fixed x), fixcos(x))
+-      AL_ALIAS(fixed fsin(fixed x), fixsin(x))
+-      AL_ALIAS(fixed ftan(fixed x), fixtan(x))
+-      AL_ALIAS(fixed facos(fixed x), fixacos(x))
+-      AL_ALIAS(fixed fasin(fixed x), fixasin(x))
+-      AL_ALIAS(fixed fatan(fixed x), fixatan(x))
+-      AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
+-      AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
+-      AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
+-   #endif
+-
+ #endif  /* !defined ALLEGRO_SRC */
+ 
+ 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 2d338c427472..610eb8955997 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,7 +2,9 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a
 DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
 DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0
 DIST alsa-lib-1.1.7.tar.bz2 1005257 BLAKE2B 0ee0eb9db057421d75436bbed49e0a0ef560700d480a5dc73bc0e9e6abaa29892dc4e4482c671996fbc9f6bb5f70ba645010bd714f30959fef897e3dc906980f SHA512 7cc81464d876a137e9ac9700420bfff7cd528338bdc6e0bdbe313d45c5b97c81f1a9483df0556fe390d54a9db747fbec62e843b42d2cbc740d5a91b015714f6c
+DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
 EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
 EBUILD alsa-lib-1.1.6-r1.ebuild 2050 BLAKE2B 479e663eb26aded42851cc7a1fc16925947a8b0d751e3f2032d507338d8154d62f6f1a1bfa13db4f4cb490faa53b9142acf213b31849832296a2566bd45bd1c9 SHA512 aa30f5e55524830004e230201cf1774206e2fe47be85a6d5dd93ef8b17571d7d7a56fc951874fe4704654c274474f89262e4eecffcb7b6608515d05cec9517cd
 EBUILD alsa-lib-1.1.7.ebuild 2063 BLAKE2B b3a5a74cfb2772f4a88699067ba8bad9971de795732450eb704eae5ece252830a3bbb2a06b436a1672043ddf138ed1ea5d855e856afba21a2d20e0409ac4915b SHA512 c868b015979edb7cc8a8b1d59c4f361ddd012ad4753c4597413caae27f4a023787e23786f44ba721de401fc696715a8e2837219c53598dca5e19860358b043ff
+EBUILD alsa-lib-1.1.8.ebuild 2063 BLAKE2B 7816a80aa6070f2a05b4e850690c8d0082cb99f01b1a014059721dc7fd77ea86b1894590da2b92f4cb5452ff8e435e431207a2f7301d5f242bd34ac6c12b4c99 SHA512 8e8a3c06e347b13607a2009d826093b6e26f3d22112947d0a5a9bdcd44455cdc4941ee59430a8ac5813ecddd51d5c7fc0bbd7b71d33f7f3a783a598444a057a4
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
new file mode 100644
index 000000000000..6bd9afc32fa0
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit autotools multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# https://bugs.gentoo.org/509886
+	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
+	# https://bugs.gentoo.org/545950
+	sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-resmgr
+		--enable-aload
+		--enable-rawmidi
+		--enable-seq
+		--enable-shared
+		# enable Python only on final ABI
+		$(multilib_native_use_enable python)
+		$(use_enable alisp)
+		$(use_enable thread-safety)
+		$(use_with debug)
+		$(usex elibc_uclibc --without-versioned '')
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		grep -FZrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 7ae78011968e..a1359bd00af2 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,6 +1,8 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.0.28.tar.bz2 291500 BLAKE2B 8884c91809bbdb9a20a7ebad7c076786ac5896d312741abf612598429e3d476530a198d8b4e0adb3abe2aee118b0b4b875b2b99ac636403ec37a583a4e234bcd SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e
 DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e549c46ef4df52d49333c039aa285320a179cb632df5dd48f51d56513499e59c71914236c9be1e0ba493d25bbb270 SHA512 f58ece2a5aeb846032a06d372eec0bfa1cde0bd0590b1700d4f7698aa29b10f13c8d53670297ec95a94448955ba6ea9e94a4a79129eb2cd734c8a3658197036d
+DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
 EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
 EBUILD alsa-oss-1.1.6.ebuild 915 BLAKE2B 4698147e66e0038dd8ecce1ec3ff971b0e5daf3942baefa1de10f189ef33a55e6bd73a97c83bc21b8caf5fec737a189d8d876465e72cb69d8b8b975c17064195 SHA512 c9c7d4ccf6277ff817cef5f34a0e6a04708c2806700a43e7ffed666ab4184a84da39d67fd0236e13117f39d89da8f0919a526d45dcb003943a9e510a91850eec
+EBUILD alsa-oss-1.1.8.ebuild 1024 BLAKE2B 4136bffa76305319db85eb3f4ddf49d0325c73f4320092b8530db6a5c11ae704eeb0670ad93b3f67b34aae1cef2fb0b1e802bd2a05e90713c606d1f1a80313bd SHA512 43cc72662ff14efbd12f42398135b3fb9d3cab0eb41ee023ee4c11f78977162ba4d3158c5179d614f1a9ae3e7874759db06e81eb5342c29a160a83e7103ea10b
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
new file mode 100644
index 000000000000..1ade777604ce
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.12-hardened.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-aoss
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+	find "${ED}" -name '*.la' -delete || die
+	sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED%/}/usr/bin/aoss" || die
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index ee3e3074e3f6..39119a3d92b5 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,7 @@
-AUX gexiv2-0.10.9-exiv2-0.27.patch 5212 BLAKE2B 70fb4bd8bf55071ba4313ee8b25daf112ee31badd2eb64d8961f962bdcc0aa29cb9ab80668e8f83de5fa05d455b596d4442a1479553d9a907d8728a7dcd758dc SHA512 9b6769da9dab347bed3927ccc33840598be01936aba21a45c05388f85e8b959f3ab8e6fe06c9c65332fada56f75ce9929bb12c2c98d5a29d5a9e159b4ca8091f
+AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
+DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-DIST gexiv2-0.10.9.tar.xz 380348 BLAKE2B 6e1479f1a4ac74f622f71eb554c42a5170091d6b1b790962ef415eab4b2528dececa2f2f7147cc662fa00503ec66766294f7efd9401bae4771e72c56724398ec SHA512 40683ce341c5eb09ad67a4a25ad14a791247a5b5f459acba424815e98d5797b0a7fb338fb4d4f1c234147c9268abe34570698fd4259cb80f7f7af76af0f0fba3
+EBUILD gexiv2-0.10.10.ebuild 1778 BLAKE2B 8c3bdd09c48b1337049a4f971fefa9060ae1b572e884a7911dad8b7bf87ea5cf7fe7afaa0afaa92a3a76df71d16603f6ea1e3f2c93f02cdf6b7e06ce3b77ac75 SHA512 45eaf8081a3d45f7232a284c75a09ab34c4e4ec28fb73ead465a6b1c634999a444c234a5cdb4ccd8e8fcf94b88979ea6827a9f91804f82bb7b9a67ab4957c1b2
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-0.10.9.ebuild 1532 BLAKE2B 4f68af7b1074b6798d5084837916908f1256e4479496afb54b21360cd0f17b1b4e97fefb5c40f6a929ccd7fda78354f5aa6b4c6fbef486a470a7a05f9ab6cbdd SHA512 f3ae2354dece29ace18a80183f629bbe33c403ebfc5616c42119b0afd1173e4ef531ea4fa8277fb8f347d47c443196c45f05c723f4bba6f5c3843cf09e536f4f
+EBUILD gexiv2-9999.ebuild 1621 BLAKE2B fc25baa5039abad251d79ce4ed59ce05eb878604608e833c65e835486f3b6724eff0a90c491eaec438f7405ae1f8401624ef6e7c7f6477c265d180641c08e6c2 SHA512 634213f60b484bbe46395938fc1bf64a13ea01da2b8531de1ea8e0ba0e3328c41b74d6eb945b1af9ad1d4d12bbc77775200963b17d7d765f9b944ca2c056ecd0
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
new file mode 100644
index 000000000000..03f0e4fd3162
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
@@ -0,0 +1,29 @@
+--- a/meson.build
++++ b/meson.build
+@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi
+ vapigen = find_program('vapigen', required: false)
+ vala = find_program('valac', required: false)
+ 
+-introspection_available = gir.found() and not get_option('disable-introspection')
+-vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala')
++introspection_available = gir.found() and get_option('introspection')
++vapi_available = introspection_available and vapigen.found() and get_option('vapi')
+ 
+ subdir('gexiv2')
+ 
+-if get_option('enable-gtk-doc')
++if get_option('gtk_doc')
+   subdir('docs')
+ endif
+ 
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,5 @@
+-option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)')
+-option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection')
+-option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file')
++option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)')
++option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
++option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)')
+ option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)')
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch b/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
deleted file mode 100644
index ca68a8475a1f..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From d8f96634e1df693eb0393cf82893a86dd2a92d2b Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Tue, 20 Nov 2018 12:43:21 +0100
-Subject: [PATCH] Replace single-file includes
-
-To improve compatibility with exiv2 0.27 as recommended in
-
-Fixes #34
-
-https://github.com/Exiv2/exiv2/issues/555#issuecomment-440023260
----
- gexiv2/gexiv2-metadata-exif.cpp            | 2 +-
- gexiv2/gexiv2-metadata-gps.cpp             | 2 +-
- gexiv2/gexiv2-metadata-iptc.cpp            | 2 +-
- gexiv2/gexiv2-metadata-private.h           | 6 +-----
- gexiv2/gexiv2-metadata-xmp.cpp             | 2 +-
- gexiv2/gexiv2-metadata.cpp                 | 9 ++-------
- gexiv2/gexiv2-preview-image-private.h      | 2 +-
- gexiv2/gexiv2-preview-properties-private.h | 2 +-
- gexiv2/gexiv2-startup.cpp                  | 2 +-
- gexiv2/gexiv2-stream-io.cpp                | 2 +-
- gexiv2/gexiv2-stream-io.h                  | 2 +-
- 11 files changed, 12 insertions(+), 21 deletions(-)
-
-diff --git a/gexiv2/gexiv2-metadata-exif.cpp b/gexiv2/gexiv2-metadata-exif.cpp
-index c87a460..f931b95 100644
---- a/gexiv2/gexiv2-metadata-exif.cpp
-+++ b/gexiv2/gexiv2-metadata-exif.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-gps.cpp b/gexiv2/gexiv2-metadata-gps.cpp
-index d49d97c..47592ec 100644
---- a/gexiv2/gexiv2-metadata-gps.cpp
-+++ b/gexiv2/gexiv2-metadata-gps.cpp
-@@ -15,7 +15,7 @@
- #include <stdexcept>
- #include <stdio.h>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- #include <limits>
- 
-diff --git a/gexiv2/gexiv2-metadata-iptc.cpp b/gexiv2/gexiv2-metadata-iptc.cpp
-index 2371708..aeac1c7 100644
---- a/gexiv2/gexiv2-metadata-iptc.cpp
-+++ b/gexiv2/gexiv2-metadata-iptc.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-private.h b/gexiv2/gexiv2-metadata-private.h
-index d85453c..8818c22 100644
---- a/gexiv2/gexiv2-metadata-private.h
-+++ b/gexiv2/gexiv2-metadata-private.h
-@@ -11,11 +11,7 @@
- #define GEXIV2_METADATA_PRIVATE_H
- 
- #include <gexiv2/gexiv2-metadata.h>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-xmp.cpp b/gexiv2/gexiv2-metadata-xmp.cpp
-index e4900f2..6f60cd0 100644
---- a/gexiv2/gexiv2-metadata-xmp.cpp
-+++ b/gexiv2/gexiv2-metadata-xmp.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
-index 98ded9d..9c791ef 100644
---- a/gexiv2/gexiv2-metadata.cpp
-+++ b/gexiv2/gexiv2-metadata.cpp
-@@ -22,13 +22,8 @@
- #include <cmath>
- #include <glib-object.h>
- #include <gio/gio.h>
--#include <exiv2/image.hpp>
--#include <exiv2/xmpsidecar.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
--#include <exiv2/jpgimage.hpp>
-+
-+#include <exiv2/exiv2.hpp>
- 
- 
- G_BEGIN_DECLS
-diff --git a/gexiv2/gexiv2-preview-image-private.h b/gexiv2/gexiv2-preview-image-private.h
-index 810304c..b52a84f 100644
---- a/gexiv2/gexiv2-preview-image-private.h
-+++ b/gexiv2/gexiv2-preview-image-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H
- 
- #include <gexiv2/gexiv2-preview-image.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-preview-properties-private.h b/gexiv2/gexiv2-preview-properties-private.h
-index bacb392..b057604 100644
---- a/gexiv2/gexiv2-preview-properties-private.h
-+++ b/gexiv2/gexiv2-preview-properties-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H
- 
- #include <gexiv2/gexiv2-preview-properties.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-startup.cpp b/gexiv2/gexiv2-startup.cpp
-index 179b6c7..de438de 100644
---- a/gexiv2/gexiv2-startup.cpp
-+++ b/gexiv2/gexiv2-startup.cpp
-@@ -7,7 +7,7 @@
-  * This is free software. See COPYING for details.
-  */
- 
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "gexiv2-startup.h"
- #include "gexiv2-version.h"
- 
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index b772b74..454305d 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -13,7 +13,7 @@
- #include "gexiv2-stream-io.h"
- #include "gexiv2-managed-stream.h"
- 
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
- #include <glib.h>
- #include <stdio.h>
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 430ac01..8d1fe76 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -16,7 +16,7 @@
- #define GEXIV2_STREAM_IO_H
- 
- #include <gexiv2/gexiv2-managed-stream.h>
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
- 
- 
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
new file mode 100644
index 000000000000..ad4135f9b2a5
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	# renames meson options to current git HEAD's names, current naming scheme
+	# is rather awkward
+	"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		# prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules
+		-Dpython2-girdir=no
+		-Dpython3-girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/gexiv2/gexiv2-0.10.9.ebuild b/media-libs/gexiv2/gexiv2-0.10.9.ebuild
deleted file mode 100644
index eea5a85a5cc2..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_PV=$(ver_cut 1-2)
-inherit autotools python-r1 toolchain-funcs vala xdg-utils
-
-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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="introspection python static-libs test vala"
-
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	media-gfx/exiv2:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-	test? (
-		dev-python/pygobject
-		media-gfx/exiv2[xmp]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	use vala && vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable vala)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	einstalldocs
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
new file mode 100644
index 000000000000..2547c6a9ca91
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		# prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules
+		-Dpython2-girdir=no
+		-Dpython3-girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 0f1d5d8dfd30..420be1a9784a 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
 DIST graphene-1.8.2.tar.xz 127436 BLAKE2B a22251db7cf4719c8a6cde49e6feb0a998d1ec7296fee549a4797d72fa575d4266e48fb5a6d9ebd204b93954a6278b4fa88dc56e5f86d7cf8625a5edc685a09b SHA512 8d250dccac345251081419f4ad7079c8035cb6225e10b23d25799386b067288831c23be667d608228ef44a2f6107ac47fc86bb495eda7881b1336598d6c43234
-EBUILD graphene-1.8.2.ebuild 1744 BLAKE2B 269bf053126cba977dc72eae47b8b08845fba52db67df3410526d277e88fdd8d9efda419266d43742d08fcef6feabab7f42b6372739afb0d0db65e06edebec1b SHA512 1d165a467abeb3af9629cf53e93a79e0ab73f4c9e6de1530b88ca71fb69321f27d120553d0dffa59501292140c1fde648867a795928f192e50a99af6a363a227
+EBUILD graphene-1.8.2.ebuild 1740 BLAKE2B a1d251a2ef9fab9485cfa39fbac57fc3846b3a5f252e67b1865bdbae1ba8a30763a49436063e1838a9240212e8d80c3315512407028bdc31182651a77b8a97b9 SHA512 7960955cd251abbcf0338994c608eae0e736425b441c3ce5e80e450488f30cf45697d500c1a7f2d5c57d308a728076fce271d748e79d12aa54fd0d104a9c96ec
 MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.8.2.ebuild b/media-libs/graphene/graphene-1.8.2.ebuild
index 3a29408eaf22..43f6f908e0b3 100644
--- a/media-libs/graphene/graphene-1.8.2.ebuild
+++ b/media-libs/graphene/graphene-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 5750f454536a..a6a510fb26c1 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -7,5 +7,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
 EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2606 BLAKE2B 4d18489f73c95ae84fb95aa94e81abf98708e8d2188180557488f6f240f5a3940c001198c323ae5a2f6ec92bc24db006a4e44f27c3d02b8a0f7015e0393391a8 SHA512 82cf3f251494733a0b770deb0580c1977cfb84aa08846b9d5655a775cdd917d128522368f369cec6b5fd5fc82c95dfb7b90ad109fc9e08cdb8a4c85556318e36
 EBUILD gst-plugins-bad-1.14.2.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
-EBUILD gst-plugins-bad-1.14.3.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
+EBUILD gst-plugins-bad-1.14.3.ebuild 2630 BLAKE2B 3013de1b53e5a45b45f3234929f331f96a32881c20fc710b5666040a9963a7bd7060e73548da25e5b1f1ac1c2027506c7db3d7dfae4fb0427ce87c6b571b0bb5 SHA512 b15ba68084096ddc8abc2213cf4cda4d1e5eb6a175f44a6aee2654e4c1f6517d85008378ba31f72b4959cdb84ea28806092f059af0c4c5f3eb7f3ed12e77a8c3
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index c58d0a23e121..852d4b1f2eff 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b7a4a2896fa3..03eb894a57b6 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -11,6 +11,6 @@ EBUILD gst-plugins-base-1.14.2-r1.ebuild 5883 BLAKE2B 3231c2ad0d014b9ef9cb0b5d83
 EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
 EBUILD gst-plugins-base-1.14.3-r1.ebuild 5906 BLAKE2B 4c912c1f88ed151b00539ef601bee22f5aa26994fd7de90086858365d2799fda21438c80a1424bee380d711e7ec54afd724754b313b11dbdbc35e922294f83a0 SHA512 bcd8ab6a7fa00f6f1ae8aad5f8f8b1595de69e89fa005b91cdc2d641166ff99611e781d8c1eb3e95af5b8052a343f4c8146eb4762e43a7036b5a034a530aeb2e
 EBUILD gst-plugins-base-1.14.3.ebuild 6066 BLAKE2B 2d576249fd69de48586c6b7aba76e6d649ecb631e0a3c39defd4537f75588593914fbc2b0c71c50fcfcce0d1bf3a74b7b2c762d7e22251de326bf7ff56eca3ab SHA512 4e055b2f29096ab3db96c5ecdcf2b50fa867c2adc7698e5a00150514ce26044dbba480308c098ffc38f55d881ef09ff50f4932ba185028acb94b541873edbb8e
-EBUILD gst-plugins-base-1.14.4-r1.ebuild 5906 BLAKE2B 4c912c1f88ed151b00539ef601bee22f5aa26994fd7de90086858365d2799fda21438c80a1424bee380d711e7ec54afd724754b313b11dbdbc35e922294f83a0 SHA512 bcd8ab6a7fa00f6f1ae8aad5f8f8b1595de69e89fa005b91cdc2d641166ff99611e781d8c1eb3e95af5b8052a343f4c8146eb4762e43a7036b5a034a530aeb2e
+EBUILD gst-plugins-base-1.14.4-r1.ebuild 5902 BLAKE2B 51fb5a8e65ddc7672a59a1802a3abf936a6729c727cf899dd2b06f116a06a53b77bf4ded550f6d3829fb8638c57922eab54e9b64350fe693d7ccbfba3f0d3869 SHA512 0593dd1ccb735d500c6603f518a20b539fe15d905f8858a766270640cf4013ecab02cba7ae894412f128c6de99fb172fe8ef44128837f0a901a454d9a6806081
 EBUILD gst-plugins-base-1.14.4.ebuild 6063 BLAKE2B 62e3e62d940a36da3dca05e9700ffc2a6da8e231eff85360f796e6aaf0e5496234e6755217e7500934689d44009f8b1a5de3383959e755cfd83646f0f2d940a7 SHA512 a0b735fa2538e71355591c79a3427f25eeb1df2a9d40182a7ed98de089db8892c40fd260dfb1ba3967a39fe7ab44a55a4eae32a8ecdae453bb94ddf45c2f07aa
 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
index b87fbb291fbe..bea489db1e59 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 8b02d369aab1..e9d57663d287 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -9,5 +9,5 @@ EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf
 EBUILD gst-plugins-good-1.14.1.ebuild 1497 BLAKE2B e0f49de376e0f0da5099159b0c8999d5744995cf45fd5b413544062a112f9dd27667069735508b165acfa141fd10a998a9ddc90b909af6ed18339281be1a1223 SHA512 fc772a0d34287d7d3501820158a9c86c52a04863fd06b79f004cfe38d240195fa295cde407c70aefe379fbce7421af1d50f0598a680e7a7362867da6d988cf16
 EBUILD gst-plugins-good-1.14.2.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
 EBUILD gst-plugins-good-1.14.3.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
-EBUILD gst-plugins-good-1.14.4.ebuild 1439 BLAKE2B 0bad8a9b443c3b4bd699577227eb2d50269bf3a97d7a54d2acde28d12175d60bb8fcb726b6928793f102cb0011eb6b09371ccb103a9b97f1faa8e7666623b234 SHA512 bee156bf68598e3fc7664a9c3e1e6bce4aa633cf028e98ed74cba70cc536905c47874fb897d07207b373066c2e9b0645ae5dfdc02f70a1d30da886e02fe36c15
+EBUILD gst-plugins-good-1.14.4.ebuild 1435 BLAKE2B 0667097700af413430723f546125a0dd28ee3916e6af57b1efde36db574ffb1c5473a659c8036a5d20ac385e32706b38b8b81526c01ad039382bddd2f5051567 SHA512 5f61b5b5ba7a33d5ff4d518e9ffe15e1a1be50a66fc7359b00acca089224bbe153d628caa0a4fe7321ff71eb9ca98a1c5a62b383d94a3b98273dd1c1de5b2ab2
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
index 64330fc1aeec..d794965cca8b 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 933b226fdeb2..fc41a7b19a85 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
 EBUILD gst-plugins-ugly-1.14.1.ebuild 966 BLAKE2B 4a3e01b2b17b00b16dbe8a80da288a653885086b572d15aa3a73013c00866554c2acadee04be48d19edc821c43257f54d3cc8ca060faaf92a4bb5217c98afc67 SHA512 8ea21c6090145be195c6b175e5370b35dc889ab57b55bedc1c621783a012e70ea3ae690cfa69b8a267cb899259d15cad94fe411f9a338bb9111cc21abb868277
 EBUILD gst-plugins-ugly-1.14.2.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
-EBUILD gst-plugins-ugly-1.14.3.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
+EBUILD gst-plugins-ugly-1.14.3.ebuild 969 BLAKE2B 0372b1b5fa0118140c970a7a2afd1c5fd390e7f95b8baa1b8e1ab1f2601a7705a609c085c2b4c9a9954d1ac51f718488187577c26f2b76d98e7f7c3383c6127d SHA512 21a427870bfabbbbb8372a4fe48718364f697311f40f4ab6b44ae0c8531aeaadeb643c95100a1d986d96c620a13d48504bcab81b5724ea5ca82480c550259baa
 MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 1b31266066c2..2743c0bd7114 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index ad2b92b15cb2..aeb821eff20a 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -3,5 +3,5 @@ DIST gst-rtsp-server-1.14.1.tar.xz 662316 BLAKE2B 9ff6abe945b1a4936a713e098a2013
 DIST gst-rtsp-server-1.14.2.tar.xz 665904 BLAKE2B 3f9ab3c1579d34ec8877bcc6da2802cc69aa444ef1fabfe548e2acf3b1c58eb0e29ffb09c250fb6d2ae61e4847bf2098c22874ec43266d46d5b402cbbbcda892 SHA512 81c64c31cef45479ec23d57b11d09950ca8c04820b6cf422af6caabccd71ad648e210a114f9f020136ddfdfc9e942c3eb15f055778d493d54c8770ed4f93634c
 EBUILD gst-rtsp-server-0.10.8-r1.ebuild 2664 BLAKE2B 1bfce81aa8708ae23b01096abd90c08e92c58a55c1126d0df3dbd9c50a78e09915c599ac7a32f3fcbe6ab3793521e3b74a6ec20add132fd7640d157a2267e900 SHA512 2c521e305cc9d6d759011fc85e51d9ea861d378aff73683b40a43af995481829d3c3e2d19fe2caf066b1f1d9e852b0f992b6f9289ef34b4b050ad22f33b5e464
 EBUILD gst-rtsp-server-1.14.1.ebuild 1972 BLAKE2B e9da5d219ba17e2854e648312da591393d59444fcc5975af3f6f971ce31420c37622ab8e90da58b27faab0313c7d43e3be06f90bb0b2c048984b136e1a68e564 SHA512 db719263d1e443ef5d2fe939b60143676a41aae57c34ef0ccd9cbb9a99f4e107fb54fdfa84263492c1ee295ddff30dc6dd33c6b9cbb61f2e336d1cf61b43d7f8
-EBUILD gst-rtsp-server-1.14.2.ebuild 1988 BLAKE2B 64f7c871984d97e0d2f3af54306d5f836c8557574a58874caf061511582dae23a0974efd12287cdc10bfc133620e17fa2a9a7535f378529f79698c61a2743d60 SHA512 5f6b640daf97111c2f4055bbeea7dcfad2b5b6cab88d4fe0a870d53b69d3968fd08378b32c2e3d430be91396f2d31a0f4ede306d7ee833e9a2d567407a1f8c52
+EBUILD gst-rtsp-server-1.14.2.ebuild 1983 BLAKE2B 44bbb19d0691a24c72f5dd0237fbfecfc6aaf89d6dbc3d346e4bf828ee0543427da5df4c443bd2c634a56716ebff70c67c8edac30f586cd5ecbf607854749a1e SHA512 9f3e868ca8b2aff1d64ba01a6747268643c2c98304db63a117c18c9250af699dcbf3854390c320d05e8620807ca08bb4994f8822ceb09a0fdfbfb73077cdde8f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild
index 6669657cb4ce..5c4b7ba892eb 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples +introspection static-libs test"
 
 # gst-plugins-base for many used elements and API
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index c74c1e2ebdca..5741b31a75e9 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -3,5 +3,5 @@ DIST gstreamer-editing-services-1.14.2.tar.xz 1063208 BLAKE2B b26db0c944e203026c
 DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
 EBUILD gstreamer-editing-services-1.14.1.ebuild 1521 BLAKE2B b23e91bb494035a3cb02dd6c2d08c0a6677fe335da13d762b858546c6269a25cdc9cbce7ed63ee756636c59ff09275456df9bc54bed37f5db51d899a1bc7a809 SHA512 54c99267dc65545802775d41c321d6a153d100d6e871a7fe0ebe39af22c5424578e7053b408d5d6fbe766db3d00858f9f5b8b29d7c148ae9d980fb4ecf52c920
 EBUILD gstreamer-editing-services-1.14.2.ebuild 1544 BLAKE2B 2365ef8069067e9ca2be479806b2ceab658ffd8cdcf969537030902c04bc312017d60f3e7674729e53ba8ca28f5dbc9b2fed4083c45b69ce16b6fe4e77c00ba6 SHA512 ef6ec043c85673d84a5f34536106b00f14da86027a3da7f53e3f5221ee594249c14704a9b4e53e73b1a61e8dadcfd6d91a53c222be4d7d1f9054b22096184270
-EBUILD gstreamer-editing-services-1.14.3.ebuild 1544 BLAKE2B 2365ef8069067e9ca2be479806b2ceab658ffd8cdcf969537030902c04bc312017d60f3e7674729e53ba8ca28f5dbc9b2fed4083c45b69ce16b6fe4e77c00ba6 SHA512 ef6ec043c85673d84a5f34536106b00f14da86027a3da7f53e3f5221ee594249c14704a9b4e53e73b1a61e8dadcfd6d91a53c222be4d7d1f9054b22096184270
+EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 5c9848103655bbf47f69789a3b38c20ec6ec334469d98e393b736279ebf6368a39ee4de94226b86284041d96f3277c4fe67973d46be132bc783d2a8ca76afbe6 SHA512 ec00de8be9297223728c99f626a383c8b0c6f8105dd80218c23b3b9ce743ed72a2e744bd3c9c459b33701aa1e764f624c490e6c601e95822a5fff8b6c0792d15
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
index 0bb7fc8cf81d..3143ffd4efcc 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+introspection"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 1833806398ec..ea0f834d50b9 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -10,5 +10,5 @@ EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009f
 EBUILD gstreamer-1.14.1.ebuild 3375 BLAKE2B 6064b6693e8749608990b0a4ca9e5e5c041c84a85c65ee99ce00a9000f67c93440436690b7553b5dc4538555a0c197d7a4c445b48db2d0536440fb5dc1a8862c SHA512 89e5eeefa7bf8389458998466c3eb278a7b5fd62786834ba59b271abd01eaebed407de1d9292f53d3bf9b26fae9310c05e408dc98fb1045f934719c9cc6b0276
 EBUILD gstreamer-1.14.2.ebuild 3406 BLAKE2B d43a2dbf9c0a707b6c03df95f7eb780246d3da03763f6917ebccc65fe5d05ac25b81be4f141aa4c87a62f375b69bc7460e7156831c00f90d8ec28d1b61f50d5f SHA512 88693dd7201ff60a460ce7f43792dc9118d08cfcb699075e99bfdc254276b7288f2296eb0a8444a75b4d3f55a5f9bc1695e7b7d5323397c99d30e02e0a49a887
 EBUILD gstreamer-1.14.3.ebuild 3466 BLAKE2B fcf6a510d66a0529be30d7d14ebe7d38e128bcd6efafb36d595290c595866ff341338b06602e070bb11bc25b30f36a5b0df7722767400069fc52d5b43a29387c SHA512 e0bc3ed6a303778658a05f0d1daa13da234f78d268ef458612be8799a748f80bd7ed3954da80bb38129e0289cd1236ba23caa94d986ac192eb329197bb85be98
-EBUILD gstreamer-1.14.4.ebuild 3403 BLAKE2B 6156e586a0c2efbd368803b94542d376f6d55377a969e277a6db81db97da8752d7b5dac55a05e1e3eab6faaa0cad649a2ecb351e4198b16b3c2b386ab9d5227c SHA512 3480b9531fde97037bfc25b9a2a35a6d41b06803c83e572d66be44b784dbc3b1670600afd77aa94d9fb8793957571c6bd2e612d65909d8b3952401214fb1a4af
+EBUILD gstreamer-1.14.4.ebuild 3399 BLAKE2B 82ec7c3c3cb8af76641b5f5fba19ee3b7a448af91cfb20f5759896338133dbda9d87338d5a633b64bc7e4c799d3a780bf417d2d9d1dfd6fd0c33c8f68989b74a SHA512 9d0346452d3781ec2d49834a8a2e0e11bc5bb8a82e777d65956e6635e13c06e1e11dcd1c374684abfc2724244518f02e7d8f3f958be656bd489afc62dfd70388
 MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index a35a13f8437f..b7ca2c3d5b5a 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index d942fb17fe2e..1f4dbede14ca 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,7 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0-r1.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
+EBUILD kvazaar-1.2.0-r1.ebuild 1838 BLAKE2B 83c1f52cd27eb7ae4c250ce006e2e919ecf82c8b187a968aac5c84ea9d1a7c65d4f9377420d43b8a5e51c6e88b46f7a59332793fe59d0fe3a6364ccfb224a3c4 SHA512 35cf4d84259bf1f46cc1617c3f8569003fd7a7866d591302589ab6b65bab5284092f80bddb97f3a36517a2274f116f20c00ec90ce6a6ab0c6170340290c7f001
 EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
 EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index b8685352e221..224888311fb8 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 54b673fabfbd..4fb1a53af760 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -4,5 +4,5 @@ AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951
 DIST libextractor-1.7.tar.gz 8075299 BLAKE2B ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07 SHA512 00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
 DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
 EBUILD libextractor-1.7.ebuild 2752 BLAKE2B 625f3cbb18a025d416c76b2ac4994a4e7ac9ee16b52529c504b00ed6c192b250e128ce0c73fb7e5f5e7d3fff6b24449fa36dd897318d385ed676de9eabf4e12f SHA512 94fbdaae39caabcbd262176f009a7aceac356749b9cd5633f7baecd85b6baaa6017a19a57ee3976d9824d6ba8aed6c5d4fe82fdd99c48b2f388665592ab12232
-EBUILD libextractor-1.8-r1.ebuild 2848 BLAKE2B 8ff5fe0a574ed421aefc44917ce1963c6116eebcb34c541ed49b925b42658f112627a4dd6ed70d0ef2827ed83092347dfec2fefb8da7b4fd58f572e59a30de22 SHA512 83e894cfcd4458a0affb8295a5fe5a5680f7465b3f762c8914366526f24cef943c6cd90fa2e32c686c4ae35fc540126297c3839c09c69102c6614f565cb238b9
+EBUILD libextractor-1.8-r1.ebuild 2839 BLAKE2B c65d6023cb795e47182f015fe429dafa6254dcfaabb55404f332626b9fa71ed90421021a1e99df97dd2c8eb6213268697e27bca83b2e9427008710298225da42 SHA512 03571aa84b9747eb139cb5ed55452ae04c3ac9b71eb4354a76a843957b6507a310947a93ffdffe0e1c854e4b82ad5550a44b4a545e4ac27df6765090c345f42a
 MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index d9044a2c01d5..7a2375985adb 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc ppc64 x86"
 IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
 
 RESTRICT="test"
@@ -17,7 +17,7 @@ RESTRICT="test"
 DEPEND="
 	app-text/iso-codes
 	dev-libs/glib:2
-	<media-gfx/exiv2-0.27:=
+	media-gfx/exiv2:=
 	sys-devel/libtool
 	virtual/libiconv
 	virtual/libintl
diff --git a/media-libs/libggi/Manifest b/media-libs/libggi/Manifest
index 55a39dd23e6d..3510b1b48402 100644
--- a/media-libs/libggi/Manifest
+++ b/media-libs/libggi/Manifest
@@ -1,4 +1,4 @@
 DIST libggi-2.2.2.src.tar.bz2 1071939 BLAKE2B e583ed802cffe825cec2575ee8d33e619ca5537c841380e12e4b5d07e485b4a3d515936d8b2f4763522b26c5302ccdd2de98810d85243408acaca64b04e520ac SHA512 ee2038dc64cea43994fa1ac716f1062462d17b0bbf30fd9a9d2762e7424a43fedc7c573178d9472738a5069ff3bf977ac26957c0c262c51cdf1065b616370975
-EBUILD libggi-2.2.2-r1.ebuild 1379 BLAKE2B d23f86a129e83202db5abd7cc6392ef93d797368c9b6a162bbe417963225b587b091759264686bae3a34bc968fcb0fca4bae180a935c8e4d8308c716207eea60 SHA512 9cb63d6bf4be1a9eadbd3d2152fc6ea899dd04b4836924440a4e07b98b71a2f3bdacec36f1af1af7e55c0252ca1031f4a2f553c52e00a7a1587391db0b5a4713
+EBUILD libggi-2.2.2-r1.ebuild 1378 BLAKE2B 237bcf61189c4d71bd119cddc4c257eda453a64c7fcc02d41f3a7ef44a0e7de0f62d6624a9a6353e6f138fcdfd3bed6a7547e5216b671b4ac7c54626cd046a62 SHA512 80c83cdeeb852f91acdbf0eb9073796fb1617dd28107cedd877b85c04f1068f4004c79be532ee66b6cdcd8d5cb315d98e4b4b3a4fde0be4d16134a195548ac8e
 EBUILD libggi-2.2.2.ebuild 1529 BLAKE2B 24954c7d8d9f3fc779f6840dd3fda3bda764a3f7eba14466875e91de15040dac99db642f0b0a92cf4f14f5bfb5e19b7af083d9e804be740164657f7af3e561e2 SHA512 3f4e4d5783949f2aaed32037955869910d86c180c662453b0b6c93aeb9da7a050e88f19c560a5526526e5f618126c62a82d2f61ab5c0193559b516d5627e7741
 MISC metadata.xml 386 BLAKE2B 8e5a70d9b2afb8a35826b2742206a4470427ba4daa42159129226374836cc5d3bb254c0e64411208d836aa5bf1e615a987bc93a6d5dd874c7ad309ccd8f7550b SHA512 9ce52c323ecbb57d46f69ecffd48a406b800078e8f67fcdb744dc9b86a3806c30455a1ccf144b139619388668cefb7250e1708581a5954862d695d5f284fe3c4
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index bc10ca699663..b1652dcd2d95 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
 
 RDEPEND=">=media-libs/libgii-1.0.2
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 7c915d4b8e67..22cd10e66cde 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -8,4 +8,4 @@ DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2999 BLAKE2B c2b3c72a5eeea74b455c2d095d25d2663ced9cd4e53d35d68faede4345eaa2532c9abc64dcad6cf46b82503ab5a6b908b3e268d1f1932a04a2de34bcc383c095 SHA512 0e1532ea6e04cc05fd4f3d303877095dca0095c35632c27e47840e34eb3e153f4953d948b8dbc62edbc02f655114a79e07ce82d557813c58d6f54afda3074c69
 EBUILD libjpeg-turbo-2.0.0.ebuild 2684 BLAKE2B 03cb490426cdb79d337759a008fedb6ad641bc93aabbcf850c04c78d8e8da25487f313719b6047c82f03c9ea69df1371b3616ec4410362df46a2590f3ced50bc SHA512 5971b9a7f2b167cac75802a61165b64582528e8166a0c4acfc4a2b856ccdd266ca9f3d371f1bbf49b25df9181da194c79d61a7fb2c79dcadeb7b48416f0e9e82
 EBUILD libjpeg-turbo-2.0.1.ebuild 2681 BLAKE2B a6b2c5f2b2a70f216df5cc21c8c5c817b22536695aafb777e736bb4f53954f0d269b40d0fa277b8e8923c4a6d25f5be11f1c1c0abb3b3e1e3753ace2fd9207ed SHA512 8accd6117b7495f86ea39f4ad83ce5970f9b25ba716d693a2129d8259ff0120bcc7eb34ce4435ae3712a997b94339ad522f09e1069c507fc73bddd0c0c8d419e
-MISC metadata.xml 466 BLAKE2B 989b0d905baa9ba6217f871c43b1d06f8ea718ab7250d31cce0d498b219b3d1077638b2fecfaeb747e2505f2608d73390789bd442462a9e2f410b0939e2dbb77 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea
+MISC metadata.xml 539 BLAKE2B 6daa06f2aab2c89c5519369550061055eb37612bd8696ca44dc7c3658f81bb38dcd3715419559fc580b0d62d5e54b4aee2c126aadb6845315a3bcf2ca413f76a SHA512 b47273474a5ab74e5b10ec672b326043f5c3699bd6531cea33ac1ba9f38a42f42bda960360f01314bca5461c3b40ee74470c78e6562aebd93ec54944908a2932
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index c5936bf8ef1b..107c5f70700b 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -11,5 +11,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">libjpeg-turbo</remote-id>
+    <remote-id type="cpe">cpe:/a:libjpeg-turbo:libjpeg-turbo</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
new file mode 100644
index 000000000000..0bb82658896f
--- /dev/null
+++ b/media-libs/libldac/Manifest
@@ -0,0 +1,3 @@
+DIST libldac-2.0.2-1.1.tar.gz 282323 BLAKE2B f8e4a05130b47e4c46070c3a9f0a085451bf480e3d90579342f66edeb77df665c89bf1c81d65d5366e704c5396335de8263ebd6ac1e1d1350714acb3775511e9 SHA512 f1aedb3edc0421b7a9d49a9d2e347d8ab19d54e37f0e77b3673f92413eaccdbbacb678e2e89a23016b22c768156148a82b7fc996bebc3a4cd4451ffb606dba3e
+EBUILD libldac-2.0.2-r1.ebuild 670 BLAKE2B 7dad2e22f54acfbf8c3b856df0cd0741df9b5ead8a07a89ca030c469cca4196cb42240ed39feb88b5e8f603806c57f77cc2832425a91dd86dbfa327a836fba64 SHA512 dbc94c8d0b043ece01cc330ca764b7806ba8a7b6d56c4d00a37b8ecf1424a55581abfc0af76c7847701e8152a9e3f6c96bd27f321bcca6197de05fa5d49cf65d
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-libs/libldac/libldac-2.0.2-r1.ebuild b/media-libs/libldac/libldac-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..4efcbfb5ef43
--- /dev/null
+++ b/media-libs/libldac/libldac-2.0.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+PACKAGING_VERSION="1.1"
+
+DESCRIPTION="LDAC codec library from AOSP"
+HOMEPAGE="https://android.googlesource.com/platform/external/libldac/"
+SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION}-ldac.${PV}/ldacBT.tar.gz -> ${P}-${PACKAGING_VERSION}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/ldacBT"
+
+src_prepare() {
+	eapply_user
+	mycmakeargs=( -DLDAC_SOFT_FLOAT=OFF -DINSTALL_LIBDIR=/usr/$(get_libdir) )
+	cmake-utils_src_prepare
+}
diff --git a/media-libs/libldac/metadata.xml b/media-libs/libldac/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/media-libs/libldac/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</maintainer>
+</pkgmetadata>
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 2bc63b584613..c6f15d91ae14 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,7 +1,4 @@
-DIST libpng-1.2.57.tar.xz 656784 BLAKE2B c8538234f3aa6411629d15cf77d85846bae081f779b0a1dac92f863ae68f1fe5db84e56df44df1f782fe9f6cfa0f4fa3e418fd12472a73c6f3e7d013e0921f86 SHA512 51338d900690fc2d28ea1b5b364d311d73ce7ad498d000985e0c3926b5df0df97fcd7bb079fc954c6caa532fc6e6cbbc266e671d62fc67eca30e79a5f0e26f31
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
-DIST libpng-1.5.28-apng.patch.gz 10330 BLAKE2B f8d195a90e7b7a5b3d66c35dac2b3e7ecb531d52504c8bf7401458c63381a11cbec4053691fc17de8473ffc5c1e7b333ccf6b4abc08797a60f857ca4d254d8f9 SHA512 f99dd6ccd08083a3328841c40fbc94347a42326b29948ec0260497e18da937f1fcccccc4a3636e86a8e0c6b3a094ad8b8ab411af58f56df820b4cf78db25cd96
-DIST libpng-1.5.28.tar.xz 755724 BLAKE2B 5d8b653926434a0e7fae3c5698069883ef97f8a97fac3c0e304386ed51606fba2422af955f092ac20f74ab2593a2d7e2e26cd82f9ff766ffc6a68bf85a96d9b0 SHA512 25adcff4429e7c691a6336a70f3c3d212aa27da6c9d6393325d9866b4c7e1f5fd40b9fe23b1efbe5629753a6051ab52365688ac14913584faf40e84e0b9f514c
 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
 DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
@@ -10,11 +7,9 @@ DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c728
 DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
 DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
 DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
-EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
-EBUILD libpng-1.5.28.ebuild 1640 BLAKE2B d0af71276affd9ca437a019bd0a545f09bb7e9eed44db91ac8bea73171db75d3a5670a2b9dc12b4ef137e86bdb7eb97fe88cdf11f4914c218d20c25cb6274507 SHA512 4f57dc6dec6114934d60f09aa869f358e85df7bb1f8643e05f02846955f3c26c3f9518e46e6e0a9ae4da538dcc70960d687b0467953619f62f53fdc8cff68a94
 EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
 EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
-EBUILD libpng-1.6.35-r1.ebuild 1366 BLAKE2B 636abf93f9ab7046999e76bb81f555f827528440edc7f81c3501487d7b981bed00357859da492d1aa2c642e601f08c09176b0b6355b414094772b7c3e6baba89 SHA512 985b78aa59f7cca239e8798b2afe31ea6d0778467a50f1d0e09a230f5259826b542b0ab4069b356618e9d2db38bcc498efc851eb1f7e7d4cac4432bd23c65e08
+EBUILD libpng-1.6.35-r1.ebuild 1365 BLAKE2B af5ac1a2d6b23f8d719d10d40f261c6c4e1813a7397fcaecb42b2461d49c6090eb00268afb81e4a602e2826044e2b6c25a5c7db9404318c4f95dfdf7e7baca7f SHA512 a468177bff85f61a1373c508c0001e5a9746d46e17a1a29ea3bf17ec731598d6927c31e42878955ef15becf214e34e4d3258e139c870ec067e59196141f61841
 EBUILD libpng-1.6.36.ebuild 1375 BLAKE2B 1e4df515db793d7fc7e7dbecb3a9b07c56a3214ce337573a9f91fd010ce20c52504d0d6367122418cfb2d21fea4f6f289036737b9fad3b52a6a0e1d6113f9788 SHA512 19f546997b31fbd6dbdf4fb4bc2cc113abda654d7c8a933e140acfd33f6627377e75bdfc7897fed5af3466a7c02ca8a63540643c7e1f8f7a655d5c1a06c03583
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild
deleted file mode 100644
index e14eecd581db..000000000000
--- a/media-libs/libpng/libpng-1.2.57.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
-
-# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
-
-inherit libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="libpng"
-SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.2*:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
-}
-
-multilib_src_compile() {
-	emake libpng12.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng12.so.0.* libpng12.so.0
-}
diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
deleted file mode 100644
index 9b1ea3ce7104..000000000000
--- a/media-libs/libpng/libpng-1.5.28.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
-
-# this ebuild is only for the libpng15.so.15 SONAME for ABI compat
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="apng neon"
-
-RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	!=media-libs/libpng-1.5*:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-DOCS=""
-
-pkg_setup() {
-	local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15
-	[[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}"
-}
-
-src_prepare() {
-	default
-	if use apng; then
-		# fix windows path in patch file. Please check for each release if this can be removed again.
-		sed 's@scripts\\symbols.def@scripts/symbols.def@' \
-			-i "${WORKDIR}"/${PN}-*-apng.patch || die
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-static \
-		--enable-arm-neon=$(usex neon)
-}
-
-multilib_src_compile() {
-	emake libpng15.la
-}
-
-multilib_src_install() {
-	newlib.so .libs/libpng15.so.15.* libpng15.so.15
-}
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index 97270a957376..f1f841336979 100644
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 0f225752aa86..d1a6a1aa4160 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
 EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
-EBUILD libsdl2-2.0.9.ebuild 5318 BLAKE2B 4a9e7e4b51858744a7eab939f710b998b961f2454054546e6623ce18ca8bb90cd75c55399a8751402245a3eef171787c0d08aeba62534194bc0b3bc3cacb3288 SHA512 6bcee80ff0fb3299a9569646aeb269dc3ab59191132f06e4795b39c61348175d229119b7913a693c9d67db3a311222df3dca37279179ed4a6c4f33a6fbfd1bb5
+EBUILD libsdl2-2.0.9.ebuild 5317 BLAKE2B 8bfde69137fae2e41168852de7c964f19592ae6d9ff033e78e6e9df8eedd40c5d3c8bf6d8e88d8d68a892d0673c18e0a81a348b02f16f9ce575458076309f8d5 SHA512 b0cefcdf5d3bc0c14c705464cd1858158c2ac466b82e1ee65039ce64313797b6de3a55820761679e6a5942e3b366b1009e2ef9e596acac8a0f7116cc6174e0db
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index 559a55814eb2..5fe9e8491870 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index d8f95d752a62..b1fcb3dd8a5f 100644
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,4 +1,8 @@
 AUX libsoundtouch-2.0.0-CVE-2017-92xx.patch 1587 BLAKE2B 29cbb252a2a161e890a354291b6e83f0271ec83f2683bde43c56ca96eeb1dcca5eea3534777158939bfbec288acd2d4404bf8e70987663f43693c259a41dccb3 SHA512 aec797125ac6e0891baedf36552686342e83a2e362544e8d81ae960356227f275c5ec906f595f676497763dc411506b85de06a35e540f173c0d0e966451b1783
 DIST soundtouch-2.0.0.tar.gz 455148 BLAKE2B e38358b0b773edc03a1b227222418d1e79a97f7a1c7abd22f2cb96bb2a7e3427802214775c908329eeec87710b4d199fba819ad7b99f3d58071749cf372991a1 SHA512 c916bdd2cb3d7547f264b1caf09b739b48a161c8c6288c3893fc97379546ed6b41dafaf603b583fbf64ae91270fdeb90811e5b0df0e9c051dc9f6ddca4d319f9
+DIST soundtouch-2.1.1.tar.bz2 526206 BLAKE2B bc5d2edef5ae7d297cd017968fb1206d14306c117a847ba34090dcd284a174edcc8f4694be4a98fee7a7d100e7a912e81c2e14a998a22ab2c50eb0d27ca823f7 SHA512 9272141e5c1a4def7356add524d861f2c78eb9574ebca2bab3a57190821fb1eb5c85624aa7b31d90ada38a5165bafd8445f6fdd51e2b3a262ca9a2f2db35a9aa
+DIST soundtouch-2.1.2.tar.bz2 526281 BLAKE2B f15f004fd6abdf4cd6fdb842c650480c670a517c6d94365633a7cc4beb95447d7a8bee965d4b258da6c31630e370e3c1c1fc73abfe8568ace465ce41a87397cf SHA512 d45cb0f94e3df32e9c76722a148f201277b2ddc3e390394c1f4ae1263f13557c6b664e90301b5f62d7561d743ab4903a44a34ab7248880b343d581cebd5f0cd9
 EBUILD libsoundtouch-2.0.0-r1.ebuild 1499 BLAKE2B 43b32e874493bdfbe22bd07a7a0f78f4952ab5cd192496d1b26bc0918f18f22f2df5b6985dd27727de5097f068897d3a612d2729392450c2f638be5344cd6536 SHA512 ec0e8a610460293f89f743f3457178475b4c4c913cb80a94cdca4ac059c60eaa079252bef940afdfb222bb2b1cb524d1c23cf2a55a2280050602c8cf00aa242b
+EBUILD libsoundtouch-2.1.1.ebuild 1526 BLAKE2B bed4c40cc3e7fddb0a98185b4086ff145515cae22c9b73401bd3b7f6f8260e7c9ca62aaa453aa36a656d7bad7cc2c236f3dc73b24a56292bae1f4d1cfb5ea338 SHA512 fece8e9f6aee68d1bbcba65280f3b578635375af1023bdcc8080eb6f945322bae924d694cfbf26caf7e81d785e4f2d75ade19dffa945091c1b9a91b86a9b84c8
+EBUILD libsoundtouch-2.1.2.ebuild 1528 BLAKE2B fd168965ebefb1ef496b30b1a224ff50551b8292356f2d05d849ccae7d6c7326462b5dd48e3197e710acd37329da8a1cf41e3448f6cd33a58c459ad56f400e49 SHA512 7716f08bf53c59f7118c6be6561ab8266fab9e0c5ee10a989eea291b4585b2f1de5015b0d24ec4ff8bdfa49483d1759690d9a996b48a60f12ee34ac7118822c4
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
new file mode 100644
index 000000000000..d9b61b4636ad
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_PN=${PN/lib}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
+SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-integer-samples
+		$(use_enable cpu_flags_x86_sse x86-optimizations)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
new file mode 100644
index 000000000000..4f379707630f
--- /dev/null
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_PN=${PN/lib}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Audio processing library for changing tempo, pitch and playback rates"
+HOMEPAGE="https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch"
+SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+# subslot = libSoundTouch.so soname
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="cpu_flags_x86_sse openmp static-libs"
+
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	sed -i "s:^\(dist_doc_DATA=\)COPYING.TXT :\1:" Makefile.am || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--disable-integer-samples
+		$(use_enable cpu_flags_x86_sse x86-optimizations)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}/html install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 05c2b87e01d2..6487dbfe767d 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -5,5 +5,6 @@ AUX mlt-6.12.0-seconds-digits.patch 829 BLAKE2B a696c33a9eb97ef5ca07a7d7e302f3b8
 DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
 DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
 EBUILD mlt-6.10.0-r1.ebuild 5406 BLAKE2B d6a93ca06b4027aa6a4ab00519e10ab9faada3b5e9339a0591f99079ac7ee023ed34563f124919c690f975427b23edc5207e2f7715418739aa565575a01809cf SHA512 48dfe59716bc90bdc743e07a0ec2dab81d10cb88a169f4fe21f84694de92457b8cfa47716b50b524d4fc5d193af709d3f79885a37b937aa5e02b205f1e44d762
-EBUILD mlt-6.12.0.ebuild 5547 BLAKE2B 08f7d3f6cf042f20ecd2b7a0f1ab154e296fd30d9dc2567b8f69d9eae3be45ab4d821de087b8733cab105d4e5ba303f17a6e7dfcadb23dbfc0e7e156d44a52c1 SHA512 277ce0d91207eef27583aa80f6c3eaaa1c63e33ff2054eeb297e8a1f692f098df8ebb83ccae0290faaa453761e5cee3963568db90db7d71e16f7262875e97e2e
+EBUILD mlt-6.12.0-r1.ebuild 5547 BLAKE2B b8d37f7308ba98ee532f1ec436adf80dc96a9ab3de147943d1d4dc135d66690de50a4d4dce664b3f45fb1b5a4fb3a96ae029b1293e86fe4d26508e328adc993f SHA512 200d06b1afed6063f899ae97375ce12f7c1b8dc880bc6b0f546e4c292289cc5671a34c1693a847b23e7ca0213db1dc21e4762d0fffd532ad6c7e8b42be04765f
+EBUILD mlt-6.12.0.ebuild 5547 BLAKE2B 14a15daff94043ab61cdebd7c3630c05a926ed13be5a19162605d2b38e450ba3c3363c45300d896c21461bdaa27ad1a5a22d725a2eb4d8be860f5e9af6449fdd SHA512 048c62a99d34eb8e8a65e06ed1a5b8ceb69502bab00788e27cd702b7dd1d923d3eca132fbe8e566a2d3571fbbc7692e99a3212461c7f18e6f8df5a221a0e84a3
 MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.12.0-r1.ebuild b/media-libs/mlt/mlt-6.12.0-r1.ebuild
new file mode 100644
index 000000000000..b768e42944ed
--- /dev/null
+++ b/media-libs/mlt/mlt-6.12.0-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+# this ebuild currently only supports installing ruby bindings for a single ruby version
+# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
+# /usr/bin/${USE_RUBY} directly
+USE_RUBY="ruby25"
+inherit python-single-r1 ruby-single toolchain-funcs
+
+DESCRIPTION="Open source multimedia framework for television broadcasting"
+HOMEPAGE="https://www.mltframework.org/"
+SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+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
+IUSE="${IUSE} kernel_linux"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+#rtaudio will use OSS on non linux OSes
+RDEPEND="
+	>=media-libs/libebur128-1.2.2
+	ffmpeg? (
+		libav? ( >=media-video/libav-12: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_DEPS} )
+	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-4.1.2
+		kernel_linux? ( media-libs/alsa-lib )
+	)
+	ruby? ( ${RUBY_DEPS} )
+	sdl? (
+		media-libs/libsdl2[X,opengl,video]
+		media-libs/sdl2-image
+	)
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	xml? ( >=dev-libs/libxml2-2.5 )"
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	sox? ( media-sound/sox )
+#	tcl? ( dev-lang/tcl:0= )
+#	vidstab? ( media-libs/libvidstab )
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( virtual/imagemagick-tools[png] )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+
+DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
+	"${FILESDIR}"/${P}-seconds-digits.patch
+	"${FILESDIR}"/${P}-rgb-to-yuv-accuracy.patch
+	"${FILESDIR}"/${P}-frei0r-w-tractor.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+
+	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf=(
+		--enable-gpl
+		--enable-gpl3
+		--enable-motion-est
+		--target-arch=$(tc-arch)
+		--disable-kde
+		--disable-sdl
+		--disable-swfdec
+		$(use_enable debug)
+		$(use compressed-lumas && echo ' --luma-compress')
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable gtk gtk2)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use ffmpeg && echo ' --avformat-swscale')
+		$(use_enable fftw plus)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable opencv)
+		$(use_enable opengl)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable sdl sdl2)
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		--disable-sox
+	)
+		#$(use_enable sox) FIXME
+
+	if use qt5 ; then
+		myconf+=(
+			--enable-qt
+			--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
+			--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
+		)
+	else
+		myconf+=( --disable-qt )
+	fi
+
+	if use x86 || use amd64 ; then
+		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
+	else
+		myconf+=( --disable-mmx )
+	fi
+
+	if ! use melt; then
+		sed -i -e "s;src/melt;;" Makefile || die
+	fi
+
+	# TODO: add swig language bindings
+	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[[ -z "${swig_lang}" ]] && swig_lang="none"
+
+	econf ${myconf[@]} --swig-languages="${swig_lang}"
+
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua || die
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python || die
+		insinto $(python_get_sitedir)
+		doins mlt.py
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so
+		dodoc play.py
+		python_optimize
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby || die
+		exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+		doexe mlt.so
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
diff --git a/media-libs/mlt/mlt-6.12.0.ebuild b/media-libs/mlt/mlt-6.12.0.ebuild
index cb1ff2b99085..a9260d4f5504 100644
--- a/media-libs/mlt/mlt-6.12.0.ebuild
+++ b/media-libs/mlt/mlt-6.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 # this ebuild currently only supports installing ruby bindings for a single ruby version
 # so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
 # /usr/bin/${USE_RUBY} directly
-USE_RUBY="ruby25"
+USE_RUBY="ruby24"
 inherit python-single-r1 ruby-single toolchain-funcs
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 337643caf35b..a69bcfa49c68 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,15 +3,12 @@ AUX openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch 9877
 AUX openimageio-1.6.18-use-gnuinstalldirs.patch 11257 BLAKE2B 524d40a5ad4827743d20a259f2fd2ed094945439eef620473ff1097efb150cdfc80c66f4576b869aed6c7b9d086499d5d286c3dcaae4d891a37f6ae06f504a85 SHA512 3ca9e8474bc58b726686d1e87766d20f2cdcb2544b07b20a8a48594b442409f753c1e860219bfe948d19cdf0f5090bd04299ab6fdc6bf39f753d158d9f75a1e1
 AUX openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch 15432 BLAKE2B 550a6aa0b962b6efc5c9fb01dcb781dc78bc26a42624c8d4f4be24925464d66e6cbc1a0a7d9dcececa5c5681a70e34d97bfd72ee3224158cffe8ca151a0750c9 SHA512 433dda4b999d60248fecffe0c5866c1214a2db68dedb0e63e36f9c5e0fbcd5c54d3faff3effd19d7b3bb57bce9016eca10f58ba6b3a4143391325838cb637227
 AUX openimageio-1.7.17-use-gnuinstalldirs.patch 11236 BLAKE2B f8adc11f949906bce9046fffb0074487962c8832b4b026a7c2a47b081d0c30ca813536462a685feb5e67b793b37cb5985c3cfc6766df65424c6921ec0bc28e60 SHA512 27d51f70406812efad10cc099a3c9cabb21f98db4bc718ec14269bea564059be40e691210537cb5609708e1ba318fb485a8e02317a34c20106b2b826200ad79f
-AUX openimageio-1.8.7-ffmpeg4.patch 752 BLAKE2B 53b0ee1dec1dd5ef3c9847d46868130bb4e8203f212932af15670c02ef9d99e22a2f8dfbfc02d1fcb4c8b25599969b92997855189bb075fc75342d3932c1dad4 SHA512 ce34f1ae3854d35d17028bf09ec034c22c028d603247a7c0fee94566ada493cb106a7a08241e37f61e8b15f9c4cc67635e0d56734846a1887ce54fce8b8ae42e
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
-DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
-DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
+DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
 EBUILD openimageio-1.6.13.ebuild 2381 BLAKE2B b8a5ff95b6acc88f1de5d12e113e9812b56f5330ee677fe470650f4077635d667071090226a51762d5c1c2e55bbae928b3c9583a8b9ae56b333ed4c16ae5b931 SHA512 e3b005728837a83100594e4fbce4ce18e5af8e24b5addb0023c0da4cc45cff66a42fd551960d6a13bc2e8342e234e5eb8f53a318cbd44a32264e57ef633f5e78
 EBUILD openimageio-1.6.18.ebuild 2884 BLAKE2B 5402981510f3886fd9a143403bacc084703c6a3898319d8f61b124111e26084bdabcb5d8cb0e085cf745d66e9e8d20a68c06ad9382319482fca17a59fd3f2ee4 SHA512 6b07dd2e6239aa9c86f1b2d7dd548dbc6501e06d41c184e99dfbf400a06bd0e4c3a02d54999017e44522c50b069e94d3539d57dce78937f84bb5fcd43a97a970
 EBUILD openimageio-1.7.17.ebuild 2946 BLAKE2B 7a40878d3fab0bf03777a4a9b45118525985bbfa1b494f0641a52a73d3fecc9bc7d76616e1c61757b8b10b93c60c2a9ba5a3066971b017271aeb5b21e4ec266b SHA512 cb9df0dade489b996818b73a62e0d4de82a485b7e7f2123c95be1a46a2405d7690913878d676477857bbda07a8877138de805f8390e0d2899f3f7a26ccbf8128
-EBUILD openimageio-1.8.13.ebuild 2958 BLAKE2B b37b784f30d4f2815cc7fa2421436bc7f56acfe5b5f6996c4f9ca48ac296acf655f7834693871f2549a51a132318295abd204623d05c21e64dbe3995c4c2ce91 SHA512 b3d31a096a1b450aac0779536e971f6a558facabfce87d7a869db1f14f67e46b468da743917019aa8c43e7032bd0cb5be939b655dcdf5d36aea8bd691872a57d
-EBUILD openimageio-1.8.7.ebuild 2983 BLAKE2B 8b71066fbc00e8ede83b6767a37956aa1df54dea03d8bb00ffabd6c65e3d95f453153482e34b4c090bc9f694370bfa5a06d92e2d45014dd10bf9a841e2c69ca3 SHA512 5f314056c16ba4585afe8c68aabe74fcb3580e05d0b19952e8fea373fd0cc65f50ac58270501a2391cc8a1d8ad14d97387b49e9dcce244949302b6a5b361492a
+EBUILD openimageio-1.8.17.ebuild 2936 BLAKE2B 4daf451960cb6c56c32b0910a7ec287889347b0e7476b3f945d4e3f03779444362074496d68da7c84c8763fcd850e0d9af3b8dd3536f341193d23ed06ae6f0bf SHA512 0fd614758cf2540e82dc5d51dcfae960d0a0075a56f1ffc0be2eb780e024bbff4c35aec5ba5b72113247bf16446ad5346f3341ac39e86108c7d1b1ebd624d61c
 MISC metadata.xml 940 BLAKE2B 540f2e00e2790b5e1ec7af2f9165d8a911151c9c9d2d6dbaa80f697ae91fcfe4889ec68141ed18a321550f7b9a3a14a306de5199e3cd603f4f6b5a019005f815 SHA512 ff5c1d96b3de7d144f2cd7bcf55c9953e7e385717ad49d009adef1e21ffa32843350a71f98210b724fb74af916be98eb4f5d2927c58b4a848efbffd85f39d933
diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
deleted file mode 100644
index 92cad26c9335..000000000000
--- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 810a0235837d6f31d8b3c05544f99461df71403e
-Author: Larry Gritz <lg@larrygritz.com>
-Date:   Mon Apr 23 15:50:14 2018 -0700
-
-    Changes to allow building against the new ffmpeg 4.0 (#1926)
-
-diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
-index 4e0cb3b9..548ddba4 100644
---- a/src/ffmpeg.imageio/ffmpeginput.cpp
-+++ b/src/ffmpeg.imageio/ffmpeginput.cpp
-@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
- }
- #endif
- 
-+
-+// Changes for ffmpeg 4.0
-+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
-+
-+#if USE_FFMPEG_4_0
-+#  define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
-+#endif
-+
-+
- #include <boost/thread/once.hpp>
- 
- #include <OpenImageIO/imageio.h>
diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.13.ebuild
deleted file mode 100644
index 7e8ccfa61034..000000000000
--- a/media-libs/openimageio/openimageio-1.8.13.ebuild
+++ /dev/null
@@ -1,114 +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 cmake-utils python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND=">=dev-libs/boost-1.62:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	colorio? ( media-libs/opencolorio:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		media-libs/glew:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-S="${WORKDIR}/oiio-Release-${PV}"
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CPP14=ON
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_JPEGTURBO=ON
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex colorio)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17.ebuild
new file mode 100644
index 000000000000..5dd03517a4f4
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.17.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	colorio? ( media-libs/opencolorio:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		media-libs/glew:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex] )"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+S="${WORKDIR}/oiio-Release-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_JPEGTURBO=ON
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_NUKE=NO # Missing in Gentoo
+		-DUSE_NUKE=OFF
+		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
deleted file mode 100644
index 22956201293b..000000000000
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ /dev/null
@@ -1,116 +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 cmake-utils vcs-snapshot python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND=">=dev-libs/boost-1.62:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	colorio? ( media-libs/opencolorio:= )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		media-libs/glew:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg4.patch"
-)
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CPP14=ON
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_JPEGTURBO=ON
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex colorio)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 291dcf748453..e4771b3c889c 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -4,6 +4,6 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572b
 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
-EBUILD openjpeg-2.3.0-r1.ebuild 4220 BLAKE2B 9187d1e092d4bcb580cb58a80129c3ade005af92a4b717179bb0d118fd9cfe5525f4b52f5418fc5054ba251f4c463409baa2eb83cc577257b97cb1f1112026b5 SHA512 0e932d5762d136a655b3fad2d3041c0f99c31a97d992db6a8f23888e4cbb41fb2f991a657a1968dd6087bea1ea20d12dd9ea4e33d6f841b5209c1715cac775f1
+EBUILD openjpeg-2.3.0-r1.ebuild 4218 BLAKE2B a4215ae39c30b23c280b65d6269c6bbb0235fbdb4051e4906bc141d0aff54e003700504e9270e5272318d892331038cafbdb032e298fc926ada3a5c7822285cd SHA512 afce08f4c53acbc06ac1100563ef43121e9d3de1d8a0e53daf51997a7e19c577bab742221aa36e279fda3bf4b1f01de7b4f2cb5e9d1c42f476999c28ba4b2c77
 EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index b28122418d8e..e64e6fcf028a 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index ee04b62a8e11..e07af6439629 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -4,5 +4,5 @@ DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc
 DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
 EBUILD opusfile-0.11.ebuild 1026 BLAKE2B cb59006fa7b66f4c2c36df7004fe852379503646802f9b247807be22943fc520401bd2478b364076ecb5f7669f8517590f2765c22236e55b0c4221c0b1b539e3 SHA512 f1533ef12020ea9012da9c343e382d2d9b649c594b33e0959fe6284c8f29476994d18490cf18bc641452c613384c72413227553be9840d151094e0215b28243b
-EBUILD opusfile-0.6.ebuild 776 BLAKE2B ac01c1df72626fbe4e2c0ea46d71ce7a5b22419b2f1a72e334abbb346bbd84fbb92760d1b1cc35947c24ef0e5e01330d3a988c7daba40de703fc1bb5f80a0151 SHA512 e6ab915319a73061ed951fa5c1617c434b2c3df1335fa23860175caa2b6773b7326bad386bcc1aa39b5792c90266b1e7bdfcad85f2d997b2f6625e1670909551
+EBUILD opusfile-0.6.ebuild 774 BLAKE2B 524fdfebca63b5cc98d8306131210453659d905c8528952f6fe245910f84504216a6514194ffc3790f57853479e6a0eef2a515a4ffabf2b3bb3fefc2b5a8522c SHA512 8cd751db321e6e25c4ddd3028503d2621af55130a89106b44823385aedb07101c4f30d6a00d395641102bdb3efa90dd3c5b0e31269dc12fa498ee7fc12e16c79
 MISC metadata.xml 584 BLAKE2B da2277516b7f14b1a800d3b511ff10579b9544679e5d71535598d2e4a476f0f7cc9bce41247363ee7c50384e5d678379ab0a42fb6172013f873bc1e727d2b5db SHA512 4a4a0c3766de010ae39d0ee2339c21df051e082a36fefa9b8c53ef3ecb184072c1f8cf42aed0e4baa70f5b93d507e942a052a02a6a53ce4ed90496eb445f74c3
diff --git a/media-libs/opusfile/opusfile-0.6.ebuild b/media-libs/opusfile/opusfile-0.6.ebuild
index 28a0f7c7567d..5bac349dcd56 100644
--- a/media-libs/opusfile/opusfile-0.6.ebuild
+++ b/media-libs/opusfile/opusfile-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE="doc fixed-point +float +http static-libs"
 
 RDEPEND="media-libs/libogg
 	media-libs/opus
-	http? ( dev-libs/openssl:= )"
+	http? ( dev-libs/openssl:0= )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 210772149eaf..e8a1803b18b7 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,7 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-AUX phonon-vlc-0.10.1-screensaver-inhibitor.patch 1311 BLAKE2B e0afc0d3575bc82fbb4815a794bd34c3d5b0c0ec7972d01563cf81c4e2b70dd8bb0d79d6f19ab88bf30136cd17af5140915b443cbf95932674ae925505953b99 SHA512 78a4eddd498e0a2abaf324ba07dceb62ffdc888b848f39e83b810530c70ea670bfab3705c797397aaf3fdca5b992f075cef246401e346c3d4fe7f02790757cfd
 DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
-EBUILD phonon-vlc-0.10.1-r1.ebuild 900 BLAKE2B 03e2079bc207ea31a45410e8fee6a96b0a69de56d772550e2eba6f6b545490e228c52724d20c1354dd819e80ef38dea3440b5c0c594d56e7dd8789427f499f77 SHA512 f60d30163188e2a8cba868c4a14f59146e2d9071fbe413cdae8e9f391badfb57ec58fb17f016c706ab8f53302f69241605b05eb427ab3d54539d7e2de68e729b
+DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
 EBUILD phonon-vlc-0.10.1.ebuild 841 BLAKE2B 90482c1985f84edca55bca9dfc488d84472045d44ee4046e7044afd9258a0179c45ed604f4e985b6cdd6bbcc7c9d541d0ec531b917a9bbbe334e3c16ab37bb2a SHA512 8f6e296b8a8eac9b8738cd53a38f30855f84a33b916ca40b2653d631f416ec52eb41dc88e698436f7893ea4701d532f633dd52f81b5aeae797d28ac27b6a9cf9
+EBUILD phonon-vlc-0.10.2.ebuild 890 BLAKE2B 2c561361159c686734344629ceb7bafcf6490e2a94353c623c55bc4b2e98d36df07ade1a01006d2cbb5ef5f657da65a91030c5e04ca594900e3475f89cec7f94 SHA512 71ab1777b188ac593f2e94d293ca33946a39700c23c5ed2b5bfc889c0b1cef8b91b635b13edb547f65fa04dc2310542196c0854313fdf9d17a96f5153c7d1295
 EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
deleted file mode 100644
index 1e482a027e52..000000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cb7c2b74b25380b49b2bb7bbfb7ac3fb37f1cd28 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 9 Oct 2018 13:22:30 +0200
-Subject: disable the builtin vlc screen saver inhibitor
-
-from a phonon perspective we expect the application to inhibit.
-additionally destructing a player may attempt to uninhibit and block
-on dbus not responding because the call is too late in the lifecycle or
-to an unresponsive remote (all of which the app would ordinarily
-deal with)
----
- src/utils/libvlc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
-index 39e831c..3a33d9a 100644
---- a/src/utils/libvlc.cpp
-+++ b/src/utils/libvlc.cpp
-@@ -90,6 +90,10 @@ bool LibVLC::init()
-     args << "--no-xlib";
-     // Do not preload services discovery modules, we don't use them.
-     args << "--services-discovery=''";
-+    // The application is meant to manage this. Also, using the builtin
-+    // inhibitor may cause problems on shutdown if VLC tries to uninhibit too
-+    // late in the application lifecycle.
-+    args << "--no-disable-screensaver";
-     // Allow multiple starts (one gets to wonder whether that makes a difference).
- #if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS))
-     args << "--no-one-instance";
--- 
-cgit v1.1
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
deleted file mode 100644
index 9c4a65c67546..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.0
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-screensaver-inhibitor.patch"
-)
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
new file mode 100644
index 000000000000..f4ae408d5c77
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-vlc"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils
+
+DESCRIPTION="Phonon VLC backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-libs/phonon-4.10.0
+	media-video/vlc:=[dbus,ogg,vorbis]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.10.1-qt-5.11.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 353a4c0df702..590052fc7001 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,6 @@
-AUX phonon-4.10.1-pulseaudio-qt-5.12.patch 1222 BLAKE2B 4f3fbc357921da2fcc7257631c0fa52d6f60687717c83a3869275dbe1a28b72377262d150c30482cab8567d254bb4170632130cabb70ec659e18f45aa0b62c6b SHA512 9755301595adb720d8b28b74b1623894c8d5852b172c18ee9119534200e1db1b86039838af9405ab0081b88ae1188043132bb5c4b66a781ed7d036d11b2db9d7
 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
-EBUILD phonon-4.10.1-r1.ebuild 1383 BLAKE2B a8914a3623d1f2dd35ce183afba370e34e9b39b6bfbbfa5be7ab8743969b789d9126d337dce81abb5da126f7a3e81ed13af3c817665b06344ab258fa2be74c64 SHA512 f8f9030f134d36d9d13410191ef0ecf86006a019019eda6bd6f21e155f26f9c3ac6d2df018c142725104ea04b3a13d21e2db817c911519c28b25d7aec25fbdd7
+DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
 EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc
+EBUILD phonon-4.10.2.ebuild 1326 BLAKE2B 80fbd37bddc8762071ada165dce4736a6588d06ed1f1191858076bad55dca1d527a85f530edfcc206f6b7b5b9d937494b65b1c7916604102b11af4700104483e SHA512 65dba06b0217f8fdca06802b50faf359d9edf35bf6dc8b65abcfc506d826e89836878aa18293070721d753482fd3c770264a5b072c91b9b1c0bcc6bf781fcfaf
 EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
deleted file mode 100644
index 4b1dc5b6fbc4..000000000000
--- a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 10 Dec 2018 21:10:13 +0100
-Subject: Fix PulseAudio support with Qt 5.12
-
-QAbstractEventDispatcher::instance()->metaObject()->className() now returns "QXcbGlibEventDispatcher", so the glib event loop test fails
-
-Differential Revision: https://phabricator.kde.org/D17486
----
- phonon/pulsesupport.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
-index b7009b1..d324084 100644
---- a/phonon/pulsesupport.cpp
-+++ b/phonon/pulsesupport.cpp
-@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
-     }
- 
-     // We require a glib event loop
--    if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
-+    if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") &&
-+        !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) {
-         qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop.");
-         return;
-     }
--- 
-cgit v1.1
diff --git a/media-libs/phonon/phonon-4.10.1-r1.ebuild b/media-libs/phonon/phonon-4.10.1-r1.ebuild
deleted file mode 100644
index 011e7d0ba881..000000000000
--- a/media-libs/phonon/phonon-4.10.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-pulseaudio-qt-5.12.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
new file mode 100644
index 000000000000..264801e2557e
--- /dev/null
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils qmake-utils
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="debug designer gstreamer pulseaudio +vlc"
+
+RDEPEND="
+	!!dev-qt/qtphonon:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig
+"
+PDEPEND="
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
+	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPHONON_BUILD_PHONON4QT5=ON
+		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+		-DWITH_GLIB2=$(usex pulseaudio)
+		-DWITH_PulseAudio=$(usex pulseaudio)
+		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 658d8c5f544e..7d9e4444df81 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,5 @@
 DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
 EBUILD sdl2-image-2.0.3.ebuild 1524 BLAKE2B 3bd4371703ad10beca949c54d87094e52ff1d6a0a0c5423d75eefa355e9bb0700082c5df94dcba93a5fe497efbbba6239eea4932c4e40dceec4d206d8c80e010 SHA512 316594122cb65267148c7478bdd40a52af21021992a6335a8b030152f24320b1f1a096aec5c0e5c23e446c1adeea62d51432a9f5d7ccb63255a07d2af2607439
-EBUILD sdl2-image-2.0.4.ebuild 1536 BLAKE2B 3de26895795ad82b49c2d842b30a2564de01063d3261b7c9d9b55c04e1d4a2c3e9e8942b1ddbe18fce495c1cd4695facd6a7ab99b5d616cef07217973ce9669e SHA512 3358a63d6dbd0218fc7cabfe6d6d19e77ab62634727922e182e05156e85984ca6a00e5f27b007b7dbbed901782f156ba1e63b4e5662fc20728a90222715308f1
+EBUILD sdl2-image-2.0.4.ebuild 1534 BLAKE2B 734db2dcb15f784842b012bbef411314c9a88672464a6564b83858cf0b90d609abe3341686c87ec89ea5873b06a7faa170779506bbd349fa2cbad84807a1c453 SHA512 054eaaa74eff655abdcb5b6915117e7f28639786197ed462042bce82adfadac44a03bacc45c94f6f33755911273dc7e0582d2025e834322d51b6ad8fe92cee67
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
index 08cadf24d1c4..461162602407 100644
--- a/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 8f71272ff5f2..71072794c88b 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -2,5 +2,5 @@ AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3258 BLAKE2B d5962eba570d4b2a42589d498118977cbfdb7baf83c1422c3614920612a7cc6fdb5c3d0623fc74c9a24b5120beffd3ee2409cf8b19380cee0f13c54f879f3fe4 SHA512 5de83350d6b84e8b2cc6db63a786a9495b6d5b4b864634916b69c18ecbb0c2b46dfd14d881a14755c4483f3b1eae5f0b15f5e2a420a7b4cef69d8f6115c4124a
-EBUILD sdl2-mixer-2.0.4.ebuild 3236 BLAKE2B a6eddaeedb5ae8ef3f9b2a811a4ffc6639a874da5f29099e502455d76fb08d26f69e5085ed5461250de218fc3963581edda5f239d4455429782330b23733dafa SHA512 41cd4d0afcfaf8a1275b060ba3587f7063ac1b651c3deb7e76ae11d24d06cc8b968a2a8af0d33e5e1edd7a88fdd3a9477b04336be7ed2e77797cfaafa31070ea
+EBUILD sdl2-mixer-2.0.4.ebuild 3234 BLAKE2B 9eddb4375f8124ce514de05692e6ba665834e65a89a16c6ef931a067781313704898b085a3c20c7c7df6f43d5cb7b051ae187af5a33f07e8cdffbbf3ccd057e0 SHA512 6ea52f437fc3205345d89c10de3059ded6f3c10340448588d6438032ab460e168c89b2dbae6145a2499719c8ef97ee7058b90c1ebbc4dc1c2cc35c7b3778dcdc
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
index 97b58879c407..1e3995f3f5b1 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~hppa x86"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
new file mode 100644
index 000000000000..2c9d660149ed
--- /dev/null
+++ b/media-libs/vidstab/Manifest
@@ -0,0 +1,6 @@
+AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
+DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
+EBUILD vidstab-1.1.0-r1.ebuild 1447 BLAKE2B 82d1ae07504a1942c912bdf94bcaf0ceeeec0ad7c89ea0e4785a4ef80418b3e8ecd677fc10b7447d8d34f0c75484111d2fa03d0c66035824eb6376e9ad5f560f SHA512 a042c2292bd3e7eabfaad9fad569b5bdfcf2f90961bb884a4fa82c2f640f3392d05eb2b123cc2b1ee2b18c0be49b2cc6e95ace1996260fa82123c4747e894f66
+EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
+EBUILD vidstab-9999.ebuild 1360 BLAKE2B fe1915e7b6bd2f22df1d4c91a1bf18ab5d772be6fb95affe32c30bd01437621509655e8758770d257a00e57f0d0ae4c966f6b6f0cd24a455e7c320f0dcdfd58f SHA512 a4e104d78359493e83947900406f5e3904cb132f45a81a2cb613fed4d9c8f932eaaffe0235f878f3b8fef6f07fa9dce39272d3439ef9f848dbbd177e27539c0f
+MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
new file mode 100644
index 000000000000..1f73c50a49ed
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch
@@ -0,0 +1,25 @@
+https://github.com/georgmartius/vid.stab/pull/69
+
+From dff58ee5a26569a7eeb881d204b428ee5da40746 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 10 Jan 2019 13:47:10 -0500
+Subject: [PATCH] tests should exit with code 0 on success
+
+Exit code 0 indicates success, anything else indicates failure. Therefore, unittest_summary() should return 0 if no tests failed.
+---
+ tests/testframework.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testframework.c b/tests/testframework.c
+index a38851c..a889560 100644
+--- a/tests/testframework.c
++++ b/tests/testframework.c
+@@ -36,7 +36,7 @@ int unittest_summary(){
+   fprintf(stderr, "UNIT TESTs succeeded:\t %s%i/%i\033[0m\n",
+           units_failed>0 ? "\033[1;31m" : "\033[1;32m",
+           units_success, units_success + units_failed);
+-  return units_failed==0;
++  return units_failed!=0;
+ 
+ }
+ 
diff --git a/media-libs/vidstab/metadata.xml b/media-libs/vidstab/metadata.xml
new file mode 100644
index 000000000000..da5303a4c0e3
--- /dev/null
+++ b/media-libs/vidstab/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <name>Kalin KOZHUHAROV</name>
+    <email>kalin@thinrope.net</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">georgmartius/vid.stab</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..31b7ac658193
--- /dev/null
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-multilib toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="openmp cpu_flags_x86_sse2"
+PATCHES=(
+	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
+)
+src_prepare() {
+	# USE=cpu_flags_x86_sse2 instead
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+	# strip some CFLAGS
+	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+	done
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-check-openmp
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake-utils_src_configure
+	cmake-utils_src_make
+	"${BUILD_DIR}"/tests || die
+}
diff --git a/media-libs/vidstab/vidstab-1.1.0.ebuild b/media-libs/vidstab/vidstab-1.1.0.ebuild
new file mode 100644
index 000000000000..71caeda13785
--- /dev/null
+++ b/media-libs/vidstab/vidstab-1.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="openmp cpu_flags_x86_sse2"
+PATCHES=(
+	"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
+)
+src_prepare() {
+	# USE=cpu_flags_x86_sse2 instead
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+	# strip some CFLAGS
+	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+	done
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-check-openmp
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests || die
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake-utils_src_configure
+	cmake-utils_src_make
+	"${BUILD_DIR}"/tests || die
+}
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
new file mode 100644
index 000000000000..c694caee1d91
--- /dev/null
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-multilib toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="openmp cpu_flags_x86_sse2"
+
+src_prepare() {
+	# USE=cpu_flags_x86_sse2 instead
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+	# strip some CFLAGS
+	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+	done
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use openmp && tc-check-openmp
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake-utils_src_configure
+	cmake-utils_src_make
+	"${BUILD_DIR}"/tests || die
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index d68608776a88..8cf101fa5206 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,3 @@
-AUX vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch 2441 BLAKE2B 445a3c6a453c9f08b8b58ac7ccb55fbbb61a942372dc2eebea7cb6552fe071334fd940ecf3e222a2319662b74c11e001ee0d1460720659cd2fdc00cfa9d269c5 SHA512 7582d2e7e3a65598f9a4b559d3c647f0824575c00f3415b1e54a8d3211cf6087f0cb7b95c2c4034888321ff12342817668c09eb0b5b91d2327c1f34cc37eccae
 AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B 573fe7c005fa7ff2930b0809071346f6b1fc40a2b6334abefc05c5a1a40e81f370c2b3dd58b7e4ff130195df4b761f4c6cee6af083ac302506c0a677af6f2dd8 SHA512 e3e3963532c100dd08109e74f49d14d073b19647493ad674f6e671a34c9fabb197c85f7c1e8497f2201d004bb1a2f9d56bfda4f4c53377d5c2db56dc46159f4b
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
deleted file mode 100644
index d0b48a749c26..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4c0da77c705464a259b38944fb53cf747e4c0554 Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Tue, 3 Jul 2018 10:17:21 -0600
-Subject: [PATCH] layers: Rework include dependencies
-
-This change removes the assumption that vk_layer.h will include
-vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
-in the near future.
-
-Backported-by: Nick Sarnie <Sarnex@gentoo.org>
-
-Change-Id: I082ccc52c3cb8257bf57342404d52dd737009b4b
----
- layers/parameter_validation_utils.cpp      | 1 +
- layers/vk_layer_logging.h                  | 1 +
- layers/vk_layer_table.h                    | 1 +
- scripts/dispatch_table_helper_generator.py | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
-index 17f95bb8..c65a4970 100644
---- a/layers/parameter_validation_utils.cpp
-+++ b/layers/parameter_validation_utils.cpp
-@@ -46,6 +46,7 @@
- #include "vk_layer_logging.h"
- #include "vk_layer_extension_utils.h"
- #include "vk_layer_utils.h"
-+#include "vk_layer_dispatch_table.h"
- 
- #include "parameter_name.h"
- #include "parameter_validation.h"
-diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
-index f111cc5d..f67a3f55 100644
---- a/layers/vk_layer_logging.h
-+++ b/layers/vk_layer_logging.h
-@@ -31,6 +31,7 @@
- #include "vulkan/vk_layer.h"
- #include "vk_object_types.h"
- #include "vk_validation_error_messages.h"
-+#include "vk_layer_dispatch_table.h"
- #include <signal.h>
- #include <cinttypes>
- #include <stdarg.h>
-diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
-index 45b8f6e1..23990a12 100644
---- a/layers/vk_layer_table.h
-+++ b/layers/vk_layer_table.h
-@@ -19,6 +19,7 @@
- 
- #pragma once
- 
-+#include "vk_layer_dispatch_table.h"
- #include "vulkan/vk_layer.h"
- #include "vulkan/vulkan.h"
- #include <unordered_map>
-diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
-index fba25e55..1e2412c0 100644
---- a/scripts/dispatch_table_helper_generator.py
-+++ b/scripts/dispatch_table_helper_generator.py
-@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator):
-         preamble += '#include <vulkan/vulkan.h>\n'
-         preamble += '#include <vulkan/vk_layer.h>\n'
-         preamble += '#include <string.h>\n'
-+        preamble += '#include "vk_layer_dispatch_table.h"\n'
- 
-         write(copyright, file=self.outFile)
-         write(preamble, file=self.outFile)
--- 
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index e00a752cd272..1ad32f2735b0 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,3 @@
-AUX vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch 2018 BLAKE2B 354a11d423eabf14ce340117adee3e61e9402997b1894e35661e9c5ef88e85dbe97d65579304359e8484302c69e1bbf0bef22bd98f50ffa74ce1fe6c0355f51e SHA512 91045102cd2b53f2469748b398667d27a23d0a8c56f2a82e454a5634b3a05152af370797eae1153317ec9cf0c854dc9c7547265adf162be2e51f6134fbfa7c58
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
 EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
deleted file mode 100644
index 21fe853ce4e1..000000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-1.1.77.0-loader-Rework-include-dependencies.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 700483f5d92de01c1c8f413f8a4172d96684e93e Mon Sep 17 00:00:00 2001
-From: Lenny Komow <lenny@lunarg.com>
-Date: Mon, 25 Jun 2018 14:09:51 -0600
-Subject: [PATCH] loader: Rework include dependencies
-
-This change removes the assumption that vk_layer.h will include
-vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
-in the near future.
-
-Change-Id: I3fed5efbc35781c96aa9d0977d046c8555e04a7c
----
- CMakeLists.txt                             | 2 --
- loader/loader.h                            | 1 +
- scripts/dispatch_table_helper_generator.py | 1 +
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b942bd47c..64f498945 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -201,8 +201,6 @@ if(NOT WIN32)
-     endif()
- endif()
- 
--install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan")
--
- # uninstall target
- if(NOT TARGET uninstall)
-     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-diff --git a/loader/loader.h b/loader/loader.h
-index 0af2abf27..c39c5385e 100644
---- a/loader/loader.h
-+++ b/loader/loader.h
-@@ -34,6 +34,7 @@
- #include <vulkan/vk_layer.h>
- #include <vulkan/vk_icd.h>
- #include <assert.h>
-+#include "vk_layer_dispatch_table.h"
- #include "vk_loader_extensions.h"
- 
- #if defined(__GNUC__) && __GNUC__ >= 4
-diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
-index fba25e55e..1e2412c0c 100644
---- a/scripts/dispatch_table_helper_generator.py
-+++ b/scripts/dispatch_table_helper_generator.py
-@@ -113,6 +113,7 @@ def beginFile(self, genOpts):
-         preamble += '#include <vulkan/vulkan.h>\n'
-         preamble += '#include <vulkan/vk_layer.h>\n'
-         preamble += '#include <string.h>\n'
-+        preamble += '#include "vk_layer_dispatch_table.h"\n'
- 
-         write(copyright, file=self.outFile)
-         write(preamble, file=self.outFile)
-
diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest
index 8fbd6725289d..5ab12df7bc0a 100644
--- a/media-libs/woff2/Manifest
+++ b/media-libs/woff2/Manifest
@@ -1,3 +1,3 @@
 DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d
-EBUILD woff2-1.0.2-r1.ebuild 709 BLAKE2B 6babc6d9aa6ee5e021d95456a504f907dd7c50b505d01fcf1bf53007390b17993ea6cc618a21372314fcfddbe7b1a11ffd1b16cd3a029c24fd2cd9947b2b5e35 SHA512 c3abde69ae674ee037b60f59f8d229720d4232af94a14be453bec1ae744e8c5fe402fe52bc1115d3041f81ae616c50268792746746e002cf24dfdb511d588962
+EBUILD woff2-1.0.2-r1.ebuild 712 BLAKE2B b7d7b71ecc163555d5858017eecd9f253a30e4280b786999d28a46306604ef422bdb827034b3b05e6a81ec01289333bfc8e148069dc0bf80bb690d76ca3ff9f4 SHA512 2da20c93e60cdb442ef64aa55376a7389d2bc7ff3ea1c6259985b4c4835bdcca0c2f2b82d313e5ecd42f5a9f311933a4a59ed2d0580f53b336c32408fa53ef9f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index 2644f825a78e..fc7de30c353b 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 2597277a9c51..2eb0d9a2e553 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -1,8 +1,8 @@
 DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fcda5d9bf491fcebe7e8be538041cc536e40bc110e438370c8599ce0be35f71cea00429b16c6eeb680cb86 SHA512 7fc48c704b434d837c36d4bafc51b35789eaf90fc81a68dcd7ec546f1e82a3e41c53263f8d381541d5c0ce58e25dddf0adaf1c3575512842ae633b5581778938
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
 DIST zimg-2.7.5.tar.gz 246416 BLAKE2B a0ce1497356238aee5d3965a7ec57f1591d51c5df2475fb05d208a07f1431f073f8caaac110775fb17c6df8f887ed974b53f262e01f5532de13dc4c539958c1b SHA512 600139f86b074f2ed9614daa58d969465fa3d1578d8165bd2f841193f7b793c4b36389064dd4eee8e01e66a745d1c71c62e5bdb0b5283e54c435ed4a130a5b3b
-EBUILD zimg-2.5.ebuild 826 BLAKE2B cb99d7b3e0fb4772e5351fcf8313357b0ff5110f8bf43b00416d032177ce60ee82c907e50033d2958c1e0a87f376a888fdd7cd688c33e1ce192ccb52539d6087 SHA512 b5eaebe5a0ca214dd52d244a7ac3870d267ef4c867767d86a5e038d18171ba94b9de932d96c07a90f6dfb25202ade14ca3777cd241cc3d3f7634c1977d6b5867
-EBUILD zimg-2.7.4.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
-EBUILD zimg-2.7.5.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
+EBUILD zimg-2.5.ebuild 825 BLAKE2B a44868a6c09dde69f9a14d88e292816982efe3d2a710be81eba6d6ec5879c23b2ffb24ca55015550854e10956efcb9642257889867e0d206302cf1897d472e3f SHA512 5630c26971ac2075b4ceb82f615b818d6c2a53a273258ad4a08bf154239ff552220bfdb7104f94e6a1c69e0e4ff17d0be7dda56c98fcb5fb99cbe44509efa42f
+EBUILD zimg-2.7.4.ebuild 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
+EBUILD zimg-2.7.5.ebuild 841 BLAKE2B b4db5d33a6bb06230ffe472d9286828bb65972c230a89de9b5e32d3e862a3e5b090ba4e1b153c8282e7a570771904fafedf5a7411c3beed8d0634bc51f4e76c5 SHA512 e1ac5be82ea15245df6f1922b38422cf9162b05a6ab27e3a79290c0aebc51b4bcb7a379f38a5235ddc1f02a412142bd5b68ddbf6c4fa3a773d265cb52845ff81
 EBUILD zimg-9999.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 MISC metadata.xml 311 BLAKE2B 35db707f7a5c1e20c662525b306a018a6cc2a5cfec6e6f316c5d532566e85710d8223f9a7478569e78c476dce30f357986a66ffde04112113c389b6198de59f3 SHA512 a46022cde358c89be1d423501630b15ea56d2012e022ba8e91800d834bae267bff5a79c115e0fcfd632da6b9031d3c68948f1cd83e3f27699895b7de548f95b2
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
index 825283b9cefe..df91e3a3d814 100644
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ b/media-libs/zimg/zimg-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 
diff --git a/media-libs/zimg/zimg-2.7.4.ebuild b/media-libs/zimg/zimg-2.7.4.ebuild
index fe1991fc9e05..1d720a336c91 100644
--- a/media-libs/zimg/zimg-2.7.4.ebuild
+++ b/media-libs/zimg/zimg-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index fe1991fc9e05..1d720a336c91 100644
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index ced0db303db5..5072348918e8 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -3,5 +3,5 @@ AUX zita-convolver-3.1.0-makefile.patch 1283 BLAKE2B 14b6b799ff67218b482317ed64b
 DIST zita-convolver-2.0.0.tar.bz2 12858 BLAKE2B 1801681e799a85cd9a5b6d724ea3928e379bcd4cde1e01a39dc714e9480bdc0dfbf777aa4230c42190fc9e98ee3f842f34bf5c65a53744ff6b977c231194bb51 SHA512 5e12e8785e3b3161e42bb3a65e63ec4d4d2d6fa5c11960e0843f3985d76d4f24d7a1d979d0a092dd0c5407b817b66e799da211fa0f7eb96f581ffc56950135ce
 DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a18c7f269c1dbce8875bc7c8a50b652f3c2ddd3c5e71ae26896d906a17b78f2bcfab129c078c1d60f8871c9509bb173d7 SHA512 0003d4fffcc07b3e67d54996a63db35d537d97b26003e06afbeed19fba551d552d4d5a808a86b5c600f5254816c6b26db49f48e13bfa3c77d93d61956c479eb9
 EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
-EBUILD zita-convolver-3.1.0.ebuild 1003 BLAKE2B e800504f6f12a8050bafcf50d01927c3a86329ad2f2e6e6c9e74a9c7c0ebc2329df827c312f4a94cc9b58cc2575a8299f52cdaf9542d285879e498ea004f6b61 SHA512 bb07948795b7894188f86c5461534eb239383cd590b92992f2a967ec6206739f220b32c8f8796c3b8f7f3dda596716a91778a08ca47247d4bf2aa40f7d46aeda
+EBUILD zita-convolver-3.1.0.ebuild 999 BLAKE2B ad058daac14e1207521e1c00c11c246f81d4f4b8909b7d75bd5f83bda380fc4c236ef603cc8b0670d06a845fc29d3ed77e92f9ec64f1488141aa0559cc37edad SHA512 939556a6df4a88960ae18f819a2030acb6d8956bc8d7d6790d0aad31e11b46927e1d01d75daefa767e1399006e06795718687dffebbd2cff9598dfd4fb562169
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
index 46a83e5817d7..b4dbf0668a5a 100644
--- a/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="cpu_flags_x86_sse"
 
 RDEPEND="sci-libs/fftw:3.0="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a16e52fd90f1..93cc1e4d7b92 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 44c4303e3356..6403b01d0964 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -2,11 +2,14 @@ AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2
 AUX alsa-plugins-1.0.23-automagic.patch 346 BLAKE2B d544fdbf01229404342ae84c81ec72cccbb5def2593bbd323e464300bf04e95ba9f52a24e365b786d44d361a55165841121990f319801574c81e46ef0a111a7e SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c
 AUX alsa-plugins-1.0.28-libav10.patch 10113 BLAKE2B 880c8e9781ab19afcd724c408c5291948b4ef028935915c13134c03dae393e0a7e9a258fa91905a1a7a663a276d2a53cde6be3477bd5ed5d0e3b6ea2ae38767d SHA512 b0a169c300e3cb21ee76a6773ccc1f6d69c0e9af604d6bf24669a561e038cf670bac20c5eff5ac48b33f3f36de81d99895b6a43c8310b2609e9b2bfce42cc0bc
 AUX alsa-plugins-1.1.5-optional_plugins.patch 1123 BLAKE2B 453d9455741c118bde8ac697cc3d5b8b1404eb93d842e7a05193175261cdcd30d34e0cc7a8bd90aeb402799c60bce81dd42dcac2bd3b085b3385ba9e06cc2859 SHA512 9659eca8a071cdb2cbae6f1ec6fc0b447a45858a5464023f1dc5c36fda8053572d6a2a8cff629e8c2768b8a61e9f15d6d7cf420ab1aad1b3773084b7ed959c5e
+AUX alsa-plugins-1.1.7-double_free_fix.patch 876 BLAKE2B 782924142a0523ae800b1f55af7b625a0a96f6de07a1c81820c23a98441a066987ccfa35e07c681a48209c5b90b7b1cca3f64e63a4a2d72c818d9d25cc0c235f SHA512 62a21886273d4be05e1094b674b13296dd629ce9aa0deddec3ba4cda9a0a4b00e931aa80be969b3e5dee24c0c649137a23b97bebed15260ee614bf24dcfbe257
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
 DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
 DIST alsa-plugins-1.1.7.tar.bz2 369866 BLAKE2B 8305f17a7e72e159f1710168cc3a4f0c7deb870c813a8a48b335911717422ac584b6846b047a29880448bdc0597a80881b87e5df1ff018a1e174aea490d3e9df SHA512 c3bb22ec3c5a167fb246cfc94131d53800e321b486ab743c3395a9d91dee0ff9703f6e4a2feaea5a4ee42a7e486d835d48ab880c784c5c34bb4eb5e9ded06d8e
+DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2698 BLAKE2B 3fac1377af069760efcc93fe6daa55a3d821742e7ffd5c0976dc0f3a066151ff087d20a65803aa59f253f27f8077d20345da879f92fd3dc28398440e31b3d148 SHA512 9df4f03ae71fe97423bdb37cd28755873a915f210ce92f5f394e15bcecd6662f321acff20b9f212fdb06b63337a7f58d2fb25a6c18eac2be3c5820bc21394860
 EBUILD alsa-plugins-1.1.6.ebuild 2871 BLAKE2B 9237177da7962b41c133f03ce43551bade96df33cb8308c72f8e48515e5b74585682220754b2dd0e1cff539e3c2e93aff5be0deff0c08b000af018f89492c133 SHA512 bd24fb484361cdda38ed6f9819a3cf9a66a9ae7fae060818f958168353a199abfc88cf67bc48de3b7ccc7cd5ba36d680c67f85297d5aa0d17600dc29c72b8309
-EBUILD alsa-plugins-1.1.7.ebuild 2820 BLAKE2B 7b75a11208b7d17639c95d97c4146482f724f15b4f10faa597bc98e4b92c81315bec24f1732b16786cca8b226a6e130e124405347f1393769d622931f2675a7c SHA512 e99dfe0dd098ffb7debdfaf29eca29688f7a9c0e82c3c05dd2b48a61339b622d53a37bc1fc22dc2dd46cbec12df3155d0cc706517efa3447eae4fb26f14967fd
+EBUILD alsa-plugins-1.1.7-r1.ebuild 2875 BLAKE2B 69390fa6e62ddfb8a415ab06e3ec2fa37851fa0b7a6e02ed3e9ee96291e8d82a09902c8e78068f36ebea1521af07429e603ec0c6e62acd97f9538f97bf148153 SHA512 bd2e1ca77192e0f551a41bbc0cff271284e8be137833a3056b47692dabbbc50ce317217eb6bd66b68cd33df675d86edec8480ccb72cc05e0545decf415037335
+EBUILD alsa-plugins-1.1.8.ebuild 2820 BLAKE2B 3c92ee1ea5de3c66cb58cd94a3b65bbcf1889503b0cb4e040f4d0022c2d173a8d0e138ad8d274110ba73feb4381c3dd5d3ab1baca0cd27822491866266c9ec9d SHA512 ad4be26e27881675e4381b7d5b0f34c54704a96c3b5e00e6e7d31d8004199d34210d4f74b3e5b1d2c577022edc09a7cf9060bad0597ea95790b69aa7e1e416ca
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..f97cc166249b
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.7-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-double_free_fix.patch
+)
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg libav)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
deleted file mode 100644
index 2eff3aacc81b..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
-	# failed assert. As the code works just fine with asserts disabled, for now
-	# disable them waiting for a better solution.
-	sed -i \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	use debug || append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		--with-speex="$(usex speex lib no)"
-		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg libav)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed -i \
-			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
new file mode 100644
index 000000000000..0e6f55c85fa1
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.1.8.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
+
+RDEPEND="
+	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		--with-speex="$(usex speex lib no)"
+		$(use_enable arcam_av arcamav)
+		$(use_enable ffmpeg libav)
+		$(use_enable jack)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable mix)
+		$(use_enable oss)
+		$(use_enable pulseaudio)
+		$(use_enable speex speexdsp)
+		$(use_enable usb_stream usbstream)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
new file mode 100644
index 000000000000..9b3a81599b39
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.7-double_free_fix.patch
@@ -0,0 +1,34 @@
+From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 23 Oct 2018 09:32:46 +0200
+Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in
+ open fcn
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ a52/pcm_a52.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index e431fd0..b005bc2 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd,
+ static int a52_close(snd_pcm_ioplug_t *io)
+ {
+ 	struct a52_ctx *rec = io->private_data;
++	snd_pcm_t *slave = rec->slave;
+ 
+ 	a52_free(rec);
+-	if (rec->slave)
+-		return snd_pcm_close(rec->slave);
++	if (slave) {
++		rec->slave = NULL;
++		return snd_pcm_close(slave);
++	}
+ 	return 0;
+ }
+ 			      
+-- 
+1.7.11.7
+
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index 69e50ed3f1de..5b60265b4e2b 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-a52dec-0.10.19-r1.ebuild 399 BLAKE2B 5badb061e541f634bb4bc301a4e2828f95f74bd239551c859ae09b3aeed94ea89a1ea743b26ee4011c3f9e26b1fce587b5bb59186c300b4d37f9420294de4c67 SHA512 81f762ae4e234a7a3f1cfa82ec0efb712cc61da6b4944b0242d5d7d273f3bbdf01f3f9471860778b23a75b654d7e59f2bc355f7d8d68faa81672630d17aeaf40
 EBUILD gst-plugins-a52dec-1.14.1.ebuild 471 BLAKE2B 60875f6de0c6ea3ef6527099381a188d8806dd332fc953d8b9651702dfaea70ff8db28697a005eb0fc489c70c905ceddaaf120e5ac0d7b68edbb427cdca649b2 SHA512 9c8fc92228d8d9a65f29dcb6d464f2e785511723b442543966eecd315b451e21c16c5157ac39758c2acec7ec5b96c4a8fdefa1e50c60481204bced4405171246
 EBUILD gst-plugins-a52dec-1.14.2.ebuild 478 BLAKE2B 8cb40e188dbcde280bb956e776899ec842f3424f85b73ee76f87eeb623e15c4b19a09613d3a3b409bd045e7ba89ca38b2bf1b6f9228971fd9697b927bce4b344 SHA512 be9d39ade3c7dfc636a8b6d038db6e0bd1bbd6a75aed5c7aa4284af7e3adc69b0ae567793a1bd7e199ec74d097a3ce4dd01c0507b68f5dc6ad9a039fc3f7db72
-EBUILD gst-plugins-a52dec-1.14.3.ebuild 478 BLAKE2B 8cb40e188dbcde280bb956e776899ec842f3424f85b73ee76f87eeb623e15c4b19a09613d3a3b409bd045e7ba89ca38b2bf1b6f9228971fd9697b927bce4b344 SHA512 be9d39ade3c7dfc636a8b6d038db6e0bd1bbd6a75aed5c7aa4284af7e3adc69b0ae567793a1bd7e199ec74d097a3ce4dd01c0507b68f5dc6ad9a039fc3f7db72
+EBUILD gst-plugins-a52dec-1.14.3.ebuild 471 BLAKE2B 65775756eb30138553bf549e690cbab0b5aada01d4bb1adfb78e3a9b041e415fdc78d2fd231e7c506b64cd84078a78bac95f6b6bf77b381191c541c40707a20c SHA512 0ddbabd93d73b6c2214ccfb4ee1e81d229e383df5bf8384ff8b9d482aff53f702307d7e9efbd0e0dd138f8641ee2046430a8bd61cb22aead301b2482d039b315
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
index 193e6573ee85..8a6a1ab5d967 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/Manifest b/media-plugins/gst-plugins-amr/Manifest
index 16daeba3776f..5f8ece8af682 100644
--- a/media-plugins/gst-plugins-amr/Manifest
+++ b/media-plugins/gst-plugins-amr/Manifest
@@ -6,5 +6,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-amr-0.10.19-r1.ebuild 587 BLAKE2B 7289c3fd63e177a51e92ca02d6596a7389288e859af8cfad888fa378cb1096e6bd18da2f4309dd37e13e55bdb1fae0da9aca6cf1157ceb38452f5edb3d7b4bdd SHA512 8f355a98ab8c714ad84c177ac00da544a5b4b6604b278c9a05241c1d961704579e1fd0938c81dc2900b2b88eab967ca7c5121cb3c3f4289387ee41f59a8ccabf
 EBUILD gst-plugins-amr-1.14.1.ebuild 492 BLAKE2B 9e4fd66fabdad24f43bf6c1992137a0270b3539333155eb354fb5aee68fe2d36dde8f16fb791f6ba292ebcc05766b0416ae844ab94836cabf19580e114dcd9e9 SHA512 f416fbd1b959d6761357ff6d38e9dfeb4e31f2a42439a1dba715b15da2ac8939ec375276e77b5b21da8540947765f5331b708b8fbd6015b32ef0003fc5a12899
 EBUILD gst-plugins-amr-1.14.2.ebuild 494 BLAKE2B c947883d3e5b5dd6906611e94334eb3503259797dfc764c482efc9565d870d10c37ebabeb1ce070795724d704f9b45e5d9ede04cf9d6580af8adf6f900e1da81 SHA512 b0aa0724fda503543b1db3f7cf73de4da2cd7506d157c8c6325eb2715559ca81f040ba4220ce310e361c7833705e5aa619ed1ac46b083b792fc018fda06543f0
-EBUILD gst-plugins-amr-1.14.3.ebuild 494 BLAKE2B c947883d3e5b5dd6906611e94334eb3503259797dfc764c482efc9565d870d10c37ebabeb1ce070795724d704f9b45e5d9ede04cf9d6580af8adf6f900e1da81 SHA512 b0aa0724fda503543b1db3f7cf73de4da2cd7506d157c8c6325eb2715559ca81f040ba4220ce310e361c7833705e5aa619ed1ac46b083b792fc018fda06543f0
+EBUILD gst-plugins-amr-1.14.3.ebuild 489 BLAKE2B 185373ff6163517e3d12103aafe64e69271118b29b8ed140e00f6698f1aba4092df85209e154f183044646de422678655c52d36eb899eaf6de69f1aa810ccb30 SHA512 b87ca1de4b2beecd0d104f748a7e826e99666d16980203804af49001f1424e2444d083e3de20b568726594371ca2d7c3ae28f990a754ecc965bb98acb97a0c16
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.14.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.14.3.ebuild
index 70e96d7971d0..08e15ae3d68c 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="AMRNB encoder/decoder and AMRWB decoder plugin for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index e12307a82c93..feb86a3737df 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-assrender-0.10.23-r1.ebuild 397 BLAKE2B a37da2f3411bf8a65a65bab2c0acdb246feeda44f7bf843f6fb20a39c9835e2dc9c332683831d628fc861c08c03303768eb728725462abaff417deed43ae2e1f SHA512 cce12435dac51172f7f263bd8c0c0ab33be80a6740584e1dbcb5b707ebf62c034e5d4da247e54639c1a6592cbe7d8be055d3f7b335331cb18629b52c279d18a6
 EBUILD gst-plugins-assrender-1.14.1.ebuild 412 BLAKE2B 75f67b98e49d72ec797e54535ce9a236411a119130a23b9c4e461bbe98a4e138f6c1df4e2c5890c83cee62fc7e8e5cbaa22f0f68ec454cab0f75d288c5126d40 SHA512 6a622786a8552121140a5c21af9366173505aa977a03d8ed78848cdfcb9ea60a3a068969a4cf165df35a95057036ab723014efb18fb2016a06181411e4ec88d4
 EBUILD gst-plugins-assrender-1.14.2.ebuild 419 BLAKE2B 8382acecc2eed805d3a40461bc70c2b42ffaad67db05e5bef8050d8958306f8587d224b659ca4aa8a406bd0c5d07f8bcf336745d95bff255c2c6db567625ce0c SHA512 f09194c9285ceb3364618d930781db1da8dc61e2f035e7e961a0843d56d5602db51c8aa38ade18e3801091b624e5698cd6dd382ba20097defcf0c5b548f666df
-EBUILD gst-plugins-assrender-1.14.3.ebuild 419 BLAKE2B 8382acecc2eed805d3a40461bc70c2b42ffaad67db05e5bef8050d8958306f8587d224b659ca4aa8a406bd0c5d07f8bcf336745d95bff255c2c6db567625ce0c SHA512 f09194c9285ceb3364618d930781db1da8dc61e2f035e7e961a0843d56d5602db51c8aa38ade18e3801091b624e5698cd6dd382ba20097defcf0c5b548f666df
+EBUILD gst-plugins-assrender-1.14.3.ebuild 412 BLAKE2B 5cb3b883a5a2c11e888eb7e4c2482bc86f1572fe04ba50f1c56966aab7b594ab0bd35546b9dd91917b54b042778a894f80d147e17b2273ef1403d3d192244c78 SHA512 e712857c8df50bc893f78b2acdc1cf427c8410a1ac769f0a29a9f14a38964035b23df5670151a6367f4d2d6760b225f5aff09fa915ce9747e52e5d43dba2ff11
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
index e6ec01d07a15..a6de07e09d81 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/Manifest b/media-plugins/gst-plugins-bluez/Manifest
index 6f291121d8bf..1ccccaa77e03 100644
--- a/media-plugins/gst-plugins-bluez/Manifest
+++ b/media-plugins/gst-plugins-bluez/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-bluez-1.14.1.ebuild 364 BLAKE2B a19fc9da9f0621559a6c55813dff780e908a31fc2d682922310b91e5797031f916432d087c7e4284a4141da96375fc21c602d5aabe61bfbb59271caa0d67faf4 SHA512 04d1a168ed4a8d4d8371ad56f5cc4c68ca28d7dbc0acd14231e1f0bb54f5386469f014b38f8845e4d68714815ab636b5062905b37a963935b1b022ac3c96592d
 EBUILD gst-plugins-bluez-1.14.2.ebuild 366 BLAKE2B fc6aa8561a5d91359be878166aded2272f67b2a406bd4e319ea4a8e4867949a1af01cfdda89e7669f7cbd866da51ef6c574f0a1d132c6d92cce93b6b08f79792 SHA512 b5191160bea35ae7c7445fc754dd5c819bc8e014f1e4251716d315a83b1f507a93ea87fa313d61914772addd3d3f92e47acd8c3423f40ec2fe8c0e46bf621fc4
-EBUILD gst-plugins-bluez-1.14.3.ebuild 366 BLAKE2B fc6aa8561a5d91359be878166aded2272f67b2a406bd4e319ea4a8e4867949a1af01cfdda89e7669f7cbd866da51ef6c574f0a1d132c6d92cce93b6b08f79792 SHA512 b5191160bea35ae7c7445fc754dd5c819bc8e014f1e4251716d315a83b1f507a93ea87fa313d61914772addd3d3f92e47acd8c3423f40ec2fe8c0e46bf621fc4
+EBUILD gst-plugins-bluez-1.14.3.ebuild 361 BLAKE2B 01dc807429ce2f5818ede7ad6f842ed8a2e18dd2b2edac4608e1b8f2841bea0bdea546082e0531ce02ab0b3f23ca1036a6fcebf06978e70fe3176a51335f7051 SHA512 e651a5ce9fe6b175f0bef8d38a2406c68ab4b4991d5a4e5aa8c1619ccb67c933a347328ed4de360fb73a259535dbb60a3921c4c5192c114ba00abf5c55a1a678
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild
index 7f9ff994bb39..6644da3b7d2a 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AVDTP source/sink and A2DP sink plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-bs2b/Manifest b/media-plugins/gst-plugins-bs2b/Manifest
index a4fb5bf85e95..3a20cc23a976 100644
--- a/media-plugins/gst-plugins-bs2b/Manifest
+++ b/media-plugins/gst-plugins-bs2b/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-bs2b-1.14.1.ebuild 310 BLAKE2B 3e0537cb4abf3880681fb4bdfdfbf72a2518868bfe6e2af0c6e8c81d87f420a0b55ad06ed45c70292fbd161e6ccba6791ebb14681654392cd0facea44afa111e SHA512 1fb0bdb5e65b260dd73410f3a98944a7877c8cbd15a9857e9569daa1382a39f3f879e958f3d7ab9655579b7b9a2e480479d404f5166805994d8806e54a15e4d0
 EBUILD gst-plugins-bs2b-1.14.2.ebuild 312 BLAKE2B 0cb5f22addb879606df5d3c00b3721db0fd0d820fa3b852a8ed260226554a00e396a5e2d82c5095bcb2bb670590cede91f4a9cd4353f48cc8b141f0190ffd032 SHA512 c7c16c3424de516ecaa9b6da1ba1b4483a0f057aca9479476d0d2a1dda617de56f1965c75d5ba12909f61abf5bdeb0641de4d1cdd8fb9a8e9e4cc20e143ea909
-EBUILD gst-plugins-bs2b-1.14.3.ebuild 312 BLAKE2B 0cb5f22addb879606df5d3c00b3721db0fd0d820fa3b852a8ed260226554a00e396a5e2d82c5095bcb2bb670590cede91f4a9cd4353f48cc8b141f0190ffd032 SHA512 c7c16c3424de516ecaa9b6da1ba1b4483a0f057aca9479476d0d2a1dda617de56f1965c75d5ba12909f61abf5bdeb0641de4d1cdd8fb9a8e9e4cc20e143ea909
+EBUILD gst-plugins-bs2b-1.14.3.ebuild 307 BLAKE2B 9ce161dc51a6581ebd198ec5595aa3fe36e706511166f33321370d51f4dc703d341ca859082f0d6f90a8d64fd44473db4986cce060166f487f14bc1546484c99 SHA512 0e2e4116b8e9c3906de2de4645765a7931fa0a323504f1871a40d14b5f9542ab9f35a7b2d92683ec40401597ea8c479b4dd9a0a79582f5be045bd660b77c569a
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild
index 2e93bd8ed590..bf5cea5b896a 100644
--- a/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-bs2b/gst-plugins-bs2b-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="bs2b elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index a1d09eb0f475..7cde727cf77f 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -6,5 +6,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-cdio-0.10.19-r1.ebuild 418 BLAKE2B 1c7a01775e4347b4db8474a8f7ba85c992f694878f53fe9e119b85fa17196f43a2edb0967b5791ac673f4a0a50636acea2cc6c08f8c276c7533833797ba27063 SHA512 9df5ba64af0b1bd1d99e46851f6184f889386898d056d2c82cd6c5c023ff183bf59a6818c401f8ccd6a62beadd6bdd77a2d447f250c0472c5f54b46013d6dbb6
 EBUILD gst-plugins-cdio-1.14.1.ebuild 396 BLAKE2B 01557e64ea5a466dbfaf7de6dbbad6fcd79d1abde852eb749948a05999b6d210ed38465c3b4ea2db81ff55324aa5eed9f8d6de8f8f1c64a1ccff69ebefdc98eb SHA512 f5c0fd82f8452edd3ebf1268367a9810c8ea13e54a9196cef056740c5a80d745773bbde8502b085ce05a90941f06802c232586343af32d19beed2c37c9448889
 EBUILD gst-plugins-cdio-1.14.2.ebuild 401 BLAKE2B 2016618ae96e40a60d52613fb24db6f47feca7378808d3107c2891bff0f44b6063d361ef8976fc8cb745cfd25474f22d312d0b6a2b34f4df4f2ac14144945e6f SHA512 7d528b34823af7afcb4fc339cb2d36ec2e1b61a4c5d1628985cf7baf74f250e2e36cfe9eb64d07f5f64a662e9fcc28864199c074b9f4eb72b8cf652b1c11b158
-EBUILD gst-plugins-cdio-1.14.3.ebuild 401 BLAKE2B 2016618ae96e40a60d52613fb24db6f47feca7378808d3107c2891bff0f44b6063d361ef8976fc8cb745cfd25474f22d312d0b6a2b34f4df4f2ac14144945e6f SHA512 7d528b34823af7afcb4fc339cb2d36ec2e1b61a4c5d1628985cf7baf74f250e2e36cfe9eb64d07f5f64a662e9fcc28864199c074b9f4eb72b8cf652b1c11b158
+EBUILD gst-plugins-cdio-1.14.3.ebuild 394 BLAKE2B 4683abbd91e8eba88a08f02432a51299ba11287d384b59dd2b14343382c69818b7f4789b81beeab64b72c6a4d5da5bb1bbab94769eb36a52bd15681007e15008 SHA512 c0f6c5b7f539ee1ed2f9db59629e1580add6ad284f547ed6b8c51d921eadd63c8b53013f2be374ee6ead7ceff4f0f3f28bb4bb3b969e68db1d2e7ded2f2b1628
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.14.3.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.14.3.ebuild
index ca6757aadf51..c1d4a24ddd01 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 8726588c970f..78a0d41951d2 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-cdparanoia-0.10.36-r1.ebuild 438 BLAKE2B 056dbad1b9473f84356d
 EBUILD gst-plugins-cdparanoia-1.14.1.ebuild 477 BLAKE2B 146dbd3c217747c7937e01241123a7d7c00f2b4af6f58082fc7a994f5a3e4ec5f0851ea6ac5f54d9bb6c8b408743ff8effc29d9e5897acdac8d542102fba72d2 SHA512 a415e603a083bea57b444fce9263ccf5a78d167ac2daf45918f3b0b40b937a4028f80bcff6b93f0d5b5274dc0daec80003d40c14dd225891abb682fc5d14ce03
 EBUILD gst-plugins-cdparanoia-1.14.2.ebuild 484 BLAKE2B 27b2b4bdcf2015c67090d8b829d5df7883b2a00b403aae9adda445359f25afdbe90b6354c9d6ca2bcdfd32f22e2a8f398305cdaf02e4858cfa65bafc41323a9d SHA512 ee7008e83084708242ff7f288d84619cbfcea0d81ea3b547c1a79dc87a55bcd0329ac2d68da3475c6f30fe8c4da6ae9eefa89e0f2e0ce7a44110dc9247c05537
 EBUILD gst-plugins-cdparanoia-1.14.3.ebuild 484 BLAKE2B 27b2b4bdcf2015c67090d8b829d5df7883b2a00b403aae9adda445359f25afdbe90b6354c9d6ca2bcdfd32f22e2a8f398305cdaf02e4858cfa65bafc41323a9d SHA512 ee7008e83084708242ff7f288d84619cbfcea0d81ea3b547c1a79dc87a55bcd0329ac2d68da3475c6f30fe8c4da6ae9eefa89e0f2e0ce7a44110dc9247c05537
-EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 481 BLAKE2B ddd7028357ea7709abd33de624851d5a9d9b43a86968acac26e6691ab6b622e2aa3df33a7be045a1bdf382d72b1b5b7eb3f38010c89e9f5130679cb2c51c4c43 SHA512 6775cb0e302d046faa808241365949eb953a25a82f0aae6908c29ef22365eaee3d7404a36a353ce04e4694aaa665ad4030adeb29e5b10775e41f856b13258b25
+EBUILD gst-plugins-cdparanoia-1.14.4.ebuild 477 BLAKE2B ebdaee53b91e8f184bceab7c6db4f2a86ef9cca430267261331849e02aa6d8689b7a9fe8f838c195bb798db52a029091aa61fad93a90399e67029a9ebc684c8d SHA512 a719b4ff7c3512d279bb26c706c5f9cdd6f69670e191600a9c44db9cbe6a39525fe513d941abc9acfee384c37fecfebe2d5d0d620b2f08090b33c705ed4c1cb2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
index d5cbdee29898..ebdbad04938b 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-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=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index a1903cc90493..b03f0fdebb3a 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-dash-1.14.1.ebuild 1268 BLAKE2B ed63a29b8e60e4f8ab4b9732f8a1b6d62c552837dc53d65d84ed716217e1a46f72131a60ffe03183f1a5cdc0cd3f0a7a19a7fbe599069ac8b1a41b86848acbe7 SHA512 a4fe0df8098a304a5ef07652ee400a51d54ddf0bfad4f8291f2a776bf8fbccb818ddd7a27ebbc4411b3428e194009f415e14f619058cf7f637f9401b3f454f58
 EBUILD gst-plugins-dash-1.14.2.ebuild 1270 BLAKE2B 19b489a4176bf0b786a316768084a7f0e0c4e9dc4ae5244b66e3d71e12b65fea5f6b7e86e8ee3c342b230f7a618af2b8cabbd3c37f685044adefc85feb04cd75 SHA512 f513c107498caae677c9bf561050ba659a04a11be67b1cf940aa15f58291560cf89eb675ec805b433ef5ee69b92548f2a17cdcc38ffc13a66f88c951cb10d501
-EBUILD gst-plugins-dash-1.14.3.ebuild 1270 BLAKE2B 19b489a4176bf0b786a316768084a7f0e0c4e9dc4ae5244b66e3d71e12b65fea5f6b7e86e8ee3c342b230f7a618af2b8cabbd3c37f685044adefc85feb04cd75 SHA512 f513c107498caae677c9bf561050ba659a04a11be67b1cf940aa15f58291560cf89eb675ec805b433ef5ee69b92548f2a17cdcc38ffc13a66f88c951cb10d501
+EBUILD gst-plugins-dash-1.14.3.ebuild 1265 BLAKE2B e85c74465d9040f73bf987bc953b8780cc57841e09eb6f5c03939dd6c216450922b24268291ca7e911a0b822ff0b7a39f1b9d08b494674579638ae7f5685d511 SHA512 75606fb32c828c269d6f71fa33ef0236ff514cf74b4c26a990665a4ab655d1ca6c766c8dadbef93b6ffb093210abfcf610bd69490fcc4df01bc6349765b6bf8d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild
index 73db69a8c2c1..0fef32f2bee2 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-DASH plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/Manifest b/media-plugins/gst-plugins-dtls/Manifest
index 7cc336aeeba2..a3a36c33b326 100644
--- a/media-plugins/gst-plugins-dtls/Manifest
+++ b/media-plugins/gst-plugins-dtls/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-dtls-1.14.1.ebuild 429 BLAKE2B 095f85ea549be96f28e301c8282a96ee29ee124b891cddc8f604405c6190606740af9fe3e70ce016fa0a88d01a8c5477583aef3b55d7078d4c86c15899291127 SHA512 eab6b5f7374fd6ef3c6a88e09d28e279de4f52469e4dd9cfd691a69e3a7fb6d6e38f6572c57c7706afedbe337173cb4f0b831d6362c59727275ac289864fcb17
 EBUILD gst-plugins-dtls-1.14.2.ebuild 431 BLAKE2B 438e0e7972cb753d061d9c726801fa4b87bf89e68b30829c038d41f60f89177a895b94ea93e851d612839738eb58d1145f7c7747bd6e53da5fcc77a2f0f64860 SHA512 490fe683230eb0d1fee1c433345a6634f4ee1256c6cbdaea11f5a93df7e5733859a3e0389444addb59c7b7a577c1af9fec0583efe191b3e97c7cc85aa86aa9eb
-EBUILD gst-plugins-dtls-1.14.3.ebuild 431 BLAKE2B 438e0e7972cb753d061d9c726801fa4b87bf89e68b30829c038d41f60f89177a895b94ea93e851d612839738eb58d1145f7c7747bd6e53da5fcc77a2f0f64860 SHA512 490fe683230eb0d1fee1c433345a6634f4ee1256c6cbdaea11f5a93df7e5733859a3e0389444addb59c7b7a577c1af9fec0583efe191b3e97c7cc85aa86aa9eb
+EBUILD gst-plugins-dtls-1.14.3.ebuild 426 BLAKE2B 3978a7c398acbba159f5e2e0145b5c2c878ad47cb392f5e871acd953dc0d766c05228f052b70bc4a41f7eb5c1321ac2d884fb040e6cab1e5cb004f5715b5b7b8 SHA512 688e6aae0385bf212dde3102131678fb0638728d810da2e1f7127207ede3d38320ae805036cfa15c9e0b075c8a7980f78ddad7ab027e5643ab485c69ac487067
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild
index 6d4627c88f1b..b48ccd5f5af2 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTLS encoder/decoder with SRTP support plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/Manifest b/media-plugins/gst-plugins-dts/Manifest
index dea114243782..ffdfa093d665 100644
--- a/media-plugins/gst-plugins-dts/Manifest
+++ b/media-plugins/gst-plugins-dts/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-dts-0.10.23-r1.ebuild 429 BLAKE2B 6d3a3b37963e8c5d4c24b67cd054b7b017824706dcf55423c4491b6af1e4b7a6959cd9f10fd3ca95d769cc507823c7dba905983c7ddd0b26c663ab46bce58761 SHA512 3ed3310eb7cea909bf38a75b87f651ce8685e727525c28b4b26fadfd5011cdf57fa72743f6df843b0dffaf9967d66bfc438b626a07782162eafef1b65088e6c5
 EBUILD gst-plugins-dts-1.14.1.ebuild 430 BLAKE2B c83a341abc06817e66752b1137075b43908c8ff7610a028e44ee7b105e1662614a5c6e775e74d84d57eb304c617ea45ad2f7105de5d55d2dcfdb594d4c2168de SHA512 ebd731e0eb380fe7b281872b0e9fbb7b4b5ee26dab19cdcab624cf9a2c89c4d9ebc56227d4e440a6fe609eff9a4fcdeecc8271856cd7970d7b72424c1a141ee4
 EBUILD gst-plugins-dts-1.14.2.ebuild 432 BLAKE2B 5186628d4c9b93355ea9609be7033f1087e2265ebf3307aeab15e69b20538f7221cc1c746f864bcd0d091ed69453b3b19e9105f0fe5642e37f54ff13a9d12a65 SHA512 1a6f4f0034a96642799a7c728c21cbac956fefe7b5bf17b5f7349d49c4720e030a8ca82978795293013d4bee3b8e94af5ef707894cba9030e2bb28eb95357727
-EBUILD gst-plugins-dts-1.14.3.ebuild 432 BLAKE2B 5186628d4c9b93355ea9609be7033f1087e2265ebf3307aeab15e69b20538f7221cc1c746f864bcd0d091ed69453b3b19e9105f0fe5642e37f54ff13a9d12a65 SHA512 1a6f4f0034a96642799a7c728c21cbac956fefe7b5bf17b5f7349d49c4720e030a8ca82978795293013d4bee3b8e94af5ef707894cba9030e2bb28eb95357727
+EBUILD gst-plugins-dts-1.14.3.ebuild 427 BLAKE2B d636ec060d753c9d595966e5c5fee3286e3528d9505ee6cdc352afc610aef4a387d5521247f535c48388bf3b491f7374d8323730289aed2bfed1b182aed2f74b SHA512 5ebe8f644b2961996e24a71f61a425d812ee7d3e7cb25d3b9e391b20173cc4205cd3e1f22f86f41c2772f9e6964c2d61b3c1e64817aeb018229e30a320bec658
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild
index 4a09ce9f7460..356dd78a3c39 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTS audio decoder plugin for Gstreamer"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index d80bc50e4c5a..ec2ed8e09773 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-dv-0.10.31-r1.ebuild 409 BLAKE2B 317010ff0bc97edbcde420f253bf
 EBUILD gst-plugins-dv-1.14.1.ebuild 420 BLAKE2B 3912731f2241f4686933eb02e03e01b342807eb6fa1e68ba18fccb2651dba8ae4c0eb0dfa64fe832300429d21364151d96f46c93751e9b00d7bae01582834c2a SHA512 6b5cc086a0f0e41c780319d01b0121357aa92f9187b4e2b36252a85a1c7148619b9c36135ffff76f9b6232979a0bbe4f9ff2c5786e40145a88c0a23e4d5f7d5e
 EBUILD gst-plugins-dv-1.14.2.ebuild 425 BLAKE2B b9840b762ee5eb41518ad19a704c5b675851ea3f10b80c1493216a7aea950d570c3cf2a68383a170cd044a1c16debd7ae911e399478dd0067407940ed4f43aa1 SHA512 a9afa128ee5ed299df83c03ff8ff2231093096577a3b2ebc2d4c46ea00c5459067c9367db40aa2ff2c2eaa799d613f06dadc650383b1dfec9aca28e344fddcb7
 EBUILD gst-plugins-dv-1.14.3.ebuild 425 BLAKE2B b9840b762ee5eb41518ad19a704c5b675851ea3f10b80c1493216a7aea950d570c3cf2a68383a170cd044a1c16debd7ae911e399478dd0067407940ed4f43aa1 SHA512 a9afa128ee5ed299df83c03ff8ff2231093096577a3b2ebc2d4c46ea00c5459067c9367db40aa2ff2c2eaa799d613f06dadc650383b1dfec9aca28e344fddcb7
-EBUILD gst-plugins-dv-1.14.4.ebuild 422 BLAKE2B 5dc690346dec6569d583890ab0bb2469de515f4feadb2b06051aee392ad2a85bb0063359290fdd5b0262d0a45975e3eab533410c3e04e045c3740fa2ebfb933b SHA512 3bb669dcdf33f139742017a948404650f3499232f680380208cd12c364d621ee90e88f92277b592cd960a2a043013718e93675308ffa3413bfb29effeb7d3080
+EBUILD gst-plugins-dv-1.14.4.ebuild 418 BLAKE2B 4bed00748365615852cf3db3e63e9fa9fecbff0975db7ab8b7bcf03987cc2127f6a3c127673984e8de902da60ef0bcace9e3b34bb1396de56eafe978c94ffdb9 SHA512 f5d928a7c06c2f8ad6031732fcda334a9b34fc2dfe5e8255ec8ad3124b6b74ad8ca31b2bfd36857ca33ded1cc23ca5f580bec57370b4e7d1af661420a09f6e63
 MISC metadata.xml 380 BLAKE2B e30d4f36d092c662f4b2caf33ae705dcee14cadb22174b125686c45a8724a880b291d4683fbf6b06a1e8003cf18be831a368d617d872904a58b1e3fe70ae7ca6 SHA512 bcbeccb0d35ae268383fd3cff3c5739301777233f6769556b5793b3b34a0c5c6e6bbcafcad392e22a8ee441698dc508d9638c1c53eaa17b692ecf5a40ee6f27c
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
index f750492791f1..c6eb7b0727a9 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 53a6b377f1f6..4d90a1fbae50 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-dvb-0.10.23-r1.ebuild 321 BLAKE2B 5c391b84793fc06dda951b5a779be73cd69489f09e256ef6c801b7110d72da926e0b5eff2f4d9fd122f683ed0e8846775b58fead0956f8049fcaa8600782b8c6 SHA512 2853b009153861de3710fb1facb4b0f08a8b0cca9ead928f7b8dd773d32de9ed373c2884cad48345ae44356fb8ff00d31652d4f9f1a34a9fa5d8e3629bc63def
 EBUILD gst-plugins-dvb-1.14.1.ebuild 413 BLAKE2B 37f69ff849e2a79e9e1804b0f2cf526a0ecede47c5a48b4a065eb4ee38241f39faa67fa4af0a0ac155d77c06ab5cbd0dcf4a1461e890a2ea420787632ce00529 SHA512 aa767d91327f195b2c6c85353e77789969d38b8d69a6b9ae4b6ad3d5093b0d3f1fd5a10f37419c49ad925ea21cbc784d3c369cc78cd3d59399ccc269071e0281
 EBUILD gst-plugins-dvb-1.14.2.ebuild 419 BLAKE2B 8b78cec43115c917863e528c4968efd34b2d28304b56fbb1ea14ff7d42734fc33ffa86d8e8067e9ee4c59b4853d7aa15ab1119dbf1653f5c2dd8899b378c4db7 SHA512 b3e8de6c38969d58049b241c54957e85c9856667811a0df700e0998dde0364e76ccaa67670db8f0de0c1e7c08b086abc6d191a0d76239d49bf76b204f1f96c91
-EBUILD gst-plugins-dvb-1.14.3.ebuild 419 BLAKE2B 8b78cec43115c917863e528c4968efd34b2d28304b56fbb1ea14ff7d42734fc33ffa86d8e8067e9ee4c59b4853d7aa15ab1119dbf1653f5c2dd8899b378c4db7 SHA512 b3e8de6c38969d58049b241c54957e85c9856667811a0df700e0998dde0364e76ccaa67670db8f0de0c1e7c08b086abc6d191a0d76239d49bf76b204f1f96c91
+EBUILD gst-plugins-dvb-1.14.3.ebuild 412 BLAKE2B 6bbd2e4dab21f57403e4c0ff3397e57b5a5a1b97be69d434d73685ff918f3465e56ff2003652f7bd2faae08af7a30c83b13bcb8afc9a7ed4f1bfda652fa3d988 SHA512 e079278cc082ab73e02f8b43df1cfde0927171b990f673ac2f12716242a1224be4885a32cd65efcad1759ea2b9738d24422b6636f94ca3ee93adcaf336ddce51
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild
index 3f4fdd51547a..275812118f4c 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 1244e04069bf..5d7143456aad 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-dvdread-0.10.19-r1.ebuild 344 BLAKE2B a09e4ee0ff0b119dbc2c3f0da87793b7b9ecb594ead947cdac3209b9a8b377bbbe98bc68baafd84357b468f3186c936513d592ea79448e661147dac320d38c16 SHA512 abdd7868cdff669bdcb5ccf31f41b2cb47615967aced3d1edec5f02f025be814fe3ab0ed1afb49719f3b329ea64320a26971459078efe3192c8bd2e320b9f4ac
 EBUILD gst-plugins-dvdread-1.14.1.ebuild 401 BLAKE2B 5cd34dcf4983ef93c3ef7bc8d18cf4c3fe7022bd241973172cd9326751ca81902539afea6638d1cd944dd792c70b45d5171656cee662daca6a2079df5be5590c SHA512 5c876d71917b90595e47e0f047fe99f37149470caf013ba5947d7bae8e728d27b3c99ad3c00d3e130327608b5b3115c101c5e260b8b651ef93eec629061591a1
 EBUILD gst-plugins-dvdread-1.14.2.ebuild 408 BLAKE2B b3d16f72cd2477a04521b5304366fac935a269524101c47175c00a983cb5b0fccee55b6d794b60a9540561dbd218835a4c2bb085d11f28dbe8a8cb3960bc6a3b SHA512 455c121206efaeea7484079108ed386a7f0e94ddb4fc04241f46f7b285d2d3c723db6e1a8d37cb00dd57ac6a0a953194057b364c07731ce4ce250e9ecf22a787
-EBUILD gst-plugins-dvdread-1.14.3.ebuild 408 BLAKE2B b3d16f72cd2477a04521b5304366fac935a269524101c47175c00a983cb5b0fccee55b6d794b60a9540561dbd218835a4c2bb085d11f28dbe8a8cb3960bc6a3b SHA512 455c121206efaeea7484079108ed386a7f0e94ddb4fc04241f46f7b285d2d3c723db6e1a8d37cb00dd57ac6a0a953194057b364c07731ce4ce250e9ecf22a787
+EBUILD gst-plugins-dvdread-1.14.3.ebuild 401 BLAKE2B 62adcf1a48c031ecb33ffaaff4d6a8777ee709201d169b778d640254d82b0e422a209cc018e718b7e4dcd762603815b8a09e0457a237407df5b9d8facbeb48ce SHA512 6b4ade1dadf4ce5b679beeb0d887c1e118176761fa93601f4f0d6e871c376ce8fda2d89126ea65ff57a53e9cb2db6bcca5234c796eb302ea0d63ce911725aa2f
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
index f730004a905d..fe8b9f3f3d35 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index c3c7febaf8bb..7cefc4ea42c5 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-faac-0.10.23-r1.ebuild 308 BLAKE2B ce6856e16ad97ca843b0f6f0d6184895721c50059747baf672c78506e96e021eaa2f44017881850c0e20a50b2fe27edb7f180f6fb4141968869548654ee11f81 SHA512 f27ed34767f0e948b9bf03baa96359690783610771ee0b6421a30e7997c38f7abcb079060ae5b51c43a6a93b097fedf891a97ac999e1dcb5b1da04cee8148504
 EBUILD gst-plugins-faac-1.14.1.ebuild 359 BLAKE2B d1b7fa0a77ae2b42d125b454bbf4fd245aeec9a583f8feed982267d98ae2135a44c482b0fc30bd3835f31ad036a63d48143da40c419c780be4ba5e0cbd312954 SHA512 697e294e8a39f5e7f3c4cefac1fd0880b81dc72e94613843adfec8187fd6d85c0431181c51b62698ae750ad50eaf3239a541bd8458f70bff52644c5eda4f24e6
 EBUILD gst-plugins-faac-1.14.2.ebuild 364 BLAKE2B a6354f240447883191178b6783f69b77f2583f3dc531501f3c98dc0e2b971533edbed8d8450c17b414c4e9d4ea07ce430e87adccd02dff620208dc8ae9e45875 SHA512 c01156f97efce09e8808686cb14f5805d6265f47a35b2a7c4383a0803ba573bc9f50102e4c53dee99139a85a44f37effe38dab19080fbde1963d2a8142060125
-EBUILD gst-plugins-faac-1.14.3.ebuild 364 BLAKE2B a6354f240447883191178b6783f69b77f2583f3dc531501f3c98dc0e2b971533edbed8d8450c17b414c4e9d4ea07ce430e87adccd02dff620208dc8ae9e45875 SHA512 c01156f97efce09e8808686cb14f5805d6265f47a35b2a7c4383a0803ba573bc9f50102e4c53dee99139a85a44f37effe38dab19080fbde1963d2a8142060125
+EBUILD gst-plugins-faac-1.14.3.ebuild 357 BLAKE2B a48e9855fdff53fb60c8c320c43b5774e0df14572c2f15039ad14eb0c7feb428869c31cf6951f4ca56f3abecc724f19f8602fcb774d1d44b5183a848ae2bfdf3 SHA512 9b29bc3bb60092593af0e134f0b6ced7a4e4681bb01f6f6cb1b735f88b930f18160a0f4b0cbba0df9e7e7a1574534b9e567a33fa79720284f1e555fb8541bec6
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild
index 05649df8b58a..12e8750d869a 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 3bbb6e932ed4..3f961acf5333 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -6,5 +6,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-faad-0.10.23-r2.ebuild 491 BLAKE2B aa9f09d4174849650d316c19018779d87f078830d9ee5a94f0ef3c8031debf135cf90c06d46b8d4d97ef77d910d80e3496d4e70358d90414326020eb59198335 SHA512 921f66afbb23c737d62338c425952835bd7fad9572d2638a06baddc54596323e7a059b1330001f42a875b5263baa1e9bc591818120b00fec49e216e915664bb0
 EBUILD gst-plugins-faad-1.14.1.ebuild 386 BLAKE2B eb4db36f240a779be689135a791908b19ebd28294d35824f2ad737757dd109b4f83e6dd78a03e135fd28aa83cdd5e48a7eb0369fb67dc0ab1eabb5ecdff945e7 SHA512 b12473fa46d73ab4fb45af638373d1437e0211fed20bbb9eaca620cf98a8af37af053cb8728255958d5f78bd894ea9b863fa98353be8ebb6ab7db62315384745
 EBUILD gst-plugins-faad-1.14.2.ebuild 392 BLAKE2B 5bfedb200b04515ec75352b5f2a22b2b203dedb67bc1368387e6ea14472e2db66f0d26eeadb4282333b0ec1261fe25c16ee5a0c3eff2ca9b9881b9ae82fbf40d SHA512 23f88670b6dc1ea4b2ae5df7169cac1ceab1e184857ae3e7ab9f0515463189140c471d87fbb843e70f4170385c91c20f1471e5ce08223e1333d54e3bd2a00d81
-EBUILD gst-plugins-faad-1.14.3.ebuild 392 BLAKE2B 5bfedb200b04515ec75352b5f2a22b2b203dedb67bc1368387e6ea14472e2db66f0d26eeadb4282333b0ec1261fe25c16ee5a0c3eff2ca9b9881b9ae82fbf40d SHA512 23f88670b6dc1ea4b2ae5df7169cac1ceab1e184857ae3e7ab9f0515463189140c471d87fbb843e70f4170385c91c20f1471e5ce08223e1333d54e3bd2a00d81
+EBUILD gst-plugins-faad-1.14.3.ebuild 385 BLAKE2B d3b1f6baeae11c17c589b408956ccfcdcb5b2ebfeecbb6b309d6f45c602d9fe1c9de1c99f605043ee0fece705f734c7248671948aae5e809f58072409d89ceec SHA512 6f6cc0e87153dcd0cf3764f2224e367aa29e66a468f4437b642e89429591496df480226046f39c980ec62e4aad1b35f7bcc834c44c238dda57a4431f8aa031b0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild
index f42988774550..791de27d9cac 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC audio decoder plugin."
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index 3792fa8f7700..14d73d4ffb50 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-flac-0.10.31-r1.ebuild 402 BLAKE2B 7dbf745b4d3d9d276df3ca7ea6
 EBUILD gst-plugins-flac-1.14.1.ebuild 414 BLAKE2B 91cc0e95de205d25054b4fee1bc3f889bf4c2e296aa12695dc3393343bf379d546a9e855e6dd6af768983eeceab882ead34b55ba928a0d36d3e0df328ce9775c SHA512 b5b736df81993668aa8aebdc9ec61a066d4b398639de376943fa152df264bc8d1e4ec6fa6a67cc3f21592a51af0945d3a5aa49191fc5e2c3abaa00e1d67d3e9c
 EBUILD gst-plugins-flac-1.14.2.ebuild 421 BLAKE2B ebadfce00b7663e6af57c29b865748efbe00b45f52edae361ec00ba16f74fbb5d402eb5f5c0562133ac843c0d4be6f61ef7f858c2386b2bde3f2f9585496f427 SHA512 02d76b122b2e8c5c7e28e721a2b83ccd9500e20f8df5cf0645c7b78bb12d9c8aa1bf945c660ea5ce40f071f5760331cb3e027c70347fde59381ed604ee1d5fce
 EBUILD gst-plugins-flac-1.14.3.ebuild 421 BLAKE2B ebadfce00b7663e6af57c29b865748efbe00b45f52edae361ec00ba16f74fbb5d402eb5f5c0562133ac843c0d4be6f61ef7f858c2386b2bde3f2f9585496f427 SHA512 02d76b122b2e8c5c7e28e721a2b83ccd9500e20f8df5cf0645c7b78bb12d9c8aa1bf945c660ea5ce40f071f5760331cb3e027c70347fde59381ed604ee1d5fce
-EBUILD gst-plugins-flac-1.14.4.ebuild 418 BLAKE2B ecf5f86a671eaa69e41deaf6c46b8fdfc2c81771f9f9f14e1738c4c8fd9707dae17b88ba693575ec7d42892cd15e4779041fff3e1d3e2134e11edaae365f8236 SHA512 8aadfc49fc9a2e471620391b24223ac8fb15844c6bb979a1995e25a97dd7ea129f8c3e457d6ba6217fcb6058b31087ce1ecafce7ce9033ad86afca19e663ff4d
+EBUILD gst-plugins-flac-1.14.4.ebuild 414 BLAKE2B e10499e2550b0187f205c238735ddc011d846f3ea54995250a4e3eff566917bc553e6cc2461395ac6104c23e9d7399755b3895dbb3344bae42d1f240edda58d1 SHA512 499f667448a17a6f39da4a1549eb11c496fc11ae2ca884068d3bd2c92a567ce87acf3a21d98c37b1359694f1af84da7f9bb5557e207e9e95e205b1654748d465
 MISC metadata.xml 555 BLAKE2B 0a6c97712429505d543caaa732d716a95e4f6f5256aeb202da38bd2399ceb335e1fc6079279c96848d479d3fa3e2b8bb1c92b37ba284204b1936078d0175caf3 SHA512 2ffe5f5f8ef59e30a7da2efe1b5e88858c5f27776b7f48a7748f9cd72a18d5c97ddb239609c7bab808de874f0a51bf886ec24e395641fac995c8d3f041271e7d
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
index 2907e2ecd184..c703d4448fda 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 93c90500ee2a..30eb1cb700de 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-gdkpixbuf-0.10.31-r1.ebuild 476 BLAKE2B 3ce84c6bd9e0ae6d0bd7d
 EBUILD gst-plugins-gdkpixbuf-1.14.1.ebuild 481 BLAKE2B 2f2530f7d09003a651af7f49c126177a2f3f62b3d8501ffde53b038f8ae3bbb2b4fbbfa037b5227f591fc71a10cc842a31dc0ac6de5ad4c39b6825e58e674846 SHA512 e4c61e725b032215fa32213f6c13698c40477921d039fbb89253f4250ed3d436aa509534b7836f39e7258c13a12e16d94cf052f9494d1b6b94c66dbd7f8c6d6d
 EBUILD gst-plugins-gdkpixbuf-1.14.2.ebuild 488 BLAKE2B ba4f2f6dce3800b22ed92e5e85a765cddfe10f0b438f79a34cb56da948958525d7dccf70d6b5183b557b53ee8952bf6b7f33c1baf76a33c7157dd03188ecf92d SHA512 ff437e7b969fd523e3b3c3fe8f52f3ffdb582cbcb6aa61d51091ed8c270b446dfeba68125581da60f5d81c9a482e04117992c02ccef9cc02ec8754d97531054c
 EBUILD gst-plugins-gdkpixbuf-1.14.3.ebuild 488 BLAKE2B ba4f2f6dce3800b22ed92e5e85a765cddfe10f0b438f79a34cb56da948958525d7dccf70d6b5183b557b53ee8952bf6b7f33c1baf76a33c7157dd03188ecf92d SHA512 ff437e7b969fd523e3b3c3fe8f52f3ffdb582cbcb6aa61d51091ed8c270b446dfeba68125581da60f5d81c9a482e04117992c02ccef9cc02ec8754d97531054c
-EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 485 BLAKE2B 219a12fa5b8229e5d070a528f739e86699557d00d2eede63f7690cee6508a4d320ec3c9a01e32a4dab480e2825c4cb8a31c745f2971a8f80c1f806cf406b2e35 SHA512 6eae398b1b67156b5e425a91de7ed1c5b94371689e87df5e15a78151328d0701cffb01ef694191d7f2f10e319b90251b3618de29473fb9ad1dce34e51a51e45d
+EBUILD gst-plugins-gdkpixbuf-1.14.4.ebuild 481 BLAKE2B 75cac80b44124c2b0376435a78c5257419e8ed84aa2ce294ab814131304321146a73b5f860e44a15fd2e1739cd1515298baf1df65d57b86530dc4772b120477c SHA512 a63a63f797b307f27dd35f651eda536d8f59717cd74c04add835dc3abdfdf38cdd7741f0b28e5a3388ddb3ac041df86ec071d3a073e32d953a0fd765cfebc955
 MISC metadata.xml 610 BLAKE2B e0597a0e835fd058d1d172bef6cb6616efbd83b3f97e9b9d644afa6a68956dc97b37385ba7b5996468911f9da16e54b2dec18d9657ad8b1b6a4dcd71cb229f7e SHA512 472dddb540087c89be5a85ab67733d345bf039a95fc1a7bd2ec6ce3b08b8556b2676af77b93ee903bc8ace178963935b21dfcfc6c1c0a6ecab5a7429d60e5cbd
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
index e7740d4c4355..e2004d803843 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index f6a39cfafa75..942502f0b264 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed
 EBUILD gst-plugins-gtk-1.14.1.ebuild 1202 BLAKE2B 63e3b1bf3a73c76370e5ea6928374bc78ff118d07fa09a00240754df2051f598887d936a15c5b16f1bde256d42db93badc1e8450aa7e929032a0f5725e46a96e SHA512 593a50c5d12ab7f789a89af7f6540927aebc8e4bb2eecf25d81b699ac21abb8197d6ab7f2ec2191cee22b26fe71127132525b7626d78252ebed4f042f6b23d90
 EBUILD gst-plugins-gtk-1.14.2.ebuild 1209 BLAKE2B afeaa42b77a0240d8f864c42c0b777d238328c2ddee0e99b117113fefa4fd889638d81a28a637f70ca492ded2b5afff4aa0cd1929d617f458df11847e9fe37c8 SHA512 fd99894768d7a90489dd9a227b9298aa1c4f6e933a23fafdbce2b693e63a48f31d6c7677a11f684ca80fdb05841043fe10e63faa5bce1c013c725da71b2f62de
 EBUILD gst-plugins-gtk-1.14.3.ebuild 1209 BLAKE2B afeaa42b77a0240d8f864c42c0b777d238328c2ddee0e99b117113fefa4fd889638d81a28a637f70ca492ded2b5afff4aa0cd1929d617f458df11847e9fe37c8 SHA512 fd99894768d7a90489dd9a227b9298aa1c4f6e933a23fafdbce2b693e63a48f31d6c7677a11f684ca80fdb05841043fe10e63faa5bce1c013c725da71b2f62de
-EBUILD gst-plugins-gtk-1.14.4.ebuild 1206 BLAKE2B d1e34540bf91b5815361a531b89bd5836899a92adc17dd08af6e4ed768f89cc4ce1722150b654fc173fa26a7934d92833144039b2c5abead2ae76905994fe6e6 SHA512 53bda0b86c69da20d064c8bb83facc1d3f9746f753ea908b79bbef3f7259a3201e2c71d15be32064a1943c070bf0ef0b28a6d3c689f21e3716e5b8495e14a058
+EBUILD gst-plugins-gtk-1.14.4.ebuild 1202 BLAKE2B a785d2f0fb5f321d7766e7c4e9fd6d6b9700b5bb88324dd3f099d3b70aaf68a7155a5325fd8f7962394212c44303a5e316c9ee84d9e350dd5e1c89f37a8dc620 SHA512 cd0675a09ca53b2f7abdef1f57277a9f22cf8bbba14af968b4db1ffba1f764bc2e1308d0a9f893bdf7b6b5d6738b0a3929b399c92abac1cb4fcaf6869e4a3350
 MISC metadata.xml 790 BLAKE2B 609210afdad563f5d63ea609ac6a65301907d447a137537aa9451ce6bf5774f9a15a8294a4e11b72697e123a4ffac44cefa5f6cf820a78bd998cd581e7ec720b SHA512 8ca80354a5c57ccbc941bc62cd7fc1b3bfbd2223901c24afac0ade01ab751e790cf9bafc4e0d4a3074606be99ac7aae10a45a9f7c65068342495f2995c956fa5
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
index 44daa32a0fb5..29708a407af6 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 397b5fbd134d..fd7cd4e370c2 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-hls-1.14.1.ebuild 1123 BLAKE2B 14b3b35f1c6891c9b63bef9a8548607b2dabb2ee58ef6d216988bcbe949517a37897f8845a579d422aa6f9369d194fdf9083eec31ecc7bb2f07a1bf3f5b98375 SHA512 a37450a6f225c123b54753e542d17f3ab0fdbeb9c81b10f1b0f9ffaee1265cbf3292e40456fa055058227b2022656ef0b846d55f672acff432dfe9e0daf6e81c
 EBUILD gst-plugins-hls-1.14.2.ebuild 1125 BLAKE2B 68a392500de7ad8071a9f82cf2c77305dcaa06dc568cd3f2d5887c87f17b03a8241929b0c28b0aa8cb1b75baf0b7eaa817ef3d8728e2430485009ccbf74e5d6a SHA512 0233504d7bdc5b36b1577b137ce2ca5fcf94c661d117d73e7fa33a0ca82f71457448f878a98252ff1eb15f60558a7cc1d5334ec65d936da9e3819315b2a84ef0
-EBUILD gst-plugins-hls-1.14.3.ebuild 1125 BLAKE2B 68a392500de7ad8071a9f82cf2c77305dcaa06dc568cd3f2d5887c87f17b03a8241929b0c28b0aa8cb1b75baf0b7eaa817ef3d8728e2430485009ccbf74e5d6a SHA512 0233504d7bdc5b36b1577b137ce2ca5fcf94c661d117d73e7fa33a0ca82f71457448f878a98252ff1eb15f60558a7cc1d5334ec65d936da9e3819315b2a84ef0
+EBUILD gst-plugins-hls-1.14.3.ebuild 1120 BLAKE2B 2441b6b9f7e2b8d9aa2c08eea70d1a6fcdc2217ffad71027662ab1303e9b441f243da35844935785d09142e43c67778cc8347e62ea49ad12d455d4b38073f74d SHA512 c2bb1322a221b6e78f03dc7597f321db63a05fbcbee864f1c0f5bc5f3ff26dc1efc046210af1b710eff1b4a89f46633055156f3bd79703e830d084a35e30f8e5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild
index 058ae72347cb..7c480bdbe1e7 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP live streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index a62308606e28..3d3fe7b09997 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-jack-0.10.31-r1.ebuild 422 BLAKE2B 7a4fcaf73634137d42bc94a808
 EBUILD gst-plugins-jack-1.14.1.ebuild 381 BLAKE2B 024a1bcf30ad5505909092d2ff06cef4c19b70b32bb7c6a3ccf8c420f1fc291ce2375fc3153ce49553394e8279091020bbf3b0b0994d5887e44452f840321b2d SHA512 95a04726aa6568f05e48d104fcbe0a708be9667b8552d4b7cd1d60b456a3249e7a6eed429849b618924a40acb89c5f31ee9cfd6bff9a8df33a50cc3bf4e32e66
 EBUILD gst-plugins-jack-1.14.2.ebuild 388 BLAKE2B 03424ac05558f94342d9c6c6dcf4bbddec357d53bc2310a220e4b6c136d845aa64dda8408490d2b215fea557bb4a8e22f1e7c252da8b5c76d1bba6f1e8d9b594 SHA512 7ea915c6c62f3276414aaa9482eddc5dbc1cf78d99fc76c2e02ae0bbf773bc39b279efc7905b49932bdc09b36a3566411cd65e72072726fafd9a8e703d77def5
 EBUILD gst-plugins-jack-1.14.3.ebuild 388 BLAKE2B 03424ac05558f94342d9c6c6dcf4bbddec357d53bc2310a220e4b6c136d845aa64dda8408490d2b215fea557bb4a8e22f1e7c252da8b5c76d1bba6f1e8d9b594 SHA512 7ea915c6c62f3276414aaa9482eddc5dbc1cf78d99fc76c2e02ae0bbf773bc39b279efc7905b49932bdc09b36a3566411cd65e72072726fafd9a8e703d77def5
-EBUILD gst-plugins-jack-1.14.4.ebuild 385 BLAKE2B 9d1d65dbe3b53a1dc66ab474832ba278674db911316568041806f857f4da0f34f20d751661bccfb75003adc207da33d965838d8fc9924fed5b470d2fc6a78bde SHA512 1ea7ffc0d484f72420e934ce5a78511d302382dcb55cc7b53bcef88ea9ca9fda8ffc70fbb969646246398dfa18a199177007e33b5e5ecd1c474c0d2be0e8b646
+EBUILD gst-plugins-jack-1.14.4.ebuild 381 BLAKE2B b132c1086e474de74b32ed287b1b4299694422853cb82906849eef23b143bd5d419c8621dd5f6c707dbafbc86b717b2bc8a58fa0dac2abb5bd0babf88f56c38f SHA512 240276665f2b0cb769954ee1999e604d54cbab275a2bc26d025a4b5a44b96f768c1107350917f507b740fd4286038fba90ec6ddedd42226041471dca3bee6b05
 MISC metadata.xml 487 BLAKE2B 182c55b79c188f12dcc000cecf9c507933183ab62a78c806b6f43918af528c1c7bf3adf435ad077f689a2b64706b7517b14393500dc4d1b7f2cc14b45dd6b764 SHA512 811374b3dabbff1084c5b1b6fb502197f58da02da195b922ce7556ca6e0f3668f266a14ba1a03ff352edb89a0cff9550e7d59f3f4e116ff63a22c6e8436ef6b8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
index c9604c40cdeb..07a8274084d5 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="virtual/jack[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index 9fbbcec5c590..481623862d22 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-jpeg-0.10.31-r1.ebuild 426 BLAKE2B b6689d5335b662aeed278f862e
 EBUILD gst-plugins-jpeg-1.14.1.ebuild 376 BLAKE2B 2fd674337aaa61ae88a20d48f3d260b059695b92f0178e011767a3a4ad2c2dd366c338f0a02998d0d4f4424810bb8a9244a1238a3561c221803c6fb0c9db0f9c SHA512 3d98f64e2443bc786c3626894685c193eba597768446032b1e30aa41ea09b0c830f233c5aca27b3941a71d5e9d7095ec960777e46ccd06920c6852212295a26d
 EBUILD gst-plugins-jpeg-1.14.2.ebuild 383 BLAKE2B 8f53b6b07d8f23a53a438d08fd3052fa7ea268aeba8a599ca1019464a9a8bc174930311a620f106b37ecf4eb8c8a93bc2c0dd483f6a5a74ee905bde04cbce1a3 SHA512 2ad02b6fa2326165d5d180f444401781514873a4033f2371436f1e26705975c635f3d922c8381940072f5b21cfbdf0767b4f410cfc853553da54283bc15f6450
 EBUILD gst-plugins-jpeg-1.14.3.ebuild 383 BLAKE2B 8f53b6b07d8f23a53a438d08fd3052fa7ea268aeba8a599ca1019464a9a8bc174930311a620f106b37ecf4eb8c8a93bc2c0dd483f6a5a74ee905bde04cbce1a3 SHA512 2ad02b6fa2326165d5d180f444401781514873a4033f2371436f1e26705975c635f3d922c8381940072f5b21cfbdf0767b4f410cfc853553da54283bc15f6450
-EBUILD gst-plugins-jpeg-1.14.4.ebuild 380 BLAKE2B 3af436bd65f995311a35fa8bba8923a2b88eece248eda30bd6164944a860a99b4ce96823780faee47bc4315cd4047ac639aeeeace77fba351b8997ab6c74127d SHA512 3daf523bc058ec7195ac52c69b698cc2c5d7f9a8efea0254a7021e4943615cf04310aacdea0ebc2d7f7ef9ab8344c871302287b426514fcc9d4b89139668c7af
+EBUILD gst-plugins-jpeg-1.14.4.ebuild 376 BLAKE2B 8f081fed0bbc6e0ba462989b0f91e7b7a081f85ab0ad457ba953ee6ac6ccd409be292535c8eebb14ff5da0a12a02a6ab07b57d67725e7ee7a51d221cb232a3cd SHA512 69487f5cfdf45e6b5731f4269ecbdc9711b33aeea26827694cae08b78f00e76a79f854eef0f7abbc73f2771cd3709eb2114858c8c1d8e28a0d530322b2a61e9c
 MISC metadata.xml 659 BLAKE2B 8da81502aaf3eecb4ef62469b494598b329cb7e134511df9bd4269807882564e052ec76ddb50640203d96c08fa80deb3cb96d2b2c3c8dfae21fe296b87351ff5 SHA512 c4d076bdd3a4cf70540a9cc56c91a8e805f0a809065b629970158ca002f3cc03f3b7b91615121813030f510eb2e9a912aa4ca79504a20e023cc36f1fa3acf329
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
index 7ec0777d83df..2256dc56f663 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ladspa/Manifest b/media-plugins/gst-plugins-ladspa/Manifest
index 9cda30c37f41..5332d54cf322 100644
--- a/media-plugins/gst-plugins-ladspa/Manifest
+++ b/media-plugins/gst-plugins-ladspa/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-ladspa-0.10.23-r1.ebuild 524 BLAKE2B 1dba58d3c37d3a4224c29103380dce11839117d29019a79822d863eaa5ff2c711d703be170ecad8eebe172858d6c048a2d81b795b8262ab44ff2b2518f85e13a SHA512 ce82f70d4c060716dc9fac2ed8c8f32c351f15b99604ffc3fc559ae2017a26dd2d3eab469e0894cba18ab27dc5ffbe01c218db38ca5e5c304deafcc979a735c1
 EBUILD gst-plugins-ladspa-1.14.1.ebuild 322 BLAKE2B b1d83cd000f0292c1471bbe3fce2c7374d332fc7af60ace63b44b3e3ab3ec2657e7461b56446a0fff6bf4cca14225392401a0c05e2359f377f9203a781047c74 SHA512 182abdd104977a6a1df67508012984ace6f1e2d6e6366ea259c8f7183eb8a2ba4efb6ce629df021f779ff4e148d7c1aed963d25926cc10641f52e9e62ce20b83
 EBUILD gst-plugins-ladspa-1.14.2.ebuild 324 BLAKE2B 9bd2c2daf0281660da8495c80cae58061bc49d894f9eebab07cba247e8b7cf6b5e3f6e5918c9fcadbf6c129afbc2f500fe76bc9f75d2442101ac7d327d7eda1c SHA512 b74e837660c17d607527d5f17f1686c532e864e89b17bbe08f6d0b777a103e5e8ebde431a14d0d87b6d626b45663c8ce417aa94be7f7b94172e1234c49216936
-EBUILD gst-plugins-ladspa-1.14.3.ebuild 324 BLAKE2B 9bd2c2daf0281660da8495c80cae58061bc49d894f9eebab07cba247e8b7cf6b5e3f6e5918c9fcadbf6c129afbc2f500fe76bc9f75d2442101ac7d327d7eda1c SHA512 b74e837660c17d607527d5f17f1686c532e864e89b17bbe08f6d0b777a103e5e8ebde431a14d0d87b6d626b45663c8ce417aa94be7f7b94172e1234c49216936
+EBUILD gst-plugins-ladspa-1.14.3.ebuild 319 BLAKE2B d8015bae153cabbb1fb5cb8d13f67143eed82669910a0305f5a020005d5025cd1431be16a2bd21bad3c15e5667d7f16918c75f96cf7aa92cd22491968453579a SHA512 e225f08586703a6f693149503c2b36340d7cbc6c195edb0c900e718406f5adb460f33bcf0a597b7836c4bb3ca74ff76b1b0868c8df9ae9cce69d7dad0fce6643
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild
index 6fef906093fc..ce3aac318f0b 100644
--- a/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-ladspa/gst-plugins-ladspa-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Ladspa elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index e06a34ce154c..204f26df2600 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-lame-0.10.19-r1.ebuild 338 BLAKE2B d38330bec07d66569e856ee0f5
 EBUILD gst-plugins-lame-1.14.1.ebuild 398 BLAKE2B e0cf2ef0bf9848fe2de288374c2d72e380f96e76bcedbd3654a95dba671f384444b611f50af93fc779c8d1c530292c06353dd4c7804e0738bdd2b68090eab4e0 SHA512 d5ffb8e63d9fb9107d264f75c1a8f686102c64ebd136f8ffb84c91afb34f17771df3d61bfd878239f3bbaecad378a57a5610b6127f8331251c87015e54b06602
 EBUILD gst-plugins-lame-1.14.2.ebuild 403 BLAKE2B 33cafc621c78e3c7282c0148a50bec2253f65e1367f5e57ac511c20f8a10c8f2fe5aabfbf7e13eac64c3f19a3778024a89108084f378c0a53b3900299cfd8345 SHA512 6aef0c39f5f26cc8600c52e8c3264c06d65712f51e484da94587bc7fe836350aa9e16f67076d7b28a4add105de5671878df13e185113d409fb20c7629e585cb5
 EBUILD gst-plugins-lame-1.14.3.ebuild 403 BLAKE2B 33cafc621c78e3c7282c0148a50bec2253f65e1367f5e57ac511c20f8a10c8f2fe5aabfbf7e13eac64c3f19a3778024a89108084f378c0a53b3900299cfd8345 SHA512 6aef0c39f5f26cc8600c52e8c3264c06d65712f51e484da94587bc7fe836350aa9e16f67076d7b28a4add105de5671878df13e185113d409fb20c7629e585cb5
-EBUILD gst-plugins-lame-1.14.4.ebuild 400 BLAKE2B 4d6c2cd32bc1a2f9e876d27f9bcd57ba7a8e381a6d5e92fc13a0e64e36b2aab29556e0e02aaee662d1a790fbe777558808b1ef4aaf20860373d2fa0be1b74869 SHA512 c2c9ec23aaf3199ae8e3cfae81a7b7fc6077be5d9a84b96864b672e164e2bc40054755f725fe89571f6b8a2e3499b24af293fd472540872320589dce5940ee0c
+EBUILD gst-plugins-lame-1.14.4.ebuild 396 BLAKE2B 9b5ff89a6813f09cdda44b070292f83ffc05668143a0f01d60b4984f37e991371148327b9560c1e787fe5fa06c73bf0b34b9ebdb363ddee1b4e10fb1b5f1b1e1 SHA512 ec581dd8156f03e33f43291d1be209303c1cbce1236e0b61763bbefaaf2aed75ff52cb7f9e69640c13e9ba71ad6327aab0393fd1ba5c2c4ed64827fd21de0359
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
index 2aa75463d136..3b96cda9fc8e 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index c55186e9f8ed..f047d0e2b919 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -7,6 +7,6 @@ DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 EBUILD gst-plugins-libav-1.14.1.ebuild 2086 BLAKE2B e581232c7a38f2db8ce91291bfada3be80e16be6767da9a506e0eb2285f5106acc2580f37a4fd1f66b2546fe3c2e8c73040720a9c813157e4e8db42f71f43482 SHA512 5d423238b219f017c90368d1056f5087cd15e69c9ed171e2d9f6997c9dda63312095bf64a6022cbbcca81a42bca7f2632bd814257e9890910396c1db28f174b4
 EBUILD gst-plugins-libav-1.14.2.ebuild 2099 BLAKE2B 12f6d0fa0015bb9ceed744e3459c0163eda929c4524d4eedff7591548a520798ba868be4d7e442c3fdc6e97bfd62b65fdca7f689ad6e8442b3cebf6bf71c4e06 SHA512 e320e60696af789fcf9360fa8b1ff044bb61b9360336c9d2e284bc4895bd60c893a6e3f99e7408674d1d52b51fe88c7ef4757d5cb5c60b4c0d152044040aedf9
-EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2447 BLAKE2B 8d25fbb13d05960c3163dea4803756bc1940f14425dafe82f8afdac9e69a8ba8a547b234d4e25aa78bc49aa51a336ca142c309341ab2cc40c44f0be614afc139 SHA512 8e21feac86d4feb30e8d53c8c3d4a16b57a1b10605bb082ac5dcb655638f5591924f5e24817d696d0f07462607f178d99d1edee7a25dc106fdb965fdf5cf6d66
+EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2443 BLAKE2B 8e4970ddcf977b6369db24f563e2f1b2a704c4c08bd24ac65465da6d3f2e37378278800b3f5a41a7b48a386383c8b78a51a1ebb1b9adbc751a18d53551bbca1a SHA512 5673e069de963eede6bfe31093cdf08a2250e8039988bf7d518159fdb7cdfcc03fc47bc2d2d329e4d6d4c1ec9230faf21ed3cc0b37560095cb457425c2a829a1
 EBUILD gst-plugins-libav-1.14.4.4.1_p20181115.ebuild 2951 BLAKE2B c103597c9ead48bf9335486f109da27cc0401ed8471dfebf06d47815568948393404a5ef4948d00183120c26b03e285fc04d02b37350237f618349a3d78c8ad7 SHA512 a1c3e103488a67e5293aa3a06198f28bea6fd0b2ee84b3f55914210fe7b94eb9544fd930b9f8c67e42c03f86f9e916ed36e01cf2dc5ac4a272d9e3635ebea008
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild
index dacb390c0618..5ac8aa295d76 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libde265/Manifest b/media-plugins/gst-plugins-libde265/Manifest
index 12dc05dd3e7f..dd5195587fae 100644
--- a/media-plugins/gst-plugins-libde265/Manifest
+++ b/media-plugins/gst-plugins-libde265/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-libde265-1.14.1.ebuild 324 BLAKE2B ec5f2d57638c1b8a1daae1fdb0a95ddce898e5c1e9e9e7c08f3c1b26625121fb26104e37625c17427c254fdcea2b6cb9a0613a400eb9c993f5ae165c48378605 SHA512 a13c1c05b4d5b30d7152ef8ef931147c1e411dc662e94266bf9103ab4e62adf40d3788fa34445c9bcdcd5c55e0f9dd5bdc186873c4e33bcba695dac8867544bf
 EBUILD gst-plugins-libde265-1.14.2.ebuild 326 BLAKE2B 487f749f0a91aa22812c84432b9925f78bc76a58fa6344291b01e8d11cc0d320796f24146bf62d95e48ca926665c298c8b4ffa9f2e024db312c37ff297ee3e7d SHA512 04bb8cc7dccdf18364f6060aede2a4ef0e11c89e05a4fea4767ea27b385667c0e6482903cbec55d3151b5b664392ccb9c4cb4f2e77bb2dbad67dcceff9a81b25
-EBUILD gst-plugins-libde265-1.14.3.ebuild 326 BLAKE2B 487f749f0a91aa22812c84432b9925f78bc76a58fa6344291b01e8d11cc0d320796f24146bf62d95e48ca926665c298c8b4ffa9f2e024db312c37ff297ee3e7d SHA512 04bb8cc7dccdf18364f6060aede2a4ef0e11c89e05a4fea4767ea27b385667c0e6482903cbec55d3151b5b664392ccb9c4cb4f2e77bb2dbad67dcceff9a81b25
+EBUILD gst-plugins-libde265-1.14.3.ebuild 321 BLAKE2B 7ec911e89386954858c840e4f23d8eb50e1082a43c063b99e26b88621252433caa294498588d2d22f2dc37d9a707de3610ada82ab22992702582c20d4cf78d8b SHA512 7303f743823d9fdd4cda1391f7f119080e508bb2fd9165d7a3affd1d519fd4f70db5ef3e33bbe70a45487b35b0b022a12ca20f54132dd64aef55535753e46e81
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild
index 165812de5a99..4798ab1f8ae3 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/Manifest b/media-plugins/gst-plugins-libmms/Manifest
index 304b1d46825a..080b0ee4a87b 100644
--- a/media-plugins/gst-plugins-libmms/Manifest
+++ b/media-plugins/gst-plugins-libmms/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-libmms-0.10.23-r1.ebuild 327 BLAKE2B ab473b2e83c130d09803f4f420abeff558bec080dddf0a9de6e262ffe4bea9dd3dd56147d84b12318910045c4a6e66ffd026a7d4aab28090265ec93c56443844 SHA512 634932db7bd44c120212219a943533789973660699f488110c2d52722ac4d63e295723b7c1a7b701544e5d04f3a28253cc18c3841ad757235ab98293bb5800d4
 EBUILD gst-plugins-libmms-1.14.1.ebuild 411 BLAKE2B 505db181336c8ad1c1c7f44400f36e78ac70127879676e929d2cf643445cd53dfb616f47af508c923188a8c82b7eb076789779616ee16a5aa9615c7d831621fa SHA512 37c7128295838e8681e7b034c897087a1862468e9de459d8d3efc7ddc3ea9d90a7c1c6a30ed8f5e302539e98881e388cdc0edffafc34ab09d390d438ef69aa68
 EBUILD gst-plugins-libmms-1.14.2.ebuild 416 BLAKE2B 101535d7b6f16daa823f79c5794544e57afc9779d4696d725b4f13e0e5fdeae4a0c7fff7069aedd6fac70b6000315c3019a79f0d3f6fa4375d7666e13d31eeb0 SHA512 22b1ffa4ebd9f51e8a51ec4ee325e853d1c851f4ebcda5c0aa3b1ea0598499c472abfd0509f379c64cb40dc9fe9e1fff3a531449e50ea3b5c4c75dd44f8cd798
-EBUILD gst-plugins-libmms-1.14.3.ebuild 416 BLAKE2B 101535d7b6f16daa823f79c5794544e57afc9779d4696d725b4f13e0e5fdeae4a0c7fff7069aedd6fac70b6000315c3019a79f0d3f6fa4375d7666e13d31eeb0 SHA512 22b1ffa4ebd9f51e8a51ec4ee325e853d1c851f4ebcda5c0aa3b1ea0598499c472abfd0509f379c64cb40dc9fe9e1fff3a531449e50ea3b5c4c75dd44f8cd798
+EBUILD gst-plugins-libmms-1.14.3.ebuild 409 BLAKE2B 196748a3b01c6e72c5a50ce102ca6caf70fb5b691f1893415c571c6dbbcc0539b3eec0a738cabc0dba2cb5c054aaf47ec074348640e210deec3783c7b652421c SHA512 28c943cac4c09378dfd96a73e4f8215cda7583b9a71f04eafbbdf480f9f0f1e0462b7184aa4ebf9abb81b6f67a66634b6455934f19f6ffca1c3b26895125ea77
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild
index f975f9f1a172..7bd1adf38c60 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Microsoft Multi Media Server source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index b5c437ab07ec..c8378b2db30f 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-libpng-0.10.31-r1.ebuild 361 BLAKE2B f52a7448f035e37a03d64a68
 EBUILD gst-plugins-libpng-1.14.1.ebuild 366 BLAKE2B 0f3df80a0a6997889b5da7101deb4dc157360cb2bf342a432199a51bbc136a1b10100ec171c8713246d1b82ff627489902b0463c9d4ce5754f5f0eae148bbc35 SHA512 fe75cbf84a0ac798942749263e4d63ee9cf50365f0a3b3ce2809ed6c0b3f195f3bc0c1aec69b80c777480e4c0413053a3e1a7ab7d91d992fc445623b1394c16b
 EBUILD gst-plugins-libpng-1.14.2.ebuild 371 BLAKE2B 2fb0fb7eb3a2d1fd4c4c09b024e0869b05e9723b7c3b1396a1aa14643cf376bb2959c4e58287ebc168c632e66e3aa4afeafeb2ee8e19f365d5c02bce01456506 SHA512 c2e742dea7c1392a8096f86eedc15c27e7565d828a98062f171befb0a2c68b7b80aaaf0d3c134f810aebc61b8d01925d27073c9e3a2896c2a0ae7f611c2c0e2e
 EBUILD gst-plugins-libpng-1.14.3.ebuild 371 BLAKE2B 2fb0fb7eb3a2d1fd4c4c09b024e0869b05e9723b7c3b1396a1aa14643cf376bb2959c4e58287ebc168c632e66e3aa4afeafeb2ee8e19f365d5c02bce01456506 SHA512 c2e742dea7c1392a8096f86eedc15c27e7565d828a98062f171befb0a2c68b7b80aaaf0d3c134f810aebc61b8d01925d27073c9e3a2896c2a0ae7f611c2c0e2e
-EBUILD gst-plugins-libpng-1.14.4.ebuild 368 BLAKE2B 79640720fe67fd075ec2e8c11c51accee4b775088804204244c9481c7a1a03ba18638c459d01b3ffaaf0c2510e79ff5d39e7a7461a6ecccb57c9c0f208aaeaf9 SHA512 8c6a858de2deef53482a8a6feb7d54404d1561ba18016b724565b143ea2ffea83d75a07b1b43df5f6b7c82a6bd01700228c9747414abc3ec28225d434c3031ca
+EBUILD gst-plugins-libpng-1.14.4.ebuild 364 BLAKE2B 8d26353d11363aa1c91ec65f486712fd623253110d91172dfac9f0a2debc00f2deec52625932c6897419264e66bbad430002b5a14ed12a12a27cd8ebd81d61bb SHA512 c10b26170912606462c1786d6a9537a503d318826beb0bd3a7312d7a5d85e2618cae6de2bb10b58be1bf6e68aa4feb151ea4c1f4edc4889c776443f01e66d8bb
 MISC metadata.xml 483 BLAKE2B 3c07bc4538ab8a6e0f2ca484f7b67a41d60f672714f17a1555eb2ebbcbbf14fe8e16f21360007789400352d3c1540c1644fd1402a12b639306a3068e5c9be822 SHA512 6d536bf8813f1f4d6b402487852ef1372172cb42c01d0a57af6b70166896deea5db36bed91f78ea18c1cdb8f809e5b5514f2b91a7668efeea170bee422d8a3a7
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
index 6c1be1230d31..07c2ab6a79ac 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 27b78bb4a486..56029d9254d2 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-libvisual-0.10.36-r1.ebuild 517 BLAKE2B 613be0fe785b8e48de8cf
 EBUILD gst-plugins-libvisual-1.14.1.ebuild 630 BLAKE2B 4084a324e5630ba3f4d52fb7eec752ce7148fcfa958db0e58cb331ec987c32b9d3d762d7b996de5514a96714375365c7e2dd4dd165ad94892bc38d27f6f3850b SHA512 4566123585417a4ac83b9bb4373c19eea2186377aa9bd669ca8069477d624310bfdc78d0c3831719036f7db2da362305dc0237443071fe86512b5b30f3424325
 EBUILD gst-plugins-libvisual-1.14.2.ebuild 634 BLAKE2B 5c7082ae57c90647b69a0a84afb8719e76849f0055ce92c48e3cb200fd9a5c6360273652fdfee216f434d275d9643186be58eba33fb589f4ca615de6e1bf30c8 SHA512 45af45a46abcfce980631994a8a32beff17d7bf4384a6af2d95547ae7ae6179246aa29bf7b6ee0fcc9408e3babd46ffd862c5601a7353b376970eabe73598c62
 EBUILD gst-plugins-libvisual-1.14.3.ebuild 634 BLAKE2B 5c7082ae57c90647b69a0a84afb8719e76849f0055ce92c48e3cb200fd9a5c6360273652fdfee216f434d275d9643186be58eba33fb589f4ca615de6e1bf30c8 SHA512 45af45a46abcfce980631994a8a32beff17d7bf4384a6af2d95547ae7ae6179246aa29bf7b6ee0fcc9408e3babd46ffd862c5601a7353b376970eabe73598c62
-EBUILD gst-plugins-libvisual-1.14.4.ebuild 631 BLAKE2B 9451e677cebff615a20b42431753f7b380e02fe16e8eade9536f2bcdfafc07b84bdee449763ae85c10a6a07a02ade0f45d600d3dcfd66c998b87ebe140f9a644 SHA512 00cbe0823560768b2ab3676dc217462641dcb60727b138ed6fdc46054da5fbb5253b9fd12e9e9b9a25916fcdf47d034f275b81010522482b1ccc3f8e35d38742
+EBUILD gst-plugins-libvisual-1.14.4.ebuild 627 BLAKE2B 6d26d67a7dbff2acb9406f991d410f5a012c36523e6ff51b50aab44dafdcbce8f37d56705784a58528b3ddfd6daf81f6631a39e34e7d844fdb0818a0cbb8dda6 SHA512 e645d1a44fe4c866fc468361e93e560c47a56b153ba2d8d9946c71ce0079470e5d1734294039ff89207e2bd22a5d4177cd63faa65ae42a3839a882b84a2a5695
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
index f3a65467a250..8841fa43e1ba 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-lv2/Manifest b/media-plugins/gst-plugins-lv2/Manifest
index d4818255997f..7482d88c97c2 100644
--- a/media-plugins/gst-plugins-lv2/Manifest
+++ b/media-plugins/gst-plugins-lv2/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-lv2-1.14.1.ebuild 366 BLAKE2B 840552f35904c3373eec39caa40356faed9e3ff8772423dc8e39f14bb01285d256543a62b71020e6857fbded6a9226557de54340d4a55141a8ef3146bf524207 SHA512 952dbe13418e0e84f057968f1b72ced57a70883009c4572a0c6ad5d66bcd4d3af2c48d27e8d3a1ea22c96d746f1a211f16223af3817b861f269785940fd53997
 EBUILD gst-plugins-lv2-1.14.2.ebuild 368 BLAKE2B 2eeb95cb2c226077b910d9917387d2d8045d6363353039710b9dd6551cc2e0eb1045463eac5ca7313183c8faa9f8dccb3533a6d9b88079935e6f93d56fcf1a15 SHA512 ce68ef36e8668c75bf759b237a2034b65b8b3af5b13427fb6dc51b19b1fae80d6c9f3e41a779b9c500e9726922d1a66bed7a6da7247afef7cc384e60473ab288
-EBUILD gst-plugins-lv2-1.14.3.ebuild 368 BLAKE2B 2eeb95cb2c226077b910d9917387d2d8045d6363353039710b9dd6551cc2e0eb1045463eac5ca7313183c8faa9f8dccb3533a6d9b88079935e6f93d56fcf1a15 SHA512 ce68ef36e8668c75bf759b237a2034b65b8b3af5b13427fb6dc51b19b1fae80d6c9f3e41a779b9c500e9726922d1a66bed7a6da7247afef7cc384e60473ab288
+EBUILD gst-plugins-lv2-1.14.3.ebuild 363 BLAKE2B d01960509cb629f29b87e578b11b7bd1f6f23e89134f30494cfe4d900d10c4fd38ddf37d83e0ffc50e3691d3c1933a8fc109622da6912dc4970ca50d396ef749 SHA512 780c562eafdb72c3b32ced3f9f03834dd584f0a36d43a0d1287183596d7d721b51cfe7769371b063740dc3d34029a2ee75895ee15516c8acac2026b0677ecf4a
 MISC metadata.xml 373 BLAKE2B 6e4682246da86a7f498c11bb63a8c8acd13d6b62c527db46a4030ae641d8f86d8e6fdfb67af1e53043fd3ea0c54086d67944c99a08f693a15e59d887fd99c977 SHA512 e0a9334a77c4ab15b765c27ace9033ea1aac985a2050e5048dccc4af340ed4fab99b79c6b40a2b668b2559d5bcdcd2076091f7376af3b973df8eb3236ce43956
diff --git a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild
index 05485204d8ed..4ae97846aa76 100644
--- a/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Lv2 elements for Gstreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index e5a71f1a6dde..180a678b6c31 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -1,4 +1,4 @@
 EBUILD gst-plugins-meta-0.10-r11.ebuild 4389 BLAKE2B de5b074ead1f2945933922055274e1865bb67458df6d3b6a9071889f5688fa39c34590112d2ae4400d05698538a1468dcb061cd3301378e2a90a10f7f2690a42 SHA512 e9332638416456961a4baa40356074b1246f0138097ec41d986df2219cc0c14fa8e1247986ef47512f1377c801ac3c18bc930cd8da6d19d19b135a59ca8dc384
 EBUILD gst-plugins-meta-1.14.1.ebuild 3767 BLAKE2B 09bf914203440b8b6c183ba42681271ffc728621a05c1dfb26983b744dc8d7413d9c33136d655f7b22e3554e0fdf1c27475b8ab1558286b2647dd13c60a0313d SHA512 d19a376267a338a19b08bdf0a6e248febe5c31d7b0908cab0795efaf4daadba07fffd5f0d41d39721f096c1e87df7118c2d4e5af1a366a0458f68b8c160d8384
-EBUILD gst-plugins-meta-1.14.3.ebuild 3775 BLAKE2B f36ae71b9d5f2d47c5e1c8378c3898575af26ac58f558adb4da63214bcdfa68cc609f00eeb4516b5c5f61ad7432ac6ce191ce4b3c0b503a087b03a3443d39f70 SHA512 5174424537cc557f4f68ec747c6c53db2f3a3e9c0326727a94cd9e6c6c3d0eca8474eca75c3f48c766b3112b972bbfd5e7cb568cf9b377b09c7d12b0bb5c68c8
+EBUILD gst-plugins-meta-1.14.3.ebuild 3771 BLAKE2B cbfda7ac5bb591f230bbe6995d21ceaff51b020e0a5cab76b0ae41687f84747419addc44e8b5c682d2b20d6b887094e0f72244378d0dbc5018527594816cf533 SHA512 7455c19978fb3e1a17a73f451a588db0cd568dd5a308288c63b234673f7c14ecca869919c884ae6053f8b71be0bc59a67851319106fe3e6ad03d3d96354b201e
 MISC metadata.xml 996 BLAKE2B 1bc83f42a32de2aafdf03808fffb16d603986c19160d2802426ecea7f279e529ff7ad0e2c321671681f80c3575dceaea0064db559dba1212b0a30b826ae8e2a2 SHA512 4d905ac8fb0f07b2ba3c6791d7a84daef638ed552d2fac834a71febb274d1c667abe66735e7cfe77f5ed83c269c01ca7c2761b13d176164cd956e8fadf31fbd0
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
index ec582fe252bf..2d951147ec52 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 67be01e96783..9820badb1d72 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -6,5 +6,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-modplug-0.10.23-r1.ebuild 448 BLAKE2B 79098c3f7e021e91c3d3ff1c42bdd2a2ad5209cb090564ebf9a59948407ed595ad5ee62c5405b9ff84ae2a5812c1e175820060a7674099d74e54335d21044926 SHA512 fca50e87abf1b0da7daec6b60c57656cd66ffc3a260694866eb63ff0118bf72f156efb9578c4506573da42ad9c011a2a38e08193bff1c1c815d5c386aefcfa50
 EBUILD gst-plugins-modplug-1.14.1.ebuild 370 BLAKE2B 1402cf6c9ba4f434307f4c80cd288e3a9f7f580a2089aebcc27becacf9d8d4204b0b8b6b0b73782cea00f2e64c7dd972e95dd21f9e0f21260dbcf813e987ec17 SHA512 77407f4ebffcbd27a7eb19fe480b7cd00e5584027b64adc1cd90ed54f928bb47172ae39d3a85bb92e528e07a94bbcbc989f1701073064a329a7f1194c4b3a1fd
 EBUILD gst-plugins-modplug-1.14.2.ebuild 374 BLAKE2B 463e8c5b35c78c9b16a648bbc4dbe8626c634a1b1542301bb94913415714980a36d78d8dd33dd7ee7854bf7b4a64a5a6aded6514914a713ea6b321008fb49ee8 SHA512 c4a52a5d97a4a514c5ff4fbc700df189cdbb9e981dace34c99c05edd26b0afd863b59d1e292990a6e32c3e418c1971834b7fe2ffb7edf35a9a950b25c0baf069
-EBUILD gst-plugins-modplug-1.14.3.ebuild 374 BLAKE2B 463e8c5b35c78c9b16a648bbc4dbe8626c634a1b1542301bb94913415714980a36d78d8dd33dd7ee7854bf7b4a64a5a6aded6514914a713ea6b321008fb49ee8 SHA512 c4a52a5d97a4a514c5ff4fbc700df189cdbb9e981dace34c99c05edd26b0afd863b59d1e292990a6e32c3e418c1971834b7fe2ffb7edf35a9a950b25c0baf069
+EBUILD gst-plugins-modplug-1.14.3.ebuild 367 BLAKE2B a3cdfdca5c4e05ee1f1143bd19d68591b7e6a1e87ce58368742e13920db8d3495f1a31d8d0890f9ca8fb6bba7611eba0e951db98c9586961331dee903e7b14f4 SHA512 67cd86a0a232dd022dfe0288f073cfa603a81a006c935c180c9a0afd5bc3c058cf5b0e5b5be1a792b0dedeb7c80d68f68918f7fc2ce2fb0826f723514af07f6e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
index 5222ccf50b32..57026fb1f4d3 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 5e0efca272f4..8a82c16c8729 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-mpeg2dec-0.10.19-r1.ebuild 425 BLAKE2B a282bc36a9b8b2c9756eecbcb44e1191a9a04db2d79f4d5cda5e85f5418537ae9b5318f4fea32d3f840c1b4bc9d4aabf5d9492a17a4bcb31a6ac893ced054026 SHA512 5e0127181a8fdac077ba6919ee56ddcccecb8944bc63f481c4880bf933545bb56f3213f561a3214505933f3ee24b6aa7a96c01549f4d60ba14bb763c7eff922c
 EBUILD gst-plugins-mpeg2dec-1.14.1.ebuild 428 BLAKE2B 33472fc0616ec878f1a3ff4eb99b78b726346c32db97737752812fa36ea4bea8eab3888f9103d0a9a55a68847dd43fb5435604c06458c874feb412d8d584be4c SHA512 dc9a5d9ab738eee614b00b6872aded26f51fa51a53de00eeb22fa7077ad00f9ac2612d163b067f5bda5c8d866db7a03905cb213b126bab263ba22a9ce9b1121f
 EBUILD gst-plugins-mpeg2dec-1.14.2.ebuild 435 BLAKE2B bad088ade44f6a3ce12b94dd53d6afab2774f92aeba3535caaff7df2eba7c6a37acaa3d1c8d48b6673d87219fd9861bce568c8dc16c2bafe1dbeab0402df48aa SHA512 8e9de9d5a30f1e8a689a61adb80d4d537fc4fb9f51e80dbf50c4939c43367edd13e9974dd83aecaab8b10bdbb5189b4f409b376b4bc084dd048b50d70f0a93fa
-EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 435 BLAKE2B bad088ade44f6a3ce12b94dd53d6afab2774f92aeba3535caaff7df2eba7c6a37acaa3d1c8d48b6673d87219fd9861bce568c8dc16c2bafe1dbeab0402df48aa SHA512 8e9de9d5a30f1e8a689a61adb80d4d537fc4fb9f51e80dbf50c4939c43367edd13e9974dd83aecaab8b10bdbb5189b4f409b376b4bc084dd048b50d70f0a93fa
+EBUILD gst-plugins-mpeg2dec-1.14.3.ebuild 428 BLAKE2B 43c17c34060992fc3cc12ba87141a1647aefa02b56f944c367cedaf77888ab934741038b77f069045e9c1230f6094ed9ab10cff1748eb590838a20f6d9d68a9f SHA512 d5cae38cfdf55132823f033cd6aa259d1559cbf404b4d7379576fa411582905433cf6e98797d5fed3237667c8103862f97ae130705773ca803db313da9ffd1b4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
index d851735f7754..e827a082d7d6 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/Manifest b/media-plugins/gst-plugins-mpeg2enc/Manifest
index 9a3f1bad15d9..5d8bcaf942e2 100644
--- a/media-plugins/gst-plugins-mpeg2enc/Manifest
+++ b/media-plugins/gst-plugins-mpeg2enc/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-mpeg2enc-0.10.23-r1.ebuild 341 BLAKE2B d669bc88464615a8e750482351ff644be2614290e3fbbe3c78479d96b0a14a98c32c4d5aa4b25f8141acedcc10c87b51e203e662288c5b77a75b1e61ae61fe01 SHA512 1e14dcd11dc5a66d807bae912c7610ed8b169f99b743806a46ea36a042589e63ebe08b8046fb9adc35c8dc8c71b2ed8ee0fd102b8a96457b7824d060ee3e383a
 EBUILD gst-plugins-mpeg2enc-1.14.1.ebuild 339 BLAKE2B 71ed94e260d30a7b7ec3dde2893cdce690ab4c4b5f8688f94f639b7a6bf57764fa844b021084ecdd31428810b4f2f2634bb9fb9a2f9e8b9ec8728165cd6493ee SHA512 86b9f7fd90bc5ccdc9b276c1c928b729aae67b68f3bf4c378c656e2be65331bb7b4d190632c47cea3a12f8cf9eb8584e4e05f41394e36973c33b6d64e979c3c3
 EBUILD gst-plugins-mpeg2enc-1.14.2.ebuild 341 BLAKE2B 0d9bb554e59e8c5cf9f7d6bf22bc2e806f74dbc9b8685c5c7979cb1eb3966e2f31f1df468f61c6369804639075392d8e59ceebce04f114533f20d398154bd2af SHA512 0dd029cd4cfb85e56d6af4f5bfb79adfc6bba9934649bb187f2a6a49354ef111702c58e17d5d99be350acbb57c1fd2d43bac53bdf07db90697d648d2662b775e
-EBUILD gst-plugins-mpeg2enc-1.14.3.ebuild 341 BLAKE2B 0d9bb554e59e8c5cf9f7d6bf22bc2e806f74dbc9b8685c5c7979cb1eb3966e2f31f1df468f61c6369804639075392d8e59ceebce04f114533f20d398154bd2af SHA512 0dd029cd4cfb85e56d6af4f5bfb79adfc6bba9934649bb187f2a6a49354ef111702c58e17d5d99be350acbb57c1fd2d43bac53bdf07db90697d648d2662b775e
+EBUILD gst-plugins-mpeg2enc-1.14.3.ebuild 336 BLAKE2B 91af84a87c7b6e038b617ff47b5a89eeb7d38e6e6ed8071052ab1c5788809ffdeaed4761d0d28bb4b3dea81c364f646362473c9919a8e7eb4725f9223f317256 SHA512 41684e4cb9e05c6f7b207135e6e3abc900fcc5acc0d71f1f5b9d9d647d67d0100ecb1f2dfc98dcc449e8969d830b5fd83e96625e68d7743a54961d52a54cb39e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild
index d4688bccfa0d..499e088b7c97 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="MPEG-1/2 video encoding plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index c460156e85fe..a71d2e5b2982 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -4,6 +4,6 @@ DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e4
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-mpg123-1.14.1.ebuild 379 BLAKE2B 5eb7ad663a1f8ae2b7baec566c2c24df878d16023f5fa875283d9d2ed286239af19774ecf7977e2e8117e47afa3c2ddd1b68c05d96776dd8f82f5083a8dcbc6e SHA512 a0433112b59e7e20192788e7f7b4df14a7450d6850596ae552a7fbe0ba39d7a38926587f93477673938289a6cfe4b9fb78c627e08c24c7b7917f18a7fb8874ae
 EBUILD gst-plugins-mpg123-1.14.2.ebuild 386 BLAKE2B cbc09e77a55f8ba570750886da91869d5911d8e148cac07fda2e23ce49e64c4a6301ace52de53472baec6a69932aff542583f6ab847fff86bb6c6f3d1f50e71a SHA512 e058400d310ad849eb0e1691b4038d933e4d46a019fdd262cd022f4a96b6a5934502e1e9bb5d31856ba9643b0b2106a1643456dfc896e1d0fb5ff1ce15e813af
-EBUILD gst-plugins-mpg123-1.14.3.ebuild 386 BLAKE2B cbc09e77a55f8ba570750886da91869d5911d8e148cac07fda2e23ce49e64c4a6301ace52de53472baec6a69932aff542583f6ab847fff86bb6c6f3d1f50e71a SHA512 e058400d310ad849eb0e1691b4038d933e4d46a019fdd262cd022f4a96b6a5934502e1e9bb5d31856ba9643b0b2106a1643456dfc896e1d0fb5ff1ce15e813af
-EBUILD gst-plugins-mpg123-1.14.4.ebuild 383 BLAKE2B 8f6b7fd43cf5f60c176e4d43da03dced0728d5610da3ea926d4d68e0a70715f5fbd3f416cdf7d73f8ff8352c6a333c21f283b719f7cd19c3750f14363e95a36d SHA512 febf9de0bffa0b13ea2cfc8c521c5a1ad70766df1b42da06a94263908747077dc90e6934dc46c883588c5df57f1fbb9aa73771b92ba969dc2e7d5c8bbc46630e
+EBUILD gst-plugins-mpg123-1.14.3.ebuild 390 BLAKE2B edfbee4a1e46fdf63ab1455a9d732e927ea0c180394340fba8e70e8c379878d4893cedcd7bf38db3b10f5055aa273492f456ce156b9e58ddc263b1dcce959eff SHA512 e454cccb273f2648eddd283b9f9f287dfb3cddf9290c6d469f027cd3ba2cdf5d9b852dbcacb1cb1d0661838687b633cd08c898a364affd72ab23551122e49d23
+EBUILD gst-plugins-mpg123-1.14.4.ebuild 386 BLAKE2B f9473faf17cdd13a5d8215d62471c44ad70740c388db017430d497746cfd26756eb71613dbdc79c780727dceae890accfad1c28df17d0f520f07103e2be55c91 SHA512 b25faf1d6db22c4bcfd4345b7c1b9fa3151619c41af5153c6f995b5be9b485c4bc6e630b137f3d83871d6ae8fa182bb240326e81e05ac49510532fd18f91783b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.3.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.3.ebuild
index 3215d84f2a54..ec432bb0210b 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
index 5d7ed1735d3d..7997e1c2512a 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-mplex/Manifest b/media-plugins/gst-plugins-mplex/Manifest
index 7ce5294fa05d..0317a0853ee0 100644
--- a/media-plugins/gst-plugins-mplex/Manifest
+++ b/media-plugins/gst-plugins-mplex/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-mplex-0.10.23-r1.ebuild 414 BLAKE2B 27d20159b391761069add321ecc026f7581b1ac52609bf6d307ac28088a33c173af1aa6565bd3983231362ea203f2625e3177b942adf1fcb6ac1c4d329a49c65 SHA512 d63840987f1a7ec35b59efd8145664c6a9e00ff8c385c77a237aa292e86f70beece76b9be404db68b28a30844246651cfbb3066ed2fbb4e586366027ddc81698
 EBUILD gst-plugins-mplex-1.14.1.ebuild 420 BLAKE2B 2760b02b9100b5bce48558e34c335c38826fed877c7f8c998e0630959e84bb2aec2ad4abc0ef1f46ec9a38c15c5671124c83817f12738f89497aaf359afedb48 SHA512 4d90c63e4a112ccf9cb359c51d444b5fb4d61cbad0dd6913cec63dbbdba0bcf68cbf2bc75275b1a876f5200d1e54590ddc765c901e11bb6d0641fd3274a9da13
 EBUILD gst-plugins-mplex-1.14.2.ebuild 423 BLAKE2B 3d6a71c4c9bf14fd0bed58178745cc5d41433bba57f572aeedf047719ea944c3d9bb21c63d3972747856923cb103cabc3923e7c0d1dcd0eb69f8bca9e815faf3 SHA512 df10cd25ec700a9f2053ffb03b1824eaefc5b9b1e35dd2e32f0197f5e416e5c5fd73f83d651455a31c0e14c09a9409625b77b85180838d3438de6dcd7ebb7881
-EBUILD gst-plugins-mplex-1.14.3.ebuild 423 BLAKE2B 3d6a71c4c9bf14fd0bed58178745cc5d41433bba57f572aeedf047719ea944c3d9bb21c63d3972747856923cb103cabc3923e7c0d1dcd0eb69f8bca9e815faf3 SHA512 df10cd25ec700a9f2053ffb03b1824eaefc5b9b1e35dd2e32f0197f5e416e5c5fd73f83d651455a31c0e14c09a9409625b77b85180838d3438de6dcd7ebb7881
+EBUILD gst-plugins-mplex-1.14.3.ebuild 418 BLAKE2B a219ba4e0b9d98c4826ada0c0f9fb636bfe237460b7d4654fb912f6e38de943b6b558abbf90b2fe52f560ec1407f401d25272a481fd119e1400ee122dc3a82da SHA512 79d4a0d22492414a4d4e3eedefaaa9814ba14b61e5f73f3293d9b3e8f597bbebd2d87a1b9bfe897e8b952fd3b5a0b813acc40f5e95ee2df06e4c1c2c1a4e4518
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild
index 68669b34faa0..b5d385d662a8 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 15fadbdf7a81..ffa55c5fabef 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-neon-0.10.23-r1.ebuild 485 BLAKE2B 439c33ac05a4da45e5f222748c300cee6066d60d32a5b0ae02edc3eff5fef3bac18f5312137180d7818d584f2021373d55b6bedcea9df50771c3c2e7f3472583 SHA512 fe45be60e56ac658bebf737e85e52865eaf86a5fa4087554138205b4ad65d7caaffa4d83b29f8c55e9336b13737c37a0bbe73cc3bf9b1b190fdfba2a9e1d5743
 EBUILD gst-plugins-neon-1.14.1.ebuild 339 BLAKE2B a5d974816a8b3e8df9c01217d4deb4b19f1856d45ac8da81ec17a87c749747c5d8dd08b0b880eb4f9e2682b0a9452fce79ac6b0f9af2bef38cd570a7d4b8209d SHA512 9f9564b7d0f84488bf8c9fbb0666b833b8265cfcb1dccb45b9d37047b31cc4511d666aa5257d8bdac035ac0461cad6580fd1b3b032962db81c4166da87ab8ec2
 EBUILD gst-plugins-neon-1.14.2.ebuild 344 BLAKE2B ffc6ace5c38018aeb6f54573e9d81b37996a47b1f16fa758c9d82ee1f20643cb21087641f8a61f0c12af76f239b967aaa33ff5aebd276c92b35acb884df7036a SHA512 c03538e5b119f57230688d2a661f170b4ee9a658ae7672adaf5fd0912a75f2d45a5e783295da948d2b32434e5b872b09e5a37a6fa542968747c22dfd8b24fb1f
-EBUILD gst-plugins-neon-1.14.3.ebuild 344 BLAKE2B ffc6ace5c38018aeb6f54573e9d81b37996a47b1f16fa758c9d82ee1f20643cb21087641f8a61f0c12af76f239b967aaa33ff5aebd276c92b35acb884df7036a SHA512 c03538e5b119f57230688d2a661f170b4ee9a658ae7672adaf5fd0912a75f2d45a5e783295da948d2b32434e5b872b09e5a37a6fa542968747c22dfd8b24fb1f
+EBUILD gst-plugins-neon-1.14.3.ebuild 337 BLAKE2B 28ed9e26edf66d2ab6cf9f9129f3af5137b29202b35b997042ba6f9d4638ec539b78f4b043088bdfc8ba3959c6f453f1409b8a8bf9f18b232218885396d0b20e SHA512 48e0f0215a87dc13cd71a9ed2d93407d6404ecee53791fdeb91d900a9c216b7288836c3dcb88b01f4f6afbd20d010f7af845193c84b552f329eefc38c0611be0
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild
index 31abc7967349..c6c6e6166eb1 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/Manifest b/media-plugins/gst-plugins-ofa/Manifest
index 40d33d18b14e..e901b81c9e0a 100644
--- a/media-plugins/gst-plugins-ofa/Manifest
+++ b/media-plugins/gst-plugins-ofa/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-ofa-0.10.23-r1.ebuild 326 BLAKE2B 6594d9171f2d82e7c2ce1f20a7578aee8e4fa5cfe83f694275b4e70944a32e508ee2484c389c2628ba4a5f45ec6580f241d0a3d7b2cf7c373cbac4ad9e88449e SHA512 fec405ac626a2a28e1be309b181ec5d614c696f8d92f8c37f5bf171139b3edab4895e8e90e170d123d0be47e052049ddfe84e29b908d190047c52461099ef4ad
 EBUILD gst-plugins-ofa-1.14.1.ebuild 388 BLAKE2B b960c9c4b9ed6965372b330a628bff1066f8a2966c0cd9081c218450e219e592a632fd268e6e78d20e9f340eed989e6534b9d01c488b5452dedbdb5d2bda5d90 SHA512 08a1e6e955d2ec15f7ad9fc3dc912a3a1072fa28ee0230b13ca7014a9ce67230921ba608f0c10750a7e2ccaefd7220238c8d2cc68069383d27c453963887067d
 EBUILD gst-plugins-ofa-1.14.2.ebuild 390 BLAKE2B 4215ef72787f132d2f886cb7f8345c008486653fcc430c5b40540cab836b87bd5ce9cbde3c6c25153d53a0e982992ca7b4ece04d8f719bb40dbbf78c9a4c43c6 SHA512 2116df3eff0dcd9dbfa98814465c85e4daa5bd576f31efe5aa6ea0416038ddd56d80f91cb74c6533a43ab09d2604ecb49c6761be6e37174885982eb953ad4822
-EBUILD gst-plugins-ofa-1.14.3.ebuild 390 BLAKE2B 4215ef72787f132d2f886cb7f8345c008486653fcc430c5b40540cab836b87bd5ce9cbde3c6c25153d53a0e982992ca7b4ece04d8f719bb40dbbf78c9a4c43c6 SHA512 2116df3eff0dcd9dbfa98814465c85e4daa5bd576f31efe5aa6ea0416038ddd56d80f91cb74c6533a43ab09d2604ecb49c6761be6e37174885982eb953ad4822
+EBUILD gst-plugins-ofa-1.14.3.ebuild 385 BLAKE2B b8830639822d7aebf1f15011e73f5264e46c33776bc1eba49481fc755fa2c2c555ff8f745f1f4e3820fc45f5dc6812814b34f9a0873b62c79202847481b3549b SHA512 c93f156cb16f5029391ff9ee81c4516340abf446bfb6be573102a8a9564c89a2f6681a7051be0d34d04e1c3efde2531ec735b18f91bdeda586073e2fce459f9e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild
index 124706c079e8..891a18c80a02 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/Manifest b/media-plugins/gst-plugins-openh264/Manifest
index 56e0373434ad..426f6d1328fa 100644
--- a/media-plugins/gst-plugins-openh264/Manifest
+++ b/media-plugins/gst-plugins-openh264/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-openh264-1.14.1.ebuild 333 BLAKE2B 70b35edb97e4d168598416809e557bb4e09bad56fab3c3dee0fdb6e266cf5292f86bcef63c5766705559624b297125286f23ad0b6d797f2fc8331a2b2a765e8a SHA512 799fea51958891417953d8b0685d0eb2c6882a184deece81d0a66f43d7b1510788f822a2d55c6f0014b69157639c8930f199c064c2ba275a6fde83456a72e2ff
 EBUILD gst-plugins-openh264-1.14.2.ebuild 335 BLAKE2B f5c24dc94c54be7a18a99e9d2d03ca545238d8b49117b0e528f1e4f5c539ddab7828d784b0f7db2f759561b8c9c15ad0b2dfcb91fa622bdd7c1e32dfd2b50088 SHA512 2c4534ccee26c54e1b5b8151e7c1ee4936525f7f3adb3e8b274fb548815d182773c3ec2718032bcf79261da60db5a7cedc73ed18c40ca06a471a1ba3f3f53d4a
-EBUILD gst-plugins-openh264-1.14.3.ebuild 335 BLAKE2B f5c24dc94c54be7a18a99e9d2d03ca545238d8b49117b0e528f1e4f5c539ddab7828d784b0f7db2f759561b8c9c15ad0b2dfcb91fa622bdd7c1e32dfd2b50088 SHA512 2c4534ccee26c54e1b5b8151e7c1ee4936525f7f3adb3e8b274fb548815d182773c3ec2718032bcf79261da60db5a7cedc73ed18c40ca06a471a1ba3f3f53d4a
+EBUILD gst-plugins-openh264-1.14.3.ebuild 330 BLAKE2B ca7a30601574cc92a178ff2d2c42c08675a886ee253fb023b64432ec67b9d5974484ab4be01310b17179ce1da8a3ea9e755884ace8bd2e08f000dc4ee673d674 SHA512 6f5f785ff6191cc09ee7c38caab00e2fc4e3ff3b44554539bf32ac042dbb9f1a93a9663c710395a8fcc87d49315ef5969cb51b4ae59a94b0724a94b43b0e7269
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild
index 6886b2291256..ef238464e03b 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 5f6e14cf0792..c60ae48d3dec 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -8,6 +8,6 @@ EBUILD gst-plugins-opus-0.10.23-r1.ebuild 483 BLAKE2B 6bb8cdf5374aae793161711f58
 EBUILD gst-plugins-opus-1.14.1.ebuild 665 BLAKE2B ebef6491b73603b37c607bc0e8822f4af7950118777810132960e710a43b9f93acbfcfba889634ad04847e74e072f102bfba004617b5ab8fbfff05263dfebed5 SHA512 7990b2e951e8378ed15d88acd3b9541364f241f231823ab7f9e6c08398fa09e021ab6a5aadb678f6a0c42c0b33c89e409a6ac1717f429d49e9e505f556e3d3f8
 EBUILD gst-plugins-opus-1.14.2.ebuild 672 BLAKE2B 07b00069a9167ca00348bee6a2a29c8602c678cd0d428cb2b5799f454d0bf1c801f0b6975e2e1f28d99ab8c3a729d9e63d8bbd21edda174e840e64e180896402 SHA512 7d352a1b5ed27e6b3781d46b91aab32ca1bcdca0cda8ed6b296da826ca041bc58418ee77f2212fbd5efd42bebd638a5b301bab4d6a26a92814a5f0064668905b
 EBUILD gst-plugins-opus-1.14.3.ebuild 672 BLAKE2B 07b00069a9167ca00348bee6a2a29c8602c678cd0d428cb2b5799f454d0bf1c801f0b6975e2e1f28d99ab8c3a729d9e63d8bbd21edda174e840e64e180896402 SHA512 7d352a1b5ed27e6b3781d46b91aab32ca1bcdca0cda8ed6b296da826ca041bc58418ee77f2212fbd5efd42bebd638a5b301bab4d6a26a92814a5f0064668905b
-EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1256 BLAKE2B 85889332371d8d5724e11bc1371bc137cea194dbed5b34f8d23ccd56f11a3535b9711cf4d86b7a1a28de3b3e5b194cf730e08c349b41969b4f5cde48fd6ca213 SHA512 65c605a3f1f31cd7d92c17797b73a0820064f2f2ad0a914038300a44bd6e38f959a6e4291ec82dbd483222b6ef0e75a270682a50091f05c59b11b4cdcaa64cfb
+EBUILD gst-plugins-opus-1.14.4-r1.ebuild 1252 BLAKE2B 662731e85f40551301af68145a9bda10694c0a3a78bb07cff2f6307159fb111d61025eaab95010e41355dcf6df2c30efb5e2d3056db7556797f193cde908428e SHA512 be953a777804ae819e1dc4343a9c90fe9e51796cd869fe7c3fee77062d5bd0fdf782ba777bf48294938438b200a3cda1af5f5e814e3833401af3599383f40e06
 EBUILD gst-plugins-opus-1.14.4.ebuild 669 BLAKE2B ae1947d26264e7a6b91dad4c49b3564bd2773988030d74104ff7a35d9f1a48186ed56138758845a0bf2b03c192a102552a649b39191d3d783678e6f6e034e1d9 SHA512 d31e6bb57bf4b631477a5955452d23ab3c848d73d4f330b0c9f8cbb04d52aa91b84ec75d8e6931676c8c70903a61b5502b5bf45dde02acbce669f0ecd611ec8e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
index cffbab3dc258..aaac282b75f0 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 97b0198f3c2a..5b0eecc4047c 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-oss-0.10.31-r1.ebuild 367 BLAKE2B ee12205502d2dd27d73697107de
 EBUILD gst-plugins-oss-1.14.1.ebuild 380 BLAKE2B 54671349d17924db84f0e68b9a0572e497faa95133e1da01350b928bc5b2767199418ed392fce224b89828a9f68260ef7b076b7490433d26c926e50a55d14d50 SHA512 a08893122f723fcccba5b91de1cbdbf1f25675c73dc04deb50d74ab55e629a549790adb2e3a57a0c5455c001cdfd7e22b2f9ccd59641c269962c6e45a7203551
 EBUILD gst-plugins-oss-1.14.2.ebuild 387 BLAKE2B f921f9692c85bfd22bf9027269d0d13a875794a967580400cfcc56b98aca486a670262242da83667773c260825eff1d36ac4af550f7b8867a6d6187260868b4b SHA512 5fb2912059dbe0a03abc2871bbcfc52c15226751b0dbae992da49c61aa685c93503efe903ac72428905f4084e482f7c7b7a1da992f200043a8ed6732fa8393e6
 EBUILD gst-plugins-oss-1.14.3.ebuild 387 BLAKE2B f921f9692c85bfd22bf9027269d0d13a875794a967580400cfcc56b98aca486a670262242da83667773c260825eff1d36ac4af550f7b8867a6d6187260868b4b SHA512 5fb2912059dbe0a03abc2871bbcfc52c15226751b0dbae992da49c61aa685c93503efe903ac72428905f4084e482f7c7b7a1da992f200043a8ed6732fa8393e6
-EBUILD gst-plugins-oss-1.14.4.ebuild 384 BLAKE2B aa3b36f325a68234c7625af4c3eafc054eae233aacc3f68ab32586787351ed1b94ef6fb7203960ea9a321639a104d44d10fe28f76d9219531e3259994edfb8be SHA512 f062efb33168f4b6a35681adbc372258345aed16f34280db58b4368a93c8493d926834004279d1ea27e88220bf4ca52d1f44f9a97839d4b832098b81a0e091c2
+EBUILD gst-plugins-oss-1.14.4.ebuild 380 BLAKE2B c01f751d85714b0263444408dfdccded019b08deb77439d032a92c9735c2b5a080d595a5e6bf4d5c34a17976cb9b2ef601c9dc139e33cba7edf7c31fc279ba2f SHA512 027ecda6a36420abfa61449408460fa0bb21d3041c306b0b8dfac4f2b2cb1a5b22bd11e42545e2b40b7a68ba38b95db7d283a82fc4e078a12ffb3f27bcaaaae9
 MISC metadata.xml 488 BLAKE2B 72817781f31070fbba548a5a0e724d3a3a419f55b2c1ba1155e88f66b0f779d34fc5705c39d60ecc5c40a9ba47ed568aa2458c0557de1795ddacadf54b39a436 SHA512 6ab36e28308e33d9b2e74a419ed558c913510f23bee1fd1a58ff87c6937dc2c3b4c8c683831e771460258424e89797a6b8c5ebed95cb87506ae7d67c11b2c243
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
index 9fa3615b862c..555518495b36 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 114a9145ea8a..ee14c858c330 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-pulse-0.10.31-r2.ebuild 451 BLAKE2B cc688af55730de520620886f8
 EBUILD gst-plugins-pulse-1.14.1.ebuild 461 BLAKE2B 915aa168a025f7a7ed8c406eef81273a0cacfe58e279ff5d7373c97b6903604cf3d6a869c521f1a9e8a4f37b04c2554ff8066b045ccb7720f307f6a28b71def1 SHA512 f39b4ab2542eda3a3439623da3922a8af90aeb2c16d876d07a12f34a685f2e77fe633a7fee1f48d51ea7d82b533147ecc1dffd72b91268d9683487f3749b48e1
 EBUILD gst-plugins-pulse-1.14.2.ebuild 468 BLAKE2B 918f7c432581ebab94d10e940d5b57a7ffa30eada9e8774e8e689e2288aadd52509c3eebee4c29e2c3d3340f225aa01b2d2d679dd8f3782d534d4f65c9c9514a SHA512 95f7c6a95df3509110768d32f7f8b1222a8c4a2e0258283898d1381d3dec4f22407a72857bcfdd69cac4a76b06592cfd160d652083512ed2b74e45a1c40037fd
 EBUILD gst-plugins-pulse-1.14.3.ebuild 468 BLAKE2B 918f7c432581ebab94d10e940d5b57a7ffa30eada9e8774e8e689e2288aadd52509c3eebee4c29e2c3d3340f225aa01b2d2d679dd8f3782d534d4f65c9c9514a SHA512 95f7c6a95df3509110768d32f7f8b1222a8c4a2e0258283898d1381d3dec4f22407a72857bcfdd69cac4a76b06592cfd160d652083512ed2b74e45a1c40037fd
-EBUILD gst-plugins-pulse-1.14.4.ebuild 465 BLAKE2B a4bb55163898939ac79c7e1316c88a0ad66f7f185a1beaf1987a983f0c519bfa45f97edefdd8067e61eab1333cc9de082fc8f536983e5315cfdc71bad0e1275e SHA512 3cc43088ebc125c2526286978b7f10da468edb31b3dcbad908f7845a4db34d5c6e9ecc12ed51f25bfc7a5e31e28886a3a9fb09d6e5af52c208799ef20cda2595
+EBUILD gst-plugins-pulse-1.14.4.ebuild 461 BLAKE2B 794a3460387ff4b47f182921ddb2210fe240b9872514835167cf2c2244e5a3d1065a092cbc9b731c88b02573f774ab0e222c752bb17436255665d9aae79499be SHA512 99d2e16920c5d727354c98c53304975609cf758a4723f8b43aca1a4ce73c35e35b63f7ea974a19a0626ebbe90e99ae237f2e55b80f96ffa557362c5cb2a69661
 MISC metadata.xml 610 BLAKE2B c8d30b8baa2a2dc5dc43b2a0f5badcb212567f7ce4873f58b1662b3454c8232a4916f10470bb98c3dae745f818f0e02d7266542d44d3fd4b9eb7edf99bf2a419 SHA512 0f0fa4496446fbaa649c3d76538c4960ca0d7918b40e305aa0da8516e79ef25c10136b0097fd687cb968c37de636b57ae667be1bc3197a571f557400a9c0c478
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
index 306ee11d8456..3d010d94c4c1 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index be08df686f83..77a21a4caa6f 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-raw1394-0.10.31-r1.ebuild 517 BLAKE2B 1dd965a7a7e5e696b9a2f4a
 EBUILD gst-plugins-raw1394-1.14.1.ebuild 517 BLAKE2B b035768c2a3c4f90469bdb1bc994716991b08f181e4d429aa6fbee426c542bc43bdbfe353c116d3b1179a733948f6bd020508ff051a641acd83f958454bf8da4 SHA512 ca8842f89335058b7fa3b479cf8bf7fb260397417d87a4f901b85d2ddf1e379dd4fc217399bc50bd2cdf6703d0a23046bc5e0a9de559fdb58c6988f92a24bcc3
 EBUILD gst-plugins-raw1394-1.14.2.ebuild 521 BLAKE2B 1fa023b790b7cbe705ae89be13f8e5028ce59f9ff0370fafe306e110e905db917d1e791ff16116918043eb44dbac55f3b1aa1fc52968deda91d89cc93df18c3b SHA512 f2548297bb542cc55b1e0c4b021335dbccf9a9056fc82ab0d0642b455b8b23006fd660818530dfddfe9e0f75dace5e474de68c90c297ceccf7a72fd29cc6fedc
 EBUILD gst-plugins-raw1394-1.14.3.ebuild 521 BLAKE2B 1fa023b790b7cbe705ae89be13f8e5028ce59f9ff0370fafe306e110e905db917d1e791ff16116918043eb44dbac55f3b1aa1fc52968deda91d89cc93df18c3b SHA512 f2548297bb542cc55b1e0c4b021335dbccf9a9056fc82ab0d0642b455b8b23006fd660818530dfddfe9e0f75dace5e474de68c90c297ceccf7a72fd29cc6fedc
-EBUILD gst-plugins-raw1394-1.14.4.ebuild 518 BLAKE2B 2be473007f4856ef6e2734c568a74e99378d4992d896005801738a763f7863178ec9420d07ec6a6ec247efa44ecbc80045612f5be4149317c5d7bda0e42176c4 SHA512 5f72e6b7d13ca8a8cd1328dfa86bd1356770e6a59e6f09255124fbaf7f25202ba18405def4c670d6253ba5c528e52e48001710d21073c94dfb9b5b95d562553e
+EBUILD gst-plugins-raw1394-1.14.4.ebuild 514 BLAKE2B d499ca202c465c73bb7dd0713e6f73326cefa36d228db31ac47db5bb8e6b296fcabbb53895100902a24f0b26d3d73b2f224a43c6d4ea74268196e76dd3741f6a SHA512 77b2bbf8e74f73dfef7652c7b8085a80720fd0d44fe15bf8af80d8078b05e466614ddca19be0b542969f0b295cb170786fb1b4f3f83beef3afcfee660b10fc0d
 MISC metadata.xml 548 BLAKE2B affa90bfebf1a2616bfe7262f0850227bdb4aac3580924c58fda8c1c9c89fb288252c921c73404149d02c8f1d38f61840301bdfdea01608a3db14e5e8b0b08a6 SHA512 ad3c3f4e095d868f0df4f869fe521f3c51ada956f578b995bd9e7161ef679c5c395434a76f4ddcfe1242dc37790e8f1ffe0167c8a50c686d434747563c151031
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
index 8e7f97f7e79b..01d2ffbba7df 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index b9227a47cab2..3d65764ec0c3 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-resindvd-0.10.23-r1.ebuild 386 BLAKE2B e68fc74e19c19d205f904b3f5e576b10de64c2d46e9da71d671b729e63354ad85a33c39ef6d8a87a4555bad62c57dbb624900fb51fc0d7d636e57a8f65b0d120 SHA512 079db94e47930bd7886e03e3a51341709880847f945abe2ff4c75c54755850417b29cfa5e71fb0f710cdcc81cd858949c6e99744a4f7896395db299a97dca7f0
 EBUILD gst-plugins-resindvd-1.14.1.ebuild 455 BLAKE2B b44884617b7b74a46974753fdf81bf62be4ecd3b8b90ed1a29302365543e9ffe88851046bf028c34473275c7efba298a72028b4db868112eb15b87071cad0486 SHA512 4e94913d467b75102846338606e152233152915b3075f9a3d4a05ea6f0102b011bbb23e010644fd993e85de30fcdc085b83ba05f7932db2ea59e503eb764e3e0
 EBUILD gst-plugins-resindvd-1.14.2.ebuild 461 BLAKE2B 3637a0f1720738543cbc131ef48d47ae623701f71b4fbeba75698e64f09bf99a27f7b8440743f70ff160d13032980537583cd9995a054d3bda2e471d5668c978 SHA512 faf68b0517a27e26cbb1659b41f5d8a76ac1c35b2ee398a1954ac048264ccfc3f48f5c1eb989fc85a425c45669d674e3a6ae0076ae247d8b4812b8c517da9cfe
-EBUILD gst-plugins-resindvd-1.14.3.ebuild 461 BLAKE2B 3637a0f1720738543cbc131ef48d47ae623701f71b4fbeba75698e64f09bf99a27f7b8440743f70ff160d13032980537583cd9995a054d3bda2e471d5668c978 SHA512 faf68b0517a27e26cbb1659b41f5d8a76ac1c35b2ee398a1954ac048264ccfc3f48f5c1eb989fc85a425c45669d674e3a6ae0076ae247d8b4812b8c517da9cfe
+EBUILD gst-plugins-resindvd-1.14.3.ebuild 454 BLAKE2B 081c5cbdd9379ac3803833db5636cbba991df7f28d60d41de8a4f761a5121bd0b2de506d494a8b07b7f2bb09dbf5cfca424ed575a45cb2f7b665b792714cf13d SHA512 b1703dda5c3fd1b8e14c3762b34635df0dc3cd0335c665b7029a8d63c3a9898f912dc2903b496b317dd6d9599b7421c2d30d28f0431009ba37098e23ffd75b8d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild
index 77f8d40273af..adbb3ad4c45e 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/Manifest b/media-plugins/gst-plugins-rtmp/Manifest
index 85ed1cc80276..2772b89d6773 100644
--- a/media-plugins/gst-plugins-rtmp/Manifest
+++ b/media-plugins/gst-plugins-rtmp/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-rtmp-0.10.23-r1.ebuild 344 BLAKE2B ca7c3a994aee7e03f24175b310b0594a77de1439bcd0c9787ae726f7553aed41a3018c47b285e48f6c251711a0120f0b19f4b16fe9457f083a5dc8dca0b613dc SHA512 923e89ddd3ea15e15b4c1820d09cc12888340dc4a48ca6c7fa64e4c3725ced7edbd0a2f136057afefd4ae4d82602d677b2ede99b617ec3181b86ec12605b35eb
 EBUILD gst-plugins-rtmp-1.14.1.ebuild 335 BLAKE2B d3a32a0cda6e2359d6adfe2d827063bf44eadf257f1dd2b561a0b72912c09639967ed43dd7f823b48c011c022bc7d3872cd5bec86e5594301340149cfaaec1f5 SHA512 43fdc4f2f4fb8f88656f0c1e1f1da488589fc90fda188a86c11b5af7307f58461e10f3766ffd5b154bfd9c4e5e8a530e92196f0fc835efb43ecf1eaedd72c056
 EBUILD gst-plugins-rtmp-1.14.2.ebuild 337 BLAKE2B 267bbe18fc00e81d88454c5fb43b5e495fd69facef281beeb907d92328e825e0a6506787d5fcd7f616423ed325d073d710ee83c1aeac8f6ef54651f383c9064d SHA512 dc42784dc3c7ff80b58e6d96c2337a2024573885f0aaa40f836e7ef5b37030e3e3de7a3612c8034da7abe25ac30b4cc1dbce79deff5da56d82f5afbc68a3bdd9
-EBUILD gst-plugins-rtmp-1.14.3.ebuild 337 BLAKE2B 267bbe18fc00e81d88454c5fb43b5e495fd69facef281beeb907d92328e825e0a6506787d5fcd7f616423ed325d073d710ee83c1aeac8f6ef54651f383c9064d SHA512 dc42784dc3c7ff80b58e6d96c2337a2024573885f0aaa40f836e7ef5b37030e3e3de7a3612c8034da7abe25ac30b4cc1dbce79deff5da56d82f5afbc68a3bdd9
+EBUILD gst-plugins-rtmp-1.14.3.ebuild 332 BLAKE2B a06f090240d6d552c0d8b8cfec19a0b3dd8c3018677036619f27d04ffea008b074afb61b158a404abdafa773c948020cfec3c6ef9e362ba8d7bdfd8767ddaa80 SHA512 c08539c5e593a9aa6c95e84e537657a203b2b3a6e9830f66a94e9b6789141892411036dae076c6fb00ce978dc3a85b27cf24017b62698c79c3d9d36eef89ef45
 MISC metadata.xml 419 BLAKE2B 8e461a2732df916b2d78bf38497df7061a3617920e155157f6cd62e5658187ea94d4ad328533c950a9554bbd9f3c427a1b616a7a882bfc977b349746ced681fb SHA512 c157a5142e10bd93420db567edc321580c57872558473b0181fed12b688164dcd928cb19c983b61602583edcbf333ac685dec141be5cfc5a207f8b849f64046d
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild
index c02ad8b37c98..10d75e02d258 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="RTMP source/sink plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 7429d362bd02..1b1aad8763a2 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-shout2-0.10.31-r1.ebuild 365 BLAKE2B 753c5cc142004f2435062960
 EBUILD gst-plugins-shout2-1.14.1.ebuild 349 BLAKE2B 54a2d407fc3d3451f1a151f613a8163a59f4769b58490656c0304b175293263a56ab5c7013567ff35f773683ffb2737e59ecdd8962068de5899dc6d3813ab712 SHA512 530aacb197170b45bb6faed86f5ea19f7ac12d20aaacb294217d4cc6dde2327caa6cd0241c551c0adbe0e2c0bcea94b88c6e4d9ca8a8c005b2e6b31db55332d6
 EBUILD gst-plugins-shout2-1.14.2.ebuild 354 BLAKE2B 2af5497e6a06a28c696d5e1f447b6417336979387f0354d6fcf7e15e990fe070433f59239159fb4a95e050a672c2ffe8d3012c7006eb34e0cb658f86635e9b95 SHA512 0a1e4356ac2abc6032fe14d26a4994b1762fc77a3334d3a26edcc4c46e6b6d0db52889a0099fc8d1b34980a7fa31806fe8d866b70d2044be50c7d84287b20120
 EBUILD gst-plugins-shout2-1.14.3.ebuild 354 BLAKE2B 2af5497e6a06a28c696d5e1f447b6417336979387f0354d6fcf7e15e990fe070433f59239159fb4a95e050a672c2ffe8d3012c7006eb34e0cb658f86635e9b95 SHA512 0a1e4356ac2abc6032fe14d26a4994b1762fc77a3334d3a26edcc4c46e6b6d0db52889a0099fc8d1b34980a7fa31806fe8d866b70d2044be50c7d84287b20120
-EBUILD gst-plugins-shout2-1.14.4.ebuild 351 BLAKE2B 4656998fe2470c1784d7cb44c539cab16c4964fde49fbcf877985339aaa5a0b9b741780225bb04ac4c7f6488a5abd2fbb37f443872e977f63bb1b9f8fe90021f SHA512 ab6cf586a6ced75f55f2572a72fddb11e1825a6396a58a7708baefc81d4f5c3f8b6ca4879491d5cca008fc3fd14843f6fb3e32cc30a052ebba2569b0dea83e33
+EBUILD gst-plugins-shout2-1.14.4.ebuild 347 BLAKE2B cc650819eb32869fbbd8bb90a5676f390c098ac7275baed131f993a4ebb2a20bb9ed52a2d9b5f3b6b326b5f5ed917e9c965be873decf5e5db1ed31cf8995a664 SHA512 32f524a65cf1c084fd345181ffe5e8ee1f76db0576ce4a7926a4b8b2e9472b8c4a82c2d279c8515122e233a93d48fbe0b33ba583d15c7eb6956ae763ddee2f66
 MISC metadata.xml 478 BLAKE2B 4c7e5bbe6d79d01544434b93b998847f6c5e3fa7bf2b979c9ff0238d75c0f1ac5693cb4224073926b6cf098a661fc5064f9ba2db3dd2b121093ee78cf905b1ea SHA512 a24a36ebfdfc159df5e23891118ea4e21855a4db31c1ddee9a081c55597be4f34014adbf0a46712d202f1557f2a63e776382c86ce5193465f35868c91114cc52
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
index e0eca7535806..a53e39395fcb 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index 3f4030074c5a..c9ab21d0a74a 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-sidplay-0.10.19-r1.ebuild 308 BLAKE2B b1bb530617582fc2eb35e2d247cf6d3f1fea5e9d6df38c02d7bd00c0221082cebadd4e6d69a50cca8b5fbcc214feae6cc9f75304b88df2f14039c5f29b76130f SHA512 3dec5c4c01d3fad1d703a16acb726da7f438878acb859f867fc4e4747a8fa4407df11d054328b8f90cb84b22946924464f677a7a1373d409364b906d9b0a695c
 EBUILD gst-plugins-sidplay-1.14.1.ebuild 354 BLAKE2B b2f3cb31ad97520462915e63242afc105e6f997b919b0f2736d7d66fb7aa68310215ba4803244a39e7eabb822599ebcc8baea8863e5c88d2633e03fa22e33df3 SHA512 9ec86213e301bd8a3505aa37f6c846431c1e5a81d6b1a70b62a84abca0290e757a7641365d0682c795677bb04022301d379a22f9423220d0c5da4a8cc2936e8f
 EBUILD gst-plugins-sidplay-1.14.2.ebuild 359 BLAKE2B 9c8d1238c35292bf88f6e08cf7b98cd32bfd8817bce711e3827a29c6af69529d5395f6c27b53a6c0bfb77b8f59991f1a09f53ff18bbfcc88e93ae28c131ac0b9 SHA512 48e3ff1d8b08af5f0b3dd70955ae0b360f716bea514963e0a42d0d36ccf72e86f5ed5324f737425a2cf468e91c9269ac9c1ee5ab40de89b1de94dd660a55211e
-EBUILD gst-plugins-sidplay-1.14.3.ebuild 359 BLAKE2B 9c8d1238c35292bf88f6e08cf7b98cd32bfd8817bce711e3827a29c6af69529d5395f6c27b53a6c0bfb77b8f59991f1a09f53ff18bbfcc88e93ae28c131ac0b9 SHA512 48e3ff1d8b08af5f0b3dd70955ae0b360f716bea514963e0a42d0d36ccf72e86f5ed5324f737425a2cf468e91c9269ac9c1ee5ab40de89b1de94dd660a55211e
+EBUILD gst-plugins-sidplay-1.14.3.ebuild 352 BLAKE2B 426ba90ebbec460108fee312cc5e8c2a1e1c213df1fc29a67cb1eb77e8be9d98d48a7cb72c6bc8ed6599fd4f81b4da4c5ab1443a340ac7c64f2a717035637c86 SHA512 12c2f60970ce6290dd39b0e7ef8a61405b6b614c611c3ff4b8cfa97ca945122e9f676492af7d76a5bc58c532eefb786c96e7f354200917153dfedb00581445f1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.14.3.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.14.3.ebuild
index c21bd8055b33..e82302ce9857 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index 34c0640f2a73..dabbb8bd21cb 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-smoothstreaming-1.14.1.ebuild 1359 BLAKE2B a1ffdac51f1fa08288d27d591fef3b7daa582355c5bbbd85bd800131ef5448247d902fb3a8388951a1aa1617abce716511adfdc941b2a9317d7a2ba8ac7c7278 SHA512 48d4801b54953896967fd14d31d1bf58274d7757adf7545651adaeab37f48b79cd44eb6f3a9b67b7153f9d3605915b1fa02918222f4ed87f1f876af6580d5ac5
 EBUILD gst-plugins-smoothstreaming-1.14.2.ebuild 1361 BLAKE2B e3e271aa8241e35b86e2a165a25ad2a77c0924a3319b374a882cbcfff0ead237d7fdb76d0978d000ca79a82c3796d8ee00db640441496f566139c32c691c05cf SHA512 be9278fa9bcc232083f743194d7b4e114241f54d5df59e2149761f5e2f25a02817a394f4ec2367dc980a9f4fcb66ec34b737b44b06f3c9454ad622eb888e3999
-EBUILD gst-plugins-smoothstreaming-1.14.3.ebuild 1361 BLAKE2B e3e271aa8241e35b86e2a165a25ad2a77c0924a3319b374a882cbcfff0ead237d7fdb76d0978d000ca79a82c3796d8ee00db640441496f566139c32c691c05cf SHA512 be9278fa9bcc232083f743194d7b4e114241f54d5df59e2149761f5e2f25a02817a394f4ec2367dc980a9f4fcb66ec34b737b44b06f3c9454ad622eb888e3999
+EBUILD gst-plugins-smoothstreaming-1.14.3.ebuild 1356 BLAKE2B 13243bf1f53db280eb0f8076e84ade16e91341404cef5343883afe4fd49d432cc7bc5bae11e6a9ba8920a91a8bd8eac9a5d0b4a411000c8de01859099e572621 SHA512 d470e7f1c6f1b10b90bb703c03e00f8e90a52f296d9a52a4680bab34972397a5ba643cee922d4d871a7caa09df7d05980905ea1315490889d51a437cd6d4b8c2
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild
index 2ec5feec35fd..2dad9f61e65e 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Smooth Streaming plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/Manifest b/media-plugins/gst-plugins-soundtouch/Manifest
index 750c45796279..92bd86578465 100644
--- a/media-plugins/gst-plugins-soundtouch/Manifest
+++ b/media-plugins/gst-plugins-soundtouch/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00
 EBUILD gst-plugins-soundtouch-0.10.23-r1.ebuild 367 BLAKE2B 1d920ac6b193946d3e2c78043d37a081e4a3219810dc797cccfcccf6d757a79a937e3da8031faaba0f698ef2b175ee8d0179e9879df042dcbda3b0e9f7cc621f SHA512 ff2584f662d23a35be5a2d0d973148049195aa41b0652d3cd72205e6e37b96c23a61d9e9efc450fa3fcd24421246a9cc85e0eec488100a91c7ec7673f33720a0
 EBUILD gst-plugins-soundtouch-1.14.1.ebuild 363 BLAKE2B 90b0fd4fe616d8728253bac54ce79c0e07ce8aebf4343e21050763ebe2b5a9ef3664894ec727d19b3d4f3095257a0875e1bb97e4909a600e6f7a2610aa5722fc SHA512 71775f5f28f2091e5318084e201ff77d9639ee7b1b238415d6c209c57d26336cbfbb13f22c501072370c4e470fe854defe7a86daba0b37c711ad73777c245f01
 EBUILD gst-plugins-soundtouch-1.14.2.ebuild 365 BLAKE2B 5255e481ae4ed537c653ef14ac8e0cdaf11966df9f0a23610aa634bde79d6f2d3836f866a58f5123569aa7f490054ce56b983d9f3cc14b40db7ebc9d717300a8 SHA512 4a64f2d451b1e3571bf47d1dc9935b3e2b9514cb74b0f44c9ca0ea406276852835cff80eaf60e4ab6417b9833ec285fbc004ab268589e20f99883dd8971092c6
-EBUILD gst-plugins-soundtouch-1.14.3.ebuild 365 BLAKE2B 5255e481ae4ed537c653ef14ac8e0cdaf11966df9f0a23610aa634bde79d6f2d3836f866a58f5123569aa7f490054ce56b983d9f3cc14b40db7ebc9d717300a8 SHA512 4a64f2d451b1e3571bf47d1dc9935b3e2b9514cb74b0f44c9ca0ea406276852835cff80eaf60e4ab6417b9833ec285fbc004ab268589e20f99883dd8971092c6
+EBUILD gst-plugins-soundtouch-1.14.3.ebuild 360 BLAKE2B 206ce13fa48219b2ff90a26e5981fae94b6a5735e999c88a634a515669934b217ef8f643a978e47bcde632179aacb14386b399ba66480c294ce44786be6a161f SHA512 c787f1aaf44156b972be8ba60ecb1424297c970c4662706cd40fc19d23a4fbe757ba2bc8d698ce56797d44d076bfc5c01b3ca2ea853498d00020fb64d42385e4
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild
index bc1c86772fbd..2f61531e63cf 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Beats-per-minute detection and pitch controlling plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index 669cddaeb1de..b9118b7508e8 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -8,5 +8,5 @@ EBUILD gst-plugins-soup-0.10.31-r2.ebuild 545 BLAKE2B 074f21224146bcd4fa25ad3116
 EBUILD gst-plugins-soup-1.14.1.ebuild 418 BLAKE2B 6fdf59cad2dbc65cc44e80408216bafa3ae7ab332bcab390ea961259650ffcca8327169248f0d4e81a983bb6ec2e430a6c932370cfbcf3e4978b85c948b2f61e SHA512 32a068a3b0d04f580de5322a8853c4abecf0a745f8753140d4584da04c016aea13c1cde018c719d6f1f0aa0a4b5da118dfbfc24b3b15fd6edc79b136365a9d59
 EBUILD gst-plugins-soup-1.14.2.ebuild 425 BLAKE2B 7b7103a6d3a63302d759643cf447eebe184f346d0759a60071ed9ec248586b50f6cc1744448e616d4fac91d73cf84c3533cf587f6a92a9405eaafb1fe556082a SHA512 7ee128c98c3d7ea8219b8e96377841f026e09f8dc355d17cdd461aefdb713e8e4adb13320fb4e9b27e8b9d9ad089e2c3c2f7d74c1286d02c57f29bf50147135e
 EBUILD gst-plugins-soup-1.14.3.ebuild 425 BLAKE2B 7b7103a6d3a63302d759643cf447eebe184f346d0759a60071ed9ec248586b50f6cc1744448e616d4fac91d73cf84c3533cf587f6a92a9405eaafb1fe556082a SHA512 7ee128c98c3d7ea8219b8e96377841f026e09f8dc355d17cdd461aefdb713e8e4adb13320fb4e9b27e8b9d9ad089e2c3c2f7d74c1286d02c57f29bf50147135e
-EBUILD gst-plugins-soup-1.14.4.ebuild 422 BLAKE2B 9e8d38ec90f174988fe3f70883a97432bef64a6f6f76bc58f974c34b796aabfeb824fe289e615e7330cfb1bce02eff5b314cf3ba37dbad3c2d24e9fac1f72da0 SHA512 3f02a746a6e47c71177dc66a35959e3196fef93ca558ddd6ba50e9b03cd8cd167a497fe75a24d4362fdb52253b8664c6af47188d4fc9f316e295236ef2cf2e68
+EBUILD gst-plugins-soup-1.14.4.ebuild 418 BLAKE2B 7764cba9b0900449ed9f625fa09aebc2fab50a1d62e8778ab6cd25233e3d8d8dd513beacd26ad66a5ca6247716cfaa4df09fc8f0c2babc5486616960c75eb45e SHA512 f425f6c284fec8aad622421a0093af779b86f354a4c38a0173d2a3019fa0e94db6cf45bc3d1e4efaf216bed80b2cd07bf4b1ff689a36fae89343f78fd9e969b0
 MISC metadata.xml 552 BLAKE2B d1dddafba0b921d7484d1c52567a8b9fbecc611b5234bc602cef79c7953a2a3a9bb423bc929055127ab894506409ddd8e8a71cb432169b1370e65b83b2e4341e SHA512 ce8b5a2a0d33e00ef141b82b3c6d192e31b681f016f431f1306d2066677d7fac66135129f57d25f9d13644c9d3976baf74fa6e6f65f5feebee045b82d04e2d8c
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
index b28c659e743f..195fbd814de6 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index 4b8deeb0f9d2..3326d14e1005 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-speex-0.10.31-r1.ebuild 397 BLAKE2B 9e5bd661cd4645bfac227e498
 EBUILD gst-plugins-speex-1.14.1.ebuild 383 BLAKE2B 590a3d687ad6416ec0506dea5d2ec5e4434dfa81106eb23e4f728cb08b60f9ffa0a24df578e95395cc774878ca8b3d057aa435168dd31e71d69bf013b1d27534 SHA512 564ad55eeba95302e254d4880ed25e0ddaab91e219dac98e817d3641e8d714dac36e4d9786be99fe650f7f3c65ea6f1a4ba4f220bf5c050569b4471f56e36a8a
 EBUILD gst-plugins-speex-1.14.2.ebuild 389 BLAKE2B 6375e27c6aad6d5c7664f72c887db8b4ae6e1ec2ae972b87f58221049dcd32c1f4e44edaab8ee6f999b7a9ca0de28378a9bd51eaa00a9b6c565196c5c0f8fd25 SHA512 356ebf5eb6501b729e50fce4f1a38bb6e3ce45b2e7b9f028f455fcad89f56c09be626e118592db114ba1da5d09fcc6959995bfe140e3c0ae9371d65738fef449
 EBUILD gst-plugins-speex-1.14.3.ebuild 389 BLAKE2B 6375e27c6aad6d5c7664f72c887db8b4ae6e1ec2ae972b87f58221049dcd32c1f4e44edaab8ee6f999b7a9ca0de28378a9bd51eaa00a9b6c565196c5c0f8fd25 SHA512 356ebf5eb6501b729e50fce4f1a38bb6e3ce45b2e7b9f028f455fcad89f56c09be626e118592db114ba1da5d09fcc6959995bfe140e3c0ae9371d65738fef449
-EBUILD gst-plugins-speex-1.14.4.ebuild 386 BLAKE2B 5a5c2fa2506cd40cbee49912ee4af57c373eb719c6faaec65b1c072d43e90aad2b1b42bbbb1970f6f26f7b90f00c473920a4d69fc25e35eaf4b391beddb339ea SHA512 988b1009ed984e6b266701587972e9e56d9d64d5add520a7be37177f0cff2bd0608cfbe3e9d7b6af5ce99c0c2801ec0f34282724f5b21a284663d05857c81d00
+EBUILD gst-plugins-speex-1.14.4.ebuild 382 BLAKE2B 95612eb163cbc78ba6cdfd9bbc5328adbb895345c822c71ee3e75b214af596cfac640e4b4fbc22d080a02faea9101afec91130aedea907a4517f81ddf3f9dd93 SHA512 628f36bb0372e931c7f42ba0a77010590bf5a3e3002046031550602fa5a6c13bf073566aa1b547aaa080b46a33bf132a58732c235a5165bb58a461ed7db8df84
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
index 3084221197a4..cbdd861f6283 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 83f7d7d651bd..3815a5de4760 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-srtp-1.14.1.ebuild 333 BLAKE2B f6536d5482b6d27fb2a48d2a4c3a0707725bc196e418ba0af3df472b29673d47de54ac2bf61962acfbc3d8009a061ec8a5c5b8218739e9a7cdd32199146bd497 SHA512 c3aa3de4adc659a56fb58f7850f20d393ea1950f0d135bc632911d92f6fa7f07deed5a21878d760c2c5374706d9dc471f163bccaccfdf213c4676de414cf2048
 EBUILD gst-plugins-srtp-1.14.2.ebuild 364 BLAKE2B d95c25f4e50e86d2d9dbbe293c3a065020957b36b8cbd3654469d4b21fd9af9faf55ea56242613d605b9e7488c344a008bd6bd5269d735907c9800b760aad638 SHA512 929ae60008a85310973781e95bcf7ed15803f9ee162cd179a44f86efd663809f67b7134f864833093f67a54e2591c9f430ccdbccd57eedce393fdace88e4647f
-EBUILD gst-plugins-srtp-1.14.3.ebuild 383 BLAKE2B 432017b9afdf4be43f16d0d1c92a76b7344ddfe8e7fa736b373aecab7241cd31b5c8e636a8c3f2e24360d3eeda9c2b7a683bb7b35dc822e6e5ed0a4a552751f1 SHA512 d9b9dd365e1a4bb344cb20c3d507b979b68c8c7600d117ba5a93f88ead4cbeb338dcfe8a967cfc668349141f0fd43d30fbe5031f7bf003491fbfb0e2346b1099
+EBUILD gst-plugins-srtp-1.14.3.ebuild 381 BLAKE2B 58498f4f76511d2d94b0d0bd8aac32deb888271d0ec1cddd7fd3e3a7505acd306b643fce4b39b55da1132b133cdc659e7dff701bf7cc265d16f52d43a94b2d73 SHA512 276e7c6c4e6cc42631578d1580a7e72f82b0479c2c94b5f13f452cc69b79dc47104c6ca25cdcc034b4405cf99f3d78e610e417d1ddf7eb600a65d3a1e5b43c8d
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
index 4f298f3a6b00..8f21e4186b41 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index d3c96898e473..b4469d703921 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-taglib-0.10.31-r1.ebuild 382 BLAKE2B e456720302ad92518b49532d
 EBUILD gst-plugins-taglib-1.14.1.ebuild 400 BLAKE2B 275964d3455bd6f3d4b41efff400dd4c0df2863630c37439916f8575294ba96a25261abe5f7cf61dbd87f63f6913bda2854089dd8e42744fbfd55a0512d1e778 SHA512 53ffc1a1001ce584fcd0fd542cb01b11193ae54f58ee63e647dd17f8f1af9e08a75432dd3e2894219282b33bbe327cbcd70f2f9e9835c9b19196e675ae4dae10
 EBUILD gst-plugins-taglib-1.14.2.ebuild 407 BLAKE2B 46dbe6d58a88fc5426abd0b7a5e49ec903523d85c432cbaa624ca9c8751588104b3719465466a1b22fc76b3c51ecc8253d43af0bba916ad0062419856a1daf87 SHA512 1c80f258bd8b6318f35374352e67a90ab90c147d1584958f696eaf454b2c392d0845444921f0f5c6cec21f566089dc6d728337e5d39279dab16cae3b33e6f493
 EBUILD gst-plugins-taglib-1.14.3.ebuild 407 BLAKE2B 46dbe6d58a88fc5426abd0b7a5e49ec903523d85c432cbaa624ca9c8751588104b3719465466a1b22fc76b3c51ecc8253d43af0bba916ad0062419856a1daf87 SHA512 1c80f258bd8b6318f35374352e67a90ab90c147d1584958f696eaf454b2c392d0845444921f0f5c6cec21f566089dc6d728337e5d39279dab16cae3b33e6f493
-EBUILD gst-plugins-taglib-1.14.4.ebuild 404 BLAKE2B 4cee4c226bab1d3dc94da93b72ff5968865d37cead6548586b4fbd79da1c248162f619ce5e37b4289531bd3b6f477ba762ed848d4b41e8a4be6d99aea47839e2 SHA512 4e17033acbc121428c061c3e4863ea3143d147ab89d7a33fb57283bd379253619c783b4f5d49e7b4fce6960bca086b03bbf98c64edda36de6a0d573ef9761fa5
+EBUILD gst-plugins-taglib-1.14.4.ebuild 400 BLAKE2B ff5fb07a1f912cbf4debd26165441df552333c42bbbb5aea6182838aed3e02c90f75273204b4376b6f7f6c87aa91ff09a2017f213deb7ef18274a3cc0870a00a SHA512 76fc40f082b860219e3ad13d94411259ea9ed8d17342e35234fb4af3098f7c1d7555e3d78dbf713416d70ae1d35d4e3c6186a4d90e9482b4da64d187e008211e
 MISC metadata.xml 472 BLAKE2B 2ddad354e550883322f2276a979d7cace56275d6b0ebe9301c40a6204043c0a05b0efae27cea079bdf1c0c04b8f588ab39e080d8b0e4f405c0d0287a00c4c746 SHA512 8ddf53f0cf2e92dbc2adc5f4910b2a6fab0b0ac68eb9c9c33fd94809714d0f10d0d9d546df012a70c5d9a13adce7cccc232be4fc107b63c4649ba3ff0ff32444
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
index 5b2c84c27760..c5d4c62ca82e 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 397fec3ebe7a..141527a4ebdb 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-twolame-0.10.19-r1.ebuild 314 BLAKE2B 9eeec5a6fa1280b33b7d2d3
 EBUILD gst-plugins-twolame-1.14.1.ebuild 362 BLAKE2B 4330c47b0ed2ece6f6640b88deb537391bcee4945c73b70b6b03d86b27774bfa1da84ccc0f6034ef0eee17f9045e1ba66c3e1e9b63bd1a8058a7ed56bc3e7e6d SHA512 0dff3633e0a426f2bb7a10e1d1118a97344920ad76473a0809b645f5bd2248244ca61d25f350dd1ab3342d8c1b57ee1c369776ed55f6a330c4afa014082dcf1a
 EBUILD gst-plugins-twolame-1.14.2.ebuild 367 BLAKE2B f1bc8f5c9b2c27b8effcdb0f8eccc08494a403bf58487d39f2b234fc6480839f0ba4b67c24353fad25ab42e399461a0b7d183c1decd06076064670fbf7ba023d SHA512 8442c1fdd995af4b2c82674b2bdf256fdbda890b6449e015660f4b4c96c8dbe7562d92542e40235ab185a399abbaad9e9f7064d6eeadab6f6cdc33d2246fd5b0
 EBUILD gst-plugins-twolame-1.14.3.ebuild 367 BLAKE2B f1bc8f5c9b2c27b8effcdb0f8eccc08494a403bf58487d39f2b234fc6480839f0ba4b67c24353fad25ab42e399461a0b7d183c1decd06076064670fbf7ba023d SHA512 8442c1fdd995af4b2c82674b2bdf256fdbda890b6449e015660f4b4c96c8dbe7562d92542e40235ab185a399abbaad9e9f7064d6eeadab6f6cdc33d2246fd5b0
-EBUILD gst-plugins-twolame-1.14.4.ebuild 364 BLAKE2B 3370dc062318b9b1baa29b343529a0337c6980bb18d4a64fa72222a1c7ad968159cc152ceda47df1b52368e755cda8838dac8a1265fd84e3879faedac1ede0ac SHA512 15aeae80fe7a2b6e460034bf623794ad865de4d7d700bca82c27dc2974338c0e34f8c272a094d93b38d3e9c837cac16f2ef3c097af40fb12daa574a3ea9a9fef
+EBUILD gst-plugins-twolame-1.14.4.ebuild 360 BLAKE2B 9d10c200d2428071dacd2e82ed1d581af77e0c9f1ee361c707515e3bd6ad62dae2af482ada9dba9241d44e8740c2a291c35f63a66f07c06a23b65c9d73af8daf SHA512 b13023f0f33e4712e9f2869af90f0d5b3e6fd68d314f3abafadc8eed2e2293a8de91a80ed5c72403ca20ce29ae093ac7c6b1dad366f909f8e725159f55c4abbd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
index 201a18364796..0d3be0cd91bb 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 5349fbc3aa93..887af91329e5 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-uvch264-1.14.1.ebuild 804 BLAKE2B a261b6a27bdd84b8f6b0fa9244e4d963cd8f90b39a23c9efe0042d894bdcb234dbb819b6012dbb976306cef8b9609598725e045b2230332b7c35cafc947a567e SHA512 2aeecce8892e8e422afb187e6bd008b55f5657dd9dbb596d2fb9684676ee99c41fe14ba1552cf232be83f11794e681f9838fb9a68df2df0836ce3df80dfd1ca2
 EBUILD gst-plugins-uvch264-1.14.2.ebuild 806 BLAKE2B 638d1885813f1d3f5850d3e03b451adf9e9526999c01d9ddc0719b3367be8800a7729708d2c2b09f4047e51fcaeec00af9915dda3d7a0416a70ea6e633f961c5 SHA512 f7e977049f6f43903bfe74d59a6eb8b0acf228ed6f6c521efaa6e6846fc856a66c45fb93bf42a9006e5f2dada744008697f47516937cf08a9553d0d298827fbb
-EBUILD gst-plugins-uvch264-1.14.3.ebuild 806 BLAKE2B 638d1885813f1d3f5850d3e03b451adf9e9526999c01d9ddc0719b3367be8800a7729708d2c2b09f4047e51fcaeec00af9915dda3d7a0416a70ea6e633f961c5 SHA512 f7e977049f6f43903bfe74d59a6eb8b0acf228ed6f6c521efaa6e6846fc856a66c45fb93bf42a9006e5f2dada744008697f47516937cf08a9553d0d298827fbb
+EBUILD gst-plugins-uvch264-1.14.3.ebuild 801 BLAKE2B 3b1a58f9d31cac0bab20a2fb75a99b9c126350b63c4f17513e62c9929051d27a270f1edbca728093c6436cf18db08011978ee413b05a17eaa8e18a24fe5f5390 SHA512 5c042179d5a2a557ff759c1f9fb3c426abb6969de0a31302981dd451345348b6d87d359582709393dc039ed540a8a5b038562b99d77fc7541f8680117c367355
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild
index 27d2bb3198fc..2e77d5d1e5cd 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 8106466e3f26..38da3182c105 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -9,5 +9,5 @@ EBUILD gst-plugins-v4l2-0.10.31-r1.ebuild 829 BLAKE2B 695b8b8aba7477541c7425d5a3
 EBUILD gst-plugins-v4l2-1.14.1.ebuild 664 BLAKE2B ca8066b64e60349f550a484502b58bb12ac7706f25cefcb26d1bd09d7e13cbf67cc582dcd67ff9558b2dd35bba5a2b93fb5ec5290d443bf8967690e8fcdcc9a9 SHA512 177b3b852c5f0aa01332d39e9cc3c13dee5d493cd8e7917fc5b54bde3cfd614a2e05cc0c468328480ea44e25726b5add6940eb649e8625170873da567618cf60
 EBUILD gst-plugins-v4l2-1.14.2.ebuild 671 BLAKE2B 1722eca0cdd596914b97f95f58b5963050c745519fa6ffbd66fb3db58b1e6560a3355dbbe8dfacd57d77b11f144becadd8a3bf525b3c2f7ea126c3626aab57da SHA512 f4696033ed481d43a65205b5746847a9c72216ee1e36141b3669070a6c5b75e1290c24522f38c57da9e15cfac0d7f1a38d18d4d2dadcd0c4e9e81c9fc710d98c
 EBUILD gst-plugins-v4l2-1.14.3.ebuild 671 BLAKE2B 1722eca0cdd596914b97f95f58b5963050c745519fa6ffbd66fb3db58b1e6560a3355dbbe8dfacd57d77b11f144becadd8a3bf525b3c2f7ea126c3626aab57da SHA512 f4696033ed481d43a65205b5746847a9c72216ee1e36141b3669070a6c5b75e1290c24522f38c57da9e15cfac0d7f1a38d18d4d2dadcd0c4e9e81c9fc710d98c
-EBUILD gst-plugins-v4l2-1.14.4.ebuild 668 BLAKE2B a356fcb188c394704bd5989f676036f4c0f597bf71e64bdacf4de955991b1bef1470f7ce03ef20aad045157bf8eba488c435a01b91e780fdb670e4c1b7cf783b SHA512 78eabd4e4ceb3acb872e9874660b2bdf7f5a2314daf10fdd560c4974511a636b785547ab026dc35f8d9c16c4e52f54199cce422153102372e66253a065d1aab4
+EBUILD gst-plugins-v4l2-1.14.4.ebuild 664 BLAKE2B 90a7b8ca1bd0fc75cdbecb0b8d8b4fa2c4d951c550ca7982d6bd47dd03a5641782107a61187ecee479721b7b43a3aa5e328f1f5e902254ce613cfed4d4eaeb09 SHA512 6ae674528113f688593806d5abc4492c16f3aa01c8cb3acac6aed47793c37a21e711a03a0a5e303ff4f4094eb1423399bdfe3a58531c55ab00bd8145efaca767
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
index cc0c150dd760..b5af2f074247 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-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="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 4d5376b79ed1..8df9473d56d4 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -4,5 +4,5 @@ DIST gstreamer-vaapi-1.14.2.tar.xz 1068872 BLAKE2B 835eb394d81b4de671703b2ff05b3
 DIST gstreamer-vaapi-1.14.3.tar.xz 1070536 BLAKE2B 7e3458702072d96acc31c1ac5c4ec9f23f6d618ba922884fb141a0897a04959da7f34c7abff7765f086357d3f8f7532a1582508d117c199f76338ebd3723c6ae SHA512 b89acf63c2900b0cd588cce1a06d959a4f8bbe929c237fce985d3cfce7b94d43a3317f06a42fa77e3ff790fff8a81c8bbeeed7ac797794e4cc3342f18faa69e3
 EBUILD gst-plugins-vaapi-1.14.1.ebuild 4365 BLAKE2B ed0b9f29fad413cd5889d7c4d16f09d39d9958a95e74c2deab2b1cb67a643916eafd33eb34d65cc9b9a4e722d0a50e5bd41fbdccfaed060300d27740c8bf1905 SHA512 708b42b1e3fc8ab6fbadc0c741f6ee257ce5984fc2d4310142556b34f21b5c9991ea65dc0a48941bcde68126317fc6e634b9a833002e008735fb8774eaf3e941
 EBUILD gst-plugins-vaapi-1.14.2.ebuild 4320 BLAKE2B 8e5f33dc5708969ef7f97db1f5210155e1be268d8345e9f8d8ab31585c3a4f29caad7af5e1a9a95b19a890013a4edb12d0c3ab84c5f8c18e3e020e76f6f7a265 SHA512 3434954aa49ff2168b929b63fd4bf750b726a26411934f1486d170f97b25fbf888facfdb49f36da7a9d4dbef7e2aaf9d5216e44420fe6dcf238a625333bb6528
-EBUILD gst-plugins-vaapi-1.14.3.ebuild 4320 BLAKE2B 8e5f33dc5708969ef7f97db1f5210155e1be268d8345e9f8d8ab31585c3a4f29caad7af5e1a9a95b19a890013a4edb12d0c3ab84c5f8c18e3e020e76f6f7a265 SHA512 3434954aa49ff2168b929b63fd4bf750b726a26411934f1486d170f97b25fbf888facfdb49f36da7a9d4dbef7e2aaf9d5216e44420fe6dcf238a625333bb6528
+EBUILD gst-plugins-vaapi-1.14.3.ebuild 4315 BLAKE2B 250d0888b9dee4d80a22cf7c9f1c535cb0707a139f94227936248bc9770971d1a2bf40ba70c39ff0666defd6066f78c79ad301cf9dbb499c0c71686ac80bcefe SHA512 c6b4f4f5719216fe56c90a5b480caa00aaa7a66e50f7fab92262abcfd333ce201f588cfabe47f24b6d71424cbbb469133f97f4025fd428560e1b311b98878a69
 MISC metadata.xml 433 BLAKE2B d46828441b89363cce84ff10747ad13f30329aea96cf2acd2fc7deb786c3f3ec0ec5a86011657d39ac905f9f33a3904b38860b16f53cfb150530cc4142f1beed SHA512 366bbe78a862a65a8b82ee43521508db5766cde3a72f4ad8e7f0b703dc23347589e07dcfdb3f3ec12e62ac91adb38b2a58cee5dff4732069ac2b8724524a405b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
index 181114b5eb83..86a4d324e32a 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest
index 9781f421c765..04cb5bfd4b35 100644
--- a/media-plugins/gst-plugins-voaacenc/Manifest
+++ b/media-plugins/gst-plugins-voaacenc/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-voaacenc-1.14.1.ebuild 322 BLAKE2B 1d5d7b10f5fd6ed1f34a9d29162f8c589ce50d8bbc28258741f28fdc09825828ef1ca9bbac194ed23194292a4b95689d8ce99a58d631e1ce225947d00affac3a SHA512 2ce0d70e28379173d9dcff3b550ae9c608090c26d667fea1501aa2858cd09b04b146fe333c9fd79686d10a135b63b605ef040855ad32d41471d499a189dd77e6
 EBUILD gst-plugins-voaacenc-1.14.2.ebuild 324 BLAKE2B 94821997eebf7b1963bf114837abbed767fac105a4afdf4b997b215ff0dedcfe90d5124938af85194f6c7c4adce050401e811a091b9ec2cdd3a244204e886a3a SHA512 8501c3e39b3d0c78e32f02731b16c9f3729fe04c8ff30d9436d53b876e6574efaf2a3530fa056f358d536a742abf15781f855b5376f011cf3a4e09a51f97c12f
-EBUILD gst-plugins-voaacenc-1.14.3.ebuild 324 BLAKE2B 94821997eebf7b1963bf114837abbed767fac105a4afdf4b997b215ff0dedcfe90d5124938af85194f6c7c4adce050401e811a091b9ec2cdd3a244204e886a3a SHA512 8501c3e39b3d0c78e32f02731b16c9f3729fe04c8ff30d9436d53b876e6574efaf2a3530fa056f358d536a742abf15781f855b5376f011cf3a4e09a51f97c12f
+EBUILD gst-plugins-voaacenc-1.14.3.ebuild 319 BLAKE2B f88aacd8bfad7c6e95848c6f874784109629cfefe5564408d8d5a02cd65cb2a69a3a1b1df6f484ebcc31c62b78476aeaddc05af9fe08f6ee61667dce347d905d SHA512 8889792a4f5c405bf46f6af72ab1661923d30b56de4c03391325a3fd75c8f147b43c41623d7eb3afaad0a5a0af7db8f9b7bf21f4b71d212f47797c24da1d2f81
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild
index 5e956ed3221d..6964578602d0 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AAC encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/Manifest b/media-plugins/gst-plugins-voamrwbenc/Manifest
index 515ba25dbe64..0da00b174329 100644
--- a/media-plugins/gst-plugins-voamrwbenc/Manifest
+++ b/media-plugins/gst-plugins-voamrwbenc/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-voamrwbenc-1.14.1.ebuild 336 BLAKE2B 4ed5bbfdcb7f22efa760b4c4105536530c85cb4965bdcfec6cd05cc42557c04e2beaafaa56f402625273ea227dcd06aa1b1bf71b04e867928abcb67185473e30 SHA512 0366e499a1b5a1e8d785dc2e5e9256fab62ef309ddd31c4e218b328b29f5fba692f3c9cb110e485c529948382a6cb0495a6dbfe0bb45d6eee2249108b4cd481c
 EBUILD gst-plugins-voamrwbenc-1.14.2.ebuild 338 BLAKE2B e3b9dbb555dfb03b28a5fbf3acd5c6d15e9d633a10c6c9cdf9d9549ae9b26ceb760add224f7da281c89c4173b644147bea866e426adcda360449b4fc4a368c47 SHA512 805b6f6e08f538eed6ad536bf0727e4af168b16d274adc469cd4d9759a33346776f2cecc93ea6ecedcd63607528931806eb9503df1be007c264ebc89b9665083
-EBUILD gst-plugins-voamrwbenc-1.14.3.ebuild 338 BLAKE2B e3b9dbb555dfb03b28a5fbf3acd5c6d15e9d633a10c6c9cdf9d9549ae9b26ceb760add224f7da281c89c4173b644147bea866e426adcda360449b4fc4a368c47 SHA512 805b6f6e08f538eed6ad536bf0727e4af168b16d274adc469cd4d9759a33346776f2cecc93ea6ecedcd63607528931806eb9503df1be007c264ebc89b9665083
+EBUILD gst-plugins-voamrwbenc-1.14.3.ebuild 333 BLAKE2B 849e58b02cb05640c9a4dda1bc2691334811b202c375c7ff574efa1fd67bfa347f483cc23c72fb4b7bb02c231dfb57ac7b5ed91a25945d0211856dc193eef753 SHA512 12d3776153e1dbdeeac37b8ca9b7cff50109c201fb6ac3f5b288f8c859d7f67ac43fd74db0e3535528c003ec2f7214fb93b7e0ef11cd3487361caf6eda5c9322
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild
index 89130467e3ed..16d3ee75955b 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="AMR-WB audio encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 136640f9eb11..a08642e404d6 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed
 EBUILD gst-plugins-vpx-1.14.1.ebuild 403 BLAKE2B cc27475c9170948906702209d6865360187b54b798d229092c64f9acf2d9606bd6f5fc47dfd290a4a599fbbce0019ab81d298a1cc355bb8eea5178689a3197ef SHA512 ba8c0035bf9b808602eb75e578dd42707460ae72af208201474ec8cb2432ae0f969db68a1abf6874197083956f8e05e476bb543792faa2e155f95eec9760f351
 EBUILD gst-plugins-vpx-1.14.2.ebuild 410 BLAKE2B c650a0b8fa0c62b0ca3e3fa6b8310e8f92c6727d624b358e953448c3ec252dff9f020a6c6f6abc35f8103e7de7d7c3afd2ef1990cc6b83892d54ab498a67cafc SHA512 8b08e446ad6fd473c6ae2c8a0ebf60ccf92e68538eb8659d62b3568d2a80208bb35b39a5bafcfd686c21762ba40a57eb4a24761dc06e657e3574766395fc72fb
 EBUILD gst-plugins-vpx-1.14.3.ebuild 410 BLAKE2B c650a0b8fa0c62b0ca3e3fa6b8310e8f92c6727d624b358e953448c3ec252dff9f020a6c6f6abc35f8103e7de7d7c3afd2ef1990cc6b83892d54ab498a67cafc SHA512 8b08e446ad6fd473c6ae2c8a0ebf60ccf92e68538eb8659d62b3568d2a80208bb35b39a5bafcfd686c21762ba40a57eb4a24761dc06e657e3574766395fc72fb
-EBUILD gst-plugins-vpx-1.14.4.ebuild 407 BLAKE2B a6705f10235c5ae9f5b1510165bd66745240903d7e27f92ee0a99387f2d66b8b106b9e9f0c637d2106f2025beea5f1b5e9564f70e63f502c59ec1812a65a4680 SHA512 f5d156a26ad1216adfd934a683a348ad02c4d1394f055ed3ce2f4dd4faaf2712a5171211bebf242488a2bfca8be65a727d71ba9378dfcd0146da10bec85d05cc
+EBUILD gst-plugins-vpx-1.14.4.ebuild 403 BLAKE2B 99ee78ce7e2f4b0bd50150a8ec910469b47824799228aefecd163ee9455cd3ba3df71717a2e6e747dd057c0f3a6be181e0e6cd39f57312b15747a6f2ddf80381 SHA512 664223a116c5049a034a9b6c90b6a201def6badf0982908fdf7d7c8531d931bb7ac0eacea5631b9a5d3088b7f9df5ccc1df61bbad1bae405a3a89eeb52658269
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
index a46eaa8fa307..5a61d05bd5af 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index 2287bfedb089..fe01c79be93c 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-wavpack-0.10.31-r1.ebuild 397 BLAKE2B bc5868e4a430253b890b6a6
 EBUILD gst-plugins-wavpack-1.14.1.ebuild 404 BLAKE2B d604fdf86804080704c8ae6e56faa87a8aacef317ef32625ae223b6bee916f7253f19e23f7fb0b6075f0d0f60923b3cc8cacd3866c560b6d25e7f5000c52b607 SHA512 1d4355a1ae44c65390edcc750974cacdb409951cf15d9712fbd5ec97f572f80834e6e3bb8dc1ea6b4e01eb3ea6ea162a23b164072d66ae94d7f894699957b697
 EBUILD gst-plugins-wavpack-1.14.2.ebuild 409 BLAKE2B e9fe7c9319a8de226634ccdf1b2b669a00395273e992a5b210edeff931a87c899d14b462bfaeb2a859e9ece17474e682ccbd60308a3e48ca71120227465e0b18 SHA512 29250dc1bb1b51f38baf09bf8250406586e45b69cb8dd22370792652c1ac0d8090f363d04ef0fdd07a47f7a2ce4f14c7faa23af806c999821fec12168213b3b3
 EBUILD gst-plugins-wavpack-1.14.3.ebuild 409 BLAKE2B e9fe7c9319a8de226634ccdf1b2b669a00395273e992a5b210edeff931a87c899d14b462bfaeb2a859e9ece17474e682ccbd60308a3e48ca71120227465e0b18 SHA512 29250dc1bb1b51f38baf09bf8250406586e45b69cb8dd22370792652c1ac0d8090f363d04ef0fdd07a47f7a2ce4f14c7faa23af806c999821fec12168213b3b3
-EBUILD gst-plugins-wavpack-1.14.4.ebuild 406 BLAKE2B 5c60b6beeacfaf831f103ec28cade59ae2adf89c4a75296b474404ce9efe0deaed0688671dbb555d839e00ed92db169a817e7ede4cdfa69985077bc2bc922b87 SHA512 48d2022ed01f1b1bf3e940d5cec5e25a4d3406f93ebd6d3fc8b9c4ed72c19a0f928bd6cf5ee9970d117d43cc6ecf5c483467aa6eaee19c8c9d9e27d6a727dfe4
+EBUILD gst-plugins-wavpack-1.14.4.ebuild 402 BLAKE2B fd456373f7a95ac9655dbe7795523c2948248df0d65adc22473269a78b8cc5d03a29469a7e736c81ae94e2a6737ba3594bd1191d18785d5ab9e8e37b9ab75474 SHA512 4611d4d4f9023d01a5971579d3d3d1c2ca285b73b728cfe41129871d7d31e4cb2b0572a06f64a7805b2c343fa652664a8d865e49f7611a994dba0b31ea5f725c
 MISC metadata.xml 529 BLAKE2B 137cd943fda3cba7c57ece2b4eff3c1beb0c694dd564f11a82249171fc2bf17448a18aabd2ebf4eb21dfefef07c9a0a8a749df48e79e7709b56634d4ad8a8250 SHA512 31c1c1b8f7e462a53d6bd6cc68c310f5236c6ba52f3fac37775a30dcc0448b2fba900c1b2ef16f31566f03a3b823aa6de02ccaf033f6ec587d64a175aa57ade4
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
index e2d427f25a29..671d70f1a776 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index 4a7ea935c0aa..c5f157a38976 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2
 EBUILD gst-plugins-x264-0.10.19-r1.ebuild 372 BLAKE2B f7006c1521c85e56b2055d838796f034df03ad12870391a4691b9b88b91c4fab6ff9d220c9bf350538bbd3231bf1aec91b0444168d1ea919bc1daec513a5e8ae SHA512 05405a265af0ac17d833cff4c17998af33560f49acffa73185f6bc11e490ade0292daf4ed06a75802d404a427eede3f8d663779e23932487ebf0ec6376c7e918
 EBUILD gst-plugins-x264-1.14.1.ebuild 426 BLAKE2B 4dbf0743912fd9d450800c5ce08779677d918aacf69e2213c4c95a790405909a83de3688e9306a571b2a0db847a1e149c4d568fce075ea657279d0306384a42a SHA512 590ba283a321adc7ba53dcdafcdfa1efa76b14f546aa110c45f168e1f5e655c19df11887fa476ebfceba892d5eeb8d810b117d6e8d8cc35758b67c8c72a3d7ac
 EBUILD gst-plugins-x264-1.14.2.ebuild 433 BLAKE2B 25fdc65164aa81ea865e4d70c4a2c22becdfc15cae849a76ed5aba60d24dc994f6217cdbf23c1bd87c9021cd16660dc6b428db72f48751364ed6565f316e2889 SHA512 44be1fdf3a6d3299e0c8f33c178cc7da2b3a9d8344d09eba5ff07358e3beb40b9406c1c573b799578553dc9bf578523ed3d3383305f789fe1c7f5748999c8aaa
-EBUILD gst-plugins-x264-1.14.3.ebuild 433 BLAKE2B 25fdc65164aa81ea865e4d70c4a2c22becdfc15cae849a76ed5aba60d24dc994f6217cdbf23c1bd87c9021cd16660dc6b428db72f48751364ed6565f316e2889 SHA512 44be1fdf3a6d3299e0c8f33c178cc7da2b3a9d8344d09eba5ff07358e3beb40b9406c1c573b799578553dc9bf578523ed3d3383305f789fe1c7f5748999c8aaa
+EBUILD gst-plugins-x264-1.14.3.ebuild 426 BLAKE2B 8a549970a922622e60fbaa9e4830645cc09a82b90d80abadb1f1d880c76f9ad014a18475040442d5481c665cd2b81083f3e3037a41643ad119698c9e6b2c4bff SHA512 7342bd3716db62332834b512d3ecffcbdb931639af6aa63f9e397b7af625b0b3266904b2fb963e0423fe367d5d181df1f6cca47b95e2f2fe3a09e934e0a35e58
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
index e542008ec2fe..7f14bf91c350 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/Manifest b/media-plugins/gst-plugins-x265/Manifest
index 99f9ad4e8dba..576a055d1bba 100644
--- a/media-plugins/gst-plugins-x265/Manifest
+++ b/media-plugins/gst-plugins-x265/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-x265-1.14.1.ebuild 318 BLAKE2B e88f4d6e18990c5831bbe25bdb9158ce374c9cd77adf3d21f52089fb9ebb6498c123423482d9b5540ac81ec7f556ec27a452c5815dd94c4f2b1610320d85165c SHA512 99fd082b4e791325d09485c3f4402b1a4e7f5d0244d1ee9e97c5877a53c9e84533d073d86bc2c38412e12dec783b63dd6d7b28750f5b0f22af6def127280f54f
 EBUILD gst-plugins-x265-1.14.2.ebuild 320 BLAKE2B c06960afb625eff7a838f862d986efb05c9f49caef4872fec7f9c8144db8db1bd20defd0bb3762a3d235f13c585c88d05ca94d05ce1c52566487c0991c48236b SHA512 2842ac59a4c6c9461019acbac5029085299e79ed0be64441c1b6f755a4c9edfac3449129b290dbd18e696dd90a3f4e4200096c2b098553de89043983e15fe53f
-EBUILD gst-plugins-x265-1.14.3.ebuild 320 BLAKE2B c06960afb625eff7a838f862d986efb05c9f49caef4872fec7f9c8144db8db1bd20defd0bb3762a3d235f13c585c88d05ca94d05ce1c52566487c0991c48236b SHA512 2842ac59a4c6c9461019acbac5029085299e79ed0be64441c1b6f755a4c9edfac3449129b290dbd18e696dd90a3f4e4200096c2b098553de89043983e15fe53f
+EBUILD gst-plugins-x265-1.14.3.ebuild 315 BLAKE2B 7cb878e6f3b8b087bf7c8d0ac47bdae273e1435772a3aab655a568046b2ff34f0625b2b11e94da0c970de3e0af00b68c3f448662f5b8b6bdb339f9db4581394c SHA512 16495d7f764218030a9500c07afc138c5eaec9c55a34970b1f37c8c9f37118888f96aba8d1093f402f64243b3665361dbf9550e148dfbc3d5bee997c62e8a3b1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild
index fdf54708a5a7..b496e36e784e 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE="gst-plugins-bad"
 inherit gstreamer
 
 DESCRIPTION="H.265 encoder plugin for GStreamer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 34ab7bf9fc2a..d786304b9672 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -5,7 +5,7 @@ DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e4
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 EBUILD gst-plugins-ximagesrc-0.10.31-r2.ebuild 666 BLAKE2B e5d07c16456bbfbebc1c0c1af97732c921883baeede744c31f5fbe057b4cebb3dc99ad5547a30fd53c22bddaf9945496a3d9bfc45a52d628d5625d4f04572414 SHA512 adf9acb7f342544bc6cc447c61709afa9d1c9c6e3736bbf0b7dc8b788a85e82dfbc46b6a13011cfaa080848da88b93935179fc7cf1eb3cf4ad40f64fdf0024fb
 EBUILD gst-plugins-ximagesrc-1.14.1.ebuild 685 BLAKE2B b906367b1abe11e2362575233007103ed2cceff4393a573850bc26fbec253ab484a557a8fdd02342b391556cd7a25d5f35e49971733292ea03a92de466e369f6 SHA512 a1d5aee9b7c86f07efe00cbd7cd470109d6febb63f108f8bac892adc4f09de8981696efc7556e1dec7620af2c7982a812b7f4d74a37bdbd28be557f7e9d30e7f
-EBUILD gst-plugins-ximagesrc-1.14.2.ebuild 682 BLAKE2B 3f3ced18341789ebafc3aa97686075be0caf53ae2a1ec443b93ae1183d9cdfdebcbfb7a730eb4c14f6cc7fb6beb9365a060cce2ad461f964c4e49990098d3da4 SHA512 19eddd36d5b775b70561e0051cd562538e67eae38d90365c85cfe161c1de8c5628325700b39f777a271b1dc5d0e2e8b5694aace4a09451d10d8aa924a7b2560a
-EBUILD gst-plugins-ximagesrc-1.14.3.ebuild 682 BLAKE2B 3f3ced18341789ebafc3aa97686075be0caf53ae2a1ec443b93ae1183d9cdfdebcbfb7a730eb4c14f6cc7fb6beb9365a060cce2ad461f964c4e49990098d3da4 SHA512 19eddd36d5b775b70561e0051cd562538e67eae38d90365c85cfe161c1de8c5628325700b39f777a271b1dc5d0e2e8b5694aace4a09451d10d8aa924a7b2560a
-EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 679 BLAKE2B 68bbb0178fea2b66bf4cafaa151ffaaadf2d1ef602d2ebeabbf8cbcfde61d21e623a3a2afede10e564ed24c1956a9d3fc93dd3c347a7d6f6f3028cf9937cd569 SHA512 8e8d5066f27633f346ae43501a5294d8153aeeaf9aca0b2081d287722ddadd98f621dd77c14d2456474daac57c666611e0d25eb91ca20856b7b1fbb533598689
+EBUILD gst-plugins-ximagesrc-1.14.2.ebuild 686 BLAKE2B 5849bc32debe8c596a8df37b6151d9991d366202b4b914fc5db1185ccc8c7c4e73554bfdb7fb27f9b6cbf67e5c57b4495c6a5fa5f79db3564350a7d3cad493f1 SHA512 af8ee5b5d165226b739610bcb3f60c99657d5c9ac4f889b882355c5024c4be569fb840361285bb75bdeae7da2bb77e194239c83f9cba1654348ddb0dc1bd3a32
+EBUILD gst-plugins-ximagesrc-1.14.3.ebuild 686 BLAKE2B 5849bc32debe8c596a8df37b6151d9991d366202b4b914fc5db1185ccc8c7c4e73554bfdb7fb27f9b6cbf67e5c57b4495c6a5fa5f79db3564350a7d3cad493f1 SHA512 af8ee5b5d165226b739610bcb3f60c99657d5c9ac4f889b882355c5024c4be569fb840361285bb75bdeae7da2bb77e194239c83f9cba1654348ddb0dc1bd3a32
+EBUILD gst-plugins-ximagesrc-1.14.4.ebuild 682 BLAKE2B 6acddf4e35c62bcb10de90e4c1658026dae67f41863a5a7c2f907963309d9140b93f846b37b84090865f212d33d76a65845ee1c20c72ce0ce3671d4b754204a0 SHA512 c719b4485e3237c2a4b428d39f5514bd82ee52417bec84bbbea39d59d8744d9cda454c8c833c7c04df6f37bb2029a422d66482b63d5e8811a1c3504557a2b8e7
 MISC metadata.xml 457 BLAKE2B 6af6de3816b28b279400abcc8e9fce070ce8ac5ce2f4ccbecff7d16ba0081bb277db520bd4efaeb07e48b220cf35baf09e0c68e7d99fab59eefc57c0881af49b SHA512 52d8e5e5f48b1e6a0f0e5742307348d66ec3302ffa32dc1dde2f98078621c242d431bf2354902f5ca17b277910cb733336219bc8c1598a1b4ea2c149fcbcf559
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.2.ebuild
index 36c0022ff189..8ebedca57d22 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.3.ebuild
index 36c0022ff189..8ebedca57d22 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
index b01efa81951d..80b33b4e1d97 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index bf89a6cc976c..33e075a7db1f 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,5 +1,6 @@
 DIST kodi-pvr-mythtv-4.15.3.tar.gz 650217 BLAKE2B ddc6b11039bd8e5e6b46331030909063e127f681f4059e604734644a3159c10f10c3dbed770ba8a58bb5ea3b7e543dfba042b28f347c842d963d7966e35cad32 SHA512 1171f4e6a05878660795b585185d35707ef713e310f3508e7fb3327caf79feb6a941e4b4f4d9f2331ef13492c141a4d36157547e350642eee900f3fad1d46b55
 DIST kodi-pvr-mythtv-5.10.1.tar.gz 697844 BLAKE2B fb7678cfed9c6c9d25f0bb0ff5fe6c8544581c2cfda9b564b12430596d907744489bc116c898f23eabf24567eab0fe497be2d408dca09b9c18264c166fd7877c SHA512 1125dada0b3791ba0ad668108e7681b53a5f2389ab8498360c241be1869157bf5e5277e7b90c0291aa484eb74cbf0435c8b29cc713f49d7b87a61d8ae2523e69
+DIST kodi-pvr-mythtv-5.10.3.tar.gz 698680 BLAKE2B 3ef098d8691308d66e463ece3de59308a5af8407831a867d197c505443390646b1668ab0ad4ed1170bc67128cc1dea0b331549dc6faa4fc2e8064c3825d730c7 SHA512 e5ebabd8b9b97dbc1bbb34cc79d9e020d4186af69731c5cdf9bc6e67592fb1d017d3c51ebd8ae5b1ea72650c436bcd0de50bdc1cc04d93ec8a9336a38f6a8fcd
 DIST kodi-pvr-mythtv-5.8.14.tar.gz 696544 BLAKE2B a80b84d6c3aa2244d68f7c7ffca16b17e5942239a55a67e059a6a016f9970f7c8ca65071a6b498dbae8c0addea95349f49f27a7e7ce8888a1d9a2fd5294a8d0e SHA512 44630a944eeee7cb97de91183b560beef00d686148880ebba51063fe1f320bd43cd2c9a89061c49fbf8c5e038ac5d6788440fc948ba46ca130e8bd8a980dff97
 DIST kodi-pvr-mythtv-5.8.15.tar.gz 696549 BLAKE2B 408575d8995a5c25a1f2d32b4f7fad37ec4d929a622e287594b700aec41162db9b5b1df4dee59f68a3c4c417af95f6b9297e94de0852e4895f12aebbf40c267d SHA512 8bb8b6dc69cd62eb1b62f7d08abb17a698d354e2280e5b2c5d68d1037e1b48e048aa10dd8b9a4f830c2af7e1d232813fe53c8634669e39665e8e8abc7ae53474
 DIST kodi-pvr-mythtv-5.8.16.tar.gz 697062 BLAKE2B af0d96959904b34368934117a721e0190107f8d772f9ea6370b6eaba61848d183672edd9639737510f3f7fb8e2525aa18874a0c85db6a7ea9d9f168e08102187 SHA512 9ffe4c8defda0111e371bbde72f3b2e746b7b9003dced1956552223b344d868f344ff076f7021534d5a41781fc5b06dfd1bb75d12d1e64f97589ebefa7c030d6
@@ -8,6 +9,7 @@ DIST kodi-pvr-mythtv-5.9.0.tar.gz 701955 BLAKE2B 002293de752d0e5e3d61d67dfbd3970
 DIST kodi-pvr-mythtv-5.9.1.tar.gz 702309 BLAKE2B 351aadec6d76f96ee4056b11c12d2dbf3b92f4e301c56279cefdc42e0a4c4245f836f8d1ebf8f2d7dd212409cb0b390bb0eba1a45365131fa654f682337d4e8e SHA512 9a93ae34a8ce05425da5330d82650bbd27d7116281099f3514634def8d245623a33dd615d302e4a768e84047f4435ca370a8ddbdbec6217d2554ff8141f659b5
 EBUILD kodi-pvr-mythtv-4.15.3.ebuild 642 BLAKE2B 6b294e422af541a0867bf05d2bbb49e97f343d441b528836deca12cd1f919ecd7504978e5378713ec7019675a50f973dec956d6d93ad2de1d5a3308f3c37f789 SHA512 a5538514f1395a1f736ab751d46cadf5472c3db443ed8ee61b6ed021c358b93b5262cf1cc123c032e4ce3883a73ee677f4e7872190ff971506f2130f4c859283
 EBUILD kodi-pvr-mythtv-5.10.1.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
+EBUILD kodi-pvr-mythtv-5.10.3.ebuild 680 BLAKE2B c6fdc907d8303a6a656e22aeace84f66dbe235babda827c1b70e42c18120fd9ead176c38de20649076857f8e7f3be1c85887c3efb67c09196a31f51d195ab314 SHA512 d3c7cc92c8b5ac95c985b8cb1ada86d1ec11dd627f9c378578dffc6b3035aa63996912fcf0fdf53bd46d976e7d22fce0cd55dcd8490a1590eec265c6c74d87ca
 EBUILD kodi-pvr-mythtv-5.8.14.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
 EBUILD kodi-pvr-mythtv-5.8.15.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
 EBUILD kodi-pvr-mythtv-5.8.16.ebuild 680 BLAKE2B dadebd6ff7bf56b9f11dbd44f04fbc9f3c9cff0fdf9f322340b070d534a37e72e0df943c27cf37f68fa40cc29b8b2cd6c5ac2d73e7097b7a57d1a6c7d11f0305 SHA512 99cc81f96752512a0361d0147ca3503f5692df6ff3a4262164bd08431afe4a5dd6ce4173d1839e43df5b6db048c1c8370a8abc8301e6eba8656e7f5a2bb7f033
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.3.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.3.ebuild
new file mode 100644
index 000000000000..8b96d7f0430d
--- /dev/null
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="MythTV PVR for Kodi"
+HOMEPAGE="https://github.com/janbar/pvr.mythtv"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/janbar/pvr.mythtv.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.mythtv-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	sys-libs/zlib
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index ede1570ee3a2..f2dccc808fb0 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,8 +1,10 @@
 DIST kodi-pvr-nextpvr-2.4.11.tar.gz 111677 BLAKE2B ce1279641f4ed1bd5e1a0731198775c2ca6358ac8de846bc57588988eb415bfbaf9fe069b84717368eafb9fa01b232b833888c8580bdd886d1331618c369faab SHA512 2c9e98cb6b99aca8c582d4751096c7ef445f97b09fb6d51c798767c7a7b54632bd4e5c7fb2d723b023eeb335daa73e53ba455156bd8e8ea863c3a98659e5e906
 DIST kodi-pvr-nextpvr-2.4.13.tar.gz 111692 BLAKE2B 5199c9fb8b767eeaf116ed87abafe0d5f0e1e252fae945589413c002b313a222090c9cc12db02e927f168f6217c2fcff55f20adef984e54bceed92755e9922a5 SHA512 314217bca4ce7bf43900e8572fca158874c90bba50ca78b7541e804a3b00216bb39ef7624a270ceb4407f33d85b2711c7b58ea9b4ec1a0386d3d7697cac29c2a
+DIST kodi-pvr-nextpvr-3.3.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
 DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
 EBUILD kodi-pvr-nextpvr-2.4.11.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-2.4.13.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
+EBUILD kodi-pvr-nextpvr-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
 EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild
new file mode 100644
index 000000000000..be53994bd0ff
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index 91611d68d00e..c3726d8ddeba 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,5 @@
 DIST mda-lv2-1.0.0.tar.bz2 2154530 BLAKE2B 4053f7e8c861487ce32fb5e4b94e643084f9a6aa91423011c52c0b8938308abff12a3804b194d7ac2a30a1e5d13e1b69add1b5c18927b4dff687a79b250d42e2 SHA512 3ee521d916eeaec14c64d3cc84d036e3c2152441cb1c266d8971e823a7e498039a210e49af5f1a9a773ac85cb49c620acf64e46a0625c6969f559b4c99786575
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
 EBUILD mda-lv2-1.0.0.ebuild 523 BLAKE2B 24fee74b5be424fdee8f6bb9e5300eb59c2d85d884f6e747666ff2fa7ba17775f1ef4707b61e2073154b35986a428a6e263f916dc79d2e80e988835054d5159a SHA512 9b45585221236cb5e334e3b551bb39324ede6cfaeb8ea8284d5223e37c22dbd062693dc8d72986a16ae9f7d43323dfb163c8c803cf5d936621355a05c4b499ad
-EBUILD mda-lv2-1.2.2.ebuild 531 BLAKE2B b89e12ae408b8ef0af96bfd1b49f631ef305e60f3fc1f0986013f887aeabce6af271704f860ccfbedc0d80baff8addf8b650e6d3dca9c5424ddb58f927b77398 SHA512 c3f7e21427c2cd58ae14aab362f1501716b9b53300ba773b46892f82807c5bb841c62fedf54642edd03ef26568a6c3389ca073998bc855416a01e4fe15ab7db6
+EBUILD mda-lv2-1.2.2.ebuild 527 BLAKE2B efdbee9095c6655c85a448ec4b556c40477752190de34838c9a8b87ab19f232bf2da656c2fa0c6f63739a8d14a4f0dbff8bbb2f6d9d5b95fc41bf5471d86ebf5 SHA512 a1cf9bf73f3c9d2acd5fa83b4f7ec0addb97c01d151b0b36728d3a38258f1f50c5c77e7db29a251625cc5ba08259bc052ab33df4c2c582d12b33c83dffde4a8b
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
index 2bf84207a521..44d6b71b9b3b 100644
--- a/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
+++ b/media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="media-libs/lv2"
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f965ac94fe56..4b7907ac707a 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index 085fdaef631d..6b05d6e1fdf7 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,18 +1,5 @@
-AUX 0.10.0-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b
-AUX 0.10.1-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b
-AUX 0.8.0-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b
-AUX 0.8.2-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b
-AUX 0.8.3-makefile-removesymlink.patch 408 BLAKE2B 096eb4a34e60a16a46c324a04ad16688138569ab92a1937f97789e1520c258500e41c8771fcdd6aa612951aa5abd213e91d86bd82c7b2b1ff508e740346d9d60 SHA512 bb7620039ffb8e262a6cd018fdbdfef6df75e3ecae854c1a6de39a6924dfeb84e9e5536eb9f13e9ae620ac3794f342e5660c579d6b228d6d63d43b0f73c35d3b
-DIST js8call-0.10.0.tar.bz2 41235090 BLAKE2B 064c44a59f3109aabdf104b98ff21585235f375dec385db86744da64caf417719b85fdcdbd13bf22846886e0b954ea79b7a380441f7df79e98e65df4132e6c09 SHA512 c6cd33bd0459e0834cef069b54167a989e06b17a9aeca33a5f45e801b2203bd62dc552037d405f3305505c6a6bd93d4851ba6be7e8cb553a493da92db83f38af
-DIST js8call-0.10.1.tar.bz2 41235982 BLAKE2B baf41629ae6948b6b5543617a79e0fee18de6e95a9f771ab6d49a2fac0a628c1e8a9ab8b028df42f002ddd7436c8367020c5af54c2ddd68391c919682e9a4a63 SHA512 967a81dbac850472efe3053dee0eb5d616c3c62c20155208de700b2b6ad2f4af54da63e10e1ed58a758cfc0ee5f8d5cab80575d285f62a0b2dd2225bcf0689d3
 DIST js8call-0.11.0.tar.bz2 41232664 BLAKE2B 6a78e19aebcc003e82b9db86d212a30f227a4dc17bb2c68c0c4954f32921af4251c7b2d49579bb35733995dd7c79dafa70d3143c1c0fe44dd7e2a060acf8d0aa SHA512 e969c8d60eb7e267bf80b16dc00a052f03c4ee35c99b797b5dae78ed94f90762015658acd76b37157ec5d61a963478fc1dbbda507a95299126fe18887e7f8177
-DIST js8call-0.8.0.tar.bz2 41226056 BLAKE2B 68894f44c36bc1ede57e9596545a9dd1c3ae53ce0a24e3ea7086f5696ce4deeda2ef8e716ac2e02bfd71c69266a7e867898bfddc2616284a564c753af61e27a6 SHA512 5beb98c7f1d805e3c4dd06a584a5b5d0efc8336da527b6d3d4f53b480c366b8c9e4f902c8c6139bbb379d875538382d1c5a4549dd2a97f408656c7da6fec5796
-DIST js8call-0.8.2.tar.bz2 41229377 BLAKE2B 44be0d4e8d8104ee10e57b2cbff6b3bf794034a8cda398c62eff21e50060dbcc0cc0e35d5fafdf0d00dffa65fdaee286a4a566bc5a05bdb3fc7a797c41a6128f SHA512 54e47abbb5a092f85060ecfd51fb2e6aad5cd41dc91ef6224c3ea5bf3c17a3e2e07435a7d7ea73a0838ec644c11eb48ce644b4c7afd6a8e5d6862e1141cc51fe
-DIST js8call-0.8.3.tar.bz2 41231140 BLAKE2B 961a6318ebd9bd7514e662e0e523d04bed8898fbfa4c4d86491690805f15acf78d752839399ddf209b48b6653c6f621aed827ff164a71493ba66398697143be0 SHA512 e90e059bdf5e700cfd710430040c1bc3247bbaeaa258914a5ecaa1ec73d94933ee00f59200b25e0421102045f678204ec54d80e82a6a77abbed7b978d202b8ec
-EBUILD js8call-0.10.0.ebuild 936 BLAKE2B 3c4b9cc4036f5bc5ba1fadbac5801d10c760b2feac67fa812e5676d8d51f8e8950c4e39c5b174c5776685bdf235402deb1467f260bbd0e9eace4b2d0c7c6a015 SHA512 04da1a980bd525019b348c429decefa0c7eabbfd82d46df20c91fca48a4dd2798e2e7136e19bc03a697a7d24246b11e0f0988967ca17e896026853c0275dcc32
-EBUILD js8call-0.10.1.ebuild 936 BLAKE2B 3c4b9cc4036f5bc5ba1fadbac5801d10c760b2feac67fa812e5676d8d51f8e8950c4e39c5b174c5776685bdf235402deb1467f260bbd0e9eace4b2d0c7c6a015 SHA512 04da1a980bd525019b348c429decefa0c7eabbfd82d46df20c91fca48a4dd2798e2e7136e19bc03a697a7d24246b11e0f0988967ca17e896026853c0275dcc32
+DIST js8call-0.12.0.tar.bz2 42973126 BLAKE2B 9af3d97fc7b2d4cf658d59c1349a4f624b57a48ff120590a57b733ddd7c2766d0287273742b24bf4f6fe54e8496ebc0da392df3d1cc583aabc3b6b2865dd3428 SHA512 88096e04e14365f5fe65e7e083fdcd1b98bd02d7ecb68498b1df6cfad65b5c3ec1953941edea6300940285f148cdb021400f2a4b5b1919e1c0581356bb4655f6
 EBUILD js8call-0.11.0.ebuild 878 BLAKE2B 6c8a1bd9e43bb1b490ecd21fad8a6dc75e7d21c978bd5bf6abe0ee33204c1182f408a8bd2f1d9b4b2912c2e8888afea0419f5b30055d372006b2278b6e96a321 SHA512 323c28b10fab56b7b7d3298c3a7f3ad8720458f0032bca6a47b6c8930a5152ece75ce1a1a3c8bc20235902a0d98fcaf301ab5ad3d178d9b6eeaa700d7d784fdd
-EBUILD js8call-0.8.0.ebuild 1128 BLAKE2B 0e0dab51e203b0e0d9e2027a55eca992babd136d705a45979122076663bbb9783560c5a891b2448451a100cd13fdc3a64ab4f51ea8a83a1552c140a580f2ea7f SHA512 a44c0b1735162934f1b3d8aa88661c73449a133273287d411da6451e62775e832c8516c2fb6e1de0afaf466606b129b31a592559a78d9a75791c1d369499716c
-EBUILD js8call-0.8.2.ebuild 936 BLAKE2B 3c4b9cc4036f5bc5ba1fadbac5801d10c760b2feac67fa812e5676d8d51f8e8950c4e39c5b174c5776685bdf235402deb1467f260bbd0e9eace4b2d0c7c6a015 SHA512 04da1a980bd525019b348c429decefa0c7eabbfd82d46df20c91fca48a4dd2798e2e7136e19bc03a697a7d24246b11e0f0988967ca17e896026853c0275dcc32
-EBUILD js8call-0.8.3.ebuild 936 BLAKE2B 3c4b9cc4036f5bc5ba1fadbac5801d10c760b2feac67fa812e5676d8d51f8e8950c4e39c5b174c5776685bdf235402deb1467f260bbd0e9eace4b2d0c7c6a015 SHA512 04da1a980bd525019b348c429decefa0c7eabbfd82d46df20c91fca48a4dd2798e2e7136e19bc03a697a7d24246b11e0f0988967ca17e896026853c0275dcc32
+EBUILD js8call-0.12.0.ebuild 878 BLAKE2B 523cff43f98e36870187557b0db258ff26aa38444ec2d09a75a90b51790da0fdc778019e95a749c602676d83873a6b470b799ae91b20c9682f262359d39c4bb3 SHA512 8aab4cc95997048718b174e5ab088cd62b938954f7bd3c81d451c7c96252158bc930b71ed04711be57fe6615682ad0cda50334169f4fdcc1fbc9c3447cd98246
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/0.10.0-makefile-removesymlink.patch b/media-radio/js8call/files/0.10.0-makefile-removesymlink.patch
deleted file mode 100644
index 0bb3349cbdfd..000000000000
--- a/media-radio/js8call/files/0.10.0-makefile-removesymlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2018-10-31 17:52:18.252760284 -0400
-+++ a/CMakeLists.txt	2018-10-31 17:52:54.507461091 -0400
-@@ -1272,12 +1272,6 @@
-     #COMPONENT runtime
-     )
- 
--    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
--
--    install(FILES
--        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
--        #COMPONENT runtime
--    )
- endif (NOT WIN32 AND NOT APPLE)
- 
- 
diff --git a/media-radio/js8call/files/0.10.1-makefile-removesymlink.patch b/media-radio/js8call/files/0.10.1-makefile-removesymlink.patch
deleted file mode 100644
index 0bb3349cbdfd..000000000000
--- a/media-radio/js8call/files/0.10.1-makefile-removesymlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2018-10-31 17:52:18.252760284 -0400
-+++ a/CMakeLists.txt	2018-10-31 17:52:54.507461091 -0400
-@@ -1272,12 +1272,6 @@
-     #COMPONENT runtime
-     )
- 
--    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
--
--    install(FILES
--        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
--        #COMPONENT runtime
--    )
- endif (NOT WIN32 AND NOT APPLE)
- 
- 
diff --git a/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch b/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch
deleted file mode 100644
index 0bb3349cbdfd..000000000000
--- a/media-radio/js8call/files/0.8.0-makefile-removesymlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2018-10-31 17:52:18.252760284 -0400
-+++ a/CMakeLists.txt	2018-10-31 17:52:54.507461091 -0400
-@@ -1272,12 +1272,6 @@
-     #COMPONENT runtime
-     )
- 
--    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
--
--    install(FILES
--        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
--        #COMPONENT runtime
--    )
- endif (NOT WIN32 AND NOT APPLE)
- 
- 
diff --git a/media-radio/js8call/files/0.8.2-makefile-removesymlink.patch b/media-radio/js8call/files/0.8.2-makefile-removesymlink.patch
deleted file mode 100644
index 0bb3349cbdfd..000000000000
--- a/media-radio/js8call/files/0.8.2-makefile-removesymlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2018-10-31 17:52:18.252760284 -0400
-+++ a/CMakeLists.txt	2018-10-31 17:52:54.507461091 -0400
-@@ -1272,12 +1272,6 @@
-     #COMPONENT runtime
-     )
- 
--    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
--
--    install(FILES
--        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
--        #COMPONENT runtime
--    )
- endif (NOT WIN32 AND NOT APPLE)
- 
- 
diff --git a/media-radio/js8call/files/0.8.3-makefile-removesymlink.patch b/media-radio/js8call/files/0.8.3-makefile-removesymlink.patch
deleted file mode 100644
index 0bb3349cbdfd..000000000000
--- a/media-radio/js8call/files/0.8.3-makefile-removesymlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2018-10-31 17:52:18.252760284 -0400
-+++ a/CMakeLists.txt	2018-10-31 17:52:54.507461091 -0400
-@@ -1272,12 +1272,6 @@
-     #COMPONENT runtime
-     )
- 
--    execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
--
--    install(FILES
--        ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
--        #COMPONENT runtime
--    )
- endif (NOT WIN32 AND NOT APPLE)
- 
- 
diff --git a/media-radio/js8call/js8call-0.10.0.ebuild b/media-radio/js8call/js8call-0.10.0.ebuild
deleted file mode 100644
index 3c94dd232a64..000000000000
--- a/media-radio/js8call/js8call-0.10.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils vcs-snapshot
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://groups.io/g/js8call"
-SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	media-libs/hamlib
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-0.10.1.ebuild b/media-radio/js8call/js8call-0.10.1.ebuild
deleted file mode 100644
index 3c94dd232a64..000000000000
--- a/media-radio/js8call/js8call-0.10.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils vcs-snapshot
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://groups.io/g/js8call"
-SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	media-libs/hamlib
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-0.12.0.ebuild b/media-radio/js8call/js8call-0.12.0.ebuild
new file mode 100644
index 000000000000..ed7e9ce100ed
--- /dev/null
+++ b/media-radio/js8call/js8call-0.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	media-libs/hamlib
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
+}
diff --git a/media-radio/js8call/js8call-0.8.0.ebuild b/media-radio/js8call/js8call-0.8.0.ebuild
deleted file mode 100644
index 56ab3bdda141..000000000000
--- a/media-radio/js8call/js8call-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils vcs-snapshot
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://groups.io/g/js8call"
-SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	media-libs/hamlib
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-
-}
diff --git a/media-radio/js8call/js8call-0.8.2.ebuild b/media-radio/js8call/js8call-0.8.2.ebuild
deleted file mode 100644
index 3c94dd232a64..000000000000
--- a/media-radio/js8call/js8call-0.8.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils vcs-snapshot
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://groups.io/g/js8call"
-SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	media-libs/hamlib
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-0.8.3.ebuild b/media-radio/js8call/js8call-0.8.3.ebuild
deleted file mode 100644
index 3c94dd232a64..000000000000
--- a/media-radio/js8call/js8call-0.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils vcs-snapshot
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="https://groups.io/g/js8call"
-SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-PATCHES="${FILESDIR}/${PV}-makefile-removesymlink.patch"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	media-libs/hamlib
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 8dbcd4502dc0..3713a9c4b62e 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,6 +1,6 @@
 AUX 2.3.1-suffix.patch 639 BLAKE2B 478f9f45bc3151d4b10c1c55ac5507490de56d33dcbc7b39ac0c52ba813a89e28c49628ff551c57c55b52da028c15d1e481508bf13a835dff244759c009cb838 SHA512 a255937915503e5d600141fdee0e85032fe39bd66de0d17d65747ee96441207be987225122bd7eed6eafb5119c93031933add7afc01ac3358b0d2255049c7397
 DIST tqsl-2.3.1.tar.gz 2896807 BLAKE2B f2937950b5328cfb0a13b87797f40594799e01139d5b307199095b8cdbe6f4532e911fd9661ad3b663d8616d9287d8a359f2fefb4364c6450ba4be2505a89c63 SHA512 edaa21b1605bcb38790a66d61e1498a04f41c4f9b3b577908a6e57cd38e1ac2e1724e9c6d5421e0ca4a4ea72d1d5f5d54f08bf5a6c202bf68181ec12f27d4afd
 DIST tqsl-2.4.1.tar.gz 4191260 BLAKE2B a70652c12e0704daecbd6d38bddcc386de55242feea9d2905c65dcfa01337c0a2f31ec8596b7cf58b35c77da0f6b79ecf9188bc4f74df51b9e2479361643e3ca SHA512 7b61cf2dc37a3216548e9b82335bae2947be2c2ea4c43860fb4baffd4ce13f5f3d61cd999a293d4baae87835c56d2eb2fcce8a36f17eeba4e18ccab3e5053b60
-EBUILD tqsl-2.3.1.ebuild 645 BLAKE2B a7733f2a08b6b579d4dbe9d44022aa85343bc85f425770633f856fc8196ea10f5046640c488bded171a8901e35ac633de453f2ce28da1ade3c357ef2d6d71556 SHA512 2dcdecebc587a754b0d55b3db0513fc3cba810ce47eaf56c9e15fdb1ea4693cb1c3a516dc2a2ec3e597cb5a5f3998de76d26932d8594b0f7bae87d206f3fe9a9
-EBUILD tqsl-2.4.1.ebuild 642 BLAKE2B be638a992c47d471823e016d96dd4c49bbfe7bec33a408f968b2221293766caaf417b0b6967c06e9005fb4ccf81aa75e6ff066c156ac7cd5ab22ead1b543f00d SHA512 c02515af9d16087cd660667648b11e0e375cddca6d53763ccae9906a1a0fa2a42cd8079ee969347864df64b05514fd76dcec8b70d9f2e6fa96fce447350db298
+EBUILD tqsl-2.3.1.ebuild 643 BLAKE2B 3abb0fdbc9986af76e605f17e2de136c2be18b0b79b0abedf04eb7d399f983ac5a4c27e195954cf902293eeb30686785d18e691e6d1ebedfd58d135185061c10 SHA512 87114cd8abc4604e769a0c508ae21bbbe57349539cdb631fff90293b90b029795723f5379c2ba3b176869f5d0a0583f3266f9616e3827f0a756b230c6ebfab63
+EBUILD tqsl-2.4.1.ebuild 643 BLAKE2B 00ddfd505c0ddd1b472ec292b96644eda8c6973c1a1f0bc82d6abcece6ac832265d18d97799dbae05f4940d563cdd1e9c1f33a06e1f2c1e10d1d1f0cf559134c SHA512 1f88389b4f31966a7e4e9ab820fe74c4bd3ce73c661893c0c03f7d41ca6705b84262539d74706698c3927455b8bf39fd5d0e56a93386bb804d7a7c9e726ce69e
 MISC metadata.xml 290 BLAKE2B f7cef55d87602daf43b81563c336871a73782896b4114ef472be770bf6fa28af5672cd6eb846e8a00fd486878d39912f3599fe8b0699683ffd0970727cdbf517 SHA512 77d017e74467e30678cdda40874f4905e78c3589f51d5e0e90952227c10a070ba4132b028d18825134e7bf9a36c98ed7f7b2a19e22324202261c1098db42f7c1
diff --git a/media-radio/tqsl/tqsl-2.3.1.ebuild b/media-radio/tqsl/tqsl-2.3.1.ebuild
index 7562cb9ff583..8f5d89ecf238 100644
--- a/media-radio/tqsl/tqsl-2.3.1.ebuild
+++ b/media-radio/tqsl/tqsl-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/expat:=
-		 dev-libs/openssl:=
+		 dev-libs/openssl:0=
 		 net-misc/curl:=
 		 sys-libs/db:=
 		 sys-libs/zlib:=
diff --git a/media-radio/tqsl/tqsl-2.4.1.ebuild b/media-radio/tqsl/tqsl-2.4.1.ebuild
index 492427664781..da5bebcbef25 100644
--- a/media-radio/tqsl/tqsl-2.4.1.ebuild
+++ b/media-radio/tqsl/tqsl-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/expat:=
-		dev-libs/openssl:=
+		dev-libs/openssl:0=
 		net-misc/curl:=
 		sys-libs/db:=
 		sys-libs/zlib:=
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b8491493dae0..cdbc0e54392d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 40b3933c53e6..ea9f59ee2d96 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,11 +1,14 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
+AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
 DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
+DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2250 BLAKE2B 91f62ec519292ed9ca58c3be32114533da746c9d749db5f8d7c29aefb799342957a4078f9c207713e60582001578850fb1153f33d169cb36297ceb0f1112e5c8 SHA512 8a84e7ba4a4e861f9ad691e87e9e6d5ae42d38365252f3182374f83f37af5cacb9e365a4604e00e7c8dcaff1366ec825b97faefe8553468093d650087cae5c39
 EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
+EBUILD alsa-utils-1.1.8.ebuild 2327 BLAKE2B a6dbd0cedb1f3c9be217caa581f6e3219590f0ec9928d86bb6dadaecc5994c0bb6d805f45b91f5df44c116a9058da1cf560c296114d6975220ee9b2c77962bc5 SHA512 b1b97a5e3ebbafe230187da5bb8563fd680da4e414c0fb5797904fd9e594491496a8500f95e886573fe91e93b551f20d95cf330f48d0898674dec8597f61016b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
new file mode 100644
index 000000000000..bcc1f868e6d6
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch b/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch
new file mode 100644
index 000000000000..560d538a1cb1
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch
@@ -0,0 +1,50 @@
+--- alsa-utils-1.1.8/axfer/test/generator.h
++++ alsa-utils-1.1.8/axfer/test/generator.h
+@@ -0,0 +1,47 @@
++// SPDX-License-Identifier: GPL-2.0
++//
++// generator.c - a generator for test with buffers of PCM frames.
++//
++// Copyright (c) 2018 Takashi Sakamoto <o-takashi@sakamocchi.jp>
++//
++// Licensed under the terms of the GNU General Public License, version 2.
++
++#ifndef __ALSA_UTILS_AXFER_TEST_GENERATOR__H_
++#define __ALSA_UTILS_AXFER_TEST_GENERATOR__H_
++
++#include <stdint.h>
++#include <alsa/asoundlib.h>
++
++struct test_generator;
++typedef int (*generator_cb_t)(struct test_generator *gen,
++			      snd_pcm_access_t access,
++			      snd_pcm_format_t sample_format,
++			      unsigned int samples_per_frame,
++			      void *frame_buffer, unsigned int frame_count);
++
++struct test_generator {
++	int fd;
++	uint64_t access_mask;
++	uint64_t sample_format_mask;
++	unsigned int min_samples_per_frame;
++	unsigned int max_samples_per_frame;
++	unsigned int min_frame_count;
++	unsigned int max_frame_count;
++	unsigned int step_frame_count;
++
++	generator_cb_t cb;
++	void *private_data;
++};
++
++int generator_context_init(struct test_generator *gen,
++			   uint64_t access_mask, uint64_t sample_format_mask,
++			   unsigned int min_samples_per_frame,
++			   unsigned int max_samples_per_frame,
++			   unsigned int min_frame_count,
++			   unsigned int max_frame_count,
++			   unsigned int step_frame_count,
++			   unsigned int private_size);
++int generator_context_run(struct test_generator *gen, generator_cb_t cb);
++void generator_context_destroy(struct test_generator *gen);
++
++#endif
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 770f8af54fed..a5c178400183 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,6 +1,6 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
-EBUILD bluez-alsa-1.3.1.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
-EBUILD bluez-alsa-9999.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
+EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
+EBUILD bluez-alsa-9999.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
 MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
index bb62cc607f2e..c883ca5ff3ef 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,14 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index bb62cc607f2e..c883ca5ff3ef 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,14 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index a33638a729aa..a325b0c7e1f3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,7 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbbece6219feede3e35f9304de783787a75e43f6a1ecabc2d9bdd773c1c5db3e6d85dc206ed5e0d8425c23a37b52d0213 SHA512 e6b8d714ca6a37fd096ad77fb187e9552058dae98c73ebed9f30e04dd03f8467a27ce0cf1afa9a868e86cb5c8aad05599bafb6b56929de9753251e2bb22c6b78
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
+DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
+EBUILD cantata-2.3.3.ebuild 3195 BLAKE2B d9dd77ad8ebd2721221e64d867eb0236c16618808348a556c02e03adfe22cec33fd142240c4df673ca420652b54f0d7a6b2ad40b8897aafddb745a44b2b48608 SHA512 d51b4c23ce8ff69b1d815edea7f09e26003db1d009a85a8a6fde855e4bb39a30456204740eaad2c9b7fe8c37643f5fa3bb0953e6f26c034d4419bf74c513466e
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3.ebuild b/media-sound/cantata/cantata-2.3.3.ebuild
new file mode 100644
index 000000000000..0db70f0c745a
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	streaming? ( dev-qt/qtmultimedia:5 )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		udisks? ( sys-fs/udisks:2 )
+	)
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+
+	if ! has_version app-misc/media-player-info; then
+		elog "Install app-misc/media-player-info to enable identification"
+		elog "and querying of portable media players"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index a1c16b3f58f1..a8585a854aff 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -4,5 +4,5 @@ DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68
 DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
 EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
-EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a
+EBUILD clementine-9999.ebuild 5153 BLAKE2B 1f43fd1abb60716a257dea4892036352fa419fa38ec606c9cfe7a12ebf10e31d817f44f8e7744eb043cf71e8a08057bccd58c5bc8416185d22dc4f8bd23cf8bc SHA512 ca24106145c5fe3a1ecf1a80fd6667ef02330a3da854b33e35cc0e303023e60bc177fc51cf89c9a050ddc99eb7c00a4bf017359b2824be6bdf94d08edd451cbe
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 78421f8b1167..8fcba65622c4 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,9 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	COMMIT=
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P^}"
+	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
 inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
 unset GIT_ECLASS
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
-	virtual/opengl
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
@@ -61,6 +61,7 @@ COMMON_DEPEND="
 	projectm? (
 		media-libs/glew:=
 		>=media-libs/libprojectm-1.2.0
+		virtual/opengl
 	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
@@ -81,7 +82,6 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/linguist-tools:5
-	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	sys-devel/gettext
@@ -89,6 +89,7 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
+	projectm? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
@@ -136,7 +137,7 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index 60bca8345645..49f8a60c9bef 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,7 +1,7 @@
 DIST cmusfm-0.2.5.tar.gz 28651 BLAKE2B c69dcaa5900ed4cf3d1a0274ac3dc6e6322b73222a472c26434fa4912c2f351fa67b0f3ac1d91df9f707d5c38d6ffa7c4401ed3500ed929adcbb63b9e513f765 SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae
 DIST cmusfm-0.3.1.tar.gz 34521 BLAKE2B d5f7ce5cb37a03114e910f0ad7fd39bb3e940ce9d0ad416e464dc6cfc5438bbe901845b610bd8d0e508bde236ef6ed9cb894afb5a4cae710b1347d3173ffa60b SHA512 2d4d551d2a82fc2d70c7f75705f8cec236a0cf7b8e5268c91cc32b4ede4ecd51c4577d673b8c36f041e514af59142f2c9c001cd422c0790f0e0b3596b4394064
 DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
-EBUILD cmusfm-0.2.5.ebuild 867 BLAKE2B 7df639f3de885e1875bba7d2698d7fb21458ac112f7fd42f05503ce3f8687d7890f230fd5b37f6089d0858ea88d077a886d271818dff5d83c766884e0520e9d3 SHA512 a66b67a699e56e9b8d09e66e1e969ef914f98b465811a581a99460b48572dd2e1f9786c493d003c151198183616c5e1074e8f8a46435d1c223378fa3a7a17a69
+EBUILD cmusfm-0.2.5.ebuild 867 BLAKE2B 5fe3f2d2bb351af4f6ad3c45804fcde9852208f34f092be37c180602a96d79d17acc5ccc171366cc633b13ed9b2b8d732c96fe83bed39579022d7ac268afafb4 SHA512 852444e6d0acbd19536ddcd76822de5b5a056eb4d7b8c4e6dc355f0ac16a24d6bff8993b7032da28ad52c7265e0bf06b65cfa4bc73a1cfead5b7d8faa89b7b42
 EBUILD cmusfm-0.3.1.ebuild 840 BLAKE2B 0d11dacbaf8c1f76800f7047f75385dcf542fe38fe80f25a8397e435538a04960c507b8b41c0e6583be07188298eb565d2b42bbe97818b245f0b0c3d95a32821 SHA512 30d2b76f3ad5f5ae6d590f7d7432bfaef706021d98615424a2145edf15591254e7330316abbc392a66607767fdeafac8075dfaa9ce537432335a903607a3e6d8
 EBUILD cmusfm-0.3.3.ebuild 840 BLAKE2B e8f63cc66e0c89d19fe660b9b8dd9219262bc8fdd2540b65ff65ebdb4dffffe2f87293d4cb4752e50bd2056eeba3bce444bee134aaf3c5f92a2da98f5ecf7e9d SHA512 a5f8add218d22e8a95b4bac4fd2fba6edcfd0f6e1ab6c647f1701671c3ee0ec6984905160dc4a8ee2833149022224cc7cb1fcf20b7b594f9c69889f301e87d1a
 MISC metadata.xml 339 BLAKE2B 6a18cee3e017ee1e67fc035e63bcf5248a175a2e116964467f8f021e5b3f49606dbff1cc7aeb472e81d4f44c767e077b24fcd9f533868f0c4332f8d6465ec961 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b
diff --git a/media-sound/cmusfm/cmusfm-0.2.5.ebuild b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
index df0641f9480c..704bd8f11246 100644
--- a/media-sound/cmusfm/cmusfm-0.2.5.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
 
 DEPEND="net-misc/curl
-	dev-libs/openssl
+	dev-libs/openssl:0=
 	libnotify? ( x11-libs/libnotify )"
 RDEPEND="${DEPEND}
 	media-sound/cmus"
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 31f7f5f3b87d..b328135d8590 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
 DIST gnome-sound-recorder-3.28.1.tar.xz 458764 BLAKE2B f6d8691758b85e6cfad0d9ddc8d894bfe8a78d34084524986bf6df694c50ca615a666a0d6fc56a82149274f40c346ed6fb317668a5d6a729b06ea4516bcb7f66 SHA512 badc5b9013a5b2e66078e4e3c93431297730b8e8ef241daa30d1fd58c5e7d6f58201c569cf8e58b24c1510fa6cce068740a0e68015b5bd59f793cf18c9f566e9
+DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
 EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
 EBUILD gnome-sound-recorder-3.28.1.ebuild 1082 BLAKE2B cca83913fb79be60ee6e39f9effe4d37715aecc8392bf6dea364381df216b2c61fdb30e961c12fcd7152c3efbada9b47bca85037dad901f824a1634b3d2f5014 SHA512 74ee69a6dc5224fb35d532baccb1a2cf6ea234c544bf32039de740ff4ac22e80d9847109d5db2a63c1ba9a5565768318d215eeb26ee7b1995730dec83227fac8
+EBUILD gnome-sound-recorder-3.28.2.ebuild 1082 BLAKE2B f549983172742bbd2d8c47754410fbad4bc68e663f06f846d8c0467d3bac5cd658a9855cc3613743febc3f3731bb4d235c3ffa381c743751568de6a02f6a6e7f SHA512 e3c2a4267d968815e21ff5b75ce48fb78a7bb0ade398e7f34bb6bdf1dd383d3f3187024025e14843862caef7ae685d74cd310c3fe76d25f02693cbad410d941d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
new file mode 100644
index 000000000000..3a1a0f652494
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/gjs
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 5c9a89919c77..8b55b8dd358c 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,9 +1,5 @@
-DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
-DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
-DIST grip-3.8.1.tar.gz 960857 BLAKE2B 0d1323961eeb9593fb4644a31369852f8d40582b7ba00af3b2255f443a354cca74f5d60c80b135d09bc514d8302807191e6c8f38bf080d5a6237859ccfc90178 SHA512 9e1ebdf6de523c4b818f2b35f976ea0ceb83f7769e3355a7a5af8ea831c34be21ad0dd2106c3ddb8f61d31fe3f32e745ab806fd6aa125a06beda3d2bf381428e
+DIST grip-3.10.0.tar.gz 980402 BLAKE2B fe5cd88d170c64916abffb69fe07b66452a11ae13d75d0f24ae1cdae3bf87c1dd811f5d30be2379cd2bcd4a47ef8e7f6603c5573ffead6c94105585533645b85 SHA512 61253be210d006b778d9a071cc8701f11f03ee2f29179a7ba69f5d9309de0e113ab7b0bca5491d8f7603d1df9b912048c4b1a502bcb38c5b54664516be4acdc6
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
-EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.10.0.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.0.ebuild b/media-sound/grip/grip-3.10.0.ebuild
new file mode 100644
index 000000000000..4f7ac3d6b08f
--- /dev/null
+++ b/media-sound/grip/grip-3.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf --disable-werror
+}
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
deleted file mode 100644
index 7eb40385061a..000000000000
--- a/media-sound/grip/grip-3.4.3.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
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-3.7.1.ebuild b/media-sound/grip/grip-3.7.1.ebuild
deleted file mode 100644
index b664cc4ecb4e..000000000000
--- a/media-sound/grip/grip-3.7.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
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-3.8.1.ebuild b/media-sound/grip/grip-3.8.1.ebuild
deleted file mode 100644
index b664cc4ecb4e..000000000000
--- a/media-sound/grip/grip-3.8.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
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 4852df72b6c4..2eba4972c078 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,7 +1,5 @@
 AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
-DIST lmms-1.1.90.tar.gz 16580373 BLAKE2B 7ae6025647f949aa015dc64cb6595e1e13b21c9a9d72699f464c4ab15f3213aff353df840cf520ea48611f45d0aba2cec7c2fbb6ac9610ff816dfe9c81d57ea9 SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
-EBUILD lmms-1.1.90.ebuild 2001 BLAKE2B edbfb370f068786cb2d2d2bd39a3d3203a3c200c52846ac76f5e3f4727a2ce32be8e4585c52a955cbc6eb71e95c0a7a5fca1f99c6549513c8ac52cf465ee6ccf SHA512 0bd83dc94431a467567174d65361c4b381a1286b3941e319d33a72297cccde9ddcec6a885938a51cf4e0c3ffebca0d45d4c0c6004c5e46077a16bdcbf0f42474
 EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
 EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
deleted file mode 100644
index a3e5bc6169a4..000000000000
--- a/media-sound/lmms/lmms-1.1.90.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Cross-platform music production software"
-HOMEPAGE="https://lmms.io"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( virtual/jack )
-	libgig? ( media-libs/libgig )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? (
-		media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1
-	)
-	soundio? ( media-libs/libsoundio )
-	stk? ( media-libs/stk )
-	vst? ( virtual/wine )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/cmake-2.4.5
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/ladspa-cmt
-	media-plugins/calf
-	media-plugins/caps-plugins
-	media-plugins/swh-plugins
-	media-plugins/tap-plugins
-"
-
-DOCS=( README.md doc/AUTHORS )
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUSE_WERROR=FALSE
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=FALSE
-		-DWANT_QT5=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_GIG=$(usex libgig)
-		-DWANT_OGGVORBIS=$(usex ogg)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_SDL=$(usex sdl)
-		-DWANT_SOUNDIO=$(usex soundio)
-		-DWANT_STK=$(usex stk)
-		-DWANT_VST=$(usex vst)
-		-DWANT_SF2=$(usex fluidsynth)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 5177a40a047a..02bc1ca7defa 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,6 +4,8 @@ AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75c
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.3.tar.xz 664992 BLAKE2B 42e2bef46f4eb99e43c4078373dab4301cafa3062459abfed08e9f4b448a1fcfaa40da5a53941b49b426abecf2f31278fdb0857293b24156fa77845c56cbd095 SHA512 c6ce513ea641d026594cd7ae6e9051bd0060e45f5839d89b350ba144cc9094a8e1490052df4d024cbc92d88680ee8e8bae14fc8037431394771018a75c3ee3d7
+DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
 EBUILD mpd-0.21.3.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
+EBUILD mpd-0.21.4.ebuild 8234 BLAKE2B e26601d1a2bba280083324b70b86ce7d52a81d91b94482120ca26f2f3390161d7c6c1b7faff64e7d891da671bb71223e621db026e6f99bff31bb34d911f212a5 SHA512 f2cd49afa96fe36502b3a03d105799209f7cd39bb20ed58b9f181eb8c454d71d0b917de8f5f41fdc421b1f7e94187ad4a534d00bd502d20a863c336dc71ba875
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.4.ebuild b/media-sound/mpd/mpd-0.21.4.ebuild
new file mode 100644
index 000000000000..e93c903ec20c
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.4.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+MESON_AUTO_DEPEND="no"
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">dev-util/meson-0.47.1
+	 virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 0690df4abb6e..8daaffd80963 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
+DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
+EBUILD ncmpc-0.33.ebuild 1922 BLAKE2B 12ccee76195f41dda18d07239f7b2d5976bfc3de0356ae0a6e5b8b22c3accb47a4d768bf1eff1c6f081de84f1e22c5c47abdf1f6d068b6ec535041728db2baa3 SHA512 e9b361a9f9a5c2588a16c3697fe849619774115205cedb4c225c30f536777188a83bb1d3d5190841260a222ce8bcdfd012e57809d2a7c5db3aabcf48c24dc5d5
 MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
diff --git a/media-sound/ncmpc/ncmpc-0.33.ebuild b/media-sound/ncmpc/ncmpc-0.33.ebuild
new file mode 100644
index 000000000000..5aa8337eea5c
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.33.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.47
+	>=dev-libs/boost-1.62
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed \
+		-e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dartist_screen=$(usex artist-screen true false)
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dregex=$(usex pcre enabled disabled)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index a0c378df47d7..26bca5cfcc40 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -3,6 +3,6 @@ AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
 EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
-EBUILD picard-2.0.4.ebuild 1756 BLAKE2B a551d93dd338e98f190d4e269d99eee1b3ad9dff50c7579640636cb38f1966dd1727c2d9c487f02dc27a63e83a8be5814c69d8092845f625e8211babea7bb53a SHA512 79f78d8a674966554680593d0cf45054ee36430baa7462ced01736a658fa87e91e5d3e0129e56d3d400ccdf49fbd51b6a86a1d0009b3fa44310b097ae998ea2f
+EBUILD picard-2.0.4.ebuild 1755 BLAKE2B 1ca7397b6819efea1c2982fe7894084941c24bbe90aeea6bfd4fa450c3eada01591d9821789ab66db0036d3a49d14868f752ee1a0463c68c97ec402af13e0719 SHA512 7f8a7ecfc5a55f6e2b7bc12c039abf561b8d06a761d5ba983d5ffa2d3920841ed1a1f74988101a7580931d44b64e295c5cd982d0cb25c3de16a71876f41f6aa8
 EBUILD picard-9999.ebuild 1696 BLAKE2B 0923250ae18bc8d129649750325e0d8cbe0a9de61caa574f3f73a6023d5b915de3d4615447961ae5c9be24162ed4f6e2cdf69d263b3f80347f92337d0380faa7 SHA512 f85dfa4b86c95e3dcc3cecc4ab04efc14d0cda35e402850b3f2bae56fd278ac9bc9cbb9091367a6c6b1393b16ce055f0618f2e44aa16daa83d2e589ff5ac05e7
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.4.ebuild b/media-sound/picard/picard-2.0.4.ebuild
index 760daf7633e6..efafb521689c 100644
--- a/media-sound/picard/picard-2.0.4.ebuild
+++ b/media-sound/picard/picard-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
new file mode 100644
index 000000000000..5af4680fe088
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -0,0 +1,2 @@
+EBUILD pulseaudio-modules-bt-9999.ebuild 840 BLAKE2B fd2855d5823b84fa98c3a33b2b5e385f0c9085da66464cac6469277f485cd69ca0300dc2ecadcd8006a9b3fb24510bf792b07a526b402a7eabee0e504e75c440 SHA512 cfd3b17327cec5620c9ca8a0bf90a955671e908b8492f8efba3ad84b69e204fad3c2aacf9d605de9751b0100ff554b8e742957db826444481cbba8a7c4eb5b14
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
new file mode 100644
index 000000000000..23b537c2088d
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/EHfive/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	media-libs/fdk-aac
+	virtual/ffmpeg
+	media-libs/sbc
+	media-libs/libldac
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	>=net-misc/ofono-1.13
+	media-sound/pulseaudio[-bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+mycmakeargs=( -DFORCE_NOT_BUILD_LDAC=ON )
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b13210dff789..48c972723199 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,8 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.1.tar.gz 1035274 BLAKE2B c8fd9b6e73ef2abc07837560faa10661a0f46f503b6a6023a9cde08086fafdea18cdc73b99c8fd5176942e066629ffc085e47e591831c034fd8b739ff4975347 SHA512 11ff0a689c6bf718d95eb0202fb73e06d194a71be9393685a2b444c3fc22bfac5f022ee177a73d786e6704f56173fd702f30005e7ace48fb825f3180f0dfe99a
-DIST pulseeffects-4.4.3.tar.gz 1051621 BLAKE2B 24fc360d86a04674aa0bd4cf39b29b1bfcc67acf2001f5ae271a355a1fb01f5be8a76ed588c187c2cb4ca5b7468f72d6df97f502d483b386e2e741493bad4dc7 SHA512 34173c9ad90c2da269cf86fd7410ca0f1614c98065f2106fa9f208bc145509ca1e26342d61012d954e00637bb18a4f456b6a8f5fb432adb6405051c2d9c8cff9
+DIST pulseeffects-4.4.6.tar.gz 1053954 BLAKE2B b88922c591ff24a886d9b66363e5757ad68fe683e7de88d32146a26f8f86aa5a5feb322b75471cec45dae159125f80aab1470503a73a59be4259c96b6c66ce80 SHA512 35eb6c3e750a77c8fcf8de6da0c34ad6d6bcb72b0ee81d5b719aba37a71271b72195bb4d3e1123b4f82ce07ab7d8917c5fe52f5e40e884595d5982e95cff4bec
 EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
 EBUILD pulseeffects-4.4.1.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
-EBUILD pulseeffects-4.4.3.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.4.6.ebuild 1684 BLAKE2B 4c0ef6feb120b67a365ad4a36b1e12e602dc1a0273dfbeb7131015ca803629e0f10690f1c69cca3f315365213d95f117512195db6922d59d6f183c3461b6a183 SHA512 70ad9f9308ad45bf2c5a9b68b68d98aa53ec19386a46029a0d3573790bd5b5f788e0a6c731638f552d82c8edc8525b72c511e1aaf8a879f1a552cc9284af3624
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.3.ebuild
deleted file mode 100644
index edcf67ece621..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
new file mode 100644
index 000000000000..502ea295a5f1
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index fd7a703130e5..033cd7ecba1a 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,4 +1,6 @@
 AUX rhythmbox-3.4.2-gstreamer-1.14.patch 16445 BLAKE2B 0adc6ea739a5a420d8817117cc97477f00453fb0f6426da0dff912ab6ad9ad435645c13657950b1fd31243be4cc21c49d2bf0b5701b5844ac17f8a8279350dc6 SHA512 6e204d2e9af111a138c13aa0a5cb5f74d56ade81e86c7cd5349617119288221b46533682d7b974c1453a6d0a9a0de1fa40f2cc4dcb9f474bb93818d44930520a
 DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
-EBUILD rhythmbox-3.4.2.ebuild 3418 BLAKE2B 1833c5ca7ca047baa21b990ae2254fc1491230fd9c4d8007cb08015554555554821aa5197c22817c4c4fb1635d4964c9449770c8a0262b22a056ffb376d59bdc SHA512 bf81a76ad3bcbe77c4737d69828cb4690f0a8267f93a93d13dd2b4e65c24c130176eef9cb6250132dc84cdc80e4482f7f967dd2cb59bdd1898b28f98928449fa
+DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
+EBUILD rhythmbox-3.4.2.ebuild 3443 BLAKE2B 70ed5f930ef74f4ab93d08af7f60337acdc875a44f752b05cf7a5038889c958a1c71d75e313fb92f61d73dbfa07f183b9de63c0f423efa38f3fa558bf74b97a0 SHA512 fb4a84c482fc82e5cdea2024f5545cf7235789b28a023908278f69c68285d1e58bdb6bcf0cdbe92ed0abbb7514ddd6ec14667a08692336e5eeab671daec194f6
+EBUILD rhythmbox-3.4.3.ebuild 3375 BLAKE2B 6a0cab92219a30abbcb18dd590850e459c90ee650171e5d105bd6c2a264e1125c50ecb4e482e33aa0e50b67042fae6a426f3595d847e34512d9a2e8528f45b19 SHA512 6688812c1f6c2a81ac21f79d77df61a62381427dec5908d85ea61a33f64687d0789f0a42850fb86be3f953e5ade67971c4176e45e673c8c14536d2b6b815628b
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
index 258f18663802..5f274f786f54 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,12 +77,13 @@ RDEPEND="${COMMON_DEPEND}
 		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
+	dev-util/itstool
 	virtual/pkgconfig
 	test? ( dev-libs/check )
 "
+# eautoreconf needs yelp-tools
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gstreamer-1.14.patch
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
new file mode 100644
index 000000000000..a9801c4d3bc9
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.20.0:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.42:2.4
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
+	>=media-libs/gstreamer-1.4:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	)
+	udev? (
+		virtual/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+# eautoreconf needs yelp-tools
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P true) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	gnome2_src_install
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 415c7dfcabde..fc44b37da93c 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.94.262.g3d5c231c-9_amd64.deb 104191924 BLAKE2B 75d5067fee6333897e33dd43f3bea11f0811df30f9d3d35a537298675516e6e9c8af609460daaf2a79be91133b45a4b76c9539abee9cdbc04362caeefbbea27a SHA512 e6aa650a207fb636cd789055d4b17bc9c0fec1f6421877e4e80d3d5239f1a1bb881c5bfa4788a6cbe7748175e6c731af66a3395d2089d2d9a94dabfe5d07b09f
+DIST spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb 105145290 BLAKE2B 1ffb55ac3684d021b181e27d1183c5f0c1bd22ad8e6decbd64b0172a7925e824b6f74d40edbb1ae4401bf954860f47d9d1ffad6d879e85e02406869709d817cd SHA512 8ecff0657849058863deb8fce9304d4c9aa5a511f8043a0ba52d138a29979d3217da7568ab2058271f3e448206406fc0e1651ba7d438f677b1a2036ecb5937e2
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.94.ebuild 3429 BLAKE2B 13dd3c2f7bc09032bb9d42f20b502ec6448d54d4b51ca370a52beaaa66e8355d44e01850f15cddd1e237a267348edc5a91507931be3c0d92a3e6bae1fbfa67ef SHA512 38f275b7f5d77357d13cbfadda4b4e00605f1613421d5de755eee3d4fda08ac3ebad067183d07d443af25ebc5a64897374af7a764bedf051c7fb8bde664569bf
+EBUILD spotify-1.0.96.ebuild 3430 BLAKE2B 2078bd77d0f4e59f7a09181cab4fac996c34fbfd47fa0194eed1a691951fc425043e4a6a97a4cfb50f4b52cb5e14bf32dbf75fccad31aa166a7ebffd817f50f6 SHA512 2e8d7f6033d2bb79bd9d6bf244f737ac48b268640f6252b3db10f0f152e6cc4e3ea6b85296df1cde00a40e5357627b6825dae0a11364fd935ff8d4ac23729d27
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.96.ebuild b/media-sound/spotify/spotify-1.0.96.ebuild
new file mode 100644
index 000000000000..6de8d1d091fb
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.96.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="181.gf6bc1b6b-12"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 397cb13f36af..058a7b6848b7 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,6 +1,4 @@
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
-DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
 EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
deleted file mode 100644
index 3c553a30e8cd..000000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=34c1f88171f00a3e9fae57250799f3d3623b5f74
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/"
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="telepathy xmpp"
-
-CDEPEND="
-	$(add_frameworks_dep attica)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	>=media-libs/liblastfm-1.1.0_pre20150206
-	>=media-libs/taglib-1.8.0
-	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
-	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		-DBUILD_TESTS=OFF
-		-DBUILD_TOOLS=OFF
-		-DBUILD_WITH_QT4=OFF
-		-DWITH_KDE4=OFF
-		-DBUILD_HATCHET=OFF
-		-DWITH_TelepathyQt=$(usex telepathy)
-		-DWITH_Jreen=$(usex xmpp)
-	)
-
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 458c2ad7520c..4814684c2935 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,7 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
 DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
-EBUILD whipper-0.7.0.ebuild 1577 BLAKE2B 668694c4bb2d36d96f86a29198139312a4ad21ba1615912dcd33a62b12465478f859584afe8647f8f241076e973e9cbf07fd5c630f7d73650d14831ac9f259b8 SHA512 6187ea4ac13ae93b5e4e780e1c36d808038f08cd02395a67ca7065f480d652049ef55e4cc62e60ae508a40488d19716fb24c661f210b493ebb2a1858c48fa476
+DIST whipper-0.7.3.tar.gz 168393 BLAKE2B b34151ede7c867dbbca34fcec3d8ef81cb50d66abc760fa54bec880f8f1186faf3e0f5298c2890501b9bd2f586b80d2cdc45a0755b6fe12fc1a2215e9ea9ecbb SHA512 ac96393471a6b4c40f5870f6e3183b65d43229314e2a1eacbf065c51ac61cbc772f2de3bde9f20ee1f7ffec427cd03c31f27df60eb6c621a699927646080c0ab
+EBUILD whipper-0.7.0-r1.ebuild 1524 BLAKE2B 636f64d95e641a89110436ee76fd62da430bcd720e99bad6d01a3c58384c4977912c9e90c2cbbc9333d46b62ddfac2b5e88dd4f294725498df79ef03c9048220 SHA512 9e427de20c9518adf1bbab1cb60ae3b06885dca221e628251871794631a1db0dd2a970e2dda761e49798c13534d5a70bc73580fb9d78774639746a9b944bad50
+EBUILD whipper-0.7.3.ebuild 1550 BLAKE2B 0f6253476e28c9a15ba33356639fa111c6d36a384e17247daf70d11aa0c487d0057f6c9c65f13304a173db413dadd284defef7d0244e0af44a30f445f46196ba SHA512 6e460f634a82c454851695eba770b667ff324488b50d258daeb92d4d0e30224161721239ef9c0736a28485251ed412ef67cfdbb4bbe0da6f25df352a0a707515
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.0-r1.ebuild b/media-sound/whipper/whipper-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..2aace1ef8765
--- /dev/null
+++ b/media-sound/whipper/whipper-0.7.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libsndfile
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-cdr/cdrdao
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/cddb-py[${PYTHON_USEDEP}]
+	dev-python/pycdio[${PYTHON_USEDEP}]
+	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/flac
+	media-libs/libsndfile
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cdparanoia-name-fix.patch"
+	"${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch"
+)
+
+src_prepare() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C src CC="$(tc-getCC)"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
+}
diff --git a/media-sound/whipper/whipper-0.7.0.ebuild b/media-sound/whipper/whipper-0.7.0.ebuild
deleted file mode 100644
index 0806473cc347..000000000000
--- a/media-sound/whipper/whipper-0.7.0.ebuild
+++ /dev/null
@@ -1,64 +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 distutils-r1
-
-DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
-HOMEPAGE="https://github.com/whipper-team/whipper"
-SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libsndfile
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	app-cdr/cdrdao
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
-	>=dev-libs/libcdio-paranoia-0.94_p2
-	dev-python/cddb-py[${PYTHON_USEDEP}]
-	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:2=[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/flac
-	media-libs/libsndfile
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cdparanoia-name-fix.patch"
-	"${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch"
-)
-
-src_prepare() {
-	# accurip test totally depends on network access
-	rm "${PN}"/test/test_common_accurip.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C src CC="$(tc-getCC)"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
-}
diff --git a/media-sound/whipper/whipper-0.7.3.ebuild b/media-sound/whipper/whipper-0.7.3.ebuild
new file mode 100644
index 000000000000..f7f2f40ca587
--- /dev/null
+++ b/media-sound/whipper/whipper-0.7.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libsndfile
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-cdr/cdrdao
+	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/pycdio[${PYTHON_USEDEP}]
+	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/flac
+	media-libs/libsndfile
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
+	"${FILESDIR}/${PN}-0.7.0-src-Makefile-respect-CFLAGS.patch"
+)
+
+src_prepare() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C src CC="$(tc-getCC)"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
+}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 906161fd30da..eedf60147ca9 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,7 +1,6 @@
-DIST yoshimi-1.4.1.tar.bz2 3674539 BLAKE2B a3561f4129b1da137caec4a4bb8a59222ca43c875a6533ce0c74ccff8d499a40cf98a1258f44e1a2f290fdc6f28786ce26772d19489c03590a360825488e5b3c SHA512 2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499
-DIST yoshimi-1.5.1.1.tar.bz2 4035895 BLAKE2B 4579555c96f68ede8f6b604039f23512a041f879b23155334c6aab891fdb11d4e77b8d7d38ebad98b114d49da5fa815114872ca5cddd7f30fd5d56b5d4178be9 SHA512 f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28
+AUX yoshimi-1.5.10-cxxflags.patch 2471 BLAKE2B 0e3d614e4cb9ccb1eb7a25665794fb22db89ca877d613fe4806afebd3692fafa422c2bcba7c9d28080e37a0e7004fcbefeedd0532c5541220e77e4149f8551f6 SHA512 cd15dd79b324ae27c80745c84720bf6b04d7d78c3bed3f2541ab84f82e60928865a49ded6f7fb383cdb5fdc61a05fb8d9fc02869d4846f734eab332f040fa7d0
+DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
-EBUILD yoshimi-1.4.1.ebuild 1015 BLAKE2B 80c0ec583a13eb7aae5ea376c447c02ae31009cf73d4be324e8364203ab2b13f81294d77089d814e926eee592183eb0ee9ba5269113394eb3e1c042c6584561d SHA512 4dd13708b3d1829755bde9e37d982a7c61e822ef61fae1303fdb87318b6847ec96e002b7b16a94103f7e924fd869e65aa4a80acf28b091a28476b4fed76e3e15
-EBUILD yoshimi-1.5.1.1.ebuild 1032 BLAKE2B dcbedf93b5ca4c39206ac0809c6147b8b9133eeefb2692346ca3575ed40441c3bb0d32d855a8bfcb36686e434916775d9501537a81d313ec3fece389dde84788 SHA512 5764063f8511b3ad75e1ea4fdaedd377cc0622ef2bd0a576701d4bb047a144e60b9e458bf90b626ca9d6b555b66fe726c207c2a59cebe5507e982c767ca0e496
+EBUILD yoshimi-1.5.10.ebuild 1224 BLAKE2B cc6bfae99aa65e76e3b7b4037832d3b7fae68e5ccbfdc40c3ddb0b8013474ea8a44fed1de95f51bf278f6a8796c74e84c18907ce913e968cff0034be5f8de9ea SHA512 55de53bd5189d84d1832fae1ae8eb2048e84eff2e61305862e5f14e01769d11acb16a1e573b1d57dedd6d7bea7cb8dd45a01a5f69aa068f5922a0888f192d99b
 EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6
 MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
new file mode 100644
index 000000000000..7e64e1fdc729
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
@@ -0,0 +1,64 @@
+Respect user CXXFLAGS setting.
+
+--- yoshimi-1.5.10/src/CMakeLists.txt
++++ yoshimi-1.5.10/src/CMakeLists.txt
+@@ -302,27 +302,27 @@
+ set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
+ 
+ # set platform specific compiler flags
+-if (BuildFor0ld_X86)
+-    set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
+-else (BuildFor0ld_X86)
+-    if (BuildForAMD_X86_64)
+-        set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
+-    else (BuildForAMD_X86_64)
+-        if (BuildForCore2_X86_64)
+-            set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
+-        else (BuildForCore2_X86_64)
+-            if (BuildForNEON)
+-                set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
+-            else (BuildForNEON)
+-                if (BuildForThisCPU)
+-                    set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
+-                else (BuildForThisCPU)
+-                    set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
+-                endif (BuildForThisCPU)
+-            endif (BuildForNEON)
+-        endif (BuildForCore2_X86_64)
+-    endif (BuildForAMD_X86_64)
+-endif (BuildFor0ld_X86)
++#if (BuildFor0ld_X86)
++    #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
++#else (BuildFor0ld_X86)
++    #if (BuildForAMD_X86_64)
++        #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
++    #else (BuildForAMD_X86_64)
++        #if (BuildForCore2_X86_64)
++            #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
++        #else (BuildForCore2_X86_64)
++            #if (BuildForNEON)
++                #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
++            #else (BuildForNEON)
++                #if (BuildForThisCPU)
++                    #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
++                #else (BuildForThisCPU)
++                    #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
++                #endif (BuildForThisCPU)
++            #endif (BuildForNEON)
++        #endif (BuildForCore2_X86_64)
++    #endif (BuildForAMD_X86_64)
++#endif (BuildFor0ld_X86)
+ 
+ if (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Debug")
+@@ -330,8 +330,8 @@
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Release")
+-    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+-    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
++    #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
++    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
+ endif (BuildForDebug)
+ 
+ configure_file(
diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
deleted file mode 100644
index d7d64c58b5a2..000000000000
--- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
-	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
-	media-libs/fontconfig
-	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBuildLV2Plugin=$(usex lv2)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
deleted file mode 100644
index b8e82d9c8ffe..000000000000
--- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
-	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
-	media-libs/fontconfig
-	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
new file mode 100644
index 000000000000..e7de48192156
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="A software synthesizer based on ZynAddSubFX"
+HOMEPAGE="http://yoshimi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+RDEPEND="
+	>=dev-libs/mxml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	media-libs/fontconfig
+	media-libs/libsndfile
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib:0=
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
+
+DOCS=( Changelog README.txt )
+
+src_prepare() {
+	# respect doc dir
+	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	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/media-tv/Manifest.gz b/media-tv/Manifest.gz
index e0bae95ded4c..ae5a9da868b0 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 073af8d99bb0..af2a74595235 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -15,6 +15,7 @@ DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c
 DIST kodi-18.0rc2.tar.gz 50969888 BLAKE2B 982d660c6f87706fa5d50c5ece84ea3d27adcd3ad561a77082cb2c1abfdd378b233aeaa8102682f0c89bb6f3c28481fa03b6070d4e9c3ba9b37b66096211071e SHA512 2f5bba021221cdc45242abc90a993dd033c2d7839f1031159869ac7a777a0675324ec2858868ff5060b16a8d5f367a6135a20ac570a099e907032678c91eac0c
 DIST kodi-18.0rc3.tar.gz 50978485 BLAKE2B 791053553f475dbcacc2bc7c3a1e420849de3f48d3eb3d788f958b2b2c3fb47454cfd909f36cefee37050923c39173690b5d48d517a042254d796aeafb39fcb8 SHA512 622e3fff01e8d856bb524339796410d3fc3226539ae91c69a367464e8f5aeb28ca3ffd605dc4a4f9944e4cc59a1949d7da6fec70175d978a44f3b5bbb59190c3
 DIST kodi-18.0rc4.tar.gz 50985659 BLAKE2B 5b2475d98e084e007aebf0a5e142d03ddd08b11c9067ddf0c978892ce15a4b8f22009156bfe4e26df1ebab55bf724182c4573207440e1e9f50dd5f6b739f8a3e SHA512 cec2af70e6babed79ed649846342cbcfe979ad90a4ef4dde250e114477991c48dcfffac56a6234dc16913c9896a9a31337ebbb19488f0abf68e6c1f410d12607
+DIST kodi-18.0rc5.tar.gz 50988431 BLAKE2B 4abf13057e04f1cc3f600bbedaa9f5d641a0af59d283817410aa38c41141d8835b8ce59ac3a851e1f59752396236dd195e7ace5f233ad22127597c8a964986f4 SHA512 d5eca9c4c7380c93d1339187017c36ad8424a7484cbe0f77281c561e37896e44a36da534a894ecd30fc4eea43fc0b1703bb0e545d04d5f8c7c93eaae23066884
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
@@ -30,5 +31,6 @@ EBUILD kodi-17.6.ebuild 8670 BLAKE2B e8ea1e0dc347c5e891ccad4b05ea5f21c19284e0d5c
 EBUILD kodi-18.0_rc2.ebuild 9366 BLAKE2B d11bbfae54b8b67923d6574255bdb67efcd2caa2c54617e5fea31b71fbb7fed17e102868e024323a17415c9906de9bdc373fb8a267d9153d31ebf8f034a85e99 SHA512 7db29341f1eb28928c6ce004dc5e7745ae77e8d072ea1caecb209f73a557d2d89b1a6633cd22a9da8f850123665e2fd289bead4f28b541a5596360f16210786d
 EBUILD kodi-18.0_rc3.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 EBUILD kodi-18.0_rc4.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
+EBUILD kodi-18.0_rc5.ebuild 9403 BLAKE2B e54754cd12d199debb26d33df09b928a5b30835aad9edbc6325580f5d34a58d2e07c95d45339cf6e720dda0a6908f686ce6765c843207037f2bfac15eeaa7090 SHA512 4fc6dbcc909fd40d35c6ab0d01d9410f7848b3eddd62c090b3fe07593c2aee05e8f55d3613ac75e718bdf4162d947372436566703e3d95366006e3f3b4e43400
 EBUILD kodi-9999.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 MISC metadata.xml 1766 BLAKE2B 53c734014a9d366496190b89c31c2988751ab9bb0065b4c98e2e0162a5e2a0431c8e1bc0ef944b74403492e463e879bf0c68c7efad485a60549a2051cffd6aee SHA512 389444c93cd6e15a1773663db5705bc7658e957435ede722f5e3bd6ef2ea9f761ff352e2e06f1baeff21e66bcb63203cb4a5ad47c0544a0577dbaf734d4a1ba8
diff --git a/media-tv/kodi/kodi-18.0_rc5.ebuild b/media-tv/kodi/kodi-18.0_rc5.ebuild
new file mode 100644
index 000000000000..6cf19aad7b27
--- /dev/null
+++ b/media-tv/kodi/kodi-18.0_rc5.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.1"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="Alpha3-1"
+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 )"
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		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/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	dev-libs/libfmt
+	dev-libs/libfstrcmp
+	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-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	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(+)] )
+	>=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.3:=
+		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] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-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) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index fac9a515082b..21701bc7c128 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -6,6 +6,8 @@ AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e741
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
+DIST mythtv-29.1-r1.tar.gz 105657217 BLAKE2B 9d42464b0c75c2d3a359b528e3f7917cfb281f48451167afc6517caa9702da44fce2d48566fd902ec08af35117232113b4d499e2c9a3cf2ad2634d91cf532ca7 SHA512 0eadc37661d9fa93a63c0f425cd43d43533889b0afcea1478b2645e083ba6c96eebf2eec088db1ed6f0a0727c03b7c90c0c18b83c194d630dda3bac45bca5d87
 DIST mythtv-29.1.tar.gz 105656634 BLAKE2B 8b9dfc6b1e1178bfd1b35e8d499afe570edeb1f07cefa64fc91c2ed74f8155f5ca00cee49a024848f715c0bb782fc22f3c4d04fd8eac8562d108e105d3a41421 SHA512 c80d84c40c019d093d44487fb4cd07d9ce3174781ff8f24a4709fd10294cb8f6186b3e480dad3a09f7a496835fa0cffcc9eca114f807794b693ffcd57acd4e39
+EBUILD mythtv-29.1-r1.ebuild 10295 BLAKE2B 41264e442df41fc6099269218fbf9d920a00a3eaa6a1d584c26936f0f80f2495755fa59519c73d908ba713ca2908b419fa140272f865047bb699f8996a4677ef SHA512 6c0cfbff21c3b8e879150031d04c5bf61c6703058463bd74de398bf914fe0dbeb2c76109bf86f397a4195255e06439140a92be459acddbcc688523f798d5f9a3
 EBUILD mythtv-29.1.ebuild 10160 BLAKE2B 2513a85606e1d54fc34393fa284fa036dd262da0b99883c7fc7eace9417d8f7c55518d94b2654c291d511167b40d2f878ace7968aa9d82b5d896037bfca46bb8 SHA512 cd453ed8c541690f8ef0770cb108d944b96517a7b1ba8473b16cb0c90c8a8014b3b34b914f92895fb4e63cbbb0fd8516d3c39cba16021531398177ecd16f488f
 MISC metadata.xml 2986 BLAKE2B 8bfeb791c20052690820b02f03859a72e1de4ccba6303eee36d05bfee3b04ac204f5dc6ebd24741b39868a0e0b8fcf7875fcfb5aaaf8d855bb06be9a0d03df98 SHA512 a57d539f1f083bb69aaa0e85622862408e5afbc1eb27bfdf13b319b8104909971698ad7f51cc8978b9f5e5e4ab9e9d73b7907c61d65aba7c21867da7bfb36084
diff --git a/media-tv/mythtv/mythtv-29.1-r1.ebuild b/media-tv/mythtv/mythtv-29.1-r1.ebuild
new file mode 100644
index 000000000000..85c778c61351
--- /dev/null
+++ b/media-tv/mythtv/mythtv-29.1-r1.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
+BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
+MY_P=${P%_p*}
+MY_PV=${PV%_p*}
+
+inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd vcs-snapshot
+
+MYTHTV_BRANCH="fixes/29"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+	ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora \
+	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluray? ( xml )
+	theora? ( vorbis )
+"
+
+COMMON="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtopengl:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/taglib
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib
+	virtual/mysql
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-misc/wmctrl
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:2
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		<media-libs/libvpx-1.7.0:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		>=dev-perl/libwww-perl-5
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/lxml
+		dev-python/mysql-python
+		dev-python/urlgrabber
+		dev-python/future
+		dev-python/requests-cache
+	)
+	systemd? ( sys-apps/systemd:= )
+	theora? ( media-libs/libtheora media-libs/libogg )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zeroconf? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${COMMON}
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+"
+DEPEND="${COMMON}
+	dev-lang/yasm
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${PF}/mythtv"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+To have this machine operate as recording host for MythTV,
+mythbackend must be running. Run the following:
+rc-update add mythbackend default
+
+Your recordings folder must be owned 'mythtv'. e.g.
+chown -R mythtv /var/lib/mythtv
+
+Want mythfrontend to start automatically?
+Set USE=autostart. Details can be found at:
+https://dev.gentoo.org/~cardoe/mythtv/autostart.html
+
+Note that the systemd unit now restarts by default and logs
+to journald via the console at the notice verbosity.
+"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	default
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	myconf="${myconf} --enable-libmp3lame" # lame is not optional it is required for some broadcasts for silence detection of commercials
+	use cec || myconf="${myconf} --disable-libcec"
+	use zeroconf || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	myconf="${myconf} $(use_enable systemd systemd_notify)"
+	myconf="${myconf} $(use_enable systemd systemd_journal)"
+	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake=$(qt5_get_bindir)/qmake \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	dodoc AUTHORS UPGRADING README
+	readme.gentoo_create_doc
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+
+	# Remove empty dir
+	rmdir "${ED}"/var/log/mythtv/old
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index bcafe939cd6c..1c9aabe7a816 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -5,6 +5,6 @@ AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa74
 AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7
 AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4
 DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537 SHA512 14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9
-EBUILD tvheadend-4.2.7.ebuild 2983 BLAKE2B 5d8f1b0cc1b0948942643fdb07d58a63c8a0fac090cdc33e0899badb9c1c39dc27a65687b27036b93516ee4493b2c58e160d33ea75cec4c7ab065f9f4f513dde SHA512 7b3a50c0cfd0a24da0a962f0870f19e63df805d6cd1adc0f2fecf32d4ae09408e0f2a0318c88c0550b3623cd5b27709076274f9827cb2d2fdf6e24806135f47b
-EBUILD tvheadend-9999.ebuild 3727 BLAKE2B 043e767496b4b9754c113e880517b50eaa3467bd7f85ab56417bb6d834d43422e8a8b40565bfd8f15f41a753419dba6a5010fe32f2a3a206026978b4f32eddf7 SHA512 c51028cbe7632a7ee3b5ef3719e774d10dff6c176243cfc36bb02331863e32b0d623af7fd1e4a55ee64441a00bbc97d695a37382d897004dc0f3fbd6dec9a266
+EBUILD tvheadend-4.2.7.ebuild 2984 BLAKE2B f629d31622a84b526828add8ed5d0323bc2e7a2182939b0c5adf4be962b6f5dc27c5f69cf8b01d7cd0f3440460ce5227f1633dbe8f4ac1ecc2e92ab64387ffdd SHA512 4e76d0818c9c997b93681f7a09512946810ff43914441348c52d61197a567139973ffc10f2b4a6d3fd6e89f5df74f46421f2273c375b1d7f2f0179570316a058
+EBUILD tvheadend-9999.ebuild 3725 BLAKE2B 0e09108282bc6a26be7cf76202daacff8704e54c3d3a793b22806928c96359dfbd88d0e2a564d94072b0c18e3ead6918e4bd4f05b4ba1f67f41b2f8408e16fcd SHA512 195a24f96209365870fe0fedd68d316a9bf166350697ebce78df41bbe52a4c3e6ba9b08604948cb4d9d4f85be62b80b0e6efceaf9a0401b83dc95c2af8d52a88
 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72
diff --git a/media-tv/tvheadend/tvheadend-4.2.7.ebuild b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
index e72ceb2f7e33..604b181ffec3 100644
--- a/media-tv/tvheadend/tvheadend-4.2.7.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="
 	dvben50221? ( media-tv/linuxtv-dvb-apps )
 	ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
 	hdhomerun? ( media-libs/libhdhomerun )
-	!libressl? ( dev-libs/openssl:= )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	uriparser? ( dev-libs/uriparser )
 	zeroconf? ( net-dns/avahi )
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 96ff9acc83cc..8aa2d256431d 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="
 	dvbcsa? ( media-libs/libdvbcsa )
 	ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
 	hdhomerun? ( media-libs/libhdhomerun )
-	!libressl? ( dev-libs/openssl:= )
+	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	uriparser? ( dev-libs/uriparser )
 	zeroconf? ( net-dns/avahi )
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 73b1475d0fd1..911e46460778 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdbackup/Manifest b/media-video/dvdbackup/Manifest
index 8ffeae5b36f1..8267bba491cd 100644
--- a/media-video/dvdbackup/Manifest
+++ b/media-video/dvdbackup/Manifest
@@ -1,5 +1,3 @@
-DIST dvdbackup-0.4.1.tar.bz2 188496 BLAKE2B 4a77b7e2a31616996aa5a5a78c19fb746f84dddf223a61d43aeb3d7db8ede481991d269afd9b73e1cb34077c8d8f83fe55b84c750e05541c35ad0fff2dfd52f1 SHA512 4f6fcb06f3bc9c0066e9cb51582707accc9629c8239f15d84a05a877927292449dda515796bd91069b1280ceb99dab50213cf6f3fbc79e6f56242923d9e2ae86
 DIST dvdbackup-0.4.2.tar.xz 178660 BLAKE2B 1403bd66861713803a2da00712318a6cb399d5c7640cadd27f55fb1cee4e0013364f17a2dc3c78dab819d4fdb8405d36e781d0f2abd1bfb49873b0992d5f2dcc SHA512 df9abb2ca0b8a7cd7855ddff94dae249b06b2ec0ee42f3e9c53aa46aebd9885bdf26dacecbd4a20ff5f642ea10c0c64b811d25c23802c8a2b1489281900fbe0d
-EBUILD dvdbackup-0.4.1.ebuild 648 BLAKE2B 30d98e8bfc71595373a1fd4cb719b545b382bed264ca38abe8b9307cae099ad931e51bc8af0fee62b66ea92575909521a803f4d2c0c3eb2e09269126829ca659 SHA512 698474016f08a7b3bc7eb3fa708266b4a6c009fdeb517c114d33e1cbc8532ce7c997b17b92bac8f8a4cd41e1a7393f04e1df6cfdc802354a9948840515a80c0e
-EBUILD dvdbackup-0.4.2.ebuild 647 BLAKE2B 7867aee74f641883e3f0b8afa08a8f921cc11f69514a09e94d0803a156a660824afd9f71efe69000fc22b652b2783bfe004b6f6f10d0d2cdbdd4a15d4c2e9522 SHA512 d2b9d265b8059bb4cfd8dff120e042faf47fe49e15d112e521428b08285f89384c03cd4289bd4c17a651aa2443e125f672c1f332a69a4da8afb762fccc0f824b
+EBUILD dvdbackup-0.4.2.ebuild 604 BLAKE2B cf68a21e6f1fa0a61bb38c2b0ce0c239a99c8ae3f10d9b18a9db9085eb577a49f59dc296cdf262ad10364ec5f820f1b6df91e99eba255c8ec3274b1d316e573e SHA512 d2eb3aca44d18613515037cef0ea9a268db5e637b950b70ee5e99ba7e77057aad5feeb06e192dc0c98e33aa66793a6322e7431f7f2231838b1219757cb18b014
 MISC metadata.xml 302 BLAKE2B 7d62d6d1c62ddc1245f787ac6faf77c317ce298033e48c17433c09ea2ff92acd05af2ffa44071df281a8da4bacaf6b3c35633475f0496af3a1515e038b1ec79c SHA512 85850b8f0f8de515d846da33fced47ff85195616dc93562edbc62f11bb1108a101cdcd0db7c54be28c17f56f8cea15af9839cfe34fe2b207ba002f770e9e205f
diff --git a/media-video/dvdbackup/dvdbackup-0.4.1.ebuild b/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
deleted file mode 100644
index 4dc011b5d3a1..000000000000
--- a/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Backup content from DVD to hard disk"
-HOMEPAGE="http://dvdbackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="nls"
-
-RDEPEND=">=media-libs/libdvdread-4.2.0_pre
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-rpath \
-		--docdir=/usr/share/doc/${PF}
-}
diff --git a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
index 6dadc6d95997..5580d11d6dff 100644
--- a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Backup content from DVD to hard disk"
 HOMEPAGE="http://dvdbackup.sourceforge.net/"
@@ -17,8 +17,6 @@ RDEPEND=">=media-libs/libdvdread-4.2.0_pre
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_configure() {
 	econf \
 		$(use_enable nls) \
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index d79d764a3d33..4f1050eb44e2 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b7658
 DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
 EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
-EBUILD guvcview-2.0.6.ebuild 1579 BLAKE2B 47e4635f1281666660f7a9c2f92b8ef80f08e663f09fc869006949790c117779b9cf42da81b1f0d117518147bdc48b3b685b2cbe24d7e7f210dc335fe518bb68 SHA512 a40bbc2033404fd765d67bce17fe8c61a50625d79745e6c0173727e2cd2edfaeecc9d4a52428cf76001f85effd183a8a5b50ca67df1b24d2aa349abd3ad0bb49
+EBUILD guvcview-2.0.6.ebuild 1658 BLAKE2B d265675c9cf22564d886ce510117092536c892f13673ab6d050d0f2c11f01be707ef5be0937e3c16657cd25cf4a76428181eb03836cd163a254751384fb6dcc2 SHA512 b5b4da68ae318a698de2c9860d0799bf5a706c34ce45efe781a0cc0dc5a30b2ac97380a7b6826ab4dea7cea5be857f96517dda9b38b39abcd5d43cb6ab72fd5b
 MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index bf243272b545..8f62edffa655 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gsl libav pulseaudio qt5"
 
 RDEPEND="
@@ -51,6 +51,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
 	eautoreconf
 }
 
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 0da6906d1586..c3a4b59885a8 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -2,6 +2,6 @@ AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 BLAKE2B 58426bd919e0c0cbe9703a33fc
 AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
-EBUILD vcdimager-0.7.24.ebuild 1494 BLAKE2B d6d71aa03fef4ee2af9c7f160a8218448b4b2eb2f84b64726e5d38ac1a4a0a5f36ca5c69d896354ced7f2cf11b73324c9157ce917413d519b9dd96599c2bb781 SHA512 5800c746da2facc0537f54b40d3a66ed1b9065ae4e2e05cd6713712f366d435c3fe7c5b180642948d97eabd3950b4045ce1652891f69e26fe5a5f8223e72b072
+EBUILD vcdimager-0.7.24.ebuild 1514 BLAKE2B 02c041f82bda11b33d20d7f1a422fc123d21266a396df8bf987158c032466f5115d81827f603fe664f9a806561fcd129755a0f51ec3d17a38bd0a0e8dbd2ff7a SHA512 28a15cb2d396ff3f4a16d7356c96f39ee75c9cbdcb5827408f3e2089bc88ca169a6ba0d0b9a5a69f1245441a6a225d7fd65ce7a60881f46f933df86707639f5f
 EBUILD vcdimager-2.0.1.ebuild 1400 BLAKE2B b9d1d864856f025c57536f6ebc3135bb8ca01fd61c072a18647166187772289354a243ac9876c5a52d85e7e2e0f9bc31f60bea9d0486350b0d3f415ee7544cd6 SHA512 d898fa4c3ad5ad1ad10cf6d66f98786c5f3ebd7ae5a83e04e7c13754f5a561450a8a62b266687bfef533e11613dea8855a424fd3cde59a1709d9400b81d56ba4
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
index 7b2ce51b663b..5eece94aa347 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ IUSE="+xml static-libs"
 
 RDEPEND="
 	>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
+	<dev-libs/libcdio-1.0
 	dev-libs/popt
 	xml? ( dev-libs/libxml2:2 )
 "
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index efed6ec661a4..d71e8c558092 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e94cbeaac45c..b313ae2c9fb6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Dec 2018 12:38:35 +0000
+Sat, 12 Jan 2019 15:38:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ce7690b72a41..0034e6505c1a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 435197 BLAKE2B 5ef1f755677fba588afa252a22622c045d099b3f39fb6b356786170399bb20e8c58212856a5ddc6f59dc6076e3f84a95376a4dc3b4d5154c7d540151a154c88a SHA512 fb541e904c3c6b5ec17c08e76f9ce1dcd0d8f0b31dee092dd3542b9a34a04890e9a1b1e6b0d78d3523fb451deb84b3316ae6b588a29aec6f4741dfb52941ecc9
-TIMESTAMP 2018-12-31T12:38:39Z
+TIMESTAMP 2019-01-12T15:38:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwqDc9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw6CgRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB91g/+I1zWG2oYO2J9ZrbQVZVmOmmM4NoWGtpVST4yXXc0uByDdYFkroBsgCDA
-M9dWQXl/J6N7X4RQ4y/X0Bju+HTlvarQIhpKaS769SGs9St8d6KpSF+VOUy5CyvO
-5gaGt06fAroPYBgiMtvCcPiRuHRQrxrlsCighz/2PaGOkwIUa3FeuzET6QWCDFuE
-+1xgH8jeY022Mfo8egKkla6+7lQczfR9a0I0PYV/b4HtlT7sGs4NPuoBPmPdjpgl
-lCxlgs3S7qLkfEnlpvnhX9XANpZt0GCRQTZJR3VsLqQU/r150E+MxnR5qKo1MNS9
-sDYzlusexF+cifGy590ilfEe5oRPb7RDDS4LeGwQk+9fMJXbBtu9tXnE3V2Hl84G
-UFaWcNXtUIY7ky6spx2AZXUjDPgGPbR26fToaygCvgukJh3zqEaSP1EN83zqchvD
-A0kJKyLI86uDBHb4ARBRlGWYi51jdjzBjhBBNY/KOi0mdqCteRs/PgNFE4dHTVRm
-d/sWVZ7hBYDRUjTrbg3BGLYknGAnVo6bYyhtAH41xNO6do8IexjGNWcjMLcda0e1
-jPBqEFFq4DjalpeQq/4M0n7YTp73cp2KLjwleseEkwOWFQlYObRL3Bct2N/BPr6l
-DbxJfrHLP7B3AmjirqZkJAscBETk623dsdjsUhqIyC4IT4ukQvg=
-=P/S9
+klAX6Q/+PHs4VuG9gqjNWUPkxPm3Sli2a2ViwMICY5A4WRlGEObK1LO0V9sGBWKF
+UbyrHRW58UOKzvNxm1jRImyxcN8jNaFeTdfABB7etRxHdHFyQlzEPF7IrqnYBPKf
+6rE9AJpHvCpcbC2HRm77poAx+T7Pxsh+CIyRALWbf/eEz7Rb+ENlUEE5W12O5H00
+opQQK4gJgmRkvMDkE4N+hp0Gef+LVJAVAPjaApyDkC8Na+NmlkmjXkkZYrMXCYy5
+++oNkedGvYLivTrtX4HlDLdiZPiuWmMPsLPkIHszt8zg+27+62X1NsT5rUF2g64R
+7HS46lWO83UdsEqc/sLHh6aEZpoeajv2yq1TgnW3JcZm4bV05O7O/uYqL6ZgO2rF
+XjvMKi/jSyIlSiZDOYwaCrn6/XWswL36Z4vQjLnpn9kMeCLKQgtrowl2Gm2rSER6
+X19fEqv0ljMFlf20FiCyTcXwT+m6wJZ3gO1W5DWqFFz5aDqwL9298YXC1bVCJ0Xo
+DvGs07QcVa8w+vhG67DljngyMZif4C0Zpm1RBc8Yv6/k6R3KDZTRtAXaI7NQa034
+amwh5/OGHYbaQ99wLKxMBThpzn1zVHd5MLAzO0jzYzBAD/+5zd7vySQU2XjPyINn
+q8eLri1c3hVeTVbSfOPxuOdRkqXUSB0MHk4n0Mc7/nEInMvlzCQ=
+=9F5V
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e94cbeaac45c..b313ae2c9fb6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Dec 2018 12:38:35 +0000
+Sat, 12 Jan 2019 15:38:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 34f5f1327dbc..f1f7f93dd95a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 30d5d57e23c2..f9434c8ce888 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index 6383ee685d3d..d0fba983ebaa 100644
--- a/metadata/md5-cache/app-accessibility/simon-9999
+++ b/metadata/md5-cache/app-accessibility/simon-9999
@@ -7,5 +7,5 @@ IUSE=libsamplerate opencv pim sphinx debug +handbook test
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6=[qt5] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61b42c57cadead483bba8a6a8d8e05cb
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index be398eacf63a..9a34caed211b 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/calamares-3.1.13 b/metadata/md5-cache/app-admin/calamares-3.1.13
index 259b1c18de02..3f39bd5bcc5b 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.13
+++ b/metadata/md5-cache/app-admin/calamares-3.1.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.1.13/calamares-3.1.13.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b73d36acc242736d1449d358cc28fed0
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.2 b/metadata/md5-cache/app-admin/calamares-3.2.2
index 4438b186bb82..1169a6dbd8b7 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.2
+++ b/metadata/md5-cache/app-admin/calamares-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.2/calamares-3.2.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98b1165e5e6e8ef86d4effd1a9c3943f
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.3 b/metadata/md5-cache/app-admin/fluentd-1.3.3
new file mode 100644
index 000000000000..66b86a1b5849
--- /dev/null
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=data collector and unified logging layer (project under CNCF)
+EAPI=6
+HOMEPAGE=https://www.fluentd.org
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby23] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby23] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby23] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby23] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby23] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby24] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby24] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby24] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby24] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby24] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby24] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby25] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25] >=dev-ruby/coolio-1.4.5[ruby_targets_ruby25] >=dev-ruby/serverengine-2.0.4[ruby_targets_ruby25] >=dev-ruby/http_parser_rb-0.5.1[ruby_targets_ruby25] >=dev-ruby/sigdump-0.2.2[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.0[ruby_targets_ruby25] >=dev-ruby/strptime-0.2.2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/fluentd-1.3.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1
deleted file mode 100644
index 58cb68c0b1d4..000000000000
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare pretend setup
-DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) virtual/pkgconfig nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Single process stack of various system monitors
-EAPI=6
-HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
-SLOT=2
-SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b023c82e94eafe4a410aab5370b37b5
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
new file mode 100644
index 000000000000..bbbdd7fc71ab
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install preinst prepare pretend setup
+DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DESCRIPTION=Single process stack of various system monitors
+EAPI=7
+HOMEPAGE=http://www.gkrellm.net/
+IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+SLOT=2
+SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3ba7cba589ad815f201a2a51fcea58b5
diff --git a/metadata/md5-cache/app-admin/keepass-2.41 b/metadata/md5-cache/app-admin/keepass-2.41
new file mode 100644
index 000000000000..64b3d0e30ebd
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.41
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=6
+HOMEPAGE=https://keepass.info/
+IUSE=aot
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
+SLOT=0
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.41-Source.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fb7e45345d84ce4b71e368e2a467a8d7
diff --git a/metadata/md5-cache/app-admin/kube-bench-0.0.23 b/metadata/md5-cache/app-admin/kube-bench-0.0.23
new file mode 100644
index 000000000000..1d4531b7202d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/kube-bench-0.0.23
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Bench for Security runs the CIS Kubernetes Benchmark
+EAPI=6
+HOMEPAGE=https://github.com/aquasecurity/kube-bench
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/aquasecurity/kube-bench/archive/v0.0.23.tar.gz -> kube-bench-0.0.23.tar.gz https://github.com/fatih/color/archive/570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz -> github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.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/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jinzhu/gorm/archive/5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz -> github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz https://github.com/jinzhu/inflection/archive/1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz -> github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz https://github.com/lib/pq/archive/83612a56d3dd153a94a629cd64925371c9adad78.tar.gz -> github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mattn/go-colorable/archive/5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz -> github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz https://github.com/mattn/go-isatty/archive/57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz -> github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/pelletier/go-toml/archive/0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz -> github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz https://github.com/spf13/afero/archive/57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz -> github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/cobra/archive/7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz -> github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz -> github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/golang/sys/archive/e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz -> github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/go-yaml/yaml/archive/c95af922eae69f190717a0b7148960af8c55a072.tar.gz -> github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3e86b238d0b54f643d45b6909ea5ea13
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.20 b/metadata/md5-cache/app-admin/perl-cleaner-2.20
deleted file mode 100644
index 70ecd026173e..000000000000
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.20.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.20.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c460e662f4b23ab3095d39c37e7cf454
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.26-r1 b/metadata/md5-cache/app-admin/perl-cleaner-2.26-r1
deleted file mode 100644
index 69aee87d33bd..000000000000
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.26-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=User land tool for cleaning up old perl installs
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/perl/
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) ( sys-apps/portage-mgorny app-portage/portage-utils ) sys-apps/pkgcore )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-cleaner-2.26.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.26.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=b8eb69d64098cf25db72f2636799b989
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.27 b/metadata/md5-cache/app-admin/perl-cleaner-2.27
new file mode 100644
index 000000000000..55a982f606b8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.27
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=User land tool for cleaning up old perl installs
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/proj/en/perl/
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) ( sys-apps/portage-mgorny app-portage/portage-utils ) sys-apps/pkgcore )
+SLOT=0
+SRC_URI=mirror://gentoo/perl-cleaner-2.27.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.27.tar.bz2
+_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_md5_=b6f07742d18343aa66072d3ea24dace4
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.40.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.40.0-r1
index c1430874c94e..e456811f05d3 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.40.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.40.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/
 IUSE=curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
+KEYWORDS=amd64 arm ~arm64 ~hppa x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.3:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
 REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.40.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.40.0.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afdc1c635bcc970bf54ff67452609629
+_md5_=269b6978ca518289027e59b7f305ae6a
diff --git a/metadata/md5-cache/app-admin/salt-2016.11.10 b/metadata/md5-cache/app-admin/salt-2016.11.10
index 8beacc175b16..391feeac18d4 100644
--- a/metadata/md5-cache/app-admin/salt-2016.11.10
+++ b/metadata/md5-cache/app-admin/salt-2016.11.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( dev-python/boto3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
 EAPI=6
 HOMEPAGE=https://saltstack.com/community/
 IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2016.11.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=67fe18c37ac00934ccc40feb162c239b
+_md5_=a45606b1d56829b6af681d3f76ec0bb3
diff --git a/metadata/md5-cache/app-admin/salt-2017.7.8 b/metadata/md5-cache/app-admin/salt-2017.7.8
index 35e7d84b7421..271d96dfd5fc 100644
--- a/metadata/md5-cache/app-admin/salt-2017.7.8
+++ b/metadata/md5-cache/app-admin/salt-2017.7.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pytest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pip[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig 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=Salt is a remote execution and configuration manager
 EAPI=6
 HOMEPAGE=http://saltstack.org/
 IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/markupsafe[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) vim-syntax? ( app-vim/salt-vim ) 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=|| ( raet zeromq ) || ( python_targets_python2_7 )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2017.7.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05efc65d873ab51263948acca548bbc4
+_md5_=25cade34e70d0f025ef0df8170e925ce
diff --git a/metadata/md5-cache/app-admin/salt-2018.3.3 b/metadata/md5-cache/app-admin/salt-2018.3.3
index a8fdfcb9599c..093130c79913 100644
--- a/metadata/md5-cache/app-admin/salt-2018.3.3
+++ b/metadata/md5-cache/app-admin/salt-2018.3.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-catchlog[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest-salt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-catchlog[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !x86? ( >=dev-python/boto3-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-python/moto-0.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/SaltTesting-2016.5.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Salt is a remote execution and configuration manager
 EAPI=6
 HOMEPAGE=http://saltstack.org/
 IUSE=cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova openssl portage profile redis selinux test timelib raet +zeromq vim-syntax python_targets_python2_7 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:*[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+RDEPEND=sys-apps/pciutils dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/libnacl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <www-servers/tornado-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] libcloud? ( >=dev-python/libcloud-0.14.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mako? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) libvirt? ( dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) openssl? ( dev-libs/openssl:0=[-bindist] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) raet? ( >=dev-python/libnacl-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/ioflo-1.1.7[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/raet-0.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) zeromq? ( >=dev-python/pyzmq-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) cherrypy? ( >=dev-python/cherrypy-3.2.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mongodb? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) portage? ( || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) keyring? ( dev-python/keyring[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redis? ( dev-python/redis-py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) selinux? ( sec-policy/selinux-salt ) timelib? ( dev-python/timelib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nova? ( >=dev-python/python-novaclient-2.17.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) neutron? ( >=dev-python/python-neutronclient-2.3.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) gnupg? ( dev-python/python-gnupg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) profile? ( dev-python/yappi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) vim-syntax? ( app-vim/salt-vim ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2018.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3433193b54dd5760d2ed46e905d665ee
+_md5_=2437a763ad1ff27868a5069273b99d30
diff --git a/metadata/md5-cache/app-admin/sshguard-2.3.1 b/metadata/md5-cache/app-admin/sshguard-2.3.1
new file mode 100644
index 000000000000..5bc3ac8cf7f2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sshguard-2.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-devel/flex
+DESCRIPTION=protects hosts from brute force attacks against ssh
+EAPI=7
+HOMEPAGE=https://www.sshguard.net/
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=virtual/logger
+SLOT=0
+SRC_URI=mirror://sourceforge/sshguard/sshguard-2.3.1.tar.gz
+_md5_=9e4ce36e64e620a0bcdd55e342b24bc8
diff --git a/metadata/md5-cache/app-admin/sshguard-99999 b/metadata/md5-cache/app-admin/sshguard-99999
new file mode 100644
index 000000000000..00f390c54980
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sshguard-99999
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install prepare unpack
+DEPEND=sys-devel/flex
+DESCRIPTION=protects hosts from brute force attacks against ssh
+EAPI=7
+HOMEPAGE=https://www.sshguard.net/
+LICENSE=BSD
+RDEPEND=virtual/logger
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4b8c4bf7f636cd5750e8e719cf66ec92
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.17.2 b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
index c0d3bed5a4aa..8363b96d66a5 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.17.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.17.2
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog 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 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) 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 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.17.2/syslog-ng-3.17.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ceae8c28f44b4c4291556372a675b22c
+_md5_=2ec34ca291689dae243dc8e74c2df6f9
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index ea32123e42fd..69585b3965d3 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/systemd >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97be443413edb83c2e757af010023e96
diff --git a/metadata/md5-cache/app-admin/terraform-0.11.11 b/metadata/md5-cache/app-admin/terraform-0.11.11
new file mode 100644
index 000000000000..8aa89f7877bc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-0.11.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.11.0 >=dev-lang/go-1.9
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=6
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v0.11.11.tar.gz -> terraform-0.11.11.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=ba39dd2622ac787724bbaa26aac6babd
diff --git a/metadata/md5-cache/app-admin/tmpreaper-1.6.14 b/metadata/md5-cache/app-admin/tmpreaper-1.6.14
new file mode 100644
index 000000000000..fa13eddd63da
--- /dev/null
+++ b/metadata/md5-cache/app-admin/tmpreaper-1.6.14
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DEPEND=sys-apps/util-linux sys-fs/e2fsprogs
+DESCRIPTION=A utility for removing files based on when they were last accessed
+EAPI=7
+HOMEPAGE=https://packages.debian.org/sid/tmpreaper
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/t/tmpreaper/tmpreaper_1.6.14.tar.gz
+_md5_=20e74d86baadd0acc29b58f4698c9d05
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.3.7 b/metadata/md5-cache/app-admin/tripwire-2.4.3.7
index 61066f184c61..6c86737967c1 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.3.7
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.3.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-devel/automake sys-devel/autoconf ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=6
 HOMEPAGE=http://www.tripwire.org/
@@ -7,8 +7,8 @@ IUSE=libressl selinux ssl static +tools
 KEYWORDS=amd64 ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=tools? ( app-admin/mktwpol )
-RDEPEND=virtual/cron virtual/mta selinux? ( sec-policy/selinux-tripwire ) ssl? ( dev-libs/openssl )
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/cron virtual/mta selinux? ( sec-policy/selinux-tripwire )
 SLOT=0
 SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.7.tar.gz -> tripwire-2.4.3.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c25639d00a91afe7e648d9199aadc76d
+_md5_=2b8bafd48898cfc7c5c35e7e074c5aa4
diff --git a/metadata/md5-cache/app-admin/vault-0.10.3 b/metadata/md5-cache/app-admin/vault-0.10.3
deleted file mode 100644
index 6cc0a0b7df13..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.10.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 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.10.3.tar.gz -> vault-0.10.3.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.10.4 b/metadata/md5-cache/app-admin/vault-0.10.4
deleted file mode 100644
index 2aa979bdd760..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 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.10.4.tar.gz -> vault-0.10.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-admin/vault-0.11.0 b/metadata/md5-cache/app-admin/vault-0.11.0
deleted file mode 100644
index 806455958396..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 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.11.0.tar.gz -> vault-0.11.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f161ad71c33952fadd9ed852f735838c
diff --git a/metadata/md5-cache/app-admin/vault-1.0.1 b/metadata/md5-cache/app-admin/vault-1.0.1
new file mode 100644
index 000000000000..4aaf03c6b387
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 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/v1.0.1.tar.gz -> vault-1.0.1.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b9f6ab2ae620a64b0b070565c4c4ba5f
diff --git a/metadata/md5-cache/app-admin/whowatch-1.8.6 b/metadata/md5-cache/app-admin/whowatch-1.8.6
index aee473eb86b2..f035dffa8545 100644
--- a/metadata/md5-cache/app-admin/whowatch-1.8.6
+++ b/metadata/md5-cache/app-admin/whowatch-1.8.6
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170815
 DESCRIPTION=Displays information about users currently logged on in real time
 EAPI=6
 HOMEPAGE=http://wizard.ae.krakow.pl/~mike/ https://github.com/mtsuszycki/whowatch/
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
+KEYWORDS=amd64 ~arm hppa ~mips ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mtsuszycki/whowatch/releases/download/whowatch-1.8.6/whowatch-1.8.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f71bd51ef85c82442267bc92ca63aa11
+_md5_=3ceae9f51333f5082600c813ef09109b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 97d84a41fcc3..cb24797bed8a 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/brotli-1.0.6-r1 b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
index 4419c328147b..42991186d521 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Generic-purpose lossless compression algorithm
 EAPI=6
 HOMEPAGE=https://github.com/google/brotli
 IUSE=python 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 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT python? ( Apache-2.0 )
 RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.6.tar.gz -> brotli-1.0.6.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6ba301f6f8a5af1048154018968b3dc7
+_md5_=910bc6c4cf2c81025103eae77695550e
diff --git a/metadata/md5-cache/app-arch/gcab-0.8 b/metadata/md5-cache/app-arch/gcab-0.8
index 647c29954b1f..b8ff603e64f2 100644
--- a/metadata/md5-cache/app-arch/gcab-0.8
+++ b/metadata/md5-cache/app-arch/gcab-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/msitools
 IUSE=+introspection vala
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/0.8/gcab-0.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d53f73c9270ae8230e2df2e2fa40ab1e
+_md5_=1e9f25e036f92822e214c6d851d408b2
diff --git a/metadata/md5-cache/app-arch/gzip-1.9 b/metadata/md5-cache/app-arch/gzip-1.9
index da976e89f3e3..c03fcf5ed005 100644
--- a/metadata/md5-cache/app-arch/gzip-1.9
+++ b/metadata/md5-cache/app-arch/gzip-1.9
@@ -3,9 +3,9 @@ DESCRIPTION=Standard GNU compressor
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.9.tar.xz mirror://gnu-alpha/gzip/gzip-1.9.tar.xz mirror://gentoo/gzip-1.9.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f667ae9babf4bd97ad332ed6cedf9c16
+_md5_=17d4c5e58397eab2798a77a90176670d
diff --git a/metadata/md5-cache/app-arch/innoextract-1.6 b/metadata/md5-cache/app-arch/innoextract-1.6
deleted file mode 100644
index 155af0679a89..000000000000
--- a/metadata/md5-cache/app-arch/innoextract-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A tool to unpack installers created by Inno Setup
-EAPI=5
-HOMEPAGE=http://constexpr.org/innoextract/
-IUSE=debug +iconv +lzma
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=http://constexpr.org/innoextract/files/innoextract-1.6.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3951f1e6dc377dc3020b82cd2001b3e
diff --git a/metadata/md5-cache/app-arch/ncompress-4.2.4.5 b/metadata/md5-cache/app-arch/ncompress-4.2.4.5
new file mode 100644
index 000000000000..8435f6bf94d2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/ncompress-4.2.4.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Classic compress & uncompress programs for .Z (LZW) files
+EAPI=6
+HOMEPAGE=https://github.com/vapier/ncompress
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/vapier/ncompress/archive/v4.2.4.5.tar.gz -> ncompress-4.2.4.5.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d63efb666922d64d3fd1e741c1f80066
diff --git a/metadata/md5-cache/app-arch/tar-1.30-r1 b/metadata/md5-cache/app-arch/tar-1.30-r1
new file mode 100644
index 000000000000..98dd34f1ad44
--- /dev/null
+++ b/metadata/md5-cache/app-arch/tar-1.30-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
+DESCRIPTION=Use this to make tarballs :)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/tar/
+IUSE=acl elibc_glibc minimal nls selinux static userland_GNU 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://gnu/tar/tar-1.30.tar.bz2 mirror://gnu-alpha/tar/tar-1.30.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=763b7036fa5b902bc8f67cddc789edf6
diff --git a/metadata/md5-cache/app-arch/tar-1.31-r1 b/metadata/md5-cache/app-arch/tar-1.31-r1
new file mode 100644
index 000000000000..110bccfbc514
--- /dev/null
+++ b/metadata/md5-cache/app-arch/tar-1.31-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.10.35 ) static? ( acl? ( virtual/acl[static-libs(+)] ) ) xattr? ( elibc_glibc? ( sys-apps/attr ) )
+DESCRIPTION=Use this to make tarballs :)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/tar/
+IUSE=acl elibc_glibc minimal nls selinux static userland_GNU 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+
+RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://gnu/tar/tar-1.31.tar.bz2 mirror://gnu-alpha/tar/tar-1.31.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=53ed3a5a42efd9faa53301b820674960
diff --git a/metadata/md5-cache/app-arch/wimlib-1.13.0 b/metadata/md5-cache/app-arch/wimlib-1.13.0
new file mode 100644
index 000000000000..504ab2ae689d
--- /dev/null
+++ b/metadata/md5-cache/app-arch/wimlib-1.13.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure prepare unpack
+DEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools ) cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The open source Windows Imaging (WIM) library
+EAPI=6
+HOMEPAGE=https://wimlib.net/
+IUSE=cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3+ LGPL-3+ ) CC0-1.0
+RDEPEND=dev-libs/libxml2:2 ntfs? ( sys-fs/ntfs3g ) fuse? ( sys-fs/fuse:0 ) openssl? ( dev-libs/openssl:0 ) iso? ( app-arch/cabextract app-cdr/cdrtools )
+REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
+RESTRICT=primaryuri
+SLOT=0
+SRC_URI=https://wimlib.net/downloads/wimlib-1.13.0.tar.gz -> wimlib-1.13.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=6b9b4507b8902279d3d79d85f61a083d
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r2 b/metadata/md5-cache/app-arch/xar-1.8-r2
new file mode 100644
index 000000000000..72c713f0b9b3
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xar-1.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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=An easily extensible archive format
+EAPI=6
+HOMEPAGE=https://opensource.apple.com/source/xar/
+IUSE=libressl kernel_Darwin abi_x86_32 abi_x86_64 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,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://opensource.apple.com/tarballs/xar/xar-400.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7d07ee9e5b83ada95cca23fa6de7c084
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.14 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.14
new file mode 100644
index 000000000000..b03f894bfa73
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink] dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ archive manager that can be used with Thunar
+EAPI=6
+HOMEPAGE=https://github.com/ib/xarchiver
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= !!<app-arch/pigz-2.4[symlink]
+SLOT=0
+SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.14.tar.gz -> xarchiver-0.5.4.14.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=75c01e1ace08171accb7bcf0766c71c8
diff --git a/metadata/md5-cache/app-arch/zstd-1.1.3 b/metadata/md5-cache/app-arch/zstd-1.1.3
index 526cff6c9fde..a727a69d7c39 100644
--- a/metadata/md5-cache/app-arch/zstd-1.1.3
+++ b/metadata/md5-cache/app-arch/zstd-1.1.3
@@ -3,9 +3,9 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/facebook/zstd/archive/v1.1.3.tar.gz -> zstd-1.1.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cbf239f5cf67838809df08d62471dfc3
+_md5_=875a62cc77c8336e034ae36731864725
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.2 b/metadata/md5-cache/app-arch/zstd-1.3.2
index 207e75b10c0b..69172452df8a 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.2
+++ b/metadata/md5-cache/app-arch/zstd-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.2.tar.gz -> zstd-1.3.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3dfa908fc733b84df42848c81d758bd3
+_md5_=393eac7aa7ef4d6b0053093f3c2d2d94
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.3 b/metadata/md5-cache/app-arch/zstd-1.3.3
index 625d205d656a..cf1f8efb2ad0 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.3
+++ b/metadata/md5-cache/app-arch/zstd-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.3.tar.gz -> zstd-1.3.3.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8ad583c689fd0a2d48cd24608a72cb19
+_md5_=ac759b94fae5c79d3e35ad566485201f
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.4 b/metadata/md5-cache/app-arch/zstd-1.3.4
index 6f1b7b9f56d6..45024b8806bd 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.4
+++ b/metadata/md5-cache/app-arch/zstd-1.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8ad583c689fd0a2d48cd24608a72cb19
+_md5_=ac759b94fae5c79d3e35ad566485201f
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.4-r1 b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
index 1b94640b432e..5ab6288d3b1f 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.4-r1
+++ b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=86f719b814fa2253c85a420e94e8a938
+_md5_=a15dce091484c10c709d39d5abb2595b
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.6 b/metadata/md5-cache/app-arch/zstd-1.3.6
index f1d926c8968c..46bfbf2b8e51 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.6
+++ b/metadata/md5-cache/app-arch/zstd-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.6.tar.gz -> zstd-1.3.6.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2720b53616869b4d659fbd626052a2ab
+_md5_=95cc7032dee884f0c20df5ac2bc540f4
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.7 b/metadata/md5-cache/app-arch/zstd-1.3.7
index ebc771fa1c00..722388827e59 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.7
+++ b/metadata/md5-cache/app-arch/zstd-1.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=6
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.7.tar.gz -> zstd-1.3.7.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2720b53616869b4d659fbd626052a2ab
+_md5_=95cc7032dee884f0c20df5ac2bc540f4
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.7-r1 b/metadata/md5-cache/app-arch/zstd-1.3.7-r1
index 7fc1dffffcf7..4d222ce7aaa0 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.7-r1
+++ b/metadata/md5-cache/app-arch/zstd-1.3.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 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 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.7.tar.gz -> zstd-1.3.7.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3fe8238938ca88515df4948fad25e3eb
+_md5_=63f45007a9fbde68db7dc0716379a53a
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.8 b/metadata/md5-cache/app-arch/zstd-1.3.8
index 60d1a2a335d1..b5e61474c4e8 100644
--- a/metadata/md5-cache/app-arch/zstd-1.3.8
+++ b/metadata/md5-cache/app-arch/zstd-1.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=zstd fast compression library
 EAPI=7
 HOMEPAGE=https://facebook.github.io/zstd/
 IUSE=lz4 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 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.3.8.tar.gz -> zstd-1.3.8.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3fe8238938ca88515df4948fad25e3eb
+_md5_=63f45007a9fbde68db7dc0716379a53a
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a747b4bb80cd..6c1f4e96a9cc 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/bacula-9.4.1-r1 b/metadata/md5-cache/app-backup/bacula-9.4.1-r1
new file mode 100644
index 000000000000..8d63e77cc628
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=http://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.4.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=90aa6ce7a0bee6d5366fb87ffad94c46
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index 88cfa60c851c..83b2602ac337 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index c3d814f676b0..ddfe4726c628 100644
--- a/metadata/md5-cache/app-backup/rdedup-1.0.2
+++ b/metadata/md5-cache/app-backup/rdedup-1.0.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-libs/libsodium-1.0.11 virtual/cargo
 DESCRIPTION=data deduplication with compression and public key encryption
 EAPI=6
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/libsodium-1.0.11
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=958dc843c0bb13509bff3a0c563d4bea
diff --git a/metadata/md5-cache/app-backup/snapper-0.5.6-r1 b/metadata/md5-cache/app-backup/snapper-0.5.6-r1
index b31dc54f2b77..bcff5c4e9869 100644
--- a/metadata/md5-cache/app-backup/snapper-0.5.6-r1
+++ b/metadata/md5-cache/app-backup/snapper-0.5.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line program for btrfs and lvm snapshot management
 EAPI=6
 HOMEPAGE=http://snapper.io/
 IUSE=lvm pam xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads] dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/snapper/snapper-0.5.6.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=554c13d4f4365c25531658d07c14dc9d
+_md5_=c37d860c4610a9331f662ecf37d86d54
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index f496dbe416f4..66f901843fad 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.2 b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
index 4cefe9215ea8..578a1b9c3888 100644
--- a/metadata/md5-cache/app-cdr/isoimagewriter-0.2
+++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/isoimagewriter/0.2/isoimagewriter-0.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c5d00f83d2e0c7e7e80c4c6e9e8ea1b
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index d5d94c869c86..f676dc114855 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.2
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1481242372/kde_cdemu-0.7.2.tar.bz2 -> kcdemu-0.7.2.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 21ac4b833a1e..bf5aaa0bc04e 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/acme-0.27.1 b/metadata/md5-cache/app-crypt/acme-0.27.1
deleted file mode 100644
index 1e618b12a22d..000000000000
--- a/metadata/md5-cache/app-crypt/acme-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/cryptography-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/josepy-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/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/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/requests-2.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/requests-toolbelt-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(-)] >=dev-python/six-1.9.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/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/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.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(-)]
-DESCRIPTION=An implementation of the ACME protocol
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-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/josepy-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/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/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/requests-2.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/requests-toolbelt-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(-)] >=dev-python/six-1.9.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/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=909ea6adaa595298267fa985a70e527a
diff --git a/metadata/md5-cache/app-crypt/acme-0.29.1 b/metadata/md5-cache/app-crypt/acme-0.29.1
index 72721b6899f5..5f079e87bc0b 100644
--- a/metadata/md5-cache/app-crypt/acme-0.29.1
+++ b/metadata/md5-cache/app-crypt/acme-0.29.1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of the ACME protocol
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cryptography-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/josepy-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/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/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/requests-2.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/requests-toolbelt-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(-)] >=dev-python/six-1.9.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/certbot/certbot/archive/v0.29.1.tar.gz -> certbot-0.29.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eba496502981f0c6fed2822d46687672
+_md5_=df1658d4d167f0416fa92ccd9b0faf79
diff --git a/metadata/md5-cache/app-crypt/acme-0.30.0 b/metadata/md5-cache/app-crypt/acme-0.30.0
new file mode 100644
index 000000000000..33485e9246d9
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.30.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-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/josepy-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/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/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/requests-2.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/requests-toolbelt-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(-)] >=dev-python/six-1.9.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/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/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.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(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-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/josepy-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/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/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/requests-2.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/requests-toolbelt-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(-)] >=dev-python/six-1.9.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/certbot/certbot/archive/v0.30.0.tar.gz -> certbot-0.30.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=14287b0f912e3d56360a7644bdc49c72
diff --git a/metadata/md5-cache/app-crypt/argon2-20171227 b/metadata/md5-cache/app-crypt/argon2-20171227
index a1a3583085df..bc0ba7cb0583 100644
--- a/metadata/md5-cache/app-crypt/argon2-20171227
+++ b/metadata/md5-cache/app-crypt/argon2-20171227
@@ -3,8 +3,8 @@ DESCRIPTION=Password hashing software that won the Password Hashing Competition
 EAPI=6
 HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( Apache-2.0 CC0-1.0 )
 SLOT=0/1
 SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20171227.tar.gz -> argon2-20171227.tar.gz
-_md5_=8ad274c956a055d4816a1720b0531b83
+_md5_=59e145a4825f3ff980a08b8bb7a330be
diff --git a/metadata/md5-cache/app-crypt/certbot-0.27.1 b/metadata/md5-cache/app-crypt/certbot-0.27.1
deleted file mode 100644
index 2fc9588569ed..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-0.27.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_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~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(-)] >=app-crypt/acme-0.26.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/configargparse-0.9.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/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.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/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f8febf147bedcb9e40a0c8e8d157b532
diff --git a/metadata/md5-cache/app-crypt/certbot-0.29.1 b/metadata/md5-cache/app-crypt/certbot-0.29.1
index 210a1cc3c1be..e491063e4815 100644
--- a/metadata/md5-cache/app-crypt/certbot-0.29.1
+++ b/metadata/md5-cache/app-crypt/certbot-0.29.1
@@ -4,11 +4,11 @@ DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~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(-)] >=app-crypt/acme-0.29.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/configargparse-0.9.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/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.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/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.29.1.tar.gz -> certbot-0.29.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6351ddab81b7108b6c7a38e1b2c9d4dc
+_md5_=af6d35536d7e292301bcad9d8f497ca8
diff --git a/metadata/md5-cache/app-crypt/certbot-0.30.0 b/metadata/md5-cache/app-crypt/certbot-0.30.0
new file mode 100644
index 000000000000..8f350e97fd80
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.30.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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~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(-)] >=app-crypt/acme-0.26.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/configargparse-0.9.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/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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.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/josepy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/parsedatetime-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/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.30.0.tar.gz -> certbot-0.30.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cfa158e83e7a659abb133d54838fb18e
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.27.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.27.1
deleted file mode 100644
index 12c5b21f2219..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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=Apache plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb8eec82621910392ca603f30f9e46ad
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.29.1 b/metadata/md5-cache/app-crypt/certbot-apache-0.29.1
index 5b38299fd05e..b2b93d99c57a 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-0.29.1
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.29.1
@@ -4,11 +4,11 @@ DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 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=Apache-2.0
 RDEPEND=>=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.29.1.tar.gz -> certbot-0.29.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e61a85106ca2541e045b8c5b435e5025
+_md5_=99a38f914d6310de4e3b3d455ecbb758
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.30.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.30.0
new file mode 100644
index 000000000000..2d6e73a77c1f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.30.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.30.0.tar.gz -> certbot-0.30.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cec35806b991b0c7edbc6cb7eda1bd5a
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.27.1
deleted file mode 100644
index 6eca32903a35..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.27.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_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=Nginx plugin for certbot (Let's Encrypt Client)
-EAPI=6
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm 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(-)] >=app-crypt/certbot-0.26.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(-)] >=app-crypt/acme-0.25.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/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(-)] >=dev-python/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.27.1.tar.gz -> certbot-0.27.1.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8d39e6e2d7cf3f5cfcd82006fd2d93d2
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.29.1 b/metadata/md5-cache/app-crypt/certbot-nginx-0.29.1
index 3b8894bea789..a2546b4d3ac8 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-0.29.1
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.29.1
@@ -4,11 +4,11 @@ DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=6
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm 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(-)] >=app-crypt/certbot-0.22.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(-)] >=app-crypt/acme-0.26.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/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(-)] >=dev-python/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.29.1.tar.gz -> certbot-0.29.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8126ff1456bebaeda91f00319ded42d8
+_md5_=10126738148d21b66f6d96c26337f1a2
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.30.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.30.0
new file mode 100644
index 000000000000..d7c12a3e8e12
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.30.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=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~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(-)] >=app-crypt/certbot-0.22.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(-)] >=app-crypt/acme-0.26.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/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(-)] >=dev-python/pyparsing-1.5.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/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/certbot/certbot/archive/v0.30.0.tar.gz -> certbot-0.30.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=88fe893c960848818e5043afa6b75ba0
diff --git a/metadata/md5-cache/app-crypt/dehydrated-0.6.2-r1 b/metadata/md5-cache/app-crypt/dehydrated-0.6.2-r1
index b55e324148d3..b47e4e54bd21 100644
--- a/metadata/md5-cache/app-crypt/dehydrated-0.6.2-r1
+++ b/metadata/md5-cache/app-crypt/dehydrated-0.6.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a client for signing certificates with an ACME-server
 EAPI=6
 HOMEPAGE=https://github.com/lukas2511/dehydrated
 IUSE=+cron
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=cron? ( virtual/cron ) app-shells/bash net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.2.tar.gz -> dehydrated-0.6.2.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=afb0402c23be05a0111d656570fca3b9
+_md5_=a7ee904f95f89b3f811431fc45eb9661
diff --git a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2 b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
new file mode 100644
index 000000000000..b81a01d23f89
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
+DESCRIPTION=PKCS#11 support for GnuPG
+EAPI=7
+HOMEPAGE=http://gnupg-pkcs11.sourceforge.net
+IUSE=libressl proxy
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
+SLOT=0
+SRC_URI=https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.9.2/gnupg-pkcs11-scd-0.9.2.tar.bz2
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=fa3feabde1839e23059ab8b2aad72a7e
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.11.1 b/metadata/md5-cache/app-crypt/gpgme-1.11.1
index 4dddf812d461..0fcfb675ee8c 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.11.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.11.1
@@ -5,11 +5,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=7
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs cxx python qt5 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 ~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 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 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.29:= 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(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !<kde-apps/gpgmepp-4.14.11_pre20160611:4 !kde-apps/gpgmepp:5 !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.11.1.tar.bz2
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7383f599eea3b9ac5e91505b9a887629
+_md5_=86f195407e63415f64c9f69d33044647
diff --git a/metadata/md5-cache/app-crypt/hashcat-5.1.0 b/metadata/md5-cache/app-crypt/hashcat-5.1.0
new file mode 100644
index 000000000000..aeadbf578542
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/hashcat-5.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=virtual/opencl app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
+DESCRIPTION=World's fastest and most advanced password recovery utility
+EAPI=6
+HOMEPAGE=https://github.com/hashcat/hashcat
+IUSE=brain video_cards_nvidia
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=virtual/opencl app-arch/lzma brain? ( dev-libs/xxhash ) video_cards_nvidia? ( >x11-drivers/nvidia-drivers-367.0 )
+SLOT=0
+SRC_URI=https://github.com/hashcat/hashcat/archive/v5.1.0.tar.gz -> hashcat-5.1.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=27929bc3c84d4b26d06af61760f9a09f
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.5.0 b/metadata/md5-cache/app-crypt/heimdal-7.5.0
index 670d384d4c9e..c170f12d529b 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.5.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) 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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,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/e2fsprogs-libs-1.42.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-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/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(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( >=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(-)?] ) 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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,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/e2fsprogs-libs-1.42.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-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/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(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=6
 HOMEPAGE=http://www.h5l.org/
 IUSE=afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test 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=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd
 LICENSE=BSD
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) 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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,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/e2fsprogs-libs-1.42.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-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
+RDEPEND=ssl? ( !libressl? ( >=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(-)?] ) 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(-)?] ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,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/e2fsprogs-libs-1.42.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-libs/ncurses:0= >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.5.0/heimdal-7.5.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=da3c7d8aa5f82195ab8cb8f3e7c20f8c
+_md5_=72d2e80a462937c544d885bd4ac834e9
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.1.3 b/metadata/md5-cache/app-crypt/nitrocli-0.1.3
new file mode 100644
index 000000000000..c0518f0c993c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.1.3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line tool for interacting with the Nitrokey Storage
+EAPI=7
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/hid/0.4.1/download -> hid-0.4.1.crate https://crates.io/api/v1/crates/hidapi-sys/0.1.4/download -> hidapi-sys-0.1.4.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/nitrocli/0.1.3/download -> nitrocli-0.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=6b42886a8dc98f63a8e94c4b0641ec7a
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.0 b/metadata/md5-cache/app-crypt/nitrocli-0.2.0
new file mode 100644
index 000000000000..9d1a01b923bf
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line application for interacting with Nitrokey devices
+EAPI=7
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli
+IUSE=test debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/nitrocli/0.2.0/download -> nitrocli-0.2.0.crate https://crates.io/api/v1/crates/nitrokey/0.2.1/download -> nitrokey-0.2.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.1/download -> nitrokey-sys-3.4.1.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=a923bf4ebd72157c7b75eb386c1edf7d
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.2.1 b/metadata/md5-cache/app-crypt/nitrocli-0.2.1
new file mode 100644
index 000000000000..634ab76c7212
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.2.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/rust-1.31.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-libs/hidapi
+DESCRIPTION=A command line application for interacting with Nitrokey devices
+EAPI=7
+HOMEPAGE=https://github.com/d-e-s-o/nitrocli
+IUSE=test debug
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/hidapi app-crypt/gnupg
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.45/download -> libc-0.2.45.crate https://crates.io/api/v1/crates/nitrocli/0.2.1/download -> nitrocli-0.2.1.crate https://crates.io/api/v1/crates/nitrokey/0.2.3/download -> nitrokey-0.2.3.crate https://crates.io/api/v1/crates/nitrokey-sys/3.4.1/download -> nitrokey-sys-3.4.1.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand_chacha/0.1.0/download -> rand_chacha-0.1.0.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.0/download -> rand_isaac-0.1.0.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.0/download -> rand_xorshift-0.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=d42e4de78bf2d807471cbda88faeeccc
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190102 b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190102
new file mode 100644
index 000000000000..b902a2257e0b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20190102
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( app-crypt/gnupg )
+DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+IUSE=test
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20190102.gz test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )
+_md5_=c3809cac41858c5eaef32669e47fc779
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.12 b/metadata/md5-cache/app-crypt/p11-kit-0.23.12
index a498435551ee..9a3de49f7852 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.12
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.12
@@ -5,11 +5,11 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
 EAPI=7
 HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
 IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=asn1? ( >=dev-libs/libtasn1-3.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(-)?] ) libffi? ( >=virtual/libffi-3.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(-)?] ) trust? ( app-misc/ca-certificates )
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.12/p11-kit-0.23.12.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c36b6c362b2939dc50927304b5a0178a
+_md5_=f91336984e1c0802f8860a4fd4040a6b
diff --git a/metadata/md5-cache/app-crypt/rhash-1.3.6-r1 b/metadata/md5-cache/app-crypt/rhash-1.3.6-r1
index 5d518a0d7657..eaf48b7bc68b 100644
--- a/metadata/md5-cache/app-crypt/rhash-1.3.6-r1
+++ b/metadata/md5-cache/app-crypt/rhash-1.3.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Console utility and library for computing and verifying file hash su
 EAPI=6
 HOMEPAGE=http://rhash.anz.ru/
 IUSE=debug nls libressl ssl 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=mirror://sourceforge/rhash/rhash-1.3.6-src.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=14962d6727fc002dc884d6dbb5509d6f
+_md5_=73952b0d0369498d8d5ac86617616200
diff --git a/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3 b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3
new file mode 100644
index 000000000000..8e322eb0a35c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/tpm2-abrmd-2.0.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/gdbus-codegen >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:= test? ( dev-util/cmocka )
+DESCRIPTION=TPM2 Access Broker & Resource Manager
+EAPI=7
+HOMEPAGE=https://github.com/tpm2-software/tpm2-abrmd
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=sys-apps/dbus:= dev-libs/glib:= app-crypt/tpm2-tss:=
+SLOT=0
+SRC_URI=https://github.com/tpm2-software/tpm2-abrmd/releases/download/2.0.3/tpm2-abrmd-2.0.3.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1761a1e50b803a77001464a3304eb801
diff --git a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3 b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
index f050644426aa..ba3f84e9f1f2 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
+++ b/metadata/md5-cache/app-crypt/tpm2-tools-3.1.3
@@ -10,4 +10,4 @@ LICENSE=BSD
 RDEPEND=>=app-crypt/tpm2-tss-2.0 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/tpm2-software/tpm2-tools/releases/download/3.1.3/tpm2-tools-3.1.3.tar.gz
-_md5_=bec0570aca4bc4be1bca1aa8c7cb2ec1
+_md5_=136d4ab66c189cb65be3ce63773e87c0
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0 b/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
index c44f65e217f3..f73a75532051 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.1.0
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure prepare setup
+BDEPEND=virtual/pkgconfig ~sys-devel/autoconf-archive-2018.03.13 doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
 DEPEND=test? ( dev-util/cmocka )
 DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
 EAPI=7
 HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
-IUSE=doc +gcrypt libressl openssl static-libs test kernel_linux
+IUSE=doc +gcrypt openssl static-libs test kernel_linux
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
 SLOT=0/0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.1.0/tpm2-tss-2.1.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=a00bee166c6e8c514930297ff0f8e967
+_md5_=9ae0dd86a2988854eeb635d75ffff3ad
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 1a36acec4d5a..8422a7d76801 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/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index 63e4ed5987c2..277a2fa2caf6 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12 b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
index 8dcc6b970dae..a016cbb043a0 100644
--- a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
+++ b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=German (AT,CH,DE) dictionaries for myspell/hunspell
 EAPI=7
 HOMEPAGE=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 GPL-2 LGPL-3+
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/2017-01.12/@@download/file/dict-de_AT-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/2017-01.12/@@download/file/dict-de_CH-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/2017-01-12/@@download/file/dict-de_DE-frami_2017-01-12.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=f1e2c9098d1befa6d15fc22bdf2b87c3
+_md5_=a0d1e14a79dcd68a85f44acc71c8495a
diff --git a/metadata/md5-cache/app-dicts/myspell-de_1901-20120929 b/metadata/md5-cache/app-dicts/myspell-de_1901-20120929
deleted file mode 100644
index 1f7245084c48..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-de_1901-20120929
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=German (traditional orthography) dictionaries for myspell/hunspell
-EAPI=5
-HOMEPAGE=http://www.j3e.de/myspell/ http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( GPL-2 GPL-3 )
-SLOT=0
-SRC_URI=http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries/pscreleasefolder.2011-11-04.1209635399/2012.09.29/dict-de_de-1901_oldspell_2012-09-29.oxt
-_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=7b7920f624ff80910a40795f4c53bdce
diff --git a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403 b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
index 58e5ed2d17a3..0e13638f6e4b 100644
--- a/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
+++ b/metadata/md5-cache/app-dicts/myspell-de_1901-20160403
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=German (traditional orthography) dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=http://www.j3e.de/myspell/ http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/aoo-extensions/1057/8/dict-de_de-1901_oldspell_2016-04-03.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=77b724aa5b4aef4248bfb724709f5b61
+_md5_=a7f180f7c5693428e59a907d8067e949
diff --git a/metadata/md5-cache/app-dicts/myspell-es-2.3 b/metadata/md5-cache/app-dicts/myspell-es-2.3
index f0568a3bc919..63a13f797185 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-2.3
+++ b/metadata/md5-cache/app-dicts/myspell-es-2.3
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Spanish dictionaries for myspell/hunspell
 EAPI=6
 HOMEPAGE=https://github.com/sbosio/rla-es
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-3 MPL-1.1
 SLOT=0
 SRC_URI=https://github.com/sbosio/rla-es/releases/download/v2.3/es_ANY.oxt -> es_ANY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_AR.oxt -> es_AR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_BO.oxt -> es_BO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CL.oxt -> es_CL-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CO.oxt -> es_CO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CR.oxt -> es_CR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_CU.oxt -> es_CU-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_DO.oxt -> es_DO-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_EC.oxt -> es_EC-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_ES.oxt -> es_ES-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_GT.oxt -> es_GT-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_HN.oxt -> es_HN-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_MX.oxt -> es_MX-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_NI.oxt -> es_NI-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PA.oxt -> es_PA-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PE.oxt -> es_PE-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PH.oxt -> es_PH-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PR.oxt -> es_PR-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_PY.oxt -> es_PY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_SV.oxt -> es_SV-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_US.oxt -> es_US-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_UY.oxt -> es_UY-2.3.oxt https://github.com/sbosio/rla-es/releases/download/v2.3/es_VE.oxt -> es_VE-2.3.oxt
 _eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=d7786565e0c324e6c3777bfa5ab34a40
+_md5_=fb09baaa725196d233d4769588547212
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 76523ccb3f9d..f1973e64ec09 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/gnucash-docs-3.4 b/metadata/md5-cache/app-doc/gnucash-docs-3.4
new file mode 100644
index 000000000000..ce8d85cd42aa
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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=Documentation package for GnuCash
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_C l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/3.4.tar.gz -> gnucash-docs-3.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=51d5d0a82e501e518950c86084f7b770
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.0.1 b/metadata/md5-cache/app-doc/kicad-doc-5.0.1
new file mode 100644
index 000000000000..fb309dd677b7
--- /dev/null
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools manuals
+EAPI=6
+HOMEPAGE=http://www.kicad-pcb.org/
+IUSE=html +pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
+REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl )
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-doc/archive/5.0.1.tar.gz -> kicad-doc-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=947a0a25c427b27af84e78a350c43b9a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f25e9a6a578e..5850cb383e3b 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-vcs-26.1.91 b/metadata/md5-cache/app-editors/emacs-vcs-26.1.91
new file mode 100644
index 000000000000..f03815caebfe
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-vcs-26.1.91
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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 ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) 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= <media-gfx/imagemagick-7: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? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 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 ) ) ) ) ) X? ( x11-base/xorg-proto )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif 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 ~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?] acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) 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= <media-gfx/imagemagick-7: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? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 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.1.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-26.1.91.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4135ac20d8a3a6f0812e55f3565649f9
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92 b/metadata/md5-cache/app-editors/kile-2.9.92
index c4561a050a70..93acd073d8a6 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92
+++ b/metadata/md5-cache/app-editors/kile-2.9.92
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-18.08.3:5 >=kde-apps/okular-18.08.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f1ba6770546e81551f08d66e4e1478bd
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92-r1 b/metadata/md5-cache/app-editors/kile-2.9.92-r1
index 960d89d52bd9..1c4127888527 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92-r1
+++ b/metadata/md5-cache/app-editors/kile-2.9.92-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Latex Editor and TeX shell based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kile.sourceforge.io/
 IUSE=+pdf +png debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-18.08.3:5 >=kde-apps/okular-18.08.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=964ce3577be581f39337a3c7de45b3cc
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63e12350dcf2d761d82d029ac14980d9
diff --git a/metadata/md5-cache/app-editors/moe-1.10 b/metadata/md5-cache/app-editors/moe-1.10
new file mode 100644
index 000000000000..ae9a7187c82c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/moe-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare unpack
+DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=A powerful and user-friendly console text editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/moe/
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://gnu/moe/moe-1.10.tar.lz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=dc29d46c2c60c29238cf7319fad92bbc
diff --git a/metadata/md5-cache/app-editors/moe-1.6 b/metadata/md5-cache/app-editors/moe-1.6
deleted file mode 100644
index 305319b01e86..000000000000
--- a/metadata/md5-cache/app-editors/moe-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip ) sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=A powerful and user-friendly console text editor
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/moe/
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://gnu/moe/moe-1.6.tar.lz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=803de735660dbab94e3815c45e32e72a
diff --git a/metadata/md5-cache/app-editors/neovim-0.3.2 b/metadata/md5-cache/app-editors/neovim-0.3.2
new file mode 100644
index 000000000000..a182f9fad9d6
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.3.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/libuv-1.2.0:0= >=dev-libs/msgpack-1.0.0:0= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-2.0.0:0= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl dev-util/gperf virtual/libiconv virtual/libintl
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=7
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=>=dev-libs/libuv-1.2.0:0= >=dev-libs/msgpack-1.0.0:0= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-2.0.0:0= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.3.2.tar.gz -> neovim-0.3.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=95cafb1a2aa5a29e49bd97ea11596bef
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.4 b/metadata/md5-cache/app-editors/okteta-0.25.4
index 0bc81c79c7a9..6ec14a60d016 100644
--- a/metadata/md5-cache/app-editors/okteta-0.25.4
+++ b/metadata/md5-cache/app-editors/okteta-0.25.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.25.4/src/okteta-0.25.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=549e9a674434a8fa767882c285a33e4a
diff --git a/metadata/md5-cache/app-editors/okteta-0.25.5 b/metadata/md5-cache/app-editors/okteta-0.25.5
new file mode 100644
index 000000000000..c1ba70b9b0a4
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.25.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Hex editor by KDE
+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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/okteta/0.25.5/src/okteta-0.25.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=779812b89e3f2754205bee13d371d032
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index fa069a141300..27432dec4780 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/auto-complete-1.3.1 b/metadata/md5-cache/app-emacs/auto-complete-1.3.1
deleted file mode 100644
index fb95cad0ca9a..000000000000
--- a/metadata/md5-cache/app-emacs/auto-complete-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Auto-complete package
-EAPI=5
-HOMEPAGE=http://cx4a.org/software/auto-complete/ https://github.com/m2ym/auto-complete/
-IUSE=l10n_ja
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://cx4a.org/pub/auto-complete/auto-complete-1.3.1.tar.bz2
-_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=353e561a404a4db73fd756e3d72ad448
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index d6a26c430662..124a95b4148b 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -6,7 +6,8 @@ HOMEPAGE=https://github.com/auto-complete/popup-el
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
 _eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=9869e066d25db323b23563ab3dbe15af
+_md5_=494bee3e7a380d10dbffc5138ec94939
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.3
new file mode 100644
index 000000000000..df5842f81a3b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing Ruby code
+EAPI=6
+HOMEPAGE=https://www.ruby-lang.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://ruby/ruby-2.5.3.tar.xz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=bce0fbc8b9ddf49dbf2fb8ee40a177f7
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.0
new file mode 100644
index 000000000000..ee76ae74dd1a
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs major mode for editing Ruby code
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.0.tar.gz
+_eclasses_=elisp	efe1c459331d853614b12c63ab169a32	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=318f806f2cb0a2422797bfa1ec4d2ccc
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 808b8a183c97..c0acaf197157 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/aqemu-0.9.2 b/metadata/md5-cache/app-emulation/aqemu-0.9.2
index 037874baa3f7..feaac242ae91 100644
--- a/metadata/md5-cache/app-emulation/aqemu-0.9.2
+++ b/metadata/md5-cache/app-emulation/aqemu-0.9.2
@@ -1,13 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
 DESCRIPTION=Graphical interface for QEMU and KVM emulators, using Qt5
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/aqemu
 IUSE=vnc
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-emulation/qemu vnc? ( net-libs/libvncserver ) dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtprintsupport:5
+RDEPEND=app-emulation/qemu dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 vnc? ( net-libs/libvncserver )
 SLOT=0
 SRC_URI=https://github.com/tobimensch/aqemu/archive/v0.9.2.tar.gz -> aqemu-0.9.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c22b0a5b053afed272abf0097d769fe0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=08328115025662851c22bfed16c8ec8c
diff --git a/metadata/md5-cache/app-emulation/containerd-1.2.2 b/metadata/md5-cache/app-emulation/containerd-1.2.2
new file mode 100644
index 000000000000..3069c111436e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) >=dev-lang/go-1.9
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=apparmor +btrfs +cri hardened +seccomp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=>=app-emulation/runc-1.0.0_rc5 seccomp? ( sys-libs/libseccomp )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.2.2.tar.gz -> containerd-1.2.2.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b5fe4c478bccbe50db1ea62626763919
diff --git a/metadata/md5-cache/app-emulation/cri-o-1.13.0 b/metadata/md5-cache/app-emulation/cri-o-1.13.0
new file mode 100644
index 000000000000..1e2c37a5b4c3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cri-o-1.13.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=OCI-based implementation of Kubernetes Container Runtime Interface
+EAPI=6
+HOMEPAGE=http://cri-o.io/
+IUSE=btrfs +device-mapper ostree seccomp selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/runc dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= net-firewall/conntrack-tools net-firewall/iptables net-misc/cni-plugins net-misc/socat sys-apps/iproute2 btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) ostree? ( dev-util/ostree ) seccomp? ( sys-libs/libseccomp:= ) selinux? ( sys-libs/libselinux:= )
+SLOT=0
+SRC_URI=https://github.com/kubernetes-sigs/cri-o/archive/v1.13.0.tar.gz -> cri-o-1.13.0.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=67f7d168ebec5a06a7855859a9aecba7
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
deleted file mode 100644
index 67daecfbcf2c..000000000000
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Golden Disk Image builder.
-EAPI=6
-HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/networkx-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.17.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0490dda404715900f3feeed3a2ea5d6c
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.19.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.19.0
new file mode 100644
index 000000000000..90117a5083d4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.19.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=6
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/networkx-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/flake8-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.19.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7c6a84322fb2c13b6886648467d996aa
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.1 b/metadata/md5-cache/app-emulation/docker-18.09.1
new file mode 100644
index 000000000000..81936fc5f137
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-18.09.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.2.2 ~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20181207 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.1.tar.gz -> docker-18.09.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=55a90b301c5fbeaff189127b7e534df2
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20181207 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20181207
new file mode 100644
index 000000000000..44961c61fb1a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20181207
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker container networking
+EAPI=6
+HOMEPAGE=https://github.com/docker/libnetwork
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=!<app-emulation/docker-1.13.0_rc1
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/docker/libnetwork/archive/2cfbf9b1f98162a55829a21cc603c76072a75382.tar.gz -> docker-proxy-0.8.0_p20181207.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=e47a6ae5d65b8b9443715b40e849f8b6
diff --git a/metadata/md5-cache/app-emulation/libpod-0.12.1.2 b/metadata/md5-cache/app-emulation/libpod-0.12.1.2
new file mode 100644
index 000000000000..21d2746573dd
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-0.12.1.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 app-emulation/runc dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=6
+HOMEPAGE=https://github.com/containers/libpod/
+IUSE=apparmor btrfs ostree selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= >=app-emulation/cri-o-1.13.0 app-emulation/runc dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) ostree? ( dev-libs/glib:= dev-util/ostree:= ) selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v0.12.1.2.tar.gz -> libpod-0.12.1.2.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e0825d6bdb8be104f4d6c69881b6a0e9
diff --git a/metadata/md5-cache/app-emulation/libvirt-4.9.0 b/metadata/md5-cache/app-emulation/libvirt-4.9.0
index 87f2e89ca8dc..ad539248c5a7 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.9.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.9.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 kernel_linux
-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-1.5.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-4.6.0 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.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.9.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3669918d65094b7f97e4f30f4727a696
+_md5_=73f9bb079525274223cfba9e8a927871
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index f1aedd72c17d..a1c51b9a6edf 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 virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70198b1907f2fcf90c08e48432fca4f0
+_md5_=09944c845ea0f677b620837174eb867a
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-2.0.0 b/metadata/md5-cache/app-emulation/libvirt-glib-2.0.0
index d946774226d1..dc8186ea4bd9 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-2.0.0
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=GLib and GObject mappings for libvirt
 EAPI=6
 HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
 IUSE=+introspection nls +vala
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-1.2.6:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=17e820670dd8934ca52522bb76da583c
+_md5_=8a92b7cbeae831604a01bca57eadb13e
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.2 b/metadata/md5-cache/app-emulation/lxc-3.0.2
deleted file mode 100644
index f28b2f09805d..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.15* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst setup
-DEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) >=app-text/docbook-sgml-utils-0.6.14-r2 >=sys-kernel/linux-headers-3.2
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=apparmor examples pam python seccomp selinux +templates kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-3
-PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
-RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=464c6eaa9e847cd91a615293359ba14c
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.3 b/metadata/md5-cache/app-emulation/lxc-3.0.3
index 4ddae5af2143..17ac10870bbe 100644
--- a/metadata/md5-cache/app-emulation/lxc-3.0.3
+++ b/metadata/md5-cache/app-emulation/lxc-3.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=LinuX Containers userspace utilities
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/
 IUSE=apparmor examples pam python seccomp selinux +templates kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 PDEPEND=templates? ( app-emulation/lxc-templates ) python? ( dev-python/python3-lxc )
 RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=707c0553289c5e7f6a8e86e1bb50d19f
+_md5_=c3e220bc330e98630410e70be3efc652
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.2 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.2
deleted file mode 100644
index a187e0be81a6..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-templates-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=>=app-emulation/lxc-3.0
-DESCRIPTION=Old style template scripts for LXC
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=>=app-emulation/lxc-3.0
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1a8e2395d3838b96062b850702864050
diff --git a/metadata/md5-cache/app-emulation/lxc-templates-3.0.3 b/metadata/md5-cache/app-emulation/lxc-templates-3.0.3
index a420be20422d..93037d0fc69d 100644
--- a/metadata/md5-cache/app-emulation/lxc-templates-3.0.3
+++ b/metadata/md5-cache/app-emulation/lxc-templates-3.0.3
@@ -4,10 +4,10 @@ DEPEND=>=app-emulation/lxc-3.0
 DESCRIPTION=Old style template scripts for LXC
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 RDEPEND=>=app-emulation/lxc-3.0
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-templates-3.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0af8fc7942c592afc00953fa584d722a
+_md5_=5c90fbbe900de503a2d7e240e372e34f
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.1 b/metadata/md5-cache/app-emulation/qemu-2.12.1
index e28c24fedd0b..5b6242c1f5ae 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.1
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.1
@@ -1,5 +1,5 @@
 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) capstone? ( dev-libs/capstone ) 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/libibumad:= sys-fabric/libibverbs:= 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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-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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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(+)] ) capstone? ( dev-libs/capstone ) 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/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) capstone? ( dev-libs/capstone ) 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/libibumad:= sys-fabric/libibverbs:= 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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-lang/perl 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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(+)] ) capstone? ( dev-libs/capstone ) 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/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=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(-)] ) 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
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.1-patches-r1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=051b4b711a4d6102d2b5fea3bd6cfe1f
+_md5_=bd0b8d372004c513ed7a4c8fea4de0fd
diff --git a/metadata/md5-cache/app-emulation/qemu-3.1.0 b/metadata/md5-cache/app-emulation/qemu-3.1.0
index a8613185c5d6..cfa04d26d73d 100644
--- a/metadata/md5-cache/app-emulation/qemu-3.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-3.1.0
@@ -1,11 +1,11 @@
 BDEPEND=virtual/pkgconfig
 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= 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? ( 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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? ( 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) filecaps? ( sys-libs/libcap )
+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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= 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? ( 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-lang/perl 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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? ( 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
 IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl 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_riscv32 qemu_softmmu_targets_riscv64 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_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 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_riscv32 qemu_user_targets_riscv64 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_xtensa qemu_user_targets_xtensaeb 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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= 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? ( 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 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
@@ -13,4 +13,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-3.1.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a0dba595b4e61f83ce5126ed554fb5c8
+_md5_=766af32d0e6fe8449a19bc264b46d86c
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 02fdcca18eb1..acfcf67003b1 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= 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? ( 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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? ( 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) filecaps? ( sys-libs/libcap )
+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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=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 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= 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? ( 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] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-lang/perl 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] x11-libs/libxkbcommon[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 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) 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? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] 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? ( 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:= ) 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] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) filecaps? ( sys-libs/libcap )
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 RESTRICT=strip
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4363c3ae193ce985824a1a0723605fdd
+_md5_=58b8fa3b4bab0a48f477c507ad7787a3
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
index e55350a5157f..b60c3635f9af 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/pytho
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-3.1.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=a640ff06d596b7d272a81788cc22d662
+_md5_=4dd360751cf1d8e04a77d5ea41b11a7c
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc6_p20181203 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc6_p20181203
new file mode 100644
index 000000000000..1e846d13d911
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc6_p20181203
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=runc container cli tools
+EAPI=6
+HOMEPAGE=http://runc.io
+IUSE=+ambient apparmor hardened +kmem +seccomp
+KEYWORDS=~amd64 ~arm ~arm64 ~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/96ec2177ae841256168fcf76954f7177af9446eb.tar.gz -> runc-1.0.0_rc6_p20181203.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=e461a2f28ab8af36dceac455bf5d2bd1
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.34 b/metadata/md5-cache/app-emulation/skopeo-0.1.34
new file mode 100644
index 000000000000..9e61b9f5d97d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145 dev-go/go-md2man >=dev-lang/go-1.9
+DESCRIPTION=Command line utility foroperations on container images and image repositories
+EAPI=6
+HOMEPAGE=https://github.com/containers/skopeo
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3 >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/skopeo/archive/v0.1.34.tar.gz -> skopeo-0.1.34.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1cd32c06e160ab6897d5ba47a74eae8c
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.2.3 b/metadata/md5-cache/app-emulation/vagrant-2.2.3
new file mode 100644
index 000000000000..97868a185844
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vagrant-2.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby23] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] >=dev-ruby/net-ssh-5.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/rubyzip-1.2.2[ruby_targets_ruby23] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby24] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby24] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby24] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby24] >=dev-ruby/listen-3.1.5[ruby_targets_ruby24] <dev-ruby/log4r-1.1.11[ruby_targets_ruby24] <dev-ruby/mime-types-3:*[ruby_targets_ruby24] >=dev-ruby/net-ssh-5.1.0:*[ruby_targets_ruby24] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby24] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby24] dev-ruby/rest-client:2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2[ruby_targets_ruby24] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby25] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby25] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby25] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby25] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby25] >=dev-ruby/listen-3.1.5[ruby_targets_ruby25] <dev-ruby/log4r-1.1.11[ruby_targets_ruby25] <dev-ruby/mime-types-3:*[ruby_targets_ruby25] >=dev-ruby/net-ssh-5.1.0:*[ruby_targets_ruby25] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby25] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby25] dev-ruby/rest-client:2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2[ruby_targets_ruby25] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-10.5.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rake-10.5.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rake-10.5.0[ruby_targets_ruby25] ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=6
+HOMEPAGE=https://vagrantup.com/
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby23? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby23] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] >=dev-ruby/net-ssh-5.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/rubyzip-1.2.2[ruby_targets_ruby23] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby24] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby24] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby24] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby24] >=dev-ruby/listen-3.1.5[ruby_targets_ruby24] <dev-ruby/log4r-1.1.11[ruby_targets_ruby24] <dev-ruby/mime-types-3:*[ruby_targets_ruby24] >=dev-ruby/net-ssh-5.1.0:*[ruby_targets_ruby24] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby24] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby24] dev-ruby/rest-client:2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2[ruby_targets_ruby24] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/bcrypt_pbkdf-1.0.0[ruby_targets_ruby25] >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby25] >=dev-ruby/ed25519-1.2.4[ruby_targets_ruby25] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby25] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby25] >=dev-ruby/i18n-1.1.1:1[ruby_targets_ruby25] >=dev-ruby/listen-3.1.5[ruby_targets_ruby25] <dev-ruby/log4r-1.1.11[ruby_targets_ruby25] <dev-ruby/mime-types-3:*[ruby_targets_ruby25] >=dev-ruby/net-ssh-5.1.0:*[ruby_targets_ruby25] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby25] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby25] dev-ruby/rest-client:2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2[ruby_targets_ruby25] >=dev-ruby/vagrant_cloud-2.0.2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant/archive/v2.2.3.tar.gz -> vagrant-2.2.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8da8fd2a5b348f34afd5e59e586a354d
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.0.0 b/metadata/md5-cache/app-emulation/virt-manager-2.0.0
index 9117ea286e8e..64d1722831b9 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.0.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
 IUSE=gnome-keyring gtk policykit sasl python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=!app-emulation/virtinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/ipaddr[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/libvirt-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=sys-libs/libosinfo-0.2.10[introspection] gtk? ( gnome-base/dconf >=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection] 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_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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48458b6277ed78434251e66042142ca5
+_md5_=df60d4bdecb7631dbd77300086b83911
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566
index 12606f11ac40..d30dfb81adc9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.0.127566
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0-127566-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.0/Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.0/VirtualBoxSDK-6.0.0-127566.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9851d065689b8cc9a538a13189f3bc4f
+_md5_=93f20017b835627aca32358227cf90fb
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index ff00b2e77060..8e07be23c871 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ddc136061ff7325ef6f460c908c75116
+_md5_=b8f98a9b04cbc0c129191d88756ac7c9
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 0dc6bca409ef..22909173b782 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-2.3 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
index 1a0db3eda34a..5273e9a156e9 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_=6fe1a92bd2582bf6a1cc1830d2d4aae4
+_md5_=551b41bd54f69c83b5e54e49084d0cf4
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
index 2c4f19723ea2..15b87860d4f6 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 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.4.tbz2
-_md5_=191f8ea2574121600e9f8b4e8fdd3974
+_md5_=db290dffdd2ae791e48258890c16adbb
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 625164fb8e05..08035b9e1c66 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/afl-2.35b b/metadata/md5-cache/app-forensics/afl-2.35b
deleted file mode 100644
index 7414ba7372b4..000000000000
--- a/metadata/md5-cache/app-forensics/afl-2.35b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc:* sys-devel/clang:*
-DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=5
-HOMEPAGE=http://lcamtuf.coredump.cx/afl/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc:* sys-devel/clang:*
-SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.35b.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10f4cdd8988ff2e2d0e62c117598433b
diff --git a/metadata/md5-cache/app-forensics/afl-2.39b b/metadata/md5-cache/app-forensics/afl-2.39b
deleted file mode 100644
index 99209d8ab9f3..000000000000
--- a/metadata/md5-cache/app-forensics/afl-2.39b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc:* sys-devel/clang:*
-DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=5
-HOMEPAGE=http://lcamtuf.coredump.cx/afl/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc:* sys-devel/clang:*
-SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.39b.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10f4cdd8988ff2e2d0e62c117598433b
diff --git a/metadata/md5-cache/app-forensics/afl-2.46b b/metadata/md5-cache/app-forensics/afl-2.46b
deleted file mode 100644
index 3bd3b30b4c8e..000000000000
--- a/metadata/md5-cache/app-forensics/afl-2.46b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc:* sys-devel/clang:*
-DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=5
-HOMEPAGE=http://lcamtuf.coredump.cx/afl/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc:* sys-devel/clang:*
-SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.46b.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5ef70f657a19fb98669a84a7d796a03
diff --git a/metadata/md5-cache/app-forensics/afl-2.51b b/metadata/md5-cache/app-forensics/afl-2.51b
deleted file mode 100644
index c75f13aec67d..000000000000
--- a/metadata/md5-cache/app-forensics/afl-2.51b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc:* sys-devel/clang:*
-DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=6
-HOMEPAGE=http://lcamtuf.coredump.cx/afl/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc:* sys-devel/clang:*
-SLOT=0
-SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.51b.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91c5f97a9132afdf363f51c6bb0bde3e
diff --git a/metadata/md5-cache/app-forensics/afl-2.52b b/metadata/md5-cache/app-forensics/afl-2.52b
index 5ea388e71334..06844cbc7a17 100644
--- a/metadata/md5-cache/app-forensics/afl-2.52b
+++ b/metadata/md5-cache/app-forensics/afl-2.52b
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc:* sys-devel/clang:*
+DEPEND=sys-devel/gcc:* sys-devel/clang:=
 DESCRIPTION=american fuzzy lop - compile-time instrumentation fuzzer
-EAPI=6
+EAPI=7
 HOMEPAGE=http://lcamtuf.coredump.cx/afl/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-devel/gcc:* sys-devel/clang:*
+RDEPEND=sys-devel/gcc:* sys-devel/clang:=
 SLOT=0
 SRC_URI=http://lcamtuf.coredump.cx/afl/releases/afl-2.52b.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91c5f97a9132afdf363f51c6bb0bde3e
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b788ba6982822b4f78624c7618f6ba2e
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 868e06535de5..7fa3349c7f20 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
deleted file mode 100644
index d00ff60ccae4..000000000000
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Linux kernel laptop_mode user-space utilities
-EAPI=7
-HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
-IUSE=+acpi apm bluetooth
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
-SLOT=0
-SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=01115e25d00ca064d24c9aa25fe6920c
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
new file mode 100644
index 000000000000..85ef2eabc6ab
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Linux kernel laptop_mode user-space utilities
+EAPI=7
+HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
+IUSE=+acpi apm bluetooth
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
+SLOT=0
+SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=2b0cc06063457d823b122e40f557e035
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 25e4c3b4a5dd..74df70b8d0c1 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/github-exporter-04 b/metadata/md5-cache/app-metrics/github-exporter-04
new file mode 100644
index 000000000000..1edea3d3ca71
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/github-exporter-04
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Github statistics exporter for prometheus
+EAPI=6
+HOMEPAGE=https://github.com/infinityworks/github-exporter
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/infinityworks/github-exporter/archive/04.tar.gz -> github-exporter-04.tar.gz https://github.com/beorn7/perks/archive/3a771d9.tar.gz -> github.com-beorn7-perks-3a771d9.tar.gz https://github.com/fatih/structs/archive/878a968.tar.gz -> github.com-fatih-structs-878a968.tar.gz https://github.com/golang/protobuf/archive/347cf4a.tar.gz -> github.com-golang-protobuf-347cf4a.tar.gz https://github.com/infinityworks/go-common/archive/7f20a14.tar.gz -> github.com-infinityworks-go-common-7f20a14.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182aff.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182aff.tar.gz https://github.com/prometheus/client_golang/archive/d2ead25.tar.gz -> github.com-prometheus-client_golang-d2ead25.tar.gz https://github.com/prometheus/client_model/archive/f287a10.tar.gz -> github.com-prometheus-client_model-f287a10.tar.gz https://github.com/prometheus/common/archive/2998b13.tar.gz -> github.com-prometheus-common-2998b13.tar.gz https://github.com/prometheus/procfs/archive/b1a0a9a.tar.gz -> github.com-prometheus-procfs-b1a0a9a.tar.gz https://github.com/sirupsen/logrus/archive/eef6b76.tar.gz -> github.com-sirupsen-logrus-eef6b76.tar.gz https://github.com/golang/crypto/archive/ff983b9.tar.gz -> github.com-golang-crypto-ff983b9.tar.gz https://github.com/golang/sys/archive/48ac38b.tar.gz -> github.com-golang-sys-48ac38b.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d4af354b5cf2bccb43f8046bb33721aa
diff --git a/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0 b/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0
new file mode 100644
index 000000000000..63ccfbaab073
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Prometheus exporter for memcached
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/memcached_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/prometheus/memcached_exporter/archive/v0.5.0.tar.gz -> memcached_exporter-0.5.0.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=640f863420e23d2e5480e6258740a600
diff --git a/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610 b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610
new file mode 100644
index 000000000000..acb6372bad0f
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/nginx-lua-prometheus-0.1_pre20170610
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/lua-5.1:= virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/lua-5.1:=
+DESCRIPTION=Library that exports Nginx metrics to Prometheus
+EAPI=7
+HOMEPAGE=https://github.com/knyar/nginx-lua-prometheus
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-lang/lua-5.1:= www-servers/nginx[nginx_modules_http_lua]
+SLOT=0
+SRC_URI=https://github.com/knyar/nginx-lua-prometheus/archive/0.1-20170610.tar.gz -> nginx-lua-prometheus-0.1_pre20170610.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=554b49a8911474e680da8968a4276e04
diff --git a/metadata/md5-cache/app-metrics/process-exporter-0.4.0 b/metadata/md5-cache/app-metrics/process-exporter-0.4.0
new file mode 100644
index 000000000000..fa02ad175c61
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/process-exporter-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Process exporter for prometheus
+EAPI=6
+HOMEPAGE=https://github.com/ncabatoff/process-exporter
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/ncabatoff/process-exporter/archive/v0.4.0.tar.gz -> process-exporter-0.4.0.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7de3e728ab2a75d18795369f15194f78
diff --git a/metadata/md5-cache/app-metrics/vault_exporter-0.1.2 b/metadata/md5-cache/app-metrics/vault_exporter-0.1.2
new file mode 100644
index 000000000000..a2e0a42f03ee
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/vault_exporter-0.1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Vault exporter for Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/grapeshot/vault_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/grapeshot/vault_exporter/archive/v0.1.2.tar.gz -> vault_exporter-0.1.2.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1460614c5697ab359b354c28f1276f08
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 7b59c08bf417..23fa94385810 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/ca-certificates-20170717.3.36.1 b/metadata/md5-cache/app-misc/ca-certificates-20170717.3.36.1
deleted file mode 100644
index 4b9e44c6e400..000000000000
--- a/metadata/md5-cache/app-misc/ca-certificates-20170717.3.36.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( 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=Common CA Certificates PEM files
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/ca-certificates
-IUSE=insecure_certs cacert
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MPL-1.1
-RDEPEND=app-misc/c_rehash sys-apps/debianutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20170717.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_36_1_RTM/src/nss-3.36.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a53823ea826b6210b070e487f3f9fb87
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.36.1-r1 b/metadata/md5-cache/app-misc/ca-certificates-20180409.3.36.1-r1
deleted file mode 100644
index 3820b23ccf81..000000000000
--- a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.36.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( 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=Common CA Certificates PEM files
-EAPI=6
-HOMEPAGE=https://packages.debian.org/sid/ca-certificates
-IUSE=cacert
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MPL-1.1
-RDEPEND=app-misc/c_rehash sys-apps/debianutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20180409.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_36_1_RTM/src/nss-3.36.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88a96c8f594794de05d3a2b84a4701f2
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37 b/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
index ee066896d6b5..99404c689c7c 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
+++ b/metadata/md5-cache/app-misc/ca-certificates-20180409.3.37
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/ca-certificates
 IUSE=cacert
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MPL-1.1
 RDEPEND=app-misc/c_rehash sys-apps/debianutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20180409.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_37_RTM/src/nss-3.37.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98565ea3104f6fc1447407a8b6c174dc
+_md5_=c5447feae1f6ad06fc00097f5e605df3
diff --git a/metadata/md5-cache/app-misc/ckermit-9.0.302 b/metadata/md5-cache/app-misc/ckermit-9.0.302
new file mode 100644
index 000000000000..b2cc51f610c6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ckermit-9.0.302
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= )
+DESCRIPTION=combined serial and network communication software package
+EAPI=7
+HOMEPAGE=http://www.kermitproject.org/
+IUSE=ncurses
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=Kermit
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
+SLOT=0
+SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku302.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9eba783821267029370c9018d9676b47
diff --git a/metadata/md5-cache/app-misc/datovka-4.10.3 b/metadata/md5-cache/app-misc/datovka-4.10.3
index 621794528c6d..eafb2614646c 100644
--- a/metadata/md5-cache/app-misc/datovka-4.10.3
+++ b/metadata/md5-cache/app-misc/datovka-4.10.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
+DEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
 DESCRIPTION=GUI to access the Czech eGov system of Datove schranky
 EAPI=6
 HOMEPAGE=https://www.datovka.cz/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
+RDEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/datove_schranky/4.10.3/datovka-4.10.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c5f237631e5e87840f5f2865465e0083
+_md5_=9c95aa2187eefa5692d06365c55a3dae
diff --git a/metadata/md5-cache/app-misc/datovka-4.11.0 b/metadata/md5-cache/app-misc/datovka-4.11.0
index d563ebb8f1fc..f78be6cff88b 100644
--- a/metadata/md5-cache/app-misc/datovka-4.11.0
+++ b/metadata/md5-cache/app-misc/datovka-4.11.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
+DEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
 DESCRIPTION=GUI to access the Czech eGov system of Datove schranky
 EAPI=6
 HOMEPAGE=https://www.datovka.cz/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
+RDEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/datove_schranky/4.11.0/datovka-4.11.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e00bce29c07e0b104f53a6622f3324c5
+_md5_=7b6f252884bcf44c29c98adb20517be0
diff --git a/metadata/md5-cache/app-misc/datovka-4.11.1 b/metadata/md5-cache/app-misc/datovka-4.11.1
index 2b0093ae1371..518b1a16f94b 100644
--- a/metadata/md5-cache/app-misc/datovka-4.11.1
+++ b/metadata/md5-cache/app-misc/datovka-4.11.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
+DEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8 >=dev-qt/linguist-tools-5.3.2:5 >=sys-apps/sed-4
 DESCRIPTION=GUI to access the Czech eGov system of Datove schranky
 EAPI=6
 HOMEPAGE=https://www.datovka.cz/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-1.0.2 >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
+RDEPEND=>=dev-libs/openssl-1.0.2:0= >=dev-qt/qtcore-5.3.2:5 >=dev-qt/qtgui-5.3.2:5 >=dev-qt/qtnetwork-5.3.2:5 >=dev-qt/qtprintsupport-5.3.2:5 >=dev-qt/qtsql-5.3.2:5[sqlite] >=dev-qt/qtsvg-5.3.2:5 >=dev-qt/qtwidgets-5.3.2:5 >=net-libs/libisds-0.10.8
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/datove_schranky/4.11.1/datovka-4.11.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c7882467da41878c13a6e59ec131c836
+_md5_=7b6f252884bcf44c29c98adb20517be0
diff --git a/metadata/md5-cache/app-misc/ddate-0.2.2 b/metadata/md5-cache/app-misc/ddate-0.2.2
index d4f735a2ffe4..d747248e2695 100644
--- a/metadata/md5-cache/app-misc/ddate-0.2.2
+++ b/metadata/md5-cache/app-misc/ddate-0.2.2
@@ -3,10 +3,10 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Perpetual date converter from gregorian to poee calendar
 EAPI=6
 HOMEPAGE=https://github.com/bo0ts/ddate
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=public-domain
 RDEPEND=!sys-apps/util-linux[ddate]
 SLOT=0
 SRC_URI=https://github.com/bo0ts/ddate/archive/v0.2.2.tar.gz -> ddate-0.2.2.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b30d7b4bafea7142aa11530d640bac1d
+_md5_=085b72894d20b6a172c0578a909c5914
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.8 b/metadata/md5-cache/app-misc/geoclue-2.4.8
index 9a45e93f50df..20c1549ac242 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.8
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=A geoinformation D-Bus service
 EAPI=6
 HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
 IUSE=+introspection +modemmanager zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0
 SLOT=2.0
 SRC_URI=https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf0121a85e1cac65eb574fdb22de52a7
+_md5_=ef3e96ea00d25e9e09384459562a2fea
diff --git a/metadata/md5-cache/app-misc/gramps-5.0.1 b/metadata/md5-cache/app-misc/gramps-5.0.1
new file mode 100644
index 000000000000..7c9415b3d070
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.0.1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=7
+HOMEPAGE=https://gramps-project.org/
+IUSE=+rcs +reports exif geo postscript spell 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=dev-python/bsddb3[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_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.12: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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyicu[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=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_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/gramps-project/gramps/archive/v5.0.1.tar.gz -> gramps-5.0.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2b30107595a524dd41c1a64e8b0ed6c2
diff --git a/metadata/md5-cache/app-misc/mc-4.8.22 b/metadata/md5-cache/app-misc/mc-4.8.22
new file mode 100644
index 000000000000..91f93ccff14f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mc-4.8.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst pretend
+DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
+DESCRIPTION=GNU Midnight Commander is a text based file manager
+EAPI=7
+HOMEPAGE=https://www.midnight-commander.org
+IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
+REQUIRED_USE=spell? ( edit )
+SLOT=0
+SRC_URI=http://ftp.midnight-commander.org/mc-4.8.22.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b45fd56e4c48665a4946d377dcda18eb
diff --git a/metadata/md5-cache/app-misc/mc-9999 b/metadata/md5-cache/app-misc/mc-9999
index a3c250d3ebea..6f0ed2c89892 100644
--- a/metadata/md5-cache/app-misc/mc-9999
+++ b/metadata/md5-cache/app-misc/mc-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst prepare pretend unpack
-DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
 DESCRIPTION=GNU Midnight Commander is a text based file manager
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.midnight-commander.org
 IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94c4ab0a4cf4af24629669f31bf4075e
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=02aad96b04df322e4c770a2ca11fdbdb
diff --git a/metadata/md5-cache/app-misc/neofetch-5.1.0 b/metadata/md5-cache/app-misc/neofetch-5.1.0
new file mode 100644
index 000000000000..4ecf070f4d82
--- /dev/null
+++ b/metadata/md5-cache/app-misc/neofetch-5.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Simple information system script
+EAPI=7
+HOMEPAGE=https://github.com/dylanaraps/neofetch
+IUSE=X
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd
+LICENSE=MIT-with-advertising
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
+SLOT=0
+SRC_URI=https://github.com/dylanaraps/neofetch/archive/5.1.0/neofetch-5.1.0.tar.gz
+_md5_=636101049b78792c533539e13fcd210d
diff --git a/metadata/md5-cache/app-misc/neofetch-6.0.0 b/metadata/md5-cache/app-misc/neofetch-6.0.0
new file mode 100644
index 000000000000..a01a151f71fb
--- /dev/null
+++ b/metadata/md5-cache/app-misc/neofetch-6.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Simple information system script
+EAPI=7
+HOMEPAGE=https://github.com/dylanaraps/neofetch
+IUSE=X
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-fbsd
+LICENSE=MIT-with-advertising
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
+SLOT=0
+SRC_URI=https://github.com/dylanaraps/neofetch/archive/6.0.0/neofetch-6.0.0.tar.gz
+_md5_=636101049b78792c533539e13fcd210d
diff --git a/metadata/md5-cache/app-misc/neofetch-9999 b/metadata/md5-cache/app-misc/neofetch-9999
index 1813593f6bbc..3bae70b663a3 100644
--- a/metadata/md5-cache/app-misc/neofetch-9999
+++ b/metadata/md5-cache/app-misc/neofetch-9999
@@ -8,4 +8,4 @@ LICENSE=MIT-with-advertising
 RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9
-_md5_=f853e59744382d9b09b33a96ee6ac38b
+_md5_=636101049b78792c533539e13fcd210d
diff --git a/metadata/md5-cache/app-misc/nnn-2.2 b/metadata/md5-cache/app-misc/nnn-2.2
new file mode 100644
index 000000000000..beb23fef3322
--- /dev/null
+++ b/metadata/md5-cache/app-misc/nnn-2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+DESCRIPTION=The missing terminal file browser for X
+EAPI=6
+HOMEPAGE=https://github.com/jarun/nnn
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
+SLOT=0
+SRC_URI=https://github.com/jarun/nnn/archive/v2.2.tar.gz -> nnn-2.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=efb49088ec0b492ce62ab66731225973
diff --git a/metadata/md5-cache/app-misc/rq-0.10.4 b/metadata/md5-cache/app-misc/rq-0.10.4
index fbbe4e5e9bb8..9b62efabae43 100644
--- a/metadata/md5-cache/app-misc/rq-0.10.4
+++ b/metadata/md5-cache/app-misc/rq-0.10.4
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/dflemstr/rq/archive/v0.10.4.tar.gz -> rq-0.10.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.2/download -> aho-corasick-0.6.2.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/aster/0.38.0/download -> aster-0.38.0.crate https://crates.io/api/v1/crates/atty/0.2.2/download -> atty-0.2.2.crate https://crates.io/api/v1/crates/backtrace/0.3.0/download -> backtrace-0.3.0.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.10/download -> backtrace-sys-0.1.10.crate https://crates.io/api/v1/crates/bindgen/0.22.1/download -> bindgen-0.22.1.crate https://crates.io/api/v1/crates/bitflags/0.4.0/download -> bitflags-0.4.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.8.0/download -> bitflags-0.8.0.crate https://crates.io/api/v1/crates/byteorder/1.0.0/download -> byteorder-1.0.0.crate https://crates.io/api/v1/crates/cexpr/0.2.0/download -> cexpr-0.2.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/clang/0.15.0/download -> clang-0.15.0.crate https://crates.io/api/v1/crates/clang-sys/0.14.0/download -> clang-sys-0.14.0.crate https://crates.io/api/v1/crates/clap/2.21.1/download -> clap-2.21.1.crate https://crates.io/api/v1/crates/crc/1.4.0/download -> crc-1.4.0.crate https://crates.io/api/v1/crates/dbghelp-sys/0.2.0/download -> dbghelp-sys-0.2.0.crate https://crates.io/api/v1/crates/docopt/0.7.0/download -> docopt-0.7.0.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.4.2/download -> env_logger-0.4.2.crate https://crates.io/api/v1/crates/error-chain/0.9.0/download -> error-chain-0.9.0.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.4/download -> lazy_static-0.2.4.crate https://crates.io/api/v1/crates/libc/0.2.21/download -> libc-0.2.21.crate https://crates.io/api/v1/crates/libloading/0.3.2/download -> libloading-0.3.2.crate https://crates.io/api/v1/crates/linked-hash-map/0.3.0/download -> linked-hash-map-0.3.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.1/download -> linked-hash-map-0.4.1.crate https://crates.io/api/v1/crates/log/0.3.7/download -> log-0.3.7.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/nix/0.7.0/download -> nix-0.7.0.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.37/download -> num-traits-0.1.37.crate https://crates.io/api/v1/crates/num_cpus/1.3.0/download -> num_cpus-1.3.0.crate https://crates.io/api/v1/crates/ordered-float/0.4.0/download -> ordered-float-0.4.0.crate https://crates.io/api/v1/crates/pest/0.4.1/download -> pest-0.4.1.crate https://crates.io/api/v1/crates/phf/0.7.21/download -> phf-0.7.21.crate https://crates.io/api/v1/crates/phf_codegen/0.7.21/download -> phf_codegen-0.7.21.crate https://crates.io/api/v1/crates/phf_generator/0.7.21/download -> phf_generator-0.7.21.crate https://crates.io/api/v1/crates/phf_shared/0.7.21/download -> phf_shared-0.7.21.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/protobuf/1.2.2/download -> protobuf-1.2.2.crate https://crates.io/api/v1/crates/quasi/0.29.0/download -> quasi-0.29.0.crate https://crates.io/api/v1/crates/quasi_codegen/0.29.0/download -> quasi_codegen-0.29.0.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex/0.2.1/download -> regex-0.2.1.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.4.0/download -> regex-syntax-0.4.0.crate https://crates.io/api/v1/crates/rmp/0.8.5/download -> rmp-0.8.5.crate https://crates.io/api/v1/crates/rmpv/0.2.0/download -> rmpv-0.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.4/download -> rustc-demangle-0.1.4.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/serde/0.8.23/download -> serde-0.8.23.crate https://crates.io/api/v1/crates/serde/0.9.11/download -> serde-0.9.11.crate https://crates.io/api/v1/crates/serde-hjson/0.8.1/download -> serde-hjson-0.8.1.crate https://crates.io/api/v1/crates/serde-value/0.4.0/download -> serde-value-0.4.0.crate https://crates.io/api/v1/crates/serde_cbor/0.5.2/download -> serde_cbor-0.5.2.crate https://crates.io/api/v1/crates/serde_codegen_internals/0.14.1/download -> serde_codegen_internals-0.14.1.crate https://crates.io/api/v1/crates/serde_derive/0.9.11/download -> serde_derive-0.9.11.crate https://crates.io/api/v1/crates/serde_json/0.9.9/download -> serde_json-0.9.9.crate https://crates.io/api/v1/crates/serde_test/0.8.23/download -> serde_test-0.8.23.crate https://crates.io/api/v1/crates/serde_yaml/0.6.2/download -> serde_yaml-0.6.2.crate https://crates.io/api/v1/crates/siphasher/0.2.1/download -> siphasher-0.2.1.crate https://crates.io/api/v1/crates/snap/0.2.1/download -> snap-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/syn/0.11.9/download -> syn-0.11.9.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex/0.54.0/download -> syntex-0.54.0.crate https://crates.io/api/v1/crates/syntex_errors/0.54.0/download -> syntex_errors-0.54.0.crate https://crates.io/api/v1/crates/syntex_pos/0.54.0/download -> syntex_pos-0.54.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.54.0/download -> syntex_syntax-0.54.0.crate https://crates.io/api/v1/crates/target_build_utils/0.3.0/download -> target_build_utils-0.3.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/term_size/0.2.3/download -> term_size-0.2.3.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread-id/3.0.0/download -> thread-id-3.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.3.1/download -> toml-0.3.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.1.0/download -> unicode-segmentation-1.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/v8/0.9.6/download -> v8-0.9.6.crate https://crates.io/api/v1/crates/v8-api/0.7.3/download -> v8-api-0.7.3.crate https://crates.io/api/v1/crates/v8-sys/0.14.7/download -> v8-sys-0.14.7.crate https://crates.io/api/v1/crates/vec_map/0.7.0/download -> vec_map-0.7.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/xdg-basedir/1.0.0/download -> xdg-basedir-1.0.0.crate https://crates.io/api/v1/crates/yaml-rust/0.3.5/download -> yaml-rust-0.3.5.crate amd64? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/x86_64-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-x86_64-build.tar.gz ) x86? ( https://s3-eu-west-1.amazonaws.com/record-query/v8/i686-unknown-linux-gnu/5.6.222/v8-build.tar.gz -> rq-v8-5.6.222-i686-build.tar.gz )
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=c7c9f90ed7ffdff91bdb5ba8e4d8c42b
diff --git a/metadata/md5-cache/app-misc/skim-0.5.2 b/metadata/md5-cache/app-misc/skim-0.5.2
index d96cc29dec2d..26d57c464ac6 100644
--- a/metadata/md5-cache/app-misc/skim-0.5.2
+++ b/metadata/md5-cache/app-misc/skim-0.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/lotabout/skim/archive/v0.5.2.tar.gz -> skim-0.5.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.4/download -> aho-corasick-0.6.4.crate https://crates.io/api/v1/crates/ansi_term/0.10.2/download -> ansi_term-0.10.2.crate https://crates.io/api/v1/crates/atty/0.2.3/download -> atty-0.2.3.crate https://crates.io/api/v1/crates/bitflags/1.0.1/download -> bitflags-1.0.1.crate https://crates.io/api/v1/crates/cc/1.0.17/download -> cc-1.0.17.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.28.0/download -> clap-2.28.0.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.32/download -> redox_syscall-0.1.32.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/0.2.3/download -> regex-0.2.3.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/strsim/0.6.0/download -> strsim-0.6.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/thread_local/0.3.4/download -> thread_local-0.3.4.crate https://crates.io/api/v1/crates/time/0.1.38/download -> time-0.1.38.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.0/download -> vec_map-0.8.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=f89d51038a5c1cae20b29238213e32f1
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=1e7e033341b431f8f2e850afe3f8958e
diff --git a/metadata/md5-cache/app-misc/sphinx-2.2.11-r1 b/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
index e1520b6dd06c..b3b18bdf98ac 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
+++ b/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.sphinxsearch.com/
 IUSE=debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-c ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) re2? ( dev-libs/re2 ) stemmer? ( dev-libs/snowball-stemmer ) xml? ( dev-libs/expat ) virtual/libiconv
 REQUIRED_USE=mysql? ( !mariadb ) mariadb? ( !mysql )
 SLOT=0
 SRC_URI=http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54498f06ed5643f0b62cf92e9c698fa2
+_md5_=72203ed933b454ed644dd3375ef0057f
diff --git a/metadata/md5-cache/app-misc/tkpasman-2.2b b/metadata/md5-cache/app-misc/tkpasman-2.2b
index f51fc225fab4..de9305c8738b 100644
--- a/metadata/md5-cache/app-misc/tkpasman-2.2b
+++ b/metadata/md5-cache/app-misc/tkpasman-2.2b
@@ -1,13 +1,12 @@
 DEFINED_PHASES=install prepare
 DEPEND=>=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0=
 DESCRIPTION=A useful and reliable personal password manager, written in Tcl/Tk
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.xs4all.nl/~wbsoft/linux/tkpasman.html
 IUSE=ssl
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= ssl? ( dev-libs/openssl )
+RDEPEND=>=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~wbsoft/linux/projects/TkPasMan-2.2b.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f1fcc5e9cff68cfc0c267bef253d80b
+_md5_=a736f5c9e63b7bef9e8937b0616ccda6
diff --git a/metadata/md5-cache/app-misc/tmate-2.2.0-r1 b/metadata/md5-cache/app-misc/tmate-2.2.0-r1
index d93dd3d9809d..25d4a098a858 100644
--- a/metadata/md5-cache/app-misc/tmate-2.2.0-r1
+++ b/metadata/md5-cache/app-misc/tmate-2.2.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl:0=[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Instant terminal sharing
 EAPI=5
 HOMEPAGE=http://tmate.io/
 IUSE=debug static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
+RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl:0=[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
 SLOT=0
 SRC_URI=https://github.com/tmate-io/tmate/archive/2.2.0.tar.gz -> tmate-2.2.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/tmate-2.2.0-upstream-patches-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efc85a06338b6af412ff496de3f4e805
+_md5_=c3b574dd2ee24253bbf34791dc7d8831
diff --git a/metadata/md5-cache/app-misc/tmate-2.2.1 b/metadata/md5-cache/app-misc/tmate-2.2.1
index 96e418cfb2ec..3663df978e7b 100644
--- a/metadata/md5-cache/app-misc/tmate-2.2.1
+++ b/metadata/md5-cache/app-misc/tmate-2.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl:0=[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Instant terminal sharing
 EAPI=5
 HOMEPAGE=http://tmate.io/
 IUSE=debug static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
+RDEPEND=sys-libs/zlib[static-libs?] sys-libs/libutempter[static-libs?] dev-libs/openssl:0=[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
 SLOT=0
 SRC_URI=https://github.com/tmate-io/tmate/archive/2.2.1.tar.gz -> tmate-2.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b2650e377de293717d0a436fe936a6c
+_md5_=c55019784c729ede9b510620ba7d88fb
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 24e98b7cdedc..3da9c487e0d0 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-r2 b/metadata/md5-cache/app-office/calligra-3.1.0-r2
index 8258cb4a6635..390bf6751b43 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r2
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0: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	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=497357cd86107413c6617ee8dd31efe4
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r3 b/metadata/md5-cache/app-office/calligra-3.1.0-r3
new file mode 100644
index 000000000000..06d600bfebcc
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.11.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.52.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-0.64:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) pim? ( >=kde-apps/kcalcore-18.08.3:5 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_stage? ( okular? ( >=kde-apps/okular-18.08.3:5 ) ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-18.08.3:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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_sheets calligra_features_stage calligra_features_words debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.11.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.52.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-0.64:=[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) pim? ( >=kde-apps/kcalcore-18.08.3:5 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_stage? ( okular? ( >=kde-apps/okular-18.08.3:5 ) ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-18.08.3: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=db80e1bddd596cd783a0273ae821d70c
diff --git a/metadata/md5-cache/app-office/calligraplan-3.1.0 b/metadata/md5-cache/app-office/calligraplan-3.1.0
new file mode 100644
index 000000000000..434372e70e4f
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligraplan-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl dev-libs/kdiagram:5 sys-libs/zlib activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) holidays? ( >=kde-frameworks/kholidays-5.52.0:5 ) kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 app-crypt/qca:2[qt5(+)] ) pim? ( >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Project management application
+EAPI=6
+HOMEPAGE=https://www.calligra.org/
+IUSE=activities +holidays kwallet pim X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl dev-libs/kdiagram:5 sys-libs/zlib activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) holidays? ( >=kde-frameworks/kholidays-5.52.0:5 ) kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 app-crypt/qca:2[qt5(+)] ) pim? ( >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !app-office/calligra[calligra_features_plan(-)] !app-office/calligra-l10n:4 >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=355eb9a524e0a785ab793ca8f8d6822b
diff --git a/metadata/md5-cache/app-office/gnucash-3.4 b/metadata/md5-cache/app-office/gnucash-3.4
new file mode 100644
index 000000000000..50937d02e623
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-3.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) ~dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.19.6 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A personal finance manager
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite 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 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=doc? ( ~app-doc/gnucash-docs-3.4 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,regex] dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( gnome-base/dconf net-libs/webkit-gtk:4= >=x11-libs/gtk+-3.14.0:3 ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1 ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.4/gnucash-3.4.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1c94800a90988fa2d33e44ddc91b4ee9
diff --git a/metadata/md5-cache/app-office/kexi-3.1.0 b/metadata/md5-cache/app-office/kexi-3.1.0
index b771596e94da..35de0686e129 100644
--- a/metadata/md5-cache/app-office/kexi-3.1.0
+++ b/metadata/md5-cache/app-office/kexi-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/breeze-icons-rcc-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.8.0:5 >=dev-qt/qtgui-5.8.0:5 >=dev-qt/qtnetwork-5.8.0:5 >=dev-qt/qtprintsupport-5.8.0:5 >=dev-qt/qtwidgets-5.8.0:5 >=dev-qt/qtxml-5.8.0:5 >=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kproperty-3.1.0:5= >=dev-libs/kreport-3.1.0:5=[scripting] marble? ( >=kde-apps/marble-18.08.3:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.8.0:5 ) !app-office/calligra:4[calligra_features_kexi] !app-office/calligra-l10n:4[calligra_features_kexi(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.8.0:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=44f5287ccf13cf4ccb9c129a06feb94f
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.2 b/metadata/md5-cache/app-office/kmymoney-5.0.2
index 6330961efc8f..bb0d9aec04c6 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.2
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=
 REQUIRED_USE=weboob? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.2/src/kmymoney-5.0.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecb85b9f85fab6e695bc75e95a62ee6c
diff --git a/metadata/md5-cache/app-office/kraft-0.80 b/metadata/md5-cache/app-office/kraft-0.80
index c1f48732e77d..072335e3804b 100644
--- a/metadata/md5-cache/app-office/kraft-0.80
+++ b/metadata/md5-cache/app-office/kraft-0.80
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kcontacts-18.08.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/dragotin/kraft/archive/v0.80.tar.gz -> kraft-0.80.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f72f3ca8fcbdd92efd7038a51af61f3e
diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.2 b/metadata/md5-cache/app-office/libalkimia-7.0.2
index 60faf6537f94..43368af0a862 100644
--- a/metadata/md5-cache/app-office/libalkimia-7.0.2
+++ b/metadata/md5-cache/app-office/libalkimia-7.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 dev-libs/gmp:0=[cxx] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0/7
 SRC_URI=mirror://kde/stable/alkimia/7.0.2/alkimia-7.0.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a8fe5bc7d8b147741e7da3478b72ef4f
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.6.2 b/metadata/md5-cache/app-office/libreoffice-6.0.6.2
deleted file mode 100644
index cce09d312248..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.0.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.0*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-6.0.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.6//libreoffice-help-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-6.0.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.6.2/src/libreoffice-help-6.0.6.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=921d3faf29bd735b93dd88a7cf7dee0b
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.4.2 b/metadata/md5-cache/app-office/libreoffice-6.1.4.2
index adff9490c5cc..3c9b600c8292 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.1*
 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] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-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-6.1.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.4//libreoffice-6.1.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.1.4//libreoffice-help-6.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.4.2/src/libreoffice-6.1.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.1.4.2/src/libreoffice-help-6.1.4.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2679079bd1c2c1d25bc10de267ac0762
+_md5_=e8c67fd33cda6d716fa1b79c69b5905d
diff --git a/metadata/md5-cache/app-office/libreoffice-6.1.9999 b/metadata/md5-cache/app-office/libreoffice-6.1.9999
deleted file mode 100644
index 562af7cfbf9d..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.1.9999
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool =dev-util/mdds-1.3*:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND=!app-office/libreoffice-l10n
-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] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-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_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) 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	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2679079bd1c2c1d25bc10de267ac0762
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.0.2 b/metadata/md5-cache/app-office/libreoffice-6.2.0.2
new file mode 100644
index 000000000000..5f8476ec2313
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads(+),xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+),xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge 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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.2*
+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] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.14.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/fontforge 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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) 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/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+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_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.0.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.0.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-6.2.0.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-help-6.2.0.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.2/src/libreoffice-6.2.0.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.2/src/libreoffice-help-6.2.0.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=05e1a3e3c367b7d36df108e832becb8c
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.9999 b/metadata/md5-cache/app-office/libreoffice-6.2.9999
index 6d4453186409..b5a4a48fbf89 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.9999
@@ -11,4 +11,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 ) 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	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1118614b16f788d2bf64e3817639115a
+_md5_=1f5074aba3129e97cffafae67ff2330f
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.1.4.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.1.4.2
index f8a6d39cfdb9..02dcec30c254 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite. Binary package
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_6
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-6.1.4.2*
 RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/63.1 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-7.3.0 >=sys-libs/glibc-2.27 virtual/jpeg:62 python_targets_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[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_7(-),python_single_target_python3_6(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=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 sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender 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 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.1.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.1.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.1.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.1.4.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.1.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.1.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.1.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.1.4.2.xd3 ) ) ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=16561b054d1691d0b2dd1463392c722b
+_md5_=18e9d9309f1a153356a555e9d66d2be8
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.4.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.4.2
index 6363d88d0892..e372a37b8733 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-6.1.4.2[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-6.1.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.1.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.1.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-java-6.1.4.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-6.1.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.1.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.1.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.1.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-java-6.1.4.2.xd3 ) ) ) )
-_md5_=a773a031c5ca67dbc0509ceeed6a15b7
+_md5_=d15f868f792d1f1b3fb43e8c19c0d217
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.1.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.1.4.2
index 0a523ec0dd97..30a9cac5ec24 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.1.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.1.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite
 EAPI=7
 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.1.4/rpm/x86/LibreOffice_6.1.4_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.1.4/rpm/x86/LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.1.4.2_Linux_x86_rpm_langpack_zu.tar.gz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=6c2c1d84e01e4d2532afdedce3bbb28c
+_md5_=7f9115878092ace9d2fa95c904abb159
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.2.0.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.2.0.2
new file mode 100644
index 000000000000..10c1ccd8598a
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.2.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Translations for the Libreoffice suite
+EAPI=7
+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
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=app-text/hunspell
+RESTRICT=strip
+SLOT=0
+SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.2.0/rpm/x86/LibreOffice_6.2.0_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.2.0/rpm/x86/LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.2.0.2_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=174531cfcaab69461f84d14a11c3015f
diff --git a/metadata/md5-cache/app-office/moneyguru-2.13.1 b/metadata/md5-cache/app-office/moneyguru-2.13.1
new file mode 100644
index 000000000000..b7c6522da537
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneyguru-2.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-util/cunit )
+DESCRIPTION=Future-aware personal finances management
+EAPI=7
+HOMEPAGE=https://hardcoded.net/moneyguru
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations
+SLOT=0
+SRC_URI=https://download.hardcoded.net/moneyguru-2.13.1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d3f8a190efb91bccf6a7aae29259195e
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5_pre20181227 b/metadata/md5-cache/app-office/scribus-1.5.5_pre20181227
new file mode 100644
index 000000000000..cd4ad46ea625
--- /dev/null
+++ b/metadata/md5-cache/app-office/scribus-1.5.5_pre20181227
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Desktop publishing (DTP) and layout program
+EAPI=6
+HOMEPAGE=https://www.scribus.net/
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
+REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
+SLOT=0
+SRC_URI=https://github.com/scribusproject/scribus/archive/d857c1a3430acf207cdde2512db6822c45e98732.tar.gz -> scribus-1.5.5_pre20181227.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0b04840a8e959d5c1473cc690f6f4cc
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index cbea1b2cae58..bcfb327416a4 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=6
 HOMEPAGE=https://www.scribus.net/
 IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk l10n_af l10n_ar l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_de-CH l10n_de-DE l10n_el l10n_en-AU l10n_en-GB l10n_en-US l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_kab l10n_kn l10n_ko l10n_ku l10n_la l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sa l10n_sk l10n_sl l10n_so l10n_sq l10n_sr l10n_sv l10n_te l10n_th l10n_tr l10n_uk l10n_zh-CN l10n_zh-TW python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=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_python3_7(-),python_single_target_python2_7(+)] app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=291affa5ed53a464294acf57ddadb6c9
+_md5_=79c10954cca5e95d185e47af3a589dd8
diff --git a/metadata/md5-cache/app-office/skrooge-2.16.2 b/metadata/md5-cache/app-office/skrooge-2.16.2
index 9691f80c041a..f6d076a00e93 100644
--- a/metadata/md5-cache/app-office/skrooge-2.16.2
+++ b/metadata/md5-cache/app-office/skrooge-2.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.16.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0623a6fa7e5edf832f325bcb7afb3b22
diff --git a/metadata/md5-cache/app-office/skrooge-2.17.0 b/metadata/md5-cache/app-office/skrooge-2.17.0
index 0ab105ec9f63..adf5875a2888 100644
--- a/metadata/md5-cache/app-office/skrooge-2.17.0
+++ b/metadata/md5-cache/app-office/skrooge-2.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.17.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=587b04374943e814f4ab24675a11cc2b
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.14 b/metadata/md5-cache/app-office/texstudio-2.12.14
new file mode 100644
index 000000000000..ad1408273607
--- /dev/null
+++ b/metadata/md5-cache/app-office/texstudio-2.12.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
+EAPI=6
+HOMEPAGE=https://www.texstudio.org https://github.com/texstudio-org/texstudio
+IUSE=video
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.14.tar.gz -> texstudio-2.12.14.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e342b9664d2b036880e392a13b3ace46
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index cbc25c5993e0..8b5b3effb928 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/eix-0.33.2 b/metadata/md5-cache/app-portage/eix-0.33.2
deleted file mode 100644
index 0c67c880b4fe..000000000000
--- a/metadata/md5-cache/app-portage/eix-0.33.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Search and query ebuilds
-EAPI=6
-HOMEPAGE=https://github.com/vaeth/eix/
-IUSE=debug doc nls sqlite
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.2/eix-0.33.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fcb513a57ebfcbba7576ce9211215308
diff --git a/metadata/md5-cache/app-portage/eix-0.33.5 b/metadata/md5-cache/app-portage/eix-0.33.5
index db74956feaf6..9c74b07abd60 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.5
+++ b/metadata/md5-cache/app-portage/eix-0.33.5
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/eix/
 IUSE=debug doc nls sqlite
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.5/eix-0.33.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b435699ae379a3480104411f507ef3b2
+_md5_=b9a25f0438ec43d68e4d29d70db31fd0
diff --git a/metadata/md5-cache/app-portage/hashgen-1.0 b/metadata/md5-cache/app-portage/hashgen-1.0
index e343f83bea98..7ad884c98309 100644
--- a/metadata/md5-cache/app-portage/hashgen-1.0
+++ b/metadata/md5-cache/app-portage/hashgen-1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme
 DESCRIPTION=Manifest generation and verification tool written in C
 EAPI=6
 HOMEPAGE=https://prefix.gentoo.org/
 IUSE=+openmp
 KEYWORDS=~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
-RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=7fc3cf2b4baddc8b98c994b8ee024330d8f29956 -> hashgen-1.0.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e77408472d5961dec77da07a062dd33a
+_md5_=187d362069b0618b9021ec7fc39e264d
diff --git a/metadata/md5-cache/app-portage/hashgen-1.1 b/metadata/md5-cache/app-portage/hashgen-1.1
index 5060e2d4c7ef..f44e6e515cb7 100644
--- a/metadata/md5-cache/app-portage/hashgen-1.1
+++ b/metadata/md5-cache/app-portage/hashgen-1.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+DEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme
 DESCRIPTION=Manifest generation and verification tool written in C
 EAPI=6
 HOMEPAGE=https://prefix.gentoo.org/
 IUSE=+openmp
 KEYWORDS=~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
-RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:* sys-libs/zlib app-crypt/gpgme
+RDEPEND=openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) app-crypt/libb2 dev-libs/openssl:0= sys-libs/zlib app-crypt/gpgme
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=2ea68e88531288c29c5533440d63da6c8136d477 -> hashgen-1.1.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab32cc3229bed6a78f99d79cb6b401fc
+_md5_=da00a996690cb579f13ac58b33749577
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 732fd430191e..63b9480999bd 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/bash-5.0 b/metadata/md5-cache/app-shells/bash-5.0
new file mode 100644
index 000000000000..1bb15bcf00d4
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= ) nls? ( virtual/libintl )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=6
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-8.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b81123ae6ed62feba86169f271ee496b
diff --git a/metadata/md5-cache/app-shells/fish-2.7.1 b/metadata/md5-cache/app-shells/fish-2.7.1
index f9241c7c6b2c..1abfda1ba303 100644
--- a/metadata/md5-cache/app-shells/fish-2.7.1
+++ b/metadata/md5-cache/app-shells/fish-2.7.1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz
-_md5_=3010ee32f508b9f9c1ed21caed24bf53
+_md5_=c4088d4eaf1b6908cb5e4b8a74f3abb9
diff --git a/metadata/md5-cache/app-shells/fish-3.0.0-r1 b/metadata/md5-cache/app-shells/fish-3.0.0-r1
index ec1a7fb2ac0e..ee49fddd23bd 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.0-r1
+++ b/metadata/md5-cache/app-shells/fish-3.0.0-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unico
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.0/fish-3.0.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c1778c5264c658cb60f7b0ef7c97f335
+_md5_=034cc25985dd7c0986c44c38bf93aaf2
diff --git a/metadata/md5-cache/app-shells/mcfly-0.2.5 b/metadata/md5-cache/app-shells/mcfly-0.2.5
deleted file mode 100644
index 0b7dea72f76b..000000000000
--- a/metadata/md5-cache/app-shells/mcfly-0.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst test unpack
-DEPEND=virtual/cargo
-DESCRIPTION=Context-aware bash history search replacement (crtl-r)
-EAPI=6
-HOMEPAGE=https://github.com/cantino/mcfly
-IUSE=test debug
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/cantino/mcfly/archive/v0.2.5.tar.gz -> mcfly-0.2.5.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.6/download -> aho-corasick-0.6.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/1.0.2/download -> regex-1.0.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.5/download -> thread_local-0.3.5.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=e0a05e32f02a2685bda6bd5a5ec15d00
diff --git a/metadata/md5-cache/app-shells/mcfly-0.3.1 b/metadata/md5-cache/app-shells/mcfly-0.3.1
index b7b1804ffbde..a088500da50b 100644
--- a/metadata/md5-cache/app-shells/mcfly-0.3.1
+++ b/metadata/md5-cache/app-shells/mcfly-0.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/cantino/mcfly/archive/v0.3.1.tar.gz -> mcfly-0.3.1.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=97247ddd949fdf689bd0574b45c59df1
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c1a438b2cebffabfb2ce66577932ce2a
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
index 3d1a778fbb9a..1c4157d8eba0 100644
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install unpack
 DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
 EAPI=6
 HOMEPAGE=https://github.com/vaeth/quoter/
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=78ef3ea8a888a0a8bdbf21322db353ae
+_md5_=6eda16394fd62611fb4c42ca56e3f710
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c96bbe675a02..4acb50369fc2 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/bibutils-6.7 b/metadata/md5-cache/app-text/bibutils-6.7
new file mode 100644
index 000000000000..e18d15cb7d63
--- /dev/null
+++ b/metadata/md5-cache/app-text/bibutils-6.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Interconverts between various bibliography formats using common XML intermediate
+EAPI=7
+HOMEPAGE=https://sourceforge.net/p/bibutils/home/Bibutils/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/bibutils/bibutils_6.7_src.tgz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e3ecb09b8f760f52a90d872a5373ce9e
diff --git a/metadata/md5-cache/app-text/dvipng-1.15 b/metadata/md5-cache/app-text/dvipng-1.15
deleted file mode 100644
index 0305dc276510..000000000000
--- a/metadata/md5-cache/app-text/dvipng-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/kpathsea:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 ) virtual/texi2dvi virtual/pkgconfig test? ( dev-texlive/texlive-fontsrecommended )
-DESCRIPTION=Translate DVI files into PNG or GIF graphics
-EAPI=5
-HOMEPAGE=http://dvipng.sourceforge.net/
-IUSE=truetype test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-3+ Texinfo-manual
-RDEPEND=dev-libs/kpathsea:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=239b90ec1952fd5c4924f803af716303
diff --git a/metadata/md5-cache/app-text/dvipng-1.15-r1 b/metadata/md5-cache/app-text/dvipng-1.15-r1
index 83ff9ee1a253..ee43ea431234 100644
--- a/metadata/md5-cache/app-text/dvipng-1.15-r1
+++ b/metadata/md5-cache/app-text/dvipng-1.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Translate DVI files into PNG or GIF graphics
 EAPI=6
 HOMEPAGE=http://dvipng.sourceforge.net/
 IUSE=truetype test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-solaris
 LICENSE=LGPL-3+ Texinfo-manual
 RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bebaeef726460b8d49e3f8d3994c6700
+_md5_=56ab9dbca64a355dc3b011b39c374673
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8.1 b/metadata/md5-cache/app-text/kbibtex-0.8.1
index e637e09534e4..a6f563e1795d 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8.1
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( webengine webkit )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/KBibTeX/0.8.1/kbibtex-0.8.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5e7220f431cd892d071f14a8af5650f5
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8.2 b/metadata/md5-cache/app-text/kbibtex-0.8.2
new file mode 100644
index 000000000000..2f1c88831bb2
--- /dev/null
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KBibTeX
+IUSE=webengine webkit zotero test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=?? ( webengine webkit )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/KBibTeX/0.8.2/kbibtex-0.8.2.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c4d487f53e966eb8fc817e3a9c6940e
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.5 b/metadata/md5-cache/app-text/libnumbertext-1.0.5
index ec62bcd0a233..bc68edb5782a 100644
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.5
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Number to number name and money text conversion libraries
 EAPI=7
 HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.5/libnumbertext-1.0.5.tar.xz
-_md5_=308595eb4862b29ac506b2bc1b7343c5
+_md5_=a63ed86d02180c1dbc4b9dd10bad96fb
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.6 b/metadata/md5-cache/app-text/libodfgen-0.1.6
deleted file mode 100644
index 25ec4df45889..000000000000
--- a/metadata/md5-cache/app-text/libodfgen-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
-EAPI=6
-HOMEPAGE=http://libwpd.sf.net
-IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.6.tar.xz
-_md5_=3d2a91b333dbf4f76d1d70fabb5752e6
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.7 b/metadata/md5-cache/app-text/libodfgen-0.1.7
index 3ced82f78910..908512ccf366 100644
--- a/metadata/md5-cache/app-text/libodfgen-0.1.7
+++ b/metadata/md5-cache/app-text/libodfgen-0.1.7
@@ -5,9 +5,9 @@ DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=7
 HOMEPAGE=http://libwpd.sourceforge.net/
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.7.tar.xz
-_md5_=08b9b14b7b842b6fc2ab615d08a90fb4
+_md5_=f5a3eaaf41f9b65bed269a55dfc994ea
diff --git a/metadata/md5-cache/app-text/manpager-1 b/metadata/md5-cache/app-text/manpager-1
index 6ded6e1a960b..0962ebe6dfcd 100644
--- a/metadata/md5-cache/app-text/manpager-1
+++ b/metadata/md5-cache/app-text/manpager-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Enable colorization of man pages
 EAPI=5
 HOMEPAGE=https://www.gentoo.org/
-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-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0257a6296b0d517eada66050d8ea2bf6
+_md5_=4ace0417237cdeb83d1af9090fb6027b
diff --git a/metadata/md5-cache/app-text/mecab-0.996-r1 b/metadata/md5-cache/app-text/mecab-0.996-r1
index fb3b52e2421d..9764c4b4e763 100644
--- a/metadata/md5-cache/app-text/mecab-0.996-r1
+++ b/metadata/md5-cache/app-text/mecab-0.996-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
 EAPI=6
 HOMEPAGE=https://taku910.github.io/mecab/
 IUSE=static-libs unicode
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
 PDEPEND=|| ( app-dicts/mecab-ipadic[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mecab/mecab-0.996.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc234df6536911fa0f4a13533c2ac956
+_md5_=9dd54201f2c9bda6ab96b9febd83d529
diff --git a/metadata/md5-cache/app-text/nfoview-1.23 b/metadata/md5-cache/app-text/nfoview-1.23
index 08d64b15414b..a41e0540e38f 100644
--- a/metadata/md5-cache/app-text/nfoview-1.23
+++ b/metadata/md5-cache/app-text/nfoview-1.23
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-python/pygobject: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(-)] >=sys-apps/sed-4
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
+DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
 EAPI=6
 HOMEPAGE=https://otsaloma.io/nfoview/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=dev-python/pygobject: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(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.23.tar.gz -> nfoview-1.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
+_md5_=b1b8e117b5680c3dca5615fa15d20623
diff --git a/metadata/md5-cache/app-text/nfoview-1.24 b/metadata/md5-cache/app-text/nfoview-1.24
index c1a0b138da6b..de5136669761 100644
--- a/metadata/md5-cache/app-text/nfoview-1.24
+++ b/metadata/md5-cache/app-text/nfoview-1.24
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=dev-python/pygobject: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(-)] >=sys-apps/sed-4
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
+DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
 EAPI=6
 HOMEPAGE=https://otsaloma.io/nfoview/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
+LICENSE=GPL-3+
 RDEPEND=dev-python/pygobject: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(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.24.tar.gz -> nfoview-1.24.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
+_md5_=b1b8e117b5680c3dca5615fa15d20623
diff --git a/metadata/md5-cache/app-text/nfoview-1.26 b/metadata/md5-cache/app-text/nfoview-1.26
new file mode 100644
index 000000000000..65591590e70a
--- /dev/null
+++ b/metadata/md5-cache/app-text/nfoview-1.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/sed-4
+DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
+EAPI=6
+HOMEPAGE=https://otsaloma.io/nfoview/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/terminus-font 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/otsaloma/nfoview/archive/1.26.tar.gz -> nfoview-1.26.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=85eb75376dae8989ef55c59616b82e06
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 7b8b5d8d2520..f9cbfc238d31 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject: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(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Simple viewer for NFO files, which are ASCII art in the CP437 codepage
 EAPI=6
 HOMEPAGE=https://otsaloma.io/nfoview/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject: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(-)] media-fonts/terminus-font 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 )
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=GPL-3+
+RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/terminus-font 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
+_md5_=85eb75376dae8989ef55c59616b82e06
diff --git a/metadata/md5-cache/app-text/pdf2djvu-0.9.12 b/metadata/md5-cache/app-text/pdf2djvu-0.9.12
new file mode 100644
index 000000000000..cf8db3b2c462
--- /dev/null
+++ b/metadata/md5-cache/app-text/pdf2djvu-0.9.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= ) dev-cpp/pstreams virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DESCRIPTION=A tool to create DjVu files from PDF files
+EAPI=7
+HOMEPAGE=http://jwilk.net/software/pdf2djvu
+IUSE=+graphicsmagick nls openmp test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
+REQUIRED_USE=test? ( graphicsmagick )
+SLOT=0
+SRC_URI=https://github.com/jwilk/pdf2djvu/releases/download/0.9.12/pdf2djvu-0.9.12.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=82f98b45b5a1facbf952ea65c822fe68
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715 b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
index 04b390e2283d..67e0bef82ad8 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20180715
@@ -11,4 +11,4 @@ REQUIRED_USE=test? ( tools )
 SLOT=0/0.9.6
 SRC_URI=mirror://gentoo/podofo-0.9.6_p20180715.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7966badf294a456d44dc7a09afcfb66a
+_md5_=bbd95dc749d97efac704ae189153a3ce
diff --git a/metadata/md5-cache/app-text/poppler-0.67.0 b/metadata/md5-cache/app-text/poppler-0.67.0
deleted file mode 100644
index cdd12208929c..000000000000
--- a/metadata/md5-cache/app-text/poppler-0.67.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) dev-util/glib-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/78
-SRC_URI=https://poppler.freedesktop.org/poppler-0.67.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b840baac7bd9b8282072c5c79d85bc17
diff --git a/metadata/md5-cache/app-text/poppler-0.68.0 b/metadata/md5-cache/app-text/poppler-0.68.0
index 9548adaedf33..422c24503ba9 100644
--- a/metadata/md5-cache/app-text/poppler-0.68.0
+++ b/metadata/md5-cache/app-text/poppler-0.68.0
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=6
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/79
 SRC_URI=https://poppler.freedesktop.org/poppler-0.68.0.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4e97ae6f638f7e2e6264730f75a3780a
+_md5_=98736242951f8d35e51bf4232080bf69
diff --git a/metadata/md5-cache/app-text/poppler-0.73.0 b/metadata/md5-cache/app-text/poppler-0.73.0
new file mode 100644
index 000000000000..2411202a2d01
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-0.73.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
+DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
+EAPI=7
+HOMEPAGE=https://poppler.freedesktop.org/
+IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
+RESTRICT=test
+SLOT=0/84
+SRC_URI=https://poppler.freedesktop.org/poppler-0.73.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=020de1e7017a1a6aa4d2b6717ca173bf
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 06767b176060..5c2861474ffd 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) dev-util/glib-utils virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 )
 DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
+EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce7be28ef90da13d9caff43fed2be1f0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=020de1e7017a1a6aa4d2b6717ca173bf
diff --git a/metadata/md5-cache/app-text/unrtf-0.21.10 b/metadata/md5-cache/app-text/unrtf-0.21.10
index 8ddacaf10663..541b94f74a57 100644
--- a/metadata/md5-cache/app-text/unrtf-0.21.10
+++ b/metadata/md5-cache/app-text/unrtf-0.21.10
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Converts RTF files to various formats
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/unrtf/unrtf.html
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/unrtf/unrtf-0.21.10.tar.gz
-_md5_=8b21df076e2125966e3c2f146081b267
+_md5_=12e3c03845405646af1082565c6b3e83
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r1 b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
index 5aac2f91eabd..fcc5b17a03d5 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r1
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r1
@@ -4,10 +4,10 @@ DESCRIPTION=script for converting XML and DocBook documents to a variety of outp
 EAPI=5
 HOMEPAGE=https://pagure.io/xmlto
 IUSE=latex text
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
 SLOT=0
 SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=544c29fc4e65aacfabdf2367bf493f2d
+_md5_=4a955ec389c56bc954dd570bb98efa51
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 8d3fd7719743..f45cfae269a6 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/diffchar-7.2 b/metadata/md5-cache/app-vim/diffchar-7.2
deleted file mode 100644
index ded510781e67..000000000000
--- a/metadata/md5-cache/app-vim/diffchar-7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
-EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
-KEYWORDS=amd64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/diffchar-7.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.2.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0e5160fe6f5a249c1040778710012884
diff --git a/metadata/md5-cache/app-vim/diffchar-8.1 b/metadata/md5-cache/app-vim/diffchar-8.1
index cb6d55f21760..b6a9020ced55 100644
--- a/metadata/md5-cache/app-vim/diffchar-8.1
+++ b/metadata/md5-cache/app-vim/diffchar-8.1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
 EAPI=6
 HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/057dad8c90d72af5d9bca9cd33746c3b59285191.tar.gz -> diffchar-8.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d5a3b20efa29bf456b88463c3dbdf47e
+_md5_=408124fb8fbb28b6da3f4504e0bb5b94
diff --git a/metadata/md5-cache/app-vim/diffchar-8.2 b/metadata/md5-cache/app-vim/diffchar-8.2
new file mode 100644
index 000000000000..51f3ef6fc578
--- /dev/null
+++ b/metadata/md5-cache/app-vim/diffchar-8.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
+EAPI=6
+HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
+KEYWORDS=~amd64 ~x86
+LICENSE=vim.org
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/837334b268302cf6c597d88485aa8aad6a500b98.tar.gz -> diffchar-8.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=9b64f0ec53bcd1d1afaa57da85ee19c8
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5 b/metadata/md5-cache/app-vim/dirdiff-1.1.5
deleted file mode 100644
index b5efd0b58eae..000000000000
--- a/metadata/md5-cache/app-vim/dirdiff-1.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: diff and merge two directories recursively
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2ae5fe30f0b2073de5e3d3b6c4c6b0b9
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1 b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
new file mode 100644
index 000000000000..d1807abe41d0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: diff and merge two directories recursively
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d8067b81f1be2badc17438d80e534a3c
diff --git a/metadata/md5-cache/app-vim/emmet-0.85 b/metadata/md5-cache/app-vim/emmet-0.85
deleted file mode 100644
index 2cc1d0beef4b..000000000000
--- a/metadata/md5-cache/app-vim/emmet-0.85
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=cb9003fa1a4b08782eba9b76cb120302
diff --git a/metadata/md5-cache/app-vim/emmet-0.85-r1 b/metadata/md5-cache/app-vim/emmet-0.85-r1
new file mode 100644
index 000000000000..e39bbf158a22
--- /dev/null
+++ b/metadata/md5-cache/app-vim/emmet-0.85-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d044d845d65724041f93a2f88ce31267
diff --git a/metadata/md5-cache/app-vim/fugitive-2.3 b/metadata/md5-cache/app-vim/fugitive-2.3
deleted file mode 100644
index f9b2838d3ae3..000000000000
--- a/metadata/md5-cache/app-vim/fugitive-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.3.tar.gz -> fugitive-2.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2183be956aa58e21decfd920bfb0bf33
diff --git a/metadata/md5-cache/app-vim/fugitive-2.4 b/metadata/md5-cache/app-vim/fugitive-2.4
index a6d71e59241d..3f0b09ca6a92 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.4
+++ b/metadata/md5-cache/app-vim/fugitive-2.4
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
+KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.4.tar.gz -> fugitive-2.4.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0ac3891752359c3e9a87039b6db8645c
+_md5_=2183be956aa58e21decfd920bfb0bf33
diff --git a/metadata/md5-cache/app-vim/fugitive-2.5 b/metadata/md5-cache/app-vim/fugitive-2.5
new file mode 100644
index 000000000000..d8fee8d682f9
--- /dev/null
+++ b/metadata/md5-cache/app-vim/fugitive-2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a git wrapper for vim
+EAPI=7
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
+LICENSE=vim
+RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.5.tar.gz -> fugitive-2.5.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=42a25b5dd48e6b7d272d3b8c87693796
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index ed19bcb8eeb7..72a6ba8cc98f 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -1,10 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0ac3891752359c3e9a87039b6db8645c
+_md5_=42a25b5dd48e6b7d272d3b8c87693796
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20180821 b/metadata/md5-cache/app-vim/gentoo-syntax-20180821
index a505e76dbbb3..471224140c87 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20180821
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20180821
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20180821.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=330ebf7f9096d62b379125f748326c1c
+_md5_=65522b113046f76e4967feb95e156d89
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20181023 b/metadata/md5-cache/app-vim/gentoo-syntax-20181023
index 4a327ece1fa5..194320430ee0 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20181023
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20181023
@@ -4,10 +4,10 @@ DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20181023.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e976c61b2fa4c6a4f63a31f002ae2487
+_md5_=11baf72593fe154779ca59a24460ebf1
diff --git a/metadata/md5-cache/app-vim/gitgutter-20171101 b/metadata/md5-cache/app-vim/gitgutter-20171101
deleted file mode 100644
index 839c6e9037be..000000000000
--- a/metadata/md5-cache/app-vim/gitgutter-20171101
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/airblade/vim-gitgutter/archive/1e60667322b7cd1bfcba98762fbba746a888d21a.tar.gz -> gitgutter-20171101.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=17bc046e420fa454c6c641a48b8273e6
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180316 b/metadata/md5-cache/app-vim/gitgutter-20180316
index 4f0f8c61ac8e..cabf5ea75aea 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20180316
+++ b/metadata/md5-cache/app-vim/gitgutter-20180316
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
 EAPI=6
 HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=890112afbdebdf52965ff8fedd6601a4
+_md5_=c0a1d900e55524136d8f798a93bb1a86
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180815 b/metadata/md5-cache/app-vim/gitgutter-20180815
new file mode 100644
index 000000000000..518881556667
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gitgutter-20180815
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
+EAPI=6
+HOMEPAGE=https://github.com/airblade/vim-gitgutter/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/airblade/vim-gitgutter/archive/50a7062909d91a290fae04219887b1b45f3138db.tar.gz -> gitgutter-20180815.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	b77011b62e2053c646ad720defe6d921	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=4933d37818851245abea1147c0b7f6e6
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0 b/metadata/md5-cache/app-vim/nerdtree-5.0.0
deleted file mode 100644
index c11ea1de6098..000000000000
--- a/metadata/md5-cache/app-vim/nerdtree-5.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=aa7b7de7c07a080c01de3f9ff71043ed
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1 b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
new file mode 100644
index 000000000000..2bb570dd8946
--- /dev/null
+++ b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
+KEYWORDS=amd64 x86 ~x64-macos
+LICENSE=WTFPL-2
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=4e8411eea15dae8d9e0c4600e83b0fd6
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4 b/metadata/md5-cache/app-vim/pathogen-2.4
deleted file mode 100644
index 40b459eee751..000000000000
--- a/metadata/md5-cache/app-vim/pathogen-2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: manage your runtimepath
-EAPI=5
-HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=4f72db80e2a5de8b633d60c35fcd4050
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4-r1 b/metadata/md5-cache/app-vim/pathogen-2.4-r1
new file mode 100644
index 000000000000..af2bb2c3599d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/pathogen-2.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: manage your runtimepath
+EAPI=6
+HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
+KEYWORDS=amd64 x86 ~x64-macos
+LICENSE=vim
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=02b724c9e1726172fb082e0191d88731
diff --git a/metadata/md5-cache/app-vim/tagbar-2.6.1 b/metadata/md5-cache/app-vim/tagbar-2.6.1
deleted file mode 100644
index 86739e9bff96..000000000000
--- a/metadata/md5-cache/app-vim/tagbar-2.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display tags of the current file ordered by scope
-EAPI=5
-HOMEPAGE=https://majutsushi.github.com/tagbar/ https://www.vim.org/scripts/script.php?script_id=3465
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.6.1.tar.gz -> tagbar-2.6.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7065e8097490cbbed253d5b5418dca3d
diff --git a/metadata/md5-cache/app-vim/tagbar-2.7 b/metadata/md5-cache/app-vim/tagbar-2.7
index f0db0f49d8a5..c33c2ceaeed5 100644
--- a/metadata/md5-cache/app-vim/tagbar-2.7
+++ b/metadata/md5-cache/app-vim/tagbar-2.7
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display tags of the current file ordered by scope
 EAPI=6
 HOMEPAGE=https://majutsushi.github.com/tagbar/ https://www.vim.org/scripts/script.php?script_id=3465
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.7.tar.gz -> tagbar-2.7.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f588c7b52dd7d8bbe214edcf6dbda42a
+_md5_=be53bd6fea38b836ebb1b68eb98b9d07
diff --git a/metadata/md5-cache/app-vim/webapi-0.2 b/metadata/md5-cache/app-vim/webapi-0.2
deleted file mode 100644
index 7dc524a39f36..000000000000
--- a/metadata/md5-cache/app-vim/webapi-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interface to Web APIs
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4019
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/webapi-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/webapi-0.2.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=65a5c486f41713df22bc343f2e9a3c05
diff --git a/metadata/md5-cache/app-vim/webapi-0.3 b/metadata/md5-cache/app-vim/webapi-0.3
index 0065f0b64060..e00947e99b50 100644
--- a/metadata/md5-cache/app-vim/webapi-0.3
+++ b/metadata/md5-cache/app-vim/webapi-0.3
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface to Web APIs
 EAPI=6
 HOMEPAGE=https://github.com/mattn/webapi-vim
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d57cd303299f860636c95d5c94eb65b8
+_md5_=c0b3d9276300033cbff367ed0e7916c2
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index fb265159232e..f23f4e45c7ee 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/gps-2018 b/metadata/md5-cache/dev-ada/gps-2018
deleted file mode 100644
index 69b0c1603da5..000000000000
--- a/metadata/md5-cache/dev-ada/gps-2018
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-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_python3_7(-),python_single_target_python2_7(+)] dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi gnat_2017? ( sys-devel/llvm:5 ) gnat_2018? ( || ( sys-devel/llvm:6 sys-devel/llvm:7 ) ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The GNAT Programming Studio
-EAPI=6
-HOMEPAGE=http://libre.adacore.com/tools/gps/
-IUSE=gnat_2017 +gnat_2018 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_python3_7(-),python_single_target_python2_7(+)] dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi gnat_2017? ( sys-devel/llvm:5 ) gnat_2018? ( || ( sys-devel/llvm:6 sys-devel/llvm:7 ) ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz https://dev.gentoo.org/~tupone/distfiles/gpsLib.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c84cd0b11253fb64b9ebfbc3b6041f86
diff --git a/metadata/md5-cache/dev-ada/gps-2018-r1 b/metadata/md5-cache/dev-ada/gps-2018-r1
new file mode 100644
index 000000000000..66139bbbcb55
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gps-2018-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+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_python3_7(-),python_single_target_python2_7(+)] dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi gnat_2017? ( sys-devel/llvm:5 ) gnat_2018? ( || ( sys-devel/llvm:6 sys-devel/llvm:7 ) ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The GNAT Programming Studio
+EAPI=6
+HOMEPAGE=http://libre.adacore.com/tools/gps/
+IUSE=gnat_2017 +gnat_2018 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_python3_7(-),python_single_target_python2_7(+)] dev-ada/gnatcoll-db[gnat_2017=,gnat_2018=,gnatcoll_db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] ~dev-ada/gtkada-2018[gnat_2017=,gnat_2017=] dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi gnat_2017? ( sys-devel/llvm:5 ) gnat_2018? ( || ( sys-devel/llvm:6 sys-devel/llvm:7 ) ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=02f2598d20cea76b9f2c23a21ecfaa20
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 75439e2c02af..240d5b13b77c 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.50.1 b/metadata/md5-cache/dev-cpp/glibmm-2.50.1
deleted file mode 100644
index 25397e27f2b2..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.50.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=C++ interface for glib2
-EAPI=6
-HOMEPAGE=https://www.gtkmm.org
-IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.50/glibmm-2.50.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1b5e8af3ff8a25cf03c5a5c1c016c34c
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1-r1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1-r1
deleted file mode 100644
index b988ef0fc2e5..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=C++ interface for glib2
-EAPI=6
-HOMEPAGE=https://www.gtkmm.org
-IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.52/glibmm-2.52.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bd7da69150c73dcd430ff9873d3b2895
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.54.1 b/metadata/md5-cache/dev-cpp/glibmm-2.54.1
deleted file mode 100644
index 729e3dbd9be1..000000000000
--- a/metadata/md5-cache/dev-cpp/glibmm-2.54.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=C++ interface for glib2
-EAPI=6
-HOMEPAGE=https://www.gtkmm.org
-IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2.1+ GPL-2+
-RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2
-SRC_URI=mirror://gnome/sources/glibmm/2.54/glibmm-2.54.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7fcd5232bd03bcb676629a6c5009fb59
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.56.0 b/metadata/md5-cache/dev-cpp/glibmm-2.56.0
index e803d6632ef7..dce47e594a10 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.56.0
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.56.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for glib2
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.55.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(-)?]
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.56/glibmm-2.56.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dbefcbbec25ebf06a061b5ea630da48c
+_md5_=87c813743eb4370f75525b5d1df38e25
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.4 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.4
new file mode 100644
index 000000000000..2365d759dc8e
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.4 doc? ( app-doc/doxygen media-gfx/graphviz )
+DESCRIPTION=Wayland C++ bindings
+EAPI=7
+HOMEPAGE=https://github.com/NilsBrause/waylandpp
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.4
+SLOT=0/0.2
+SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.4.tar.gz -> waylandpp-0.2.4.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c98d0e8bbc53b92b4ccac2a6c39b879
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-9999 b/metadata/md5-cache/dev-cpp/waylandpp-9999
index 979f57a65a38..87bec1e0487c 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-9999
+++ b/metadata/md5-cache/dev-cpp/waylandpp-9999
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.4 doc? ( app-doc/doxygen media-gfx/graphviz )
 DESCRIPTION=Wayland C++ bindings
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/NilsBrause/waylandpp
 IUSE=doc
 LICENSE=MIT
-RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland]
+RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.4
 SLOT=0/9999
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a337ff3ab3cdbae38d50ec595cba3046
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c98d0e8bbc53b92b4ccac2a6c39b879
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index c163db44374e..6830530ac90f 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/cpp-driver-2.9.0 b/metadata/md5-cache/dev-db/cpp-driver-2.9.0
index 0e5a19b0cc02..ae4427c34670 100644
--- a/metadata/md5-cache/dev-db/cpp-driver-2.9.0
+++ b/metadata/md5-cache/dev-db/cpp-driver-2.9.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=DataStax C/C++ Driver for Cassandra
 EAPI=6
 HOMEPAGE=https://datastax.github.io/cpp-driver/
 IUSE=libressl ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/datastax/cpp-driver/archive/2.9.0.tar.gz -> cpp-driver-2.9.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3daa7fdd4d755e0949fe6118010c8e3
+_md5_=62e559bed4dc1a7ec41486d9982f859e
diff --git a/metadata/md5-cache/dev-db/kdb-3.1.0-r2 b/metadata/md5-cache/dev-db/kdb-3.1.0-r2
index 35cfe0b2bee2..83efd07ec081 100644
--- a/metadata/md5-cache/dev-db/kdb-3.1.0-r2
+++ b/metadata/md5-cache/dev-db/kdb-3.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/icu:= mysql? ( dev-db/mysql-connector-c:= ) postgres? ( >=dev-qt/qtnetwork-5.11.1:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dcf9217b3a21e0b41f2cc7b461b4a4ae
diff --git a/metadata/md5-cache/dev-db/libzdb-3.1 b/metadata/md5-cache/dev-db/libzdb-3.1
index 1184cf002b84..86749e1a2c63 100644
--- a/metadata/md5-cache/dev-db/libzdb-3.1
+++ b/metadata/md5-cache/dev-db/libzdb-3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A thread safe high level multi-database connection pool library
 EAPI=5
 HOMEPAGE=http://www.tildeslash.com/libzdb/
 IUSE=debug doc mysql postgres +sqlite ssl static-libs
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl )
+RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=|| ( postgres mysql sqlite )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=439aebcbae2bce653fa6f58175a4ae94
+_md5_=aeb22ba4b198deaf5ab87f2a30db9502
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.22 b/metadata/md5-cache/dev-db/lmdb-0.9.22
index d331626cd084..5bb281da933e 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.22
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.22
@@ -9,4 +9,4 @@ RDEPEND=!=net-nds/openldap-2.4.40-r0
 SLOT=0/0.9.22
 SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=fbefa8530f2e84de80d9373cea04451d
+_md5_=a3076d71d305af9693e7edcb7a6e1fca
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.8 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.8
new file mode 100644
index 000000000000..9030d99cfe70
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=6
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.8/mariadb-connector-c-3.0.8-src.tar.gz?serve -> mariadb-connector-c-3.0.8-src.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=23dc8b411b3e1a7d6ef0c459dac0f639
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-9999 b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
index d24a1df2915e..2f86648b0057 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-9999
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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-crypt/heimdal[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3.24:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
 SLOT=0/3
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f8f3da771373b4912cd5513e28bf1b62
+_md5_=23dc8b411b3e1a7d6ef0c459dac0f639
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.3-r1 b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
index fc56fce08b82..525127d43ff1 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
 EAPI=6
 HOMEPAGE=https://github.com/maxbube/mydumper
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
+RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.3.tar.gz -> mydumper-0.9.3.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5459ed584a8aed4e67c3da0adbfe0fa9
+_md5_=1ede80ef1e20a2443f20c408f901cb78
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.5 b/metadata/md5-cache/dev-db/mydumper-0.9.5
index ceeb4790d1e2..0cf52fdc4a3f 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.9.5
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
 EAPI=6
 HOMEPAGE=https://github.com/maxbube/mydumper
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/mysql
+RDEPEND=dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.5.tar.gz -> mydumper-0.9.5.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5a0fb45cc51a60aa399539602f4325ee
+_md5_=1242fa758b3647d43c367dd37292bb7c
diff --git a/metadata/md5-cache/dev-db/mydumper-0.9.5-r1 b/metadata/md5-cache/dev-db/mydumper-0.9.5-r1
index c72024b87fb6..dd8465d50dd6 100644
--- a/metadata/md5-cache/dev-db/mydumper-0.9.5-r1
+++ b/metadata/md5-cache/dev-db/mydumper-0.9.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:= virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:= virtual/pkgconfig doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A high-performance multi-threaded backup (and restore) toolset for MySQL
 EAPI=6
 HOMEPAGE=https://github.com/maxbube/mydumper
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:= sys-libs/zlib:=
+RDEPEND=dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= dev-libs/openssl:0= sys-libs/zlib:=
 SLOT=0
 SRC_URI=https://github.com/maxbube/mydumper/archive/v0.9.5.tar.gz -> mydumper-0.9.5.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe66201849d1f90b1fdec148768817ee
+_md5_=8d9f45710fc605a83911d88380feb99a
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.3 b/metadata/md5-cache/dev-db/mysql++-3.2.3
index 452f313cffea..8317dc10b988 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.3
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ API interface to the MySQL database
 EAPI=6
 HOMEPAGE=http://tangentsoft.net/mysql++/
 IUSE=doc
-KEYWORDS=alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=virtual/libmysqlclient:=
 SLOT=0/3
 SRC_URI=http://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd37a38e25c8983aa87994477d2c9fe7
+_md5_=f27c8d41fa25cf75bc4ae88f0a72da6b
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11
new file mode 100644
index 000000000000..b777fbc8f7a5
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !<dev-db/mysql-connector-c-6.1.8
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.11.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=573fc5482316fdc03759b9d92a13594b
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.13 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.13
new file mode 100644
index 000000000000..275f51fcfc77
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.13
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0= dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= )
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=+legacy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= )
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.13-src.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=35633473b72cc3a1272ef1b0ad7ea8fb
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
index 1d2846767b6e..d5aea66c8a34 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-6.1.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=6
 HOMEPAGE=https://dev.mysql.com/downloads/connector/c/
 IUSE=libressl 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 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=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(-)?] 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(-)?] ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)]
 SLOT=0/18
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.11-src.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44634e4db3d5bdd3b0a8864ffbb5dbbe
+_md5_=9d72202172bbbbca0bbffd81f2cc60b0
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
deleted file mode 100644
index 7792630bba70..000000000000
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.20:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl >=dev-lang/lua-5.1:0[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 dev-lang/swig virtual/jre virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MySQL Workbench
-EAPI=5
-HOMEPAGE=http://dev.mysql.com/workbench/
-IUSE=debug doc gnome-keyring python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.20:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl >=dev-lang/lua-5.1:0[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.4-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=72e3e17a353bcc72e0b611eb86bc09a1
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.9.0 b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
index a0fb88e0c748..018b5c648042 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.9.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
+DEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:0=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
 DESCRIPTION=Lightweight connection pooler for PostgreSQL
 EAPI=6
 HOMEPAGE=https://pgbouncer.github.io
 IUSE=+c-ares debug doc pam ssl -udns
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
+RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:0=[-bindist] ) udns? ( >=net-libs/udns-0.1 )
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.9.0/pgbouncer-1.9.0.tar.gz
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f0ef772cd139dfad82e5548efc5a5630
+_md5_=d5926cfd8cf7afa11f423311f2f0b508
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.0 b/metadata/md5-cache/dev-db/pgpool2-3.7.0
index 6b710f95ec7f..1a9f28ce1955 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.0
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison !!dev-db/pgpool
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.0.tar.gz -> pgpool-II-3.7.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e930f8bb95586b89de26fdb227ae2654
+_md5_=94ee1f5867ad82ee9b784d62e424c0c7
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.1 b/metadata/md5-cache/dev-db/pgpool2-3.7.1
index 6d1b8550c450..b762992b72b7 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.1
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison !!dev-db/pgpool
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.1.tar.gz -> pgpool-II-3.7.1.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c8f5cbf3d2dd52cfebcc9ffe98a04ccd
+_md5_=d88e1f4733096bafd23e69b37edd04e9
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.3 b/metadata/md5-cache/dev-db/pgpool2-3.7.3
index 133b499fa668..2afe7ab23f3e 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.3
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= ) sys-devel/bison !!dev-db/pgpool
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.3.tar.gz -> pgpool-II-3.7.3.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c8f5cbf3d2dd52cfebcc9ffe98a04ccd
+_md5_=d88e1f4733096bafd23e69b37edd04e9
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.5 b/metadata/md5-cache/dev-db/pgpool2-3.7.5
index fcf97dfd2089..2d66af12ab1a 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.5
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.5.tar.gz -> pgpool-II-3.7.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0f208b492d148717b8aecbf921fcb540
+_md5_=f37b5243197b16ba92060610364a212c
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.7 b/metadata/md5-cache/dev-db/pgpool2-3.7.7
index b2ab373aa803..9aea04f87dd6 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.7
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.7.tar.gz -> pgpool-II-3.7.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b3649dce1599b0f03d92db76cb639f5d
+_md5_=17e3ef0662b41a235d29e73d57faf2fd
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.0.2 b/metadata/md5-cache/dev-db/pgpool2-4.0.2
index 26d5fa17e109..b34560b1bc65 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.0.2
+++ b/metadata/md5-cache/dev-db/pgpool2-4.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-4.0.2.tar.gz -> pgpool-II-4.0.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0c155fd057405a3969130ac033f7851b
+_md5_=310c64cc6b122fe8c349036ad2f77ad8
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index 33b2ebe45bb8..c1c2ca46a6a2 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) !!dev-db/pgpool sys-devel/bison virtual/pkgconfig doc? ( app-text/openjade dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Connection pool server for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgpool.net/
 IUSE=doc libressl memcached pam ssl static-libs postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
 LICENSE=BSD
-RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e26b9fd38fd6ecf402ac1b68d8b489ec
+_md5_=68c04c1fe944378cd8404db4678f700f
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.1-r1 b/metadata/md5-cache/dev-db/postgis-2.5.1-r1
index a30d8829807c..bbc0cf0a0f45 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.1-r1
+++ b/metadata/md5-cache/dev-db/postgis-2.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server] ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=6
 HOMEPAGE=http://postgis.net
-IUSE=address-standardizer doc gtk static-libs mapbox test topology postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3
+IUSE=address-standardizer doc gtk static-libs mapbox test topology postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server] ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf )
-REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 )
+RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server] ) dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 address-standardizer? ( dev-libs/libpcre ) gtk? ( x11-libs/gtk+:2 ) mapbox? ( dev-libs/protobuf )
+REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.5.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	postgres	1d395ef92a41175c81bf7da2cb7fb8cb	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d0a4923c3aad50d221ab8ebf3baa7b3b
+_md5_=595d528f5451cc8045d92c658990e8a0
diff --git a/metadata/md5-cache/dev-db/postgresql-10.6 b/metadata/md5-cache/dev-db/postgresql-10.6
index 413a46cc8fbd..063981751251 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.6
+++ b/metadata/md5-cache/dev-db/postgresql-10.6
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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_python3_7(-),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.6/postgresql-10.6.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=37346254e8d4a4dbe74795f15d5c1a3c
+_md5_=386f7794079781255e0b55f65d5c0813
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.25 b/metadata/md5-cache/dev-db/postgresql-9.3.25
index d941d5b257b1..292a6c76aae5 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.3.25
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.25
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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_python3_7(-),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.25/postgresql-9.3.25.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4e38d945298ae25106b6f34576b8c235
+_md5_=0804fa69af27a25d3fef998b0dd4b597
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.20 b/metadata/md5-cache/dev-db/postgresql-9.4.20
index 178e6c67138b..1a856a03551d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.20
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.20
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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_python3_7(-),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.20/postgresql-9.4.20.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=91eb2542e85dfb6b330adcd62bee1ae0
+_md5_=925f24e11985637ce2605ed3cf2f77a2
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.15 b/metadata/md5-cache/dev-db/postgresql-9.5.15
index b2fbb7134707..010e2c147b90 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.15
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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_python3_7(-),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.15/postgresql-9.5.15.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8ecc785016905b402c9166d8cd45da43
+_md5_=3ba7532be7159bd3f6ef2d9e19c16e29
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.11 b/metadata/md5-cache/dev-db/postgresql-9.6.11
index 8d6d22ceb8ba..8044efd0c2f0 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.11
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.11
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://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 kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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_python3_7(-),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.11/postgresql-9.6.11.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=726981aba3a6dfc76df2b0d81a10a35e
+_md5_=d1c7efaa303f1927a03809d198e12fce
diff --git a/metadata/md5-cache/dev-db/sqlite-3.25.3 b/metadata/md5-cache/dev-db/sqlite-3.25.3
index 54fcc1db6571..158ca315d6dd 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.25.3
+++ b/metadata/md5-cache/dev-db/sqlite-3.25.3
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 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 ~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 ~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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3250300.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3250300.zip ) test? ( https://sqlite.org/2018/sqlite-src-3250300.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3250300.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3250300.tar.gz ) ) )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d8cfeab98ec2fd85e60d022cd3d800f3
+_md5_=f85c0fce3829c0a342ba7debc54745cf
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7 b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
index 4d3bea7efea3..76fe85223845 100644
--- a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
+++ b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/designer-5.11.1:5 cups? ( >=dev-qt/qtprintsupport-5.11.1:5 ) cli? ( sys-libs/readline:= ) tcl? ( dev-lang/tcl:= )
 SLOT=0
 SRC_URI=http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/sqlitestudio-3.0.7.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=fc2f77dbbe74577381921ae89a30e315
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index cfed83cc30b2..e57d38e793fc 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.0.26 b/metadata/md5-cache/dev-erlang/fast_tls-1.0.26
new file mode 100644
index 000000000000..bcd4a7220057
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.0.26
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/fast_tls
+IUSE=libressl
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-lang/erlang
+SLOT=0
+SRC_URI=https://github.com/processone/fast_tls/archive/1.0.26.tar.gz -> fast_tls-1.0.26.tar.gz
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
+_md5_=f40ad50d81c85b89c04e564dbbcb965e
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index bb2b1bede50a..679f3f4bad5e 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/go-md2man-1.0.8 b/metadata/md5-cache/dev-go/go-md2man-1.0.8
new file mode 100644
index 000000000000..f3537367a1d7
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-md2man-1.0.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A utility to convert markdown to man pages
+EAPI=6
+HOMEPAGE=https://github.com/cpuguy83/go-md2man
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v1.0.8.tar.gz -> go-md2man-1.0.8.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=dcde1a2e0dd00622236dbfcaa0a6203b
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 07e346e50928..480a07b946a9 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.10.4 b/metadata/md5-cache/dev-haskell/hsopenssl-0.10.4
index 328c802fcac9..d96bd42400fc 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.10.4
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.10.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:* >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:0= >=dev-haskell/cabal-1.8.0.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Partial OpenSSL binding for Haskell
 EAPI=5
 HOMEPAGE=https://github.com/phonohawk/HsOpenSSL
 IUSE=+fast-bignum doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:*
+RDEPEND=>=dev-haskell/network-2.1.0.0:=[profile?] >=dev-lang/ghc-6.12.1:= dev-libs/openssl:0=
 SLOT=0/0.10.4
 SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.10.4/HsOpenSSL-0.10.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c63f15d5e94cb5fa02ecc6befb1032b
+_md5_=f069d1c9e3ec1d7d658e47e4af3b73c3
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 8b14f35e1a5c..68425032ad2f 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/java-config-2.2.0-r4 b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
index abf901b082cd..097e75e13056 100644
--- a/metadata/md5-cache/dev-java/java-config-2.2.0-r4
+++ b/metadata/md5-cache/dev-java/java-config-2.2.0-r4
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=2
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/java-config-2.2.0.tar.bz2
+SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/java-config-2.2.0.tar.bz2
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=28164d2b338ec99e57103c795699762c
+_md5_=8a14da48167f29c96f3f3dd9f95956d5
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.1_p13 b/metadata/md5-cache/dev-java/openjdk-11.0.1_p13
index c6246b8ee1db..e7ff68fe7fcc 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.1_p13
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.1_p13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= net-print/cups sys-libs/zlib !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) app-arch/zip media-libs/alsa-lib !headless-awt? ( x11-base/xorg-proto ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=media-libs/freetype:2= net-print/cups sys-libs/zlib systemtap? ( dev-util/systemtap ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) app-arch/zip media-libs/alsa-lib !headless-awt? ( x11-base/xorg-proto ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
-IUSE=+jvm_variant_server jvm_variant_client jvm_variant_core jvm_variant_minimal jvm_variant_zero alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart elibc_FreeBSD
+IUSE=+jvm_variant_server jvm_variant_client jvm_variant_core jvm_variant_minimal jvm_variant_zero alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart elibc_FreeBSD
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=GPL-2
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/freetype:2= net-print/cups sys-libs/zlib !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RDEPEND=media-libs/freetype:2= net-print/cups sys-libs/zlib systemtap? ( dev-util/systemtap ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 REQUIRED_USE=|| ( jvm_variant_server jvm_variant_client jvm_variant_core jvm_variant_minimal jvm_variant_zero ) ?? ( jvm_variant_core jvm_variant_zero ) jvm_variant_core? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal ) jvm_variant_zero? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.1+13.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5a1abb9c57baa8f786e851959d888c5c
+_md5_=05715454b81f8dee662a5251961b15f6
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.16 b/metadata/md5-cache/dev-java/tomcat-native-1.2.16
deleted file mode 100644
index 24bd5de43c3b..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Native APR library for Tomcat
-EAPI=5
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.16/source/tomcat-native-1.2.16-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=27f1862a67d002e9e875d33c39598a24
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.17 b/metadata/md5-cache/dev-java/tomcat-native-1.2.17
deleted file mode 100644
index b06accfae1b1..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.17/source/tomcat-native-1.2.17-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ad41b948f33807bb5b48979f6efc62ec
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.18 b/metadata/md5-cache/dev-java/tomcat-native-1.2.18
deleted file mode 100644
index c401887a18d4..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Allows Tomcat to use certain native resources for better performance
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.18/source/tomcat-native-1.2.18-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5053737d98ac85e357de2416a880e419
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.19 b/metadata/md5-cache/dev-java/tomcat-native-1.2.19
index 2772c6073f50..d87785f3433c 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.19
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.19
@@ -4,10 +4,10 @@ DESCRIPTION=Allows Tomcat to use certain native resources for better performance
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=static-libs test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/openssl:0= >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.19/source/tomcat-native-1.2.19-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5053737d98ac85e357de2416a880e419
+_md5_=0d5b0b8ccb2dfdd6d2f037269acb6bc2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
deleted file mode 100644
index d1b634626eb0..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 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-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.45/src/apache-tomcat-6.0.45-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5a59dffb3ab53cf2a69a9b0a1fa64cee
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85
deleted file mode 100644
index cc03e6d813af..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.85
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.85/src/apache-tomcat-7.0.85-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2ca803da3197dde1655ea947a8cd7b89
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.88 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.88
deleted file mode 100644
index 9e2a2e8a2b13..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.88
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.0
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.88/src/apache-tomcat-7.0.88-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=779a8bed93a93b69d5ac1757890a916c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.90 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.90
index 7df2b791fb9d..43d90362164d 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.90
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.90
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.90/src/apache-tomcat-7.0.90-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=779a8bed93a93b69d5ac1757890a916c
+_md5_=3028f34c5b4257a5cc3ac6f43dcfe552
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.92 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.92
new file mode 100644
index 000000000000..1176c5253f52
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.92
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7601d458c491539a9aa21679c084b101
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
deleted file mode 100644
index 9cc2ae9703e3..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.50
+++ /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-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.50/src/apache-tomcat-8.0.50-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1b3f03355b813721a9204e8e46d68185
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.52 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.52
index 86df2b6cedd7..e8e925b70fef 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.52
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.52
@@ -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-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~x86 ~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.52/src/apache-tomcat-8.0.52-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c1fe3ba0136216ce36f0693ecde026b6
+_md5_=385281f323eb8b902b6c4353f3a42c9c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.53 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.53
new file mode 100644
index 000000000000..1d8cca0807c0
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.53
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=5
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-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.53/src/apache-tomcat-8.0.53-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f0526e67403fb7372782f927394a3048
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.30 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.30
deleted file mode 100644
index 59d7b3b4c560..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.30
+++ /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=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~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.30/src/apache-tomcat-8.5.30-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6cb28624e7504c7ac433a8c198dde806
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.31 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.31
index 2a99bbe7261e..fba2126c83b0 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.31
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.31
@@ -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-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~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.31/src/apache-tomcat-8.5.31-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=466a50287d6629c3864557c848e828eb
+_md5_=145f63593b7ba300076e09354ba3e967
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.37 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.37
new file mode 100644
index 000000000000..15b91aedc1a2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.37
@@ -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-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.37/src/apache-tomcat-8.5.37-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5b88961dd8b21b2a816c9c773bfb68be
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.14 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.14
new file mode 100644
index 000000000000..21255afc2687
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.14
@@ -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-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.14/src/apache-tomcat-9.0.14-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=7f25840b5524705229b9a7688e1c190e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.8 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.8
index b9b551e543d8..6567858d45cc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.8
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.8
@@ -4,10 +4,10 @@ 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-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~x86 ~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.8/src/apache-tomcat-9.0.8-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2b8827f71321f04c309f7a1cccf79d5d
+_md5_=b0d60824501edb0fa0d91442cfe49f5f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 87d512d9243a..c996ca098491 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/go-1.10.7 b/metadata/md5-cache/dev-lang/go-1.10.7
index 07e80d0eea8d..5997d9bda0f0 100644
--- a/metadata/md5-cache/dev-lang/go-1.10.7
+++ b/metadata/md5-cache/dev-lang/go-1.10.7
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=https://golang.org
 IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.10.7
 SRC_URI=https://storage.googleapis.com/golang/go1.10.7.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	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e49eb4629da0dc6e7f5b05468e6e7f98
+_md5_=0a00995fbf0084fd1b47482772ce9a8b
diff --git a/metadata/md5-cache/dev-lang/go-1.11.4 b/metadata/md5-cache/dev-lang/go-1.11.4
index f7d9303d24af..9b04e0ce2f84 100644
--- a/metadata/md5-cache/dev-lang/go-1.11.4
+++ b/metadata/md5-cache/dev-lang/go-1.11.4
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=6
 HOMEPAGE=https://golang.org
 IUSE=gccgo
-KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.11.4
 SRC_URI=https://storage.googleapis.com/golang/go1.11.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	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=541980db6ffbc4629070a2427f6104ca
+_md5_=daafb5045b106c8629aacc6133ba415a
diff --git a/metadata/md5-cache/dev-lang/julia-0.6.3-r1 b/metadata/md5-cache/dev-lang/julia-0.6.3-r1
deleted file mode 100644
index 4ec4ab9d50bc..000000000000
--- a/metadata/md5-cache/dev-lang/julia-0.6.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:4= sys-devel/clang:4= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=6
-HOMEPAGE=https://julialang.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=sys-devel/llvm:4= sys-devel/clang:4= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v0.6.3/julia-0.6.3.tar.gz https://dev.gentoo.org/~tamiko/distfiles/julia-0.6.3-bundled.tar.gz
-_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ec87c1e3af8ce5622ad9ef8cff13177a
diff --git a/metadata/md5-cache/dev-lang/julia-0.7.0 b/metadata/md5-cache/dev-lang/julia-0.7.0
deleted file mode 100644
index ccc50aa73b4f..000000000000
--- a/metadata/md5-cache/dev-lang/julia-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=6
-HOMEPAGE=https://julialang.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v0.7.0/julia-0.7.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
-_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7bb1495647d8b640fb41aafd06c5780c
diff --git a/metadata/md5-cache/dev-lang/julia-1.0.1 b/metadata/md5-cache/dev-lang/julia-1.0.1
deleted file mode 100644
index 7b51f51b2d1e..000000000000
--- a/metadata/md5-cache/dev-lang/julia-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
-DESCRIPTION=High-performance programming language for technical computing
-EAPI=6
-HOMEPAGE=https://julialang.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.1/julia-1.0.1.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
-_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cc48f41b96b6e58d54056eb986e25e81
diff --git a/metadata/md5-cache/dev-lang/julia-1.0.3 b/metadata/md5-cache/dev-lang/julia-1.0.3
new file mode 100644
index 000000000000..5069ca92f354
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-1.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=6
+HOMEPAGE=https://julialang.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.3/julia-1.0.3.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
+_eclasses_=llvm	01fccd3367b527770b74bfbf59d616c6	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=87f869477142762ad2d5f9e1b705bbe4
diff --git a/metadata/md5-cache/dev-lang/julia-1.1.0_rc1 b/metadata/md5-cache/dev-lang/julia-1.1.0_rc1
new file mode 100644
index 000000000000..143255fee265
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-1.1.0_rc1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=6
+HOMEPAGE=https://julialang.org/
+LICENSE=MIT
+RDEPEND=dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.1.0-rc1/julia-1.1.0-rc1.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz -> julia-llvm-6.0.1.src.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=45fea9a455edf42b70082df68f90415c
diff --git a/metadata/md5-cache/dev-lang/julia-bin-1.0.3 b/metadata/md5-cache/dev-lang/julia-bin-1.0.3
new file mode 100644
index 000000000000..f3e61b5a1dee
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-bin-1.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=!dev-lang/julia
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=7
+HOMEPAGE=https://julialang.org/
+IUSE=elibc_glibc elibc_FreeBSD
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=!dev-lang/julia
+SLOT=0
+SRC_URI=x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.0/julia-1.0.3-linux-i686.tar.gz ) amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.0/julia-1.0.3-linux-x86_64.tar.gz ) arm? ( https://julialang-s3.julialang.org/bin/linux/armv7l/1.0/julia-1.0.3-linux-armv7l.tar.gz ) arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/1.0/julia-1.0.3-linux-aarch64.tar.gz ) amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.0/julia-1.0.3-freebsd-x86_64.tar.gz )
+_md5_=ac95bcd35be201fe461bf99d93bfd5c2
diff --git a/metadata/md5-cache/dev-lang/mono-5.18.0.225 b/metadata/md5-cache/dev-lang/mono-5.18.0.225
new file mode 100644
index 000000000000..8137072f669e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mono-5.18.0.225
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) sys-devel/bc virtual/yacc pax_kernel? ( sys-apps/elfix ) dev-util/cmake >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
+EAPI=6
+HOMEPAGE=http://www.mono-project.com/Main_Page
+IUSE=nls minimal pax_kernel xen doc kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
+RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
+SLOT=0
+SRC_URI=http://download.mono-project.com/sources/mono/mono-5.18.0.225.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e8edd4f4b48ae25265425c57f54814cc
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.4 b/metadata/md5-cache/dev-lang/mujs-1.0.4
index 354d04125c57..1ee2ca9cde23 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.4
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.4
@@ -3,9 +3,9 @@ DESCRIPTION=lightweight Javascript interpreter
 EAPI=7
 HOMEPAGE=http://mujs.com/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 SLOT=0
 SRC_URI=https://mujs.com/downloads/mujs-1.0.4.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a9d1cb833dd07da75b9b92001aaeecd
+_md5_=36289b090fab89a6349138eb80c85dab
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.5 b/metadata/md5-cache/dev-lang/mujs-1.0.5
index 277cc0b23914..c1d9306a0076 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.5
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.5
@@ -1,11 +1,13 @@
 DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/readline:0=
 DESCRIPTION=An embeddable Javascript interpreter in C.
 EAPI=7
 HOMEPAGE=http://mujs.com/ https://github.com/ccxvii/mujs/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
+RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.5.tar.gz -> mujs-1.0.5.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ef2d85bd9f772841f57b68af497033a1
+_md5_=dd754c0d93268dd52d69d0337b75fba6
diff --git a/metadata/md5-cache/dev-lang/nim-0.16.0 b/metadata/md5-cache/dev-lang/nim-0.16.0
deleted file mode 100644
index 6dbf1b19407e..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.16.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=readline? ( sys-libs/readline:0= )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=6
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.16.0.tar.xz
-_md5_=cffbdda5cb22c7e19c45dc65d125911c
diff --git a/metadata/md5-cache/dev-lang/nim-0.17.0 b/metadata/md5-cache/dev-lang/nim-0.17.0
deleted file mode 100644
index 5e3af050bf98..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=readline? ( sys-libs/readline:0= )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=6
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.17.0.tar.xz
-_md5_=9fe95de0454e5280171ce118e024ec8d
diff --git a/metadata/md5-cache/dev-lang/nim-0.17.2 b/metadata/md5-cache/dev-lang/nim-0.17.2
deleted file mode 100644
index 7c0b011d19cf..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.17.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=readline? ( sys-libs/readline:0= )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=6
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.17.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6275ef4dacc5f88efa0c7e76900b3216
diff --git a/metadata/md5-cache/dev-lang/nim-0.17.2-r1 b/metadata/md5-cache/dev-lang/nim-0.17.2-r1
deleted file mode 100644
index 381a3b6449f6..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.17.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=readline? ( sys-libs/readline:0= )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=6
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.17.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=51083b49d86718a507eacaab26e88fed
diff --git a/metadata/md5-cache/dev-lang/nim-0.18.0 b/metadata/md5-cache/dev-lang/nim-0.18.0
deleted file mode 100644
index c861e1447227..000000000000
--- a/metadata/md5-cache/dev-lang/nim-0.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( net-libs/nodejs )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=6
-HOMEPAGE=https://nim-lang.org/
-IUSE=doc +readline test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-0.18.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=26cd04847cd91b0865b6da8f8554ac36
diff --git a/metadata/md5-cache/dev-lang/nim-0.19.2 b/metadata/md5-cache/dev-lang/nim-0.19.2
new file mode 100644
index 000000000000..05a363ba173a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-0.19.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test
+DEPEND=test? ( net-libs/nodejs )
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=7
+HOMEPAGE=https://nim-lang.org/
+IUSE=doc +readline test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=readline? ( sys-libs/readline:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-0.19.2.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=978588e8f04e74c69ffe4048c9a70bc8
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1 b/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
index e327b32ab507..e3175804cded 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.04.2-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) virtual/pkgconfig
 DESCRIPTION=Type-inferring functional programming language descended from the ML family
 EAPI=5
-HOMEPAGE=http://www.ocaml.org/
+HOMEPAGE=https://ocaml.org
 IUSE=emacs flambda latex ncurses +ocamlopt X xemacs
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) X? ( x11-libs/
 SLOT=0/4.04.2
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.04.2.tar.gz -> ocaml-4.04.2.tar.gz mirror://gentoo/ocaml-patches-8.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3af01f8f3d5bfc7445ec6e5957046c7b
+_md5_=23537dea05266ff02fffe4822ef20a1a
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1 b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
index 0f2541d053d4..ecf6d850c5ae 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
+++ b/metadata/md5-cache/dev-lang/ocaml-4.05.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( sys-libs/libunwind:= ) X? ( x11-libs/libX11 ) virtual/pkgconfig
 DESCRIPTION=Type-inferring functional programming language descended from the ML family
 EAPI=5
-HOMEPAGE=http://www.ocaml.org/
+HOMEPAGE=https://ocaml.org
 IUSE=emacs flambda latex ncurses +ocamlopt spacetime X xemacs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=QPL-1.0 LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/binutils-libs:= ncurses? ( sys-libs/ncurses:0= ) spacetime? ( s
 SLOT=0/4.05.0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz mirror://gentoo/ocaml-patches-9.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=04f22a55b968a78a9d1a337c5b5153cb
+_md5_=eb88807ca1d2e6fd06fd6346808d71a5
diff --git a/metadata/md5-cache/dev-lang/parrot-7.1.0 b/metadata/md5-cache/dev-lang/parrot-7.1.0
index eac1712fce6a..03a53d6199ea 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.1.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
 EAPI=5
 HOMEPAGE=http://www.parrot.org/
 IUSE=opengl nls doc examples gdbm gmp ssl +unicode pcre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 RESTRICT=test
 SLOT=0/7.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.1.0/parrot-7.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0d708d4f64544e56ef293988bf76dab9
+_md5_=9df17f0cb382bba23ea6b27ed398cb92
diff --git a/metadata/md5-cache/dev-lang/parrot-7.11.0 b/metadata/md5-cache/dev-lang/parrot-7.11.0
index b4affbca804f..684e6d254e50 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.11.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
 EAPI=5
 HOMEPAGE=http://www.parrot.org/
 IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 RESTRICT=test
 SLOT=0/7.11.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.11.0/parrot-7.11.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=194aa19f5c70de9d3d3cd657655302d8
+_md5_=11db600e04c365be33b5d617b88f4702
diff --git a/metadata/md5-cache/dev-lang/parrot-7.5.0 b/metadata/md5-cache/dev-lang/parrot-7.5.0
index c440a568b2e8..c03f7a35d1f9 100644
--- a/metadata/md5-cache/dev-lang/parrot-7.5.0
+++ b/metadata/md5-cache/dev-lang/parrot-7.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
 EAPI=5
 HOMEPAGE=http://www.parrot.org/
 IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline dev-libs/libffi opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 RESTRICT=test
 SLOT=0/7.5.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/7.5.0/parrot-7.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=194aa19f5c70de9d3d3cd657655302d8
+_md5_=11db600e04c365be33b5d617b88f4702
diff --git a/metadata/md5-cache/dev-lang/parrot-8.1.0 b/metadata/md5-cache/dev-lang/parrot-8.1.0
index 24eaecc42c73..34fd5dd5d8ff 100644
--- a/metadata/md5-cache/dev-lang/parrot-8.1.0
+++ b/metadata/md5-cache/dev-lang/parrot-8.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+DEPEND=dev-lang/perl[doc?] sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 DESCRIPTION=Virtual machine designed to compile and execute bytecode for dynamic languages
 EAPI=5
 HOMEPAGE=http://www.parrot.org/
 IUSE=opengl nls doc examples gdbm +gmp ssl +unicode pcre
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Artistic-2
-RDEPEND=sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
+RDEPEND=sys-libs/readline dev-libs/libffi net-libs/libnsl:0= opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6:= ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl:0= ) pcre? ( dev-libs/libpcre ) doc? ( dev-perl/JSON )
 RESTRICT=test
 SLOT=0/8.1.0
 SRC_URI=ftp://ftp.parrot.org/pub/parrot/releases/all/8.1.0/parrot-8.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a873809e936e3be5d8fa23e4c2642ea
+_md5_=c7df9f9763f05dac74c85d4c4fa77bec
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.2 b/metadata/md5-cache/dev-lang/perl-5.26.2
index 782029835bee..dd25907faeb1 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.2
+++ b/metadata/md5-cache/dev-lang/perl-5.26.2
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.26
 SRC_URI=mirror://cpan/src/5.0/perl-5.26.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.2-patches-1/perl-5.26.2-patches-1.tar.xz mirror://gentoo/perl-5.26.2-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.2-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=329ade81652b43dfb81517967f4d4bc2
+_md5_=947eeb8aa226e877ebea4670cc632a84
diff --git a/metadata/md5-cache/dev-lang/php-5.6.38-r1 b/metadata/md5-cache/dev-lang/php-5.6.38-r1
deleted file mode 100644
index 02a7a7c0f62f..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.6.38-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( <dev-libs/icu-61.1:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( <dev-libs/icu-61.1:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
-SLOT=5.6
-SRC_URI=https://php.net/distributions/php-5.6.38.tar.xz https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd4a571de1f2f599d3cbbd868008ee5c
diff --git a/metadata/md5-cache/dev-lang/php-5.6.39 b/metadata/md5-cache/dev-lang/php-5.6.39
deleted file mode 100644
index f2841a2cbbbb..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.6.39
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
-SLOT=5.6
-SRC_URI=https://php.net/distributions/php-5.6.39.tar.xz https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7f174d8a6c7021955c9f27693647c4a7
diff --git a/metadata/md5-cache/dev-lang/php-5.6.40 b/metadata/md5-cache/dev-lang/php-5.6.40
new file mode 100644
index 000000000000..7a1ad70bfe46
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.40
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) vpx? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+SLOT=5.6
+SRC_URI=https://php.net/distributions/php-5.6.40.tar.xz https://salsa.debian.org/php-team/php/raw/8149a436/debian/patches/0055-Use-OpenSSL-1.1-compatibility-patch-when-built-with-.patch?inline=false -> php-5.6-openssl-1.1-compatibility.patch
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=acd484e992ed75ef833f90a2a0d9d051
diff --git a/metadata/md5-cache/dev-lang/php-7.1.23 b/metadata/md5-cache/dev-lang/php-7.1.23
deleted file mode 100644
index 1595abac51ba..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
-SLOT=7.1
-SRC_URI=https://secure.php.net/distributions/php-7.1.23.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e8a5100697da2e6d5a221b68fcc88cf
diff --git a/metadata/md5-cache/dev-lang/php-7.1.24 b/metadata/md5-cache/dev-lang/php-7.1.24
deleted file mode 100644
index 14ddd11c8986..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
-SLOT=7.1
-SRC_URI=https://secure.php.net/distributions/php-7.1.24.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e8a5100697da2e6d5a221b68fcc88cf
diff --git a/metadata/md5-cache/dev-lang/php-7.1.25 b/metadata/md5-cache/dev-lang/php-7.1.25
deleted file mode 100644
index 0927f7e9bb7f..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.25
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
-SLOT=7.1
-SRC_URI=https://secure.php.net/distributions/php-7.1.25.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4c193b4a653fc5f759f3ebc9564cd386
diff --git a/metadata/md5-cache/dev-lang/php-7.1.26 b/metadata/md5-cache/dev-lang/php-7.1.26
new file mode 100644
index 000000000000..6316dfe58b8d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.26
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
+SLOT=7.1
+SRC_URI=https://secure.php.net/distributions/php-7.1.26.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=da5e9716e77ecc081a096924c7e78082
diff --git a/metadata/md5-cache/dev-lang/php-7.2.11 b/metadata/md5-cache/dev-lang/php-7.2.11
deleted file mode 100644
index 892135588ece..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
-SLOT=7.2
-SRC_URI=https://secure.php.net/distributions/php-7.2.11.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3898b6ca0733367554e1a144ca3d292
diff --git a/metadata/md5-cache/dev-lang/php-7.2.12 b/metadata/md5-cache/dev-lang/php-7.2.12
deleted file mode 100644
index b9036e0487d7..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.2.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
-SLOT=7.2
-SRC_URI=https://secure.php.net/distributions/php-7.2.12.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3898b6ca0733367554e1a144ca3d292
diff --git a/metadata/md5-cache/dev-lang/php-7.2.13 b/metadata/md5-cache/dev-lang/php-7.2.13
deleted file mode 100644
index f4028df07370..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.2.13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
-DESCRIPTION=The PHP language runtime engine
-EAPI=7
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
-SLOT=7.2
-SRC_URI=https://php.net/distributions/php-7.2.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cba5728bbfe5ed640bd35a4c3124e1e1
diff --git a/metadata/md5-cache/dev-lang/php-7.2.14 b/metadata/md5-cache/dev-lang/php-7.2.14
new file mode 100644
index 000000000000..0d41e61b7e75
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.2.14
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
+SLOT=7.2
+SRC_URI=https://php.net/distributions/php-7.2.14.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=21461650bcd4eeb7cfbbfe2bc8a4bfa5
diff --git a/metadata/md5-cache/dev-lang/php-7.3.0 b/metadata/md5-cache/dev-lang/php-7.3.0
deleted file mode 100644
index 4ea9873966fc..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
-SLOT=7.3
-SRC_URI=https://secure.php.net/distributions/php-7.3.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aab8b9e3879a9c88a1dce846f467e46b
diff --git a/metadata/md5-cache/dev-lang/php-7.3.1 b/metadata/md5-cache/dev-lang/php-7.3.1
new file mode 100644
index 000000000000..e780299a809a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption 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=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
+SLOT=7.3
+SRC_URI=https://secure.php.net/distributions/php-7.3.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=628f39cf2758e3fe84e090204cce6ab8
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.5 b/metadata/md5-cache/dev-lang/ruby-2.4.5
index 4c73984cad67..e23c496cff39 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.5
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.5
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=mirror://ruby/2.4/ruby-2.4.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f3cf28e3ea4a73083f6b6b4213a31eae
+_md5_=ed5842add5fd2e404a43108e6bfafd3f
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.5-r1 b/metadata/md5-cache/dev-lang/ruby-2.4.5-r1
index 14fb8dce4480..45f037eda39b 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.5-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.5-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=mirror://ruby/2.4/ruby-2.4.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9369bf08a0fd0dbdb00946a5ae1143ee
+_md5_=c508cced4ba6001660cc6d3d54f558d6
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.3 b/metadata/md5-cache/dev-lang/ruby-2.5.3
index db3e144c7a09..b75a7e8a6fce 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.3
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.3
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.5
 SRC_URI=mirror://ruby/2.5/ruby-2.5.3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4bf47c7e4295933db38c2bd009768cd7
+_md5_=b2137845afc4a8bd9c04805d26634e9f
diff --git a/metadata/md5-cache/dev-lang/ruby-2.6.0-r1 b/metadata/md5-cache/dev-lang/ruby-2.6.0-r1
index e33080f4c787..f5a3c678cf40 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.6.0-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.6.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
@@ -8,8 +8,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests s
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] virtual/rubygems[ruby_targets_ruby26] >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] >=dev-ruby/json-2.0.2[ruby_targets_ruby26] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.6
 SRC_URI=mirror://ruby/2.6/ruby-2.6.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bcdfb3c841e398013fac8db399f8c17d
+_md5_=a104656dc9597e0c9d11587a9a14b212
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1 b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
index a913ba908ea6..df001fc9e96e 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
+++ b/metadata/md5-cache/dev-lang/spidermonkey-52.9.1_pre1
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone JavaScript C++ library
 EAPI=6
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 IUSE=debug minimal +system-icu test custom-cflags custom-optimization
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=NPL-1.1
 RDEPEND=>=dev-libs/nspr-4.13.1 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-58.1:= )
 RESTRICT=ia64? ( test )
 SLOT=52
 SRC_URI=http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.1pre1.tar.bz2 -> mozjs-52.9.1pre1.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-52.0-patches-0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=060d2bfc7d17d67973852cc6a9de3ed0
+_md5_=bd7440f80029e0e9151b9731a746d7b7
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.7.24 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.24
new file mode 100644
index 000000000000..927487e0a68c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=versatile implementation of the Prolog programming language
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) yaml? ( dev-libs/libyaml )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.24.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=54b422073309d1656377299324c2a326
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9.1 b/metadata/md5-cache/dev-lang/tk-8.6.9.1
new file mode 100644
index 000000000000..5037d43ead28
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!aqua? ( >=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(-)?] >=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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-base/xorg-proto )
+DESCRIPTION=Tk Widget Set
+EAPI=7
+HOMEPAGE=http://www.tcl.tk/
+IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=tcltk
+RDEPEND=!aqua? ( >=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(-)?] >=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/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/8.6
+SRC_URI=mirror://sourceforge/tcl/tk8.6.9.1-src.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=67e96e83c039841f2ec1e0633ecc90eb
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.9 b/metadata/md5-cache/dev-lang/vala-0.34.9
deleted file mode 100644
index 3d8c4726ec69..000000000000
--- a/metadata/md5-cache/dev-lang/vala-0.34.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.9 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Compiler for the GObject type system
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.9
-SLOT=0.34
-SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.9.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f74931df60e102e601ad782e9124aab
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.17 b/metadata/md5-cache/dev-lang/vala-0.36.17
new file mode 100644
index 000000000000..923f0457466b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.36.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.17 !dev-lang/vala:0 dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.17
+SLOT=0.36
+SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.17.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bc7c97ab72e20b48680b3519668254d4
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 5b1ee1f4523e..4bfb479e884d 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/appstream-glib-0.6.13 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
deleted file mode 100644
index d45bac270fec..000000000000
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.19.7 dev-util/gperf >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
-EAPI=6
-HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
-IUSE=+introspection nls stemmer
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) !<dev-util/appdata-tools-0.1.8-r1
-SLOT=0/8
-SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.6.13.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=742dde61d6086aa090f82652647bd223
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9 b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
index 712f8a11d618..178092f45deb 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.7.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.7 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.7 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
 DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
 EAPI=6
 HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=doc +introspection stemmer
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~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 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) !<dev-util/appdata-tools-0.1.8-r1
+RDEPEND=>=dev-libs/glib-2.45.8:2 sys-apps/util-linux app-arch/libarchive >=net-libs/libsoup-2.51.92:2.4 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] app-arch/gcab x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.7.9.tar.xz
 _eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b50572cf81ca95484530d3d7615c0e0c
+_md5_=07d30e1a9c45a63d5a31a6681197bca1
diff --git a/metadata/md5-cache/dev-libs/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 7b513518d1c8..dc46d4016646 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )
 RDEPEND=>=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtserialport-5.11.1:5 gui? ( >=dev-qt/qtcharts-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0421301772e3d1e0621937ae8a9493b2
diff --git a/metadata/md5-cache/dev-libs/botan-2.8.0 b/metadata/md5-cache/dev-libs/botan-2.8.0
index bae693d1a98c..3650b914e6de 100644
--- a/metadata/md5-cache/dev-libs/botan-2.8.0
+++ b/metadata/md5-cache/dev-libs/botan-2.8.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=2/2.8
 SRC_URI=https://botan.randombit.net/releases/Botan-2.8.0.tgz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5ba561c5eb0cd37784258b36e6ab7a4e
+_md5_=65ac9cf3fcac68f1e571e37870ad5ede
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.1 b/metadata/md5-cache/dev-libs/capstone-4.0.1
new file mode 100644
index 000000000000..e9a907320b27
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] ) python? ( 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(-)] )
+DESCRIPTION=disassembly/disassembler framework + bindings
+EAPI=7
+HOMEPAGE=http://www.capstone-engine.org/
+IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=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? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=0/4
+SRC_URI=https://github.com/aquynh/capstone/archive/4.0.1.tar.gz -> capstone-4.0.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=932228a3740797145dccde09baaa47ab
diff --git a/metadata/md5-cache/dev-libs/console_bridge-0.4.2 b/metadata/md5-cache/dev-libs/console_bridge-0.4.2
new file mode 100644
index 000000000000..b2557dbe1c7b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/console_bridge-0.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A ROS-independent package for logging into rosconsole/rosout
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/console_bridge
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads]
+SLOT=0/4
+SRC_URI=https://github.com/ros/console_bridge/archive/0.4.2.tar.gz -> console_bridge-0.4.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79230923073aff14b6f4cd5bc8fc7ec1
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1
new file mode 100644
index 000000000000..38419cd689d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=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(-)?] ) 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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
+EAPI=6
+HOMEPAGE=https://www.cyrusimap.org/sasl/
+IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-with-attribution
+RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=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(-)?] ) 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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=2
+SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1204d6491a8bcbb6cf49f5f7f38405ab
diff --git a/metadata/md5-cache/dev-libs/editline-1.16.0 b/metadata/md5-cache/dev-libs/editline-1.16.0
new file mode 100644
index 000000000000..07a38748efc0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/editline-1.16.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=line editing library for UNIX call compatible with the FSF readline
+EAPI=7
+HOMEPAGE=http://troglobit.com/projects/editline/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/troglobit/editline/releases/download/1.16.0/editline-1.16.0.tar.xz
+_md5_=5cca1da599f2be6aaea5a3085def71dc
diff --git a/metadata/md5-cache/dev-libs/efl-1.20.7-r2 b/metadata/md5-cache/dev-libs/efl-1.20.7-r2
index 34e32c556465..33200d9ac966 100644
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r2
+++ b/metadata/md5-cache/dev-libs/efl-1.20.7-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4
+DEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=sys-apps/sed-4
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=6
 HOMEPAGE=https://www.enlightenment.org/
 IUSE=avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
+RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
 REQUIRED_USE=?? ( opengl egl ) ?? ( opengl gles ) egl ( gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) !sdl egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ff25f2cb7dbf4328f47c55613455fdd
+_md5_=3f7b2c6854e3da676a66e1b0f1fc8046
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.1-r2 b/metadata/md5-cache/dev-libs/efl-1.21.1-r2
deleted file mode 100644
index f1b42d960d32..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.21.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles? ( media-libs/mesa[gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles? ( media-libs/mesa[gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=?? ( opengl egl ) ?? ( opengl gles ) egl ( gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) !sdl egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X ) xpresent? ( X )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b978bc2211ed12f13490556b21fb423e
diff --git a/metadata/md5-cache/dev-libs/efl-1.21.1-r3 b/metadata/md5-cache/dev-libs/efl-1.21.1-r3
new file mode 100644
index 000000000000..7cff105678fd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.21.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles? ( media-libs/mesa[gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=6
+HOMEPAGE=https://www.enlightenment.org
+IUSE=+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) egl? ( media-libs/mesa[egl] ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles? ( media-libs/mesa[gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=?? ( opengl egl ) ?? ( opengl gles ) egl? ( gles ) fbcon? ( !tslib ) gles? ( || ( X wayland ) !sdl egl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( X fbcon ) wayland? ( egl gles !opengl ) xim? ( X ) xpresent? ( X )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.21.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=afe8daa00013ea7f5dacff8c4b2b175c
diff --git a/metadata/md5-cache/dev-libs/gdl-3.22.0 b/metadata/md5-cache/dev-libs/gdl-3.22.0
deleted file mode 100644
index 3e2247fc2168..000000000000
--- a/metadata/md5-cache/dev-libs/gdl-3.22.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.4 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME docking library
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gdl
-IUSE=+introspection
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=3/5
-SRC_URI=mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6818a1c35b33ebc22f9546899cd30730
diff --git a/metadata/md5-cache/dev-libs/gdl-3.28.0 b/metadata/md5-cache/dev-libs/gdl-3.28.0
index c646831a1be2..e286e0c265c6 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.28.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME docking library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdl
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.28/gdl-3.28.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=28bbf767f494405165fedfbd9e54a508
+_md5_=2d8232e5fb9667b3f41a417ce392a6d6
diff --git a/metadata/md5-cache/dev-libs/glib-2.56.2 b/metadata/md5-cache/dev-libs/glib-2.56.2
deleted file mode 100644
index 595ed19a53e3..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.56.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=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(-)?] >=virtual/libffi-3.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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.20 systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sys-devel/gdb >=dev-util/gdbus-codegen-2.56.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.56.2 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=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(-)?] >=virtual/libffi-3.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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.2 virtual/libelf:0= ) >=dev-util/glib-utils-2.56.2
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.2.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05654154615aa997a2b258fb4e20175c
diff --git a/metadata/md5-cache/dev-libs/glib-2.56.4 b/metadata/md5-cache/dev-libs/glib-2.56.4
index 8f4e148f51dc..bf55d6ab8f73 100644
--- a/metadata/md5-cache/dev-libs/glib-2.56.4
+++ b/metadata/md5-cache/dev-libs/glib-2.56.4
@@ -4,11 +4,11 @@ DESCRIPTION=The GLib library of C routines
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.56.4 >=dev-libs/libpcre-8.13: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(-)?,static-libs?] >=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(-)?] >=virtual/libffi-3.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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] kernel_linux? ( sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fam? ( >=virtual/fam-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(-)?] ) utils? ( >=dev-util/gdbus-codegen-2.56.4 virtual/libelf:0= ) >=dev-util/glib-utils-2.56.4
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.4.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=df3e742c217fa15c5c5a9ccab5fd6fd2
+_md5_=c391cce6caf5af4cbff415c4444ea69d
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.23 b/metadata/md5-cache/dev-libs/gmime-2.6.23
index 5a22b0eed49f..d77f71e960cc 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.23
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.23
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=6
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
 IUSE=doc mono smime static-libs test vala
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32.0:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.12.21:2 ) smime? ( >=app-crypt/gpgme-1.1.6:1= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-1.30.0:= )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.23.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=54b2972a3bc5baab8a642a2ca7845f5d
+_md5_=4d20219f19053162ee54f4eb222d39d4
diff --git a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031 b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031
deleted file mode 100644
index d755fc6114a2..000000000000
--- a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.1:0= virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
-EAPI=6
-HOMEPAGE=https://github.com/gost-engine/engine
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=openssl
-RDEPEND=>=dev-libs/openssl-1.1:0=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.0.3_p20181031
-SRC_URI=https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> gost-engine-1.1.0.3_p20181031.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=34d3479e23129e5e7f76b84789cad6fe
diff --git a/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r1 b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r1
new file mode 100644
index 000000000000..871b15ff0b64
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/openssl-1.1.1:0= virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
+EAPI=6
+HOMEPAGE=https://github.com/gost-engine/engine
+IUSE=test
+KEYWORDS=~amd64 ~hppa
+LICENSE=openssl
+RDEPEND=>=dev-libs/openssl-1.1.1:0=
+RESTRICT=!test? ( test )
+SLOT=0/1.1.0.3_p20181031
+SRC_URI=https://github.com/gost-engine/engine/archive/e5cc3684f3b3ad40e186e23b00b253d234df92ab.tar.gz -> gost-engine-1.1.0.3_p20181031.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0db48245de30373698c2fb25e891b61d
diff --git a/metadata/md5-cache/dev-libs/gost-engine-9999 b/metadata/md5-cache/dev-libs/gost-engine-9999
index a79a575e5912..9f3988ba7d94 100644
--- a/metadata/md5-cache/dev-libs/gost-engine-9999
+++ b/metadata/md5-cache/dev-libs/gost-engine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/openssl-1.1:0= virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/openssl-1.1.1:0= virtual/pkgconfig test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A reference implementation of the Russian GOST crypto algorithms for OpenSSL
 EAPI=6
 HOMEPAGE=https://github.com/gost-engine/engine
 IUSE=test
 LICENSE=openssl
-RDEPEND=>=dev-libs/openssl-1.1:0=
+RDEPEND=>=dev-libs/openssl-1.1.1:0=
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=311efc6f26155947e47b87508a88178d
+_md5_=8dfef4a56a69cfd973a53f9814f96512
diff --git a/metadata/md5-cache/dev-libs/grok-0.9.2-r2 b/metadata/md5-cache/dev-libs/grok-0.9.2-r2
index fe571698844e..ab37bf439497 100644
--- a/metadata/md5-cache/dev-libs/grok-0.9.2-r2
+++ b/metadata/md5-cache/dev-libs/grok-0.9.2-r2
@@ -3,10 +3,10 @@ DEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6 >=ne
 DESCRIPTION=DRY and RAD for regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok
-KEYWORDS=amd64 arm ~arm64 ~hppa x86
+KEYWORDS=amd64 arm ~arm64 hppa x86
 LICENSE=BSD
 RDEPEND=dev-db/tokyocabinet >=dev-libs/libevent-1.3:= >=dev-libs/libpcre-7.6 >=net-libs/rpcsvc-proto-1 net-libs/libtirpc
 SLOT=0
 SRC_URI=https://github.com/jordansissel/grok/archive/v0.9.2.tar.gz -> grok-0.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b878f1ca4086e6ac8b081b3c9376bce
+_md5_=b38f017241b4761eb45e2fc24d4d3de3
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.0 b/metadata/md5-cache/dev-libs/handystats-1.11.0
deleted file mode 100644
index b2af877bab12..000000000000
--- a/metadata/md5-cache/dev-libs/handystats-1.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/gtest dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ library for collecting user-defined in-process runtime statistics
-EAPI=5
-HOMEPAGE=https://github.com/shindo/handystats
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/shindo/handystats/archive/1.11.0.zip -> handystats-1.11.0.zip
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=724fcb7b27ba87bf29a273675d62f30f
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.1 b/metadata/md5-cache/dev-libs/handystats-1.11.1
deleted file mode 100644
index 686688a4ac23..000000000000
--- a/metadata/md5-cache/dev-libs/handystats-1.11.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/gtest dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ library for collecting user-defined in-process runtime statistics
-EAPI=5
-HOMEPAGE=https://github.com/shindo/handystats
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/shindo/handystats/archive/1.11.1.zip -> handystats-1.11.1.zip
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=724fcb7b27ba87bf29a273675d62f30f
diff --git a/metadata/md5-cache/dev-libs/handystats-1.11.3 b/metadata/md5-cache/dev-libs/handystats-1.11.3
index aa1c7e18c503..54aa6a532b66 100644
--- a/metadata/md5-cache/dev-libs/handystats-1.11.3
+++ b/metadata/md5-cache/dev-libs/handystats-1.11.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-cpp/gtest dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C++ library for collecting user-defined in-process runtime statistics
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/shindo/handystats
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/shindo/handystats/archive/1.11.3.zip -> handystats-1.11.3.zip
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=724fcb7b27ba87bf29a273675d62f30f
+_md5_=4fb664c1d455d1114affc0a43924e630
diff --git a/metadata/md5-cache/dev-libs/icu-62.1 b/metadata/md5-cache/dev-libs/icu-62.1
deleted file mode 100644
index 55f2f72bdc49..000000000000
--- a/metadata/md5-cache/dev-libs/icu-62.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=International Components for Unicode
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/62.1
-SRC_URI=http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b194b82eb4dd08b3a2050ea1be50364a
diff --git a/metadata/md5-cache/dev-libs/icu-63.1 b/metadata/md5-cache/dev-libs/icu-63.1
deleted file mode 100644
index 77a25e9dfc79..000000000000
--- a/metadata/md5-cache/dev-libs/icu-63.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=International Components for Unicode
-EAPI=7
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=BSD
-SLOT=0/63.1
-SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=985a85fcf2e8480a1aac234c3fa97901
diff --git a/metadata/md5-cache/dev-libs/icu-63.1-r1 b/metadata/md5-cache/dev-libs/icu-63.1-r1
index 127b1ef60335..9c69250e4737 100644
--- a/metadata/md5-cache/dev-libs/icu-63.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-63.1-r1
@@ -5,9 +5,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/63.1
 SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=60c686b0af7278a0d49ab57ea6cbb1f4
+_md5_=2fa2b95cf15154fdb7f01f6cd96162c0
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-62.1 b/metadata/md5-cache/dev-libs/icu-layoutex-62.1
deleted file mode 100644
index 9c7d90e2d576..000000000000
--- a/metadata/md5-cache/dev-libs/icu-layoutex-62.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-libs/icu-62.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/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,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-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=External layout part of International Components for Unicode
-EAPI=6
-HOMEPAGE=http://www.icu-project.org/
-IUSE=debug 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=~dev-libs/icu-62.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/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,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/62.1
-SRC_URI=http://download.icu-project.org/files/icu4c/62.1/icu4c-62_1-src.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c254675cc32c6d2be9bfc11f05cee53e
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-63.1 b/metadata/md5-cache/dev-libs/icu-layoutex-63.1
index 3641b896585e..b05a4fc4f8a8 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-63.1
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-63.1
@@ -5,10 +5,10 @@ DESCRIPTION=External layout part of International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug 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 hppa ~ia64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-63.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/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,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/63.1
 SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=eaaa31539cb87d109a6c91ecddcd443d
+_md5_=ea4244b901888c619b806eef335db43e
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1 b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
index 753f95c6006f..31c35c16fe16 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.3.tar.gz -> ivykis-0.42.3.tar.gz
-_md5_=7e13b1efbdf79c37c586eb41ac37eaee
+_md5_=86a29f7e2f33596de9445e84812ecc93
diff --git a/metadata/md5-cache/dev-libs/jansson-2.11 b/metadata/md5-cache/dev-libs/jansson-2.11
index a86fee9ebc1d..a14b6f76ad03 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.11
+++ b/metadata/md5-cache/dev-libs/jansson-2.11
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=6
 HOMEPAGE=http://www.digip.org/jansson/
 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 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://www.digip.org/jansson/releases/jansson-2.11.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=18e3d266ae23ffe17b18a6a64d51e42b
+_md5_=091d1e6cc8b59b8e564ed79c2c0aea92
diff --git a/metadata/md5-cache/dev-libs/jansson-2.12 b/metadata/md5-cache/dev-libs/jansson-2.12
new file mode 100644
index 000000000000..1ec6a52c8bab
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jansson-2.12
@@ -0,0 +1,12 @@
+BDEPEND=doc? ( >=dev-python/sphinx-1.0.4 )
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=C library for encoding, decoding and manipulating JSON data
+EAPI=7
+HOMEPAGE=http://www.digip.org/jansson/
+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 ~amd64-fbsd
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.digip.org/jansson/releases/jansson-2.12.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=dc416f78cf9caa01f29d412b16cc8e4a
diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0
index e22d8532eda5..12e72197f3da 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.2.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.2.0/src/kasync-0.2.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=82624b9e928c29220ad8738c147c1973
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.1 b/metadata/md5-cache/dev-libs/kdiagram-2.6.1
index 273a7a917502..70d9b3ea3c06 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.1
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-
 REQUIRED_USE=test? ( examples )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.1/kdiagram-2.6.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=388ef3e3915e27dc258da749bb334c3b
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.1.0 b/metadata/md5-cache/dev-libs/kproperty-3.1.0
index ab802ff8d8a9..094fca5dcfe6 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.1.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6f9623d6404f02769ee4f8b5e67e861d
diff --git a/metadata/md5-cache/dev-libs/kreport-3.1.0 b/metadata/md5-cache/dev-libs/kreport-3.1.0
index 732507db37f1..f2530b4ab17c 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.1.0
+++ b/metadata/md5-cache/dev-libs/kreport-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65681b5946185d651f2744c1f610c5c2
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.4.4 b/metadata/md5-cache/dev-libs/leatherman-1.4.4
deleted file mode 100644
index 3bd34d617287..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.4.4
+++ /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.9.6
-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/1.4.4
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.4.4.tar.gz -> leatherman-1.4.4.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c02fe143683c0c3f2e4585ca060cc6c7
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.2 b/metadata/md5-cache/dev-libs/leatherman-1.5.2
deleted file mode 100644
index 9c7f6326565e..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.5.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.9.6
-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/1.5.2
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.2.tar.gz -> leatherman-1.5.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c02fe143683c0c3f2e4585ca060cc6c7
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.3 b/metadata/md5-cache/dev-libs/leatherman-1.5.3
deleted file mode 100644
index 03f6c0632a5e..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.5.3
+++ /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.9.6
-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/1.5.3
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.3.tar.gz -> leatherman-1.5.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c02fe143683c0c3f2e4585ca060cc6c7
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.5.4 b/metadata/md5-cache/dev-libs/leatherman-1.5.4
index 511b876c6dbc..7e5108d73b22 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.5.4
+++ b/metadata/md5-cache/dev-libs/leatherman-1.5.4
@@ -4,10 +4,10 @@ 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
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 SLOT=0/1.5.4
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.5.4.tar.gz -> leatherman-1.5.4.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aa656fff1548aabbe7783b154a2f6bb3
+_md5_=3084cc0627123365db2c883337ddec3a
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.3.0 b/metadata/md5-cache/dev-libs/libarcus-3.3.0
deleted file mode 100644
index ce76c7194c36..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( 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=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.3.0.tar.gz -> libarcus-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fde8e01f716b04dcd32ce9dda1599452
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.5.1 b/metadata/md5-cache/dev-libs/libarcus-3.5.1
deleted file mode 100644
index a97c4d04c522..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( 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=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.5.1.tar.gz -> libarcus-3.5.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe41b325b4b161a06275a2a3ab472e3d
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.6.0 b/metadata/md5-cache/dev-libs/libarcus-3.6.0
new file mode 100644
index 000000000000..889282577e1e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libarcus-3.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/libArcus
+IUSE=examples python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( ^^ ( 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=0/3
+SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.6.0.tar.gz -> libarcus-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fe41b325b4b161a06275a2a3ab472e3d
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
index 3f278d2e7c3f..f2ff3ddde918 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
@@ -4,10 +4,10 @@ DESCRIPTION=an advanced CDDA reader with error correction
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 IUSE=+cxx 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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?]
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77ef6d9e23482b99b0289ba8d66d4745
+_md5_=88aaa330bafc0e1eb69b407cfac30f0b
diff --git a/metadata/md5-cache/dev-libs/libcec-3.1.0-r1 b/metadata/md5-cache/dev-libs/libcec-3.1.0-r1
deleted file mode 100644
index e47209165c46..000000000000
--- a/metadata/md5-cache/dev-libs/libcec-3.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
-EAPI=6
-HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-3.1.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8667b1b1ca9a50fc95f17ef0db693b80
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2 b/metadata/md5-cache/dev-libs/libcec-4.0.2
deleted file mode 100644
index fc5bc699f815..000000000000
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
-EAPI=6
-HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=992a2b154c44c43e4bf2f1e82b144eea
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
deleted file mode 100644
index 2ab5aa169667..000000000000
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
-EAPI=6
-HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3b0ea7f1b580473a169e32e5660cabda
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.4 b/metadata/md5-cache/dev-libs/libcec-4.0.4
new file mode 100644
index 000000000000..44027e0984a8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
+EAPI=6
+HOMEPAGE=http://libcec.pulse-eight.com
+IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=83ee33119cea41d6222295ee337004a5
diff --git a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5 b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
index 70c911c13822..8d560674d62f 100644
--- a/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
+++ b/metadata/md5-cache/dev-libs/libcgroup-0.41-r5
@@ -3,7 +3,7 @@ DEPEND=pam? ( virtual/pam ) sys-devel/bison sys-devel/flex elibc_musl? ( sys-lib
 DESCRIPTION=Tools and libraries to configure and manage kernel control groups
 EAPI=6
 HOMEPAGE=http://libcg.sourceforge.net/
-IUSE=+daemon elibc_musl pam static-libs +tools kernel_linux
+IUSE=+daemon elibc_musl pam static-libs test +tools kernel_linux
 KEYWORDS=amd64 arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=pam? ( virtual/pam )
@@ -11,4 +11,4 @@ REQUIRED_USE=daemon? ( tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libcg/libcgroup/v0.41/libcgroup-0.41.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20fbc1218a447f399d7d6593e50e934b
+_md5_=36f56bf67605457ee0d99e9fe9ec85d7
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.3.0 b/metadata/md5-cache/dev-libs/libcharon-3.3.0
deleted file mode 100644
index f3f9e36ba81c..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-3.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.3.0.tar.gz -> libcharon-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a1086ba28c4444e99104664fd860df14
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.5.1 b/metadata/md5-cache/dev-libs/libcharon-3.5.1
deleted file mode 100644
index 08f055eb97cb..000000000000
--- a/metadata/md5-cache/dev-libs/libcharon-3.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.5.1.tar.gz -> libcharon-3.5.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=170eb5925e70086be0f616032aa5289d
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.6.0 b/metadata/md5-cache/dev-libs/libcharon-3.6.0
new file mode 100644
index 000000000000..172841ca5d91
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcharon-3.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/libCharon
+IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=0/3
+SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.6.0.tar.gz -> libcharon-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=170eb5925e70086be0f616032aa5289d
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.30.2 b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
index a266126f021f..43c888e05ad2 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.30.2
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.30.2
@@ -4,7 +4,7 @@ DESCRIPTION=Experimental new features for GTK+ and GLib
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
 IUSE=gtk-doc +introspection test vala test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.30/libdazzle-3.30.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aed87e02cfcf2728f7c952160e236018
+_md5_=7fa3eaac8261e8151427cbf02c3083a3
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.11 b/metadata/md5-cache/dev-libs/libestr-0.1.11
index 28ffcc2f7dd8..a67e91ed852c 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.11
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.11
@@ -4,9 +4,9 @@ DESCRIPTION=Library for some string essentials
 EAPI=7
 HOMEPAGE=http://libestr.adiscon.com/
 IUSE=debug static-libs test
-KEYWORDS=amd64 ~arm ~arm64 hppa x86
+KEYWORDS=amd64 arm ~arm64 hppa x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=16473e2209161295d4f278c16d0a9488
+_md5_=e1ab4be7e8a850e0913578709e249bc6
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3_rc0 b/metadata/md5-cache/dev-libs/libffi-3.3_rc0
index 3690084f2954..c83e7e32a43d 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3_rc0
+++ b/metadata/md5-cache/dev-libs/libffi-3.3_rc0
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=de52a381e40f672bd8740b7c1b7805da
+_md5_=bb021da9abb71886ece60f35b9229d10
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.3 b/metadata/md5-cache/dev-libs/libical-3.0.3
deleted file mode 100644
index 81b5580089b0..000000000000
--- a/metadata/md5-cache/dev-libs/libical-3.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An implementation of basic iCAL protocols
-EAPI=6
-HOMEPAGE=https://github.com/libical/libical
-IUSE=berkdb doc examples static-libs test
-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-2.0 LGPL-2.1 )
-RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
-SLOT=0/3
-SRC_URI=https://github.com/libical/libical/archive/v3.0.3.tar.gz -> libical-3.0.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3b9246f9dae67b3fa9e1e288e2344363
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.4 b/metadata/md5-cache/dev-libs/libical-3.0.4
new file mode 100644
index 000000000000..4b1d1a4c1459
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libical-3.0.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= )
+DESCRIPTION=An implementation of basic iCAL protocols
+EAPI=7
+HOMEPAGE=https://github.com/libical/libical
+IUSE=berkdb doc examples static-libs test
+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-2.0 LGPL-2.1 )
+RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
+SLOT=0/3
+SRC_URI=https://github.com/libical/libical/releases/download/v3.0.4/libical-3.0.4.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d6ccf3db20307a9533384497d0cec909
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.3 b/metadata/md5-cache/dev-libs/libinput-1.12.3
deleted file mode 100644
index e274ed4cc24c..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/commonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/recommonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/commonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/recommonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.45.1 >=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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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:= virtual/udev
-RESTRICT=test
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.3.tar.xz
-_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=3a26cd64c5276304180e1aef429a029a
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.5 b/metadata/md5-cache/dev-libs/libinput-1.12.5
new file mode 100644
index 000000000000..997509713471
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/commonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/recommonmark[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/commonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/recommonmark[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 )
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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:= virtual/udev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.5.tar.xz
+_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=0a16b349f26c5bd8b273853d76e48644
diff --git a/metadata/md5-cache/dev-libs/liblognorm-2.0.6 b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
index f6b3c644ad63..244c5bfaf709 100644
--- a/metadata/md5-cache/dev-libs/liblognorm-2.0.6
+++ b/metadata/md5-cache/dev-libs/liblognorm-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Fast samples-based log normalization library
 EAPI=6
 HOMEPAGE=http://www.liblognorm.com
 IUSE=debug doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 hppa x86 ~amd64-linux
+KEYWORDS=amd64 arm ~arm64 hppa x86 ~amd64-linux
 LICENSE=LGPL-2.1 Apache-2.0
 RDEPEND=>=dev-libs/libestr-0.1.3 >=dev-libs/libfastjson-0.99.2:=
 SLOT=0/5.1.0
 SRC_URI=http://www.liblognorm.com/files/download/liblognorm-2.0.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=dceab138177b3b1a27ad89416948ec96
+_md5_=798f85d23a568b2f0c96f624826afdca
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1 b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
index 1f7a294a762f..44ee4d7a69a5 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
+++ b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A library for Microsoft compression formats
 EAPI=7
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
 IUSE=debug 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 hppa ia64 ppc ppc64 sparc x86 ~x64-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.9.1alpha.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f2381a61bfa5917d4ab0d8817f70f625
+_md5_=24feafb364a145b96d99f4e46c9a2b96
diff --git a/metadata/md5-cache/dev-libs/libpipeline-1.5.0 b/metadata/md5-cache/dev-libs/libpipeline-1.5.0
index fd2c81f576ea..6541be10e451 100644
--- a/metadata/md5-cache/dev-libs/libpipeline-1.5.0
+++ b/metadata/md5-cache/dev-libs/libpipeline-1.5.0
@@ -4,9 +4,9 @@ DESCRIPTION=a pipeline manipulation library
 EAPI=6
 HOMEPAGE=http://libpipeline.nongnu.org/
 IUSE=static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://nongnu/libpipeline/libpipeline-1.5.0.tar.gz
 _eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4a0ef7ba0db05e0ad9f8200b5f176795
+_md5_=e672f8eb297bcbd2e67241b21cfb9957
diff --git a/metadata/md5-cache/dev-libs/librdkafka-0.11.6 b/metadata/md5-cache/dev-libs/librdkafka-0.11.6
index c8721c48fba0..331477da757a 100644
--- a/metadata/md5-cache/dev-libs/librdkafka-0.11.6
+++ b/metadata/md5-cache/dev-libs/librdkafka-0.11.6
@@ -4,10 +4,10 @@ DESCRIPTION=Apache Kafka C/C++ client library
 EAPI=7
 HOMEPAGE=https://github.com/edenhill/librdkafka
 IUSE=lz4 sasl ssl static-libs
-KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc x86
+KEYWORDS=amd64 arm ~arm64 hppa ~ppc x86
 LICENSE=BSD-2
 RDEPEND=lz4? ( app-arch/lz4:=[static-libs(-)?] ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) sys-libs/zlib
 SLOT=0/1
 SRC_URI=https://github.com/edenhill/librdkafka/archive/v0.11.6.tar.gz -> librdkafka-0.11.6.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a4973518ae98a822555e783e71211582
+_md5_=d431c1e818a691eb36bf7ce0094a6145
diff --git a/metadata/md5-cache/dev-libs/librelp-1.3.0 b/metadata/md5-cache/dev-libs/librelp-1.3.0
index bb61d666ed65..f27771b2e19d 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.3.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=http://www.librelp.com/
 IUSE=debug doc +ssl +gnutls libressl openssl static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~sparc x86
 LICENSE=GPL-3+ doc? ( FDL-1.3 )
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 REQUIRED_USE=ssl? ( ^^ ( gnutls openssl ) ) gnutls? ( ssl ) openssl? ( ssl ) libressl? ( openssl )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=http://download.rsyslog.com/librelp/librelp-1.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6cd913993538583f95ffb394c0f3047b
+_md5_=a5cbd95417e171d3ce4f72cd20d81be6
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1 b/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1
deleted file mode 100644
index 98c1c90e14fa..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-3.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( 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=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.3.0.tar.gz -> libsavitar-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b90a0aef7b1e1ec2d7d01518ac9a1577
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.5.1 b/metadata/md5-cache/dev-libs/libsavitar-3.5.1
deleted file mode 100644
index 96d163cf746f..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( 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=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.5.1.tar.gz -> libsavitar-3.5.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cf061c475cd1b5e3be374d51233cf836
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.6.0 b/metadata/md5-cache/dev-libs/libsavitar-3.6.0
new file mode 100644
index 000000000000..60fa5f558061
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsavitar-3.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/libSavitar
+IUSE=+python static-libs python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/pugixml dev-python/sip[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=python? ( ^^ ( 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=0/3
+SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.6.0.tar.gz -> libsavitar-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cf061c475cd1b5e3be374d51233cf836
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928
new file mode 100644
index 000000000000..854270557b4c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=gmp? ( dev-libs/gmp:0= ) virtual/pkgconfig java? ( virtual/jdk ) test_openssl? ( dev-libs/openssl:0 )
+DESCRIPTION=Optimized C library for EC operations on curve secp256k1
+EAPI=7
+HOMEPAGE=https://github.com/bitcoin-core/secp256k1
+IUSE=+asm ecdh endomorphism experimental gmp java +recovery test test_openssl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=gmp? ( dev-libs/gmp:0= )
+REQUIRED_USE=asm? ( || ( amd64 arm ) arm? ( experimental ) ) ecdh? ( experimental ) java? ( ecdh ) test_openssl? ( test )
+SLOT=0
+SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/7a78f60598a6aeb635ef227ead50fb44a209c363.tar.gz -> libsecp256k1-v0.1_pre20170928.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6e8741694e7700321124ef164cae1db6
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.17 b/metadata/md5-cache/dev-libs/libsodium-1.0.17
new file mode 100644
index 000000000000..b56fe8cdcc2b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.17
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
+EAPI=7
+HOMEPAGE=https://github.com/jedisct1/libsodium
+IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes abi_x86_32 abi_x86_64 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 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=ISC
+SLOT=0/23
+SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.17.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5f36595fb08d1354ff01159679b78892
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10 b/metadata/md5-cache/dev-libs/libunistring-0.9.10
index 9e19bd5814f0..b16c9205e601 100644
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.10
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10
@@ -4,9 +4,9 @@ DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 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 ~x64-cygwin ~amd64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3 GPL-3
 SLOT=0/2
 SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfed2c71ee03688298ef5b58e30fb4ee
+_md5_=0b49fbbd145fd2ca0a62a2a2ca21171a
diff --git a/metadata/md5-cache/dev-libs/libvarlink-16 b/metadata/md5-cache/dev-libs/libvarlink-16
new file mode 100644
index 000000000000..4088c549ce66
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libvarlink-16
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=C implementation of the Varlink protocol and command line tool
+EAPI=7
+HOMEPAGE=https://github.com/varlink/libvarlink
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/varlink/libvarlink/archive/16.tar.gz -> libvarlink-16.tar.gz
+_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=34baba02f809adce677a03829d3bf935
diff --git a/metadata/md5-cache/dev-libs/libverto-0.2.5-r1 b/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
index 33cfd82192e2..4172f168a18e 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Main event loop abstraction library
 EAPI=5
 HOMEPAGE=https://github.com/latchset/libverto/
 IUSE=glib +libev libevent tevent +threads static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-crypt/mit-krb5-1.10.1-r2 glib? ( >=dev-libs/glib-2.34.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(-)?] ) libev? ( >=dev-libs/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libevent? ( >=dev-libs/libevent-2.0.21[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tevent? ( >=sys-libs/tevent-0.9.19[abi_x86_32(-)?,abi_x86_64(-)?,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=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://github.com/latchset/libverto/releases/download/0.2.5/libverto-0.2.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21e57737e062fc56f5aeb74ec04358b2
+_md5_=31bea2b4396aacf784c5b17867ec97ce
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.8 b/metadata/md5-cache/dev-libs/libxml2-2.9.8
index db0020d23ad3..2a8bf70e41ab 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.8
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.8
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 py
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33b5dc468fb71530aa3fd2d7b46c9e13
+_md5_=bca25b1ba3416ca4cd109f85a2b13e9a
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.8-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.8-r1
new file mode 100644
index 000000000000..2336a1e4f474
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.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(-)?] ) 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(-)?] ) python? ( 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] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=XML C parser and toolkit
+EAPI=6
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.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(-)?] ) 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(-)?] ) python? ( 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] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=421ad9d6afbcbe6810e56abd00280f97
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.4 b/metadata/md5-cache/dev-libs/libxmlb-0.1.4
deleted file mode 100644
index 57ab2c2dca1a..000000000000
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.47.0 dev-util/ninja virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer ) doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection )
-DESCRIPTION=Library to help create and query binary XML blobs
-EAPI=7
-HOMEPAGE=https://github.com/hughsie/libxmlb
-IUSE=doc introspection stemmer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
-SLOT=0
-SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.4.tar.gz -> libxmlb-0.1.4.tar.gz
-_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3a231e03d558e1d5a03043491cdd01ba
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.6 b/metadata/md5-cache/dev-libs/libxmlb-0.1.6
new file mode 100644
index 000000000000..df5421da5f43
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer ) doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection )
+DESCRIPTION=Library to help create and query binary XML blobs
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libxmlb
+IUSE=doc introspection stemmer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
+SLOT=0
+SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.6.tar.gz -> libxmlb-0.1.6.tar.gz
+_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=24372eb11603f87f7e9a3a59cd8ab2a1
diff --git a/metadata/md5-cache/dev-libs/nspr-4.20 b/metadata/md5-cache/dev-libs/nspr-4.20
index c91b865a72f9..bc5180d381d2 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.20
+++ b/metadata/md5-cache/dev-libs/nspr-4.20
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.20/src/nspr-4.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5766d320776c279c3086b9bff3de6f6b
+_md5_=0bf513dec4884b6363eb52804feae9e1
diff --git a/metadata/md5-cache/dev-libs/nss-3.40.1 b/metadata/md5-cache/dev-libs/nss-3.40.1
index 1229c98531a5..cca05c4f55aa 100644
--- a/metadata/md5-cache/dev-libs/nss-3.40.1
+++ b/metadata/md5-cache/dev-libs/nss-3.40.1
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.16[abi_x86_32(-)?,abi_x86_64(-)?,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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_40_1_RTM/src/nss-3.40.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5b45e0ea39537bc85e933e1ccb93b409
+_md5_=5b6081565cc5a6485f5445ac33a30b6b
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.0 b/metadata/md5-cache/dev-libs/oniguruma-6.9.0
index 0694a19cc958..f25a6cd643db 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.0
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.0
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=7
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=crnl-as-line-terminator 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.0/onig-6.9.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=74feff72411b65ce7b5648eb55db4768
+_md5_=d9bad01e2f08ca7397a35a75ab25c22b
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2p-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.2p-r1
deleted file mode 100644
index c4fd8994c677..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2p-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
-DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=6
-HOMEPAGE=https://www.openssl.org/
-IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=mirror://openssl/source/openssl-1.0.2p.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.6.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.6.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.6.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.6.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2p_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2p_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2p_ectest.c )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3284ff7ee6fffb6fc1211d91c96667f4
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2q b/metadata/md5-cache/dev-libs/openssl-1.0.2q
index 5b2f259709f5..8d587dbf424c 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2q
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2q
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=6
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2q.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2q_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2q_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2q_ectest.c )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d748347cf87bb228e95dc6945915a0f6
+_md5_=397a50fc3781b22e8ca02e042baf699c
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2q-r200 b/metadata/md5-cache/dev-libs/openssl-1.0.2q-r200
new file mode 100644
index 000000000000..fe08c78b0e57
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2q-r200
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) !=dev-libs/openssl-1.0.2*:0 >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=6
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) !=dev-libs/openssl-1.0.2*:0
+RESTRICT=test
+SLOT=1.0.0
+SRC_URI=mirror://openssl/source/openssl-1.0.2q.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2q_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2q_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2q_ectest.c )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9f5d5f2d59872a2f4c47b9c2e5e2e596
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1a-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1a-r1
new file mode 100644
index 000000000000..e42dc508884e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1a-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=6
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1a.tar.gz bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f29 -> openssl-1.1.1a_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f29 -> openssl-1.1.1a_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f29 -> openssl-1.1.1a_ectest.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//openssl-1.1.1-ec-curves.patch?h=f29 -> openssl-1.1.1-ec-curves.patch )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=63b93807d19aa8e2393b001a8f32ec25
diff --git a/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1 b/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1
index 717544207052..1d8d001555a2 100644
--- a/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1
+++ b/metadata/md5-cache/dev-libs/pkcs11-helper-1.25.1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.4.7 )
 DEFINED_PHASES=configure install
-DEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:=[bindist=] ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
+DEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:0=[bindist=] ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
 DESCRIPTION=PKCS#11 helper library
 EAPI=7
 HOMEPAGE=https://github.com/OpenSC/pkcs11-helper
 IUSE=bindist doc gnutls libressl nss static-libs
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:=[bindist=] ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
+RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.7:0=[bindist=] ) libressl? ( dev-libs/libressl ) gnutls? ( >=net-libs/gnutls-1.4.4 ) nss? ( dev-libs/nss )
 SLOT=0
 SRC_URI=https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-1.25.1/pkcs11-helper-1.25.1.tar.bz2
-_md5_=e3f9c9255a195b2154762023d32c213c
+_md5_=2d6b961ec116ff8e9bcee7bb2cc9b191
diff --git a/metadata/md5-cache/dev-libs/poco-1.4.6_p4 b/metadata/md5-cache/dev-libs/poco-1.4.6_p4
index 82272601b244..970092168758 100644
--- a/metadata/md5-cache/dev-libs/poco-1.4.6_p4
+++ b/metadata/md5-cache/dev-libs/poco-1.4.6_p4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl:0= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=C++ libraries for building network-based applications
 EAPI=5
 HOMEPAGE=https://pocoproject.org/
 IUSE=doc examples iodbc mysql odbc sqlite ssl test
 KEYWORDS=amd64 arm x86
 LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl:0= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://pocoproject.org/releases/poco-1.4.6/poco-1.4.6p4-all.tar.bz2 doc? ( mirror://sourceforge/poco/poco-1.4.6-all-doc.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3a437a235a517c062c3641ec0c4c7ac4
+_md5_=14ef494cc9077f5a8fce1805c40736be
diff --git a/metadata/md5-cache/dev-libs/poco-1.4.6_p4-r1 b/metadata/md5-cache/dev-libs/poco-1.4.6_p4-r1
index 35da5cca6630..bb011f5a52b4 100644
--- a/metadata/md5-cache/dev-libs/poco-1.4.6_p4-r1
+++ b/metadata/md5-cache/dev-libs/poco-1.4.6_p4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=C++ libraries for building network-based applications
 EAPI=5
 HOMEPAGE=https://pocoproject.org/
 IUSE=doc examples iodbc libressl mysql odbc sqlite ssl test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=>=dev-libs/libpcre-8.13 dev-libs/expat sys-libs/zlib mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://pocoproject.org/releases/poco-1.4.6/poco-1.4.6p4-all.tar.bz2 doc? ( mirror://sourceforge/poco/poco-1.4.6-all-doc.zip )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b966916c2fa45c0623a0d3eb960ba858
+_md5_=af6a4d3d073f4af4b58121c200fa2c73
diff --git a/metadata/md5-cache/dev-libs/poco-1.7.6 b/metadata/md5-cache/dev-libs/poco-1.7.6
index 50f0aa1657c4..0cf938be47d9 100644
--- a/metadata/md5-cache/dev-libs/poco-1.7.6
+++ b/metadata/md5-cache/dev-libs/poco-1.7.6
@@ -6,9 +6,9 @@ HOMEPAGE=https://pocoproject.org/
 IUSE=7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0 ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 ) zip? ( sys-libs/zlib )
+RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 ) zip? ( sys-libs/zlib )
 REQUIRED_USE=7z? ( xml ) apache? ( net util ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) test? ( data? ( sqlite ) json util xml )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.7.6-release.tar.gz -> poco-1.7.6.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dff36f10e3c054e9cb668fa83cc8bef8
+_md5_=45213639b583d7002f324fe600d81232
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0 b/metadata/md5-cache/dev-libs/poco-1.9.0
index f1064eec2eb2..9ccc250cd023 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://pocoproject.org/
 IUSE=7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Boost-1.0
-RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0 ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 ) zip? ( sys-libs/zlib )
+RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( virtual/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( <dev-libs/openssl-1.1.0:0= ) libressl? ( dev-libs/libressl ) ) sqlite? ( dev-db/sqlite:3 ) zip? ( sys-libs/zlib )
 REQUIRED_USE=7z? ( xml ) apache? ( net util ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mongodb? ( data ) mysql? ( data ) odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) sqlite? ( data ) test? ( data? ( sqlite ) json util xml )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dff36f10e3c054e9cb668fa83cc8bef8
+_md5_=45213639b583d7002f324fe600d81232
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
new file mode 100644
index 000000000000..a0d9376b8356
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Protocol Buffers implementation in C
+EAPI=7
+HOMEPAGE=https://github.com/protobuf-c/protobuf-c
+IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/1.0.0
+SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.1/protobuf-c-1.3.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=66a27268b2a1751f9baec47299588b99
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.9-r1 b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
new file mode 100644
index 000000000000..68e88e75aec4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
+EAPI=7
+HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.9/pugixml-1.9.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ce45d4b65a29d8186d440880b94325c0
diff --git a/metadata/md5-cache/dev-libs/pugixml-9999 b/metadata/md5-cache/dev-libs/pugixml-9999
new file mode 100644
index 000000000000..7507689da9bf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pugixml-9999
@@ -0,0 +1,9 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
+EAPI=7
+HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
+LICENSE=MIT
+SLOT=0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3874bb8f4f129da274260e1655042610
diff --git a/metadata/md5-cache/dev-libs/re2-0.2018.10.01 b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
index 6459262dd6a1..0f8d0f098374 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2018.10.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2018.10.01
@@ -5,10 +5,10 @@ DESCRIPTION=An efficient, principled regular expression library
 EAPI=7
 HOMEPAGE=https://github.com/google/re2
 IUSE=icu abi_x86_32 abi_x86_64 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 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 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(-)?] )
 SLOT=0/gentoo-2017-03-01
 SRC_URI=https://github.com/google/re2/archive/2018-10-01.tar.gz -> re2-2018-10-01.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=eb853d44bc08b5ad16c8462e2ffe7f75
+_md5_=46249f4e14695701596e623b7fe1d749
diff --git a/metadata/md5-cache/dev-libs/sink-0.7.0 b/metadata/md5-cache/dev-libs/sink-0.7.0
index 353a76cc592e..bbac4f54dd32 100644
--- a/metadata/md5-cache/dev-libs/sink-0.7.0
+++ b/metadata/md5-cache/dev-libs/sink-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=https://github.com/KDE/sink/archive/v0.7.0.tar.gz -> sink-0.7.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61d2e4625c96eedb70450e819baf066a
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index baa97d854504..0cfe6f781810 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -3,9 +3,9 @@ DESCRIPTION=All you need to include the snowball stemming algorithms into a C pr
 EAPI=5
 HOMEPAGE=https://snowballstem.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aead0c6c0ca30d9be5f7794f0ed37849
+_md5_=cae01ad1084e00699fe1eba4913890cf
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.4.0 b/metadata/md5-cache/dev-libs/softhsm-2.4.0
index 93fdaa5582c9..325c60aa1c37 100644
--- a/metadata/md5-cache/dev-libs/softhsm-2.4.0
+++ b/metadata/md5-cache/dev-libs/softhsm-2.4.0
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-devel/gcc:=[cxx] test? ( dev-util/cppunit )
 DEFINED_PHASES=configure install
-DEPEND=migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !~dev-libs/softhsm-2.0.0:0
+DEPEND=migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl ) !~dev-libs/softhsm-2.0.0:0
 DESCRIPTION=A software PKCS#11 implementation
 EAPI=7
 HOMEPAGE=https://www.opendnssec.org/
-IUSE=bindist libressl migration-tool test
+IUSE=bindist gost libressl migration-tool test
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl ) !~dev-libs/softhsm-2.0.0:0
+RDEPEND=migration-tool? ( dev-db/sqlite:3 ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl ) !~dev-libs/softhsm-2.0.0:0
 SLOT=2
 SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.4.0.tar.gz
-_md5_=caa516e55604096510dba72cab3c45ec
+_md5_=978164ec27434f623e16a743bb36c956
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.5.0 b/metadata/md5-cache/dev-libs/softhsm-2.5.0
index 7e4b55e831b9..54f74682caeb 100644
--- a/metadata/md5-cache/dev-libs/softhsm-2.5.0
+++ b/metadata/md5-cache/dev-libs/softhsm-2.5.0
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig sys-devel/gcc:=[cxx] test? ( dev-util/cppunit )
 DEFINED_PHASES=configure install
-DEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
+DEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
 DESCRIPTION=A software PKCS#11 implementation
 EAPI=7
 HOMEPAGE=https://www.opendnssec.org/
-IUSE=bindist libressl migration-tool test
+IUSE=bindist gost libressl migration-tool test
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
+RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
 SLOT=2
 SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.5.0.tar.gz
-_md5_=7d6538f059d134fa26ebe42adf7afc19
+_md5_=f857a2cc6cfe6eaf48803ef710b96173
diff --git a/metadata/md5-cache/dev-libs/stb-20180211 b/metadata/md5-cache/dev-libs/stb-20180211
new file mode 100644
index 000000000000..0dd8087ef211
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/stb-20180211
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=single-file public domain (or MIT licensed) libraries for C/C++
+EAPI=7
+HOMEPAGE=https://github.com/nothings/stb
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Unlicense )
+SLOT=0
+SRC_URI=https://github.com/nothings/stb/archive/e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz -> stb-20180211.tar.gz
+_md5_=f757f7fdf0ceced97f2cd21c8a893fd3
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.2.1 b/metadata/md5-cache/dev-libs/tntnet-2.2.1
index e9fe8d754079..b7664f6c7e8a 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.2.1
+++ b/metadata/md5-cache/dev-libs/tntnet-2.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:* ) ) virtual/pkgconfig app-arch/zip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) ) virtual/pkgconfig app-arch/zip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Modular, multithreaded web application server extensible with C++
 EAPI=5
 HOMEPAGE=http://www.tntnet.org/
 IUSE=doc gnutls server ssl examples
 KEYWORDS=amd64 ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:* ) )
+RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt:0 ) !gnutls? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=http://www.tntnet.org/download/tntnet-2.2.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e12bf9e902ece39b75572d6b70c41100
+_md5_=84d2bc5265cc0a2d468d32b2ded8e887
diff --git a/metadata/md5-cache/dev-libs/univalue-1.0.4 b/metadata/md5-cache/dev-libs/univalue-1.0.4
index 9dd3a2b96cea..7897d8c0e59d 100644
--- a/metadata/md5-cache/dev-libs/univalue-1.0.4
+++ b/metadata/md5-cache/dev-libs/univalue-1.0.4
@@ -3,9 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=C++ universal value object and JSON library
 EAPI=7
 HOMEPAGE=https://github.com/jgarzik/univalue
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0/0
 SRC_URI=https://codeload.github.com/jgarzik/univalue/tar.gz/v1.0.4 -> univalue-1.0.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=39d69bbce39eae00244118c77ce41674
+_md5_=52a122771aa05b77e148ae47039a8b77
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.1 b/metadata/md5-cache/dev-libs/uriparser-0.9.1
new file mode 100644
index 000000000000..d75c03e927fa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt5? ( dev-qt/qthelp:5 ) ) test? ( >=dev-cpp/gtest-1.8.1 )
+DESCRIPTION=Uriparser is a strictly RFC 3986 compliant URI parsing library in C
+EAPI=7
+HOMEPAGE=https://uriparser.github.io/
+IUSE=doc qt5 test unicode
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+REQUIRED_USE=test? ( unicode )
+SLOT=0
+SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.1/uriparser-0.9.1.tar.bz2
+_md5_=9cb273936fed8394acea5fca5a3f1dbc
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.17 b/metadata/md5-cache/dev-libs/vala-common-0.36.17
new file mode 100644
index 000000000000..5b988994cede
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1
+RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.17.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c9f2eededf8a56fea2a20436151405bd
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.24 b/metadata/md5-cache/dev-libs/xapian-1.2.24
index 283c6f9bddf8..131165f86e3b 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.24
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.24
@@ -4,10 +4,10 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.24/xapian-core-1.2.24.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7056aba651b04b17e2c1a9aae689c62b
+_md5_=afed4051098809f0e236c283466c644b
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.25 b/metadata/md5-cache/dev-libs/xapian-1.2.25
index 074da8b9e024..060d398bec81 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.25
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.25
@@ -4,10 +4,10 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.25/xapian-core-1.2.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e90194c3e35a668c494973be414b9c9
+_md5_=a848d234a9bd96c05b5fa52f811db4e6
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.4 b/metadata/md5-cache/dev-libs/xapian-1.4.4
index 2d5fb4466d48..1410f0abeb06 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.4
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.4/xapian-core-1.4.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=085b22a389e5a5bf5c4638008dec0365
+_md5_=9c234e65380d69aaef299a22aa842daf
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.5 b/metadata/md5-cache/dev-libs/xapian-1.4.5
index 36f76fef581e..dacb822242b2 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.5
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.5
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.5/xapian-core-1.4.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=17f769e96c7baa1f99fba49b61a6f239
+_md5_=1646498b4158be77cf12e4136d79b5aa
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.6 b/metadata/md5-cache/dev-libs/xapian-1.4.6
index 8dcc325c60e8..5a7157d24543 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.6
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.6/xapian-core-1.4.6.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0679a5a5a1c494e804aaac09228195aa
+_md5_=34853210b90de55cebd80baf9a304e25
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.7 b/metadata/md5-cache/dev-libs/xapian-1.4.7
index 46f0203dc682..76dd0834d573 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.7
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.7
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.7/xapian-core-1.4.7.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85482d214058526e88ce44cc3c20a49a
+_md5_=300520dc224169b5bead99ec10288c80
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.8 b/metadata/md5-cache/dev-libs/xapian-1.4.8
index 99e6b80c5798..dcb0834462b0 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.8
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.8/xapian-core-1.4.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3801a49407a7e5013b5168435d55d2d0
+_md5_=34853210b90de55cebd80baf9a304e25
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.9 b/metadata/md5-cache/dev-libs/xapian-1.4.9
index ba0651f279ff..da9d698501cd 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.9
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.9
@@ -4,11 +4,11 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=6
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 REQUIRED_USE=inmemory? ( chert )
 SLOT=0/30
 SRC_URI=http://oligarchy.co.uk/xapian/1.4.9/xapian-core-1.4.9.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3801a49407a7e5013b5168435d55d2d0
+_md5_=34853210b90de55cebd80baf9a304e25
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
new file mode 100644
index 000000000000..37183f6ec1cd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv doc? ( app-doc/doxygen ) test? ( dev-lang/perl ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=A validating XML parser written in a portable subset of C++
+EAPI=6
+HOMEPAGE=https://xerces.apache.org/xerces-c/
+IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
+SLOT=0
+SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aa366962b602aebbadbaaf7cf0785774
diff --git a/metadata/md5-cache/dev-libs/xxhash-0.6.5 b/metadata/md5-cache/dev-libs/xxhash-0.6.5
index afef7ee8eb79..7958ba87b0aa 100644
--- a/metadata/md5-cache/dev-libs/xxhash-0.6.5
+++ b/metadata/md5-cache/dev-libs/xxhash-0.6.5
@@ -3,9 +3,9 @@ DESCRIPTION=Extremely fast non-cryptographic hash algorithm
 EAPI=6
 HOMEPAGE=http://www.xxhash.com
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x64-macos
 LICENSE=BSD-2 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/xxHash/archive/v0.6.5.tar.gz -> xxhash-0.6.5.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ba7ff19653ba8c7bdd4757ab073a6475
+_md5_=eff80d26eea98f167e2c4e5e403a5445
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.69 b/metadata/md5-cache/dev-libs/zziplib-0.13.69
new file mode 100644
index 000000000000..85c729984042
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.69
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig test? ( app-arch/zip )
+DESCRIPTION=Lightweight library for extracting data from files archived in a single zip file
+EAPI=7
+HOMEPAGE=http://zziplib.sourceforge.net/
+IUSE=doc sdl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
+SLOT=0
+SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.69.tar.gz -> zziplib-0.13.69.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=06ef7e04c5c06a7238a54e391d668c13
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 0e1eb44b9879..00ffbce993e4 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/sbcl-1.4.15 b/metadata/md5-cache/dev-lisp/sbcl-1.4.15
new file mode 100644
index 000000000000..8ff1b5eab0fd
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.4.15
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.15-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.15-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ebf4f1f730b011fd1f64a91556ab8540
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 537a3a8ccd48..776f8b6264e5 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0 b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
index eb57652e382a..4f9437ad2e43 100644
--- a/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
+++ b/metadata/md5-cache/dev-lua/lua-cjson-2.1.0
@@ -1,7 +1,8 @@
+BDEPEND=test? ( dev-lang/perl ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1:0 test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-lang/lua-5.1:0
 DESCRIPTION=A fast JSON encoding/parsing module for Lua
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.kyne.com.au/~mark/software/lua-cjson.php https://github.com/mpx/lua-cjson/
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
@@ -9,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0
 SLOT=0
 SRC_URI=https://www.kyne.com.au/~mark/software/download/lua-cjson-2.1.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=81ccf810d140a31b7616c47ae5ffa2b1
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=75d192d199f298ef2547a44e49d51619
diff --git a/metadata/md5-cache/dev-lua/luaossl-20181207 b/metadata/md5-cache/dev-lua/luaossl-20181207
new file mode 100644
index 000000000000..4378458e367e
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaossl-20181207
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl virtual/pkgconfig
+DESCRIPTION=Most comprehensive OpenSSL module in the Lua universe.
+EAPI=7
+HOMEPAGE=https://github.com/wahern/luaossl
+IUSE=luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( >=dev-lang/lua-5.1:0 ) dev-libs/openssl:0[-bindist] !dev-lua/lua-openssl
+SLOT=0
+SRC_URI=https://github.com/wahern/luaossl/archive/rel-20181207.tar.gz -> luaossl-rel-20181207.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=92a79699dab36d6b397d70b719b2225d
diff --git a/metadata/md5-cache/dev-perl/B-Debug-1.260.0 b/metadata/md5-cache/dev-perl/B-Debug-1.260.0
new file mode 100644
index 000000000000..13587630b3c0
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Debug-1.260.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Walk Perl syntax tree, printing debug info about ops
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/B-Debug
+IUSE=test minimal
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!minimal? ( >=dev-perl/B-Flags-0.40.0 ) >=dev-lang/perl-5.19.2 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Debug-1.26.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
+_md5_=a490326eec69af208ebf1a5bfefcc79c
diff --git a/metadata/md5-cache/dev-perl/B-Flags-0.170.0 b/metadata/md5-cache/dev-perl/B-Flags-0.170.0
new file mode 100644
index 000000000000..99f6adf6a92a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Flags-0.170.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Friendlier flags for B
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/B-Flags
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
+_md5_=fcf39954c09a3efa6c07b45adc14328b
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
index 71a20f23e33d..fe41186f5ad4 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
@@ -4,10 +4,10 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Cpanel-JSON-XS
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0239.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=d990cc4f24b5a0570f128306a7a3d736
+_md5_=993ae7f0ef3fe04b9ee22753b0bc4ec6
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r1 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r1
new file mode 100644
index 000000000000..0fca3c6cb1e8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-ECDSA-0.80.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=OpenSSL ECDSA (Elliptic Curve Digital Signature Algorithm) Perl extension
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-ECDSA
+IUSE=libressl
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Crypt-OpenSSL-EC-0.50.0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Crypt-OpenSSL-ECDSA-0.08.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
+_md5_=24a6c38dab1d2956290fc7ac01338b34
diff --git a/metadata/md5-cache/dev-perl/DBI-1.637.0 b/metadata/md5-cache/dev-perl/DBI-1.637.0
index a07134a187d6..fa87f9866cc7 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.637.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.637.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.637.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d03b37930ff3ba4f54a4d8bf845b79f
+_md5_=733986d993eee4e0b5abd884bcb036ba
diff --git a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0 b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
index cd0be3b17f4f..5de739e2a33a 100644
--- a/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
+++ b/metadata/md5-cache/dev-perl/Data-Validate-Domain-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Domain and host name validation
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Data-Validate-Domain
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~hppa sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter >=dev-perl/Net-Domain-TLD-1.740.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=43c45393bc5de3270662d89628493bb1
+_md5_=abfd0d40d527719bfa4668db440f6eb8
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0 b/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0
deleted file mode 100644
index a973af00d0c2..000000000000
--- a/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
-DESCRIPTION=Code coverage metrics for Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Devel-Cover
-IUSE=minimal test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-B-Debug virtual/perl-Digest-MD5 virtual/perl-Storable >=dev-perl/HTML-Parser-3.690.0 !minimal? ( dev-perl/Browser-Open dev-perl/Capture-Tiny dev-perl/Class-XSAccessor dev-perl/HTML-Parser >=dev-perl/JSON-MaybeXS-1.3.3 dev-perl/Moo dev-perl/Parallel-Iterator >=dev-perl/Perl-Tidy-20060719.0.0 >=dev-perl/Pod-Coverage-0.220.0 dev-perl/Sereal-Decoder dev-perl/Sereal-Encoder >=dev-perl/PPI-HTML-1.70.0 >=dev-perl/Template-Toolkit-2.0.0 dev-perl/Test-Differences dev-perl/namespace-clean ) dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.29.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=0583912b2dec719c904d584ab98a26ed
diff --git a/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1 b/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1
new file mode 100644
index 000000000000..7b966de46ca2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-Cover-1.290.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Code coverage metrics for Perl
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Devel-Cover
+IUSE=minimal test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/B-Debug virtual/perl-Digest-MD5 virtual/perl-Storable >=dev-perl/HTML-Parser-3.690.0 !minimal? ( dev-perl/Browser-Open dev-perl/Capture-Tiny dev-perl/Class-XSAccessor dev-perl/HTML-Parser >=dev-perl/JSON-MaybeXS-1.3.3 dev-perl/Moo dev-perl/Parallel-Iterator >=dev-perl/Perl-Tidy-20060719.0.0 >=dev-perl/Pod-Coverage-0.220.0 dev-perl/Sereal-Decoder dev-perl/Sereal-Encoder >=dev-perl/PPI-HTML-1.70.0 >=dev-perl/Template-Toolkit-2.0.0 dev-perl/Test-Differences dev-perl/namespace-clean ) dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.29.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
+_md5_=40af4d29c0057181283b3515d32f21b0
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
new file mode 100644
index 000000000000..5d724289bf14
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.840.0 >=dev-perl/Test-Differences-0.60.0 ) dev-lang/perl:=
+DESCRIPTION=Powerful feature-rich perl source code profiler
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Devel-NYTProf
+IUSE=test examples
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
+_md5_=ccaca475ac50a9e4c839dbfba10c064a
diff --git a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0 b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
index 9288b6a37286..56b970553b8d 100644
--- a/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
+++ b/metadata/md5-cache/dev-perl/Dist-CheckConflicts-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=Declare version conflicts for your dist
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Dist-CheckConflicts
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=dev-perl/Module-Runtime-0.9.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=e8bdbcc843fb8c742ed7688d078c3099
+_md5_=e184be92511526a9ac3e0658f381eba2
diff --git a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0 b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
index 3f66f2ea5207..4cc3c4c64ed4 100644
--- a/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
+++ b/metadata/md5-cache/dev-perl/DynaLoader-Functions-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Deconstructed Dynamic C Library Loading
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/DynaLoader-Functions
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/DynaLoader-Functions-0.003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=bab8cbeb54ac7272a22a9a1796a484b7
+_md5_=8d736132b8729398e24cbfcdb71e9ef4
diff --git a/metadata/md5-cache/dev-perl/Importer-0.24.0 b/metadata/md5-cache/dev-perl/Importer-0.24.0
index 4c3f2fe95840..efc708fca2b7 100644
--- a/metadata/md5-cache/dev-perl/Importer-0.24.0
+++ b/metadata/md5-cache/dev-perl/Importer-0.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alternative interface to modules that export symbols
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Importer
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.024.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=b4e680b8fde6e4904272385491cb272f
+_md5_=1a5ce1e36155298fba4ec019661e0fc6
diff --git a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0 b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
index 8e0f9729555d..45d52f91853e 100644
--- a/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
+++ b/metadata/md5-cache/dev-perl/Locale-gettext-1.70.0
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gettext virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=A Perl module for accessing the GNU locale utilities
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/gettext
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=sys-devel/gettext dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=ad58c5a32c76aaa21627476b8ab30a42
+_md5_=adc5d39ab573cf6f513717cd9238960d
diff --git a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0 b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
index 8080db982e22..8ef275d702e8 100644
--- a/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
+++ b/metadata/md5-cache/dev-perl/MIME-tools-5.509.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/perl-File-Path-1 >=virtual/perl-File-Spec-0.600.0 >=virtual/pe
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=45614f88fa064af022ab2cf22c3fe6ce
+_md5_=9c471faed867b41f61b307a8ce72b229
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9b87f0699532..83a2afff0928 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/Math-BigInt-GMP-1.600.200 b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
index 4efdcd3b00f9..0bbb905ea381 100644
--- a/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
+++ b/metadata/md5-cache/dev-perl/Math-BigInt-GMP-1.600.200
@@ -4,10 +4,10 @@ DESCRIPTION=Use the GMP library for Math::BigInt routines
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Math-BigInt-GMP
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ppc sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Math-BigInt-1.999.801 >=virtual/perl-XSLoader-0.20.0 >=dev-libs/gmp-4.0.0:0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=36deb9d0e908c6df69855df4376fb321
+_md5_=fd7d498fbb53ebb56bbd24767e3f177c
diff --git a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0 b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
index 29ce1c4e1825..c30d69d200fa 100644
--- a/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
+++ b/metadata/md5-cache/dev-perl/Net-Domain-TLD-1.750.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-Storable virtual/perl-ExtUtils-MakeMaker d
 DESCRIPTION=Current top level domain names including new ICANN additions and ccTLDs
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-Domain-TLD
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Storable dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=cf573f1deb2b675fcc6ef9933476fa07
+_md5_=8ecd0faad49d681cd7f98730bdb07719
diff --git a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0 b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
index 08f67293a1a6..eb6f558fb9ee 100644
--- a/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
+++ b/metadata/md5-cache/dev-perl/Net-IDN-Encode-2.400.0
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalizing Domain Names in Applications (IDNA)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-IDN-Encode
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Unicode-Normalize dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=eec45e4e72cf7d49f090304a515edae9
+_md5_=1d0e614799e4a5568ffa3896f492855b
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1 b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
index e00bba5db72e..09d6e5660604 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN-0.120.0-r1
@@ -3,10 +3,10 @@ DEPEND=net-dns/libidn dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl bindings for GNU Libidn
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Net-LibIDN
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=net-dns/libidn dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN-0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd072ab9d4fe7f47f50329b4bae8b943
+_md5_=61c7c535f2f1d65661abc8ce7c26d522
diff --git a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0 b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0
index bc2baaccfde1..51ae007f00fe 100644
--- a/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0
+++ b/metadata/md5-cache/dev-perl/Net-LibIDN2-1.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-dns/libidn2 virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.10.0 ) dev-lang/perl:=
+DEPEND=net-dns/libidn2:= virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build test? ( >=virtual/perl-Test-Simple-0.10.0 ) dev-lang/perl:=
 DESCRIPTION=Perl bindings for GNU Libidn2
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Net-LibIDN2
 IUSE=test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=net-dns/libidn2 dev-lang/perl:=
+RDEPEND=net-dns/libidn2:= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.00.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=52eb3437c2d5f8b18f52ac797597dabe
+_md5_=f3ace0d3bd8ea51fcdbf09b7f1d18e44
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.850.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.850.0
new file mode 100644
index 000000000000..78b7be56e393
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.850.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-NoWarnings ) virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Perl extension for using OpenSSL
+EAPI=6
+HOMEPAGE=https://metacpan.org/release/Net-SSLeay
+IUSE=libressl test minimal examples examples
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=openssl
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=065125cf291b1de9058f92234e4a2e2f
diff --git a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15 b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
index 08615b6d9bc0..c657c46eab3f 100644
--- a/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
+++ b/metadata/md5-cache/dev-perl/Parse-RecDescent-1.967.15
@@ -4,10 +4,10 @@ DESCRIPTION=Generate Recursive-Descent Parsers
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Parse-RecDescent
 IUSE=test examples
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Balanced-1.950.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=79e33a8decbdae1d6befccdd88d7f10a
+_md5_=3c7bf642938af0f3f8c833148c6f4ea3
diff --git a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0 b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
index 7a37a8d800b0..8d64504e376a 100644
--- a/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
+++ b/metadata/md5-cache/dev-perl/Path-Tiny-0.104.0
@@ -4,10 +4,10 @@ DESCRIPTION=File path utility
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Path-Tiny
 IUSE=test minimal
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=!minimal? ( >=dev-perl/Unicode-UTF8-0.580.0 ) virtual/perl-Carp >=virtual/perl-Digest-1.30.0 >=virtual/perl-Digest-SHA-5.450.0 >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Path-2.70.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-File-Temp-0.190.0 virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=9c8ea959ba9bfc4d487c1fd485f9ed3e
+_md5_=57ba2c5ec0132a430451a3a1b8e831d3
diff --git a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0 b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
index c3b9417e5d9e..30edafd958ae 100644
--- a/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
+++ b/metadata/md5-cache/dev-perl/Sub-Info-0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tool for inspecting subroutines
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Sub-Info
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=bc34e3624b7b8214d920240f59658ffe
+_md5_=a04ec6cf550443d677865393cc1da96b
diff --git a/metadata/md5-cache/dev-perl/Term-Table-0.8.0 b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
index 28677e2f41fa..fb1c6f1e2944 100644
--- a/metadata/md5-cache/dev-perl/Term-Table-0.8.0
+++ b/metadata/md5-cache/dev-perl/Term-Table-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Format a header and rows into a table
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Term-Table
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.008.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab81ff15fff2f56af5b3a545448efdaf
+_md5_=470ba965fafcc63563858e38a14e6d98
diff --git a/metadata/md5-cache/dev-perl/TermReadKey-2.370.0 b/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
index d71d18ebf1e4..e7756a779980 100644
--- a/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
+++ b/metadata/md5-cache/dev-perl/TermReadKey-2.370.0
@@ -4,10 +4,10 @@ DESCRIPTION=Change terminal modes, and perform non-blocking reads
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/TermReadKey
 IUSE=examples
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=4719093d1c2ed514219a702ff49f056c
+_md5_=48c73e330ca6adc69e0335a07fc47284
diff --git a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0 b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
index dda88d018536..5580adcbec0e 100644
--- a/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
+++ b/metadata/md5-cache/dev-perl/Test-Warn-0.320.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension to test methods for warnings
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-Warn
 IUSE=test
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.220.0 >=dev-perl/Sub-Uplevel-0.120.0 >=virtual/perl-Test-Simple-0.880.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=9008bdb41d23f20891056b9da8b19285
+_md5_=17624282935e6a6afbf7cb861a5beaef
diff --git a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77 b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
index 9e6af3ccbd52..c8e64e21c705 100644
--- a/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
+++ b/metadata/md5-cache/dev-perl/Test2-Suite-0.0.77
@@ -4,10 +4,10 @@ DESCRIPTION=A rich set of tools built upon the Test2 framework
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test2-Suite
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Importer-0.24.0 virtual/perl-Scalar-List-Utils >=dev-perl/Sub-Info-0.1.0 >=dev-perl/Term-Table-0.2.0 >=virtual/perl-Test-Simple-1.302.73 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000077.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=e0bb1a9e29ca4dafd1689f26d906213b
+_md5_=f5167c850cbf234bcca6c7d023a0a03e
diff --git a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1 b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
index ab6f73ce0526..ac700332cf04 100644
--- a/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-CharWidth-0.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Get number of occupied columns of a string on terminal
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Text-CharWidth
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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 m68k ~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+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9563f8bf9499959cf398ceadfc295f4
+_md5_=718dc38de07978051a27fc0d45e642c7
diff --git a/metadata/md5-cache/dev-perl/Text-Template-1.530.0 b/metadata/md5-cache/dev-perl/Text-Template-1.530.0
index 34e95a0d9ff8..294052f78d8b 100644
--- a/metadata/md5-cache/dev-perl/Text-Template-1.530.0
+++ b/metadata/md5-cache/dev-perl/Text-Template-1.530.0
@@ -4,10 +4,10 @@ DESCRIPTION=Expand template text with embedded Perl
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Text-Template
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=81c7a0dd30d5039ae3815b266535d143
+_md5_=038d041a7077d932665028a7690f8bc0
diff --git a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1 b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
index 6d67a2cac522..0f9c8886d6ea 100644
--- a/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Text-WrapI18N-0.60.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 DESCRIPTION=Internationalized substitute of Text::Wrap
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Text-WrapI18N
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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 m68k ~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+ )
 RDEPEND=dev-perl/Text-CharWidth dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86f0f214b28bc9668f486c406bdb898d
+_md5_=e15070cc75d5f7f2559cae992881468d
diff --git a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0 b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
index 69803f4d91f8..a0546d84e258 100644
--- a/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
+++ b/metadata/md5-cache/dev-perl/YAML-Tiny-1.730.0
@@ -4,10 +4,10 @@ DESCRIPTION=Read/Write YAML files with as little code as possible
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/YAML-Tiny
 IUSE=test minimal
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=15d67857f9a12a48526aecebd71910dd
+_md5_=376309212a0b2cd26880c99dbaaab111
diff --git a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1 b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
index 0c287a875050..4eb8fc6010ec 100644
--- a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
+++ b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Collection of Perl modules for working with XML
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/libxml-perl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8edda18fc3f1d9be1840e2506d38ef4f
+_md5_=a3fac58cc875598bcc5f3e346a45c658
diff --git a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2 b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
index 29557ef1aaf2..024660c60999 100644
--- a/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
+++ b/metadata/md5-cache/dev-perl/libxml-perl-0.80.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=
 DESCRIPTION=Collection of Perl modules for working with XML
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/libxml-perl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=c5d8fa695724d6cfe5e325bec64090be
+_md5_=8279924a6e53deb9b955fb0b2ab53e16
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 523c40a46ace..a3aa6f67ed81 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/asn1crypto-0.24.0 b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
index b109525aba2d..0d452ca0cb0a 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
 EAPI=6
 HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/wbond/asn1crypto/archive/0.24.0.tar.gz -> asn1crypto-0.24.0.gh.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=755e3a5425176d0cd3e0772ba2bf1151
+_md5_=40d4146f3347b992ce50f890e381355b
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.16 b/metadata/md5-cache/dev-python/bottle-0.12.16
new file mode 100644
index 000000000000..e70463150a6b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bottle-0.12.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst 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_targets_python3_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_7(-)] test? ( dev-python/mako[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_7(-)?,-python_single_target_python3_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+DESCRIPTION=A fast and simple micro-framework for small web-applications
+EAPI=5
+HOMEPAGE=https://pypi.org/project/bottle/ http://bottlepy.org/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bottle/bottle-0.12.16.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=366a6fabd3bf92d212bb2da9bad45b9f
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.5 b/metadata/md5-cache/dev-python/cffi-1.11.5
index af2b0ae8a916..13381f875480 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.5
+++ b/metadata/md5-cache/dev-python/cffi-1.11.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0/1.11.5
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66862a02ba41c71ce0b3bb58502e9c50
+_md5_=58f3a844de0a13df93efd1c5c43c0eb6
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.1.0 b/metadata/md5-cache/dev-python/cherrypy-18.1.0
new file mode 100644
index 000000000000..532396e3386f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cherrypy-18.1.0
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] >=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] test? ( dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] )
+DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
+EAPI=7
+HOMEPAGE=https://www.cherrypy.org https://pypi.org/project/CherryPy/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] >=dev-python/portend-2.1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] >=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2a6dacccf8804d09d098ef50b70e0b9d
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index 60d580175c1c..ca1f5a4b4311 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
 EAPI=7
 HOMEPAGE=http://click.pocoo.org/ https://pypi.org/project/click/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=BSD
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=41f56f20be2cde3629aaaa42cfed3a4b
+_md5_=0b19734a856175423c8a67a1fd8f112e
diff --git a/metadata/md5-cache/dev-python/django-1.11.18 b/metadata/md5-cache/dev-python/django-1.11.18
new file mode 100644
index 000000000000..27eaa7c014c7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-1.11.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) test? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/numpy[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_7(-)?,-python_single_target_python3_7(-)] dev-python/pillow[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/python-enum34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=6
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.18.tar.gz mirror://pypi/D/Django/Django-1.11.18.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fa6bfb22e375aadd979a1da33dcd7442
diff --git a/metadata/md5-cache/dev-python/django-2.0.10 b/metadata/md5-cache/dev-python/django-2.0.10
new file mode 100644
index 000000000000..5c51b0bc7cb3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-python/pytz[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(-)] doc? ( >=dev-python/sphinx-1.0.7[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? ( python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) dev-python/docutils[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/numpy[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/pillow[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/mock[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[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,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(-)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=High-level Python web framework
+EAPI=6
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,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(-)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/2.0/Django-2.0.10.tar.gz mirror://pypi/D/Django/Django-2.0.10.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a2b1e4014e119847edc9c40ffca35815
diff --git a/metadata/md5-cache/dev-python/django-2.1.5 b/metadata/md5-cache/dev-python/django-2.1.5
new file mode 100644
index 000000000000..b1afb36c864b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-2.1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=High-level Python web framework
+EAPI=7
+HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
+IUSE=doc sqlite test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.5.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=54376645a07af4bba9c420e529fcb0e5
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r2 b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
index 3945531a9bdd..3da017e943a4 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r2
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Pythonic argument parser, that will make you smile
 EAPI=5
 HOMEPAGE=https://pypi.org/project/docopt/ https://github.com/docopt/docopt
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/docopt/docopt-0.6.2.tar.gz https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f0e8e2a3214fc953565da00895f8b0c7
+_md5_=459db59c365ee0add60d7f24e8049778
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.0.4 b/metadata/md5-cache/dev-python/gitlabform-1.0.4
new file mode 100644
index 000000000000..1d4e044aef54
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gitlabform-1.0.4
@@ -0,0 +1,15 @@
+BDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.20.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Easy configuration as code tool for GitLab using config in plain YAML
+EAPI=7
+HOMEPAGE=https://github.com/egnyte/gitlabform
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/pyyaml-3.13[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.20.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.0.4.tar.gz -> gitlabform-1.0.4.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c2fee195bf77c3e28aea9f555db536d3
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.12 b/metadata/md5-cache/dev-python/greenlet-0.4.12
index b11503149dfe..da98ff793f72 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.12
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.12
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=6
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc 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 ~amd64-linux ~x86-linux
+KEYWORDS=-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 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(-)]
 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/greenlet/greenlet-0.4.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4489fc85fe3b1fb7203d81bef74aa5ba
+_md5_=cabeece47355bd4eb778383b77678d59
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.13 b/metadata/md5-cache/dev-python/greenlet-0.4.13
index 06955a93a171..c3736cc3d864 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.13
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.13
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=6
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae66db2d7d4f9f39d022dc9011705bfa
+_md5_=ac23c59065f32cc53362b3b0c0349e9f
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15 b/metadata/md5-cache/dev-python/greenlet-0.4.15
index 74b233dd73d7..a8e1192b07b2 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.15
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.15
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight in-process concurrent programming
 EAPI=6
 HOMEPAGE=https://pypi.org/project/greenlet/
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=-alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=58f3a2e386b62762201949481bad7862
+_md5_=ac23c59065f32cc53362b3b0c0349e9f
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.5 b/metadata/md5-cache/dev-python/html5-parser-0.4.5
new file mode 100644
index 000000000000..4192431d48eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.5
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2:=
+DESCRIPTION=Fast C based HTML 5 parsing for python
+EAPI=7
+HOMEPAGE=https://github.com/kovidgoyal/html5-parser/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lxml-3.8.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/h/html5-parser/html5-parser-0.4.5.tar.gz -> html5-parser-0.4.5.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=77b83ca8b296c1c901819e41206bcbed
diff --git a/metadata/md5-cache/dev-python/hyperframe-4.0.1 b/metadata/md5-cache/dev-python/hyperframe-4.0.1
index 2d071d832be2..e96630bca2df 100644
--- a/metadata/md5-cache/dev-python/hyperframe-4.0.1
+++ b/metadata/md5-cache/dev-python/hyperframe-4.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
 HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe/
 IUSE=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 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86
 LICENSE=MIT
 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/h/hyperframe/hyperframe-4.0.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1251bf45a97b1e24d0778d8a78206f91
+_md5_=6804e21cba5a35e3fc4b1312039fa749
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.1.0 b/metadata/md5-cache/dev-python/hyperframe-5.1.0
index 5158f5aa1e97..cde5c49b7637 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.1.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
 HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe/
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=51b77cfbed9cdeb73f2543d528ed6b9f
+_md5_=816a438df4e7641600c0fa93b6b0b843
diff --git a/metadata/md5-cache/dev-python/libvirt-python-4.9.0 b/metadata/md5-cache/dev-python/libvirt-python-4.9.0
index edb30d5e65de..048bb5f462f7 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-4.9.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-4.9.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 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2
 RDEPEND=app-emulation/libvirt:0/4.9.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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-4.9.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=10ef7259233e316730e376ce38548cbf
+_md5_=57dec2567c429935ea38bc108ef326ea
diff --git a/metadata/md5-cache/dev-python/lxml-4.1.1 b/metadata/md5-cache/dev-python/lxml-4.1.1
deleted file mode 100644
index 3dea7258149f..000000000000
--- a/metadata/md5-cache/dev-python/lxml-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 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/cssselect[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
-EAPI=6
-HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
-IUSE=doc examples +threads test 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 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.9.2 >=dev-libs/libxslt-1.1.28 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/l/lxml/lxml-4.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5feef894e267fe47f239345e7f6b2226
diff --git a/metadata/md5-cache/dev-python/lxml-4.2.5 b/metadata/md5-cache/dev-python/lxml-4.2.5
index b391cb6bf7d9..469c260b75ff 100644
--- a/metadata/md5-cache/dev-python/lxml-4.2.5
+++ b/metadata/md5-cache/dev-python/lxml-4.2.5
@@ -5,11 +5,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-4.2.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=dac23662aa5f62d1f7d1baa3259704e8
+_md5_=6b6b1691617856987f7dae93cd0cef1b
diff --git a/metadata/md5-cache/dev-python/lxml-4.3.0 b/metadata/md5-cache/dev-python/lxml-4.3.0
new file mode 100644
index 000000000000..ae7c0815aebc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-4.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig python_targets_python2_7? ( dev-python/cython[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/cython[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/cython[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/cython[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_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/cython[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_7(-)?,-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] test? ( dev-python/cssselect[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28
+DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=7
+HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
+IUSE=doc examples +threads test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/l/lxml/lxml-4.3.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=68701286f89a2c65a8d4d895825725b7
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.3.12 b/metadata/md5-cache/dev-python/mysqlclient-1.3.12
deleted file mode 100644
index 08992f7d6c80..000000000000
--- a/metadata/md5-cache/dev-python/mysqlclient-1.3.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-python/mysql-python virtual/mysql 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(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Fork of MySQL-python
-EAPI=6
-HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python
-IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!dev-python/mysql-python virtual/mysql python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.3.12.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3b9ccb3d68e2501958e682b2bc125f89
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.3.14 b/metadata/md5-cache/dev-python/mysqlclient-1.3.14
index e1e23d780d60..54236982ff86 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.3.14
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.3.14
@@ -4,11 +4,11 @@ DESCRIPTION=Fork of MySQL-python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python
 IUSE=doc python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!dev-python/mysql-python virtual/mysql 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.3.14.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01f697e820893c3dba2b70eda154b426
+_md5_=112d336b958e641210cc81d0d6cf0711
diff --git a/metadata/md5-cache/dev-python/numpy-1.15.4 b/metadata/md5-cache/dev-python/numpy-1.15.4
new file mode 100644
index 000000000000..5f38c1b18f1a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.15.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lapack? ( virtual/cblas virtual/lapack ) app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/pkgconfig ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=6
+HOMEPAGE=https://www.numpy.org
+IUSE=doc lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+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
+RDEPEND=lapack? ( virtual/cblas virtual/lapack ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/n/numpy/numpy-1.15.4.zip doc? ( http://docs.scipy.org/doc/numpy-1.15.4/numpy-html-1.15.4.zip http://docs.scipy.org/doc/numpy-1.15.4/numpy-ref-1.15.4.pdf http://docs.scipy.org/doc/numpy-1.15.4/numpy-user-1.15.4.pdf )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ca447db53cc5970d298f88e861b4eb05
diff --git a/metadata/md5-cache/dev-python/numpy-9999 b/metadata/md5-cache/dev-python/numpy-9999
index 16f995d6bdb5..0e3858fbc525 100644
--- a/metadata/md5-cache/dev-python/numpy-9999
+++ b/metadata/md5-cache/dev-python/numpy-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/cblas virtual/lapack ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/cblas virtual/lapack ) lapack? ( virtual/pkgconfig ) test? ( >=dev-python/nose-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Fast array and numerical python library
 EAPI=5
 HOMEPAGE=https://www.numpy.org
-IUSE=lapack test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=lapack test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/cblas virtual/lapack ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/cblas virtual/lapack ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c1517f3d2b96cc062bcecf084a34fcb1
+_md5_=83ba0c4c7ab4286db03dfb6e80487914
diff --git a/metadata/md5-cache/dev-python/olefile-0.46 b/metadata/md5-cache/dev-python/olefile-0.46
index b0e3bc68033e..c1b0b971c17e 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46
+++ b/metadata/md5-cache/dev-python/olefile-0.46
@@ -4,11 +4,11 @@ DESCRIPTION=Python package to parse, read and write Microsoft OLE2 files
 EAPI=7
 HOMEPAGE=https://www.decalage.info/olefile
 IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f90283d0fbfb139afaaa301052eda30f
+_md5_=987bbb092cb8e688b6a453c1cc9ed846
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
index 87e73d3128ef..6c0979c949d4 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx themes for Pallets and related projects
 EAPI=7
 HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/jinja[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3ff6ac0fd1030911a4449acea9c6f82d
+_md5_=17383a8d337e818b49d09eaae693f2a1
diff --git a/metadata/md5-cache/dev-python/pillow-5.2.0 b/metadata/md5-cache/dev-python/pillow-5.2.0
index 9282f7be28db..7c63b0908c11 100644
--- a/metadata/md5-cache/dev-python/pillow-5.2.0
+++ b/metadata/md5-cache/dev-python/pillow-5.2.0
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] media-gfx/imagemagick[png] )
+DEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) test? ( <dev-python/pytest-3.10[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] media-gfx/imagemagick[png] )
 DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-5.2.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6a390a99c7869a85681b77b0b831829f
+_md5_=39257678e3df6a71d033b76b737c61f0
diff --git a/metadata/md5-cache/dev-python/pillow-5.3.0 b/metadata/md5-cache/dev-python/pillow-5.3.0
index d2ba1cc59713..a8394add580b 100644
--- a/metadata/md5-cache/dev-python/pillow-5.3.0
+++ b/metadata/md5-cache/dev-python/pillow-5.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
 IUSE=doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_pypy? ( >=virtual/pypy-5:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-5.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c85526666d4cf354af3c185e8a3975a3
+_md5_=c66b78ea23f2cee84b59cc5426d1b390
diff --git a/metadata/md5-cache/dev-python/pillow-5.4.1 b/metadata/md5-cache/dev-python/pillow-5.4.1
new file mode 100644
index 000000000000..eda1507b2fba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pillow-5.4.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] media-gfx/imagemagick[png] )
+DESCRIPTION=Python Imaging Library (fork)
+EAPI=7
+HOMEPAGE=https://python-pillow.org/
+IUSE=doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=HPND
+RDEPEND=dev-python/olefile[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_pypy? ( >=virtual/pypy-5:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/python-pillow/Pillow/archive/5.4.1.tar.gz -> pillow-5.4.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=7405efa68fd9c7830534f07a0ab171f1
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.8 b/metadata/md5-cache/dev-python/psutil-5.4.8
new file mode 100644
index 000000000000..eb0a18ae587f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.4.8
@@ -0,0 +1,16 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+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_targets_python3_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_7(-)] test? ( 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_targets_python3_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_7(-)] dev-python/ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] )
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=7
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-5.4.8.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=340a43453e3900c4fbe55582f746408d
diff --git a/metadata/md5-cache/dev-python/py-1.5.4 b/metadata/md5-cache/dev-python/py-1.5.4
index 6d4fa3ca0529..008347ede236 100644
--- a/metadata/md5-cache/dev-python/py-1.5.4
+++ b/metadata/md5-cache/dev-python/py-1.5.4
@@ -1,5 +1,5 @@
 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_targets_python3_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_7(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+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_targets_python3_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_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] test? ( >=dev-python/pytest-2.4.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
 EAPI=6
 HOMEPAGE=https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d4d3f157ea36d93a33ee9522c2123e11
+_md5_=567f856b032e34306f6461caf6ab7b76
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index a41e6633dcd5..ca443f04f6a0 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND==dev-python/snakeoil-9999[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(-)] ) dev-python/sphinx[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(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~dev-python/snakeoil-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=a python library and cli tool that simplify chroot handling
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pychroot
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
-RDEPEND==dev-python/snakeoil-9999[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 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0efc4c6f6180a2509a2743ee65f9671a
+_md5_=e77f67b68307cae8e36228c6496b5928
diff --git a/metadata/md5-cache/dev-python/pycuda-2018.1.1 b/metadata/md5-cache/dev-python/pycuda-2018.1.1
new file mode 100644
index 000000000000..ae6e0569fa31
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycuda-2018.1.1
@@ -0,0 +1,16 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[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/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytools-2013[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers opengl? ( virtual/opengl ) test? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] )
+DESCRIPTION=Python wrapper for NVIDIA CUDA
+EAPI=7
+HOMEPAGE=https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/
+IUSE=examples opengl test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:=[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/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytools-2013[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers opengl? ( virtual/opengl ) 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=userpriv
+SLOT=0
+SRC_URI=mirror://pypi/p/pycuda/pycuda-2018.1.1.tar.gz
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8f0b401b04a7b6984471a6d4d975316e
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
index d2bafb8bc842..76960fa2d130 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.4
@@ -1,14 +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(-)] 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/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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? ( ssl? ( 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(-)] ) 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/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] dev-python/pysendfile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=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(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysendfile[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python FTP server library
 EAPI=6
 HOMEPAGE=https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/
-IUSE=doc examples ssl test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc examples ssl test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
-RDEPEND=ssl? ( 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-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=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 )
+RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.4.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ddf5e0a8fbe0453d8ac7adc112297402
+_md5_=f1b06164f84e1bca83d0987a7df933a6
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
new file mode 100644
index 000000000000..f282eb168d45
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] >=media-libs/sdl2-mixer-2.0.2 media-libs/sdl2-ttf virtual/jpeg:62
+DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
+EAPI=7
+HOMEPAGE=https://github.com/renpy/pygame_sdl2
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 ZLIB
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] >=media-libs/sdl2-mixer-2.0.2 media-libs/sdl2-ttf virtual/jpeg:62 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=318a5a34d53deff5d84ef8bc138d267e
diff --git a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55 b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
index 7b1cd71a3122..888989aac372 100644
--- a/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
+++ b/metadata/md5-cache/dev-python/pygobject-2.28.6-r55
@@ -4,11 +4,11 @@ DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
 IUSE=examples libffi test python_targets_python2_7 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.24.0:2 dev-lang/python-exec:2 libffi? ( virtual/libffi:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<dev-python/pygtk-2.23
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ca50485e8c8b0f6265a2d8397edc35e3
+_md5_=a7738b40c40ba8f34413ea48a8c3a3fc
diff --git a/metadata/md5-cache/dev-python/pygobject-3.28.3 b/metadata/md5-cache/dev-python/pygobject-3.28.3
index 4275d9e2ff12..bc5636043d1f 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.28.3
+++ b/metadata/md5-cache/dev-python/pygobject-3.28.3
@@ -4,11 +4,11 @@ DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
 IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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=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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.46.0:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/cairo ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.28/pygobject-3.28.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13793fc4fbe42febdf2a58653de94b9c
+_md5_=455c32c8ef6d78a0c9e0816f83cd358d
diff --git a/metadata/md5-cache/dev-python/pyicu-2.2 b/metadata/md5-cache/dev-python/pyicu-2.2
new file mode 100644
index 000000000000..ef0029b54b4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.2
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu test? ( dev-python/pytest dev-python/six )
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=7
+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
+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.2.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=a9e5fc21e86bcd165b310368d682ab9c
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.3.0 b/metadata/md5-cache/dev-python/pyparsing-2.3.0
new file mode 100644
index 000000000000..619203b7decb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyparsing-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+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_targets_python3_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_7(-)]
+DESCRIPTION=Easy-to-use Python module for text parsing
+EAPI=7
+HOMEPAGE=https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/
+IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.3.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7d60d9573489a3d4207d0ff01370f8b1
diff --git a/metadata/md5-cache/dev-python/pypodman-0.12.1.2 b/metadata/md5-cache/dev-python/pypodman-0.12.1.2
new file mode 100644
index 000000000000..d5b45cddddef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypodman-0.12.1.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/humanize[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-podman[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytoml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-39[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=CLI for podman written in python
+EAPI=7
+HOMEPAGE=https://github.com/containers/libpod/tree/master/contrib/python/pypodman/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/humanize[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-podman[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytoml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-39[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v0.12.1.2.tar.gz -> libpod-0.12.1.2.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8d1f9b5e2e30557ff6ae2fb780bfd03c
diff --git a/metadata/md5-cache/dev-python/pypy-5.10.0 b/metadata/md5-cache/dev-python/pypy-5.10.0
deleted file mode 100644
index cfb803ae1ce2..000000000000
--- a/metadata/md5-cache/dev-python/pypy-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0 !low-memory? ( || ( dev-python/pypy dev-python/pypy-bin ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4b4aec5f4f2048798a80d14f54dc1ec8
diff --git a/metadata/md5-cache/dev-python/pypy-bin-5.10.0 b/metadata/md5-cache/dev-python/pypy-bin-5.10.0
deleted file mode 100644
index 7060b5c98adc..000000000000
--- a/metadata/md5-cache/dev-python/pypy-bin-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
-DESCRIPTION=Pre-built version of PyPy
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/5.10.0/pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=efe45359d813b3dd7f86419a97d6bf74
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
index dfb214fba025..fc9e3aaa717a 100644
--- a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r100
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/0[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/41
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+jit+libressl+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-amd64+bzip2+libressl+ncurses.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0-ffi7/pypy-bin-6.0.0-ffi7-x86+bzip2+libressl+ncurses.tar.lz ) ) ) )
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c9ea9d444751ff4d24574650b18a79b6
+_md5_=0467acfb88ac92740ebfb3ab901c97f9
diff --git a/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200 b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
new file mode 100644
index 000000000000..d2e2de8be9b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-bin-6.0.0-r200
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0 app-arch/lzip app-arch/xz-utils
+DESCRIPTION=Pre-built version of PyPy
+EAPI=6
+HOMEPAGE=http://pypy.org/
+IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0/1.1[-bindist] ) libressl? ( dev-libs/libressl:0/44 ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy:0
+REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
+SLOT=0/41
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-src.tar.bz2 https://dev.gentoo.org/~floppym/python-gentoo-patches-2.7.14-0.tar.xz amd64? ( !libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.ossl11.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-amd64+bzip2+ncurses.ffi7.ossl11.tar.lz ) ) libressl? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) x86? ( !libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.ossl11.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.ossl11.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7.ossl11/pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz ) ) ) libressl? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy-bin/6.0.0.ffi7/pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.ffi7.tar.lz ) ) ) )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4c747712498ed47355d50b35fa084e9d
diff --git a/metadata/md5-cache/dev-python/pypy3-5.10.1 b/metadata/md5-cache/dev-python/pypy3-5.10.1
deleted file mode 100644
index 6a644c3a8560..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-5.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0 low-memory? ( virtual/pypy ) !low-memory? ( || ( virtual/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.5) language
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3-bin:0
-SLOT=0/510
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-src.tar.bz2
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=77891cf2f93be4320dafd740b8cab68a
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-5.10.1 b/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
deleted file mode 100644
index 9ceef9152a85..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0 app-arch/lzip app-arch/xz-utils test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) )
-DESCRIPTION=A fast, compliant alternative implementation of Python 3.3 (binary package)
-EAPI=6
-HOMEPAGE=http://pypy.org/
-IUSE=gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/0 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
-REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
-SLOT=0/510
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.1-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/5.10.1/pypy3-bin-5.10.1-x86+bzip2+ncurses.tar.lz ) ) )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ada20145a5a99743efeb2ee405c3e6d0
diff --git a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100 b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
index 50e7aa4bd789..7006ec2f489d 100644
--- a/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
+++ b/metadata/md5-cache/dev-python/pypy3-bin-6.0.0-r100
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/7 sys-devel/gcc:* sys-libs/glibc sys-libs/ncurses:0/6 sys-libs/zlib:0/1 gdbm? ( sys-libs/gdbm:0= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy3:0
 REQUIRED_USE=x86? ( !cpu_flags_x86_sse2? ( !jit ) )
 SLOT=0/60
-SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-amd64+bzip2+jit+ncurses.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-amd64+bzip2+ncurses.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+jit+ncurses+sse2.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses+sse2.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0-ffi7/pypy3-bin-6.0.0-ffi7-x86+bzip2+ncurses.tar.lz ) ) )
+SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-src.tar.bz2 amd64? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-amd64+bzip2+ncurses.ffi7.tar.lz ) ) x86? ( cpu_flags_x86_sse2? ( jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.ffi7.tar.lz ) !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz ) ) !cpu_flags_x86_sse2? ( !jit? ( https://dev.gentoo.org/~mgorny/dist/pypy3-bin/6.0.0.ffi7/pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz ) ) )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0fa2d260da38619a2536995f06afe2c2
+_md5_=cf0e9b55d594ee7d13bc3cff5763ecc1
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.8 b/metadata/md5-cache/dev-python/pysnmp-4.4.8
new file mode 100644
index 000000000000..cee7c5114051
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.8
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(-)] 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(-)] )
+DESCRIPTION=Python SNMP library
+EAPI=7
+HOMEPAGE=http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/
+IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pysmi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pycrypto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/p/pysnmp/pysnmp-4.4.8.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=21875a44e0f19c713b6457fdad67f60e
diff --git a/metadata/md5-cache/dev-python/pytables-3.4.4 b/metadata/md5-cache/dev-python/pytables-3.4.4
index 6a9402ce28e8..cefe81d6a54e 100644
--- a/metadata/md5-cache/dev-python/pytables-3.4.4
+++ b/metadata/md5-cache/dev-python/pytables-3.4.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/lzo:2= >=dev-python/numpy-1.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numexpr-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/hdf5-1.8.15:0= >=dev-python/cython-0.21[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/lzo:2= >=dev-python/numpy-1.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numexpr-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/hdf5-1.8.15:0= >=dev-python/cython-0.21[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Hierarchical datasets for Python
 EAPI=6
 HOMEPAGE=https://www.pytables.org/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2:0= app-arch/lz4:0= >=app-arch/zstd-1.0.0:= >=dev-libs/c-blosc-1.11.1:0= dev-libs/lzo:2= >=dev-python/numpy-1.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numexpr-2.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/hdf5-1.8.15:0= 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tables/tables-3.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ff0947f3d1fe07b61a570783d0d9b0f
+_md5_=16a7771a99999fba78f75c7a4b380ba1
diff --git a/metadata/md5-cache/dev-python/pytest-3.6.3 b/metadata/md5-cache/dev-python/pytest-3.6.3
deleted file mode 100644
index edf61110f84a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.6.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] test? ( >=dev-python/hypothesis-3.5.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/pytest-xdist-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] !!dev-python/flaky !!dev-python/pytest-capturelog ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-DESCRIPTION=Simple powerful testing with Python
-EAPI=6
-HOMEPAGE=http://pytest.org/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/pluggy-0.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] !<dev-python/logilab-common-1.3.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-3.6.3.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=68ff19a659f223992c3b49c9d6979fe0
diff --git a/metadata/md5-cache/dev-python/pytest-3.8.2 b/metadata/md5-cache/dev-python/pytest-3.8.2
deleted file mode 100644
index 0e9ea06386ba..000000000000
--- a/metadata/md5-cache/dev-python/pytest-3.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/pytest-xdist-1.22.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] !!dev-python/flaky !!dev-python/pytest-capturelog )
-DESCRIPTION=Simple powerful testing with Python
-EAPI=7
-HOMEPAGE=http://pytest.org/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-3.8.2.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=07fbc7148051163a49914675b6b982fb
diff --git a/metadata/md5-cache/dev-python/pytest-4.0.2 b/metadata/md5-cache/dev-python/pytest-4.0.2
deleted file mode 100644
index 6a146c46b673..000000000000
--- a/metadata/md5-cache/dev-python/pytest-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/setuptools-40[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] !!dev-python/flaky !!dev-python/pytest-capturelog )
-DESCRIPTION=Simple powerful testing with Python
-EAPI=7
-HOMEPAGE=http://pytest.org/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/setuptools-40[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest/pytest-4.0.2.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f27759d879c0695b32a6c4f379966111
diff --git a/metadata/md5-cache/dev-python/pytest-4.1.0 b/metadata/md5-cache/dev-python/pytest-4.1.0
new file mode 100644
index 000000000000..5fd384f8c820
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-4.1.0
@@ -0,0 +1,15 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/setuptools-40[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] test? ( >=dev-python/hypothesis-3.56[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] !!dev-python/flaky !!dev-python/pytest-capturelog )
+DESCRIPTION=Simple powerful testing with Python
+EAPI=7
+HOMEPAGE=http://pytest.org/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/attrs-17.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] python_targets_python2_7? ( dev-python/pathlib2[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/pathlib2[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/pathlib2[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/pluggy-0.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/py-1.5.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/setuptools-40[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] virtual/python-funcsigs[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest/pytest-4.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=709ebda1456824a0a4aa62e46533a660
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0
index 723e3e9e9e27..a4a957956737 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin that stores test expectations by saving the set of fa
 EAPI=6
 HOMEPAGE=https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=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_targets_python3_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_7(-)] dev-python/u-msgpack[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac6efa1a8398dda63f4821a23b9a6d0d
+_md5_=a3961152367205d25963aba8d699082c
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.6.3 b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
index 5123362ac16b..277c5f7b0176 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.6.3
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Thin-wrapper around the mock package for easier use with py.test
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-mock/
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=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_targets_python3_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_7(-)] python_targets_pypy? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/mock-2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.6.3.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dd7f0e0e1875b40a1fc28586496464e1
+_md5_=ae0a960207903b76ed17a6af489c6f00
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1 b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
index bb10cb610c63..92457d4af0c2 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Access the libmagic file type identification library
 EAPI=7
 HOMEPAGE=https://github.com/ahupp/python-magic
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~hppa ~ia64 ~x86
+KEYWORDS=~amd64 ~hppa ~ia64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=sys-apps/file[-python] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ahupp/python-magic/archive/0.4.15.tar.gz -> python-magic-0.4.15.gh.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c272c66a165b99ae782bee44cddcc94c
+_md5_=5785b283f44a7093326111664989ef54
diff --git a/metadata/md5-cache/dev-python/python-podman-0.12.1.2 b/metadata/md5-cache/dev-python/python-podman-0.12.1.2
new file mode 100644
index 000000000000..36dc42ed0b7a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-podman-0.12.1.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-varlink[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-39[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A library for communicating with a Podman server
+EAPI=7
+HOMEPAGE=https://github.com/containers/libpod/tree/master/contrib/python/podman/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/psutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-varlink[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v0.12.1.2.tar.gz -> libpod-0.12.1.2.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f7fd531ea95ed1c482321c4b737bd1a4
diff --git a/metadata/md5-cache/dev-python/python-varlink-29.0.2 b/metadata/md5-cache/dev-python/python-varlink-29.0.2
new file mode 100644
index 000000000000..d81d6638808f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-varlink-29.0.2
@@ -0,0 +1,16 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python implementation of the Varlink protocol
+EAPI=7
+HOMEPAGE=https://github.com/varlink/python
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/varlink/python/archive/29.0.2.tar.gz -> python-varlink-29.0.2.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=80e945e2770b2a125e7edba0d465e8da
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.4 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.4
deleted file mode 100644
index 0e4c0d358041..000000000000
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.10.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure 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(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/PyQt5[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.4:=
-DESCRIPTION=Python bindings for QScintilla
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/PyQt5[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.4:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.4.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d3f5621bf649cec7f7165882bc4c78c8
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.8 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.8
index 9bdc847b69e5..2d6b2bf281f5 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.10.8
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for QScintilla
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~ppc64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.8:=
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.8.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f7669811a482388a86e10c528ed3ed8e
+_md5_=b9a3f08bf8b6975efc2c05eff37a76f7
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8 b/metadata/md5-cache/dev-python/rfc3987-1.3.8
new file mode 100644
index 000000000000..121618fd0992
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_python3_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_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_7(-)?,-python_single_target_python3_7(-)] ) 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_targets_python3_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_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+DESCRIPTION=Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)
+EAPI=5
+HOMEPAGE=https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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_python3_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_7(-)?,-python_single_target_python3_7(-)] ) 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_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_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_7(-)?,-python_single_target_python3_7(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63b88ff3fa6bfc43436b037674b54acc
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.7.0 b/metadata/md5-cache/dev-python/rosdistro-0.7.0
new file mode 100644
index 000000000000..2dea7ffa0780
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rosdistro-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=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(-)] ) 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(-)]
+DEFINED_PHASES=compile configure install 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/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/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(-)] )
+DESCRIPTION=Tools to work with catkinized rosdistro files
+EAPI=7
+HOMEPAGE=http://wiki.ros.org/rosdistro
+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/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(-)] 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=https://github.com/ros-infrastructure/rosdistro/archive/0.7.0.tar.gz -> rosdistro-0.7.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1402a568641006d5fda9280fcb697fb0
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.0 b/metadata/md5-cache/dev-python/scrypt-0.8.0
index caa98d7a6fb1..d40ea0efc79d 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.0
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.0
@@ -1,15 +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(-)] 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(-)]
+DEPEND=dev-libs/openssl:0= 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(-)]
+RDEPEND=dev-libs/openssl:0= python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8fa2ae9990196381411891c81ca78f98
+_md5_=c066b1ebb38b7764e9b71a5c95872232
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.6 b/metadata/md5-cache/dev-python/scrypt-0.8.6
index 580485f31791..24904e436292 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.6
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+DEPEND=dev-libs/openssl:0= dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 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 python_targets_python3_7
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+RDEPEND=dev-libs/openssl:0= 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.6.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b46c28a8efdf3e897793c68f524ed2c9
+_md5_=a0055f15ae19192bc265cdc48913152b
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-3.1.0 b/metadata/md5-cache/dev-python/setuptools_scm-3.1.0
new file mode 100644
index 000000000000..df8386d21d52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-3.1.0
@@ -0,0 +1,15 @@
+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_targets_python3_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_7(-)] 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_targets_python3_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_7(-)] dev-vcs/git dev-vcs/mercurial ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+DESCRIPTION=package to manage versions by scm tags via setuptools
+EAPI=6
+HOMEPAGE=https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-3.1.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=366eddb136968af9c57a46081735c941
diff --git a/metadata/md5-cache/dev-python/simplekv-0.11.11 b/metadata/md5-cache/dev-python/simplekv-0.11.11
new file mode 100644
index 000000000000..6dc6d9be00fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplekv-0.11.11
@@ -0,0 +1,14 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A key-value storage for binary data, support many backends.
+EAPI=7
+HOMEPAGE=https://pypi.org/project/simplekv/ https://github.com/mbr/simplekv
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+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/simplekv/simplekv-0.11.11.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=13c17117feeba6cec996a95baab2a7f9
diff --git a/metadata/md5-cache/dev-python/sip-4.19.13 b/metadata/md5-cache/dev-python/sip-4.19.13
index f92ccbac8e77..42640254e202 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.13
+++ b/metadata/md5-cache/dev-python/sip-4.19.13
@@ -4,11 +4,11 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/sip/intro
 IUSE=debug doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( GPL-2 GPL-3 SIP )
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/pyqt/sip-4.19.13.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1c4fed14adc9894ccab2f3867ed526ed
+_md5_=5f76f9fdfb2398731866188a25bb86cb
diff --git a/metadata/md5-cache/dev-python/sip-4.19.14_pre1812231555 b/metadata/md5-cache/dev-python/sip-4.19.14_pre1812231555
index 17415c747567..302fbf9d9d2b 100644
--- a/metadata/md5-cache/dev-python/sip-4.19.14_pre1812231555
+++ b/metadata/md5-cache/dev-python/sip-4.19.14_pre1812231555
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0/12
 SRC_URI=https://dev.gentoo.org/~pesa/distfiles/sip-4.19.14.dev1812231555.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5fb0ef9d4ce1a0c1c882d03cc6dede74
+_md5_=df95e1ac1f66cac03995b3d97abfcd40
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.4 b/metadata/md5-cache/dev-python/snakeoil-0.7.4
deleted file mode 100644
index 6e0d10b9483d..000000000000
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.4
+++ /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(-)] 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[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(-)]
-DESCRIPTION=misc common functionality and useful optimizations
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/snakeoil
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=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=mirror://pypi/s/snakeoil/snakeoil-0.7.4.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=380a76bb995e94cc273ce2a51566d49a
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.5 b/metadata/md5-cache/dev-python/snakeoil-0.7.5
index a4ca5bca1d92..8ffb7a580fdc 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.5
@@ -4,11 +4,11 @@ DESCRIPTION=misc common functionality and useful optimizations
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/snakeoil
 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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=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/pkgcore/snakeoil/releases/download/v0.7.5/snakeoil-0.7.5.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1a7ebb45a608b81491dae2b53d0f70b4
+_md5_=01e23b6a418f2142e258865f46bb4754
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 54fb54aaab5f..c1d3278affbc 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)] dev-python/pytest-mock[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/cython[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(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=misc common functionality and useful optimizations
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/snakeoil
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
-RDEPEND=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 )
+RDEPEND=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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a7f5c62da0b261445f73d3ae4e8475b4
+_md5_=29bf6c7b6bd1b37fcc8fbd768b21bcf4
diff --git a/metadata/md5-cache/dev-python/toml-0.10.0 b/metadata/md5-cache/dev-python/toml-0.10.0
new file mode 100644
index 000000000000..ed7e9c96fd40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toml-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+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_targets_python3_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_7(-)]
+DESCRIPTION=Python library for handling TOML files
+EAPI=7
+HOMEPAGE=https://github.com/uiri/toml
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/t/toml/toml-0.10.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=b62d4a1df6704c26c05d66f5b3931dcc
diff --git a/metadata/md5-cache/dev-python/toml-0.9.6 b/metadata/md5-cache/dev-python/toml-0.9.6
deleted file mode 100644
index fe4de797caf2..000000000000
--- a/metadata/md5-cache/dev-python/toml-0.9.6
+++ /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(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library for handling TOML files
-EAPI=6
-HOMEPAGE=https://github.com/uiri/toml
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/t/toml/toml-0.9.6.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9c46bc976b261f0b1dd536d4ead5286e
diff --git a/metadata/md5-cache/dev-python/tox-3.6.0 b/metadata/md5-cache/dev-python/tox-3.6.0
deleted file mode 100644
index d0bafca598e6..000000000000
--- a/metadata/md5-cache/dev-python/tox-3.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-3.6[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pytest-4.0 <dev-python/pytest-mock-2.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=7
-HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/py[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_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_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tox/tox-3.6.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=7292964aaa86a7117f7a16dffd82d8a5
diff --git a/metadata/md5-cache/dev-python/tox-3.6.1 b/metadata/md5-cache/dev-python/tox-3.6.1
new file mode 100644
index 000000000000..31b18d0b6f95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-3.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pytest-4.0 <dev-python/pytest-mock-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/t/tox/tox-3.6.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ee480943d5d62907c88fdd6570832ad2
diff --git a/metadata/md5-cache/dev-python/uranium-3.3.0 b/metadata/md5-cache/dev-python/uranium-3.3.0
deleted file mode 100644
index 4f96056bdecb..000000000000
--- a/metadata/md5-cache/dev-python/uranium-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.3.0:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <dev-python/PyQt5-5.10[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Python framework for building 3D printing related applications
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.3.0:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <dev-python/PyQt5-5.10[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-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=0
-SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.3.0.tar.gz -> uranium-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0ddd56ed87a3d94b2e1c573e10d94a9e
diff --git a/metadata/md5-cache/dev-python/uranium-3.5.1 b/metadata/md5-cache/dev-python/uranium-3.5.1
deleted file mode 100644
index 83e04e9ea252..000000000000
--- a/metadata/md5-cache/dev-python/uranium-3.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.5.1:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <dev-python/PyQt5-5.10[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A Python framework for building 3D printing related applications
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.5.1:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] <dev-python/PyQt5-5.10[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-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=0
-SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.5.1.tar.gz -> uranium-3.5.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0ddd56ed87a3d94b2e1c573e10d94a9e
diff --git a/metadata/md5-cache/dev-python/uranium-3.6.0-r1 b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
new file mode 100644
index 000000000000..b6127e1757a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.6.0:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A Python framework for building 3D printing related applications
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/Uranium
+IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ~dev-libs/libarcus-3.6.0:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/Shapely[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+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=0
+SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.6.0.tar.gz -> uranium-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd538b24b68162f69b5eb603836dc9cc
diff --git a/metadata/md5-cache/dev-python/vertex-0.3.0-r1 b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
index 58ed9cc24ed6..db834c858f22 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/openssl >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[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(-)]
+DEPEND=dev-libs/openssl:0 >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=An implementation of the Q2Q protocol
 EAPI=5
 HOMEPAGE=https://github.com/twisted/vertex https://pypi.org/project/Vertex/
 IUSE=python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-libs/openssl >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[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(-)]
+RDEPEND=dev-libs/openssl:0 >=dev-python/epsilon-0.6.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/V/Vertex/Vertex-0.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ba176438007c0933d9b84081b98207b
+_md5_=1f8e64382361220cec4a173e67e0b2b7
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1 b/metadata/md5-cache/dev-python/webencodings-0.5.1
index de0e16aca9d3..01d623100fff 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Character encoding aliases for legacy web content
 EAPI=6
 HOMEPAGE=https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/webencodings/webencodings-0.5.1.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8fe9c1fdb9d3918a5fd69e78c297285f
+_md5_=473e6932df612cbe88169bc86004f76a
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 4bafba55db19..3ceb310ea007 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.11.3 b/metadata/md5-cache/dev-qt/assistant-5.11.3
index 085e2e97b419..2fa21b47bf19 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.11.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qthelp-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtprintsupport-5.11.3 ~dev-qt/qtsql-5.11.3[sqlite] ~dev-qt/qtwidgets-5.11.3 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6e6e46d3e2ef5adb3c3f24f1c26581c4
+_md5_=c530633bc4dbda399e09b3a9e0215c36
diff --git a/metadata/md5-cache/dev-qt/designer-5.11.3 b/metadata/md5-cache/dev-qt/designer-5.11.3
index 8f1348c6f166..eeb39ee47f99 100644
--- a/metadata/md5-cache/dev-qt/designer-5.11.3
+++ b/metadata/md5-cache/dev-qt/designer-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYG tool for designing and building Qt-based GUIs
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtprintsupport-5.11.3 ~dev-qt/qtwidgets-5.11.3 ~dev-qt/qtxml-5.11.3 declarative? ( ~dev-qt/qtdeclarative-5.11.3[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c10fcb59880c452a85529bdeaf8f6343
+_md5_=c07a692ffac31912a4278cc7caca1f6c
diff --git a/metadata/md5-cache/dev-qt/linguist-5.11.3 b/metadata/md5-cache/dev-qt/linguist-5.11.3
index 422f9d2a85ab..dc24b1bd07a3 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.11.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtprintsupport-5.11.3 ~dev-qt/qtwidgets-5.11.3 ~dev-qt/qtxml-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=709a02013460a0ea45f5810c361da473
+_md5_=f2599c72d4c50da910290722e471380c
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.11.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
index 918b02f676d2..6dfd238429cc 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtxml-5.11.3 qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=461745b222d9ec397323e1cb993aec71
+_md5_=058e77f28fee717f90205ccff34ce84c
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.11.3 b/metadata/md5-cache/dev-qt/pixeltool-5.11.3
index 15a828a832be..f3877a9fb314 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.11.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fcf5825ba210bd96f9b6510548b2fba3
+_md5_=b5222f88163fc3a78a032d8646be4ca2
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.11.3 b/metadata/md5-cache/dev-qt/qdbus-5.11.3
index e394c9656ca3..a02b724de928 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 ~dev-qt/qtxml-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cea7bd8dfa7b792119abecf939f0f1da
+_md5_=3c7c3a337676fceb0d31aac329086aa7
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
index 66801e5e90ad..76838fb0df5a 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 ~dev-qt/qtxml-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1fd93588be5354499eeec35d1d3e2d06
+_md5_=d9e6335083ef20f9fa12f6ea548a9a6b
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.11.3 b/metadata/md5-cache/dev-qt/qdoc-5.11.3
index 89a62360cf97..5bb0465be3a6 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.11.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ba443aa3c096178d9f964a98ee044ec4
+_md5_=c9fab24fdda092b5b67694c068f63c73
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.11.3_p201811291914 b/metadata/md5-cache/dev-qt/qt-docs-5.11.3_p201811291914
index 4d96c1ac76d7..1c05e52dcca7 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.11.3_p201811291914
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.11.3_p201811291914
@@ -4,9 +4,9 @@ DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=7
 HOMEPAGE=https://doc.qt.io/
 IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc/5.11.3-0-201811291914qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtcharts/5.11.3-0-201811291914qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtdatavis3d/5.11.3-0-201811291914qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtnetworkauth/5.11.3-0-201811291914qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtscript/5.11.3-0-201811291914qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtscript/5.11.3-0-201811291914qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtvirtualkeyboard/5.11.3-0-201811291914qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5113_src_doc_examples/qt.qt5.5113.doc.qtwebengine/5.11.3-0-201811291914qtwebengine-documentation.7z )
-_md5_=b92545856b080581d8038785b0980767
+_md5_=130a8232ad21e546de83cab0fd4e3f07
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.11.3 b/metadata/md5-cache/dev-qt/qt3d-5.11.3
index f6d0a0c9967d..adf3cf7d4dfc 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.11.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=The 3D module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.11.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c36b428f22c38a3d70b499d70d2e0618
+_md5_=7eff9092c4ec4bae16380f183de2251f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
index 826ea1349960..1bcb264d4a69 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.11.3 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=2ee69290b6221429c299011ecfff39f0
+_md5_=529b269c22c356a07a6db004bffdaa43
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
index 46b6f6902ea3..fb0d4fc01157 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=a128516f5f87a478f2ad1483c19d77d4
+_md5_=687147da287c7e376c9d3651af84cd44
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.3 b/metadata/md5-cache/dev-qt/qtcore-5.11.3
deleted file mode 100644
index 5394513f10ec..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.3 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.11
-SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=310f736653b2d0267cc9d4856fbba02a
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2 b/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2
new file mode 100644
index 000000000000..d6cbf12f9d97
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.11.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.3 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.11
+SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=40f396f4920263044b7919d573a86ba4
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.11.3 b/metadata/md5-cache/dev-qt/qtdbus-5.11.3
index f31081141db2..54b0acb09459 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1cd1fa41a9f8b37a084cc5c6bdf4fe9d
+_md5_=29d5a8cfe861439902137d1b9f9e92c1
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
index f577965c1d63..148ef159de51 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qttest-5.11.3 localstorage? ( ~dev-qt/qtsql-5.11.3 ) widgets? ( ~dev-qt/qtwidgets-5.11.3[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtxmlpatterns-5.11.3 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b494c355c7f9a56a384f62b6b7fe13b1
+_md5_=df554a0cc34021c0130ee758b3417f1c
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
index a43e6a7444de..41acfe41b707 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=12b3d728252eeaa8945c4b1663360854
+_md5_=1faf9c637143a6adf1eb585782d99a2c
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.11.3 b/metadata/md5-cache/dev-qt/qtgui-5.11.3
index e98d5521976b..4b41375835d7 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.11.3 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= >=sys-libs/zlib-1.2.5 virtual/opengl dbus? ( ~dev-qt/qtdbus-5.11.3 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.11.3 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.11.3 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXi-1.7.5 >=x11-libs/libxcb-1.10:=[xkb] >=x11-libs/libxkbcommon-0.4.1[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=487c91f7e00119808b2fc56882b00733
+_md5_=3a597c05138a2ed2aa366a78ecdf461c
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.11.3 b/metadata/md5-cache/dev-qt/qthelp-5.11.3
index e052e5a59095..c1e6571f04ec 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.11.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtsql-5.11.3[sqlite] ~dev-qt/qtwidgets-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=0718425463c65cdd9377a65916934d45
+_md5_=1ac2c4a20dc2c53dc4864ac0010913fc
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.11.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
index 03b39222750d..e0b04894d4e1 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=72374f8cb886bcb8bd61a63633c3f931
+_md5_=47925c0d85bf521a89a804d323c52579
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
index 9ac4bcca4f99..056c0727c854 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.11.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Location module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtpositioning-5.11.3[qml] ~dev-qt/qtsql-5.11.3 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7e31c454d1ed535d1fe7de859db72a1b
+_md5_=b12d8388912385d724f8b6236b47c7e3
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
index 232b882334fd..65384b7bf144 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtnetwork-5.11.3 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio ) qml? ( ~dev-qt/qtdeclarative-5.11.3 gles2? ( ~dev-qt/qtgui-5.11.3[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.11.3 ~dev-qt/qtwidgets-5.11.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ff3b94d4eef013bcb2b98811b08eeb46
+_md5_=693e84c54ef1ea1c16082b6d3d0e1336
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.11.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
index 90c2584594c7..e9764204d265 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman libproxy networkmanager +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.11.3 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.11.3 ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b3659f10bb081f2eaafdd78da13425d8
+_md5_=1a44a39f619b47c06ab9f97251694f2f
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.11.3 b/metadata/md5-cache/dev-qt/qtopengl-5.11.3
index 95664a091b86..5d4b4380b199 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtwidgets-5.11.3[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b044c8190d71765447af9d9fb393acce
+_md5_=dc1a2fb36858bff4315b9d7524c56933
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.11.3 b/metadata/md5-cache/dev-qt/qtpaths-5.11.3
index 1115480f8c88..b2394909cf9c 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7d5883d4a1d1d9c044695501c28235d2
+_md5_=eea80fa39d87c01326f1fcb953acadb3
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.11.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
index 2a7391fd60f0..9efc0e0f3acb 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue +qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND=~dev-qt/qtcore-5.11.3 geoclue? ( ~dev-qt/qtdbus-5.11.3 ) qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.11.3-geoclue2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1be123d06d92b6e6cdc96ff3cbbb58b4
+_md5_=45f927aa4a2b20c081a17d73261bfd56
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
index e9467deb6949..f5467b7e96f3 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=] ~dev-qt/qtwidgets-5.11.3[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=dc2ee3b58f7214f2006b80082fa7053b
+_md5_=ea54e63d39f79957785b40d4f0fd76db
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
index 2dfd28eaff95..5346ceb6df9c 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of controls used in conjunction with Qt Quick to build complete
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 widgets? ( ~dev-qt/qtwidgets-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=19448e68a4d66b40f3b3fa8b3867dc3d
+_md5_=65433975c16f22f18e7d889cac2a2f57
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
index 0be114d62630..40e8b845a353 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 widgets? ( ~dev-qt/qtwidgets-5.11.3 ) ~dev-qt/qtgraphicaleffects-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=94816705778df36c1aef3ab3083d3f0d
+_md5_=544dd37287338575a6a3c358812b05d9
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.11.3 b/metadata/md5-cache/dev-qt/qtscript-5.11.3
index 060de1151bf7..e896e2f82eef 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 scripttools? ( ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=3d0a295a62ddc5244cf00cc7d02aeb69
+_md5_=a7f9bf405f548ce16a6772f1290e5622
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.11.3 b/metadata/md5-cache/dev-qt/qtscxml-5.11.3
index 31b88ac4ff93..a24c7b4d62dc 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5ea63038fdcb8d0be50a69809afb4efe
+_md5_=393b5b27c510e952d46a08c419289a78
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.11.3 b/metadata/md5-cache/dev-qt/qtsensors-5.11.3
index 3bd2e0cc4cb4..08673bfd6f25 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdbus-5.11.3 qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f02b691b4817ed71557f41f8aa44e15e
+_md5_=81d5a92a8ecebc13cc023aaf405f8f18
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.11.3 b/metadata/md5-cache/dev-qt/qtserialport-5.11.3
index 7766d13d188b..43b0c91ed603 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=9bbb3e0bb57494c16c77c1a60115e379
+_md5_=055340c3b96891bc84a8a196b2bb402f
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.11.3 b/metadata/md5-cache/dev-qt/qtspeech-5.11.3
index bacc89431cc9..9981f1a029d4 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=99822ee6b774f57292e05027916d64c8
+_md5_=86f8cb446bf31dd201ab39bcee62756e
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.11.3 b/metadata/md5-cache/dev-qt/qtsql-5.11.3
index 769af26c5aad..23a13156a3f5 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 freetds? ( dev-db/freetds ) mysql? ( virtual/libmysqlclient:= ) oci8? ( dev-db/oracle-instantclient-basic ) odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.10.2:3 ) dev-qt/qtchooser
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d4d41a663333e2a5a44b26ab0312bdc7
+_md5_=5bea8eeb656367e7c928773e2bda3393
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.11.3 b/metadata/md5-cache/dev-qt/qtsvg-5.11.3
index 3282310b4914..87ca9016c733 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtwidgets-5.11.3 >=sys-libs/zlib-1.2.5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=e9e18def06e0ad44b2761b6aa6a10046
+_md5_=e0ff5b56ef8396f5c7011781b322a34f
diff --git a/metadata/md5-cache/dev-qt/qttest-5.11.3 b/metadata/md5-cache/dev-qt/qttest-5.11.3
index c07743fa38d6..6aff48abbef0 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.11.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=36b5ab578c2f87cd885aa210ca01b18f
+_md5_=de264abb57713f38c5fbcbf2d6503d9f
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.11.3 b/metadata/md5-cache/dev-qt/qttranslations-5.11.3
index 6d18071934b1..ba06123d11e6 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.11.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=67ca0ef7cd552dca1c805661ae2cefff
+_md5_=82825800662d14da10e535c8c72cb4bc
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
index 01f6e6e62704..6ae865f21b26 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Virtual keyboard plugin for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtsvg-5.11.3 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=782c6b9b20ba566d46cb7ab3f2bb94cf
+_md5_=8ef1186d2c09b314f3af8e106b4891db
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.11.3 b/metadata/md5-cache/dev-qt/qtwayland-5.11.3
index 54f8054d269b..9f7416223c7f 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5a1b182dbe0586fc2c139c9a38f8e73b
+_md5_=352674f72f5deb3f52c1259c81321e7c
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
index 88b2ea37d897..533bb5ae47a4 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=11f26c476eed35f2a16c32254f87c8f7
+_md5_=71d252f05796b80ebedded008496624c
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
index ed24ac32a1ef..b32e02cbdf14 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.3
@@ -4,7 +4,7 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.3 ~dev-qt/qtdeclarative-5.11.3 ~dev-qt/qtgui-5.11.3 ~dev-qt/qtnetwork-5.11.3 ~dev-qt/qtprintsupport-5.11.3 ~dev-qt/qtwebchannel-5.11.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.3 ) geolocation? ( ~dev-qt/qtpositioning-5.11.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.3[widgets] ~dev-qt/qtwidgets-5.11.3 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5c4f316693c06327d3e39296a3b7d504
+_md5_=7179820a2a4137bb908bf824588c3496
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
index 30eaca51f182..9fc0fb714667 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3[ssl=] qml? ( ~dev-qt/qtdeclarative-5.11.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=90f6a853a2129b36cff7f1f109c0fc0f
+_md5_=f17e91322b55eaf08d3fb710d0836f01
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.11.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
index 968f054efd1f..a106d9ca090c 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.11.3[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=0140b3ad0f825df8f9c44b797c4bc42b
+_md5_=18b59ba1db8bc5e9a37f400de33858d1
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.11.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
index 9034cc591e96..a6050d428d77 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtgui-5.11.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=927906309fe6a8fa6f89a0367b6ad834
+_md5_=234fccbf707cb07d0905b378d3dc5feb
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.11.3 b/metadata/md5-cache/dev-qt/qtxml-5.11.3
index 0aaec9feb84f..249fd9ce7e2b 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=83104c218d2d09b33b8509e03fea8d8b
+_md5_=231c8962d54790bcf70b689bd85ee8a0
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
index 15900f701714..368426ce3fab 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.11.3 ~dev-qt/qtnetwork-5.11.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	0a5654b011bf54859714f9d21d90a727	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=39c2b5cbe759d9004c9f052f013d130c
+_md5_=0fa8c3a8e22722d4632aa710707276a8
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index b4776ec69bdf..257029b95ebf 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/dynamic_reconfigure-1.6.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0
new file mode 100644
index 000000000000..59168636ff0c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.9.6 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(-)] )
+DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp 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(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.6.0.tar.gz -> dynamic_reconfigure-1.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4e3941cb0d42830192d45ef0dfba1e49
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.7 b/metadata/md5-cache/dev-ros/ivcon-0.1.7
new file mode 100644
index 000000000000..ec8eb6184ff6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 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=Mesh Conversion Utility
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/ivcon/archive/0.1.7.tar.gz -> ivcon-0.1.7.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c12a7b633a10521e6d084055c9e4fb3
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.6 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.6
new file mode 100644
index 000000000000..0f904bb45e5d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 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/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/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(-)] )
+DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters 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/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/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(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.6.tar.gz -> laser_assembler-1.7.6.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=674fef94121722022d0546f32c920089
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.4.2 b/metadata/md5-cache/dev-ros/openni2_camera-0.4.2
new file mode 100644
index 000000000000..604af3644820
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_camera-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 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 drivers for the Asus Xtion and Primesense Devices
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] 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-drivers/openni2_camera/archive/0.4.2.tar.gz -> openni2_camera-0.4.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=64d615ea1066e754cf66d5e4b50910f2
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-0.4.2
new file mode 100644
index 000000000000..ebe5a9985784
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_launch-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-devel/make >=dev-util/cmake-3.9.6 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=Launch files to start the openni2_camera drivers using rgbd_launch
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils 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-drivers/openni2_camera/archive/0.4.2.tar.gz -> openni2_camera-0.4.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7daa5936384eef9c78de010e29474d4c
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index 846e9e0c702c..0b620e1a0d92 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf 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/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils 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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1a47b31f5093f8d1960fb09222f17652
+_md5_=7daa5936384eef9c78de010e29474d4c
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r1
deleted file mode 100644
index 9ca74abc2c72..000000000000
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= sys-devel/make >=dev-util/cmake-3.9.6 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=Set of tools for recording from and playing back ROS message
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= 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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=220bb676727492c24efa930cf762ec29
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2 b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2
new file mode 100644
index 000000000000..2c02a464b329
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.14.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 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=Set of tools for recording from and playing back ROS message
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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/ros_comm/archive/1.14.3.tar.gz -> ros_comm-1.14.3.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=26c9eecea162439b7a8755b981e42ff8
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 444bd1f1d7bc..41c6794b1183 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 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=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= 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/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme 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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=220bb676727492c24efa930cf762ec29
+_md5_=26c9eecea162439b7a8755b981e42ff8
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.13.6 b/metadata/md5-cache/dev-ros/rosconsole-1.13.6
deleted file mode 100644
index 38340ad8c6ab..000000000000
--- a/metadata/md5-cache/dev-ros/rosconsole-1.13.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) sys-devel/make >=dev-util/cmake-3.9.6 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 console output library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/ros_comm
-IUSE=+log4cxx glog python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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/ros_comm/archive/1.13.6.tar.gz -> ros_comm-1.13.6.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f756b6b85ddade142254e9f41492edea
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.13.9 b/metadata/md5-cache/dev-ros/rosconsole-1.13.9
new file mode 100644
index 000000000000..2d1cd0a7e355
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.13.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) sys-devel/make >=dev-util/cmake-3.9.6 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 console output library
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
+IUSE=+log4cxx glog python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) 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/rosconsole/archive/1.13.9.tar.gz -> rosconsole-1.13.9.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3bf3d7abc51cd199744a65ef78d6ce5b
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.0 b/metadata/md5-cache/dev-ros/xacro-1.13.0
deleted file mode 100644
index 5a482abc10b4..000000000000
--- a/metadata/md5-cache/dev-ros/xacro-1.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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=XML macro language
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[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/xacro/archive/1.13.0.tar.gz -> xacro-1.13.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2382b53167f5ef64ad129a239dab5939
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.1 b/metadata/md5-cache/dev-ros/xacro-1.13.1
deleted file mode 100644
index 1f57fb9772bb..000000000000
--- a/metadata/md5-cache/dev-ros/xacro-1.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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=XML macro language
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[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/xacro/archive/1.13.1.tar.gz -> xacro-1.13.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2382b53167f5ef64ad129a239dab5939
diff --git a/metadata/md5-cache/dev-ros/xacro-1.13.3 b/metadata/md5-cache/dev-ros/xacro-1.13.3
new file mode 100644
index 000000000000..a71ad54b4eb9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xacro-1.13.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 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=XML macro language
+EAPI=5
+HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[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/xacro/archive/1.13.3.tar.gz -> xacro-1.13.3.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ros-catkin	0d420151b2dd779013f9b4443109f8a4	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ee41c64c571d9e41476a76fad0f1bf26
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 81bcb81faacd..0df11c8e552a 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/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index dd822ada8792..3abf210bad5a 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ab16d83dd48258645165650fa6c7c72d
+_md5_=9564994574a7b4bfa1aea41aae26c266
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.0 b/metadata/md5-cache/dev-ruby/activestorage-5.2.0
index de081714f8e2..16de8a95f20e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.0
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Attach cloud and local files in Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.0:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.0:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.0.tar.gz -> rails-5.2.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=11235b3445e1c0e38b874f300ed9e8c3
+_md5_=7b66d46f5765d9d4c3902ffb95044592
diff --git a/metadata/md5-cache/dev-ruby/activestorage-5.2.2 b/metadata/md5-cache/dev-ruby/activestorage-5.2.2
index 349e60c2cf4f..2a49558a9500 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-5.2.2
+++ b/metadata/md5-cache/dev-ruby/activestorage-5.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Attach cloud and local files in Rails applications
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.2:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.2:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.2:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.2:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.2:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.2:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.2.tar.gz -> rails-5.2.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5f9be5d1071fba1cc61ccf33bec72177
+_md5_=95b0b62ddb55e35a92796b839152c91c
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.5.2 b/metadata/md5-cache/dev-ruby/addressable-2.5.2
index ea3a6f93714f..0d3571ec8c07 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.5.2
+++ b/metadata/md5-cache/dev-ruby/addressable-2.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby26] <dev-ruby/public_suffix-4:*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A replacement for the URI implementation that is part of Ruby's standard library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby23] <dev-ruby/public_suffix-4:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby24] <dev-ruby/public_suffix-4:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby25] <dev-ruby/public_suffix-4:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/public_suffix-2.0.2:*[ruby_targets_ruby26] <dev-ruby/public_suffix-4:*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.5.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=104bd33604fcda6389044d38bed767c6
+_md5_=d7e5724dada9f0cca4be7900b1d0cfbf
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
new file mode 100644
index 000000000000..141d0101fdd4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Provides POSIX tarchive management from Ruby programs
+EAPI=6
+HOMEPAGE=https://github.com/halostatue/minitar
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( BSD-2 Ruby )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> archive-tar-minitar-0.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=830a8bda251011986df4b5175c94ad7e
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.7 b/metadata/md5-cache/dev-ruby/asciimath-1.0.7
new file mode 100644
index 000000000000..e8d2c0f7a91b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
+EAPI=6
+HOMEPAGE=https://github.com/pepijnve/asciimath
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/asciimath-1.0.7.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5c0d59e7c889a160944acc5d9f2d24ef
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.100 b/metadata/md5-cache/dev-ruby/atomic-1.1.100
deleted file mode 100644
index 6716d66ebef6..000000000000
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
-EAPI=5
-HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/atomic-1.1.100.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=149f5fb59760eacdd0b79d76132415ba
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101 b/metadata/md5-cache/dev-ruby/atomic-1.1.101
index e54c019c7507..6bd4e7755052 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
 EAPI=5
 HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.101.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dbad7c19fdfa1895f76995c763bfaeaa
+_md5_=4a9de8fe5cdfee48cf9fc441f93dc251
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
deleted file mode 100644
index 0628513dad03..000000000000
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
-EAPI=5
-HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/atomic-1.1.99.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7907c384e4c2697bac7d9d1e8a3b79eb
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 8a09d543d5a1..0ba518686a0b 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Small RSpec clone weighing less than 350 LoC
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/bacon
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f3b818a37856385e9277797f019c234c
+_md5_=88100d2eb3eb5984c9cb67e3a9aa54a7
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 45e29add072d..112ed69741c6 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Base class with almost all of the methods from Object and Kernel being removed
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=35b0620a81ce04525e2d55e4822d6517
+_md5_=9faac4ed07e48e6198dbb4bb1da213b8
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.3 b/metadata/md5-cache/dev-ruby/builder-3.2.3
index 3e0c33a07fc8..648845f01005 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.3
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=5
 HOMEPAGE=http://onestepback.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3d106d09596037bc9e4e2fb1de3fb4ac
+_md5_=4dcc18e113aa8bf2ed3d87b64a60ed23
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.17.4 b/metadata/md5-cache/dev-ruby/celluloid-0.17.4
new file mode 100644
index 000000000000..0eae63583cee
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.17.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/celluloid-essentials[ruby_targets_ruby24] dev-ruby/celluloid-extras[ruby_targets_ruby24] dev-ruby/celluloid-fsm[ruby_targets_ruby24] dev-ruby/celluloid-pool[ruby_targets_ruby24] dev-ruby/celluloid-supervision[ruby_targets_ruby24] >=dev-ruby/timers-4.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/dotenv[ruby_targets_ruby23] dev-ruby/nenv[ruby_targets_ruby23] dev-ruby/rspec-retry[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/dotenv[ruby_targets_ruby24] dev-ruby/nenv[ruby_targets_ruby24] dev-ruby/rspec-retry[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Provides a simple and natural way to build fault-tolerant concurrent programs
+EAPI=6
+HOMEPAGE=https://github.com/celluloid/celluloid
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/celluloid-essentials[ruby_targets_ruby23] dev-ruby/celluloid-extras[ruby_targets_ruby23] dev-ruby/celluloid-fsm[ruby_targets_ruby23] dev-ruby/celluloid-pool[ruby_targets_ruby23] dev-ruby/celluloid-supervision[ruby_targets_ruby23] >=dev-ruby/timers-4.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/celluloid-essentials[ruby_targets_ruby24] dev-ruby/celluloid-extras[ruby_targets_ruby24] dev-ruby/celluloid-fsm[ruby_targets_ruby24] dev-ruby/celluloid-pool[ruby_targets_ruby24] dev-ruby/celluloid-supervision[ruby_targets_ruby24] >=dev-ruby/timers-4.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/celluloid-0.17.4.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b12d423732d8cccd40b8d2d0807194da
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index f70c6a6823ca..a1def1e45a29 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/coffee-script-source[ruby_targets_ruby25] dev-ruby/execjs:*[ruby_targets_ruby25] ) ) 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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/coffee-script-source[ruby_targets_ruby25] dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/coffee-script-source[ruby_targets_ruby26] dev-ruby/execjs:*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
 EAPI=5
 HOMEPAGE=https://github.com/rails/ruby-coffee-script https://github.com/rails/coffee-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/coffee-script-source[ruby_targets_ruby25] dev-ruby/execjs:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/coffee-script-source[ruby_targets_ruby23] dev-ruby/execjs:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/coffee-script-source[ruby_targets_ruby24] dev-ruby/execjs:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/coffee-script-source[ruby_targets_ruby25] dev-ruby/execjs:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/coffee-script-source[ruby_targets_ruby26] dev-ruby/execjs:*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.4.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c745dec5777e328e4b7aab0c8ec7b843
+_md5_=a6d8366a1a099e8a03e2a010955387cb
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
index 546d6df30561..213f6e0b40e6 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby CoffeeScript is a bridge to the official CoffeeScript compiler
 EAPI=5
 HOMEPAGE=http://coffeescript.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.12.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=187fa0cb00ebc95ac58642ea5972c610
+_md5_=6a163c968b04e320f6d22b5956cb2046
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index d01b2a0a7c09..977b47250dcd 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/timecop-0.7.4[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Modern concurrency tools including agents, futures, promises, thread pools, more
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8c7525363e37209ecf30ab857428cc58
+_md5_=fcba84c9dc6bdd819352e8a36dc07610
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
index df26f7c737db..e65eb5f01b50 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Generic connection pooling for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/mperham/connection_pool
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=40f440d295e4cbc22099db727ddd632f
+_md5_=1d173269fe011c9c9e236bcbed958148
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.5.3 b/metadata/md5-cache/dev-ruby/coolio-1.5.3
index ae91d12f1ad3..d938b2754341 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.5.3
+++ b/metadata/md5-cache/dev-ruby/coolio-1.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
 EAPI=6
 HOMEPAGE=https://coolio.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.5.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=821a46d0b7812bd405b98c45a1731ea6
+_md5_=03f9282636edae28402b1a0f8770bea9
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.6 b/metadata/md5-cache/dev-ruby/curses-1.2.6
new file mode 100644
index 000000000000..5baab07e236a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/ncurses:0 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
+EAPI=6
+HOMEPAGE=https://github.com/ruby/curses
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Ruby BSD-2 )
+RDEPEND=sys-libs/ncurses:0 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/curses-1.2.6.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f8a131fc6c867c055ffa98183c36f03c
diff --git a/metadata/md5-cache/dev-ruby/curses-1.2.7 b/metadata/md5-cache/dev-ruby/curses-1.2.7
new file mode 100644
index 000000000000..888cb7cf331d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/curses-1.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/ncurses:0 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby binding for curses, ncurses, and PDCurses
+EAPI=6
+HOMEPAGE=https://github.com/ruby/curses
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Ruby BSD-2 )
+RDEPEND=sys-libs/ncurses:0 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1
+SRC_URI=mirror://rubygems/curses-1.2.7.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f8a131fc6c867c055ffa98183c36f03c
diff --git a/metadata/md5-cache/dev-ruby/dbf-4.0.1 b/metadata/md5-cache/dev-ruby/dbf-4.0.1
new file mode 100644
index 000000000000..7adc11f2c205
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dbf-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=a small fast library for reading dBase, xBase, Clipper and FoxPro database files
+EAPI=6
+HOMEPAGE=https://github.com/infused/dbf
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/dbf-4.0.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=8fad42f5801a3d3406c865b65d1b721c
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index 29cc20d8aa6f..1b96954d7675 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c566ed67e97e7632591dd40f89cd9764
+_md5_=0083a242aa95f2b613f0de3b53bb2c36
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.5.0-r1 b/metadata/md5-cache/dev-ruby/dotenv-2.5.0-r1
new file mode 100644
index 000000000000..e9807864b647
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.5.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/spring[ruby_targets_ruby23] dev-ruby/rails[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/spring[ruby_targets_ruby24] dev-ruby/rails[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/spring[ruby_targets_ruby25] dev-ruby/rails[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Loads environment variables from .env into ENV
+EAPI=6
+HOMEPAGE=https://github.com/bkeepers/dotenv
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=2
+SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.5.0.tar.gz -> dotenv-2.5.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ea83e4d16d482f3486d01302d0aaedba
diff --git a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0 b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
index 71f7c5ceb6e9..ddaaf5de3e75 100644
--- a/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
+++ b/metadata/md5-cache/dev-ruby/ecma-re-validator-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Validate a regular expression string against what ECMA-262 can actually do
 EAPI=6
 HOMEPAGE=https://github.com/gjtorikian/ecma-re-validator
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/regexp_parser-1.2:1[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/ecma-re-validator-0.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bc6e841795ef59772f2cc735b9b710fa
+_md5_=8f9a0a592c768d9d7a70b2b6bae25247
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index ad2e1c46e674..cf92ecd618fb 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Erubis is an implementation of eRuby
 EAPI=5
 HOMEPAGE=http://www.kuwata-lab.com/erubis/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=700267f78bb347d6bd472c1890e67e8f
+_md5_=1e3211d14e8dba1fe5fb67e7759c3450
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.12.0 b/metadata/md5-cache/dev-ruby/ethon-0.12.0
new file mode 100644
index 000000000000..e65d09643a73
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ethon-0.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/sinatra[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/sinatra[ruby_targets_ruby24] dev-ruby/mime-types[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/sinatra[ruby_targets_ruby25] dev-ruby/mime-types[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Very lightweight libcurl wrapper
+EAPI=6
+HOMEPAGE=https://github.com/typhoeus/ethon
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=net-misc/curl ruby_targets_ruby23? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ffi-1.3.0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/ethon-0.12.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0a232dfa5cfb8d1c179f33a05098d8fe
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.7.0 b/metadata/md5-cache/dev-ruby/execjs-2.7.0
index fdb0cc2e7e3f..eeb6861ad553 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.7.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=ExecJS lets you run JavaScript code from Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rails/execjs
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=MIT
-RDEPEND=|| ( net-libs/nodejs ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=|| ( net-libs/nodejs ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.7.0.tar.gz -> execjs-2.7.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=738dd2115634ba4f4aa8783b4786f4ec
+_md5_=13bb4e665014eb4bf7c04861b143b30d
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.10.0 b/metadata/md5-cache/dev-ruby/ffi-1.10.0
new file mode 100644
index 000000000000..8320afd863c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libffi ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
+EAPI=6
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/libffi 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ffi/ffi/archive/1.10.0.tar.gz -> ffi-git-1.10.0.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=152e3fff239dae81e12cec97b970f4e3
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.4.2 b/metadata/md5-cache/dev-ruby/globalid-0.4.2
new file mode 100644
index 000000000000..542b038ff848
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/globalid-0.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby23] >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby24] >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/activemodel-4.2.0[ruby_targets_ruby25] >=dev-ruby/railties-4.2.0[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Reference models by URI
+EAPI=6
+HOMEPAGE=https://github.com/rails/globalid
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/rails/globalid/archive/v0.4.2.tar.gz -> globalid-0.4.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d50f9b815192d51fa9f3741082b30586
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.8 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.8
index 24a23b23837b..a78e53ef62b0 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.8
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Simple Hash extension to make working with nested hashes easier
 EAPI=6
 HOMEPAGE=https://github.com/liufengyun/hashdiff
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.8.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=00b798214dab7d3a4b59573a1c126280
+_md5_=ff5330821c71841a29ee44f052148d51
diff --git a/metadata/md5-cache/dev-ruby/http-form_data-2.1.1 b/metadata/md5-cache/dev-ruby/http-form_data-2.1.1
index 2b3287635ccc..5abe8c3cea15 100644
--- a/metadata/md5-cache/dev-ruby/http-form_data-2.1.1
+++ b/metadata/md5-cache/dev-ruby/http-form_data-2.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Utility-belt to build form data request bodies
 EAPI=6
 HOMEPAGE=https://github.com/httprb/form_data.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/http-form_data-2.1.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7fd562689b88820de747e382dff3d214
+_md5_=12df8692c57684850b6bb3a31b008947
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index b0a5679d8612..4c82a386371f 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/blankslate[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/blankslate[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/blankslate[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/blankslate[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/blankslate[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/blankslate[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/blankslate[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby object
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d691637c55db2ef46d0eadacad7751f8
+_md5_=48cd221186ee55b50464a2ffb46d4427
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index aa2442a4f739..6c7e04ee744f 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=IO::Buffer is a byte queue which is intended for non-blocking I/O applications
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/iobuffer
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f2ccb5364d83a9383dcb526800e6ed58
+_md5_=e5a01f2f7f2335464f9f00c9013227ab
diff --git a/metadata/md5-cache/dev-ruby/json_schema-0.20.1 b/metadata/md5-cache/dev-ruby/json_schema-0.20.1
new file mode 100644
index 000000000000..d2f959530003
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/json_schema-0.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A JSON Schema V4 and Hyperschema V4 parser and validator
+EAPI=6
+HOMEPAGE=https://github.com/brandur/json_schema
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/brandur/json_schema/archive/v0.20.1.tar.gz -> json_schema-0.20.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0e78b2ee1edfc1daee9040d8946c5c37
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
index 2d5e4219e49a..8d2b410fb84f 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple mime type detection using magic numbers, filenames, and exten
 EAPI=6
 HOMEPAGE=https://github.com/basecamp/marcel
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/marcel-0.3.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=be07db0eb0514db6af72cf7a5ff068b2
+_md5_=fbd5f351a691e4617b717619d62de1e7
diff --git a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
index e252f5e5bc09..b79020acb9aa 100644
--- a/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/marcel-0.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple mime type detection using magic numbers, filenames, and exten
 EAPI=6
 HOMEPAGE=https://github.com/basecamp/marcel
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mimemagic-0.3.2:0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/basecamp/marcel/archive/v0.3.3.tar.gz -> marcel-0.3.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8cbd35440aa284b3d42cf0afa6ecb9ba
+_md5_=ece0f8d374763b81afa0c598e3d47e1c
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.2.2 b/metadata/md5-cache/dev-ruby/mime-types-3.2.2
index 72c101d7b3cc..0c9e03727d34 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.2.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby23] dev-ruby/minitest-hooks:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby24] dev-ruby/minitest-hooks:1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby25] dev-ruby/minitest-hooks:1[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby23] dev-ruby/minitest-hooks:1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby24] dev-ruby/minitest-hooks:1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby25] dev-ruby/minitest-hooks:1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/minitest-bonus-assertions:2[ruby_targets_ruby26] dev-ruby/minitest-hooks:1[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.2.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=917f9c764c2668a02a0ce7d0a972b49d
+_md5_=36ef4b34972f6dde752e8206c5ebcee2
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812
index d8a3bd9644f3..6ff01266cfbb 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2018.0812
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Registry for information about MIME media type definitions
 EAPI=6
 HOMEPAGE=https://github.com/mime-types/mime-types-data
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2018.0812.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d5af99b876f2eb3ab084cdd6b3aa5a8b
+_md5_=6c213424bd4b8968ecb2ae1742323a2b
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
index 0f6aafc1ab0b..958257bff1e1 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast mime detection by extension or content
 EAPI=5
 HOMEPAGE=https://github.com/minad/mimemagic
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7f71c2317d6a31941818bace78e26592
+_md5_=bf9859963a64feef1a249d03e8305226
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.3 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.3
index b6fd65e7f5ff..9c64d73431ce 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.3
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Fast mime detection by extension or content
 EAPI=6
 HOMEPAGE=https://github.com/minad/mimemagic
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2eb11165aaccf99c7368ab2c870ac1d1
+_md5_=1afacd4e1cb35533d4b07c097d915fad
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
index 1e260a0ac042..de1054cdf422 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulate images with minimal use of memory
 EAPI=6
 HOMEPAGE=https://github.com/minimagick/minimagick
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=media-gfx/imagemagick 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.8.0.tar.gz -> mini_magick-4.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a40175e95331b3a14d18dcf73f16ea02
+_md5_=a85dde42a9d983cd4f283cd978d24caa
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.9.2 b/metadata/md5-cache/dev-ruby/mini_magick-4.9.2
index ec41fdd8f83b..76128765041f 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.9.2
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Manipulate images with minimal use of memory
 EAPI=6
 HOMEPAGE=https://github.com/minimagick/minimagick
 IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=media-gfx/imagemagick 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.9.2.tar.gz -> mini_magick-4.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e9ec2c28aff3add70c453986d5b5d01a
+_md5_=704f3f1a7f937c788233dbd770c436a5
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
index 6869d9bf5f5f..ddb33937a391 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/minitest-pretty_diff[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/minitest-pretty_diff[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] dev-ruby/minitest-pretty_diff[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/minitest-pretty_diff[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/minitest-pretty_diff[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26] dev-ruby/minitest-pretty_diff[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Bonus assertions for minitest
 EAPI=6
 HOMEPAGE=https://github.com/halostatue/minitest-bonus-assertions
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-3.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d51db4cff7d2364edc1715e01d33725e
+_md5_=d844d6e139bbc6fcf51faa017c5f09d8
diff --git a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0 b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
index f3695a0aee46..4ffb32965d69 100644
--- a/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
+++ b/metadata/md5-cache/dev-ruby/minitest-hooks-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Adds around and before_all/after_all/around_all hooks for Minitest
 EAPI=6
 HOMEPAGE=https://github.com/jeremyevans/minitest-hooks
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/minitest-hooks-1.5.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=349a54c6afb7113bceae4a94efe808fd
+_md5_=ccc0c259c2b8074ba80327290a3c49b4
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index 1dbfa1440d55..68b1f9e3e06d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Pretty-print hashes and arrays before diffing them in MiniTest
 EAPI=5
 HOMEPAGE=https://github.com/adammck/minitest-pretty_diff
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-pretty_diff-0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=24024c841e8c1bcee2ba67798875c236
+_md5_=bfbd76ec793f74d098473652d0a4c5a6
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.7.0 b/metadata/md5-cache/dev-ruby/mocha-1.7.0
index aae09dfbd615..632b8dbd28f5 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.7.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] dev-ruby/introspection[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] dev-ruby/introspection[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26] dev-ruby/introspection[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=6
 HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.7.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b8bdcf7314aa917f40c1975f3b53ef04
+_md5_=5e244418667254c46c4ff4806d22e1fb
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.2.6 b/metadata/md5-cache/dev-ruby/msgpack-1.2.6
new file mode 100644
index 000000000000..7b10548f7096
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Binary-based efficient data interchange format for ruby binding
+EAPI=6
+HOMEPAGE=https://msgpack.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/msgpack-1.2.6.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=855528ca00dea0a71bfdb2f722efa643
diff --git a/metadata/md5-cache/dev-ruby/mustermann-1.0.3 b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
index 0a98ff2496c1..d2c2e6b2e739 100644
--- a/metadata/md5-cache/dev-ruby/mustermann-1.0.3
+++ b/metadata/md5-cache/dev-ruby/mustermann-1.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A library implementing patterns that behave like regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/sinatra/mustermann
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/mustermann-1.0.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6e429fdf3b310f6938ea45f8db4953c3
+_md5_=6e83197280d30f0d08889a353bbca674
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index ca7a1d3e9b3e..1ca9347ce46c 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Convenient wrapper for Ruby's ENV
 EAPI=5
 HOMEPAGE=https://github.com/e2/nenv
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e5d1f6b9d59a2de4464f5459fdf2ce9d
+_md5_=77e8c1b839ac436ab2d5a6631ec79c0f
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.9.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.9.1
index 23b1eb219da6..fab2ef586039 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.9.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.8 >=dev-libs/libxslt-1.1.30 virtual/libiconv ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/hoe[ruby_targets_ruby25] >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby25] dev-ruby/rexical[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=>=dev-libs/libxml2-2.9.8 >=dev-libs/libxslt-1.1.30 virtual/libiconv ruby_targets_ruby23? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby23] dev-ruby/rexical[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] dev-ruby/racc[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby24] dev-ruby/rexical[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby25] dev-ruby/rexical[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.1.7[ruby_targets_ruby26] dev-ruby/rexical[ruby_targets_ruby26] dev-ruby/rdoc[ruby_targets_ruby26] dev-ruby/racc[ruby_targets_ruby26] test? ( dev-ruby/minitest[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=6
 HOMEPAGE=https://www.nokogiri.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.8:= >=dev-libs/libxslt-1.1.30 virtual/libiconv 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=>=dev-libs/libxml2-2.9.8:= >=dev-libs/libxslt-1.1.30 virtual/libiconv 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.9.1.tar.gz -> nokogiri-1.9.1-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b3685582ddcab84c2d2c608c272d870b
+_md5_=9e06a4dd17ebc8951979af03cc37dd10
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
new file mode 100644
index 000000000000..6a27ab5004b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=OpenSSL CBC-MAC (CCM) ruby gem
+EAPI=6
+HOMEPAGE=https://github.com/SmallLars/openssl-ccm
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1.2.2
+SRC_URI=mirror://rubygems/openssl-ccm-1.2.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5f5037004dffd95d14b76634d23e219b
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
index e84f4ba5d647..d79afd2d449f 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.13-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library that implements a subset of the Ruby 1.9 Process::spawn
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/posix-spawn/
 IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT LGPL-2.1
 RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4960fc566882568e5194b4290999aa84
+_md5_=c3f885ae7aa3b4ede8149f95e105b0d1
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-3.0.3 b/metadata/md5-cache/dev-ruby/public_suffix-3.0.3
index da33e6ba81a9..fa3666cd24a4 100644
--- a/metadata/md5-cache/dev-ruby/public_suffix-3.0.3
+++ b/metadata/md5-cache/dev-ruby/public_suffix-3.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/public_suffix-3.0.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f0094b332f4b1e46def955c4741ba37f
+_md5_=48773c55ba78be47f54014db3ae9e766
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.6 b/metadata/md5-cache/dev-ruby/rack-2.0.6
index d5961d2860c0..54a56cb4909c 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.6
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/concurrent-ruby[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/concurrent-ruby[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/concurrent-ruby[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/concurrent-ruby[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/concurrent-ruby[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26] ) !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=38e31170c115b6f51cc7af52dcac8ded
+_md5_=769c0858f6d287a6267a6a7ee50df8df
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.0.5 b/metadata/md5-cache/dev-ruby/rack-protection-2.0.5
index 39a5daaf685d..fc43b20ce4b0 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-2.0.5
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) 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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=This gem protects against typical web attacks
 EAPI=6
 HOMEPAGE=https://github.com/rkh/rack-protection
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/rack-protection-2.0.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13695c2d888423907110877e84959bb8
+_md5_=2261dca235343870f0119f259a0427ea
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.0 b/metadata/md5-cache/dev-ruby/rails-5.2.0
index f05c4eeb5357..e42763f932f4 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.0
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=http://www.rubyonrails.org
 IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby23] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby23] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby23] ~dev-ruby/railties-5.2.0[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby24] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby24] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby24] ~dev-ruby/railties-5.2.0[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.0[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.0[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.0[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.0[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.0[ruby_targets_ruby25] ~dev-ruby/activestorage-5.2.0[ruby_targets_ruby25] ~dev-ruby/activesupport-5.2.0[ruby_targets_ruby25] ~dev-ruby/railties-5.2.0[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] =dev-ruby/bundler-1*[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25] ) ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=mirror://rubygems/rails-5.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ec517d266969c2963a02005a4196b07f
+_md5_=cfaf25b58c3048158396569fab37f513
diff --git a/metadata/md5-cache/dev-ruby/rails-5.2.2 b/metadata/md5-cache/dev-ruby/rails-5.2.2
index 0f755449025b..edc9355ecebe 100644
--- a/metadata/md5-cache/dev-ruby/rails-5.2.2
+++ b/metadata/md5-cache/dev-ruby/rails-5.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=ruby on rails is a web-application and persistance framework
 EAPI=6
 HOMEPAGE=https://rubyonrails.org
 IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.2.2[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.2.2[ruby_targets_ruby23] ~dev-ruby/actionpack-5.2.2[ruby_targets_ruby23] ~dev-ruby/actionview-5.2.2[ruby_targets_ruby23] ~dev-ruby/activejob-5.2.2[ruby_targets_ruby23] ~dev-ruby/activemodel-5.2.2[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.2[ruby_targets_ruby23] ~dev-ruby/activestorage-5.2.2[ruby_targets_ruby23] ~dev-ruby/activesupport-5.2.2[ruby_targets_ruby23] ~dev-ruby/railties-5.2.2[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.2.2[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.2.2[ruby_targets_ruby24] ~dev-ruby/actionpack-5.2.2[ruby_targets_ruby24] ~dev-ruby/actionview-5.2.2[ruby_targets_ruby24] ~dev-ruby/activejob-5.2.2[ruby_targets_ruby24] ~dev-ruby/activemodel-5.2.2[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.2[ruby_targets_ruby24] ~dev-ruby/activestorage-5.2.2[ruby_targets_ruby24] ~dev-ruby/activesupport-5.2.2[ruby_targets_ruby24] ~dev-ruby/railties-5.2.2[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( ~dev-ruby/actioncable-5.2.2[ruby_targets_ruby25] ~dev-ruby/actionmailer-5.2.2[ruby_targets_ruby25] ~dev-ruby/actionpack-5.2.2[ruby_targets_ruby25] ~dev-ruby/actionview-5.2.2[ruby_targets_ruby25] ~dev-ruby/activejob-5.2.2[ruby_targets_ruby25] ~dev-ruby/activemodel-5.2.2[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.2[ruby_targets_ruby25] ~dev-ruby/activestorage-5.2.2[ruby_targets_ruby25] ~dev-ruby/activesupport-5.2.2[ruby_targets_ruby25] ~dev-ruby/railties-5.2.2[ruby_targets_ruby25] >=dev-ruby/bundler-1.3[ruby_targets_ruby25] =dev-ruby/bundler-1*[ruby_targets_ruby25] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby25] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby25] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby25] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby25] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby25] ) ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=5.2
 SRC_URI=mirror://rubygems/rails-5.2.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=69baddf1400a009111657025740f17f0
+_md5_=a7bbe06b829052b9ed09d5864290bfa9
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.2.2 b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
index 9fbfe2d7154a..bcfffcec1726 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.2.2
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=6
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.2.2.tar.gz -> rainbow-git-2.2.2.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=129dabd79e164e4f0780b6d5b208fa4f
+_md5_=9c0d61d8e94953ce9d6e45165fa4978e
diff --git a/metadata/md5-cache/dev-ruby/rainbow-3.0.0 b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
index 5409545d5f0d..ec37b28865a3 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-3.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Colorize printed text on ANSI terminals
 EAPI=6
 HOMEPAGE=https://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/sickill/rainbow/archive/v3.0.0.tar.gz -> rainbow-git-3.0.0.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=03a4c49c650c8f00004ceca24f3f0c23
+_md5_=1a5a71b21123ed77d95b15c59cba1c15
diff --git a/metadata/md5-cache/dev-ruby/rake-10.5.0 b/metadata/md5-cache/dev-ruby/rake-10.5.0
deleted file mode 100644
index e61684644a3e..000000000000
--- a/metadata/md5-cache/dev-ruby/rake-10.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/gzip ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.8[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Make-like scripting in Ruby
-EAPI=5
-HOMEPAGE=https://github.com/jimweirich/rake
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rake-10.5.0.gem
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4fc1fef4537ef30fde4b00e3ed255a3d
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.0.7 b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.7
new file mode 100644
index 000000000000..2a8b0ebdf531
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] dev-ruby/rspec:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] dev-ruby/rspec:2[ruby_targets_ruby25] ) ) 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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Provide a standard and simplified way to build and package Ruby extensions
+EAPI=6
+HOMEPAGE=https://github.com/luislavena/rake-compiler
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.0.7.tar.gz -> rake-compiler-1.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f59d720e96439685ba041b40cdf68c72
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
index 48715f868e2a..c70be09c3c7e 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=6
 HOMEPAGE=https://github.com/nex3/rb-inotify
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.10.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=560fcc3f54d83f07fb692df2e4e57ac8
+_md5_=bc6d63187feee884b0d79f5f561f7a61
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.3.0 b/metadata/md5-cache/dev-ruby/rdoc-4.3.0
deleted file mode 100644
index 25e176b3ebbf..000000000000
--- a/metadata/md5-cache/dev-ruby/rdoc-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-ruby/racc[ruby_targets_ruby23] test? ( >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
-EAPI=5
-HOMEPAGE=https://github.com/rdoc/rdoc/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Ruby MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/json-1.4:0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rdoc-4.3.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13238737e3bb043f50bb0894a61d98e4
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.3.0 b/metadata/md5-cache/dev-ruby/regexp_parser-1.3.0
index f9ad51cf2d3b..ab2ba5914efa 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-1.3.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.3.0.tar.gz -> regexp_parser-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a600ff083e06b27af264088f4466ca57
+_md5_=20932426f4d7c2569edd67ae20659e64
diff --git a/metadata/md5-cache/dev-ruby/regexp_property_values-0.3.4 b/metadata/md5-cache/dev-ruby/regexp_property_values-0.3.4
index 2b24585c5553..bdb22a2d9d8d 100644
--- a/metadata/md5-cache/dev-ruby/regexp_property_values-0.3.4
+++ b/metadata/md5-cache/dev-ruby/regexp_property_values-0.3.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=See which property values are supported by the regular expression engine
 EAPI=6
 HOMEPAGE=https://github.com/janosch-x/regexp_property_values
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/janosch-x/regexp_property_values/archive/v0.3.4.tar.gz -> regexp_property_values-0.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=04a51b40e84cd63c02d6e19f45e69345
+_md5_=93d20d868d667695f36f55dcf1b10088
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r4 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r4
new file mode 100644
index 000000000000..41ef553d25a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Rexical is a lexical scanner generator
+EAPI=6
+HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=!!app-admin/rex 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/rexical-1.0.5.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2051ebd0cfa5df95cc9e1bfeebb16869
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-3.8.0
index cf5808d28663..79515d952bcf 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.8.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ) 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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby26] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.8.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=14a00fc7957b0b1f7e6c2f5644e1bb1f
+_md5_=d1c7851a093c39cc0a39434670e567b7
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1
new file mode 100644
index 000000000000..a375c23dd1f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby25] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] dev-ruby/syntax[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby26] >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] dev-ruby/syntax[ruby_targets_ruby26] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-3.8.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-core
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.0.tar.gz -> rspec-core-3.8.0-git.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4deee93b6a5798f7805bf5573c76cba8
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
index 5a82dd85e016..a75d51d9b013 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-support-3.5.0:3[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-expectations
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] <dev-ruby/diff-lcs-2[ruby_targets_ruby24] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] <dev-ruby/diff-lcs-2[ruby_targets_ruby25] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] <dev-ruby/diff-lcs-2[ruby_targets_ruby26] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.2.tar.gz -> rspec-expectations-3.8.2-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e2c584f265a259b204cf033320d3c0c5
+_md5_=f66b164e9519ba43dc838fedc4852b41
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
index 877146dfa2a5..6e2c8efd1cc1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-its
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=13d5ef5d492e90786d17682848e986c4
+_md5_=fdd5aeea7dcba5ab937479a90d2cd245
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
index a724b5d0ff66..1ccd62596565 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby25] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby26] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-mocks
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.8.0.tar.gz -> rspec-mocks-3.8.0-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7a9e74f810b690993b36734fa55dbed6
+_md5_=88669bc1ab9f4045e9f3c30b45fe99f5
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
index f580ee21e263..322987b45e9c 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby25] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-3.8.0:3[ruby_targets_ruby26] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-support
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.0.tar.gz -> rspec-support-3.8.0-git.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f1501c4aa84b44e8f5e710c43d43d918
+_md5_=786a2a897ce9221fd7b26610fb3c20c1
diff --git a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0 b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
index a23797d10541..4d969a3aab8a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby_dep-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Creates a version constraint of supported Rubies,suitable for a gemspec file
 EAPI=5
 HOMEPAGE=https://github.com/e2/ruby_dep
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/ruby_dep-1.5.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b4daa86004586e75b5e71337baadd980
+_md5_=442f4b91a1c9e579f23d49bbe94a6ad8
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
deleted file mode 100644
index d1b9df49794b..000000000000
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Simply adds a declarative test method syntax to test/unit
-EAPI=5
-HOMEPAGE=https://github.com/svenfuchs/test_declarative
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.5 -> test_declarative-0.0.5.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=086d5102797edcd69d6e06f7bbb9383b
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
index 30619ffe4230..5ce95eedf7cb 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby25] ) ) 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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Simply adds a declarative test method syntax to test/unit
 EAPI=5
 HOMEPAGE=https://github.com/svenfuchs/test_declarative
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.6 -> test_declarative-0.0.6.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=477e520ec0790739ad87c97b65e70ae1
+_md5_=8e11eaa11edb3af4387fa7c71d812e6b
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index 64ca42417f63..6b694b80eed0 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7aff680f3529fea623b24ad9bb3a73c5
+_md5_=577eb344e437d96d89dc765502449beb
diff --git a/metadata/md5-cache/dev-ruby/thor-0.20.3 b/metadata/md5-cache/dev-ruby/thor-0.20.3
index 9a969388e668..7bc00d69a8f9 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.20.3
+++ b/metadata/md5-cache/dev-ruby/thor-0.20.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/childlabor[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/childlabor[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/childlabor[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.20.3.tar.gz -> thor-git-0.20.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a70a71c2fa9f6904ee0bb6a5354e20f
+_md5_=1386a16c3c8725ce4bb913c26aab80a3
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index b97354c9321b..1b4f2e860eaa 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Test helper for ordering threaded code
 EAPI=6
 HOMEPAGE=https://github.com/JoshCheek/thread_order
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_order-1.1.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=94a8d81bde9cca4b964a822b431fafe5
+_md5_=306fbcc4c36d02e0fcad4a9c64217ba2
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 828b6d2b1130..247a6a19dc61 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby25] ) ) 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_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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/atomic-1.1.16[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A collection of thread-safe versions of common core Ruby classes
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/thread_safe
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b1a7efa4bc1c54c40c1e4d442143c999
+_md5_=83b7e210acac419ecd01a177a108e874
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index e63a3791dad0..e6dadf4ae23e 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.9.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8330999e7414260091dbff9725f1937a
+_md5_=a4f34e5cba4fef2ae1f9fa1df1999793
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
index 173dadb7ef02..bdaf08056897 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Daylight-savings aware timezone library
 EAPI=6
 HOMEPAGE=https://tzinfo.github.io/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=sys-libs/timezone-data ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.5.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4320586b2fef234fc0b8c98baf373d15
+_md5_=7ce4df91e86f76b3a84858e3a06812db
diff --git a/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.2 b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.2
new file mode 100644
index 000000000000..11f1d704f1b3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vagrant_cloud-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( >=dev-ruby/rake-10.4[ruby_targets_ruby23] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/rake-10.4[ruby_targets_ruby24] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( >=dev-ruby/rake-10.4[ruby_targets_ruby25] test? ( >=dev-ruby/webmock-3.0[ruby_targets_ruby25] ) ) 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Vagrant Cloud API Library
+EAPI=6
+HOMEPAGE=https://github.com/hashicorp/vagrant_cloud
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rest-client-2.0.2[ruby_targets_ruby25] ) 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vagrant_cloud/archive/v2.0.2.tar.gz -> vagrant_cloud-2.0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=eeb802dfa360c467de9c93e695cfa1b3
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
index 7f2d55734c3e..feeda6c4f531 100644
--- a/metadata/md5-cache/dev-ruby/vcr-1.11.3
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/vcr-1.11.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=23be80526b24a5c251ded123d5b18652
+_md5_=e183f88ce5dbaf61a79a4c362394aec5
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
index 63c9bb188787..951289128b63 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl 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_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) 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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=dev-libs/yajl 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl 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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=dev-libs/yajl 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.4.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a3b11c02b00d9572c4cc8cbdd3106dc3
+_md5_=e4c5324a5ae0a5cf57a9b6d7f0d1f351
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.2 b/metadata/md5-cache/dev-ruby/zentest-4.11.2
new file mode 100644
index 000000000000..49e8ab97176d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby23] dev-ruby/hoe-seattlerb[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby24] dev-ruby/hoe-seattlerb[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby25] dev-ruby/hoe-seattlerb[ruby_targets_ruby25] dev-ruby/minitest:5[ruby_targets_ruby25] ) ) 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_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_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_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_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails
+EAPI=6
+HOMEPAGE=https://github.com/seattlerb/zentest
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby
+RDEPEND=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_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_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/ZenTest-4.11.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=04ffb0c706ba68742d93091e37590512
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index a6167fd0542d..51000212d28b 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/tcllib-1.19 b/metadata/md5-cache/dev-tcltk/tcllib-1.19
index 8896ddfae555..8f64cff6b091 100644
--- a/metadata/md5-cache/dev-tcltk/tcllib-1.19
+++ b/metadata/md5-cache/dev-tcltk/tcllib-1.19
@@ -4,10 +4,10 @@ DESCRIPTION=Tcl Standard Library
 EAPI=6
 HOMEPAGE=http://www.tcl.tk/software/tcllib/
 IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-tcltk/tdom
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/tcllib/1.19/tcllib-1.19.tar.xz
 _eclasses_=virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=eb9bc201d8589ae08b273bab076c865c
+_md5_=1fbe5cfadbc04d5a415baaf191c7e6c2
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
index c366afc0876e..c80d9de4aff2 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
 EAPI=5
 HOMEPAGE=https://tdom.github.com/
 IUSE=static-libs threads
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MPL-1.1
 RDEPEND=dev-lang/tcl:0= dev-libs/expat
 SLOT=0
 SRC_URI=mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0da4376e82127fc2c791cb7b6e91cc2
+_md5_=7e636e08b3451c96b84637d4a1b40b6f
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 8fe6a1814de9..ee6e48eabb70 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/biber-2.7 b/metadata/md5-cache/dev-tex/biber-2.7
index 577e50b2800e..0875b533c52a 100644
--- a/metadata/md5-cache/dev-tex/biber-2.7
+++ b/metadata/md5-cache/dev-tex/biber-2.7
@@ -4,10 +4,10 @@ DESCRIPTION=A BibTeX replacement for users of biblatex
 EAPI=6
 HOMEPAGE=http://biblatex-biber.sourceforge.net/ https://github.com/plk/biber/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=Artistic-2
 RDEPEND=>=dev-lang/perl-5.24 dev-perl/autovivification dev-perl/Business-ISBN dev-perl/Business-ISMN dev-perl/Business-ISSN dev-perl/Class-Accessor dev-perl/Data-Compare dev-perl/Data-Dump dev-perl/Data-Uniqid dev-perl/DateTime-Calendar-Julian dev-perl/DateTime-Format-Builder dev-perl/Encode-EUCJPASCII dev-perl/Encode-HanExtra dev-perl/Encode-JIS2K dev-perl/File-Slurp dev-perl/IPC-Run3 dev-perl/libwww-perl[ssl] >=dev-perl/Lingua-Translit-0.250 dev-perl/List-AllUtils dev-perl/List-MoreUtils dev-perl/List-MoreUtils-XS dev-perl/Log-Log4perl dev-perl/LWP-Protocol-https dev-perl/Regexp-Common dev-perl/Sort-Key >=dev-perl/Text-BibTeX-0.760.0 dev-perl/Text-CSV dev-perl/Text-CSV_XS dev-perl/Text-Roman dev-perl/URI >=dev-perl/Unicode-LineBreak-2016.3.0 >=virtual/perl-Unicode-Normalize-1.250.0 >=dev-perl/XML-LibXML-1.70 dev-perl/XML-LibXML-Simple dev-perl/XML-LibXSLT dev-perl/XML-Writer ~dev-tex/biblatex-3.7 virtual/perl-IPC-Cmd >=virtual/perl-Unicode-Collate-1.190.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/plk/biber/archive/v2.7.tar.gz -> biber-2.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=0f30fd280127a9f19f00e8a5b2de0b5a
+_md5_=9ca0fb2217fe2f4323d8f90393703e86
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.7-r1 b/metadata/md5-cache/dev-tex/biblatex-3.7-r1
index 039d29b26444..33397c3c673c 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.7-r1
+++ b/metadata/md5-cache/dev-tex/biblatex-3.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 EAPI=6
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
 IUSE=+biber doc examples
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=LPPL-1.3
 PDEPEND=biber? ( ~dev-tex/biber-2.7 )
 RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/biblatex/biblatex-3.7.tds.tgz
 _eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
-_md5_=c373a527f980904825c2b9a2e1c755fd
+_md5_=25612407013659f53c7adf4485e96524
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7f285119de1e..37c4439122bb 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/bingrep-0.6.1 b/metadata/md5-cache/dev-util/bingrep-0.6.1
new file mode 100644
index 000000000000..856b4ff057ec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bingrep-0.6.1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Binary file analysis tool
+EAPI=7
+HOMEPAGE=https://github.com/m4b/bingrep
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/m4b/bingrep/archive/d61355612f914200d422fe0fceff918b45d4bdfb.tar.gz -> bingrep-0.6.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.2.6/download -> byteorder-1.2.6.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cpp_demangle/0.2.12/download -> cpp_demangle-0.2.12.crate https://crates.io/api/v1/crates/csv/1.0.2/download -> csv-1.0.2.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/encode_unicode/0.3.5/download -> encode_unicode-0.3.5.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/goblin/0.0.19/download -> goblin-0.0.19.crate https://crates.io/api/v1/crates/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/memchr/2.1.0/download -> memchr-2.1.0.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.1.1/download -> metagoblin-0.1.1.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.5/download -> regex-1.0.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/scroll/0.9.2/download -> scroll-0.9.2.crate https://crates.io/api/v1/crates/scroll_derive/0.9.5/download -> scroll_derive-0.9.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.80/download -> serde-1.0.80.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/structopt/0.2.12/download -> structopt-0.2.12.crate https://crates.io/api/v1/crates/structopt-derive/0.2.12/download -> structopt-derive-0.2.12.crate https://crates.io/api/v1/crates/syn/0.15.13/download -> syn-0.15.13.crate https://crates.io/api/v1/crates/synstructure/0.10.0/download -> synstructure-0.10.0.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=b89a4a5c04a875ff194d783ea49e0065
diff --git a/metadata/md5-cache/dev-util/bitcoin-tx-0.17.1 b/metadata/md5-cache/dev-util/bitcoin-tx-0.17.1
new file mode 100644
index 000000000000..f5d58da1f356
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bitcoin-tx-0.17.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Command-line Bitcoin transaction tool
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=823a17d8639ed9d704ef0692be5551ef
diff --git a/metadata/md5-cache/dev-util/cargo-0.30.0 b/metadata/md5-cache/dev-util/cargo-0.30.0
index bef0c60b8309..04f0d671e44b 100644
--- a/metadata/md5-cache/dev-util/cargo-0.30.0
+++ b/metadata/md5-cache/dev-util/cargo-0.30.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install unpack
+DEFINED_PHASES=compile configure install test unpack
 DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= >=virtual/rust-1.28.0 dev-util/cmake sys-apps/coreutils sys-apps/diffutils sys-apps/findutils sys-apps/sed
 DESCRIPTION=The Rust's package manager
 EAPI=6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/rust-lang/cargo/archive/0.30.0.tar.gz -> cargo-0.30.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bufstream/0.1.3/download -> bufstream-0.1.3.crate https://crates.io/api/v1/crates/cargo/0.30.0/download -> cargo-0.30.0.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.1/download -> core-foundation-0.6.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.1/download -> core-foundation-sys-0.6.1.crate https://crates.io/api/v1/crates/crates-io/0.18.0/download -> crates-io-0.18.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.2.6/download -> crossbeam-channel-0.2.6.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.0/download -> crossbeam-epoch-0.6.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crypto-hash/0.3.1/download -> crypto-hash-0.3.1.crate https://crates.io/api/v1/crates/curl/0.4.17/download -> curl-0.4.17.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/flate2/1.0.2/download -> flate2-1.0.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.5/download -> git2-0.7.5.crate https://crates.io/api/v1/crates/git2-curl/0.8.1/download -> git2-curl-0.8.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.3/download -> home-0.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.4/download -> ignore-0.4.4.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jobserver/0.1.11/download -> jobserver-0.1.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.8/download -> libgit2-sys-0.7.8.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.11/download -> libssh2-sys-0.2.11.crate https://crates.io/api/v1/crates/libz-sys/1.0.22/download -> libz-sys-1.0.22.crate https://crates.io/api/v1/crates/lock_api/0.1.3/download -> lock_api-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.0/download -> memchr-2.1.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.10/download -> miniz-sys-0.1.10.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.10.12/download -> openssl-0.10.12.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-src/110.0.7+1.1.0i/download -> openssl-src-110.0.7+1.1.0i.crate https://crates.io/api/v1/crates/openssl-sys/0.9.36/download -> openssl-sys-0.9.36.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.19/download -> proc-macro2-0.4.19.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.5/download -> regex-1.0.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.2/download -> rustfix-0.4.2.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/same-file/1.0.3/download -> same-file-1.0.3.crate https://crates.io/api/v1/crates/schannel/0.1.13/download -> schannel-0.1.13.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.79/download -> serde-1.0.79.crate https://crates.io/api/v1/crates/serde_derive/1.0.79/download -> serde_derive-1.0.79.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.28/download -> serde_json-1.0.28.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/syn/0.15.4/download -> syn-0.15.4.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/tar/0.4.16/download -> tar-0.4.16.crate https://crates.io/api/v1/crates/tempfile/3.0.4/download -> tempfile-3.0.4.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.1/download -> url-1.7.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.5/download -> walkdir-2.2.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate amd64? ( https://static.rust-lang.org/dist/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/cargo-0.29.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/cargo-0.29.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/cargo-0.29.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/cargo-0.29.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/cargo-0.29.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/cargo-0.29.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/cargo-0.29.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	rust-toolchain	f9b504d977266122e1891048638138c6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multiprocessing	cac3169468f893670dac3e7cb940e045	rust-toolchain	f9b504d977266122e1891048638138c6	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d826501ec645de66494a77ba6596d9d0
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.6.6 b/metadata/md5-cache/dev-util/cbindgen-0.6.6
index 402acfd2e43b..09dde38880ec 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.6.6
+++ b/metadata/md5-cache/dev-util/cbindgen-0.6.6
@@ -1,5 +1,5 @@
 BDEPEND=virtual/cargo
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DESCRIPTION=A tool for generating C bindings to Rust code
 EAPI=7
 HOMEPAGE=https://github.com/eqrion/cbindgen/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/cbindgen/0.6.6/download -> cbindgen-0.6.6.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/libc/0.2.41/download -> libc-0.2.41.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/proc-macro2/0.4.4/download -> proc-macro2-0.4.4.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/quote/0.6.3/download -> quote-0.6.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/serde/1.0.64/download -> serde-1.0.64.crate https://crates.io/api/v1/crates/serde_derive/1.0.58/download -> serde_derive-1.0.58.crate https://crates.io/api/v1/crates/serde_json/1.0.19/download -> serde_json-1.0.19.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.13.11/download -> syn-0.13.11.crate https://crates.io/api/v1/crates/syn/0.14.1/download -> syn-0.14.1.crate https://crates.io/api/v1/crates/tempfile/3.0.3/download -> tempfile-3.0.3.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=b21e3f224b57a0fc2cadd35f4eed8b6f
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.6.7 b/metadata/md5-cache/dev-util/cbindgen-0.6.7
index 1f79c9b3ff7b..2c6f2537dfc5 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.6.7
+++ b/metadata/md5-cache/dev-util/cbindgen-0.6.7
@@ -1,5 +1,5 @@
 BDEPEND=virtual/cargo
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DESCRIPTION=A tool for generating C bindings to Rust code
 EAPI=7
 HOMEPAGE=https://github.com/eqrion/cbindgen/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/cbindgen/0.6.7/download -> cbindgen-0.6.7.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.2/download -> dtoa-0.4.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/itoa/0.4.1/download -> itoa-0.4.1.crate https://crates.io/api/v1/crates/libc/0.2.41/download -> libc-0.2.41.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/proc-macro2/0.4.4/download -> proc-macro2-0.4.4.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/quote/0.6.3/download -> quote-0.6.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/serde/1.0.64/download -> serde-1.0.64.crate https://crates.io/api/v1/crates/serde_derive/1.0.58/download -> serde_derive-1.0.58.crate https://crates.io/api/v1/crates/serde_json/1.0.19/download -> serde_json-1.0.19.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.13.11/download -> syn-0.13.11.crate https://crates.io/api/v1/crates/syn/0.14.1/download -> syn-0.14.1.crate https://crates.io/api/v1/crates/tempfile/3.0.3/download -> tempfile-3.0.3.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=a9f18c8863896c6512b71bee2bb5e713
diff --git a/metadata/md5-cache/dev-util/ccache-3.4.3 b/metadata/md5-cache/dev-util/ccache-3.4.3
deleted file mode 100644
index f8149bae1137..000000000000
--- a/metadata/md5-cache/dev-util/ccache-3.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm
-DEPEND=app-arch/xz-utils sys-libs/zlib
-DESCRIPTION=fast compiler cache
-EAPI=6
-HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.4.3.tar.xz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=160f50b92f9e96cfa46213783012d7fc
diff --git a/metadata/md5-cache/dev-util/ccache-3.5.1a b/metadata/md5-cache/dev-util/ccache-3.5.1a
new file mode 100644
index 000000000000..e6505c852fa5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-3.5.1a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare prerm test
+DEPEND=app-arch/xz-utils sys-libs/zlib
+DESCRIPTION=fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.samba.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.5.1a.tar.xz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=6ee253142ac02ebe7aa1fc59f7ae99b1
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.86 b/metadata/md5-cache/dev-util/cppcheck-1.86
index 60e44eb4dd10..0221631a32f0 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.86
+++ b/metadata/md5-cache/dev-util/cppcheck-1.86
@@ -5,11 +5,11 @@ DESCRIPTION=Static analyzer of C/C++ code
 EAPI=7
 HOMEPAGE=http://cppcheck.sourceforge.net
 IUSE=htmlreport pcre qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 hppa ~ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/tinyxml2:= htmlreport? ( 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(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport: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 ) 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/danmar/cppcheck/archive/1.86.tar.gz -> cppcheck-1.86.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=afbd3d36e636b71897a0bbbf0f1386a2
+_md5_=2f9c354d26955dca8664ac2508607e4d
diff --git a/metadata/md5-cache/dev-util/cpptest-2.0.0 b/metadata/md5-cache/dev-util/cpptest-2.0.0
new file mode 100644
index 000000000000..c67daa374bff
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cpptest-2.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=Simple but powerful unit testing framework for C++
+EAPI=7
+HOMEPAGE=https://github.com/cpptest/cpptest
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!dev-util/cpptest:0
+SLOT=1
+SRC_URI=https://github.com/cpptest/cpptest/releases/download/2.0.0/cpptest-2.0.0.tar.bz2
+_md5_=2b733211ecd0aa6d1ee1aea3154e4757
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1
deleted file mode 100644
index 69ff495ac1df..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/xz-utils python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
-DESCRIPTION=GDBus code and documentation generator
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2+
-PDEPEND=>=dev-libs/glib-2.56.2:2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
-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_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.2.tar.xz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b567561f789022da6818dbdbe225178
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.4 b/metadata/md5-cache/dev-util/gdbus-codegen-2.56.4
index c8060eb66c56..bf643675c61c 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.56.4
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.56.4
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~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 ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.56.4:2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.4.tar.xz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ca3a3715ac7a83c8e1975f9d573a7db9
+_md5_=025707958e14e36771f1ac4326ffa3f7
diff --git a/metadata/md5-cache/dev-util/geany-1.34.1 b/metadata/md5-cache/dev-util/geany-1.34.1
new file mode 100644
index 000000000000..12691da71978
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-1.34.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GTK+ based fast and lightweight IDE
+EAPI=6
+HOMEPAGE=https://www.geany.org
+IUSE=+gtk3 +vte
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ HPND
+RDEPEND=>=dev-libs/glib-2.32:2 !gtk3? ( >=x11-libs/gtk+-2.24:2 vte? ( x11-libs/vte:0 ) ) gtk3? ( >=x11-libs/gtk+-3.0:3 vte? ( x11-libs/vte:2.91 ) )
+SLOT=0
+SRC_URI=https://download.geany.org/geany-1.34.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58a11539481e32aaf20d7230fd7b1481
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
deleted file mode 100644
index 6384a1fff938..000000000000
--- a/metadata/md5-cache/dev-util/glade-3.20.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) 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_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8: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_python3_7(-),python_single_target_python2_7(+)] ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A user interface designer for GTK+ and GNOME
-EAPI=6
-HOMEPAGE=https://glade.gnome.org/
-IUSE=debug +introspection python python_targets_python2_7 test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) 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_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8: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_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=3.10/6
-SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=15a89d7e462c8925351c0d77d6d6c938
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.56.2 b/metadata/md5-cache/dev-util/glib-utils-2.56.2
deleted file mode 100644
index d861303c1c59..000000000000
--- a/metadata/md5-cache/dev-util/glib-utils-2.56.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] !<dev-libs/glib-2.56.2:2 app-arch/xz-utils
-DESCRIPTION=Build utilities for GLib using projects
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] !<dev-libs/glib-2.56.2:2
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=30ecbccd0ab45702075a204918d4bce9
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.56.4 b/metadata/md5-cache/dev-util/glib-utils-2.56.4
index f5af77cc2663..81a122f0f3c9 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.56.4
+++ b/metadata/md5-cache/dev-util/glib-utils-2.56.4
@@ -4,11 +4,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.56/glib-2.56.4.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=702efdcff6e5d77209b05bdba23f4ec9
+_md5_=5a12f9a9976026ebbdaba347e4111bf0
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index 448350bdc4aa..f121dcd9c0e6 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -7,5 +7,5 @@ IUSE=+qt5 zstd debug test
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kconfigwidgets-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kitemmodels-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/threadweaver-5.52.0 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 ) zstd? ( app-arch/zstd:= ) qt5? ( >=kde-frameworks/kf-env-4 )
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b856227d68d1ca4b6b116ba46d936a2
diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.0 b/metadata/md5-cache/dev-util/kdbg-3.0.0
index 49b7855a8c01..dc771f604681 100644
--- a/metadata/md5-cache/dev-util/kdbg-3.0.0
+++ b/metadata/md5-cache/dev-util/kdbg-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e77576abbf3259957b0f6034b6db8bd
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-5.2.4
index da0702e263dd..29209cb34c2b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdevelop-5.2.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1de836dbc0959a6983bd8bcb2fe7ddfe
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.3.1 b/metadata/md5-cache/dev-util/kdevelop-5.3.1
index d94f5e6fc828..e743f6b912f5 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.3.1
+++ b/metadata/md5-cache/dev-util/kdevelop-5.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.3.1/src/kdevelop-5.3.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e78b2d1148c63ee37d4170e614d19e90
diff --git a/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3 b/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3
index 85541d86264f..da8dea2426c4 100644
--- a/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3
+++ b/metadata/md5-cache/dev-util/kdevelop-clang-tidy-0.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-util/kdevelop-5.2.3:5 sys-devel/clang:* >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdev-clang-tidy/0.3.3/src/kdev-clang-tidy-0.3.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28f95408791c98c0815db449f952984a
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
index f6bd2c058c0e..57705697d7dc 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=!dev-util/kdevelop-pg-qt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.1.0/src/kdevelop-pg-qt-2.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c335e45dfeb97d6c7f311c8d7454a57
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1
index a893f4345f8a..9bdae1646da5 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdev-php-5.2.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e1f159542402d556a7ec998c6494806
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.3.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.3.1
index 26805c056283..950bb7c62ca7 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.3.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5 !dev-util/kdevelop-php-docs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.3.1/src/kdev-php-5.3.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0ae19ef421b31deeaed2ff88a44b55ba
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
index 0a28d9311a25..c06d21e38e72 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdev-python-5.2.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5dc465d3e0ef8b1714f3e78e13eadfc8
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.3.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.3.1
index 97e3b83d9872..977b0552fb89 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.3.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.3.1/src/kdev-python-5.3.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=28f08037d6c6d965584b27fe45316019
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3 b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
index 38754bf804f1..37751823663a 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5
 SLOT=0
 SRC_URI=https://github.com/KDAB/KDStateMachineEditor/releases/download/v1.2.3/kdstatemachineeditor-1.2.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=16e80ca7855fb5cfdde295eb67573867
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999 b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
index ab2bbba0970d..6fb1e03068ea 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
@@ -7,5 +7,5 @@ IUSE=doc test
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=990ed621d1169f8fdf9f8e6ad805bdd5
diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
index 0b667c0f3f9e..3e68ca1a21da 100644
--- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
+++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab153fd91110f43cc0d34f46fa749cfb
diff --git a/metadata/md5-cache/dev-util/meld-3.20.0 b/metadata/md5-cache/dev-util/meld-3.20.0
new file mode 100644
index 000000000000..7c51295218c1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meld-3.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
+DESCRIPTION=A graphical diff and merge tool
+EAPI=6
+HOMEPAGE=http://meldmerge.org/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=94d6522d6f7a411c12a028ec4bdcb8e8
diff --git a/metadata/md5-cache/dev-util/meson-0.48.2 b/metadata/md5-cache/dev-util/meson-0.48.2
index d5104c876545..1206af7850f9 100644
--- a/metadata/md5-cache/dev-util/meson-0.48.2
+++ b/metadata/md5-cache/dev-util/meson-0.48.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.48.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=87af9740dd9406b5f73e7b380c09f2b3
+_md5_=9cf3f0d4e5ecfd54578a4417105c38d7
diff --git a/metadata/md5-cache/dev-util/meson-0.49.0 b/metadata/md5-cache/dev-util/meson-0.49.0
index 9308d5c13e23..43155b1ced10 100644
--- a/metadata/md5-cache/dev-util/meson-0.49.0
+++ b/metadata/md5-cache/dev-util/meson-0.49.0
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.49.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b3d727a7a275882dc9f5c69d23b6c24e
+_md5_=85df8e85413508c2ee4462e73b46514c
diff --git a/metadata/md5-cache/dev-util/ostree-2018.5 b/metadata/md5-cache/dev-util/ostree-2018.5
index 7f80daa9fdb3..ddc079a14654 100644
--- a/metadata/md5-cache/dev-util/ostree-2018.5
+++ b/metadata/md5-cache/dev-util/ostree-2018.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) sys-devel/bison sys-devel/flex
+DEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) sys-devel/bison sys-devel/flex
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=6
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
 IUSE=grub selinux soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
+RDEPEND=app-arch/libarchive:= app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= net-misc/curl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= grub? ( sys-boot/grub:* ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.5/libostree-2018.5.tar.xz -> ostree-2018.5.tar.xz
-_md5_=0274150ecbc2043e93654da4273d4086
+_md5_=4224e2b933e18c659e602446a949532c
diff --git a/metadata/md5-cache/dev-util/ostree-2018.9 b/metadata/md5-cache/dev-util/ostree-2018.9
index 1d12bb604433..a9d039a79a03 100644
--- a/metadata/md5-cache/dev-util/ostree-2018.9
+++ b/metadata/md5-cache/dev-util/ostree-2018.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt sys-devel/bison sys-devel/flex virtual/pkgconfig curl? ( net-misc/curl:= ) introspection? ( dev-libs/gobject-introspection ) doc? ( dev-util/gtk-doc )
+DEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* ) app-text/docbook-xsl-stylesheets sys-devel/bison dev-libs/libxslt || ( dev-util/glib-utils <dev-libs/glib-2.56.2:2 ) sys-devel/bison sys-devel/flex virtual/pkgconfig curl? ( net-misc/curl:= ) introspection? ( dev-libs/gobject-introspection ) doc? ( dev-util/gtk-doc )
 DESCRIPTION=Operating system and container binary deployment and upgrades
 EAPI=6
 HOMEPAGE=https://ostree.readthedocs.io/en/latest/
 IUSE=archive curl doc gnutls grub introspection libmount selinux ssl soup systemd zeroconf
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
+RDEPEND=app-arch/xz-utils:= app-crypt/gpgme:= dev-libs/glib:2= dev-libs/libassuan:= dev-libs/libgpg-error:= dev-libs/openssl:0= sys-apps/util-linux:= sys-fs/fuse:= sys-libs/zlib:= archive? ( app-arch/libarchive:= ) grub? ( sys-boot/grub:* ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) libmount? ( sys-apps/util-linux:= ) selinux? ( sys-libs/libselinux:= ) soup? ( net-libs/libsoup:= ) systemd? ( sys-apps/systemd:= ) zeroconf? ( net-dns/avahi:* )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ostreedev/ostree/releases/download/v2018.9/libostree-2018.9.tar.xz -> ostree-2018.9.tar.xz
-_md5_=28c2c91b7d24abd91d02960cd7d0260d
+_md5_=1675c2a33288a7a56f4e3b4cf396e008
diff --git a/metadata/md5-cache/dev-util/packer-1.3.3 b/metadata/md5-cache/dev-util/packer-1.3.3
new file mode 100644
index 000000000000..c631fc94dcc2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/packer-1.3.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.11.0 >=dev-lang/go-1.9
+DESCRIPTION=A tool to create identical machine images for multiple platforms
+EAPI=6
+HOMEPAGE=https://www.packer.io
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+SLOT=0
+SRC_URI=https://github.com/hashicorp/packer/archive/v1.3.3.tar.gz -> packer-1.3.3.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=4a2532022569db8d9cd6cd01ee3751c8
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.5.3 b/metadata/md5-cache/dev-util/pkgcheck-0.5.3
deleted file mode 100644
index 3f2e2975e507..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=sys-apps/pkgcore-0.9.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/snakeoil-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/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/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=pkgcore-based QA utility
-EAPI=5
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=sys-apps/pkgcore-0.9.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/snakeoil-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/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(-)] 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/pkgcore/pkgcheck/releases/download/v0.5.3/pkgcheck-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6cf13a729dbf8ab2d16da455c6ef7870
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 2d2dbafdede3..08794fa2baba 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=pkgcore-based QA utility
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=python_targets_python3_6
+IUSE=doc python_targets_python3_6 python_targets_python3_7
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-apps/pkgcore-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=378b9d2b368ece474f52b55a697e9a05
+_md5_=cb38379b234b4c2ddef6f4144dba8acf
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2018.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2018.3.3
new file mode 100644
index 000000000000..b4be69de6459
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2018.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2018.3.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=957aff7fa620c0baaffd152bfb9ae109
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2018.3.3 b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.3
new file mode 100644
index 000000000000..906f5f77c74d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2018.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2018.3.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e39fff5ac924ee8bc1c5e9d57e5efb4b
diff --git a/metadata/md5-cache/dev-util/radare2-3.2.0 b/metadata/md5-cache/dev-util/radare2-3.2.0
new file mode 100644
index 000000000000..e3072d18452b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/radare2-3.2.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+DESCRIPTION=unix-like reverse engineering framework and commandline tools
+EAPI=7
+HOMEPAGE=http://www.radare.org
+IUSE=ssl libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://github.com/radare/radare2/archive/3.2.0.tar.gz -> radare2-3.2.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=03da0005c00178b3a42dc03ca101b4fc
diff --git a/metadata/md5-cache/dev-util/radare2-9999 b/metadata/md5-cache/dev-util/radare2-9999
index b05f659372e4..2649304da68d 100644
--- a/metadata/md5-cache/dev-util/radare2-9999
+++ b/metadata/md5-cache/dev-util/radare2-9999
@@ -1,12 +1,12 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install unpack
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= )
+DEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=unix-like reverse engineering framework and commandline tools
 EAPI=7
 HOMEPAGE=http://www.radare.org
-IUSE=ssl libressl +system-capstone
+IUSE=ssl libressl
 LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-capstone? ( dev-libs/capstone:0= )
+RDEPEND=dev-libs/capstone:0= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=700506a4b00b9d11fce8c6be8f264e99
+_md5_=03da0005c00178b3a42dc03ca101b4fc
diff --git a/metadata/md5-cache/dev-util/re2c-1.1.1 b/metadata/md5-cache/dev-util/re2c-1.1.1
index 9757e1d9899c..1f4293d56068 100644
--- a/metadata/md5-cache/dev-util/re2c-1.1.1
+++ b/metadata/md5-cache/dev-util/re2c-1.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=6
 HOMEPAGE=http://re2c.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.1.1/re2c-1.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a3b0b32ae7b7171ff1931ef9e787161
+_md5_=fd59ae84d07a5311fd836a9004a804fe
diff --git a/metadata/md5-cache/dev-util/redo-0.21 b/metadata/md5-cache/dev-util/redo-0.21
deleted file mode 100644
index 3675164144bb..000000000000
--- a/metadata/md5-cache/dev-util/redo-0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DEFINED_PHASES=install setup
-DESCRIPTION=Smaller, easier, more powerful, and more reliable than make
-EAPI=7
-HOMEPAGE=https://github.com/apenwarr/redo
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.21.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1b5268202d1c77b1132273449f96e90c
diff --git a/metadata/md5-cache/dev-util/redo-0.41 b/metadata/md5-cache/dev-util/redo-0.41
new file mode 100644
index 000000000000..442be57d96fd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/redo-0.41
@@ -0,0 +1,12 @@
+BDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Smaller, easier, more powerful, and more reliable than make
+EAPI=7
+HOMEPAGE=https://github.com/apenwarr/redo
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=LGPL-2
+SLOT=0
+SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.41.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3e8a6f85f6d7298c773cc9bc0b782282
diff --git a/metadata/md5-cache/dev-util/redo-99999 b/metadata/md5-cache/dev-util/redo-99999
index 281ef96e6895..8b4b854d418c 100644
--- a/metadata/md5-cache/dev-util/redo-99999
+++ b/metadata/md5-cache/dev-util/redo-99999
@@ -7,4 +7,4 @@ IUSE=python_targets_python2_7
 LICENSE=LGPL-2
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4af3b9a89e1987e130064d0c350599da
+_md5_=6d6946c8225b4b0ae6bed531b16436e4
diff --git a/metadata/md5-cache/dev-util/rr-5.2.0 b/metadata/md5-cache/dev-util/rr-5.2.0
index 8078bb0fca29..ab528ad56aed 100644
--- a/metadata/md5-cache/dev-util/rr-5.2.0
+++ b/metadata/md5-cache/dev-util/rr-5.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/mozilla/rr/archive/5.2.0.tar.gz -> mozilla-rr-5.2.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=097311b73d85afd66ddd1aabf570dfd2
+_md5_=c7b3cdb79f334529c76a51bad4e5bc53
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.8.6 b/metadata/md5-cache/dev-util/rustfmt-0.8.6
index 67d3eaa6df03..9dcb81ae858d 100644
--- a/metadata/md5-cache/dev-util/rustfmt-0.8.6
+++ b/metadata/md5-cache/dev-util/rustfmt-0.8.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DEPEND=>=dev-lang/rust-1.8.0 virtual/cargo
 DESCRIPTION=Tool to find and fix Rust formatting issues
 EAPI=6
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/diff/0.1.10/download -> diff-0.1.10.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/extprim/1.2.2/download -> extprim-1.2.2.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.23/download -> libc-0.2.23.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/num-traits/0.1.39/download -> num-traits-0.1.39.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.1/download -> rustc_version-0.2.1.crate https://crates.io/api/v1/crates/rustfmt/0.8.6/download -> rustfmt-0.8.6.crate https://crates.io/api/v1/crates/semver/0.6.0/download -> semver-0.6.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.8/download -> serde-1.0.8.crate https://crates.io/api/v1/crates/serde_derive/1.0.8/download -> serde_derive-1.0.8.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.1/download -> serde_derive_internals-0.15.1.crate https://crates.io/api/v1/crates/serde_json/1.0.2/download -> serde_json-1.0.2.crate https://crates.io/api/v1/crates/strings/0.1.0/download -> strings-0.1.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex_errors/0.59.0/download -> syntex_errors-0.59.0.crate https://crates.io/api/v1/crates/syntex_pos/0.59.0/download -> syntex_pos-0.59.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.59.0/download -> syntex_syntax-0.59.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/thread-id/3.1.0/download -> thread-id-3.1.0.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.4.1/download -> toml-0.4.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.0/download -> unicode-segmentation-1.2.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=11e063e6ef6c1bbc9f53047fcc5cf7da
diff --git a/metadata/md5-cache/dev-util/rustfmt-0.9.0 b/metadata/md5-cache/dev-util/rustfmt-0.9.0
index 4f72f039eaa7..e5aae418198c 100644
--- a/metadata/md5-cache/dev-util/rustfmt-0.9.0
+++ b/metadata/md5-cache/dev-util/rustfmt-0.9.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/cargo
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DESCRIPTION=Tool to find and fix Rust formatting issues
 EAPI=7
 HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.3/download -> aho-corasick-0.6.3.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/diff/0.1.10/download -> diff-0.1.10.crate https://crates.io/api/v1/crates/dtoa/0.4.1/download -> dtoa-0.4.1.crate https://crates.io/api/v1/crates/env_logger/0.4.3/download -> env_logger-0.4.3.crate https://crates.io/api/v1/crates/extprim/1.2.2/download -> extprim-1.2.2.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itoa/0.3.1/download -> itoa-0.3.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.23/download -> libc-0.2.23.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/memchr/1.0.1/download -> memchr-1.0.1.crate https://crates.io/api/v1/crates/num-traits/0.1.39/download -> num-traits-0.1.39.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/regex/0.2.2/download -> regex-0.2.2.crate https://crates.io/api/v1/crates/regex-syntax/0.4.1/download -> regex-syntax-0.4.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.1/download -> rustc_version-0.2.1.crate https://crates.io/api/v1/crates/rustfmt/0.9.0/download -> rustfmt-0.9.0.crate https://crates.io/api/v1/crates/semver/0.6.0/download -> semver-0.6.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.8/download -> serde-1.0.8.crate https://crates.io/api/v1/crates/serde_derive/1.0.8/download -> serde_derive-1.0.8.crate https://crates.io/api/v1/crates/serde_derive_internals/0.15.1/download -> serde_derive_internals-0.15.1.crate https://crates.io/api/v1/crates/serde_json/1.0.2/download -> serde_json-1.0.2.crate https://crates.io/api/v1/crates/strings/0.1.0/download -> strings-0.1.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/syntex_errors/0.59.0/download -> syntex_errors-0.59.0.crate https://crates.io/api/v1/crates/syntex_pos/0.59.0/download -> syntex_pos-0.59.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.59.0/download -> syntex_syntax-0.59.0.crate https://crates.io/api/v1/crates/term/0.4.5/download -> term-0.4.5.crate https://crates.io/api/v1/crates/thread-id/3.1.0/download -> thread-id-3.1.0.crate https://crates.io/api/v1/crates/thread_local/0.3.3/download -> thread_local-0.3.3.crate https://crates.io/api/v1/crates/toml/0.4.1/download -> toml-0.4.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.0/download -> unicode-segmentation-1.2.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/0.1.1/download -> unreachable-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=17d3e3e543527e91f007487b4c83a649
diff --git a/metadata/md5-cache/dev-util/strace-4.25 b/metadata/md5-cache/dev-util/strace-4.25
index 317601e6c711..e345b2b1733f 100644
--- a/metadata/md5-cache/dev-util/strace-4.25
+++ b/metadata/md5-cache/dev-util/strace-4.25
@@ -4,11 +4,11 @@ DESCRIPTION=A useful diagnostic, instructional, and debugging tool
 EAPI=6
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
-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=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 SRC_URI=https://github.com/strace/strace/releases/download/v4.25/strace-4.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8b1ba56ee06267fa930662ce8053519
+_md5_=2d5fbc9161318f78fc9c3bc6dd95bcf9
diff --git a/metadata/md5-cache/dev-util/systemtap-2.9 b/metadata/md5-cache/dev-util/systemtap-2.9
deleted file mode 100644
index 5c34160492b3..000000000000
--- a/metadata/md5-cache/dev-util/systemtap-2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A linux trace/probe tool
-EAPI=5
-HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=sqlite kernel_linux python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e52be027bb50581d34427da648bca857
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1 b/metadata/md5-cache/dev-util/systemtap-3.1
deleted file mode 100644
index 84097fbf5003..000000000000
--- a/metadata/md5-cache/dev-util/systemtap-3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A linux trace/probe tool
-EAPI=6
-HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=sqlite kernel_linux python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8bf480802bc56e56c64f29317c70ae0d
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1-r1 b/metadata/md5-cache/dev-util/systemtap-3.1-r1
index 5da8e2ebd443..3d9f08035e9e 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1-r1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= dev-libs/nspr dev-libs/nss sys-libs/ncurses:0= sys-libs/readline: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_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/gettext-0.18.2 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A linux trace/probe tool
 EAPI=6
 HOMEPAGE=https://www.sourceware.org/systemtap/
 IUSE=libvirt sqlite kernel_linux python_targets_python2_7
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap 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_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= dev-libs/nspr dev-libs/nss sys-libs/ncurses:0= sys-libs/readline: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_python3_7(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ada2b78a72e8d9728fa756caf3fb32c
+_md5_=e30de8f25d9a55deae2379afa6972838
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
new file mode 100644
index 000000000000..87c48d4e7c91
--- /dev/null
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] avahi? ( net-dns/avahi ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) app-text/xmlto >=sys-devel/gettext-0.18.2 libvirt? ( dev-libs/libxml2 )
+DESCRIPTION=A linux trace/probe tool
+EAPI=7
+HOMEPAGE=https://www.sourceware.org/systemtap/
+IUSE=avahi libvirt selinux sqlite +ssl kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] avahi? ( net-dns/avahi ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f9ba1baba0f3d9c247ad0c5841d3ef84
diff --git a/metadata/md5-cache/dev-util/vmtouch-1.3.0 b/metadata/md5-cache/dev-util/vmtouch-1.3.0
index 21a3639c2666..4149c6b0c245 100644
--- a/metadata/md5-cache/dev-util/vmtouch-1.3.0
+++ b/metadata/md5-cache/dev-util/vmtouch-1.3.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Virtual Memory Toucher, portable file system cache diagnostics and control
 EAPI=6
 HOMEPAGE=http://hoytech.com/vmtouch/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/hoytech/vmtouch/archive/v1.3.0.tar.gz -> vmtouch-1.3.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9ebb3cf9bbd65bede90d4adc25393718
+_md5_=c656f6016e79b89d471cc136548c844b
diff --git a/metadata/md5-cache/dev-util/wsta-0.5.0 b/metadata/md5-cache/dev-util/wsta-0.5.0
index b33eb7ac3b19..167ced71ddf8 100644
--- a/metadata/md5-cache/dev-util/wsta-0.5.0
+++ b/metadata/md5-cache/dev-util/wsta-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/openssl:*
 SLOT=0
 SRC_URI=https://github.com/esphen/wsta/archive/0.5.0.tar.gz -> wsta-0.5.0.tar.gz https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/byteorder/0.5.3/download -> byteorder-0.5.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.0/download -> cfg-if-0.1.0.crate https://crates.io/api/v1/crates/config/0.1.3/download -> config-0.1.3.crate https://crates.io/api/v1/crates/cookie/0.2.5/download -> cookie-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.40/download -> gcc-0.3.40.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/hpack/0.2.0/download -> hpack-0.2.0.crate https://crates.io/api/v1/crates/httparse/1.2.1/download -> httparse-1.2.1.crate https://crates.io/api/v1/crates/hyper/0.9.14/download -> hyper-0.9.14.crate https://crates.io/api/v1/crates/idna/0.1.0/download -> idna-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.2/download -> lazy_static-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.18/download -> libc-0.2.18.crate https://crates.io/api/v1/crates/libressl-pnacl-sys/2.1.6/download -> libressl-pnacl-sys-2.1.6.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/matches/0.1.4/download -> matches-0.1.4.crate https://crates.io/api/v1/crates/mime/0.2.2/download -> mime-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.26/download -> net2-0.2.26.crate https://crates.io/api/v1/crates/nom/1.0.1/download -> nom-1.0.1.crate https://crates.io/api/v1/crates/num_cpus/1.2.0/download -> num_cpus-1.2.0.crate https://crates.io/api/v1/crates/openssl/0.7.14/download -> openssl-0.7.14.crate https://crates.io/api/v1/crates/openssl-sys/0.7.17/download -> openssl-sys-0.7.17.crate https://crates.io/api/v1/crates/openssl-sys-extras/0.7.14/download -> openssl-sys-extras-0.7.14.crate https://crates.io/api/v1/crates/openssl-verify/0.1.0/download -> openssl-verify-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.8/download -> pkg-config-0.3.8.crate https://crates.io/api/v1/crates/pnacl-build-helper/1.4.10/download -> pnacl-build-helper-1.4.10.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/rustc_version/0.1.7/download -> rustc_version-0.1.7.crate https://crates.io/api/v1/crates/semver/0.1.20/download -> semver-0.1.20.crate https://crates.io/api/v1/crates/solicit/0.4.4/download -> solicit-0.4.4.crate https://crates.io/api/v1/crates/tempdir/0.3.5/download -> tempdir-0.3.5.crate https://crates.io/api/v1/crates/time/0.1.35/download -> time-0.1.35.crate https://crates.io/api/v1/crates/traitobject/0.0.1/download -> traitobject-0.0.1.crate https://crates.io/api/v1/crates/typeable/0.1.2/download -> typeable-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.0/download -> unicase-1.4.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.2.3/download -> unicode-bidi-0.2.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.2/download -> unicode-normalization-0.1.2.crate https://crates.io/api/v1/crates/url/1.2.4/download -> url-1.2.4.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/websocket/0.17.1/download -> websocket-0.17.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xdg/2.0.0/download -> xdg-2.0.0.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=3f1d4bd47139b20a9acf60d5bcef8958
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index d889f992464d..2a384a33ff7e 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/gitolite-3.6 b/metadata/md5-cache/dev-vcs/gitolite-3.6
deleted file mode 100644
index 8d36009c450f..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=tools vim-syntax
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.tar.gz -> gitolite-3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d203161a9aabe9a7bb88f236b150f11
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.6.11 b/metadata/md5-cache/dev-vcs/gitolite-3.6.11
new file mode 100644
index 000000000000..68cddf2da779
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.6.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=
+DESCRIPTION=Highly flexible server for git directory version tracker
+EAPI=6
+HOMEPAGE=https://github.com/sitaramc/gitolite
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !app-vim/gitolite-syntax !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) dev-perl/JSON dev-lang/perl:=
+SLOT=0
+SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.11.tar.gz -> gitolite-3.6.11.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=b84ff136b09fdd294cbce17918d9f5cb
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.6.3 b/metadata/md5-cache/dev-vcs/gitolite-3.6.3
deleted file mode 100644
index 700f324c162d..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-3.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker
-EAPI=5
-HOMEPAGE=https://github.com/sitaramc/gitolite
-IUSE=selinux tools vim-syntax
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.3.tar.gz -> gitolite-3.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a0bd477e6c80d6736d9347122a3fb807
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1
new file mode 100644
index 000000000000..ae98d032221e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=push to and pull from a Git repository using Mercurial
+EAPI=7
+HOMEPAGE=http://hg-git.github.io https://pypi.org/project/hg-git/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-2.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/dulwich-0.9.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.12.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ddf015ab5d39f9da63228778618665a0
diff --git a/metadata/md5-cache/dev-vcs/hub-2.7.0 b/metadata/md5-cache/dev-vcs/hub-2.7.0
new file mode 100644
index 000000000000..cbe93520d00d
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hub-2.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/go-1.5.1:=
+DESCRIPTION=Command-line wrapper for git that makes you better at GitHub
+EAPI=6
+HOMEPAGE=https://github.com/github/hub
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-vcs/git-1.7.3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/github/hub/archive/v2.7.0.tar.gz -> hub-2.7.0.tar.gz https://github.com/github/hub/releases/download/v2.7.0/hub-linux-amd64-2.7.0.tgz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=37835e1d780520a515ace53862e5e79c
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index 0987d1a1b7b2..75e33e55a2aa 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion !dev-vcs/kdesvn:4 !kde-apps/kdesdk-kioslaves:4[subversion(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa68c1865ae469db6efb3c7a90da5a02
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.7.2 b/metadata/md5-cache/dev-vcs/mercurial-4.7.2
index edad879f5026..cf7c660621a0 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.7.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=6
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.7.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6b2d8e06768236cffc8eb0dbe2fcdff6
+_md5_=a55b8aea34178631400347e9c26f914e
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.8.1 b/metadata/md5-cache/dev-vcs/mercurial-4.8.1
index 76f69bdf1039..c025486a50d4 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.8.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.8.1
@@ -5,11 +5,11 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=7
 HOMEPAGE=https://www.mercurial-scm.org/
 IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.8.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=165298cca9848ef7cef94654a4c7c1ae
+_md5_=f47ca6106f72db53e164c958a49ed58e
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.8.2 b/metadata/md5-cache/dev-vcs/mercurial-4.8.2
new file mode 100644
index 000000000000..30cb0d0c50b6
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.8.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) test? ( app-arch/unzip dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Scalable distributed SCM
+EAPI=7
+HOMEPAGE=https://www.mercurial-scm.org/
+IUSE=bugzilla emacs gpg test tk python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.8.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f47ca6106f72db53e164c958a49ed58e
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.2 b/metadata/md5-cache/dev-vcs/subversion-1.10.2
deleted file mode 100644
index 9d6b1510fc74..000000000000
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.10.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0085aabbbdef8693034da64720ec54f3
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.11.1 b/metadata/md5-cache/dev-vcs/subversion-1.11.1
new file mode 100644
index 000000000000..18bf02c724e4
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/subversion-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 ctypes-python? ( dev-python/ctypesgen ) doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Advanced version control system
+EAPI=6
+HOMEPAGE=https://subversion.apache.org/
+IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Subversion GPL-2
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
+SLOT=0
+SRC_URI=mirror://apache/subversion/subversion-1.11.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3aa583e60eeda3081d2559652a531a29
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index a17a537bdeeb..482be48f2cde 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/xboard-4.8.0-r1 b/metadata/md5-cache/games-board/xboard-4.8.0-r1
deleted file mode 100644
index d18c956c244a..000000000000
--- a/metadata/md5-cache/games-board/xboard-4.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig x11-base/xorg-proto nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=GUI for gnuchess and for internet chess servers
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/xboard/
-IUSE=Xaw3d +default-font gtk nls zippy
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/xboard/xboard-4.8.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c80b6ec76249fd8cf0cd5509d7494c7
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index d56d75b4c481..394ade717310 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r2 b/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r2
deleted file mode 100644
index 1b6d883cfeab..000000000000
--- a/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib app-arch/unzip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DOS emulator
-EAPI=6
-HOMEPAGE=http://dosbox.sourceforge.net/
-IUSE=alsa +core-inline debug glide hardened opengl X
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://gentoo/dosbox-code-0-3989-dosbox-trunk.zip glide? ( https://raw.githubusercontent.com/voyageur/openglide/3722fc563b737d2d7933df6a771651c2154e6f7b/platform/dosbox/dosbox_glide.diff -> dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=140fcfed55fec61104f218766a6e94de
diff --git a/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r3 b/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r3
new file mode 100644
index 000000000000..09defb47a2f0
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/dosbox-0.74_p20160629-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib app-arch/unzip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=DOS emulator
+EAPI=6
+HOMEPAGE=https://www.dosbox.com/
+IUSE=alsa +core-inline debug glide hardened opengl X
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://gentoo/dosbox-code-0-3989-dosbox-trunk.zip glide? ( https://raw.githubusercontent.com/voyageur/openglide/3722fc563b737d2d7933df6a771651c2154e6f7b/platform/dosbox/dosbox_glide.diff -> dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6f88dd0e7ae17a91fade7b8878d554ee
diff --git a/metadata/md5-cache/games-emulation/dosbox-9999 b/metadata/md5-cache/games-emulation/dosbox-9999
index 4938f23acf42..cca1e5fa52e8 100644
--- a/metadata/md5-cache/games-emulation/dosbox-9999
+++ b/metadata/md5-cache/games-emulation/dosbox-9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst preinst prepare unpack
 DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=DOS emulator
 EAPI=6
-HOMEPAGE=http://dosbox.sourceforge.net/
+HOMEPAGE=https://www.dosbox.com/
 IUSE=alsa +core-inline debug glide hardened opengl X
 LICENSE=GPL-2
 RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) X? ( x11-libs/libX11 ) media-libs/libpng:0= media-libs/libsdl[joystick,opengl?,video,X] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib
 SLOT=0
 SRC_URI=glide? ( https://raw.githubusercontent.com/voyageur/openglide/841e1071597b64ead14dd08c25a03206b2d1d1b6/platform/dosbox/dosbox_glide.diff -> dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	3d1eb4b41d7190570a84f786958ebb13	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84df818424708a6286aca8f5e2db115f
+_md5_=3e677e592ccdb7d881dd39b9e49086a6
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.58 b/metadata/md5-cache/games-emulation/snes9x-1.58
index b6b03377977c..95e4d938fb5a 100644
--- a/metadata/md5-cache/games-emulation/snes9x-1.58
+++ b/metadata/md5-cache/games-emulation/snes9x-1.58
@@ -11,4 +11,4 @@ RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.58.tar.gz -> snes9x-1.58.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e92d7106239a5188f6fe1e05f487a47d
+_md5_=c9d744e32b13a90f2deee290562b0c6b
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 22ac28696ded..51c5f1cbd090 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/gnome-mud-9999 b/metadata/md5-cache/games-mud/gnome-mud-9999
index 5cb2f91aa1c7..fbe8a13063d7 100644
--- a/metadata/md5-cache/games-mud/gnome-mud-9999
+++ b/metadata/md5-cache/games-mud/gnome-mud-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=virtual/libintl >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.11:0 dev-libs/libpcre gnome-base/gconf:2 gstreamer? ( media-libs/gstreamer:1.0 ) virtual/pkgconfig app-text/rarian >=dev-util/intltool-0.23 >=sys-devel/gettext-0.11.5 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/vte-0.37:2.91 dev-libs/libpcre sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME MUD client
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/GnomeMud
 IUSE=debug gstreamer
 LICENSE=GPL-2+
-RDEPEND=virtual/libintl >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.11:0 dev-libs/libpcre gnome-base/gconf:2 gstreamer? ( media-libs/gstreamer:1.0 )
+RDEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/vte-0.37:2.91 dev-libs/libpcre sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b9b1d1563e98fdd5111a88f13804e87
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ac599acc12225fa648acb465aae475ff
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 0b814f0f8e9f..a29f329dc75d 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
deleted file mode 100644
index b09ee2752023..000000000000
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The japanese warehouse keeper game
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksokoban.git
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=0
-SRC_URI=https://github.com/KDE/ksokoban/archive/048b42324ef6dac807af4351174065cda2f32f44.tar.gz -> ksokoban-0.5.0_pre20170827.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190104 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190104
new file mode 100644
index 000000000000..fac893fbd6c3
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190104
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kiconthemes-5.52.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The japanese warehouse keeper game
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/ksokoban.git
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=0
+SRC_URI=https://github.com/KDE/ksokoban/archive/f99c63723ca96cfd3d9499ef7fcf0fe7e7b021ca.tar.gz -> ksokoban-0.5.0_pre20190104.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bc9c70a815dce29402084bf7412454d4
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index 1d463a6ed553..3fa01035f2a8 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
+DEPEND=>=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kiconthemes-5.52.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils
 DESCRIPTION=The japanese warehouse keeper game
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/ksokoban.git
 IUSE=debug +handbook
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0cad6e6b2cf80cfe9e8f451bb3b0105c
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92d64dffa5056c134d677f56565d3033
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 95fbadfc2348..cf0d464f6a47 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1 b/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
deleted file mode 100644
index 842e3d6d72c9..000000000000
--- a/metadata/md5-cache/games-strategy/hedgewars-0.9.24.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) >=dev-lang/fpc-2.4 dev-qt/linguist-tools:5 server? ( >=dev-lang/ghc-6.10 dev-haskell/entropy dev-haskell/hslogger >=dev-haskell/mtl-2 >=dev-haskell/network-2.3 dev-haskell/random dev-haskell/regex-tdfa dev-haskell/sandi dev-haskell/sha dev-haskell/vector dev-haskell/utf8-string >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A turn-based strategy, artillery, action and comedy game
-EAPI=6
-HOMEPAGE=https://www.hedgewars.org/
-IUSE=libav server
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 Apache-2.0 FDL-1.3
-RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
-SLOT=0
-SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-0.9.24.1.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.23-dfsg-2.debian.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3bcd50f1a8718040d8a8793d96668c7
diff --git a/metadata/md5-cache/games-strategy/hedgewars-0.9.25 b/metadata/md5-cache/games-strategy/hedgewars-0.9.25
new file mode 100644
index 000000000000..ae742714a4bb
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/hedgewars-0.9.25
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 server? ( >=dev-lang/ghc-6.10 dev-haskell/entropy dev-haskell/hslogger >=dev-haskell/mtl-2 >=dev-haskell/network-2.3 dev-haskell/random dev-haskell/regex-tdfa dev-haskell/sandi dev-haskell/sha dev-haskell/vector dev-haskell/utf8-string dev-haskell/yaml >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 ) !x86? ( >=dev-lang/fpc-2.4 ) x86? ( >=dev-lang/ghc-6.10 dev-haskell/parsec ) sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib !x86? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) )
+DESCRIPTION=A turn-based strategy, artillery, action and comedy game
+EAPI=7
+HOMEPAGE=https://www.hedgewars.org/
+IUSE=libav server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Apache-2.0 FDL-1.3
+RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib !x86? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
+SLOT=0
+SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-0.9.25.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.23-dfsg-2.debian.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=03e936ef1d2ba303aba1e065a0602716
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.4 b/metadata/md5-cache/games-strategy/wesnoth-1.14.4
deleted file mode 100644
index 040d2a64c154..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=6
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls openmp server
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.4.tar.gz -> wesnoth-1.14.4.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ece6e48345abf5c0a600845a032dd5fd
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.5 b/metadata/md5-cache/games-strategy/wesnoth-1.14.5
index 0959e046d279..21a6b00ab196 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.5
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
 EAPI=6
 HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
 IUSE=dbus dedicated doc fribidi libressl nls openmp server
 KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.5.tar.gz -> wesnoth-1.14.5.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ece6e48345abf5c0a600845a032dd5fd
+_md5_=47e11e035f05af713d0b2953adec06f1
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 8f5bf62bdd53..e123e1901382 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/springlobby-0.266 b/metadata/md5-cache/games-util/springlobby-0.266
index 900c6402c38f..3f965bad214a 100644
--- a/metadata/md5-cache/games-util/springlobby-0.266
+++ b/metadata/md5-cache/games-util/springlobby-0.266
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:0= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=The official lobby client for SpringRTS community games
 EAPI=6
 HOMEPAGE=https://springlobby.info
 IUSE=debug +libnotify +nls +sound
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal )
+RDEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:0= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal )
 SLOT=0
 SRC_URI=https://www.springlobby.info/tarballs/springlobby-0.266.tar.bz2
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=414b0055667470ff8947871fc8c454a1
+_md5_=f92c9ead1a1cc806f91318d3cf71a69a
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index e322cee3d0d5..b23a6246d277 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r2 b/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r2
new file mode 100644
index 000000000000..3a9605c9514b
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gvfs-1.34.2.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.4 virtual/pkgconfig dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am test? ( >=dev-python/twisted-16 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Virtual filesystem implementation for gio
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
+REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.34/gvfs-1.34.2.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.34.2.1-patchset.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=12b3d46d57fb9c1573ddade2b5f2558b
diff --git a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0 b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
index 6d6fd90e614a..262195add173 100644
--- a/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
+++ b/metadata/md5-cache/gnome-base/libgnomekbd-3.26.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c7265abac7553bf5edc355fe61852454
+_md5_=61ffb8d7592d41124dc613a0c335a0c5
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b1d155d5c017..5b4aedb79933 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/gnome-color-manager-3.24.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
index 80ba581c2796..3b5d9d077ce5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.24.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanber
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.24/gnome-color-manager-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=025abfdb46d00dd378869a7c49b29593
+_md5_=78629dae127fdaaf4209484b6822bf73
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
index e97ed3a82dde..ddd401991e26 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.30.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanber
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.30/gnome-color-manager-3.30.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=92d925b3e51a0443ada7750ef9bf8fc4
+_md5_=0c5c715eeafbf70923e2f96458da7b46
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
deleted file mode 100644
index 7d88d99078b0..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/glib:2 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DESCRIPTION=KDE Connect implementation for Gnome Shell
-EAPI=6
-HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
-KEYWORDS=amd64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 >=gnome-base/gnome-shell-3.24 gnome-base/nautilus[introspection] net-fs/sshfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound )
-SLOT=0
-SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v12.tar.gz -> gnome-shell-extension-gsconnect-12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=60be2c54253172aeabf39a23e3639277
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12-r1
new file mode 100644
index 000000000000..d0928283a948
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-12-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=dev-libs/glib:2 virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=KDE Connect implementation for Gnome Shell
+EAPI=6
+HOMEPAGE=https://github.com/andyholmes/gnome-shell-extension-gsconnect
+KEYWORDS=amd64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.48 dev-python/nautilus-python >=gnome-base/gnome-shell-3.24 gnome-base/nautilus[introspection] net-fs/sshfs || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) || ( media-libs/libcanberra media-libs/gsound )
+SLOT=0
+SRC_URI=https://github.com/andyholmes/gnome-shell-extension-gsconnect/archive/v12.tar.gz -> gnome-shell-extension-gsconnect-12.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76a72a402c8c39210bb89386dbb3eae5
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.8 b/metadata/md5-cache/gnome-extra/libgda-5.2.8
index 706134861516..90e4dd74fa74 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.8
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.8
@@ -12,4 +12,4 @@ RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.8.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=19fb2e3b295599f80c1e92a687bfbb60
+_md5_=8b9bdb2e5ff8cc7ff1f9873d203376dc
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 1ddafa2b93f9..9a7f922527d9 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-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-18.08.3
deleted file mode 100644
index cbfdcaec4dbe..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.08.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4: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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b54ff2aec30fabdde9300642ad4b0822
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.08.3-r1 b/metadata/md5-cache/kde-apps/akonadi-18.08.3-r1
new file mode 100644
index 000000000000..ad5bb702a341
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.08.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( >=dev-qt/qtsql-5.9.4:5=[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.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4: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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 x11-misc/shared-mime-info sqlite? ( >=dev-qt/qtsql-5.9.4:5=[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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-18.08.3.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d25e82a408e42585ef2bbb23a91c2343
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-18.12.0
deleted file mode 100644
index d54f2c8d089b..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-18.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8ad7e23cb6b054e55f9f765f23f52b52
diff --git a/metadata/md5-cache/kde-apps/akonadi-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-18.12.1
new file mode 100644
index 000000000000..80af9ebb6ef0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-18.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 x11-misc/shared-mime-info sqlite? ( >=dev-qt/qtsql-5.11.1:5=[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.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 x11-misc/shared-mime-info sqlite? ( >=dev-qt/qtsql-5.11.1:5=[sqlite] dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !kde-apps/akonadi:4 !<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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4e4630e4be5f83b80f66c707798ef197
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.3
index bddec0a32e05..61a646a62d82 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-calendar-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d147be09414d08950791307e7dbbcb1
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.0
deleted file mode 100644
index 74dc7959a4f3..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-calendar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-calendar-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=21a084e0e669fa665dfd84b3748c6c3d
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.1
new file mode 100644
index 000000000000..b7426c2775c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7dc4926b514307fb425dffc016950f85
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.3
index 148847c340dd..572265f81279 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-contacts-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bd2d60b47b6ccdc890ff800a7beb906
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.0
deleted file mode 100644
index 3af03d8da34b..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-contacts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-contacts-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a1ea6376341b1e9cc7f739fd132034cc
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.1
new file mode 100644
index 000000000000..f75a9da475b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a5a742948af965485f34d9f37453ac2b
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.3
index dd76523cb139..00f0964eb862 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/mailcommon-18.08.3:5 >=kde-apps/mailimporter-18.08.3:5 >=kde-apps/messagelib-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-import-wizard-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52ac184bce8a31e15749fc0c01ee9227
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.12.0
deleted file mode 100644
index 12f14446eafe..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-import-wizard-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6019c6eef8bd8dc7c32561aa00cc1df2
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.12.1
new file mode 100644
index 000000000000..40958b43bd5a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cb2587cd4313d02b8dbc1c315f033139
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.3
index 4116e3816ca6..cce328d0755b 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-mime-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d10b529b425fde868342a52bcaa65ace
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-mime-18.12.0
deleted file mode 100644
index 66e95fc45be0..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-mime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-mime-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d8baaed7916f41dfcca1c8367838b1bc
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-mime-18.12.1
new file mode 100644
index 000000000000..b5c504020982
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libxslt x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libxslt x11-misc/shared-mime-info !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=caa6ab86f8e2bcd3cdf84336acfe941d
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.3
index 333418f4a72d..ff7c795c989b 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kmime-18.08.3:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-notes-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49bcb9df9d12e014dae10ef65d9475b7
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-notes-18.12.0
deleted file mode 100644
index 5f82adff2b4c..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-apps/akonadi-18.12.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-notes:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-notes-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9165a8ec7796b576f09c6896c7181a1
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-notes-18.12.1
new file mode 100644
index 000000000000..bce3f1348e23
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-apps/akonadi-18.12.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f225528232dc71f5bf8314b6ec960442
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.08.3 b/metadata/md5-cache/kde-apps/akonadi-search-18.08.3
index 907b640f2801..06d48f30e36e 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-search-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4ccf2431e1af3e467e5534e2fa17d6fe
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.12.0 b/metadata/md5-cache/kde-apps/akonadi-search-18.12.0
deleted file mode 100644
index 7a350699f7bc..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.12.0:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-search-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1883226a9883f3722f07a3458b356252
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-18.12.1 b/metadata/md5-cache/kde-apps/akonadi-search-18.12.1
new file mode 100644
index 000000000000..8f44eed7e8e2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/xapian-1.3:=[chert] dev-libs/boost test? ( >=kde-apps/akonadi-18.12.1:5[mysql,postgres,sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1581edf507bb3821e1c0dc0bfb947684
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.3 b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.3
index c6a973eb2ceb..c8303d08d1ba 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.08.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-search-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/messagelib-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadiconsole-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09be5e22c57936d985b890f8087aa993
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.12.0 b/metadata/md5-cache/kde-apps/akonadiconsole-18.12.0
deleted file mode 100644
index 04cb98b5fa35..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadiconsole-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f270b584b22c96fc757695f82b0a6a6
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-18.12.1 b/metadata/md5-cache/kde-apps/akonadiconsole-18.12.1
new file mode 100644
index 000000000000..58c55cbf9243
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5a7abe35b9e0573efa925f29d8c5ef7d
diff --git a/metadata/md5-cache/kde-apps/akregator-18.08.3 b/metadata/md5-cache/kde-apps/akregator-18.08.3
index 05a2c1730779..a5b848ad7f86 100644
--- a/metadata/md5-cache/kde-apps/akregator-18.08.3
+++ b/metadata/md5-cache/kde-apps/akregator-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/grantleetheme-18.08.3:5 >=kde-apps/kontactinterface-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/messagelib-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akregator-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67b7e0020d17bb45583203e11b7f7c54
diff --git a/metadata/md5-cache/kde-apps/akregator-18.12.0-r1 b/metadata/md5-cache/kde-apps/akregator-18.12.0-r1
deleted file mode 100644
index b96eebc3d541..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-18.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akregator-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2fd49dbcfc1d81d8e992a5651b6ef6ef
diff --git a/metadata/md5-cache/kde-apps/akregator-18.12.1 b/metadata/md5-cache/kde-apps/akregator-18.12.1
new file mode 100644
index 000000000000..4c827ec260bb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/akregator:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cdbfda7ae623eea1f0ad32972f76aa65
diff --git a/metadata/md5-cache/kde-apps/analitza-18.08.3 b/metadata/md5-cache/kde-apps/analitza-18.08.3
index 412fa100b865..31c813e6f033 100644
--- a/metadata/md5-cache/kde-apps/analitza-18.08.3
+++ b/metadata/md5-cache/kde-apps/analitza-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[-gles2] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/analitza-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34557b52df8cb905a1ce2acba8eb38ec
diff --git a/metadata/md5-cache/kde-apps/analitza-18.12.0 b/metadata/md5-cache/kde-apps/analitza-18.12.0
deleted file mode 100644
index 1f61436cd88a..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[-gles2] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 >=dev-qt/qtgui-5.11.1:5[-gles2] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/analitza-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=823fa2381d67957d68e21e0d3d771cf3
diff --git a/metadata/md5-cache/kde-apps/analitza-18.12.1 b/metadata/md5-cache/kde-apps/analitza-18.12.1
new file mode 100644
index 000000000000..92c72886b554
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[-gles2] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 eigen? ( dev-cpp/eigen:3 ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 >=dev-qt/qtgui-5.11.1:5[-gles2] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a54c31cfbc223d40baf18a7e04c15a77
diff --git a/metadata/md5-cache/kde-apps/ark-18.08.3 b/metadata/md5-cache/kde-apps/ark-18.08.3
index 1da1f45d9148..71ad5ee8a8fe 100644
--- a/metadata/md5-cache/kde-apps/ark-18.08.3
+++ b/metadata/md5-cache/kde-apps/ark-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ark-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f3d820104f10849e4522bfa82e0dde9
diff --git a/metadata/md5-cache/kde-apps/ark-18.12.0 b/metadata/md5-cache/kde-apps/ark-18.12.0
deleted file mode 100644
index f823d37ea760..000000000000
--- a/metadata/md5-cache/kde-apps/ark-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ark:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ark-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7514eda7f75a8532f7752c0debcece43
diff --git a/metadata/md5-cache/kde-apps/ark-18.12.1 b/metadata/md5-cache/kde-apps/ark-18.12.1
new file mode 100644
index 000000000000..f3405f976f85
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ark-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=efc2e768b519de88f5a1e7bebcc94ec2
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.08.3 b/metadata/md5-cache/kde-apps/artikulate-18.08.3
index 48d9b10f7908..baeb2472149c 100644
--- a/metadata/md5-cache/kde-apps/artikulate-18.08.3
+++ b/metadata/md5-cache/kde-apps/artikulate-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/artikulate-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ca741eadfe3c94995be1cb5534a8134
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.12.0 b/metadata/md5-cache/kde-apps/artikulate-18.12.0
deleted file mode 100644
index f9cc945aac52..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/artikulate:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/artikulate-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6ef59bd04a7d05b3575950a63c50859c
diff --git a/metadata/md5-cache/kde-apps/artikulate-18.12.1 b/metadata/md5-cache/kde-apps/artikulate-18.12.1
new file mode 100644
index 000000000000..fc99cf568a2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=447544c344f4990af5bdb0df16a28027
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.3 b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.3
index b561f6d2f765..19377bf32e37 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.08.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/libkcddb-18.08.3:5 >=kde-apps/libkcompactdisc-18.08.3:5 >=dev-qt/qtwidgets-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/audiocd-kio-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=57e2854c3ce9af88b41a48d082b76fe0
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.12.0 b/metadata/md5-cache/kde-apps/audiocd-kio-18.12.0
deleted file mode 100644
index 37741d143658..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/libkcddb-18.12.0:5 >=kde-apps/libkcompactdisc-18.12.0:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/libkcddb-18.12.0:5 >=kde-apps/libkcompactdisc-18.12.0:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/audiocd-kio-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b9c2572b6c2e3b3a94a780d4c6eead6
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-18.12.1 b/metadata/md5-cache/kde-apps/audiocd-kio-18.12.1
new file mode 100644
index 000000000000..bebcbb4a99a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/libkcddb-18.12.1:5 >=kde-apps/libkcompactdisc-18.12.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/libkcddb-18.12.1:5 >=kde-apps/libkcompactdisc-18.12.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !kde-apps/audiocd-kio:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=68b6302018073532f6987956efdcef83
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.3 b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.3
index 18d6a4bcfa8a..75c6d257dc2c 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.08.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/baloo-widgets-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c717b709648a62b5b7c4771e6cafdc2
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.12.0 b/metadata/md5-cache/kde-apps/baloo-widgets-18.12.0
deleted file mode 100644
index 4798944bd941..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/baloo-widgets:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/baloo-widgets-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f4c2553d0b6e9c49efdbc7969e1864d4
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-18.12.1 b/metadata/md5-cache/kde-apps/baloo-widgets-18.12.1
new file mode 100644
index 000000000000..30c01ee4eef9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e1516dcdfa8bd4252f3f507c0337a0f0
diff --git a/metadata/md5-cache/kde-apps/blinken-18.08.3 b/metadata/md5-cache/kde-apps/blinken-18.08.3
index aabf2db53d4c..732a263442f5 100644
--- a/metadata/md5-cache/kde-apps/blinken-18.08.3
+++ b/metadata/md5-cache/kde-apps/blinken-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/blinken-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6252820ef5d5a3138806185a2caf2027
diff --git a/metadata/md5-cache/kde-apps/blinken-18.12.0 b/metadata/md5-cache/kde-apps/blinken-18.12.0
deleted file mode 100644
index e9dc03c7187e..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/blinken-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1abe86e944c428b0494340398e4b5cb6
diff --git a/metadata/md5-cache/kde-apps/blinken-18.12.1 b/metadata/md5-cache/kde-apps/blinken-18.12.1
new file mode 100644
index 000000000000..618b50bc602b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=767b25d64375faca487db98b6d61181c
diff --git a/metadata/md5-cache/kde-apps/bomber-18.08.3 b/metadata/md5-cache/kde-apps/bomber-18.08.3
index d204b7550b8e..63e0122c7090 100644
--- a/metadata/md5-cache/kde-apps/bomber-18.08.3
+++ b/metadata/md5-cache/kde-apps/bomber-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/bomber-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6dc978ad33f377adeb16036284e16eea
diff --git a/metadata/md5-cache/kde-apps/bomber-18.12.0 b/metadata/md5-cache/kde-apps/bomber-18.12.0
deleted file mode 100644
index 4abe4b04a4f0..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/bomber-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d060584d3205f054e110b70c24223343
diff --git a/metadata/md5-cache/kde-apps/bomber-18.12.1 b/metadata/md5-cache/kde-apps/bomber-18.12.1
new file mode 100644
index 000000000000..bca613eb32f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=668903d7c129fcef1bac1e0d6638ace1
diff --git a/metadata/md5-cache/kde-apps/bovo-18.08.3 b/metadata/md5-cache/kde-apps/bovo-18.08.3
index 780f537c373a..a6acaaa1852c 100644
--- a/metadata/md5-cache/kde-apps/bovo-18.08.3
+++ b/metadata/md5-cache/kde-apps/bovo-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/bovo-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdb5c97a3d995da9c53369acdcc40911
diff --git a/metadata/md5-cache/kde-apps/bovo-18.12.0 b/metadata/md5-cache/kde-apps/bovo-18.12.0
deleted file mode 100644
index 26211f321d1b..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/bovo-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=624d7eecd8ed7242f9858f673deeb7a1
diff --git a/metadata/md5-cache/kde-apps/bovo-18.12.1 b/metadata/md5-cache/kde-apps/bovo-18.12.1
new file mode 100644
index 000000000000..806dd6692b5c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=93fac3613536cd23ab1ce00b66e5a6eb
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.3 b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.3
index a8d8fbe436cb..146fdc14299d 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.08.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-calendar-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-calendar-tools-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d0a009b2b940e5195d9376a307016321
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.12.0 b/metadata/md5-cache/kde-apps/calendarjanitor-18.12.0
deleted file mode 100644
index ddb4f28447f8..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-18.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.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-calendar-tools-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=93aeefe9890ab93ebded37ec0f2fae82
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-18.12.1 b/metadata/md5-cache/kde-apps/calendarjanitor-18.12.1
new file mode 100644
index 000000000000..d7aee85ef377
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4453942b16f9734deec3cb3e12df5999
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.08.3 b/metadata/md5-cache/kde-apps/calendarsupport-18.08.3
index 49af65176a33..eaf5fee8d593 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.08.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-calendar-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kdepim-apps-libs-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/calendarsupport-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3119027e7a9276ea9d76b26fc83c9e6
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.12.0 b/metadata/md5-cache/kde-apps/calendarsupport-18.12.0
deleted file mode 100644
index fb83f74d43d1..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/calendarsupport-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eaa92f35e4f1a6389419439b143838f8
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-18.12.1 b/metadata/md5-cache/kde-apps/calendarsupport-18.12.1
new file mode 100644
index 000000000000..025c627a2a80
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bad51934cf259ad5dcd4515856bab7fa
diff --git a/metadata/md5-cache/kde-apps/cantor-18.08.3 b/metadata/md5-cache/kde-apps/cantor-18.08.3
index 012c95bfbda4..2c185b22097e 100644
--- a/metadata/md5-cache/kde-apps/cantor-18.08.3
+++ b/metadata/md5-cache/kde-apps/cantor-18.08.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/cantor-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d2e328d5fbefbd6b4d4cf8d0f7a91cda
diff --git a/metadata/md5-cache/kde-apps/cantor-18.12.0 b/metadata/md5-cache/kde-apps/cantor-18.12.0
deleted file mode 100644
index 8452f201d773..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-18.12.0
+++ /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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 analitza? ( >=kde-apps/analitza-18.12.0:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) markdown? ( >=app-text/discount-2.2.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 markdown postscript python qalculate R debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 analitza? ( >=kde-apps/analitza-18.12.0:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) markdown? ( >=app-text/discount-2.2.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/cantor-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a81034e30c98f497a1aae43594494c89
diff --git a/metadata/md5-cache/kde-apps/cantor-18.12.1 b/metadata/md5-cache/kde-apps/cantor-18.12.1
new file mode 100644
index 000000000000..b20178658fba
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-18.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 analitza? ( >=kde-apps/analitza-18.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) markdown? ( >=app-text/discount-2.2.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 markdown postscript python qalculate R debug +handbook test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 analitza? ( >=kde-apps/analitza-18.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) markdown? ( >=app-text/discount-2.2.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d341c679a52a835f50e2660e83ce9697
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.08.3 b/metadata/md5-cache/kde-apps/cervisia-18.08.3
index 1a9c1655e2fa..6fecf67631ef 100644
--- a/metadata/md5-cache/kde-apps/cervisia-18.08.3
+++ b/metadata/md5-cache/kde-apps/cervisia-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/cervisia-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d5064c2207b58232cee8ab23a708229
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.12.0 b/metadata/md5-cache/kde-apps/cervisia-18.12.0
deleted file mode 100644
index 1ca816a5c155..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/cervisia-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c40cdcdc1b6f5ed0f2b19a924b47f331
diff --git a/metadata/md5-cache/kde-apps/cervisia-18.12.1 b/metadata/md5-cache/kde-apps/cervisia-18.12.1
new file mode 100644
index 000000000000..c2df17782875
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5728266c7cc08219ba0c54464eaf77d0
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.08.3 b/metadata/md5-cache/kde-apps/dolphin-18.08.3
index c302c0211489..209f7ce25c85 100644
--- a/metadata/md5-cache/kde-apps/dolphin-18.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/dolphin-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d66e34ed64f40cfa105ec593993f040e
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-18.12.0
deleted file mode 100644
index 1c4f44c20c2f..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-apps/baloo-widgets-18.12.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-apps/baloo-widgets-18.12.0:5 ) >=kde-apps/kio-extras-18.12.0:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.12.0:5 >=kde-apps/thumbnailers-18.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5661c732fdf6a160cbe24bb72a33efcd
diff --git a/metadata/md5-cache/kde-apps/dolphin-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-18.12.1
new file mode 100644
index 000000000000..877a49f7c849
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-apps/baloo-widgets-18.12.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-apps/baloo-widgets-18.12.1:5 ) >=kde-apps/kio-extras-18.12.1:5 thumbnail? ( >=kde-apps/ffmpegthumbs-18.12.1:5 >=kde-apps/thumbnailers-18.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=68a74a874aa331ea3963c176b289467f
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.3
index 591045da0b38..1bbad3966442 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/dolphin-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 git? ( >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 ) >=kde-apps/kompare-18.08.3:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/dolphin-plugins-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5122e659d2013cf0f19140cc6bd2d353
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.12.0
deleted file mode 100644
index e73997a7ad9e..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dolphin plugin for Bazaar integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins-bazaar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e9150e38266b38d5c1b1a948b11f2e27
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.12.1
new file mode 100644
index 000000000000..c4a52d9301a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dolphin plugin for Bazaar integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f089c68dafcf44d8e6486f241e79c2fa
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.12.0
deleted file mode 100644
index e5746f56b776..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dolphin plugin for Dropbox service integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins-dropbox:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=22ae12d516927f202f36821096974698
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.12.1
new file mode 100644
index 000000000000..47e2a21ab016
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dolphin plugin for Dropbox service integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=657efa928ad4111aff4c02f76b928b17
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.12.0
deleted file mode 100644
index b5328009d2f3..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dolphin plugin for Git integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 dev-vcs/git >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins-git:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=add951d107676aa6a329e9eb23515a50
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.12.1
new file mode 100644
index 000000000000..395ebc590232
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dolphin plugin for Git integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 dev-vcs/git >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=905c8013e63c39c88485a4b079a760a5
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.12.0
deleted file mode 100644
index 606e092a9a9a..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dolphin plugin for Mercurial integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins-mercurial:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0c4e2918630f583e8005f3a1b62a5289
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.12.1
new file mode 100644
index 000000000000..eb76fb015af6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dolphin plugin for Mercurial integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=de72aa9d005135d786771f42f66aa722
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.12.0 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.12.0
deleted file mode 100644
index b3188170559b..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Dolphin plugin for Subversion integration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-18.12.0:5 dev-vcs/subversion >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins-subversion:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dolphin-plugins-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b69d0019db5675bf538b5b4f01a825e6
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.12.1
new file mode 100644
index 000000000000..dbc0b8a11b1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Dolphin plugin for Subversion integration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-apps/dolphin-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-18.12.1:5 dev-vcs/subversion >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e0f0c12f0d64cb7c7e6f7f4c83b9ee07
diff --git a/metadata/md5-cache/kde-apps/dragon-18.08.3 b/metadata/md5-cache/kde-apps/dragon-18.08.3
index 1a6147312a91..91b66132845b 100644
--- a/metadata/md5-cache/kde-apps/dragon-18.08.3
+++ b/metadata/md5-cache/kde-apps/dragon-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/dragon-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f5c3f62877b428ac84f89ef58639bfd
diff --git a/metadata/md5-cache/kde-apps/dragon-18.12.0 b/metadata/md5-cache/kde-apps/dragon-18.12.0
deleted file mode 100644
index f662cfd795f4..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/dragon-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=808cba69b895b1eb4d3c7ad69f2f2724
diff --git a/metadata/md5-cache/kde-apps/dragon-18.12.1 b/metadata/md5-cache/kde-apps/dragon-18.12.1
new file mode 100644
index 000000000000..8628644efd2b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cc5754dc3e0471761f51c8127139f682
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.08.3 b/metadata/md5-cache/kde-apps/eventviews-18.08.3
index a4db6e57b670..e90c70dbe3be 100644
--- a/metadata/md5-cache/kde-apps/eventviews-18.08.3
+++ b/metadata/md5-cache/kde-apps/eventviews-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-calendar-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/eventviews-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef30bc2446ed37eb51908cc2ddc98873
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.12.0 b/metadata/md5-cache/kde-apps/eventviews-18.12.0
deleted file mode 100644
index 8fa4863d7504..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/eventviews-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=52bbd9b441c15695939f17df2c49e7f5
diff --git a/metadata/md5-cache/kde-apps/eventviews-18.12.1 b/metadata/md5-cache/kde-apps/eventviews-18.12.1
new file mode 100644
index 000000000000..253d36eeae58
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 dev-libs/libical sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c14540d1e56eb55e02fe24b79c26b83f
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.3
index 8089877f21b7..ce7dde57d307 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ffmpegthumbs-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b168c9aea10f94d96555f6d8658f6d60
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.12.0 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.12.0
deleted file mode 100644
index 78101ea2e64e..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ffmpegthumbs-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0dccf634947f6bc4ee780f0539761fc3
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-18.12.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.12.1
new file mode 100644
index 000000000000..0116685d1fb8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eb5ee871a7b2b331095cb2548e6567ca
diff --git a/metadata/md5-cache/kde-apps/filelight-18.08.3 b/metadata/md5-cache/kde-apps/filelight-18.08.3
index 6581a76183f3..b6be3e55b0f6 100644
--- a/metadata/md5-cache/kde-apps/filelight-18.08.3
+++ b/metadata/md5-cache/kde-apps/filelight-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/filelight-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=134662c1219da9595338e6a39660921d
diff --git a/metadata/md5-cache/kde-apps/filelight-18.12.0 b/metadata/md5-cache/kde-apps/filelight-18.12.0
deleted file mode 100644
index 43c01c8fedb8..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/filelight-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff4c383865ef20fb5a0bb3a4a539fcd4
diff --git a/metadata/md5-cache/kde-apps/filelight-18.12.1 b/metadata/md5-cache/kde-apps/filelight-18.12.1
new file mode 100644
index 000000000000..0efd2571830a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63fca80729c8632d4fb3b1e305d8a5ed
diff --git a/metadata/md5-cache/kde-apps/granatier-18.08.3 b/metadata/md5-cache/kde-apps/granatier-18.08.3
index c7741add2094..7f41c3fcdbc5 100644
--- a/metadata/md5-cache/kde-apps/granatier-18.08.3
+++ b/metadata/md5-cache/kde-apps/granatier-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/granatier-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=91c90548efb6a3e271200fe581214998
diff --git a/metadata/md5-cache/kde-apps/granatier-18.12.0 b/metadata/md5-cache/kde-apps/granatier-18.12.0
deleted file mode 100644
index 0ed3c693002d..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/granatier-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b26034eb7ddb73f5f2841b31b41d5825
diff --git a/metadata/md5-cache/kde-apps/granatier-18.12.1 b/metadata/md5-cache/kde-apps/granatier-18.12.1
new file mode 100644
index 000000000000..9f4216214032
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=de5924a3ffa65e7871fad1c61497ca78
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.3 b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.3
index e8fd992df717..228b0143a8c8 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.08.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/messagelib-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/grantlee-editor-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5100538af4877c9400ae9253a2c1d2b5
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.12.0 b/metadata/md5-cache/kde-apps/grantlee-editor-18.12.0
deleted file mode 100644
index 95601b32c8bc..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/grantlee-editor-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1cb815eb5e6d9a7945af286ac0dc1337
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-18.12.1 b/metadata/md5-cache/kde-apps/grantlee-editor-18.12.1
new file mode 100644
index 000000000000..d9aaa92521d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76aed876bc1a7c35da01c53881c4fdbc
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.08.3 b/metadata/md5-cache/kde-apps/grantleetheme-18.08.3
index 7c2c671142c0..512d1c8d2faa 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.08.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/grantleetheme-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3a964a7c412da55cb7f507de0c05ee87
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.12.0 b/metadata/md5-cache/kde-apps/grantleetheme-18.12.0
deleted file mode 100644
index a0f678298597..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantleetheme:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/grantleetheme-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=754f56c0fd5bad526bffe35edf71bcc1
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-18.12.1 b/metadata/md5-cache/kde-apps/grantleetheme-18.12.1
new file mode 100644
index 000000000000..98db2cdf906b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ab34cd98d67124f7eb255ad56bea101a
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.08.3 b/metadata/md5-cache/kde-apps/gwenview-18.08.3
index 9f8b4c513115..dfcdd055bcf6 100644
--- a/metadata/md5-cache/kde-apps/gwenview-18.08.3
+++ b/metadata/md5-cache/kde-apps/gwenview-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/gwenview-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f73da2a67532cdc2792599234ccd50d4
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.12.0 b/metadata/md5-cache/kde-apps/gwenview-18.12.0
deleted file mode 100644
index 3c637e3acb1f..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.12.0:5= ) mpris? ( >=dev-qt/qtdbus-5.11.1:5 ) raw? ( >=kde-apps/libkdcraw-18.12.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Image viewer by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
-IUSE=activities fits kipi +mpris raw semantic-desktop X debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.12.0:5= ) mpris? ( >=dev-qt/qtdbus-5.11.1:5 ) raw? ( >=kde-apps/libkdcraw-18.12.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.52.0:5 >=dev-qt/qtimageformats-5.11.1:5 kipi? ( media-plugins/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/gwenview:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/gwenview-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57660bddc6fa6673d15f5602e0b0a940
diff --git a/metadata/md5-cache/kde-apps/gwenview-18.12.1 b/metadata/md5-cache/kde-apps/gwenview-18.12.1
new file mode 100644
index 000000000000..92e164e0b9d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.12.1:5= ) mpris? ( >=dev-qt/qtdbus-5.11.1:5 ) raw? ( >=kde-apps/libkdcraw-18.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Image viewer by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/ https://userbase.kde.org/Gwenview
+IUSE=activities fits kipi +mpris raw semantic-desktop X debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-18.12.1:5= ) mpris? ( >=dev-qt/qtdbus-5.11.1:5 ) raw? ( >=kde-apps/libkdcraw-18.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.52.0:5 >=dev-qt/qtimageformats-5.11.1:5 kipi? ( media-plugins/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=01f7fec6e0f714668e6f9f2cdc009fcb
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.3 b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.3
index 7e4f97155817..8e7698fe34c5 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.08.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-calendar-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/eventviews-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kdepim-apps-libs-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kldap-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/incidenceeditor-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e09a1fd28004a27930eaf1ca2d2123cb
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.12.0 b/metadata/md5-cache/kde-apps/incidenceeditor-18.12.0
deleted file mode 100644
index 3e6b3d8b166d..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/incidenceeditor-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c900ea47d596d61c080bfdcdf5427685
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-18.12.1 b/metadata/md5-cache/kde-apps/incidenceeditor-18.12.1
new file mode 100644
index 000000000000..cdbcb3a75a25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/kdiagram:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=55b358f8222975e02ea9f1b6cb83739c
diff --git a/metadata/md5-cache/kde-apps/juk-18.08.3 b/metadata/md5-cache/kde-apps/juk-18.08.3
index d522d90bce79..b4ff36cc7153 100644
--- a/metadata/md5-cache/kde-apps/juk-18.08.3
+++ b/metadata/md5-cache/kde-apps/juk-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/juk-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=535282888b7e5a31c91b0593e2dbeb32
diff --git a/metadata/md5-cache/kde-apps/juk-18.12.0 b/metadata/md5-cache/kde-apps/juk-18.12.0
deleted file mode 100644
index 3044c0e96e41..000000000000
--- a/metadata/md5-cache/kde-apps/juk-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/juk-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50cf806ce039e4fc7461eabf5a4b6661
diff --git a/metadata/md5-cache/kde-apps/juk-18.12.1 b/metadata/md5-cache/kde-apps/juk-18.12.1
new file mode 100644
index 000000000000..470b50e342d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/juk-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0f7c244cd1f7fcbc48ddf9c46a49cebe
diff --git a/metadata/md5-cache/kde-apps/k3b-18.08.3 b/metadata/md5-cache/kde-apps/k3b-18.08.3
index 3ea1ad05f14f..a8aaf26c40d0 100644
--- a/metadata/md5-cache/kde-apps/k3b-18.08.3
+++ b/metadata/md5-cache/kde-apps/k3b-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/k3b-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15758ed8a6a6f4cfd0051d954057d061
diff --git a/metadata/md5-cache/kde-apps/k3b-18.12.0 b/metadata/md5-cache/kde-apps/k3b-18.12.0
deleted file mode 100644
index aceaa2c94a5a..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-18.12.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5[taglib?] >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5[taglib?] >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/k3b:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/k3b-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=377053037c37f8f55b277041a0d1ed4e
diff --git a/metadata/md5-cache/kde-apps/k3b-18.12.1 b/metadata/md5-cache/kde-apps/k3b-18.12.1
new file mode 100644
index 000000000000..f0760f0ba637
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5[taglib?] >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5[taglib?] >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=71c004bc342955dd8ae7a8fe94e1504e
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.3
index b08d008b630b..4c0d68ebfefd 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kaccounts-integration-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=259777288f31553a0c9e0e49fe2e08f0
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.0 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.0
deleted file mode 100644
index 19d5cb580a9a..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.52.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond dev-util/intltool >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-integration:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kaccounts-integration-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e780f13337133157ae258efb0160ef9d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.1
new file mode 100644
index 000000000000..f82167284c1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond >=kde-frameworks/kcmutils-5.52.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21 net-libs/signond dev-util/intltool >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=96b9ac4bac65208dbab9775f7a21821d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.3
index c6b7856aa135..41751bcfb15e 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-apps/kaccounts-integration-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kaccounts-providers-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c45935ae1e6c66efa61d1d1f753cac78
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.12.0 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.12.0
deleted file mode 100644
index ddff87476f78..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-18.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.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kaccounts-providers-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6130dbd829da82220254aa0a30b2ba4c
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-18.12.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-18.12.1
new file mode 100644
index 000000000000..913f085ddd5d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-util/intltool sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0d5eb844eb319e55ffe07abc74ac44b8
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.08.3 b/metadata/md5-cache/kde-apps/kaddressbook-18.08.3
index a6725c5c9c01..b4a3db6a4912 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.08.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-search-18.08.3:5 >=kde-apps/grantleetheme-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kdepim-apps-libs-18.08.3:5 >=kde-apps/kontactinterface-18.08.3:5 >=kde-apps/libgravatar-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/libkleo-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kaddressbook-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f9815170d7f8093076d6e03f4cda1d7
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.12.0 b/metadata/md5-cache/kde-apps/kaddressbook-18.12.0
deleted file mode 100644
index 3381869b2bca..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kaddressbook-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5fbfb29f05c274bdc9c8865c38068af
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-18.12.1 b/metadata/md5-cache/kde-apps/kaddressbook-18.12.1
new file mode 100644
index 000000000000..389cfe3fb9e1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 test? ( >=kde-apps/akonadi-18.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e7f1e6004ba1874ad1aa099743247e2d
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.08.3 b/metadata/md5-cache/kde-apps/kajongg-18.08.3
index 85fef701a3de..60aaef31e06e 100644
--- a/metadata/md5-cache/kde-apps/kajongg-18.08.3
+++ b/metadata/md5-cache/kde-apps/kajongg-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kajongg-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ae5bb3f09e4fd2e864fd9505271f181f
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.12.0 b/metadata/md5-cache/kde-apps/kajongg-18.12.0
deleted file mode 100644
index 2c3488c406f7..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-18.12.0
+++ /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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.52.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_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-apps/libkmahjongg-18.12.0: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_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kajongg-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d5d41aac6f1b7e396a07d97b29eed23a
diff --git a/metadata/md5-cache/kde-apps/kajongg-18.12.1 b/metadata/md5-cache/kde-apps/kajongg-18.12.1
new file mode 100644
index 000000000000..9414082bcc06
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-18.12.1
@@ -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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info handbook? ( >=kde-frameworks/kdoctools-5.52.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_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-apps/libkmahjongg-18.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_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bee42e307eccac0929ac157b20dd90c9
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.08.3 b/metadata/md5-cache/kde-apps/kalarm-18.08.3
index 1c4a9ce74ff3..97906194f1cb 100644
--- a/metadata/md5-cache/kde-apps/kalarm-18.08.3
+++ b/metadata/md5-cache/kde-apps/kalarm-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/kalarmcal-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kdepim-apps-libs-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/kontactinterface-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/mailcommon-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kalarm-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8bc02787d2bef7fb7b77c9e985e89131
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.12.0 b/metadata/md5-cache/kde-apps/kalarm-18.12.0
deleted file mode 100644
index fc9121fe8bcf..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-18.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kalarmcal-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kalarmcal-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kalarm-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=585e458993553c325d7c675c97768605
diff --git a/metadata/md5-cache/kde-apps/kalarm-18.12.1 b/metadata/md5-cache/kde-apps/kalarm-18.12.1
new file mode 100644
index 000000000000..1459ac6910ea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kalarmcal-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kalarmcal-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kalarm:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2d61198a9b40b4ad0edbfcd09eab1b1b
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.08.3 b/metadata/md5-cache/kde-apps/kalarmcal-18.08.3
index 8d98f9041556..985b299f4682 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.08.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kalarmcal-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a9de8a20cc052a4afd35cb88637d5f3
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.12.0 b/metadata/md5-cache/kde-apps/kalarmcal-18.12.0
deleted file mode 100644
index 67afa7fcb886..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-18.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.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 test? ( >=dev-qt/qtdbus-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kalarmcal-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43d069ef8cc0dddb61f29bbe4b68c88e
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-18.12.1 b/metadata/md5-cache/kde-apps/kalarmcal-18.12.1
new file mode 100644
index 000000000000..06127466b6fd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 test? ( >=dev-qt/qtdbus-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2ce63c2779e71870d44102b0a02602a1
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.08.3 b/metadata/md5-cache/kde-apps/kalgebra-18.08.3
index c9b41b1545d2..c2d28cc9eab3 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-18.08.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/analitza-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kalgebra-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14fba6c16c238bb623f518c2184b3816
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.12.0 b/metadata/md5-cache/kde-apps/kalgebra-18.12.0
deleted file mode 100644
index c28dd57bd2b9..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/analitza-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/analitza-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kalgebra-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5bbc9005dcf9d682b860e4252e1791b3
diff --git a/metadata/md5-cache/kde-apps/kalgebra-18.12.1 b/metadata/md5-cache/kde-apps/kalgebra-18.12.1
new file mode 100644
index 000000000000..0999b64515b4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/analitza-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 readline? ( sys-libs/readline:0= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/analitza-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=663158d02d4a9d901fc8a200c2f45add
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.08.3 b/metadata/md5-cache/kde-apps/kalzium-18.08.3
index 6e5773dd09e6..2ca000b11d83 100644
--- a/metadata/md5-cache/kde-apps/kalzium-18.08.3
+++ b/metadata/md5-cache/kde-apps/kalzium-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 editor? ( >=dev-qt/qtopengl-5.9.4:5 >=kde-frameworks/knewstuff-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kalzium-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bc749925beb0083a332396b83256f906
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.12.0 b/metadata/md5-cache/kde-apps/kalzium-18.12.0
deleted file mode 100644
index 1b033a250850..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kalzium-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ed1871883030a04304659d2ec9c73ba1
diff --git a/metadata/md5-cache/kde-apps/kalzium-18.12.1 b/metadata/md5-cache/kde-apps/kalzium-18.12.1
new file mode 100644
index 000000000000..f937d98a928b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editor? ( >=dev-qt/qtopengl-5.11.1:5 >=kde-frameworks/knewstuff-5.52.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c8fef37833dc59a5bf9f0cc6c0727005
diff --git a/metadata/md5-cache/kde-apps/kamera-18.08.3 b/metadata/md5-cache/kde-apps/kamera-18.08.3
index 94bc5d022c65..7372f0498709 100644
--- a/metadata/md5-cache/kde-apps/kamera-18.08.3
+++ b/metadata/md5-cache/kde-apps/kamera-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kamera-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c7926a1d3d88ad1c8924d85d8493f4d
diff --git a/metadata/md5-cache/kde-apps/kamera-18.12.0 b/metadata/md5-cache/kde-apps/kamera-18.12.0
deleted file mode 100644
index 0f38b12fc22a..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kamera-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f91e7d24f20764f0c7d3bca8403d589
diff --git a/metadata/md5-cache/kde-apps/kamera-18.12.1 b/metadata/md5-cache/kde-apps/kamera-18.12.1
new file mode 100644
index 000000000000..924caf629f43
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libgphoto2:= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=010231f10927ad8610337dc4da7ce896
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.08.3 b/metadata/md5-cache/kde-apps/kamoso-18.08.3
index af62d54727a6..5bb16195ddca 100644
--- a/metadata/md5-cache/kde-apps/kamoso-18.08.3
+++ b/metadata/md5-cache/kde-apps/kamoso-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kamoso-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb33069c62bd7d99ef1c57269ea57f02
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.12.0 b/metadata/md5-cache/kde-apps/kamoso-18.12.0
deleted file mode 100644
index 17f7da822b5e..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/purpose-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/purpose-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamoso:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kamoso-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3bd7ac03c909dd72243c9c92262fc100
diff --git a/metadata/md5-cache/kde-apps/kamoso-18.12.1 b/metadata/md5-cache/kde-apps/kamoso-18.12.1
new file mode 100644
index 000000000000..37987717e8f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/purpose-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/purpose-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=da1f47357da3b014d7d04877b746f2fb
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.08.3 b/metadata/md5-cache/kde-apps/kanagram-18.08.3
index 2aa838f89bad..0c9eb68dcafb 100644
--- a/metadata/md5-cache/kde-apps/kanagram-18.08.3
+++ b/metadata/md5-cache/kde-apps/kanagram-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/libkeduvocdocument-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/kdeedu-data-18.08.3:5 >=dev-qt/qtmultimedia-5.9.4:5[qml] >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kanagram-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6ba9bed59546cb2f4d5ccc30e9286ef
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.12.0 b/metadata/md5-cache/kde-apps/kanagram-18.12.0
deleted file mode 100644
index 59a930b4492b..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-apps/kdeedu-data-18.12.0:5 >=dev-qt/qtmultimedia-5.11.1:5[qml] >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kanagram-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1359d4eaa6b9082d8788faf515b07662
diff --git a/metadata/md5-cache/kde-apps/kanagram-18.12.1 b/metadata/md5-cache/kde-apps/kanagram-18.12.1
new file mode 100644
index 000000000000..fb9fad9085c7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-apps/kdeedu-data-18.12.1:5 >=dev-qt/qtmultimedia-5.11.1:5[qml] >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d50cc8052446704d1300368bd02a9a66
diff --git a/metadata/md5-cache/kde-apps/kapman-18.08.3 b/metadata/md5-cache/kde-apps/kapman-18.08.3
index d60d01a924b7..452a6627ccc5 100644
--- a/metadata/md5-cache/kde-apps/kapman-18.08.3
+++ b/metadata/md5-cache/kde-apps/kapman-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kapman-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14888b68a48bdeb3d99dae68d9ddca4f
diff --git a/metadata/md5-cache/kde-apps/kapman-18.12.0 b/metadata/md5-cache/kde-apps/kapman-18.12.0
deleted file mode 100644
index 7fa2b81a6436..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kapman-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c0ae4e62ae04773a04f64da4dd333967
diff --git a/metadata/md5-cache/kde-apps/kapman-18.12.1 b/metadata/md5-cache/kde-apps/kapman-18.12.1
new file mode 100644
index 000000000000..519c93a996f2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=76aa5733a9a87bfca3e34921b0e842f3
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.08.3 b/metadata/md5-cache/kde-apps/kapptemplate-18.08.3
index 8b3d3ce9f077..0ba9da83bca2 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.08.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kapptemplate-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c10a349582916694914f94b3e038a5c1
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.12.0 b/metadata/md5-cache/kde-apps/kapptemplate-18.12.0
deleted file mode 100644
index 631fe7421b2d..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kapptemplate-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3808b5978d7ac4040e4fe39eeebd2a18
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-18.12.1 b/metadata/md5-cache/kde-apps/kapptemplate-18.12.1
new file mode 100644
index 000000000000..0366c3d8a916
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fcaf86d22b1e56866123d50cccf0d7ae
diff --git a/metadata/md5-cache/kde-apps/kate-18.08.3 b/metadata/md5-cache/kde-apps/kate-18.08.3
index 7ad4be6b023e..b56a1188111f 100644
--- a/metadata/md5-cache/kde-apps/kate-18.08.3
+++ b/metadata/md5-cache/kde-apps/kate-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 addons? ( >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtsql-5.9.4:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kate-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=50b1802f005985b7498243103b10b121
diff --git a/metadata/md5-cache/kde-apps/kate-18.12.0 b/metadata/md5-cache/kde-apps/kate-18.12.0
deleted file mode 100644
index 92ce4baa898b..000000000000
--- a/metadata/md5-cache/kde-apps/kate-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 addons? ( >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 addons? ( >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kate-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3d45415e84a475cb66b087e51a45c0c
diff --git a/metadata/md5-cache/kde-apps/kate-18.12.1 b/metadata/md5-cache/kde-apps/kate-18.12.1
new file mode 100644
index 000000000000..691be1463f5f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 addons? ( >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 addons? ( >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kate-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=af74094dfa3560a614c51fb968b97de5
diff --git a/metadata/md5-cache/kde-apps/katomic-18.08.3 b/metadata/md5-cache/kde-apps/katomic-18.08.3
index f318fd7ac748..965637022977 100644
--- a/metadata/md5-cache/kde-apps/katomic-18.08.3
+++ b/metadata/md5-cache/kde-apps/katomic-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/katomic-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ba0e65567cfe149a006d7aa07a9a476
diff --git a/metadata/md5-cache/kde-apps/katomic-18.12.0 b/metadata/md5-cache/kde-apps/katomic-18.12.0
deleted file mode 100644
index a59d417cc460..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/katomic-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=73bcc03126dd9b6249e01d7e6c932549
diff --git a/metadata/md5-cache/kde-apps/katomic-18.12.1 b/metadata/md5-cache/kde-apps/katomic-18.12.1
new file mode 100644
index 000000000000..f3d3916c98ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4f10b5676379b357ffbca21e606cc559
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.08.3 b/metadata/md5-cache/kde-apps/kbackup-18.08.3
index 669416e90193..77fee276d060 100644
--- a/metadata/md5-cache/kde-apps/kbackup-18.08.3
+++ b/metadata/md5-cache/kde-apps/kbackup-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kbackup-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9a808631c87aa08a932fb60f848417d
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.12.0 b/metadata/md5-cache/kde-apps/kbackup-18.12.0
deleted file mode 100644
index 5e2f096626bd..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbackup:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kbackup-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9f0352c191cdc89827665718ef2feb07
diff --git a/metadata/md5-cache/kde-apps/kbackup-18.12.1 b/metadata/md5-cache/kde-apps/kbackup-18.12.1
new file mode 100644
index 000000000000..0f03605f8195
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a52bed5354af1e0169334aaf56e4109a
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.08.3 b/metadata/md5-cache/kde-apps/kblackbox-18.08.3
index fa9729c714b0..353e4afaadc2 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-18.08.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kblackbox-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2eed6b926cc75370cb9940c8a6c00b49
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.12.0 b/metadata/md5-cache/kde-apps/kblackbox-18.12.0
deleted file mode 100644
index 4da40b78281e..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kblackbox-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a008ef002746888719e8005123f83a0b
diff --git a/metadata/md5-cache/kde-apps/kblackbox-18.12.1 b/metadata/md5-cache/kde-apps/kblackbox-18.12.1
new file mode 100644
index 000000000000..85a628d2421d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=04ad202dcf9ebd025ad0d0b70684ff90
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.08.3 b/metadata/md5-cache/kde-apps/kblocks-18.08.3
index 7af9a4fecd09..0496f6e1b117 100644
--- a/metadata/md5-cache/kde-apps/kblocks-18.08.3
+++ b/metadata/md5-cache/kde-apps/kblocks-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kblocks-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0872a5c51dc8cb21933dafa7c4a6fe6a
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.12.0 b/metadata/md5-cache/kde-apps/kblocks-18.12.0
deleted file mode 100644
index 30d9056744cb..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kblocks-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f0491e68b8429c74be805b885026912b
diff --git a/metadata/md5-cache/kde-apps/kblocks-18.12.1 b/metadata/md5-cache/kde-apps/kblocks-18.12.1
new file mode 100644
index 000000000000..5a139f866364
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6ac696f0f5a18127672d438f19fe7e03
diff --git a/metadata/md5-cache/kde-apps/kblog-18.08.3 b/metadata/md5-cache/kde-apps/kblog-18.08.3
index 8215a2a72eb7..307c30168edf 100644
--- a/metadata/md5-cache/kde-apps/kblog-18.08.3
+++ b/metadata/md5-cache/kde-apps/kblog-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kblog-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d68267a095ee3d2f7c4e067015b5d81c
diff --git a/metadata/md5-cache/kde-apps/kblog-18.12.0 b/metadata/md5-cache/kde-apps/kblog-18.12.0
deleted file mode 100644
index cf5051e979b2..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kblog-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14a2d7a5d9addfa254c78613ee8f3b60
diff --git a/metadata/md5-cache/kde-apps/kblog-18.12.1 b/metadata/md5-cache/kde-apps/kblog-18.12.1
new file mode 100644
index 000000000000..851a1f3be3ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=kde-frameworks/syndication-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0530668c523a49c3bd06e5fea3fd2bde
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.08.3 b/metadata/md5-cache/kde-apps/kbounce-18.08.3
index fafc1e960881..24096e8b6715 100644
--- a/metadata/md5-cache/kde-apps/kbounce-18.08.3
+++ b/metadata/md5-cache/kde-apps/kbounce-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kbounce-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7e8918900f2e117c800567336d09b93d
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.12.0 b/metadata/md5-cache/kde-apps/kbounce-18.12.0
deleted file mode 100644
index 24788a098446..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kbounce-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=791356c5445733b8f6378d5337a17019
diff --git a/metadata/md5-cache/kde-apps/kbounce-18.12.1 b/metadata/md5-cache/kde-apps/kbounce-18.12.1
new file mode 100644
index 000000000000..5f04811fe04f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d08687b297b2e98e02bbeea485e67f27
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.08.3 b/metadata/md5-cache/kde-apps/kbreakout-18.08.3
index e0ea55515a0e..528acbe6f3b9 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-18.08.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kbreakout-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4b416277e20e542251c518df5c833f88
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.12.0 b/metadata/md5-cache/kde-apps/kbreakout-18.12.0
deleted file mode 100644
index 81caa4bcb534..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kbreakout-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1541d154c0fffb6b88379a25233b3062
diff --git a/metadata/md5-cache/kde-apps/kbreakout-18.12.1 b/metadata/md5-cache/kde-apps/kbreakout-18.12.1
new file mode 100644
index 000000000000..9527fadabed1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d8f828fe57a492d809eda8b6444fa84e
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.08.3 b/metadata/md5-cache/kde-apps/kbruch-18.08.3
index ae3acaa1a72e..f0739254da1e 100644
--- a/metadata/md5-cache/kde-apps/kbruch-18.08.3
+++ b/metadata/md5-cache/kde-apps/kbruch-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kbruch-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac66095bf49800f4afdad3e9d8b8effd
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.12.0 b/metadata/md5-cache/kde-apps/kbruch-18.12.0
deleted file mode 100644
index 99077851a29d..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kbruch-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6fcee72a8b16192ab6f249b1c31b2fc2
diff --git a/metadata/md5-cache/kde-apps/kbruch-18.12.1 b/metadata/md5-cache/kde-apps/kbruch-18.12.1
new file mode 100644
index 000000000000..35c105f0ad4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=89212601bfe51816ccbf94d40e6721a9
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.08.3 b/metadata/md5-cache/kde-apps/kcachegrind-18.08.3
index e22ea022ca6d..33e7bfe2be38 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcachegrind-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=29115500c0d7098719370000f98480f2
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.12.0 b/metadata/md5-cache/kde-apps/kcachegrind-18.12.0
deleted file mode 100644
index e385d668062b..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/graphviz >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcachegrind-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f4476d593d280ab5401fa940f0f95460
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-18.12.1 b/metadata/md5-cache/kde-apps/kcachegrind-18.12.1
new file mode 100644
index 000000000000..6c7212731736
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/graphviz >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5aff5435a39d42d53327077296ba1f85
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.08.3 b/metadata/md5-cache/kde-apps/kcalc-18.08.3
index 936301f64d1a..a6e61cfeb98a 100644
--- a/metadata/md5-cache/kde-apps/kcalc-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcalc-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcalc-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5527b0857a4ccc99df5f3cc0378866d
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.12.0 b/metadata/md5-cache/kde-apps/kcalc-18.12.0
deleted file mode 100644
index 04b255c5549e..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcalc-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e9578e85b63f52d4249da70e71302d2e
diff --git a/metadata/md5-cache/kde-apps/kcalc-18.12.1 b/metadata/md5-cache/kde-apps/kcalc-18.12.1
new file mode 100644
index 000000000000..77e0fd5d6c1f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/gmp:0= sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d959be7148332e8ed90cda043b816d3c
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.08.3 b/metadata/md5-cache/kde-apps/kcalcore-18.08.3
index b09a5319e096..9d9b9ead4102 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || (
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcalcore-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c69eb513e8e9eeb8e5197e97345f8a1
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.12.0 b/metadata/md5-cache/kde-apps/kcalcore-18.12.0
deleted file mode 100644
index 93fb87c3b1c1..000000000000
--- a/metadata/md5-cache/kde-apps/kcalcore-18.12.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.11.1:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalcore:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcalcore-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14f5c5f9127fd2890aabba3b09a65665
diff --git a/metadata/md5-cache/kde-apps/kcalcore-18.12.1 b/metadata/md5-cache/kde-apps/kcalcore-18.12.1
new file mode 100644
index 000000000000..8225976b5cdb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalcore-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 dev-libs/libical:= sys-devel/bison sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3dd855360f011591dc5adc07cbd2423b
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.08.3 b/metadata/md5-cache/kde-apps/kcalutils-18.08.3
index 7eaf8ca56306..4396217e9149 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcalutils-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=956e6d6615b6a41ac8cdf7b27bd71b88
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.12.0 b/metadata/md5-cache/kde-apps/kcalutils-18.12.0
deleted file mode 100644
index 649b3a8ba932..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalutils:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcalutils-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=499b457abedff45d05fec6e044918270
diff --git a/metadata/md5-cache/kde-apps/kcalutils-18.12.1 b/metadata/md5-cache/kde-apps/kcalutils-18.12.1
new file mode 100644
index 000000000000..c95273534b99
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4499532855f3295308cdcd19332bd9f8
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.08.3 b/metadata/md5-cache/kde-apps/kcharselect-18.08.3
index f413c71c6698..1d7e05d7ec7f 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcharselect-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0737f7755620e480c3de3de3d1f6d8ab
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.12.0 b/metadata/md5-cache/kde-apps/kcharselect-18.12.0
deleted file mode 100644
index 1078e2d96c4b..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcharselect-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fcfb1481d19978aa6b15898851c94c4b
diff --git a/metadata/md5-cache/kde-apps/kcharselect-18.12.1 b/metadata/md5-cache/kde-apps/kcharselect-18.12.1
new file mode 100644
index 000000000000..7286983168fb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c12cdef66d0436044ad2d51b7e997fda
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.3 b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.3
index cb113a83da22..88cc69907a16 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.08.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcolorchooser-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=22303da0c783dbe3c5fd14a6fd948d1e
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.12.0 b/metadata/md5-cache/kde-apps/kcolorchooser-18.12.0
deleted file mode 100644
index ec0f6b5eca43..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcolorchooser-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=70bb0978143b875dad6d4d1fdf842be9
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-18.12.1 b/metadata/md5-cache/kde-apps/kcolorchooser-18.12.1
new file mode 100644
index 000000000000..c9e29a0d6ed0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4be2c92802a480cef26c237472853717
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.08.3 b/metadata/md5-cache/kde-apps/kcontacts-18.08.3
index 5f255034bd50..3cccd923ec64 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcontacts-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b543040f1d9d732cb0c72db06cb6f363
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.12.0 b/metadata/md5-cache/kde-apps/kcontacts-18.12.0
deleted file mode 100644
index d22713309351..000000000000
--- a/metadata/md5-cache/kde-apps/kcontacts-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcontacts-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=936de5078bbbdb22b0c0f0927296991f
diff --git a/metadata/md5-cache/kde-apps/kcontacts-18.12.1 b/metadata/md5-cache/kde-apps/kcontacts-18.12.1
new file mode 100644
index 000000000000..74846475a8c1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcontacts-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 !kde-apps/kdepim-l10n app-text/iso-codes >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=569b0164ee3383e5b7061013990ecd51
diff --git a/metadata/md5-cache/kde-apps/kcron-18.08.3 b/metadata/md5-cache/kde-apps/kcron-18.08.3
index c856652f5221..23a809f48099 100644
--- a/metadata/md5-cache/kde-apps/kcron-18.08.3
+++ b/metadata/md5-cache/kde-apps/kcron-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kcron-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c8e6ae837b36b6a7badb5744a695ebc
diff --git a/metadata/md5-cache/kde-apps/kcron-18.12.0 b/metadata/md5-cache/kde-apps/kcron-18.12.0
deleted file mode 100644
index 110ca095e738..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-18.12.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kcron-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=733643aeb5aa224e6a2c9221fa890c99
diff --git a/metadata/md5-cache/kde-apps/kcron-18.12.1 b/metadata/md5-cache/kde-apps/kcron-18.12.1
new file mode 100644
index 000000000000..8d6c44b35085
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/cron >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c5734773b9bf3817d65af1cba27c5cfa
diff --git a/metadata/md5-cache/kde-apps/kdav-18.08.3 b/metadata/md5-cache/kde-apps/kdav-18.08.3
index c0630d40d3fb..b5b37c966982 100644
--- a/metadata/md5-cache/kde-apps/kdav-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdav-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdav-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed880da15b5c6638a9df2d258a8bf2a7
diff --git a/metadata/md5-cache/kde-apps/kdav-18.12.0 b/metadata/md5-cache/kde-apps/kdav-18.12.0
deleted file mode 100644
index 4263434fd8ac..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-18.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.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdav-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=504377b966fb9841a75d66ef2d0f3ff5
diff --git a/metadata/md5-cache/kde-apps/kdav-18.12.1 b/metadata/md5-cache/kde-apps/kdav-18.12.1
new file mode 100644
index 000000000000..13dfccbbbc1f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=48103e18e9c1800dfa7af11b18e0b23d
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.3
index 8c6f096c3cd4..e6790a8542e0 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-18.08.3 >=kde-apps/kdeadmin-meta-18.08.3 >=kde-apps/kdecore-meta-18.08.3 >=kde-apps/kdeedu-meta-18.08.3 >=kde-apps/kdegames-meta-18.08.3 >=kde-apps/kdegraphics-meta-18.08.3 >=kde-apps/kdemultimedia-meta-18.08.3 >=kde-apps/kdenetwork-meta-18.08.3 >=kde-apps/kdeutils-meta-18.08.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.08.3 ) pim? ( >=kde-apps/kdepim-meta-18.08.3 ) sdk? ( >=kde-apps/kdesdk-meta-18.08.3 ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5bff451c24fdfcbb37e4e68258ff0fe2
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.0 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.0
deleted file mode 100644
index 82958bdd83a2..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdeadmin-meta-18.12.0:5 >=kde-apps/kdecore-meta-18.12.0:5 >=kde-apps/kdeedu-meta-18.12.0:5 >=kde-apps/kdegames-meta-18.12.0:5 >=kde-apps/kdegraphics-meta-18.12.0:5 >=kde-apps/kdemultimedia-meta-18.12.0:5 >=kde-apps/kdenetwork-meta-18.12.0:5 >=kde-apps/kdeutils-meta-18.12.0:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.12.0:5 ) pim? ( >=kde-apps/kdepim-meta-18.12.0:5 ) sdk? ( >=kde-apps/kdesdk-meta-18.12.0:5 )
-SLOT=5
-_md5_=3f9421c9eb2f65d3c4438802dc811cf2
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.1
new file mode 100644
index 000000000000..2c0b906b1b8c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdeadmin-meta-18.12.1:5 >=kde-apps/kdecore-meta-18.12.1:5 >=kde-apps/kdeedu-meta-18.12.1:5 >=kde-apps/kdegames-meta-18.12.1:5 >=kde-apps/kdegraphics-meta-18.12.1:5 >=kde-apps/kdemultimedia-meta-18.12.1:5 >=kde-apps/kdenetwork-meta-18.12.1:5 >=kde-apps/kdeutils-meta-18.12.1:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-18.12.1:5 ) pim? ( >=kde-apps/kdepim-meta-18.12.1:5 ) sdk? ( >=kde-apps/kdesdk-meta-18.12.1:5 )
+SLOT=5
+_md5_=ade8a8b26bf20607163478b604db09ea
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.3
index d824bb407410..9103112cc2f5 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.08.3
@@ -9,5 +9,5 @@ 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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kde-dev-scripts-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d07ea4277f3260243908936b3836cc35
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.0 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.0
deleted file mode 100644
index 7f9541738459..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kde-dev-scripts-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13622f19b98f06a2cc0a278efaa0da37
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.1
new file mode 100644
index 000000000000..96cbe6f6c60e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=75cb748ab90b681d3667c8e0dc043aba
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.3
index 4e5647cbb155..98255b7f7399 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kde-dev-utils-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb8188535844f1584e62f0895eade233
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.12.0 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.12.0
deleted file mode 100644
index 01ba2b952935..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kde-dev-utils-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d18bb587c5ea4b40e08a5e380834c810
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-18.12.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-18.12.1
new file mode 100644
index 000000000000..1430247980d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=08618250640713b0d553b7063ef8b5d7
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.08.3 b/metadata/md5-cache/kde-apps/kde-meta-18.08.3
index 7d772b0fb1c2..710be8a790a2 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-18.08.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=36cecc45c4a61340be20c15ae9771518
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.12.0 b/metadata/md5-cache/kde-apps/kde-meta-18.12.0
deleted file mode 100644
index 046285689145..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-18.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-18.12.0:5 kde-plasma/plasma-meta:5
-SLOT=5
-_md5_=c53f86412f92fc15fb0ef29736e043c9
diff --git a/metadata/md5-cache/kde-apps/kde-meta-18.12.1 b/metadata/md5-cache/kde-apps/kde-meta-18.12.1
new file mode 100644
index 000000000000..b0f3076ca25c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-18.12.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-18.12.1:5 kde-plasma/plasma-meta:5
+SLOT=5
+_md5_=1a50bf92c58f77aa9a0d2746cc79845f
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.3
index 413daadab2c6..7a3481a8eb4b 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kmag-18.08.3 >=kde-apps/kmousetool-18.08.3 >=kde-apps/kmouth-18.08.3 !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=afda86d3530e3cc2b0cbe7d8bee790bd
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.0
deleted file mode 100644
index 429cf486a650..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-18.12.0:5 >=kde-apps/kmousetool-18.12.0:5 >=kde-apps/kmouth-18.12.0:5
-SLOT=5
-_md5_=6966eea2245fa0eb3a63753ba2f2383b
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.1
new file mode 100644
index 000000000000..c875f9faed7a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-18.12.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-18.12.1:5 >=kde-apps/kmousetool-18.12.1:5 >=kde-apps/kmouth-18.12.1:5
+SLOT=5
+_md5_=ffe0f3f5adcb0ba5a826a0953268fffb
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.3
index 80d94041917b..395b27673a8b 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-18.08.3 cron? ( >=kde-apps/kcron-18.08.3 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c6431bb93703b2f4ca3da62d34302989
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.0
deleted file mode 100644
index 0bb04f986ae2..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-18.12.0:5 cron? ( >=kde-apps/kcron-18.12.0:5 )
-SLOT=5
-_md5_=11ca33f18f78f759a0dc3ed4cf527821
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.1
new file mode 100644
index 000000000000..d492df9cbeee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-18.12.1:5 cron? ( >=kde-apps/kcron-18.12.1:5 )
+SLOT=5
+_md5_=19308340d8000deb57fba42bfb51a23f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdebase-meta-18.08.3
index c451a31d91e6..f4cba4ab29c6 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-18.08.3 >=kde-plasma/plasma-meta-5.12.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=cae0d1204defebd5c90d3f1c5cdf3808
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdebase-meta-18.12.0
deleted file mode 100644
index 976ccc647d08..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-18.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-18.12.0:5 kde-plasma/plasma-meta
-SLOT=5
-_md5_=0de9fd86b263c47b86333fcc052e7f3b
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdebase-meta-18.12.1
new file mode 100644
index 000000000000..05ae6c63b2c6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-18.12.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-18.12.1:5 kde-plasma/plasma-meta
+SLOT=5
+_md5_=297dc6e468ee18249e4b25ae9690edb9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.3 b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.3
index aeac122011a0..2c9505bba119 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdebugsettings-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bfb41d379f57bdb79e3fb5ec25801aa9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.12.0 b/metadata/md5-cache/kde-apps/kdebugsettings-18.12.0
deleted file mode 100644
index ea82888b0831..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdebugsettings:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdebugsettings-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f537a8dc4d8f874316a6353ed7088627
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-18.12.1 b/metadata/md5-cache/kde-apps/kdebugsettings-18.12.1
new file mode 100644
index 000000000000..c06c38c84b7b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e53d384a3edd717ac2db54bd46af67f9
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.08.3-r1 b/metadata/md5-cache/kde-apps/kdecore-meta-18.08.3-r1
index dd7c763df82b..d486705f53b4 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.08.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-18.08.3 >=kde-apps/kdialog-18.08.3 >=kde-apps/keditbookmarks-18.08.3 >=kde-apps/kfind-18.08.3 >=kde-apps/konsole-18.08.3 >=kde-apps/kwrite-18.08.3 handbook? ( >=kde-apps/khelpcenter-18.08.3 ) webengine? ( www-client/falkon ) webkit? ( >=kde-apps/konqueror-18.08.3[webengine?] kde-misc/kwebkitpart:5 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=717f82a0b8358b3eb36743f6e4c8dc41
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdecore-meta-18.12.0
deleted file mode 100644
index 4363e570fe4e..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-IUSE=+handbook +webengine webkit
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-18.12.0:5 >=kde-apps/kdialog-18.12.0:5 >=kde-apps/keditbookmarks-18.12.0:5 >=kde-apps/kfind-18.12.0:5 >=kde-apps/konsole-18.12.0:5 >=kde-apps/kwrite-18.12.0:5 handbook? ( >=kde-apps/khelpcenter-18.12.0:5 ) webengine? ( www-client/falkon ) webkit? ( >=kde-apps/konqueror-18.12.0:5[webengine?] kde-misc/kwebkitpart:5 )
-SLOT=5
-_md5_=0a9a5b7a0a1078a0d38dd17e2fa2d1e1
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdecore-meta-18.12.1
new file mode 100644
index 000000000000..bbe94eee9484
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+IUSE=+handbook +webengine webkit
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-18.12.1:5 >=kde-apps/kdialog-18.12.1:5 >=kde-apps/keditbookmarks-18.12.1:5 >=kde-apps/kfind-18.12.1:5 >=kde-apps/konsole-18.12.1:5 >=kde-apps/kwrite-18.12.1:5 handbook? ( >=kde-apps/khelpcenter-18.12.1:5 ) webengine? ( www-client/falkon ) webkit? ( >=kde-apps/konqueror-18.12.1:5[webengine?] kde-misc/kwebkitpart:5 )
+SLOT=5
+_md5_=7781b726c9106a89c52c0ebc5c1c028d
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.3 b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.3
index 68fb559bc9d2..181922a3201b 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.08.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdeedu-data-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6ed66fb39957629558133caf56dda78
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.12.0 b/metadata/md5-cache/kde-apps/kdeedu-data-18.12.0
deleted file mode 100644
index 1235c65ef3e3..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-18.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.52.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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/18.12.0/src/kdeedu-data-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=89240f2089ef44933a202dd6e923f79d
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-18.12.1 b/metadata/md5-cache/kde-apps/kdeedu-data-18.12.1
new file mode 100644
index 000000000000..d5845c500821
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-18.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.52.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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/18.12.1/src/kdeedu-data-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=047eaf7ad07d6395329fa019a8f6c532
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.3
index e21785d74b4d..5fffb763d60d 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-18.08.3 >=kde-apps/artikulate-18.08.3 >=kde-apps/blinken-18.08.3 >=kde-apps/cantor-18.08.3 >=kde-apps/kalzium-18.08.3 >=kde-apps/kanagram-18.08.3 >=kde-apps/kbruch-18.08.3 >=kde-apps/kdeedu-data-18.08.3 >=kde-apps/kgeography-18.08.3 >=kde-apps/khangman-18.08.3 >=kde-apps/kig-18.08.3 >=kde-apps/kiten-18.08.3 >=kde-apps/klettres-18.08.3 >=kde-apps/kmplot-18.08.3 >=kde-apps/kqtquickcharts-18.08.3 >=kde-apps/ktouch-18.08.3 >=kde-apps/kturtle-18.08.3 >=kde-apps/kwordquiz-18.08.3 >=kde-apps/libkeduvocdocument-18.08.3 >=kde-apps/marble-18.08.3 >=kde-apps/minuet-18.08.3 >=kde-apps/step-18.08.3 webengine? ( >=kde-apps/kalgebra-18.08.3 >=kde-apps/parley-18.08.3 ) webkit? ( >=kde-apps/rocs-18.08.3 ) !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d383c90c895a81cf59ff35b1fe344524
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.0
deleted file mode 100644
index fe8ce99da118..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=7
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine +webkit
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-18.12.0:5 >=kde-apps/artikulate-18.12.0:5 >=kde-apps/blinken-18.12.0:5 >=kde-apps/cantor-18.12.0:5 >=kde-apps/kalzium-18.12.0:5 >=kde-apps/kanagram-18.12.0:5 >=kde-apps/kbruch-18.12.0:5 >=kde-apps/kdeedu-data-18.12.0:5 >=kde-apps/kgeography-18.12.0:5 >=kde-apps/khangman-18.12.0:5 >=kde-apps/kig-18.12.0:5 >=kde-apps/kiten-18.12.0:5 >=kde-apps/klettres-18.12.0:5 >=kde-apps/kmplot-18.12.0:5 >=kde-apps/kqtquickcharts-18.12.0:5 >=kde-apps/ktouch-18.12.0:5 >=kde-apps/kturtle-18.12.0:5 >=kde-apps/kwordquiz-18.12.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=kde-apps/marble-18.12.0:5 >=kde-apps/minuet-18.12.0:5 >=kde-apps/step-18.12.0:5 webengine? ( >=kde-apps/kalgebra-18.12.0:5 >=kde-apps/parley-18.12.0:5 ) webkit? ( >=kde-apps/rocs-18.12.0:5 )
-SLOT=5
-_md5_=7e0be9f578644cc0a0d77fb9fa795618
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.1
new file mode 100644
index 000000000000..a2f1367d5bbb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=7
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine +webkit
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-18.12.1:5 >=kde-apps/artikulate-18.12.1:5 >=kde-apps/blinken-18.12.1:5 >=kde-apps/cantor-18.12.1:5 >=kde-apps/kalzium-18.12.1:5 >=kde-apps/kanagram-18.12.1:5 >=kde-apps/kbruch-18.12.1:5 >=kde-apps/kdeedu-data-18.12.1:5 >=kde-apps/kgeography-18.12.1:5 >=kde-apps/khangman-18.12.1:5 >=kde-apps/kig-18.12.1:5 >=kde-apps/kiten-18.12.1:5 >=kde-apps/klettres-18.12.1:5 >=kde-apps/kmplot-18.12.1:5 >=kde-apps/kqtquickcharts-18.12.1:5 >=kde-apps/ktouch-18.12.1:5 >=kde-apps/kturtle-18.12.1:5 >=kde-apps/kwordquiz-18.12.1:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=kde-apps/marble-18.12.1:5 >=kde-apps/minuet-18.12.1:5 >=kde-apps/step-18.12.1:5 webengine? ( >=kde-apps/kalgebra-18.12.1:5 >=kde-apps/parley-18.12.1:5 ) webkit? ( >=kde-apps/rocs-18.12.1:5 )
+SLOT=5
+_md5_=1cbdd7e19d5a5e0499ce75fba7c381c5
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdegames-meta-18.08.3
index aa2f0f7f1f9b..f0f62e4538a6 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-18.08.3 >=kde-apps/bovo-18.08.3 >=kde-apps/granatier-18.08.3 >=kde-apps/kapman-18.08.3 >=kde-apps/katomic-18.08.3 >=kde-apps/kblackbox-18.08.3 >=kde-apps/kblocks-18.08.3 >=kde-apps/kbounce-18.08.3 >=kde-apps/kbreakout-18.08.3 >=kde-apps/kdiamond-18.08.3 >=kde-apps/kfourinline-18.08.3 >=kde-apps/kgoldrunner-18.08.3 >=kde-apps/kigo-18.08.3 >=kde-apps/killbots-18.08.3 >=kde-apps/kiriki-18.08.3 >=kde-apps/kjumpingcube-18.08.3 >=kde-apps/klickety-18.08.3 >=kde-apps/klines-18.08.3 >=kde-apps/kmahjongg-18.08.3 >=kde-apps/kmines-18.08.3 >=kde-apps/knavalbattle-18.08.3 >=kde-apps/knetwalk-18.08.3 >=kde-apps/kolf-18.08.3 >=kde-apps/kollision-18.08.3 >=kde-apps/konquest-18.08.3 >=kde-apps/kpat-18.04.3 >=kde-apps/kreversi-18.08.3 >=kde-apps/kshisen-18.08.3 >=kde-apps/ksirk-18.08.3 >=kde-apps/ksnakeduel-18.08.3 >=kde-apps/kspaceduel-18.08.3 >=kde-apps/ksquares-18.08.3 >=kde-apps/ktuberling-18.08.3 >=kde-apps/libkdegames-18.08.3 >=kde-apps/libkmahjongg-18.08.3 >=kde-apps/lskat-18.08.3 >=kde-apps/palapeli-18.08.3 >=kde-apps/picmi-18.08.3 opengl? ( >=kde-apps/ksudoku-18.08.3 >=kde-apps/kubrick-18.08.3 ) python? ( >=kde-apps/kajongg-18.08.3 ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0c05bd040907ab1e0891d9ff4954248b
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdegames-meta-18.12.0
deleted file mode 100644
index 16d9073676b4..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=7
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-18.12.0:5 >=kde-apps/bovo-18.12.0:5 >=kde-apps/granatier-18.12.0:5 >=kde-apps/kapman-18.12.0:5 >=kde-apps/katomic-18.12.0:5 >=kde-apps/kblackbox-18.12.0:5 >=kde-apps/kblocks-18.12.0:5 >=kde-apps/kbounce-18.12.0:5 >=kde-apps/kbreakout-18.12.0:5 >=kde-apps/kdiamond-18.12.0:5 >=kde-apps/kfourinline-18.12.0:5 >=kde-apps/kgoldrunner-18.12.0:5 >=kde-apps/kigo-18.12.0:5 >=kde-apps/killbots-18.12.0:5 >=kde-apps/kiriki-18.12.0:5 >=kde-apps/kjumpingcube-18.12.0:5 >=kde-apps/klickety-18.12.0:5 >=kde-apps/klines-18.12.0:5 >=kde-apps/kmahjongg-18.12.0:5 >=kde-apps/kmines-18.12.0:5 >=kde-apps/knavalbattle-18.12.0:5 >=kde-apps/knetwalk-18.12.0:5 >=kde-apps/knights-18.12.0:5 >=kde-apps/kolf-18.12.0:5 >=kde-apps/kollision-18.12.0:5 >=kde-apps/konquest-18.12.0:5 >=kde-apps/kpat-18.04.3:5 >=kde-apps/kreversi-18.12.0:5 >=kde-apps/kshisen-18.12.0:5 >=kde-apps/ksirk-18.12.0:5 >=kde-apps/ksnakeduel-18.12.0:5 >=kde-apps/kspaceduel-18.12.0:5 >=kde-apps/ksquares-18.12.0:5 >=kde-apps/ktuberling-18.12.0:5 >=kde-apps/libkdegames-18.12.0:5 >=kde-apps/libkmahjongg-18.12.0:5 >=kde-apps/lskat-18.12.0:5 >=kde-apps/palapeli-18.12.0:5 >=kde-apps/picmi-18.12.0:5 opengl? ( >=kde-apps/ksudoku-18.12.0:5 >=kde-apps/kubrick-18.12.0:5 ) python? ( >=kde-apps/kajongg-18.12.0:5 )
-SLOT=5
-_md5_=022976b60bfb230857ab174115073217
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdegames-meta-18.12.1
new file mode 100644
index 000000000000..cd6ae1d98fcd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=7
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-18.12.1:5 >=kde-apps/bovo-18.12.1:5 >=kde-apps/granatier-18.12.1:5 >=kde-apps/kapman-18.12.1:5 >=kde-apps/katomic-18.12.1:5 >=kde-apps/kblackbox-18.12.1:5 >=kde-apps/kblocks-18.12.1:5 >=kde-apps/kbounce-18.12.1:5 >=kde-apps/kbreakout-18.12.1:5 >=kde-apps/kdiamond-18.12.1:5 >=kde-apps/kfourinline-18.12.1:5 >=kde-apps/kgoldrunner-18.12.1:5 >=kde-apps/kigo-18.12.1:5 >=kde-apps/killbots-18.12.1:5 >=kde-apps/kiriki-18.12.1:5 >=kde-apps/kjumpingcube-18.12.1:5 >=kde-apps/klickety-18.12.1:5 >=kde-apps/klines-18.12.1:5 >=kde-apps/kmahjongg-18.12.1:5 >=kde-apps/kmines-18.12.1:5 >=kde-apps/knavalbattle-18.12.1:5 >=kde-apps/knetwalk-18.12.1:5 >=kde-apps/knights-18.12.1:5 >=kde-apps/kolf-18.12.1:5 >=kde-apps/kollision-18.12.1:5 >=kde-apps/konquest-18.12.1:5 >=kde-apps/kpat-18.04.3:5 >=kde-apps/kreversi-18.12.1:5 >=kde-apps/kshisen-18.12.1:5 >=kde-apps/ksirk-18.12.1:5 >=kde-apps/ksnakeduel-18.12.1:5 >=kde-apps/kspaceduel-18.12.1:5 >=kde-apps/ksquares-18.12.1:5 >=kde-apps/ktuberling-18.12.1:5 >=kde-apps/libkdegames-18.12.1:5 >=kde-apps/libkmahjongg-18.12.1:5 >=kde-apps/lskat-18.12.1:5 >=kde-apps/palapeli-18.12.1:5 >=kde-apps/picmi-18.12.1:5 opengl? ( >=kde-apps/ksudoku-18.12.1:5 >=kde-apps/kubrick-18.12.1:5 ) python? ( >=kde-apps/kajongg-18.12.1:5 )
+SLOT=5
+_md5_=3a762d17fc7996dcada777899d4e4ae1
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.3
index bf0978aa7e29..087e660d08ee 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-18.08.3 >=kde-apps/kamera-18.08.3 >=kde-apps/kcolorchooser-18.08.3 >=kde-apps/kdegraphics-mobipocket-18.08.3 >=kde-apps/kolourpaint-18.08.3 >=kde-apps/kruler-18.08.3 >=kde-apps/libkdcraw-18.08.3 >=kde-apps/libkexiv2-18.08.3 >=kde-apps/libkipi-18.08.3 >=kde-apps/okular-18.08.3 >=kde-apps/spectacle-18.08.3 >=kde-apps/svgpart-18.08.3 >=kde-apps/thumbnailers-18.08.3 scanner? ( >=kde-apps/libksane-18.08.3 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=25b2bb854f529640225bc1f3675943bc
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.0
deleted file mode 100644
index 6ff02705538d..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-18.12.0:5 >=kde-apps/kamera-18.12.0:5 >=kde-apps/kcolorchooser-18.12.0:5 >=kde-apps/kdegraphics-mobipocket-18.12.0:5 >=kde-apps/kolourpaint-18.12.0:5 >=kde-apps/kruler-18.12.0:5 >=kde-apps/libkdcraw-18.12.0:5 >=kde-apps/libkexiv2-18.12.0:5 >=kde-apps/libkipi-18.12.0:5 >=kde-apps/okular-18.12.0:5 >=kde-apps/spectacle-18.12.0:5 >=kde-apps/svgpart-18.12.0:5 >=kde-apps/thumbnailers-18.12.0:5 scanner? ( >=kde-apps/libksane-18.12.0:5 )
-SLOT=5
-_md5_=d21e0d06251d2926d4963f9ee0a4e89f
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.1
new file mode 100644
index 000000000000..770baf519dea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-18.12.1:5 >=kde-apps/kamera-18.12.1:5 >=kde-apps/kcolorchooser-18.12.1:5 >=kde-apps/kdegraphics-mobipocket-18.12.1:5 >=kde-apps/kolourpaint-18.12.1:5 >=kde-apps/kruler-18.12.1:5 >=kde-apps/libkdcraw-18.12.1:5 >=kde-apps/libkexiv2-18.12.1:5 >=kde-apps/libkipi-18.12.1:5 >=kde-apps/okular-18.12.1:5 >=kde-apps/spectacle-18.12.1:5 >=kde-apps/svgpart-18.12.1:5 >=kde-apps/thumbnailers-18.12.1:5 scanner? ( >=kde-apps/libksane-18.12.1:5 )
+SLOT=5
+_md5_=3c04c937facc6df1a787435813791541
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.3
index 53ebd87b3636..74e9eee3629d 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 thumbnail? ( >=kde-frameworks/kio-5.52.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdegraphics-mobipocket-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=03d8080e056074aad806f0037d298503
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.12.0 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.12.0
deleted file mode 100644
index b54efb107cc4..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.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.11.1:5 thumbnail? ( >=kde-frameworks/kio-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 thumbnail? ( >=kde-frameworks/kio-5.52.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdegraphics-mobipocket-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=25155f75fb8b07c768bdbc3ae5e8c9d5
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.12.1
new file mode 100644
index 000000000000..c58375c50e78
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 thumbnail? ( >=kde-frameworks/kio-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 thumbnail? ( >=kde-frameworks/kio-5.52.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=22be204c96b47470cb161c9eec57cc37
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.3
index 97fb813b4248..9a233dabc010 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-18.08.3 >=kde-apps/juk-18.08.3 >=kde-apps/kdenlive-18.08.3 >=kde-apps/kmix-18.08.3 >=kde-apps/kwave-18.08.3 >=kde-apps/libkcddb-18.08.3 cdrom? ( >=kde-apps/audiocd-kio-18.08.3 >=kde-apps/k3b-18.08.3 >=kde-apps/libkcompactdisc-18.08.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.08.3 ) gstreamer? ( >=kde-apps/kamoso-18.08.3 ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e6f652e1a59b67815507363e200a11b
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.0
deleted file mode 100644
index 9b01b8ea3db3..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-18.12.0:5 >=kde-apps/juk-18.12.0:5 >=kde-apps/kdenlive-18.12.0:5 >=kde-apps/kmix-18.12.0:5 >=kde-apps/kwave-18.12.0:5 >=kde-apps/libkcddb-18.12.0:5 cdrom? ( >=kde-apps/audiocd-kio-18.12.0:5 >=kde-apps/k3b-18.12.0:5 >=kde-apps/libkcompactdisc-18.12.0:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.12.0:5 ) gstreamer? ( >=kde-apps/kamoso-18.12.0:5 )
-SLOT=5
-_md5_=854dfea0a69dfb5166d688ad8472cd3e
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.1
new file mode 100644
index 000000000000..1142efaaf7c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-18.12.1:5 >=kde-apps/juk-18.12.1:5 >=kde-apps/kdenlive-18.12.1:5 >=kde-apps/kmix-18.12.1:5 >=kde-apps/kwave-18.12.1:5 >=kde-apps/libkcddb-18.12.1:5 cdrom? ( >=kde-apps/audiocd-kio-18.12.1:5 >=kde-apps/k3b-18.12.1:5 >=kde-apps/libkcompactdisc-18.12.1:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-18.12.1:5 ) gstreamer? ( >=kde-apps/kamoso-18.12.1:5 )
+SLOT=5
+_md5_=ba1f65fb32cca82e1652341912c3ab83
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.3
index 153f1fb371a2..666854c1f9e8 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdenetwork-filesharing-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ec18c355351977a0ee1650dc3a97900
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.12.0 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.12.0
deleted file mode 100644
index 489d0d429ae2..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdenetwork-filesharing-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b84b778f694e0b9b17345cbe3e66fb2c
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.12.1
new file mode 100644
index 000000000000..497ec1efb954
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb9606820ae633cd731858dcebf0e956
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.3
index 3b174d491738..e73dd074c043 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-18.08.3 >=kde-apps/kget-18.08.3 >=kde-apps/krdc-18.08.3 >=kde-apps/kopete-18.08.3 >=kde-apps/krfb-18.08.3 >=kde-apps/zeroconf-ioslave-18.08.3 telepathy? ( >=kde-apps/plasma-telepathy-meta-18.08.3 ) !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1d89c59bf3547542d37d059dd47725d4
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.0
deleted file mode 100644
index 9b38a211779a..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/
-IUSE=dropbox +telepathy
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-18.12.0:5 >=kde-apps/kget-18.12.0:5 >=kde-apps/krdc-18.12.0:5 >=kde-apps/kopete-18.12.0:5 >=kde-apps/krfb-18.12.0:5 >=kde-apps/zeroconf-ioslave-18.12.0:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-18.12.0:5 ) telepathy? ( >=kde-apps/plasma-telepathy-meta-18.12.0:5 )
-SLOT=5
-_md5_=e43bc4a9c51727755fac1594622258d9
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.1
new file mode 100644
index 000000000000..81744087c821
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/
+IUSE=dropbox +telepathy
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-18.12.1:5 >=kde-apps/kget-18.12.1:5 >=kde-apps/krdc-18.12.1:5 >=kde-apps/kopete-18.12.1:5 >=kde-apps/krfb-18.12.1:5 >=kde-apps/zeroconf-ioslave-18.12.1:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-18.12.1:5 ) telepathy? ( >=kde-apps/plasma-telepathy-meta-18.12.1:5 )
+SLOT=5
+_md5_=ab839a35712fe4a3b7a5922ca5fcf0ba
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.08.3 b/metadata/md5-cache/kde-apps/kdenlive-18.08.3
index d231c6004332..8b2de4376c57 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[gles2=] >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=media-libs/mlt-6.10.0[ffmpeg,frei0r,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.52.0:5 ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdenlive-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fac4b88c569fa92fb287c552fd70b718
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.12.0 b/metadata/md5-cache/kde-apps/kdenlive-18.12.0
deleted file mode 100644
index 803cf51231a5..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-18.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=media-libs/mlt-6.10.0[ffmpeg,frei0r,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.52.0:5 ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 share v4l debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=media-libs/mlt-6.10.0[ffmpeg,frei0r,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.52.0:5 ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdenlive-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=efdc5b3ff0f77bcc4169f2aabca12ba9
diff --git a/metadata/md5-cache/kde-apps/kdenlive-18.12.1 b/metadata/md5-cache/kde-apps/kdenlive-18.12.1
new file mode 100644
index 000000000000..519fa8a909fe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=media-libs/mlt-6.10.0[ffmpeg,frei0r,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.52.0:5 ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 share v4l debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=media-libs/mlt-6.10.0[ffmpeg,frei0r,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.52.0:5 ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=38a52939eedb2396bae50d4323d42e1f
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.3 b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.3
index 07b298e88a08..9a6d57b20708 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdepim-addons-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=948f9b58ae24a120223e1d4919feaf87
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.12.0 b/metadata/md5-cache/kde-apps/kdepim-addons-18.12.0
deleted file mode 100644
index 68f9b90a84ea..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kitinerary-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpkpass-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/libktnef-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.12.0:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 markdown test debug examples test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kitinerary-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpkpass-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/libktnef-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.12.0:5 ) markdown? ( app-text/discount ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-addons:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdepim-addons-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9a26cfe6bf5ba82d24c808d39c7d3a3
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-18.12.1 b/metadata/md5-cache/kde-apps/kdepim-addons-18.12.1
new file mode 100644
index 000000000000..540783929572
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kitinerary-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpkpass-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/libktnef-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.12.1:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.7.1[cxx,qt5] sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 markdown test debug examples test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kitinerary-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpkpass-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/libktnef-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 importwizard? ( >=kde-apps/akonadi-import-wizard-18.12.1:5 ) markdown? ( app-text/discount ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a03ebf65c06b688ad31257eab7f8b978
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.3
index 8c83ed730f1a..38cc997aa5b2 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/grantleetheme-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/libkleo-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdepim-apps-libs-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3836a6522b589b144b898314cf6b0e0
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.12.0 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.12.0
deleted file mode 100644
index 08dcea786306..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdepim-apps-libs-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c404615eaf454e0ea81eb3050dcac8b
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.12.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.12.1
new file mode 100644
index 000000000000..a1899d5b0874
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/grantlee-5.1.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/prison-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5771a73224eb0e7c288a3c4f2e26ec22
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdepim-meta-18.08.3
index 46baab55be2b..525edec922d8 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-18.08.3 >=kde-apps/akonadiconsole-18.08.3 >=kde-apps/akonadi-calendar-18.08.3 >=kde-apps/akonadi-contacts-18.08.3 >=kde-apps/akonadi-import-wizard-18.08.3 >=kde-apps/akonadi-mime-18.08.3 >=kde-apps/akonadi-notes-18.08.3 >=kde-apps/akonadi-search-18.08.3 >=kde-apps/akregator-18.08.3 >=kde-apps/calendarjanitor-18.08.3 >=kde-apps/calendarsupport-18.08.3 >=kde-apps/eventviews-18.08.3 >=kde-apps/grantlee-editor-18.08.3 >=kde-apps/grantleetheme-18.08.3 >=kde-apps/incidenceeditor-18.08.3 >=kde-apps/kaddressbook-18.08.3 >=kde-apps/kalarm-18.08.3 >=kde-apps/kalarmcal-18.08.3 >=kde-apps/kcalcore-18.08.3 >=kde-apps/kcalutils-18.08.3 >=kde-apps/kcontacts-18.08.3 >=kde-apps/kdepim-addons-18.08.3 >=kde-apps/kdepim-apps-libs-18.08.3 >=kde-apps/kdepim-runtime-18.08.3 >=kde-apps/kidentitymanagement-18.08.3 >=kde-apps/kimap-18.08.3 >=kde-apps/kitinerary-18.08.3 >=kde-apps/kldap-18.08.3 >=kde-apps/kleopatra-18.08.3 >=kde-apps/kmail-18.08.3 >=kde-apps/kmail-account-wizard-18.08.3 >=kde-apps/kmailtransport-18.08.3 >=kde-apps/kmbox-18.08.3 >=kde-apps/kmime-18.08.3 >=kde-apps/knotes-18.08.3 >=kde-apps/konsolekalendar-18.08.3 >=kde-apps/kontact-18.08.3 >=kde-apps/kontactinterface-18.08.3 >=kde-apps/korganizer-18.08.3 >=kde-apps/kpimtextedit-18.08.3 >=kde-apps/kpkpass-18.08.3 >=kde-apps/ksmtp-18.08.3 >=kde-apps/libgravatar-18.08.3 >=kde-apps/libkdepim-18.08.3 >=kde-apps/libkgapi-18.08.3 >=kde-apps/libkleo-18.08.3 >=kde-apps/libksieve-18.08.3 >=kde-apps/libktnef-18.08.3 >=kde-apps/mailcommon-18.08.3 >=kde-apps/mailimporter-18.08.3 >=kde-apps/mbox-importer-18.08.3 >=kde-apps/messagelib-18.08.3 >=kde-apps/pim-data-exporter-18.08.3 >=kde-apps/pim-sieve-editor-18.08.3 >=kde-apps/pimcommon-18.08.3 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=99f7036cc49a2d9c5bf9f6344910e934
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdepim-meta-18.12.0
deleted file mode 100644
index b3dec943f0d6..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadiconsole-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-import-wizard-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/akregator-18.12.0:5 >=kde-apps/calendarjanitor-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/grantlee-editor-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kaddressbook-18.12.0:5 >=kde-apps/kalarm-18.12.0:5 >=kde-apps/kalarmcal-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-addons-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kdepim-runtime-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kitinerary-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kleopatra-18.12.0:5 >=kde-apps/kmail-18.12.0:5 >=kde-apps/kmail-account-wizard-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmbox-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/knotes-18.12.0:5 >=kde-apps/konsolekalendar-18.12.0:5 >=kde-apps/kontact-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/korganizer-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/kpkpass-18.12.0:5 >=kde-apps/ksmtp-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkgapi-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/libktnef-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=kde-apps/mbox-importer-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pim-data-exporter-18.12.0:5 >=kde-apps/pim-sieve-editor-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 !kde-apps/kdepim-meta:4 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
-SLOT=5
-_md5_=fa7557061dd8a8ca54975e5ce3debc5a
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdepim-meta-18.12.1
new file mode 100644
index 000000000000..be5e2f18c643
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=bogofilter clamav spamassassin
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadiconsole-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-import-wizard-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/akregator-18.12.1:5 >=kde-apps/calendarjanitor-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/grantlee-editor-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kaddressbook-18.12.1:5 >=kde-apps/kalarm-18.12.1:5 >=kde-apps/kalarmcal-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-addons-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kitinerary-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kleopatra-18.12.1:5 >=kde-apps/kmail-18.12.1:5 >=kde-apps/kmail-account-wizard-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmbox-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/knotes-18.12.1:5 >=kde-apps/konsolekalendar-18.12.1:5 >=kde-apps/kontact-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/korganizer-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/kpkpass-18.12.1:5 >=kde-apps/ksmtp-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkgapi-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/libktnef-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=kde-apps/mbox-importer-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pim-data-exporter-18.12.1:5 >=kde-apps/pim-sieve-editor-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 !kde-apps/kdepim-meta:4 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
+SLOT=5
+_md5_=b492d479385ba00df60681bcc888b01a
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.3-r1 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.3-r1
index b7c24ae58647..4730905ca440 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.08.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdepim-runtime-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dbffcbac58c14a33a8a0ce2f4a6bc923
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.0 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.0
deleted file mode 100644
index d1e9acbbd25f..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/kalarmcal-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdav-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmbox-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkgapi-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= oauth? ( >=dev-qt/qtnetworkauth-5.11.1:5 ) >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.12.0:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=+oauth test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/kalarmcal-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdav-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmbox-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkgapi-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= oauth? ( >=dev-qt/qtnetworkauth-5.11.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-runtime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdepim-runtime-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2d5d1edab79b1297155efcc37e4b132b
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.1
new file mode 100644
index 000000000000..e46ff3c0b030
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/kalarmcal-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdav-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmbox-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkgapi-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= oauth? ( >=dev-qt/qtnetworkauth-5.11.1:5 ) >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/libxslt test? ( >=kde-apps/kimap-18.12.1:5[test] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=+oauth test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/kalarmcal-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdav-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmbox-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkgapi-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= oauth? ( >=dev-qt/qtnetworkauth-5.11.1:5 ) !kde-apps/kdepim-l10n !kde-misc/akonadi-ews >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=22d2aff0007a5015e76fa1be6515ff3f
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.3
index 2688fc58eb3c..ca2010da38c9 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdesdk-kioslaves-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bd86da31d06a2308d9f644c6ee095d4
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.12.0 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.12.0
deleted file mode 100644
index d68c997a4387..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-lang/perl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdesdk-kioslaves-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2638bba936f5a485d3d20cc73ac7e659
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.12.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.12.1
new file mode 100644
index 000000000000..d4fc72adaf7f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-lang/perl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5d0fd4f24fc620fcaea9509d33179574
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.3
index bca747601f3c..c9d123a223de 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-18.08.3 >=kde-apps/kapptemplate-18.08.3 >=kde-apps/kcachegrind-18.08.3 >=kde-apps/kde-dev-scripts-18.08.3 >=kde-apps/kde-dev-utils-18.08.3 >=kde-apps/kdesdk-kioslaves-18.08.3 >=kde-apps/kdesdk-thumbnailers-18.08.3 >=kde-apps/kompare-18.08.3 >=kde-apps/kross-interpreters-18.08.3 >=kde-apps/libkomparediff2-18.08.3 >=kde-apps/lokalize-18.08.3 >=kde-apps/poxml-18.08.3 cvs? ( >=kde-apps/cervisia-18.08.3 ) webkit? ( >=kde-apps/umbrello-18.08.3 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e0b5f1266b7502ec37e9398d38b595f8
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.0
deleted file mode 100644
index 1396ed63d64b..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/applications/development
-IUSE=bazaar cvs git mercurial subversion +webkit
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kapptemplate-18.12.0:5 >=kde-apps/kcachegrind-18.12.0:5 >=kde-apps/kde-dev-scripts-18.12.0:5 >=kde-apps/kde-dev-utils-18.12.0:5 >=kde-apps/kdesdk-kioslaves-18.12.0:5 >=kde-apps/kdesdk-thumbnailers-18.12.0:5 >=kde-apps/kompare-18.12.0:5 >=kde-apps/kross-interpreters-18.12.0:5 >=kde-apps/libkomparediff2-18.12.0:5 >=kde-apps/lokalize-18.12.0:5 >=kde-apps/poxml-18.12.0:5 bazaar? ( >=kde-apps/dolphin-plugins-bazaar-18.12.0:5 ) cvs? ( >=kde-apps/cervisia-18.12.0:5 ) git? ( >=kde-apps/dolphin-plugins-git-18.12.0:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-18.12.0:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-18.12.0:5 ) webkit? ( >=kde-apps/umbrello-18.12.0:5 )
-SLOT=5
-_md5_=56d689ad1ece1b433618a07eeeef80d7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.1
new file mode 100644
index 000000000000..bf330d25bdc3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/applications/development
+IUSE=bazaar cvs git mercurial subversion +webkit
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kapptemplate-18.12.1:5 >=kde-apps/kcachegrind-18.12.1:5 >=kde-apps/kde-dev-scripts-18.12.1:5 >=kde-apps/kde-dev-utils-18.12.1:5 >=kde-apps/kdesdk-kioslaves-18.12.1:5 >=kde-apps/kdesdk-thumbnailers-18.12.1:5 >=kde-apps/kompare-18.12.1:5 >=kde-apps/kross-interpreters-18.12.1:5 >=kde-apps/libkomparediff2-18.12.1:5 >=kde-apps/lokalize-18.12.1:5 >=kde-apps/poxml-18.12.1:5 bazaar? ( >=kde-apps/dolphin-plugins-bazaar-18.12.1:5 ) cvs? ( >=kde-apps/cervisia-18.12.1:5 ) git? ( >=kde-apps/dolphin-plugins-git-18.12.1:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-18.12.1:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-18.12.1:5 ) webkit? ( >=kde-apps/umbrello-18.12.1:5 )
+SLOT=5
+_md5_=e30b7dd163c38cdcf3581176379d898b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.3
index bbffaf16ab3e..678485c65468 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdesdk-thumbnailers-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d909cf1555adfda6ae1593c0c8c2ed7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.12.0 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.12.0
deleted file mode 100644
index bdcf8d30c98c..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdesdk-thumbnailers-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6168aa1022343dd7d182c9f642ec051a
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.12.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.12.1
new file mode 100644
index 000000000000..11e04883f5d3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=731a847de052aaacec34303ae063d413
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.3 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.3
index e1aa5eae7587..a00c4b8e7cee 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-18.08.3 >=kde-apps/filelight-18.08.3 >=kde-apps/kbackup-18.08.3 >=kde-apps/kcalc-18.08.3 >=kde-apps/kcharselect-18.08.3 >=kde-apps/kdebugsettings-18.08.3 >=kde-apps/kdf-18.08.3 >=kde-apps/kgpg-18.08.3 >=kde-apps/kimagemapeditor-18.08.3 >=kde-apps/kteatime-18.08.3 >=kde-apps/ktimer-18.08.3 >=kde-apps/kwalletmanager-18.08.3 >=kde-apps/sweeper-18.08.3 cups? ( >=kde-apps/print-manager-18.08.3 ) floppy? ( >=kde-apps/kfloppy-18.08.3 ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7a08cb5c87a5ebf22d06641c096dba41
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.0 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.0
deleted file mode 100644
index ac73256fd2db..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=7
-HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
-IUSE=7zip cups floppy lrz rar
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-18.12.0:5 >=kde-apps/filelight-18.12.0:5 >=kde-apps/kate-18.12.0:5 >=kde-apps/kbackup-18.12.0:5 >=kde-apps/kcalc-18.12.0:5 >=kde-apps/kcharselect-18.12.0:5 >=kde-apps/kdebugsettings-18.12.0:5 >=kde-apps/kdf-18.12.0:5 >=kde-apps/kgpg-18.12.0:5 >=kde-apps/kimagemapeditor-18.12.0:5 >=kde-apps/kteatime-18.12.0:5 >=kde-apps/ktimer-18.12.0:5 >=kde-apps/kwalletmanager-18.12.0:5 >=kde-apps/sweeper-18.12.0:5 cups? ( >=kde-apps/print-manager-18.12.0:5 ) floppy? ( >=kde-apps/kfloppy-18.12.0:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/unar app-arch/unrar ) app-arch/rar )
-SLOT=5
-_md5_=6888e744b29572ec7bd39eecb259d2d0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.1
new file mode 100644
index 000000000000..b854f8eb52a6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/applications/utilities https://utils.kde.org
+IUSE=7zip cups floppy lrz rar
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-18.12.1:5 >=kde-apps/filelight-18.12.1:5 >=kde-apps/kate-18.12.1:5 >=kde-apps/kbackup-18.12.1:5 >=kde-apps/kcalc-18.12.1:5 >=kde-apps/kcharselect-18.12.1:5 >=kde-apps/kdebugsettings-18.12.1:5 >=kde-apps/kdf-18.12.1:5 >=kde-apps/kgpg-18.12.1:5 >=kde-apps/kimagemapeditor-18.12.1:5 >=kde-apps/kteatime-18.12.1:5 >=kde-apps/ktimer-18.12.1:5 >=kde-apps/kwalletmanager-18.12.1:5 >=kde-apps/sweeper-18.12.1:5 cups? ( >=kde-apps/print-manager-18.12.1:5 ) floppy? ( >=kde-apps/kfloppy-18.12.1:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
+SLOT=5
+_md5_=02390a2a9683afeda3ba8359ad8af80f
diff --git a/metadata/md5-cache/kde-apps/kdf-18.08.3 b/metadata/md5-cache/kde-apps/kdf-18.08.3
index f8761cddf87b..b756bd8a7f15 100644
--- a/metadata/md5-cache/kde-apps/kdf-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdf-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdf-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=527b0824e2306fcb943191091ea4af06
diff --git a/metadata/md5-cache/kde-apps/kdf-18.12.0 b/metadata/md5-cache/kde-apps/kdf-18.12.0
deleted file mode 100644
index 3d5ea8301223..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdf-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=92b640b5ed280a1e109d84821a16e509
diff --git a/metadata/md5-cache/kde-apps/kdf-18.12.1 b/metadata/md5-cache/kde-apps/kdf-18.12.1
new file mode 100644
index 000000000000..19f26256b4e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a736a0f596ee1cb299ad2ecea0a29403
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.08.3 b/metadata/md5-cache/kde-apps/kdialog-18.08.3
index c692539d1164..0af3a82cb332 100644
--- a/metadata/md5-cache/kde-apps/kdialog-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdialog-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdialog-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f59950619f8aed8c1bec7457b2e21891
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.12.0 b/metadata/md5-cache/kde-apps/kdialog-18.12.0
deleted file mode 100644
index c10fe1e799fb..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdialog-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fdd0af5e8850792d2e0de563f90d5156
diff --git a/metadata/md5-cache/kde-apps/kdialog-18.12.1 b/metadata/md5-cache/kde-apps/kdialog-18.12.1
new file mode 100644
index 000000000000..580e940c2ec8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aa118bcf285fa66ccdac0509633a4c33
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.08.3 b/metadata/md5-cache/kde-apps/kdiamond-18.08.3
index d636cba6c337..ee72d7621aeb 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-18.08.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdiamond-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=969a7f8946254c484ca839632e783695
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.12.0 b/metadata/md5-cache/kde-apps/kdiamond-18.12.0
deleted file mode 100644
index c3c61cc68745..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdiamond-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=867b26fc13a8a987e51f07e537a56591
diff --git a/metadata/md5-cache/kde-apps/kdiamond-18.12.1 b/metadata/md5-cache/kde-apps/kdiamond-18.12.1
new file mode 100644
index 000000000000..9ffde42ebb74
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=86622d7b0b5e973a03974ddffc6e7a3d
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.3 b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.3
index 9d78c051180a..78256c83fc61 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.08.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/keditbookmarks-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a761c30e88aeb1880f619bc051ab5d98
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.12.0 b/metadata/md5-cache/kde-apps/keditbookmarks-18.12.0
deleted file mode 100644
index d37fb794d088..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/keditbookmarks-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32027fd5f3e0d1a6593d1ddc3819d4d9
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-18.12.1 b/metadata/md5-cache/kde-apps/keditbookmarks-18.12.1
new file mode 100644
index 000000000000..409f318689d4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=44cba91c78ce8fad9b88b39dbd9177ba
diff --git a/metadata/md5-cache/kde-apps/kfind-18.08.3 b/metadata/md5-cache/kde-apps/kfind-18.08.3
index 9c69a4d2d443..64d4e0fee01b 100644
--- a/metadata/md5-cache/kde-apps/kfind-18.08.3
+++ b/metadata/md5-cache/kde-apps/kfind-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kfind-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f11e4a13a805cdddd803b5189fd2702b
diff --git a/metadata/md5-cache/kde-apps/kfind-18.12.0 b/metadata/md5-cache/kde-apps/kfind-18.12.0
deleted file mode 100644
index 02f24922c7f8..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kfind-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3561b4c811a86f161c3035c73a9345e7
diff --git a/metadata/md5-cache/kde-apps/kfind-18.12.1 b/metadata/md5-cache/kde-apps/kfind-18.12.1
new file mode 100644
index 000000000000..4b25d1696867
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=23209256223d42ade9b754fd6d20d8f4
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.08.3 b/metadata/md5-cache/kde-apps/kfloppy-18.08.3
index 7c73e752acd2..d8434a0ad564 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-18.08.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kfloppy-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed2d207050639dfe23d3f24cb3704030
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.12.0 b/metadata/md5-cache/kde-apps/kfloppy-18.12.0
deleted file mode 100644
index defe661bdd15..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kfloppy-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=37b6a484b71ae2159115ae351c168c6b
diff --git a/metadata/md5-cache/kde-apps/kfloppy-18.12.1 b/metadata/md5-cache/kde-apps/kfloppy-18.12.1
new file mode 100644
index 000000000000..3668082443b6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5f6768515c84c31b9159e53180e333e0
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.08.3 b/metadata/md5-cache/kde-apps/kfourinline-18.08.3
index 50e174695bf0..6c31bdd01579 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-18.08.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kfourinline-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b818fdb31c1d56191e59753135419e4
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.12.0 b/metadata/md5-cache/kde-apps/kfourinline-18.12.0
deleted file mode 100644
index 5d1dd6dc284c..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kfourinline-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6aff357b115bf24096a0b51831d755b0
diff --git a/metadata/md5-cache/kde-apps/kfourinline-18.12.1 b/metadata/md5-cache/kde-apps/kfourinline-18.12.1
new file mode 100644
index 000000000000..28a1a5e80b07
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c5fb9d3442c8522a25129c85f4b0766d
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.08.3 b/metadata/md5-cache/kde-apps/kgeography-18.08.3
index ef15f14cc463..9a4ff0d53d9b 100644
--- a/metadata/md5-cache/kde-apps/kgeography-18.08.3
+++ b/metadata/md5-cache/kde-apps/kgeography-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kgeography-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ad63de73a7e1d82124dcc20de9163a11
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.12.0 b/metadata/md5-cache/kde-apps/kgeography-18.12.0
deleted file mode 100644
index d5ec49fefc99..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kgeography-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a54b5322c70d3ba3a8b2086aeb86b12
diff --git a/metadata/md5-cache/kde-apps/kgeography-18.12.1 b/metadata/md5-cache/kde-apps/kgeography-18.12.1
new file mode 100644
index 000000000000..45afc5a8bed0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=83b0d89e697ff8b17b794703a07d1263
diff --git a/metadata/md5-cache/kde-apps/kget-18.08.3 b/metadata/md5-cache/kde-apps/kget-18.08.3
index 6df0c0224284..70239f98dac7 100644
--- a/metadata/md5-cache/kde-apps/kget-18.08.3
+++ b/metadata/md5-cache/kde-apps/kget-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( || ( >=kde-plasma/libkworkspace-5.12.5:5 >=kde-plasma/plasma-workspace-5.12.5:5 ) ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kget-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26ec4177fb07d74b1e7e47c1d9a07c33
diff --git a/metadata/md5-cache/kde-apps/kget-18.12.0 b/metadata/md5-cache/kde-apps/kget-18.12.0
deleted file mode 100644
index 5cd66a7331e1..000000000000
--- a/metadata/md5-cache/kde-apps/kget-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kget-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=90b3d4983801407208833e7dad2c7f7c
diff --git a/metadata/md5-cache/kde-apps/kget-18.12.1 b/metadata/md5-cache/kde-apps/kget-18.12.1
new file mode 100644
index 000000000000..f869ce18d199
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.12.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kget-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7d1890d2dfa9390f24eee48cd322ba92
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.3 b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.3
index 7d71cc9a7b10..c41c1bd61745 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.08.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=dev-qt/qtsvg-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kgoldrunner-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7d7a9d531089d2a4dcaecee3669f069
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.12.0 b/metadata/md5-cache/kde-apps/kgoldrunner-18.12.0
deleted file mode 100644
index 1dfd2efa82f7..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kgoldrunner-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c904ee0cbf569003c59658c7a5e46fb5
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-18.12.1 b/metadata/md5-cache/kde-apps/kgoldrunner-18.12.1
new file mode 100644
index 000000000000..bf0b918b9201
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dda5d4347e08e91d4c6b6c86d347554c
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.08.3 b/metadata/md5-cache/kde-apps/kgpg-18.08.3
index a3beb0efbecf..3642396f8b4e 100644
--- a/metadata/md5-cache/kde-apps/kgpg-18.08.3
+++ b/metadata/md5-cache/kde-apps/kgpg-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kgpg-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64fdd137263de9220570cd965ed79fce
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.12.0 b/metadata/md5-cache/kde-apps/kgpg-18.12.0
deleted file mode 100644
index 10d00dc36d24..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kgpg-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3f50f4d8e5dff31a52af638a125eec9
diff --git a/metadata/md5-cache/kde-apps/kgpg-18.12.1 b/metadata/md5-cache/kde-apps/kgpg-18.12.1
new file mode 100644
index 000000000000..e0e5982e1ef6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-crypt/gpgme sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7a27c22338e5906446948587981a508a
diff --git a/metadata/md5-cache/kde-apps/khangman-18.08.3 b/metadata/md5-cache/kde-apps/khangman-18.08.3
index e70ce0d5f2f6..478a27a69960 100644
--- a/metadata/md5-cache/kde-apps/khangman-18.08.3
+++ b/metadata/md5-cache/kde-apps/khangman-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.08.3:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtquickcontrols-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/khangman-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=997bfe18fc5353a639e0218917338860
diff --git a/metadata/md5-cache/kde-apps/khangman-18.12.0 b/metadata/md5-cache/kde-apps/khangman-18.12.0
deleted file mode 100644
index ca4092678697..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.12.0:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/khangman-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bcb6301ccb5c5b1fd193f647403b6b5d
diff --git a/metadata/md5-cache/kde-apps/khangman-18.12.1 b/metadata/md5-cache/kde-apps/khangman-18.12.1
new file mode 100644
index 000000000000..d83d63b644d1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-18.12.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c66ac507d87065f28ac83c58315ec76
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.08.3 b/metadata/md5-cache/kde-apps/khelpcenter-18.08.3
index 7eff6ce1a532..2fece8750c9d 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.08.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/khelpcenter-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=944feb5faedfddca15cd1fa7fc49dd4c
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.12.0 b/metadata/md5-cache/kde-apps/khelpcenter-18.12.0
deleted file mode 100644
index 1978323c6297..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-18.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/khelpcenter-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=125894c2279331061ec5355fb77320b7
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-18.12.1 b/metadata/md5-cache/kde-apps/khelpcenter-18.12.1
new file mode 100644
index 000000000000..7410e468a795
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3522c4aa60e2ff9e9fc8738c26e0e096
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.3
index 3e7b158489c4..f210a6819e5d 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kidentitymanagement-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c336fefb9d9024e233a69252617e3e9e
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.0 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.0
deleted file mode 100644
index 642d753d1e36..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kidentitymanagement:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kidentitymanagement-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=246053800d80cb885b14722ec6d4f0a2
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.1
new file mode 100644
index 000000000000..54ae2fc9ad58
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kpimtextedit-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kpimtextedit-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ed86daafcd6e3b35d6321b9f5173b085
diff --git a/metadata/md5-cache/kde-apps/kig-18.08.3 b/metadata/md5-cache/kde-apps/kig-18.08.3
index b9f69fe80525..d77c5eef105a 100644
--- a/metadata/md5-cache/kde-apps/kig-18.08.3
+++ b/metadata/md5-cache/kde-apps/kig-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kig-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cefdfd2cdb732c5f03642ba3b0c94d83
diff --git a/metadata/md5-cache/kde-apps/kig-18.12.0 b/metadata/md5-cache/kde-apps/kig-18.12.0
deleted file mode 100644
index e50030182f84..000000000000
--- a/metadata/md5-cache/kde-apps/kig-18.12.0
+++ /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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kig:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=python_targets_python2_7
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kig-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=97ef030c05ed5d8d6640cc27da875da5
diff --git a/metadata/md5-cache/kde-apps/kig-18.12.1 b/metadata/md5-cache/kde-apps/kig-18.12.1
new file mode 100644
index 000000000000..553d7c9d1073
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-18.12.1
@@ -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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/ktexteditor-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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_python3_7(-),python_single_target_python2_7(+)] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=python_targets_python2_7
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kig-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bdfa7c5a297dfb9aa7f0f05ea4545e33
diff --git a/metadata/md5-cache/kde-apps/kigo-18.08.3 b/metadata/md5-cache/kde-apps/kigo-18.08.3
index 72b9b7ed738e..96efae507f5d 100644
--- a/metadata/md5-cache/kde-apps/kigo-18.08.3
+++ b/metadata/md5-cache/kde-apps/kigo-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kigo-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75b9b2298ae21cb5998a05365ad20f2e
diff --git a/metadata/md5-cache/kde-apps/kigo-18.12.0 b/metadata/md5-cache/kde-apps/kigo-18.12.0
deleted file mode 100644
index e05918eeb571..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kigo-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d54d24be6f221f67825e015738c401e4
diff --git a/metadata/md5-cache/kde-apps/kigo-18.12.1 b/metadata/md5-cache/kde-apps/kigo-18.12.1
new file mode 100644
index 000000000000..98672b3c61a7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0177c60700123f8a47b7e659b1c2fc80
diff --git a/metadata/md5-cache/kde-apps/killbots-18.08.3 b/metadata/md5-cache/kde-apps/killbots-18.08.3
index 9c4b5f6b9d78..a1f2d248ea5c 100644
--- a/metadata/md5-cache/kde-apps/killbots-18.08.3
+++ b/metadata/md5-cache/kde-apps/killbots-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/killbots-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79db797249080516fc38e9abf335ec6a
diff --git a/metadata/md5-cache/kde-apps/killbots-18.12.0 b/metadata/md5-cache/kde-apps/killbots-18.12.0
deleted file mode 100644
index e67fce8a42f5..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/killbots-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=26e4c7f282248075834473e1468de0ce
diff --git a/metadata/md5-cache/kde-apps/killbots-18.12.1 b/metadata/md5-cache/kde-apps/killbots-18.12.1
new file mode 100644
index 000000000000..8555519d1773
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f41615348d22a2e688fd83651cd33ca2
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.3
index b4d3c51e5156..a1eee7a61fe1 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kimagemapeditor-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=051365d9bd35ce0110dfde5e31582c25
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.12.0 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.12.0
deleted file mode 100644
index deffeca45ebd..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kimagemapeditor-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5a4656764c1d1500e8188b1ac0388d46
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-18.12.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-18.12.1
new file mode 100644
index 000000000000..2a3a12e26261
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0385bd75e3ea5035a459ab144daab7b
diff --git a/metadata/md5-cache/kde-apps/kimap-18.08.3 b/metadata/md5-cache/kde-apps/kimap-18.08.3
index cd7c85528be2..d8ae7111b599 100644
--- a/metadata/md5-cache/kde-apps/kimap-18.08.3
+++ b/metadata/md5-cache/kde-apps/kimap-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/kmime-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kimap-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e24f94684b6aae05c6e698460b79f8cf
diff --git a/metadata/md5-cache/kde-apps/kimap-18.12.0 b/metadata/md5-cache/kde-apps/kimap-18.12.0
deleted file mode 100644
index af17a211d3b9..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-18.12.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/kmime-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kimap-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6269bce1a8f7a53b11b6bddfce65aed2
diff --git a/metadata/md5-cache/kde-apps/kimap-18.12.1 b/metadata/md5-cache/kde-apps/kimap-18.12.1
new file mode 100644
index 000000000000..60e045ebcedd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qttest-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/kmime-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=22caf433be67008caae0085bce2705a1
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.08.3-r1 b/metadata/md5-cache/kde-apps/kio-extras-18.08.3-r1
index b3159d934289..4681b629c91c 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.08.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kio-extras-18.08.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/kio-extras-18.08.3-sftp-18.11.80.patch.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=681b3408760e0c2fd03de79b69d75c51
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.12.0 b/metadata/md5-cache/kde-apps/kio-extras-18.12.0
deleted file mode 100644
index 8f4aca533f59..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-18.12.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.52.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) man? ( >=kde-frameworks/khtml-5.52.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) man? ( >=kde-frameworks/khtml-5.52.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kio-extras:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kio-extras-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=692c9575ca9d0afdbacc7a92a755ffea
diff --git a/metadata/md5-cache/kde-apps/kio-extras-18.12.1 b/metadata/md5-cache/kde-apps/kio-extras-18.12.1
new file mode 100644
index 000000000000..2b20b019e04f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) man? ( >=kde-frameworks/khtml-5.52.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) x11-misc/shared-mime-info man? ( dev-util/gperf ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 activities? ( >=kde-frameworks/kactivities-5.52.0:5 >=dev-qt/qtsql-5.11.1:5 ) man? ( >=kde-frameworks/khtml-5.52.0:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3c7abaa8004513decc5641e0ee3a08dc
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.08.3 b/metadata/md5-cache/kde-apps/kiriki-18.08.3
index e2e233a8c943..acda2262776b 100644
--- a/metadata/md5-cache/kde-apps/kiriki-18.08.3
+++ b/metadata/md5-cache/kde-apps/kiriki-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kiriki-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=35ed8d48363d15d82cf71b7f776a1723
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.12.0 b/metadata/md5-cache/kde-apps/kiriki-18.12.0
deleted file mode 100644
index 1cce26b4a4ae..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kiriki-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f1101837a5b2b3ce485584dce22b9797
diff --git a/metadata/md5-cache/kde-apps/kiriki-18.12.1 b/metadata/md5-cache/kde-apps/kiriki-18.12.1
new file mode 100644
index 000000000000..964f296ff940
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3711b96e2a846e54234a20b10b56b401
diff --git a/metadata/md5-cache/kde-apps/kiten-18.08.3 b/metadata/md5-cache/kde-apps/kiten-18.08.3
index 1740f7684db1..c991eb33d7fb 100644
--- a/metadata/md5-cache/kde-apps/kiten-18.08.3
+++ b/metadata/md5-cache/kde-apps/kiten-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kiten-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c34f6e5c63468b1c2e69080c05315bb2
diff --git a/metadata/md5-cache/kde-apps/kiten-18.12.0 b/metadata/md5-cache/kde-apps/kiten-18.12.0
deleted file mode 100644
index bf892f99f365..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kiten-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50129616cad7c644c45da044e72883b5
diff --git a/metadata/md5-cache/kde-apps/kiten-18.12.1 b/metadata/md5-cache/kde-apps/kiten-18.12.1
new file mode 100644
index 000000000000..5a452ac42bbc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-fonts/kanjistrokeorders >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0bd1f789aa6abb0d4140b5480ca07840
diff --git a/metadata/md5-cache/kde-apps/kitinerary-18.08.3 b/metadata/md5-cache/kde-apps/kitinerary-18.08.3
index 32a856616ee3..67b49cff1cc5 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-18.08.3
+++ b/metadata/md5-cache/kde-apps/kitinerary-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/kpkpass-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kitinerary:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kitinerary-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7bbdd23384f97dba4b8b368aabeebb93
diff --git a/metadata/md5-cache/kde-apps/kitinerary-18.12.0 b/metadata/md5-cache/kde-apps/kitinerary-18.12.0
deleted file mode 100644
index 2dc33fab9782..000000000000
--- a/metadata/md5-cache/kde-apps/kitinerary-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpkpass-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=pdf test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpkpass-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kitinerary:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kitinerary-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1ade7430e19793430b4dbbc216c9cd46
diff --git a/metadata/md5-cache/kde-apps/kitinerary-18.12.1 b/metadata/md5-cache/kde-apps/kitinerary-18.12.1
new file mode 100644
index 000000000000..9ae7b81c4d11
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kitinerary-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpkpass-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Data Model and Extraction System for Travel Reservation information
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=pdf test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpkpass-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-libs/zlib pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=beffbddaa2cd9afa82e26284b32d47eb
diff --git a/metadata/md5-cache/kde-apps/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 045cbb404c0e..16e43e39a557 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Note taking utility by KDE
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/utilities/kjots/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjots:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-5.0.2:5 >=kde-apps/akonadi-notes-5.0.2:5 >=kde-apps/kmime-5.0.2:5 >=kde-apps/kontactinterface-5.0.2:5 >=kde-apps/kpimtextedit-5.0.2:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt !kde-apps/kjots:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ab2c8ee88eb9582f64cf5919f5779e9e
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d7b092146b1c9c79b200bb1fc3848f7d
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.3 b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.3
index ca1e925425bc..09232d6cd39b 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.08.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kjumpingcube-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d73cdad45b9529fee5200a6be2a99ae
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.12.0 b/metadata/md5-cache/kde-apps/kjumpingcube-18.12.0
deleted file mode 100644
index 0ab594fef80e..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kjumpingcube-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f5d3a95099f19b6f30c2eb4beed5554
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-18.12.1 b/metadata/md5-cache/kde-apps/kjumpingcube-18.12.1
new file mode 100644
index 000000000000..bb19aacc34db
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7e28fa1585bcdf1aaabf1472dd6a461f
diff --git a/metadata/md5-cache/kde-apps/kldap-18.08.3 b/metadata/md5-cache/kde-apps/kldap-18.08.3
index eaa514ba232b..b9a543c81490 100644
--- a/metadata/md5-cache/kde-apps/kldap-18.08.3
+++ b/metadata/md5-cache/kde-apps/kldap-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kldap-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3588dc4a375eb304d9210c256d11ff1
diff --git a/metadata/md5-cache/kde-apps/kldap-18.12.0 b/metadata/md5-cache/kde-apps/kldap-18.12.0
deleted file mode 100644
index d20e537d9af0..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kldap-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1db5941b06af0dcb8e68cdc4dec1d661
diff --git a/metadata/md5-cache/kde-apps/kldap-18.12.1 b/metadata/md5-cache/kde-apps/kldap-18.12.1
new file mode 100644
index 000000000000..3ab0c42b0594
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl net-nds/openldap sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f72e1ae818214cd53ed8579e6176ed64
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.08.3 b/metadata/md5-cache/kde-apps/kleopatra-18.08.3
index 17f93c43e287..5ad566573191 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-18.08.3
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kleopatra-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=41a0138e6ed5e3f9b97afe3f1dc4c9df
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.12.0 b/metadata/md5-cache/kde-apps/kleopatra-18.12.0
deleted file mode 100644
index 101b684c7415..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kleopatra-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01d3d3dfc5b10e1bb99ca15e11218a95
diff --git a/metadata/md5-cache/kde-apps/kleopatra-18.12.1 b/metadata/md5-cache/kde-apps/kleopatra-18.12.1
new file mode 100644
index 000000000000..5b375ed1bbe9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n !kde-apps/kleopatra:4 >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6b520a43b62a699d27e39ba0a208d9cc
diff --git a/metadata/md5-cache/kde-apps/klettres-18.08.3 b/metadata/md5-cache/kde-apps/klettres-18.08.3
index 5315571aec72..61efed2f3dc6 100644
--- a/metadata/md5-cache/kde-apps/klettres-18.08.3
+++ b/metadata/md5-cache/kde-apps/klettres-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/klettres-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52677449b2510cd81223cd5f08d30892
diff --git a/metadata/md5-cache/kde-apps/klettres-18.12.0 b/metadata/md5-cache/kde-apps/klettres-18.12.0
deleted file mode 100644
index b30c02adf8b6..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/klettres-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=15f94db89a8885f4f0d6705ff2e18ba8
diff --git a/metadata/md5-cache/kde-apps/klettres-18.12.1 b/metadata/md5-cache/kde-apps/klettres-18.12.1
new file mode 100644
index 000000000000..b23598188506
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ddff32235598c8e55be7f95620e461f6
diff --git a/metadata/md5-cache/kde-apps/klickety-18.08.3 b/metadata/md5-cache/kde-apps/klickety-18.08.3
index b043d8002704..5212238da4d2 100644
--- a/metadata/md5-cache/kde-apps/klickety-18.08.3
+++ b/metadata/md5-cache/kde-apps/klickety-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/klickety-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=54b4b964f437e0d15386e3fab25efe0f
diff --git a/metadata/md5-cache/kde-apps/klickety-18.12.0 b/metadata/md5-cache/kde-apps/klickety-18.12.0
deleted file mode 100644
index 54bdba73ccf4..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/klickety-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe64c44eb1612b51bd7d4168a30b08c8
diff --git a/metadata/md5-cache/kde-apps/klickety-18.12.1 b/metadata/md5-cache/kde-apps/klickety-18.12.1
new file mode 100644
index 000000000000..63482c917f86
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4255b978933f8688896a9f3406db3452
diff --git a/metadata/md5-cache/kde-apps/klines-18.08.3 b/metadata/md5-cache/kde-apps/klines-18.08.3
index 03236f47942e..624c0fcae528 100644
--- a/metadata/md5-cache/kde-apps/klines-18.08.3
+++ b/metadata/md5-cache/kde-apps/klines-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/klines-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb8e1100eee66df92deb5e0214a2a35c
diff --git a/metadata/md5-cache/kde-apps/klines-18.12.0 b/metadata/md5-cache/kde-apps/klines-18.12.0
deleted file mode 100644
index 4ac73129b401..000000000000
--- a/metadata/md5-cache/kde-apps/klines-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/klines-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=35307f16d1b7daf99d64c1e53ffbbbe5
diff --git a/metadata/md5-cache/kde-apps/klines-18.12.1 b/metadata/md5-cache/kde-apps/klines-18.12.1
new file mode 100644
index 000000000000..29544ade0976
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/klines-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9dc564ac3ea4c801bf99e17584ba0195
diff --git a/metadata/md5-cache/kde-apps/kmag-18.08.3 b/metadata/md5-cache/kde-apps/kmag-18.08.3
index 5efc9b7c8f3e..0f990d38448d 100644
--- a/metadata/md5-cache/kde-apps/kmag-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmag-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmag-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5a7b8cfe7affc65f441cf01daf791022
diff --git a/metadata/md5-cache/kde-apps/kmag-18.12.0 b/metadata/md5-cache/kde-apps/kmag-18.12.0
deleted file mode 100644
index 126e61068e91..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmag-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c0e97bed944aed362480c5c02611d7bd
diff --git a/metadata/md5-cache/kde-apps/kmag-18.12.1 b/metadata/md5-cache/kde-apps/kmag-18.12.1
new file mode 100644
index 000000000000..bd675147900e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a15260cf8819f229362d094602ead400
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.08.3 b/metadata/md5-cache/kde-apps/kmahjongg-18.08.3
index dfec37670870..efbdfa0bc987 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=kde-apps/libkmahjongg-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmahjongg-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=725b872e19b81686fea38dd8faba980c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.12.0 b/metadata/md5-cache/kde-apps/kmahjongg-18.12.0
deleted file mode 100644
index 4de0295686e8..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=kde-apps/libkmahjongg-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=kde-apps/libkmahjongg-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmahjongg-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2650833e371c191e2385b174d7ad3a64
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-18.12.1 b/metadata/md5-cache/kde-apps/kmahjongg-18.12.1
new file mode 100644
index 000000000000..469c784a7f20
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=kde-apps/libkmahjongg-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=kde-apps/libkmahjongg-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4c91582641845ab6d8914b675ef3b966
diff --git a/metadata/md5-cache/kde-apps/kmail-18.08.3 b/metadata/md5-cache/kde-apps/kmail-18.08.3
index 85a7c662a511..82bfb0c29177 100644
--- a/metadata/md5-cache/kde-apps/kmail-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmail-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmail-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af91df5e85fe34477524ee5dba49a5ec
diff --git a/metadata/md5-cache/kde-apps/kmail-18.12.0 b/metadata/md5-cache/kde-apps/kmail-18.12.0
deleted file mode 100644
index 5e8ead0c4a15..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/libktnef-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kldap-18.12.0:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/libktnef-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.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-18.12.0:5 >=kde-apps/kmail-account-wizard-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmail-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c9c1311afeecc2460067e8835447f7d3
diff --git a/metadata/md5-cache/kde-apps/kmail-18.12.1 b/metadata/md5-cache/kde-apps/kmail-18.12.1
new file mode 100644
index 000000000000..dfb7b8b1d668
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/libktnef-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kldap-18.12.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-18.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/libktnef-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 !kde-apps/ktnef >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-apps/kmail-account-wizard-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=19a1adfee236917bd0f7ab594873bd57
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.3
index 4821bb8d1ec9..8dc26561b318 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kldap-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/libkleo-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmail-account-wizard-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a00ea03d57cdc3b5d3d49e53b7e4c495
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.0 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.0
deleted file mode 100644
index 5dfc27721b7d..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmail-account-wizard-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2c975708c9a5e76c2b594feb879c1cd
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.1
new file mode 100644
index 000000000000..f159c05720da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5883009fdf4e41ba8edd77eb41573a47
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.08.3 b/metadata/md5-cache/kde-apps/kmailtransport-18.08.3
index ffa14870f5af..ae0d8f4da194 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmailtransport-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=932a9bfb2bc1defacb2c0507a9c09acd
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.12.0 b/metadata/md5-cache/kde-apps/kmailtransport-18.12.0
deleted file mode 100644
index 2b4f3394d452..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/ksmtp-18.12.0:5 >=kde-apps/libkgapi-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 test? ( >=kde-frameworks/ktextwidgets-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/ksmtp-18.12.0:5 >=kde-apps/libkgapi-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmailtransport-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=74526b77b28f3e4841baf837a9184fb6
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-18.12.1 b/metadata/md5-cache/kde-apps/kmailtransport-18.12.1
new file mode 100644
index 000000000000..9e6b6cda45f0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/ksmtp-18.12.1:5 >=kde-apps/libkgapi-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 test? ( >=kde-frameworks/ktextwidgets-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/ksmtp-18.12.1:5 >=kde-apps/libkgapi-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4e67df92bb70163933469028bfd98683
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.08.3 b/metadata/md5-cache/kde-apps/kmbox-18.08.3
index 6f1435239113..5a833c825941 100644
--- a/metadata/md5-cache/kde-apps/kmbox-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmbox-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmbox-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c94c7626f0441cd56b8a805d918ad0e
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.12.0 b/metadata/md5-cache/kde-apps/kmbox-18.12.0
deleted file mode 100644
index 4f71b7d2b6ac..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-18.12.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmbox-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=885f5e37971b421e413081fdd8c895f5
diff --git a/metadata/md5-cache/kde-apps/kmbox-18.12.1 b/metadata/md5-cache/kde-apps/kmbox-18.12.1
new file mode 100644
index 000000000000..76058fded2d4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-18.12.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9ad0c4d9239e4f10b97f96549cb3101f
diff --git a/metadata/md5-cache/kde-apps/kmime-18.08.3 b/metadata/md5-cache/kde-apps/kmime-18.08.3
index b2f230662292..f2ea91ec15db 100644
--- a/metadata/md5-cache/kde-apps/kmime-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmime-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmime-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=88cfd2e8bfbcd29e5819874b3cf1dc22
diff --git a/metadata/md5-cache/kde-apps/kmime-18.12.0 b/metadata/md5-cache/kde-apps/kmime-18.12.0
deleted file mode 100644
index 6bf5b678748d..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-18.12.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmime-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2ae29e7091bcf3e2b6fa62fc4b789ad
diff --git a/metadata/md5-cache/kde-apps/kmime-18.12.1 b/metadata/md5-cache/kde-apps/kmime-18.12.1
new file mode 100644
index 000000000000..ce41953ff427
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a334644e74d597f4af4c426edf844795
diff --git a/metadata/md5-cache/kde-apps/kmines-18.08.3 b/metadata/md5-cache/kde-apps/kmines-18.08.3
index b7271717ec23..0fd31097260c 100644
--- a/metadata/md5-cache/kde-apps/kmines-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmines-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmines-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=290ba5a6908a87bea4cf9e1e05b0d1d9
diff --git a/metadata/md5-cache/kde-apps/kmines-18.12.0 b/metadata/md5-cache/kde-apps/kmines-18.12.0
deleted file mode 100644
index f1f132228296..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmines-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=51c3532653a1a2490a1746a51d833d02
diff --git a/metadata/md5-cache/kde-apps/kmines-18.12.1 b/metadata/md5-cache/kde-apps/kmines-18.12.1
new file mode 100644
index 000000000000..5a5ec42efa31
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a87733dddb8c04096d1226ad82db8103
diff --git a/metadata/md5-cache/kde-apps/kmix-18.08.3 b/metadata/md5-cache/kde-apps/kmix-18.08.3
index f1ce8e59044e..dddd1d73e0b1 100644
--- a/metadata/md5-cache/kde-apps/kmix-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmix-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmix-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=382ec8331df2146d61af832e7a820d8c
diff --git a/metadata/md5-cache/kde-apps/kmix-18.12.0 b/metadata/md5-cache/kde-apps/kmix-18.12.0
deleted file mode 100644
index 8fa4cf23107a..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmix-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18db26379f4046aacf6083c1e3392109
diff --git a/metadata/md5-cache/kde-apps/kmix-18.12.1 b/metadata/md5-cache/kde-apps/kmix-18.12.1
new file mode 100644
index 000000000000..4e0719cdb4bf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.12.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e1d4ee8b52bc3282c5eb43ec5803bef4
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.08.3 b/metadata/md5-cache/kde-apps/kmousetool-18.08.3
index f190d2e4e6a0..07457ad17319 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmousetool-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dba2042667df0223b5e8d1e298e36a8e
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.12.0 b/metadata/md5-cache/kde-apps/kmousetool-18.12.0
deleted file mode 100644
index 267ab1b4111b..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-18.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmousetool-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf0a4cac639a8c1bacc3e1e3dbc16770
diff --git a/metadata/md5-cache/kde-apps/kmousetool-18.12.1 b/metadata/md5-cache/kde-apps/kmousetool-18.12.1
new file mode 100644
index 000000000000..546a66a1ef61
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=23ddc72f7d463933ea5c5ffbab85a09d
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.08.3 b/metadata/md5-cache/kde-apps/kmouth-18.08.3
index 162f40545074..688fec764f29 100644
--- a/metadata/md5-cache/kde-apps/kmouth-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmouth-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtspeech-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmouth-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c21f76cb7132bf237565bf15381d6a7
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.12.0 b/metadata/md5-cache/kde-apps/kmouth-18.12.0
deleted file mode 100644
index 3df64a9935b4..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmouth-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f2aca76235e22cebd4e00185bf49dbb7
diff --git a/metadata/md5-cache/kde-apps/kmouth-18.12.1 b/metadata/md5-cache/kde-apps/kmouth-18.12.1
new file mode 100644
index 000000000000..b07d6b071424
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=34392f94395c4fc378e5b09042dc407c
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.08.3 b/metadata/md5-cache/kde-apps/kmplot-18.08.3
index a36bcd2de77c..6dd80006037e 100644
--- a/metadata/md5-cache/kde-apps/kmplot-18.08.3
+++ b/metadata/md5-cache/kde-apps/kmplot-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kmplot-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b3bcca2a1d41a91fcfbe8b25e2a85391
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.12.0 b/metadata/md5-cache/kde-apps/kmplot-18.12.0
deleted file mode 100644
index e8291f7d64b4..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kmplot-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e21f273451bd6dcfc96032a8b6af4a28
diff --git a/metadata/md5-cache/kde-apps/kmplot-18.12.1 b/metadata/md5-cache/kde-apps/kmplot-18.12.1
new file mode 100644
index 000000000000..0fc2bf221f5d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b1da72b50c4d61e4392f7917155a4736
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.08.3 b/metadata/md5-cache/kde-apps/knavalbattle-18.08.3
index 46a305829f16..e59c15e407c1 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.08.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/knavalbattle-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20cab879da3306d175acffcef2567c07
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.12.0 b/metadata/md5-cache/kde-apps/knavalbattle-18.12.0
deleted file mode 100644
index ae994ad18ff1..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/knavalbattle-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=427658de13697ae81206eda5b6adfcea
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-18.12.1 b/metadata/md5-cache/kde-apps/knavalbattle-18.12.1
new file mode 100644
index 000000000000..905bf436ccee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=061e1fa0e944111f81b6176dc15ab6de
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.08.3 b/metadata/md5-cache/kde-apps/knetwalk-18.08.3
index bd66f393acc1..0932ddf26db8 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-18.08.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/knetwalk-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f019689f3fabd611bc63c3212a143d4
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.12.0 b/metadata/md5-cache/kde-apps/knetwalk-18.12.0
deleted file mode 100644
index a39457f2fa48..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/knetwalk-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7e85b9a4c2e1cfe64e4a6f1a7fb1dd8d
diff --git a/metadata/md5-cache/kde-apps/knetwalk-18.12.1 b/metadata/md5-cache/kde-apps/knetwalk-18.12.1
new file mode 100644
index 000000000000..4615eb82e119
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c1ddd529743e462b3f82715cc33bd559
diff --git a/metadata/md5-cache/kde-apps/knights-18.12.0-r1 b/metadata/md5-cache/kde-apps/knights-18.12.0-r1
deleted file mode 100644
index 0730c490edc1..000000000000
--- a/metadata/md5-cache/kde-apps/knights-18.12.0-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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Simple chess board based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/games/knights/
-IUSE=speech debug +handbook selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knights:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/knights-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a62b5b23abe5967d36624eff27b96e16
diff --git a/metadata/md5-cache/kde-apps/knights-18.12.1 b/metadata/md5-cache/kde-apps/knights-18.12.1
new file mode 100644
index 000000000000..27db2a410462
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knights-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple chess board based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/games/knights/
+IUSE=speech debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/knights-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eca060e64ed0216a0ca70bd28a3f2943
diff --git a/metadata/md5-cache/kde-apps/knotes-18.08.3 b/metadata/md5-cache/kde-apps/knotes-18.08.3
index ec7dd572a2d1..68f7ab23b1e2 100644
--- a/metadata/md5-cache/kde-apps/knotes-18.08.3
+++ b/metadata/md5-cache/kde-apps/knotes-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-notes-18.08.3:5 >=kde-apps/akonadi-search-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/kontactinterface-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/knotes-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=862942ff2d3e32df607bb1e3ee23e847
diff --git a/metadata/md5-cache/kde-apps/knotes-18.12.0 b/metadata/md5-cache/kde-apps/knotes-18.12.0
deleted file mode 100644
index 2f5e8783a9ea..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/knotes-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0dce6b2fe49270d548b091b2c96e35b1
diff --git a/metadata/md5-cache/kde-apps/knotes-18.12.1 b/metadata/md5-cache/kde-apps/knotes-18.12.1
new file mode 100644
index 000000000000..a6f60d7a8ba4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n !kde-apps/knotes:4 >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3d5e7babf59a6fd7662b1f598435afd3
diff --git a/metadata/md5-cache/kde-apps/kolf-18.08.3-r1 b/metadata/md5-cache/kde-apps/kolf-18.08.3-r1
index 0201f169d751..b016110c03d5 100644
--- a/metadata/md5-cache/kde-apps/kolf-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kolf-18.08.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kolf-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dec305186769aee6f643a9323cad8812
diff --git a/metadata/md5-cache/kde-apps/kolf-18.12.0 b/metadata/md5-cache/kde-apps/kolf-18.12.0
deleted file mode 100644
index 18f5d9b9a049..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kolf-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=127ba31ed1254801492e2c9f555ca6c5
diff --git a/metadata/md5-cache/kde-apps/kolf-18.12.1 b/metadata/md5-cache/kde-apps/kolf-18.12.1
new file mode 100644
index 000000000000..48ff89ee9d74
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f6283c090d97474d1ba2af78f94718b2
diff --git a/metadata/md5-cache/kde-apps/kollision-18.08.3 b/metadata/md5-cache/kde-apps/kollision-18.08.3
index 79fa7dc4351a..bd1433f96cb8 100644
--- a/metadata/md5-cache/kde-apps/kollision-18.08.3
+++ b/metadata/md5-cache/kde-apps/kollision-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kollision-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f009d10271fcfc2b9c24051b6621ca03
diff --git a/metadata/md5-cache/kde-apps/kollision-18.12.0 b/metadata/md5-cache/kde-apps/kollision-18.12.0
deleted file mode 100644
index 77dec7ac6e8b..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kollision-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b5cbebc6d909ce16f69a0590a3653d4d
diff --git a/metadata/md5-cache/kde-apps/kollision-18.12.1 b/metadata/md5-cache/kde-apps/kollision-18.12.1
new file mode 100644
index 000000000000..b5f43a140138
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=256cb24bcde0b56e824ea7adb63d346f
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.08.3 b/metadata/md5-cache/kde-apps/kolourpaint-18.08.3
index 9c009eb50fb4..d6e3376f86a4 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.08.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.08.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 scanner? ( >=kde-apps/libksane-18.08.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kolourpaint-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6346f7063df74d5c1e949a9c143229df
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.12.0 b/metadata/md5-cache/kde-apps/kolourpaint-18.12.0
deleted file mode 100644
index d6b6d4fef83e..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 scanner? ( >=kde-apps/libksane-18.12.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 scanner? ( >=kde-apps/libksane-18.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kolourpaint-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2a7d6e954ff596af983b5085f2b820b5
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-18.12.1 b/metadata/md5-cache/kde-apps/kolourpaint-18.12.1
new file mode 100644
index 000000000000..b014935ad426
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 scanner? ( >=kde-apps/libksane-18.12.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 scanner? ( >=kde-apps/libksane-18.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b3e99f8e7da33739de7da23b5dc9a2cf
diff --git a/metadata/md5-cache/kde-apps/kompare-18.08.3 b/metadata/md5-cache/kde-apps/kompare-18.08.3
index 5091d6dcf546..9062d8be4448 100644
--- a/metadata/md5-cache/kde-apps/kompare-18.08.3
+++ b/metadata/md5-cache/kde-apps/kompare-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkomparediff2-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kompare-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b3f57e2bc92c2d47b8a9c669909abd58
diff --git a/metadata/md5-cache/kde-apps/kompare-18.12.0 b/metadata/md5-cache/kde-apps/kompare-18.12.0
deleted file mode 100644
index f97d1a026694..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkomparediff2-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkomparediff2-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kompare-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fc863d694e141ca08467d1b34eab77df
diff --git a/metadata/md5-cache/kde-apps/kompare-18.12.1 b/metadata/md5-cache/kde-apps/kompare-18.12.1
new file mode 100644
index 000000000000..86ace90596e0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkomparediff2-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkomparediff2-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=13ad3b84a2dd10ec9b415e53dbcbbeae
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.08.3-r1 b/metadata/md5-cache/kde-apps/konqueror-18.08.3-r1
index 439f1844c42d..a54ee4a6be27 100644
--- a/metadata/md5-cache/kde-apps/konqueror-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/konqueror-18.08.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/konqueror-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=67a1f0d9ef67b3b660fb15bab5eb02c4
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.12.0 b/metadata/md5-cache/kde-apps/konqueror-18.12.0
deleted file mode 100644
index 411ea13d772c..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-18.12.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tidy? ( app-text/tidy-html5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +webengine X test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tidy? ( app-text/tidy-html5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/libkonq:5 >=kde-apps/kfind-18.12.0:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konqueror:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/konqueror-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7a676fde0613cc71951c2d3d4ff7ef6
diff --git a/metadata/md5-cache/kde-apps/konqueror-18.12.1 b/metadata/md5-cache/kde-apps/konqueror-18.12.1
new file mode 100644
index 000000000000..b2475d575675
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tidy? ( app-text/tidy-html5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +webengine X test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tidy? ( app-text/tidy-html5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/kfmclient:4 !kde-apps/konq-plugins !kde-apps/konqueror:4 !kde-apps/libkonq:5 >=kde-apps/kfind-18.12.1:5 >=kde-plasma/kde-cli-tools-5.12.5:5 !webengine? ( kde-misc/kwebkitpart:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bdb365d79d3b2b7ba79572ef06d30b10
diff --git a/metadata/md5-cache/kde-apps/konquest-18.08.3 b/metadata/md5-cache/kde-apps/konquest-18.08.3
index 5ce885ef9dfc..32143bbb8ab4 100644
--- a/metadata/md5-cache/kde-apps/konquest-18.08.3
+++ b/metadata/md5-cache/kde-apps/konquest-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/konquest-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61fce97ac990d5cd2c9bf78979973786
diff --git a/metadata/md5-cache/kde-apps/konquest-18.12.0 b/metadata/md5-cache/kde-apps/konquest-18.12.0
deleted file mode 100644
index 6ec569c53a8e..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/konquest-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49cd0241f0aff023e04d9bd48e2c419c
diff --git a/metadata/md5-cache/kde-apps/konquest-18.12.1 b/metadata/md5-cache/kde-apps/konquest-18.12.1
new file mode 100644
index 000000000000..10ec38abb778
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=36ec6976ea4195489c63e119dc5fae4c
diff --git a/metadata/md5-cache/kde-apps/konsole-18.08.3-r1 b/metadata/md5-cache/kde-apps/konsole-18.08.3-r1
index 725f66d5c254..75a776eb0828 100644
--- a/metadata/md5-cache/kde-apps/konsole-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/konsole-18.08.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/konsole-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d451137133ea5fdfd55e1e31f486fb75
diff --git a/metadata/md5-cache/kde-apps/konsole-18.12.0-r2 b/metadata/md5-cache/kde-apps/konsole-18.12.0-r2
deleted file mode 100644
index fc147c6f9226..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-18.12.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/konsole-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=03db9b1b67bfd50ffb2f93905f81f0dd
diff --git a/metadata/md5-cache/kde-apps/konsole-18.12.1 b/metadata/md5-cache/kde-apps/konsole-18.12.1
new file mode 100644
index 000000000000..5979d3b1bdab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a3e8ae2aaae0dcf67a432878df198f6c
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.3 b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.3
index f651b4b9182d..5d95b160a12d 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.08.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-calendar-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/akonadi-calendar-tools-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcb23a9c4c3455737a83f10ec68b1338
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.12.0 b/metadata/md5-cache/kde-apps/konsolekalendar-18.12.0
deleted file mode 100644
index a46c1afd9c3c..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/akonadi-calendar-tools-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb9d7f53d3d6c330fb459e4f3e123964
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-18.12.1 b/metadata/md5-cache/kde-apps/konsolekalendar-18.12.1
new file mode 100644
index 000000000000..617b43e154e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 !kde-apps/kdepim-l10n !kde-apps/konsolekalendar:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4d53bf9f4dd40cbf3433b8891d685cad
diff --git a/metadata/md5-cache/kde-apps/kontact-18.08.3 b/metadata/md5-cache/kde-apps/kontact-18.08.3
index a1ccc21a9426..7bbb672aafdb 100644
--- a/metadata/md5-cache/kde-apps/kontact-18.08.3
+++ b/metadata/md5-cache/kde-apps/kontact-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/grantleetheme-18.08.3:5 >=kde-apps/kdepim-apps-libs-18.08.3:5 >=kde-apps/kontactinterface-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/mailcommon-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kontact-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d43a04844d29afedf6f64a510fad6905
diff --git a/metadata/md5-cache/kde-apps/kontact-18.12.0 b/metadata/md5-cache/kde-apps/kontact-18.12.0
deleted file mode 100644
index 17c35948fc8a..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kontact-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6ed1ee6bae7394ebd0beb335622ddce
diff --git a/metadata/md5-cache/kde-apps/kontact-18.12.1 b/metadata/md5-cache/kde-apps/kontact-18.12.1
new file mode 100644
index 000000000000..12d744a9d0e9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kontact:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=057e9cd6e13a37faad15df36774c71ed
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.08.3 b/metadata/md5-cache/kde-apps/kontactinterface-18.08.3
index fa0a2eb79f73..0e47c7f0a228 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.08.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kontactinterface-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd87e6dade9774ff0534d3453c0bc87b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.12.0 b/metadata/md5-cache/kde-apps/kontactinterface-18.12.0
deleted file mode 100644
index f864f817dfb6..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-18.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.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kontactinterface-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c1c6f1cbad1c4ca48c3ba52b24d3e58a
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-18.12.1 b/metadata/md5-cache/kde-apps/kontactinterface-18.12.1
new file mode 100644
index 000000000000..5af28e95ff55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6c0770eb39edf5d6397b3c1daa50c9e3
diff --git a/metadata/md5-cache/kde-apps/kopete-18.08.3 b/metadata/md5-cache/kde-apps/kopete-18.08.3
index 0eaa4d4b0ad7..eb25a061a1d8 100644
--- a/metadata/md5-cache/kde-apps/kopete-18.08.3
+++ b/metadata/md5-cache/kde-apps/kopete-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kopete-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7dda5edebf5edb5844340d4416c8797c
diff --git a/metadata/md5-cache/kde-apps/kopete-18.12.0 b/metadata/md5-cache/kde-apps/kopete-18.12.0
deleted file mode 100644
index a893921d5e72..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) 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:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/Kopete 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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) 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:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 ) !kde-apps/kde4-l10n 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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kopete-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=89c9da0ebabc76de86c4cbce834a0378
diff --git a/metadata/md5-cache/kde-apps/kopete-18.12.1 b/metadata/md5-cache/kde-apps/kopete-18.12.1
new file mode 100644
index 000000000000..ed25fac5e8e7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) 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:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.1:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kopete 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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) 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:0= sys-libs/zlib:= ) zeroconf? ( >=kde-frameworks/kdnssd-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.1:5 ) !kde-apps/kde4-l10n !kde-apps/kopete:4 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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bd23c214ef087e95e25116b480c6237b
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.08.3 b/metadata/md5-cache/kde-apps/korganizer-18.08.3
index f0c536fb6aa9..0a164c88c9a1 100644
--- a/metadata/md5-cache/kde-apps/korganizer-18.08.3
+++ b/metadata/md5-cache/kde-apps/korganizer-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/korganizer-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b36907333c633c613792bdc3329cd3a7
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.12.0 b/metadata/md5-cache/kde-apps/korganizer-18.12.0
deleted file mode 100644
index 3665a70858f5..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-apps/kldap-18.12.0:5 >=dev-qt/designer-5.11.1:5 test? ( >=kde-apps/akonadi-18.12.0:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-calendar-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/akonadi-notes-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/eventviews-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kontactinterface-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/korganizer-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7217b9ff88fa809a795c210696105b3a
diff --git a/metadata/md5-cache/kde-apps/korganizer-18.12.1 b/metadata/md5-cache/kde-apps/korganizer-18.12.1
new file mode 100644
index 000000000000..11ea23c93fd8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) >=kde-apps/kldap-18.12.1:5 >=dev-qt/designer-5.11.1:5 test? ( >=kde-apps/akonadi-18.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-calendar-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/akonadi-notes-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/eventviews-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kontactinterface-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/korganizer:4 >=kde-apps/kdepim-runtime-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6323dea3accc605ddc384f5cf6bdb8a5
diff --git a/metadata/md5-cache/kde-apps/kpat-18.04.3 b/metadata/md5-cache/kde-apps/kpat-18.04.3
index f033803042ba..c123ff555831 100644
--- a/metadata/md5-cache/kde-apps/kpat-18.04.3
+++ b/metadata/md5-cache/kde-apps/kpat-18.04.3
@@ -6,8 +6,8 @@ HOMEPAGE=https://games.kde.org/game.php?game=kpat
 IUSE=debug +handbook selinux
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-apps/libkdegames-18.04.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 x11-misc/shared-mime-info !kde-apps/kpat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=97036d5759821c3c1c30fbc473fb98e5
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2ae4e2f46a3b9ce50dec4e2c47d7543
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.3 b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.3
index bc7ae547ddcf..879bfb05d78c 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.08.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kpimtextedit-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b55b2758a5ecc0f5b599a1151e0e664c
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.12.0 b/metadata/md5-cache/kde-apps/kpimtextedit-18.12.0
deleted file mode 100644
index 96cee14b7bfa..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 test? ( >=kde-frameworks/ktextwidgets-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpimtextedit:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kpimtextedit-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d2aa973e11b2ab1e5dba2b1d873e05e7
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-18.12.1 b/metadata/md5-cache/kde-apps/kpimtextedit-18.12.1
new file mode 100644
index 000000000000..fcfb57b69c3e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 test? ( >=kde-frameworks/ktextwidgets-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtspeech-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=07218e4d989a2b2880cf7746394cf9b7
diff --git a/metadata/md5-cache/kde-apps/kpkpass-18.08.3 b/metadata/md5-cache/kde-apps/kpkpass-18.08.3
index 3b21aef64be6..ba20b185b712 100644
--- a/metadata/md5-cache/kde-apps/kpkpass-18.08.3
+++ b/metadata/md5-cache/kde-apps/kpkpass-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpkpass:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kpkpass-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb27be7565d816c83903a8b5bac9ed60
diff --git a/metadata/md5-cache/kde-apps/kpkpass-18.12.0 b/metadata/md5-cache/kde-apps/kpkpass-18.12.0
deleted file mode 100644
index 2b03c5674cb5..000000000000
--- a/metadata/md5-cache/kde-apps/kpkpass-18.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library to deal with Apple Wallet pass files
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/office/kontact/
-IUSE=test debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpkpass:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kpkpass-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b98a917ce770492230890b43b98eb9cb
diff --git a/metadata/md5-cache/kde-apps/kpkpass-18.12.1 b/metadata/md5-cache/kde-apps/kpkpass-18.12.1
new file mode 100644
index 000000000000..6baf8b82b702
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpkpass-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library to deal with Apple Wallet pass files
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/office/kontact/
+IUSE=test debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 !<kde-apps/kdepim-addons-18.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb696cf6c6c75a011f2e7dcfacfdc5d7
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.3
index cf352be4dd75..682356d24b88 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kqtquickcharts-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd84b864a45a1dd01d37ec16fb4444e4
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.0 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.0
deleted file mode 100644
index 8f7058342be3..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kqtquickcharts-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e02e372e05390aed3c65bd77da092d7b
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.1
new file mode 100644
index 000000000000..6f91ca4add46
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5678c082b0eb2727eda1704cde041ddf
diff --git a/metadata/md5-cache/kde-apps/krdc-18.08.3 b/metadata/md5-cache/kde-apps/krdc-18.08.3
index 9f44304dc285..5809ceeacbee 100644
--- a/metadata/md5-cache/kde-apps/krdc-18.08.3
+++ b/metadata/md5-cache/kde-apps/krdc-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/krdc-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5208d839c8e27709ecee58df3d5b1a31
diff --git a/metadata/md5-cache/kde-apps/krdc-18.12.0 b/metadata/md5-cache/kde-apps/krdc-18.12.0
deleted file mode 100644
index 003c8b49266e..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/krdc-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43317076c676326cd3df1ee15bc44cbc
diff --git a/metadata/md5-cache/kde-apps/krdc-18.12.1 b/metadata/md5-cache/kde-apps/krdc-18.12.1
new file mode 100644
index 000000000000..e9661f203e6c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=19d98330a79be71701cbe943d3cdb2e8
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.08.3 b/metadata/md5-cache/kde-apps/kreversi-18.08.3
index f01c2968c5c5..75dc508f8660 100644
--- a/metadata/md5-cache/kde-apps/kreversi-18.08.3
+++ b/metadata/md5-cache/kde-apps/kreversi-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kreversi-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e821a6e990de693a006588ef87c86f60
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.12.0 b/metadata/md5-cache/kde-apps/kreversi-18.12.0
deleted file mode 100644
index 26614a9b8b2e..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kreversi-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2aef2f570e9b6fbaabbe01c01b56b1f9
diff --git a/metadata/md5-cache/kde-apps/kreversi-18.12.1 b/metadata/md5-cache/kde-apps/kreversi-18.12.1
new file mode 100644
index 000000000000..feb1dd9a429f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f7e60d07996f8471ed2fec1e912c1536
diff --git a/metadata/md5-cache/kde-apps/krfb-18.08.3 b/metadata/md5-cache/kde-apps/krfb-18.08.3
index 0da7192a388e..2f134476e479 100644
--- a/metadata/md5-cache/kde-apps/krfb-18.08.3
+++ b/metadata/md5-cache/kde-apps/krfb-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/krfb-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=02b8761df43c36691bed31cd7aed36d6
diff --git a/metadata/md5-cache/kde-apps/krfb-18.12.0 b/metadata/md5-cache/kde-apps/krfb-18.12.0
deleted file mode 100644
index e23e9288a8d8..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/krfb-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=92d987cca7753f4505a3cade5f8ae1de
diff --git a/metadata/md5-cache/kde-apps/krfb-18.12.1 b/metadata/md5-cache/kde-apps/krfb-18.12.1
new file mode 100644
index 000000000000..60bed1d88688
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f8ffd83236e1561b133955c4a1a0a9f5
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.3-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.3-r1
index 598a05f2711d..bd3ed7c99971 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.08.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kross-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidget
 REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kross-interpreters-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3b7cebe2601dde68059349ae64df072f
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.12.0 b/metadata/md5-cache/kde-apps/kross-interpreters-18.12.0
deleted file mode 100644
index ab48ebc536cd..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kross-interpreters:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kross-interpreters-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=296c1934038ef6db766d2c7a1751260b
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-18.12.1 b/metadata/md5-cache/kde-apps/kross-interpreters-18.12.1
new file mode 100644
index 000000000000..5b7c09998188
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f9d10acfe660e89daeb586b01593cf96
diff --git a/metadata/md5-cache/kde-apps/kruler-18.08.3 b/metadata/md5-cache/kde-apps/kruler-18.08.3
index 357a7f82cc07..685ef45b0db5 100644
--- a/metadata/md5-cache/kde-apps/kruler-18.08.3
+++ b/metadata/md5-cache/kde-apps/kruler-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kruler-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ce082d8202409291570f26b70d12787
diff --git a/metadata/md5-cache/kde-apps/kruler-18.12.0 b/metadata/md5-cache/kde-apps/kruler-18.12.0
deleted file mode 100644
index e8a1496e41e9..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kruler-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c15bd5ed60297294f714b08f2366a19
diff --git a/metadata/md5-cache/kde-apps/kruler-18.12.1 b/metadata/md5-cache/kde-apps/kruler-18.12.1
new file mode 100644
index 000000000000..4e576c7a935e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f4f9f44d62215e9e48b6f8328825b93f
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.08.3 b/metadata/md5-cache/kde-apps/kshisen-18.08.3
index 088dbf312ee9..bbc80f8284ae 100644
--- a/metadata/md5-cache/kde-apps/kshisen-18.08.3
+++ b/metadata/md5-cache/kde-apps/kshisen-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=kde-apps/libkmahjongg-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kshisen-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26fc03ddb385105e6701a3b9e9a877ac
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.12.0 b/metadata/md5-cache/kde-apps/kshisen-18.12.0
deleted file mode 100644
index ef8175aa9fa5..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=kde-apps/libkmahjongg-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=kde-apps/libkmahjongg-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kshisen-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e35190fa5ed239571fde710db746bd33
diff --git a/metadata/md5-cache/kde-apps/kshisen-18.12.1 b/metadata/md5-cache/kde-apps/kshisen-18.12.1
new file mode 100644
index 000000000000..e261915bb8ad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=kde-apps/libkmahjongg-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=kde-apps/libkmahjongg-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=99350e7302c411e968f6fcd3b9098454
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.08.3 b/metadata/md5-cache/kde-apps/ksirk-18.08.3
index d5ae05b91718..21baa1a82bc0 100644
--- a/metadata/md5-cache/kde-apps/ksirk-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksirk-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksirk-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a185181b9256d834e0f949318c784b0c
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.12.0 b/metadata/md5-cache/kde-apps/ksirk-18.12.0
deleted file mode 100644
index b9a7579c7a8a..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksirk-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f898dd31bf7ff61ecbd4d94bed392635
diff --git a/metadata/md5-cache/kde-apps/ksirk-18.12.1 b/metadata/md5-cache/kde-apps/ksirk-18.12.1
new file mode 100644
index 000000000000..3a162dbc8eb4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=33b97f4bec6671d2090e20f5e536768f
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.08.3 b/metadata/md5-cache/kde-apps/ksmtp-18.08.3
index b4e36fe4dee3..b4e4d4b39128 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksmtp-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eeeb5af1cf75edce7434327d6fb05a5b
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.12.0 b/metadata/md5-cache/kde-apps/ksmtp-18.12.0
deleted file mode 100644
index 17baf55486aa..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-18.12.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksmtp:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksmtp-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cb6bbebab8b022ec82dfdf8b6b7d041f
diff --git a/metadata/md5-cache/kde-apps/ksmtp-18.12.1 b/metadata/md5-cache/kde-apps/ksmtp-18.12.1
new file mode 100644
index 000000000000..0a0904fcda29
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 dev-libs/cyrus-sasl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 dev-libs/cyrus-sasl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fb43ea07e6db33dee2b4fde407773b3f
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.3 b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.3
index 2a75665ced6e..33aa9ab28610 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksnakeduel-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb0a2450037844506afeaa45d902f3b5
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.12.0 b/metadata/md5-cache/kde-apps/ksnakeduel-18.12.0
deleted file mode 100644
index 7de7e64ebdb2..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksnakeduel-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=989293264910295ee52638742d634780
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-18.12.1 b/metadata/md5-cache/kde-apps/ksnakeduel-18.12.1
new file mode 100644
index 000000000000..90b3903cac43
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=45c9adc7eacc3422c35ef9ca7022e10d
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.08.3 b/metadata/md5-cache/kde-apps/kspaceduel-18.08.3
index e1e5d33572d0..1ed12734fb65 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.08.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kspaceduel-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a29d982d722bd73fc079c3860f33ea9
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.12.0 b/metadata/md5-cache/kde-apps/kspaceduel-18.12.0
deleted file mode 100644
index 73ffd01dccf2..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kspaceduel-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a02f9f524ab0b41122ba096c55d3bd91
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-18.12.1 b/metadata/md5-cache/kde-apps/kspaceduel-18.12.1
new file mode 100644
index 000000000000..c2f1f8433031
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=19c2d2cba28bc19dd7be7a6f48e8369f
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.08.3 b/metadata/md5-cache/kde-apps/ksquares-18.08.3
index d2dc8182c9da..e6b30539d1b9 100644
--- a/metadata/md5-cache/kde-apps/ksquares-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksquares-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksquares-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b81dfd268f894765b7820d7ab6e8b4eb
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.12.0 b/metadata/md5-cache/kde-apps/ksquares-18.12.0
deleted file mode 100644
index 6aae29f0cd70..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksquares-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=145a2205d4eb0d2047b9a147cc9305de
diff --git a/metadata/md5-cache/kde-apps/ksquares-18.12.1 b/metadata/md5-cache/kde-apps/ksquares-18.12.1
new file mode 100644
index 000000000000..19dcf470602f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=248ea3ce79b9ec34280b5964007c0772
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.08.3 b/metadata/md5-cache/kde-apps/ksudoku-18.08.3
index 787d464ee6a1..0d79a430ed2c 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 opengl? ( >=dev-qt/qtopengl-5.9.4:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksudoku-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14c52742ed8866ae7757b8bb2ad5e903
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.12.0 b/metadata/md5-cache/kde-apps/ksudoku-18.12.0
deleted file mode 100644
index 8e2f319f86b7..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 opengl? ( >=dev-qt/qtopengl-5.11.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 opengl? ( >=dev-qt/qtopengl-5.11.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksudoku-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e8dcd0501f0dd3680372f9bddfad5c06
diff --git a/metadata/md5-cache/kde-apps/ksudoku-18.12.1 b/metadata/md5-cache/kde-apps/ksudoku-18.12.1
new file mode 100644
index 000000000000..0628ace5ed94
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 opengl? ( >=dev-qt/qtopengl-5.11.1:5 virtual/glu ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 opengl? ( >=dev-qt/qtopengl-5.11.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0559401946152cad19de8a6634aff09d
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.08.3 b/metadata/md5-cache/kde-apps/ksystemlog-18.08.3
index a1701dfd5e41..140f6c7ef7a7 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.08.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ksystemlog-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8818023594a522b0fd0e4a1974eba037
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.12.0 b/metadata/md5-cache/kde-apps/ksystemlog-18.12.0
deleted file mode 100644
index 18ff40b68a01..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksystemlog:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ksystemlog-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6e649a6a3cf127b6454cf1463e58e56
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-18.12.1 b/metadata/md5-cache/kde-apps/ksystemlog-18.12.1
new file mode 100644
index 000000000000..11ea32055e0b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 systemd? ( sys-apps/systemd ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 systemd? ( sys-apps/systemd ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bab727c93838ea8f3b102f595253d743
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.08.3 b/metadata/md5-cache/kde-apps/kteatime-18.08.3
index a4166926fde7..796c0154eaf7 100644
--- a/metadata/md5-cache/kde-apps/kteatime-18.08.3
+++ b/metadata/md5-cache/kde-apps/kteatime-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kteatime-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d12c114153f93fd4069e5c98232347ee
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.12.0 b/metadata/md5-cache/kde-apps/kteatime-18.12.0
deleted file mode 100644
index 9f1fa70477b7..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kteatime-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2da424d605554a8037266a5b9ebd6f7d
diff --git a/metadata/md5-cache/kde-apps/kteatime-18.12.1 b/metadata/md5-cache/kde-apps/kteatime-18.12.1
new file mode 100644
index 000000000000..48f399c933d0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=39c9fefd514a376c41f265cee41f0f04
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.08.3 b/metadata/md5-cache/kde-apps/ktimer-18.08.3
index 26ce71663022..4cfac9f8d527 100644
--- a/metadata/md5-cache/kde-apps/ktimer-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktimer-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktimer-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47545bc4d7082ca155f3b468d5357bd7
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.12.0 b/metadata/md5-cache/kde-apps/ktimer-18.12.0
deleted file mode 100644
index 17975eefcd10..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktimer-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ff837512aa21121884769acbd1d3205
diff --git a/metadata/md5-cache/kde-apps/ktimer-18.12.1 b/metadata/md5-cache/kde-apps/ktimer-18.12.1
new file mode 100644
index 000000000000..ca2bbd67c148
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=87960d50e754c35e228776073e828c34
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.08.3 b/metadata/md5-cache/kde-apps/ktouch-18.08.3
index 09c4f7d5032d..7c95bdd97522 100644
--- a/metadata/md5-cache/kde-apps/ktouch-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktouch-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktouch-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39df728117242ee8f7254e99a0e1a718
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.12.0 b/metadata/md5-cache/kde-apps/ktouch-18.12.0
deleted file mode 100644
index 4e0e26e98ad5..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktouch-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1679ff3d11fecffee1ee165a89a390f3
diff --git a/metadata/md5-cache/kde-apps/ktouch-18.12.1 b/metadata/md5-cache/kde-apps/ktouch-18.12.1
new file mode 100644
index 000000000000..870625b8edf9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kwindowsystem-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f921b22e20252bb4b471c10810693a8c
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.3
index 5ee1c54c8760..1a3d287d9ddd 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.08.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-accounts-kcm-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8589a05cceab36009705e4a3b5426377
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.0 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.0
deleted file mode 100644
index ae0c8f1ef573..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.12.0:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-accounts-kcm-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5487941316b7de4e8f6bb1a686c70489
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.1
new file mode 100644
index 000000000000..888f3798af55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 dev-util/intltool net-libs/libaccounts-glib sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-18.12.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9385989b5305d8cd4743ed7680fcd9ac
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.08.3 b/metadata/md5-cache/kde-apps/ktp-approver-18.08.3
index 510bad95f9be..b954db03db18 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-approver-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=72b454a106213fc23f98d15f603b3346
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.12.0 b/metadata/md5-cache/kde-apps/ktp-approver-18.12.0
deleted file mode 100644
index a85c998492db..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-approver-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f760834c4d391193533701b01117cc6a
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-18.12.1 b/metadata/md5-cache/kde-apps/ktp-approver-18.12.1
new file mode 100644
index 000000000000..58241d730c86
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3ad589e8ca8f43e1eab26a9beb9f6d07
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.3
index aab5bb2c0152..f6fd7835e675 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.08.3:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-auth-handler-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3c46562991675bba1e6c335a028d275c
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.12.0 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.12.0
deleted file mode 100644
index 82e95478c299..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-auth-handler-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1e1babf247771560b4da8133fdbbd1fc
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-18.12.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.12.1
new file mode 100644
index 000000000000..ad4d1f740f1d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/kaccounts-integration-18.12.1:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b0c1357ab8f733d62303d0403f1da8e2
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.3
index 681071f1290b..a7a4127de464 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-call-ui-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa8c3c1291e5a33600b07af01fa5e61e
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.12.0 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.12.0
deleted file mode 100644
index 7dcb9e4330e6..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 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/kcmutils-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-call-ui-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0b08d9c3038bdf773b46a53e6bec0ecc
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-18.12.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-18.12.1
new file mode 100644
index 000000000000..c3d3bd7d48d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 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/kcmutils-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2cf1338673df2c88edbb4fd1500a8921
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.3
index 1149f84facce..5b8d7d73577b 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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-18.08.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-common-internals-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2205665d80e90fe1ce73da116d18ba5
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.0 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.0
deleted file mode 100644
index edc878e48525..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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-18.12.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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-18.12.0:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-common-internals-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=308c69ad5c592d28f59132027f53e8d0
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.1
new file mode 100644
index 000000000000..cdab5f297485
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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-18.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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-18.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=dda0fe7c70de7bc7ce8457dda9be241a
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.3
index a2829699b6ae..a6accf1a8716 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-contact-list-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5cc800d1a827924eed88ec7a8ebaa20b
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.12.0 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.12.0
deleted file mode 100644
index 89c17f7955e0..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-contact-list-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8589f887f5bbe20244a8b7aaf27579e1
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-18.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-18.12.1
new file mode 100644
index 000000000000..be96de6f9f49
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5ce5e986ad49e58ddfaf5d532b2775ef
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.3
index 594c0b43d215..99639ddec7fc 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-contact-runner-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=564237f531dfb298f3c56c34fabf2d1a
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.12.0 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.12.0
deleted file mode 100644
index a1de9cbc45ed..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-contact-runner-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0eb269d76161b4bdd2fb2477df2089c5
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-18.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.12.1
new file mode 100644
index 000000000000..4c859b97faee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=36d853aa66cdb9420bc32a0c55b099a1
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.3
index 26b585d137f2..eebed6927dfe 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.08.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-desktop-applets-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=685cacf2cb4f37c1de32199fe0b8848a
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.0 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.0
deleted file mode 100644
index 16a8f074f618..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=kde-frameworks/ki18n-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-desktop-applets-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4b59dc336052edef6ec4e9404aeb9e52
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.1
new file mode 100644
index 000000000000..8682a1aceedb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=kde-frameworks/ki18n-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9fa4d9ab97f896f853bc22509ce35f66
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.3
index 438ec13d5f3c..33de7fbeaecf 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-filetransfer-handler-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=506823d4a0f1242be11234e5935db257
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.12.0 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.12.0
deleted file mode 100644
index c5c62b0cc9c0..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-filetransfer-handler-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d6c365ba713f2b8bde72e20148f16ca1
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.12.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.12.1
new file mode 100644
index 000000000000..3c0a231b2389
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a99c50553cf7da4d3b15a85c4d5ff9f6
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.3
index e52735dae102..69ce406bd77d 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-kded-module-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=556c9d4f83a902820484522ac77a96fb
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.12.0 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.12.0
deleted file mode 100644
index 6e580b10a84e..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-kded-module-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fe5f6f761c95cb3d9f11dc6db5ccffa1
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-18.12.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-18.12.1
new file mode 100644
index 000000000000..751d9df003c9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3593881468e921dacf502ee20d536ef2
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.3 b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.3
index 4da41d872b1a..a2d2ddca859a 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.08.3:5 >=kde-apps/ktp-filetransfer-handler-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-send-file-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bd203fa0bdd199b0ba4487476ea94fac
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.12.0 b/metadata/md5-cache/kde-apps/ktp-send-file-18.12.0
deleted file mode 100644
index ac3ec4b4ee1f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.12.0:5 >=kde-apps/ktp-filetransfer-handler-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-send-file-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef59a63635f23576fa24082136dd0dc0
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-18.12.1 b/metadata/md5-cache/kde-apps/ktp-send-file-18.12.1
new file mode 100644
index 000000000000..4781e035c1b1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-18.12.1:5 >=kde-apps/ktp-filetransfer-handler-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fccbec467c9fdfdefdae2cd7adacf90a
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.3
index fff1445931d8..63a2114e5ed0 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.08.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdewebkit-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/ktp-common-internals-18.08.3:5[otr] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-apps/ktp-contact-list-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktp-text-ui-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75e2d18a9f55e98d971c80f8eaef205f
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.0-r1 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.0-r1
deleted file mode 100644
index d4f064bdb1fe..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5[otr] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.0:5[otr] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-apps/ktp-contact-list-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktp-text-ui-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=42d1ab6ec71cabadc9d963e4a13599d0
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.1
new file mode 100644
index 000000000000..ffb131ebeac1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5[otr] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-apps/ktp-common-internals-18.12.1:5[otr] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-apps/ktp-contact-list-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a091eee6d03741ca4bedf8285ed8a119
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.08.3 b/metadata/md5-cache/kde-apps/ktuberling-18.08.3
index 65e8b7c6df95..ca3361572c5c 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-18.08.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktuberling-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=149b25fd50d316852ce15dd3e30592b5
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.12.0 b/metadata/md5-cache/kde-apps/ktuberling-18.12.0
deleted file mode 100644
index 1bf1fd13de21..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktuberling-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1b7793b51f528b1c2677ce88080c1c36
diff --git a/metadata/md5-cache/kde-apps/ktuberling-18.12.1 b/metadata/md5-cache/kde-apps/ktuberling-18.12.1
new file mode 100644
index 000000000000..bed223d2b517
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8d8c4bdb7af68f263609998eaf1567cc
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.08.3 b/metadata/md5-cache/kde-apps/kturtle-18.08.3
index b984e9a9c27f..b2c04e7e520f 100644
--- a/metadata/md5-cache/kde-apps/kturtle-18.08.3
+++ b/metadata/md5-cache/kde-apps/kturtle-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kturtle-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e2feeb0231fd2c869a5902f81915c133
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.12.0 b/metadata/md5-cache/kde-apps/kturtle-18.12.0
deleted file mode 100644
index e8c5a830c3e2..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kturtle-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ad2f44a28bf6d70e66da9bb98dae774f
diff --git a/metadata/md5-cache/kde-apps/kturtle-18.12.1 b/metadata/md5-cache/kde-apps/kturtle-18.12.1
new file mode 100644
index 000000000000..032c823d9272
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c5e2386911d9b543de0f13ae8f0575ec
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.08.3 b/metadata/md5-cache/kde-apps/kubrick-18.08.3
index a8a5df6f04dd..bf69e10b78a7 100644
--- a/metadata/md5-cache/kde-apps/kubrick-18.08.3
+++ b/metadata/md5-cache/kde-apps/kubrick-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kubrick-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45dab9f682dc663ddf53231ec1d4d78a
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.12.0 b/metadata/md5-cache/kde-apps/kubrick-18.12.0
deleted file mode 100644
index c2a051baf4f0..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kubrick-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2111c9f396b037edda0fd64681c2dc45
diff --git a/metadata/md5-cache/kde-apps/kubrick-18.12.1 b/metadata/md5-cache/kde-apps/kubrick-18.12.1
new file mode 100644
index 000000000000..71b250b7bf26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e8ff9ae478c55fa064a610f05d45c5b2
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.3 b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.3
index dcf0b1f6b7cf..978925e63a45 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.08.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kwalletmanager-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4649af4527923f32ea71d7b49904a285
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.12.0 b/metadata/md5-cache/kde-apps/kwalletmanager-18.12.0
deleted file mode 100644
index 170db0b1c3f4..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-18.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kwalletmanager-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=405d4b3c0f120ef1b4c913e8af7dcd54
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-18.12.1 b/metadata/md5-cache/kde-apps/kwalletmanager-18.12.1
new file mode 100644
index 000000000000..809cec3a0841
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=31c5ac07b297e9f4914f692bbe383baa
diff --git a/metadata/md5-cache/kde-apps/kwave-18.08.3 b/metadata/md5-cache/kde-apps/kwave-18.08.3
index 4915913e6307..376cafc3aa9c 100644
--- a/metadata/md5-cache/kde-apps/kwave-18.08.3
+++ b/metadata/md5-cache/kde-apps/kwave-18.08.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4: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.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kwave-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=20cea5217fe0bbcf9ba4cacc8061d5b4
diff --git a/metadata/md5-cache/kde-apps/kwave-18.12.0 b/metadata/md5-cache/kde-apps/kwave-18.12.0
deleted file mode 100644
index 7d32872eefb8..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.12.0:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kwave-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=aa10d0def8ca4837066ecb2e6c2d06bf
diff --git a/metadata/md5-cache/kde-apps/kwave-18.12.1 b/metadata/md5-cache/kde-apps/kwave-18.12.1
new file mode 100644
index 000000000000..5e519a25c23c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-18.12.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1147e3b907d0fa44b01d43e22fe2dd34
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.08.3 b/metadata/md5-cache/kde-apps/kwordquiz-18.08.3
index 3721265452cd..e9f1d6ff8efc 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.08.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kwordquiz-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3f510fd4b4d00ce1a25ba6e7644ef4bd
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.12.0 b/metadata/md5-cache/kde-apps/kwordquiz-18.12.0
deleted file mode 100644
index 004beb90116a..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kwordquiz-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=617bc48ba9e2e08b8d7c1dc781e3408e
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-18.12.1 b/metadata/md5-cache/kde-apps/kwordquiz-18.12.1
new file mode 100644
index 000000000000..1d4a50639304
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkeduvocdocument-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c7813324e02adc1d95d8493350545154
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.08.3 b/metadata/md5-cache/kde-apps/kwrite-18.08.3
index bd7f563aaba6..5bd194daf238 100644
--- a/metadata/md5-cache/kde-apps/kwrite-18.08.3
+++ b/metadata/md5-cache/kde-apps/kwrite-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kate-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4a9e77563f51ccea9ec2b1e35304c39
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.12.0 b/metadata/md5-cache/kde-apps/kwrite-18.12.0
deleted file mode 100644
index f1298d7c98d1..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kate-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=69187c07d86fc3912144059be0371a0f
diff --git a/metadata/md5-cache/kde-apps/kwrite-18.12.1 b/metadata/md5-cache/kde-apps/kwrite-18.12.1
new file mode 100644
index 000000000000..fa091f2c28d3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kate-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a1ebdca49776317aa925293ea5aee634
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.08.3 b/metadata/md5-cache/kde-apps/libgravatar-18.08.3
index 380dc501d7d0..019cba5b6662 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-18.08.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libgravatar-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=23b06014279e920d0804b054e389ea8c
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.12.0 b/metadata/md5-cache/kde-apps/libgravatar-18.12.0
deleted file mode 100644
index fb77d3f496cf..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libgravatar-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fec58762bdad35c9cc18e3379fd46d9a
diff --git a/metadata/md5-cache/kde-apps/libgravatar-18.12.1 b/metadata/md5-cache/kde-apps/libgravatar-18.12.1
new file mode 100644
index 000000000000..b5980cfe7e2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=57e62e9ac3e59d92f1499a8295214875
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.08.3 b/metadata/md5-cache/kde-apps/libkcddb-18.08.3
index 859496698a4c..678bcc976ddf 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkcddb-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=967b1baf85491f7d2afffb1e5c318cbc
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.12.0 b/metadata/md5-cache/kde-apps/libkcddb-18.12.0
deleted file mode 100644
index 29210fefaf20..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-18.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkcddb-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c74cd2760721b54b2de65016b304aaf0
diff --git a/metadata/md5-cache/kde-apps/libkcddb-18.12.1 b/metadata/md5-cache/kde-apps/libkcddb-18.12.1
new file mode 100644
index 000000000000..1fe80be9d160
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 musicbrainz? ( media-libs/musicbrainz:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f292d8b0e7d71d7ba763266306f7990e
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.3
index 196f5d5c0937..cc19fa6aff2e 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkcompactdisc-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d504dd3d38400ae06bb280ad71d2033d
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.12.0 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.12.0
deleted file mode 100644
index d0b244910454..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-18.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkcompactdisc-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bb7caf0c726aa3db5f9c2e1cfbfb5a88
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-18.12.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-18.12.1
new file mode 100644
index 000000000000..3b92bda10d1a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f29ec79ef590fed55e0abca2ebcb018b
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.08.3 b/metadata/md5-cache/kde-apps/libkdcraw-18.08.3
index a9c99a9320e1..96e4b85e4b2c 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkdcraw-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8eca0d0004f0303985aaa70c09d9dbc9
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.12.0 b/metadata/md5-cache/kde-apps/libkdcraw-18.12.0
deleted file mode 100644
index 49689bed4a3d..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-18.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.11.1:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkdcraw-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41988dc3700967185ab64ed0ea8c7428
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-18.12.1 b/metadata/md5-cache/kde-apps/libkdcraw-18.12.1
new file mode 100644
index 000000000000..bd240109b233
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=media-libs/libraw-0.16:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2d0935909d8bad1e2d29a7f5f7ecdf55
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.08.3 b/metadata/md5-cache/kde-apps/libkdegames-18.08.3
index 0a60b3464813..728467382ee2 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkdegames-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e08495c51b079f4270e881511dd9c9e3
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.12.0 b/metadata/md5-cache/kde-apps/libkdegames-18.12.0
deleted file mode 100644
index 45b79e4beb33..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-18.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkdegames-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d0f8c45a5760625c317d7575ef87d130
diff --git a/metadata/md5-cache/kde-apps/libkdegames-18.12.1 b/metadata/md5-cache/kde-apps/libkdegames-18.12.1
new file mode 100644
index 000000000000..44716fbff7a5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/libsndfile media-libs/openal sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0ed09cf1e585099598e48b1b61ed4fbd
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.08.3 b/metadata/md5-cache/kde-apps/libkdepim-18.08.3
index d29ffbbd2073..ad6161f11951 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-search-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kldap-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkdepim-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7f860b32208b644af63de3b1b364b54
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.12.0 b/metadata/md5-cache/kde-apps/libkdepim-18.12.0
deleted file mode 100644
index 45461ec4a19a..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-search-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkdepim-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2d10ca26b4658fb85de413b872c1063
diff --git a/metadata/md5-cache/kde-apps/libkdepim-18.12.1 b/metadata/md5-cache/kde-apps/libkdepim-18.12.1
new file mode 100644
index 000000000000..1529079564a9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-search-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6d86c5fe43fa963189a5e40f497f7b13
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.3
index d2e2c74fb40c..b6b507a3058d 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkeduvocdocument-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c5cc82ad0efb7e2775902e2423d10af6
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.12.0 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.12.0
deleted file mode 100644
index 1ad99751f152..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkeduvocdocument-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f73d8b378ef011ea1f385731d45c7ac
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-18.12.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.12.1
new file mode 100644
index 000000000000..66f15f9c8ee2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=897473f879f4b2cbcf71f42709d12163
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.08.3 b/metadata/md5-cache/kde-apps/libkexiv2-18.08.3
index 61508d14f55c..15919c1042fb 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkexiv2-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d32e58a5b889d35ef579b9d6ae5f0934
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.12.0-r1 b/metadata/md5-cache/kde-apps/libkexiv2-18.12.0-r1
deleted file mode 100644
index 2ad70a109067..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-18.12.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.11.1:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.53.0:5 >=dev-qt/qtcore-5.11.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.11.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkexiv2-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ecd75ea11ffa42782ccd1455e6d58052
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-18.12.1 b/metadata/md5-cache/kde-apps/libkexiv2-18.12.1
new file mode 100644
index 000000000000..f0a423aff547
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=media-gfx/exiv2-0.25:=[xmp=] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.53.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Wrapper around exiv2 library
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=adfb2e569f5046294f6c83e10c8c33e2
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.08.3 b/metadata/md5-cache/kde-apps/libkgapi-18.08.3
index 6f09027705ea..cff033b73d47 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkgapi-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3fb9acd029107f7b64cceda300b779a
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.12.0 b/metadata/md5-cache/kde-apps/libkgapi-18.12.0
deleted file mode 100644
index 21d5f940f285..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkgapi-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=638375cca2fb561cfbce4a67acd28792
diff --git a/metadata/md5-cache/kde-apps/libkgapi-18.12.1 b/metadata/md5-cache/kde-apps/libkgapi-18.12.1
new file mode 100644
index 000000000000..4530d934945d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=15a10e6ff37272bf71afd60c3475a5e9
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.08.3 b/metadata/md5-cache/kde-apps/libkgeomap-18.08.3
index 34e4cbb2c1e6..dc21b0ff2a77 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/marble-18.08.3:5=[kde] >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkgeomap-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c332a4b783447d4eae5a0e80d8360f21
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.12.0 b/metadata/md5-cache/kde-apps/libkgeomap-18.12.0
deleted file mode 100644
index e06608429611..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/marble-18.12.0:5=[kde] >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/marble-18.12.0:5=[kde] >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkgeomap-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2bd887b3ceec9458e4ca300043e47ddc
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-18.12.1 b/metadata/md5-cache/kde-apps/libkgeomap-18.12.1
new file mode 100644
index 000000000000..40355e419885
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/marble-18.12.1:5=[kde] >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-apps/marble-18.12.1:5=[kde] >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e89c0fee609c8097a186f68fc86fee89
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.08.3 b/metadata/md5-cache/kde-apps/libkipi-18.08.3
index ca9e4998e9a2..adffd397a061 100644
--- a/metadata/md5-cache/kde-apps/libkipi-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkipi-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkipi-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=828f6677e1ae3f7b83331c511a154819
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.12.0 b/metadata/md5-cache/kde-apps/libkipi-18.12.0
deleted file mode 100644
index ae9485163fff..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkipi-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5a32329bde9cf41cdcf54853d504e52
diff --git a/metadata/md5-cache/kde-apps/libkipi-18.12.1 b/metadata/md5-cache/kde-apps/libkipi-18.12.1
new file mode 100644
index 000000000000..77e65e70525c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=da321ee027be58c446eb6d69ddd07010
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.08.3 b/metadata/md5-cache/kde-apps/libkleo-18.08.3
index dfa673dde67a..1248b9fae24a 100644
--- a/metadata/md5-cache/kde-apps/libkleo-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkleo-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kpimtextedit-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkleo-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=14f231e537c21da8e61951a1479c72e5
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.12.0 b/metadata/md5-cache/kde-apps/libkleo-18.12.0
deleted file mode 100644
index e4e623015c35..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkleo-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ab0f3a3c03c57a9a6ae01151a0e081b2
diff --git a/metadata/md5-cache/kde-apps/libkleo-18.12.1 b/metadata/md5-cache/kde-apps/libkleo-18.12.1
new file mode 100644
index 000000000000..57b543847308
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kpimtextedit-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-apps/kpimtextedit-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a3e9922c09a234380f877506b7bacdb3
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.3 b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.3
index d09188d9151c..597c75a5f088 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkmahjongg-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa3c17e150909eb2d2960ee7198977a5
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.12.0 b/metadata/md5-cache/kde-apps/libkmahjongg-18.12.0
deleted file mode 100644
index 9cbdddd0e04d..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkmahjongg-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c67e20016d427600326fadaafcb42790
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-18.12.1 b/metadata/md5-cache/kde-apps/libkmahjongg-18.12.1
new file mode 100644
index 000000000000..75b80629f84f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ce9f8ddd1169e09e996c6d0b04e88ecf
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.3 b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.3
index ed6aab3ac1c1..02d86938acbd 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.08.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libkomparediff2-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ac50d3e5e8030a726c89a8e92900eabd
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.12.0 b/metadata/md5-cache/kde-apps/libkomparediff2-18.12.0
deleted file mode 100644
index b07758cef342..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libkomparediff2-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dc6d2054ac6a10a6daabeb7876f6911d
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-18.12.1 b/metadata/md5-cache/kde-apps/libkomparediff2-18.12.1
new file mode 100644
index 000000000000..2507aed2ac09
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=908f5f88ec8562552e03e67325e4db3e
diff --git a/metadata/md5-cache/kde-apps/libksane-18.08.3 b/metadata/md5-cache/kde-apps/libksane-18.08.3
index a44ba46e1d7b..aaaf5f468295 100644
--- a/metadata/md5-cache/kde-apps/libksane-18.08.3
+++ b/metadata/md5-cache/kde-apps/libksane-18.08.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libksane-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=553342c3205945ccaac6d6b679f9ec6f
diff --git a/metadata/md5-cache/kde-apps/libksane-18.12.0 b/metadata/md5-cache/kde-apps/libksane-18.12.0
deleted file mode 100644
index cb863f5d4256..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-18.12.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.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=kwallet debug
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libksane-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db60c1ad16b3fb724c3e11d9471c1ff4
diff --git a/metadata/md5-cache/kde-apps/libksane-18.12.1 b/metadata/md5-cache/kde-apps/libksane-18.12.1
new file mode 100644
index 000000000000..9649d599d4f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=kwallet debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.52.0:5 ) !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bdc0e4a6c116f7a6362e17a11d71bf33
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.08.3 b/metadata/md5-cache/kde-apps/libksieve-18.08.3
index c498c041f8f1..29236aac7bc6 100644
--- a/metadata/md5-cache/kde-apps/libksieve-18.08.3
+++ b/metadata/md5-cache/kde-apps/libksieve-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/libksieve-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6866477443e935ab1969a4e5e1ecdb8b
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.12.0 b/metadata/md5-cache/kde-apps/libksieve-18.12.0
deleted file mode 100644
index b5fe806fd07d..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-18.12.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libksieve:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/libksieve-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f098085c37483b8402c48ac41203e4ca
diff --git a/metadata/md5-cache/kde-apps/libksieve-18.12.1 b/metadata/md5-cache/kde-apps/libksieve-18.12.1
new file mode 100644
index 000000000000..dc6e7204ae23
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl >=kde-apps/kimap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bda59ecc2bc4edcd434ff9be48825bc8
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.08.3 b/metadata/md5-cache/kde-apps/libktnef-18.08.3
index a7eb5a8e44ce..7be6aa120ef9 100644
--- a/metadata/md5-cache/kde-apps/libktnef-18.08.3
+++ b/metadata/md5-cache/kde-apps/libktnef-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcalutils-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/ktnef-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7057503fe6d8b50f8bd61c8c40516d05
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.12.0 b/metadata/md5-cache/kde-apps/libktnef-18.12.0
deleted file mode 100644
index 261179dbaa7e..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-18.12.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.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcalutils-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/ktnef-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=12a7afb3b0c3c1b604a2742eeaf391be
diff --git a/metadata/md5-cache/kde-apps/libktnef-18.12.1 b/metadata/md5-cache/kde-apps/libktnef-18.12.1
new file mode 100644
index 000000000000..4357a330ce9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcalutils-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=36454f821b4b96c4b895673f0ede0c95
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.08.3 b/metadata/md5-cache/kde-apps/lokalize-18.08.3
index 358046c76cab..c49c6e924bf9 100644
--- a/metadata/md5-cache/kde-apps/lokalize-18.08.3
+++ b/metadata/md5-cache/kde-apps/lokalize-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_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
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/lokalize-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9fde58a2a6f0f6f488f50c4cd86ee39
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.12.0 b/metadata/md5-cache/kde-apps/lokalize-18.12.0
deleted file mode 100644
index 9fcc141a6643..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-18.12.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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 https://l10n.kde.org/tools/
-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 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 ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lokalize:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.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
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/lokalize-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6de9cb3ff642bc7e0806f36d91837802
diff --git a/metadata/md5-cache/kde-apps/lokalize-18.12.1 b/metadata/md5-cache/kde-apps/lokalize-18.12.1
new file mode 100644
index 000000000000..78802c060ed7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-18.12.1
@@ -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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=app-text/hunspell-1.2.8:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 https://l10n.kde.org/tools/
+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 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 ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.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
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3785f4d43050ced536520e62098a02e1
diff --git a/metadata/md5-cache/kde-apps/lskat-18.08.3 b/metadata/md5-cache/kde-apps/lskat-18.08.3
index 419e6685572a..0bdf5102fecc 100644
--- a/metadata/md5-cache/kde-apps/lskat-18.08.3
+++ b/metadata/md5-cache/kde-apps/lskat-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/lskat-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aab2fb3e060d727a808040b97855009b
diff --git a/metadata/md5-cache/kde-apps/lskat-18.12.0 b/metadata/md5-cache/kde-apps/lskat-18.12.0
deleted file mode 100644
index fd2180d096e8..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/lskat-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a621ab7cba7ffb2eec01510fecf92ae1
diff --git a/metadata/md5-cache/kde-apps/lskat-18.12.1 b/metadata/md5-cache/kde-apps/lskat-18.12.1
new file mode 100644
index 000000000000..f44169c69b9e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=311b06ad1dbe70bad04f375ed4d53871
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.08.3 b/metadata/md5-cache/kde-apps/mailcommon-18.08.3
index c582940187fc..fcffaa487c49 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-18.08.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/mailcommon-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fd4682a0bdfa32fa7393f557ffab5e03
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.12.0 b/metadata/md5-cache/kde-apps/mailcommon-18.12.0
deleted file mode 100644
index 2fb9025009ce..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-18.12.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=kde-apps/messagelib-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailcommon:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/mailcommon-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9ee093bc173aee7b4e1b2f5117e1b3c2
diff --git a/metadata/md5-cache/kde-apps/mailcommon-18.12.1 b/metadata/md5-cache/kde-apps/mailcommon-18.12.1
new file mode 100644
index 000000000000..5e1d8d476241
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=kde-apps/messagelib-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd3b29df8985345274ea8a78cda2fe87
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.08.3 b/metadata/md5-cache/kde-apps/mailimporter-18.08.3
index 936c4b8557fc..3baa890a7da0 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-18.08.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/mailimporter-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4067dbc73b10f28b250d8d00f0781e6c
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.12.0 b/metadata/md5-cache/kde-apps/mailimporter-18.12.0
deleted file mode 100644
index e18e3ac8b67d..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/mailimporter-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8f26b51e5e21872d377327264bd3c484
diff --git a/metadata/md5-cache/kde-apps/mailimporter-18.12.1 b/metadata/md5-cache/kde-apps/mailimporter-18.12.1
new file mode 100644
index 000000000000..5fb50f427bc4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1711ec261e5d359c4b6ca8980e634127
diff --git a/metadata/md5-cache/kde-apps/marble-18.08.3 b/metadata/md5-cache/kde-apps/marble-18.08.3
index 421a45613534..9697628d192c 100644
--- a/metadata/md5-cache/kde-apps/marble-18.08.3
+++ b/metadata/md5-cache/kde-apps/marble-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/18.08
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/marble-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=63215a2270c6b721fac542ab11c93708
diff --git a/metadata/md5-cache/kde-apps/marble-18.12.0 b/metadata/md5-cache/kde-apps/marble-18.12.0
deleted file mode 100644
index 21b4ae801b31..000000000000
--- a/metadata/md5-cache/kde-apps/marble-18.12.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.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 aprs? ( >=dev-qt/qtserialport-5.11.1:5 ) dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) designer? ( >=dev-qt/designer-5.11.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.11.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +webengine test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 aprs? ( >=dev-qt/qtserialport-5.11.1:5 ) dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) designer? ( >=dev-qt/designer-5.11.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.11.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/marble:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5/18.12
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/marble-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d3f72348cf980e4846334c9a18c55eb2
diff --git a/metadata/md5-cache/kde-apps/marble-18.12.1 b/metadata/md5-cache/kde-apps/marble-18.12.1
new file mode 100644
index 000000000000..714148c0229b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 aprs? ( >=dev-qt/qtserialport-5.11.1:5 ) dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) designer? ( >=dev-qt/designer-5.11.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.11.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +webengine test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 aprs? ( >=dev-qt/qtserialport-5.11.1:5 ) dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) designer? ( >=dev-qt/designer-5.11.1:5 ) geolocation? ( >=dev-qt/qtpositioning-5.11.1:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/18.12
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/marble-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1551689aa492cde730f276ca1511e846
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.08.3 b/metadata/md5-cache/kde-apps/mbox-importer-18.08.3
index 50dc31a5a79c..bfc34028fd29 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.08.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/mailcommon-18.08.3:5 >=kde-apps/mailimporter-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/mbox-importer-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a007aeeebce16d5cbec292ebcb2014a6
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.12.0 b/metadata/md5-cache/kde-apps/mbox-importer-18.12.0
deleted file mode 100644
index dd0798e9d56e..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-18.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/mailimporter-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/mbox-importer-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5138006779f39cb07fc7ea592a317901
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-18.12.1 b/metadata/md5-cache/kde-apps/mbox-importer-18.12.1
new file mode 100644
index 000000000000..6a2032417803
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/mailimporter-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0f916f782a53506c9c25837f58c7487d
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.08.3-r2 b/metadata/md5-cache/kde-apps/messagelib-18.08.3-r2
index 4f7a5bb8f525..06217af0866b 100644
--- a/metadata/md5-cache/kde-apps/messagelib-18.08.3-r2
+++ b/metadata/md5-cache/kde-apps/messagelib-18.08.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/messagelib-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0bb0c7738869d53156cfc64e00ad342
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.12.0 b/metadata/md5-cache/kde-apps/messagelib-18.12.0
deleted file mode 100644
index e93b72ee5be6..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-18.12.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmbox-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/grantleetheme-18.12.0:5 >=kde-apps/incidenceeditor-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kdepim-apps-libs-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kldap-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmbox-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libgravatar-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/libkleo-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/messagelib:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/messagelib-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2d10166c850349dacc3338ad2ad4415c
diff --git a/metadata/md5-cache/kde-apps/messagelib-18.12.1 b/metadata/md5-cache/kde-apps/messagelib-18.12.1
new file mode 100644
index 000000000000..1b23b6dba5e4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmbox-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/grantleetheme-18.12.1:5 >=kde-apps/incidenceeditor-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kdepim-apps-libs-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kldap-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmbox-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libgravatar-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/libkleo-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=dev-libs/grantlee-5.1.0: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c0a0cc7f372701b93487533bae9f0442
diff --git a/metadata/md5-cache/kde-apps/minuet-18.08.3 b/metadata/md5-cache/kde-apps/minuet-18.08.3
index d92d2cc21f72..31706ed78bce 100644
--- a/metadata/md5-cache/kde-apps/minuet-18.08.3
+++ b/metadata/md5-cache/kde-apps/minuet-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/minuet-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3d6833e6bd7c26412f18dbf98812220c
diff --git a/metadata/md5-cache/kde-apps/minuet-18.12.0 b/metadata/md5-cache/kde-apps/minuet-18.12.0
deleted file mode 100644
index 33d88ae9e06d..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-18.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.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/minuet-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bdc41893acf844656b7b5cefd59075eb
diff --git a/metadata/md5-cache/kde-apps/minuet-18.12.1 b/metadata/md5-cache/kde-apps/minuet-18.12.1
new file mode 100644
index 000000000000..d7bed29088a0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-sound/fluidsynth virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 media-sound/fluidsynth !kde-apps/minuet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=340c7f9eca11cf3fedd615f10a5b213b
diff --git a/metadata/md5-cache/kde-apps/okular-18.08.3 b/metadata/md5-cache/kde-apps/okular-18.08.3
index 104bf1b4bf0c..420f50b4b4dd 100644
--- a/metadata/md5-cache/kde-apps/okular-18.08.3
+++ b/metadata/md5-cache/kde-apps/okular-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.52.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-18.08.3:5 >=dev-qt/qtgui-5.9.4:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.08.3:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.52.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/okular-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e282784562f32465f2c25ae369640f4
diff --git a/metadata/md5-cache/kde-apps/okular-18.12.0 b/metadata/md5-cache/kde-apps/okular-18.12.0
deleted file mode 100644
index b06d044411af..000000000000
--- a/metadata/md5-cache/kde-apps/okular-18.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.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.52.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-18.12.0:5 >=dev-qt/qtgui-5.11.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.12.0:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.52.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-18.12.0:5 >=dev-qt/qtgui-5.11.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.12.0:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.52.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/okular-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=213fb161bf1d324a26102458eb5751f6
diff --git a/metadata/md5-cache/kde-apps/okular-18.12.1 b/metadata/md5-cache/kde-apps/okular-18.12.1
new file mode 100644
index 000000000000..f161295a3683
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.52.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-18.12.1:5 >=dev-qt/qtgui-5.11.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.12.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tiff? ( media-libs/tiff:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/threadweaver-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib:= chm? ( >=kde-frameworks/khtml-5.52.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-18.12.1:5 >=dev-qt/qtgui-5.11.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-18.12.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.52.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.52.0:5 >=dev-qt/qtquickcontrols-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/okular-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=52f17b72d2b6340a139d47f882ca99a8
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.08.3 b/metadata/md5-cache/kde-apps/palapeli-18.08.3
index fa80b6c5491c..203be96b5cab 100644
--- a/metadata/md5-cache/kde-apps/palapeli-18.08.3
+++ b/metadata/md5-cache/kde-apps/palapeli-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/palapeli-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fb91468c4ff4c2eb98d56e36aa8d62b1
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.12.0 b/metadata/md5-cache/kde-apps/palapeli-18.12.0
deleted file mode 100644
index dcc0765fe876..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/palapeli-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ac133a7bdd28ccfd29a9593f79a6d345
diff --git a/metadata/md5-cache/kde-apps/palapeli-18.12.1 b/metadata/md5-cache/kde-apps/palapeli-18.12.1
new file mode 100644
index 000000000000..9bfb5b6684d2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6c24f76841e1d88e34395a19410d7431
diff --git a/metadata/md5-cache/kde-apps/parley-18.08.3 b/metadata/md5-cache/kde-apps/parley-18.08.3
index 4aef2ff60c08..d14c2b35e29b 100644
--- a/metadata/md5-cache/kde-apps/parley-18.08.3
+++ b/metadata/md5-cache/kde-apps/parley-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-18.08.3:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtwebengine-5.9.4:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/parley-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cf2abc7ba8322f2eae4634122dbefb3d
diff --git a/metadata/md5-cache/kde-apps/parley-18.12.0 b/metadata/md5-cache/kde-apps/parley-18.12.0
deleted file mode 100644
index 1deba666f43d..000000000000
--- a/metadata/md5-cache/kde-apps/parley-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/libkeduvocdocument-18.12.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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-18.12.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/parley-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4943c958272186275491f5ecf280f48d
diff --git a/metadata/md5-cache/kde-apps/parley-18.12.1 b/metadata/md5-cache/kde-apps/parley-18.12.1
new file mode 100644
index 000000000000..49137c1373a6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/libkeduvocdocument-18.12.1:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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-18.12.1:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtmultimedia-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-18.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/parley-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bb95960b60cc4cbaf87b838180ddb454
diff --git a/metadata/md5-cache/kde-apps/picmi-18.08.3 b/metadata/md5-cache/kde-apps/picmi-18.08.3
index 70ffda08a71c..736ed173242e 100644
--- a/metadata/md5-cache/kde-apps/picmi-18.08.3
+++ b/metadata/md5-cache/kde-apps/picmi-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.08.3:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/picmi-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ddce2b882783307424cfe093066ac50
diff --git a/metadata/md5-cache/kde-apps/picmi-18.12.0 b/metadata/md5-cache/kde-apps/picmi-18.12.0
deleted file mode 100644
index 15e62240b9fd..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-18.12.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/picmi-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=868338d6eb69207a98830bd093e24f3a
diff --git a/metadata/md5-cache/kde-apps/picmi-18.12.1 b/metadata/md5-cache/kde-apps/picmi-18.12.1
new file mode 100644
index 000000000000..97aad597e3bc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkdegames-18.12.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae43adea601ef087340a2a7ecbfdc2bf
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.3
index 6dc9f9349d09..287bedb5e720 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kidentitymanagement-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/kmime-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=kde-apps/mailcommon-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/pim-data-exporter-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e46cbe867332a77090c7402cb80dc5a6
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.12.0 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.12.0
deleted file mode 100644
index bb2ccc0af239..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kidentitymanagement-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/kmime-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=kde-apps/mailcommon-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/pim-data-exporter-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3e88ba7511b1cab1dba86760ce510a42
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-18.12.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-18.12.1
new file mode 100644
index 000000000000..094dddf7a13c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kidentitymanagement-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/kmime-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=kde-apps/mailcommon-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5942bd04c86a93259f29bcb14d2c53c4
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.3
index 3112f2f9ebee..9174579a51ea 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/akonadi-mime-18.08.3:5 >=kde-apps/calendarsupport-18.08.3:5 >=kde-apps/kcalcore-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kmailtransport-18.08.3:5 >=kde-apps/libksieve-18.08.3:5 >=kde-apps/pimcommon-18.08.3:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/pim-sieve-editor-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39d614811f5ca70e1b2e69a1322df16c
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.0 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.0
deleted file mode 100644
index ef4622e26ab1..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/akonadi-mime-18.12.0:5 >=kde-apps/calendarsupport-18.12.0:5 >=kde-apps/kcalcore-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kmailtransport-18.12.0:5 >=kde-apps/libksieve-18.12.0:5 >=kde-apps/pimcommon-18.12.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/pim-sieve-editor-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=08dd2d55d47bb74cfb473ea151a62abf
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.1
new file mode 100644
index 000000000000..c042b02f05ab
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/akonadi-mime-18.12.1:5 >=kde-apps/calendarsupport-18.12.1:5 >=kde-apps/kcalcore-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kmailtransport-18.12.1:5 >=kde-apps/libksieve-18.12.1:5 >=kde-apps/pimcommon-18.12.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0d2ff49ca284317db41038afa3344b75
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.08.3 b/metadata/md5-cache/kde-apps/pimcommon-18.08.3
index fb5248adc24f..f68fed8a0340 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-18.08.3
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.08.3:5 >=kde-apps/akonadi-contacts-18.08.3:5 >=kde-apps/kcontacts-18.08.3:5 >=kde-apps/kimap-18.08.3:5 >=kde-apps/kpimtextedit-18.08.3:5 >=kde-apps/libkdepim-18.08.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/pimcommon-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ef78e0c01d92382b725331e99ad03374
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.12.0 b/metadata/md5-cache/kde-apps/pimcommon-18.12.0
deleted file mode 100644
index e33c37f36e93..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-18.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.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) >=kde-frameworks/kiconthemes-5.52.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.12.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Common PIM libraries
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=share test debug designer test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.0:5 >=kde-apps/akonadi-contacts-18.12.0:5 >=kde-apps/kcontacts-18.12.0:5 >=kde-apps/kimap-18.12.0:5 >=kde-apps/kpimtextedit-18.12.0:5 >=kde-apps/libkdepim-18.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/pimcommon-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ce3c928ba19d199610e72ae018a90e94
diff --git a/metadata/md5-cache/kde-apps/pimcommon-18.12.1 b/metadata/md5-cache/kde-apps/pimcommon-18.12.1
new file mode 100644
index 000000000000..5bef7d6b3f2a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) >=kde-frameworks/kiconthemes-5.52.0:5 dev-libs/libxslt test? ( >=kde-apps/kmime-18.12.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 designer? ( >=kde-frameworks/kdesignerplugin-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Common PIM libraries
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=share test debug designer test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-18.12.1:5 >=kde-apps/akonadi-contacts-18.12.1:5 >=kde-apps/kcontacts-18.12.1:5 >=kde-apps/kimap-18.12.1:5 >=kde-apps/kpimtextedit-18.12.1:5 >=kde-apps/libkdepim-18.12.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/grantlee:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=342bca24aef8fbc1040c99e44ad3f16b
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.3
index 3ea6bfcc1cc9..17c37aac1758 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.3
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-18.08.3 >=kde-apps/ktp-approver-18.08.3 >=kde-apps/ktp-auth-handler-18.08.3 >=kde-apps/ktp-common-internals-18.08.3 >=kde-apps/ktp-contact-list-18.08.3 >=kde-apps/ktp-contact-runner-18.08.3 >=kde-apps/ktp-desktop-applets-18.08.3 >=kde-apps/ktp-filetransfer-handler-18.08.3 >=kde-apps/ktp-kded-module-18.08.3 >=kde-apps/ktp-send-file-18.08.3 >=kde-apps/ktp-text-ui-18.08.3 gstreamer? ( >=kde-apps/ktp-call-ui-18.08.3 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f9b3d164c660964b479dfdac7d39d8fd
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.0 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.0
deleted file mode 100644
index 6933863b70d6..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ktp-accounts-kcm-18.12.0:5 >=kde-apps/ktp-approver-18.12.0:5 >=kde-apps/ktp-auth-handler-18.12.0:5 >=kde-apps/ktp-common-internals-18.12.0:5 >=kde-apps/ktp-contact-list-18.12.0:5 >=kde-apps/ktp-contact-runner-18.12.0:5 >=kde-apps/ktp-desktop-applets-18.12.0:5 >=kde-apps/ktp-filetransfer-handler-18.12.0:5 >=kde-apps/ktp-kded-module-18.12.0:5 >=kde-apps/ktp-send-file-18.12.0:5 >=kde-apps/ktp-text-ui-18.12.0:5 gstreamer? ( >=kde-apps/ktp-call-ui-18.12.0:5 )
-SLOT=5
-_md5_=4c854f97a93e9f99a65a4f9cdff84060
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.1
new file mode 100644
index 000000000000..7b640a71142f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-18.12.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ktp-accounts-kcm-18.12.1:5 >=kde-apps/ktp-approver-18.12.1:5 >=kde-apps/ktp-auth-handler-18.12.1:5 >=kde-apps/ktp-common-internals-18.12.1:5 >=kde-apps/ktp-contact-list-18.12.1:5 >=kde-apps/ktp-contact-runner-18.12.1:5 >=kde-apps/ktp-desktop-applets-18.12.1:5 >=kde-apps/ktp-filetransfer-handler-18.12.1:5 >=kde-apps/ktp-kded-module-18.12.1:5 >=kde-apps/ktp-send-file-18.12.1:5 >=kde-apps/ktp-text-ui-18.12.1:5 gstreamer? ( >=kde-apps/ktp-call-ui-18.12.1:5 )
+SLOT=5
+_md5_=fde8193ee9abfa90ad8981dcc2e701b2
diff --git a/metadata/md5-cache/kde-apps/poxml-18.08.3 b/metadata/md5-cache/kde-apps/poxml-18.08.3
index c50ccf8ef476..62abd3a849a4 100644
--- a/metadata/md5-cache/kde-apps/poxml-18.08.3
+++ b/metadata/md5-cache/kde-apps/poxml-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.9.4:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/poxml-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6d87a86918777b2eba261b0e54a6be92
diff --git a/metadata/md5-cache/kde-apps/poxml-18.12.0 b/metadata/md5-cache/kde-apps/poxml-18.12.0
deleted file mode 100644
index a5592385b072..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/poxml-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fb48998d32b568189280f834cdaa939e
diff --git a/metadata/md5-cache/kde-apps/poxml-18.12.1 b/metadata/md5-cache/kde-apps/poxml-18.12.1
new file mode 100644
index 000000000000..bea01a4a3f1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.11.1:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ca1de64c17d47baa816bcbb3f9f7257f
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.08.3 b/metadata/md5-cache/kde-apps/print-manager-18.08.3
index 3b5a8f628d71..a77c5ec65f41 100644
--- a/metadata/md5-cache/kde-apps/print-manager-18.08.3
+++ b/metadata/md5-cache/kde-apps/print-manager-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/print-manager-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=406d3740a7251f797d1b61dbcc4c9fbe
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.12.0 b/metadata/md5-cache/kde-apps/print-manager-18.12.0
deleted file mode 100644
index ca87306712df..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/print-manager-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=52fdc4679d442731d7a8a73d9d0fc214
diff --git a/metadata/md5-cache/kde-apps/print-manager-18.12.1 b/metadata/md5-cache/kde-apps/print-manager-18.12.1
new file mode 100644
index 000000000000..b68b5016143f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-print/cups sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.12.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9abb5d38299e11e931df9e5841c7f375
diff --git a/metadata/md5-cache/kde-apps/rocs-18.08.3 b/metadata/md5-cache/kde-apps/rocs-18.08.3
index 4584b1b6e71d..862e0a9bc4d3 100644
--- a/metadata/md5-cache/kde-apps/rocs-18.08.3
+++ b/metadata/md5-cache/kde-apps/rocs-18.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/rocs-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a751b0fd730cd6154f192f190432853c
diff --git a/metadata/md5-cache/kde-apps/rocs-18.12.0 b/metadata/md5-cache/kde-apps/rocs-18.12.0
deleted file mode 100644
index 4720830bb970..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-18.12.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/rocs:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/rocs-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8edcff8e2fabbd0568003183089328c3
diff --git a/metadata/md5-cache/kde-apps/rocs-18.12.1 b/metadata/md5-cache/kde-apps/rocs-18.12.1
new file mode 100644
index 000000000000..90593f782fca
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-18.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5[scripttools] >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 dev-libs/grantlee:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c2a98b5c6860c1e49ac33fcf48c4d0b5
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.3
index 3a7a4ded328e..5df055ece382 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.52.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/signon-kwallet-extension-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=68496798b54cf5ce3537bd9aa64294ee
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.0 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.0
deleted file mode 100644
index fd5530e379f1..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.52.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/signon-kwallet-extension-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1eb7b2424a74826a5b694128ddb7082
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.1
new file mode 100644
index 000000000000..8a46322510c4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.52.0:5 net-libs/signond sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3d12a6b9129c359e20fd93c57dd3969d
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.08.3 b/metadata/md5-cache/kde-apps/spectacle-18.08.3
index 9b6836250209..d5dd515258fc 100644
--- a/metadata/md5-cache/kde-apps/spectacle-18.08.3
+++ b/metadata/md5-cache/kde-apps/spectacle-18.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.08.3:5= ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/spectacle-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=49679ebcf09be255a56fe87779b6dde6
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.12.0 b/metadata/md5-cache/kde-apps/spectacle-18.12.0
deleted file mode 100644
index f492036dbca4..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-18.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.12.0:5= ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.12.0:5= ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/spectacle-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=542d7834caa7b817325934c877eeef5e
diff --git a/metadata/md5-cache/kde-apps/spectacle-18.12.1 b/metadata/md5-cache/kde-apps/spectacle-18.12.1
new file mode 100644
index 000000000000..51269598c81b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.12.1:5= ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-18.12.1:5= ) share? ( >=kde-frameworks/purpose-5.52.0:5 ) kipi? ( media-plugins/kipi-plugins:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=991b82665832bf15ab06a47b98c36aab
diff --git a/metadata/md5-cache/kde-apps/step-18.08.3 b/metadata/md5-cache/kde-apps/step-18.08.3
index 4a58b5d40cf0..8db7eb9b3fd5 100644
--- a/metadata/md5-cache/kde-apps/step-18.08.3
+++ b/metadata/md5-cache/kde-apps/step-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtopengl-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/step-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cfb40739f12807e66a0f6cd3fc16016e
diff --git a/metadata/md5-cache/kde-apps/step-18.12.0 b/metadata/md5-cache/kde-apps/step-18.12.0
deleted file mode 100644
index 745b2f7f7b89..000000000000
--- a/metadata/md5-cache/kde-apps/step-18.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/step-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5de9c17fd4b0008429851e0a985b53f
diff --git a/metadata/md5-cache/kde-apps/step-18.12.1 b/metadata/md5-cache/kde-apps/step-18.12.1
new file mode 100644
index 000000000000..137e67c1b5f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kplotting-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtopengl-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/step-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=65656448879d3d3eeef3a86c84aaa13e
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.08.3 b/metadata/md5-cache/kde-apps/svgpart-18.08.3
index 69290a85ebe9..b8525d0f64f4 100644
--- a/metadata/md5-cache/kde-apps/svgpart-18.08.3
+++ b/metadata/md5-cache/kde-apps/svgpart-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/svgpart-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b571efe759bd0ee19b2d5d753dafd63a
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.12.0 b/metadata/md5-cache/kde-apps/svgpart-18.12.0
deleted file mode 100644
index 86e66add9daf..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-18.12.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/svgpart-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ae359f4c4c800fbeadec3e539b69a20c
diff --git a/metadata/md5-cache/kde-apps/svgpart-18.12.1 b/metadata/md5-cache/kde-apps/svgpart-18.12.1
new file mode 100644
index 000000000000..cc25a772145c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aea7a95304220f873255273b36c189b6
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.08.3 b/metadata/md5-cache/kde-apps/sweeper-18.08.3
index 661fb3cc028d..580430cf08a1 100644
--- a/metadata/md5-cache/kde-apps/sweeper-18.08.3
+++ b/metadata/md5-cache/kde-apps/sweeper-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/sweeper-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0e18c5f8bdf8c7ada3f4859b96b6ef6d
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.12.0 b/metadata/md5-cache/kde-apps/sweeper-18.12.0
deleted file mode 100644
index 53acbe1d0a02..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-18.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-stats-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/sweeper-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f079f2d3cab9fb4dd586c7c8dda2607
diff --git a/metadata/md5-cache/kde-apps/sweeper-18.12.1 b/metadata/md5-cache/kde-apps/sweeper-18.12.1
new file mode 100644
index 000000000000..984ee05ab86b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=db269890cd9cd2ff42040e0b146ae95a
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.08.3 b/metadata/md5-cache/kde-apps/thumbnailers-18.08.3
index a51800b0ab24..f017494d0148 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.08.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 raw? ( >=kde-apps/libkdcraw-18.08.3:5 >=kde-apps/libkexiv2-18.08.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/kdegraphics-thumbnailers-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec888e7236485da0dfbabdb1302aa8f0
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.12.0 b/metadata/md5-cache/kde-apps/thumbnailers-18.12.0
deleted file mode 100644
index 9d52b4340872..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-18.12.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 raw? ( >=kde-apps/libkdcraw-18.12.0:5 >=kde-apps/libkexiv2-18.12.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 raw? ( >=kde-apps/libkdcraw-18.12.0:5 >=kde-apps/libkexiv2-18.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/kdegraphics-thumbnailers-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1742492809b7e66dd92c287187f754e
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-18.12.1 b/metadata/md5-cache/kde-apps/thumbnailers-18.12.1
new file mode 100644
index 000000000000..5d49c3bde113
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 raw? ( >=kde-apps/libkdcraw-18.12.1:5 >=kde-apps/libkexiv2-18.12.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=dev-qt/qtgui-5.11.1:5 raw? ( >=kde-apps/libkdcraw-18.12.1:5 >=kde-apps/libkexiv2-18.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a016ba9e89ddc1eb18597b8f201aee76
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.08.3 b/metadata/md5-cache/kde-apps/umbrello-18.08.3
index b46b958629e8..a75308f00ec5 100644
--- a/metadata/md5-cache/kde-apps/umbrello-18.08.3
+++ b/metadata/md5-cache/kde-apps/umbrello-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/umbrello-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ee332cd7b31b9170d2f709cd1856ac8
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.12.0 b/metadata/md5-cache/kde-apps/umbrello-18.12.0
deleted file mode 100644
index 2ccdecefefab..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-18.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/umbrello-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=adc8dd5d5ea3bd7c7e6a2bde2a28d945
diff --git a/metadata/md5-cache/kde-apps/umbrello-18.12.1 b/metadata/md5-cache/kde-apps/umbrello-18.12.1
new file mode 100644
index 000000000000..fde7fe000267
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt >=kde-frameworks/kdelibs4support-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0add6e47534bfec093017f58f20870d
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.3
index 2e9b71682d70..5203f04d3f26 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtdbus-5.9.4:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.9.4:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/18.08.3/src/zeroconf-ioslave-18.08.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fbcd2cee63e71378c87189775115236
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.12.0 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.12.0
deleted file mode 100644
index 9abf2f1c4ea6..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/18.12.0/src/zeroconf-ioslave-18.12.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=76ca742a60616c3a7ee9fbed2b2979da
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.12.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.12.1
new file mode 100644
index 000000000000..a0a4e7f928b8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-18.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdnssd-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b72fceca5ad4e192f1720468997bf005
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 579bdbcd0f8a..8abfea9ca95d 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.52.0 b/metadata/md5-cache/kde-frameworks/attica-5.52.0
index 24e4deded53a..d066bbd193e7 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/attica-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=61cfb359a2dde1e894c1aeea175ce364
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.53.0 b/metadata/md5-cache/kde-frameworks/attica-5.53.0
index aff839bbd9c7..907dd8c6527e 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/attica-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8eaa2479c018315d9e4653e25e2b2637
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.54.0 b/metadata/md5-cache/kde-frameworks/attica-5.54.0
new file mode 100644
index 000000000000..c791bdd41cf9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/attica-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=56f672238b2d6cdfc3f509c85830b8dc
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.52.0 b/metadata/md5-cache/kde-frameworks/baloo-5.52.0
index 7f074c6cb6da..bd1d940c5526 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kd
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/baloo-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=52adbf44bbf9a87e75dc690c3c8c757c
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.53.0 b/metadata/md5-cache/kde-frameworks/baloo-5.53.0
index 4bb55e81b735..d45340060145 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kd
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/baloo-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2376a16af205432bf5c31d4ac55958ab
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.54.0 b/metadata/md5-cache/kde-frameworks/baloo-5.54.0
new file mode 100644
index 000000000000..50a6f5301292
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kfilemetadata-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kidletime-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-db/lmdb-0.9.17 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kfilemetadata-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kidletime-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/baloo-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f0f0a67258b340110aa331f19feb4bf6
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.52.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.52.0
index 5e147e23d2bf..4c6c6d950e93 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/bluez-qt-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c37978196f846d4b15683aff6106dc27
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.53.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.53.0
index a102e28e8096..c55c8514d9bc 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9620604abc192788429dfb4337d3f652
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.54.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.54.0
new file mode 100644
index 000000000000..3c45706702aa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f04e1bd9fb8a0dbe2d2dc18b14b348fc
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.52.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.52.0
index 9947e5a47dc6..5618c16ea1a2 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.52.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-3
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/breeze-icons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6cd7ab8c2dd6e5cdbf07331a51af198
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.53.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.53.0
index c772bd79c1f7..813cef7c8e90 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.53.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-3
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6200f01b112ff48e5070dea14acb334
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.54.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.54.0
new file mode 100644
index 000000000000..3639922f59b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.54.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.54:5 >=dev-qt/qtcore-5.11.1:5 test? ( >=dev-qt/qttest-5.11.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.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 ~ppc64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4fd09d6bf6fa24408b90e795deb9197d
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.52.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.52.0
index 78d20441d848..37ec9dd8a8b8 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.52.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/breeze-icons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f944ea0d92fa52c4fe664dcf3f9147c3
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.53.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.53.0
index e163533dc4b9..8ebbe1bf4de7 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.53.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8202cd5b10f2bcec3acab881b4424f58
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.54.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.54.0
new file mode 100644
index 000000000000..06aec30c738b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.54.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.54:5 >=dev-qt/qtcore-5.11.1:5 test? ( >=dev-qt/qttest-5.11.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.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.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2647b4ada438cc0efc75bd01d7615a9b
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.52.0-r1 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.52.0-r1
index dacba69284ae..e7865d0ed4fa 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.52.0-r1
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.52.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.7 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.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_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.9.4:5 >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=doc? ( || ( dev-lang/python:3.7 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.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_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(+)] ) ) >=dev-qt/qthelp-5.9.4:5 ) test? ( >=dev-qt/qtcore-5.9.4:5 >=dev-qt/linguist-tools-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/extra-cmake-modules-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f63487b79dc26c3555089d0d968871ba
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f17734938f899733b1ac2a7e59f70d20
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.53.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.53.0
index e45dde60c882..93d59ce77651 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.53.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.7 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.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_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.11.1:5 >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=doc? ( || ( dev-lang/python:3.7 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.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_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(+)] ) ) >=dev-qt/qthelp-5.11.1:5 ) test? ( >=dev-qt/qtcore-5.11.1:5 >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40a1e0db81e1f45ce73eced34ca84297
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=59fa68b936306196b6b6eb0e29efb126
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.54.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.54.0
new file mode 100644
index 000000000000..b90db475a758
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=doc? ( || ( dev-lang/python:3.7 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.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_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(+)] ) ) >=dev-qt/qthelp-5.11.1:5 ) test? ( >=dev-qt/qtcore-5.11.1:5 >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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 ~amd64-fbsd
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=59fa68b936306196b6b6eb0e29efb126
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.52.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.52.0
index f065bbd4ea8b..b328c4aee9fc 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/frameworkintegration-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83e518da5c209e1d3494c432e7f19878
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.53.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.53.0
index 1316c4c57a2d..a796d97f3e16 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=27725462914cc48577572f0264c580a2
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.54.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.54.0
new file mode 100644
index 000000000000..69b684985bf8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/knewstuff-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/knewstuff-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6aeff0645a07cb3c9a51e1b72cb4adf4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.52.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.52.0
index 467b6d7fc89b..b46e53987ec5 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.52.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kactivities-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=42385673290978b4e27ff183eb5696ca
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.53.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.53.0
index a48dcf736069..06bef9909e1b 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.53.0
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kactivities-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f129728d15f3b6072e44ad2d1b11f946
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.54.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.54.0
new file mode 100644
index 000000000000..98b66306453c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-plasma/kactivitymanagerd-5.12.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kactivities-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1c820a090eb82716ae27c04f79b46429
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.52.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.52.0
index 704758f26b5e..152565c44f11 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=kde-frameworks/kactivities-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kactivities-stats-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65b22e264e474a3c99d404c3c5e98763
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.53.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.53.0
index c617dc4e7c28..74bcdff49a4f 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-frameworks/kactivities-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8d9f99cccdf821cdc474704142cfdce
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.54.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.54.0
new file mode 100644
index 000000000000..6b4566cb70bd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-frameworks/kactivities-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=kde-frameworks/kactivities-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ceedb483f1deec3467360555028b5cfb
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.52.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.52.0
index f1b1fbfa00ca..a9cec4becb19 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kapidox-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d242fcd4fdb0323fca04464af05193f3
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.53.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.53.0
index 514de8f034a5..fdde221b2a16 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_si
 REQUIRED_USE=python_targets_python2_7
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kapidox-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6100289353f9b71ae0dbafc7ad261d8f
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.54.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.54.0
new file mode 100644
index 000000000000..b9f4660592b7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.54.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.11.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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.11.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_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kapidox-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ef77ceeaba204d3be36b67c3ad83a815
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.52.0 b/metadata/md5-cache/kde-frameworks/karchive-5.52.0
index 3c1fd09df47a..4b3ad670b0d5 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.52.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/karchive-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e57eec7a149b2e7172222ddef6fd1ec2
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.53.0 b/metadata/md5-cache/kde-frameworks/karchive-5.53.0
index 43591311fe31..7f1649f8ebc5 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.53.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/karchive-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0d47d7319200108cdc4df753b7e985d9
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.54.0 b/metadata/md5-cache/kde-frameworks/karchive-5.54.0
new file mode 100644
index 000000000000..6b976e8ee6aa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/karchive-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cbfc46117c103f28fdabfcc18b95cb1a
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.52.0 b/metadata/md5-cache/kde-frameworks/kauth-5.52.0
index ec30e254691c..c3304329540b 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.52.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kauth-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4f9e423320c8700e40315861f9e030ce
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.53.0 b/metadata/md5-cache/kde-frameworks/kauth-5.53.0
index 71d252267cd4..c9253518c09f 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.53.0
@@ -10,5 +10,5 @@ PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kauth-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c18a504d8ba98d4a1ef720b7760b8205
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.54.0 b/metadata/md5-cache/kde-frameworks/kauth-5.54.0
new file mode 100644
index 000000000000..2c06ef432f0f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kauth-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=70eda977e8f34d368843bb3e0ef4c747
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.52.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.52.0
index 45dfa85e416c..ed05c81770b1 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kbookmarks-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0efbc28e9b8fded2b473a67168b2db5
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.53.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.53.0
index c8ac208f1793..5303e55ea5b4 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0811a286f09e35006d1505b42702cc9c
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.54.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.54.0
new file mode 100644
index 000000000000..343ff831475a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kconfigwidgets-5.54:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63bc43f51760fc584baffe35767d430e
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.52.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.52.0
index 30679a7f168a..29d515485aa4 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kdeclarative-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kitemviews-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kcmutils-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=34ed22db4062ae834813d9f0048ed31b
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.53.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.53.0
index 40d1dd8422f0..1e0a0a6748bc 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kdeclarative-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kitemviews-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=98ff15c6d5d0d99e445f5e3bcbc06d83
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.54.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.54.0
new file mode 100644
index 000000000000..c016aaaf7964
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdeclarative-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdeclarative-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4dc1bbd8cede062de9a000cdbc9b0369
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.52.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.52.0
index bd54c5600346..5063883427e0 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.52.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kcodecs-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=612380367f923af6dc517f3941923610
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.53.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.53.0
index 61f00f069aba..8df1a0700041 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.53.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9eb17a5f586fcf7a3f0e3eeb519260e4
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.54.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.54.0
new file mode 100644
index 000000000000..60a0d34db218
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=576f6318ff2b2f863ef0b7633bc2bb1f
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.52.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.52.0
index 6fadf2371be2..a1ea939881e6 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.52.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kcompletion-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=110fe2dc2d229e5e5e226b87482618f7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.53.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.53.0
index 82097d90c02f..de2c5f2632f3 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.53.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f2db568f1802754dd643b3c010b0e3f4
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.54.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.54.0
new file mode 100644
index 000000000000..758ac6805bd6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3df3c4ae035d790cf5de711fc9e6098b
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.52.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.52.0
index 2c7b91a75886..87df5b542b0e 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kconfig-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c457e948730af70c71ea35b44557d05d
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.53.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.53.0
index f72a4c6fda54..45ada031f0f6 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kconfig-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2b162aaa6d57e6a6388c46168179485e
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.54.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.54.0
new file mode 100644
index 000000000000..f3c57f435d47
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) test? ( >=dev-qt/qtconcurrent-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kconfig-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=098d5e98daace858f8a7d6d123a23ef0
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.52.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.52.0
index 2048c59e0b35..71ec147cc29d 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.52:5 >=kde-frameworks/kcodecs-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kguiaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kconfigwidgets-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=faef50a00b80cb06bf5d26c599423c73
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.53.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.53.0
index 1b3e0e6c5230..83c4cff2d743 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.53:5 >=kde-frameworks/kcodecs-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kguiaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c1f78789ddf4001f8f1727d90cbff9f2
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.54.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.54.0
new file mode 100644
index 000000000000..a16a15b9a5d6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 man? ( >=kde-frameworks/kdoctools-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4d91ce5542af73676e6a5f372e1d69d1
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.52.0-r1 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.52.0-r1
index fea4cc761e0d..6b96a4061c88 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.52.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.52.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9.4:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kcoreaddons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=48defb2eac2d729c504d664c859b4a5b
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.53.1 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.53.1
index 3c791a2f8590..b9f817e5d62e 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.53.1
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.53.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtcore-5.11.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a0b6714acf67db452f0aa69922dd6d5a
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.54.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.54.0
new file mode 100644
index 000000000000..7d81b15f7432
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.11.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=478f1b72c475b69cf092d59fbb73c5a2
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.52.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.52.0
index f873985a0639..a9c9837bc59b 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kcrash-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ab570f4e7f90fd84f5af8a21382e0847
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.53.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.53.0
index 00f8b1c83afd..e63e82ad8658 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kcrash-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1770dc75834c8fec79aa3617852bdab0
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.54.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.54.0
new file mode 100644
index 000000000000..9bb8e834c21a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-base/xorg-proto nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) test? ( >=dev-qt/qtwidgets-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kcrash-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=92c2fac3a2405fb1c7327d4d7f779bf7
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.52.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.52.0
index 729f638cdd62..f4e349610418 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdbusaddons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d32dc1c5b6b0448d30193081be4554c
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.53.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.53.0
index d11ed8305fe9..e25b1cdb973d 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4201197dee6a0e19847cd2eeab108541
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.54.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.54.0
new file mode 100644
index 000000000000..089fe7ecceb5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2771546f05211733ca8ccbb021e8b94f
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.52.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.52.0
index 7e65eabc670c..d7c334652c6c 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kglobalaccel-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kpackage-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdeclarative-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b168e6e73e662b7e26a235682a851803
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.53.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.53.0
index 982075404513..d9795aadb283 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kglobalaccel-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kpackage-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eeb52a0e7f3f47320901d3e1e0a0b1ea
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.54.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.54.0
new file mode 100644
index 000000000000..c197c387316b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libepoxy sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=18fc8d747f294b195a47e60730903006
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.52.0 b/metadata/md5-cache/kde-frameworks/kded-5.52.0
index 6b5c3ec378a2..dd8e7d69400c 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kcrash-5.52:5 >=kde-frameworks/kdbusaddons-5.52:5 >=kde-frameworks/kinit-5.52:5 >=kde-frameworks/kservice-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kded-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65cd9ba0d388d9b79a1cbadf6121625e
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.53.0 b/metadata/md5-cache/kde-frameworks/kded-5.53.0
index 35f866160a35..e24ae2972252 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kcrash-5.53:5 >=kde-frameworks/kdbusaddons-5.53:5 >=kde-frameworks/kinit-5.53:5 >=kde-frameworks/kservice-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kded-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0836429d1046be54c8de182b81e85e5c
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.54.0 b/metadata/md5-cache/kde-frameworks/kded-5.54.0
new file mode 100644
index 000000000000..eeef1e9a0063
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kinit-5.54:5 >=kde-frameworks/kservice-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 man? ( >=kde-frameworks/kdoctools-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kinit-5.54:5 >=kde-frameworks/kservice-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kded-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=abcd8ff94811bbb1711497eafce00174
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.52.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.52.0
index efc32d4fe99d..45a35e96c64c 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.52:5 >=kde-frameworks/kcodecs-5.52:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/kdelibs4support-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2402b191eea9d2900edb363d5a9395e
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.53.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.53.0
index e1522a1d53ce..a8ae00892e1f 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.53:5 >=kde-frameworks/kcodecs-5.53:5 >=kde-fram
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0813f1da9da3255987089ea638a1cdfb
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.54.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.54.0
new file mode 100644
index 000000000000..85a425fbf843
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kded-5.54:5 >=kde-frameworks/kdesignerplugin-5.54:5 >=kde-frameworks/kemoticons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kunitconversion-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.54:5 >=dev-qt/designer-5.11.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.11.1:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kded-5.54:5 >=kde-frameworks/kdesignerplugin-5.54:5 >=kde-frameworks/kemoticons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kunitconversion-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.54:5 >=kde-frameworks/kinit-5.54:5 >=kde-frameworks/kitemmodels-5.54:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f8915ba57039f868d6de90a274623c21
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.52.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.52.0
index 349781f10eed..d005f31fe9a9 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 designer? ( >=dev-qt/designer-5.9.4:5 >=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kitemviews-5.52:5 >=kde-frameworks/kplotting-5.52:5 >=kde-frameworks/ktextwidgets-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=kde-frameworks/sonnet-5.52:5 ) webkit? ( >=dev-qt/designer-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=kde-frameworks/kdewebkit-5.52:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdesignerplugin-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c7852e66fc66a70abe81cb221c8ae46
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.53.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.53.0
index e45ea7f7eb4b..f22a9fe281df 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 designer? ( >=dev-qt/designer-5.11.1:5 >=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kitemviews-5.53:5 >=kde-frameworks/kplotting-5.53:5 >=kde-frameworks/ktextwidgets-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=kde-frameworks/sonnet-5.53:5 ) webkit? ( >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kdewebkit-5.53:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94975963e82e789c40d73354b856d6cc
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.54.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.54.0
new file mode 100644
index 000000000000..0443f614e128
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 designer? ( >=dev-qt/designer-5.11.1:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kplotting-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 ) webkit? ( >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kdewebkit-5.54:5 ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 designer? ( >=dev-qt/designer-5.11.1:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kplotting-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 ) webkit? ( >=dev-qt/designer-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kdewebkit-5.54:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1275758a7930401141257884998fd8f2
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.52.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.52.0
index 1ab0fe75e39e..83a7e7863102 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kpty-5.52:5 >=kde-frameworks/kservice-5.52:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdesu-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=39e4233917b52136211c4e6ad316035c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.53.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.53.0
index 19da5752754e..f66f07f9b5ea 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kpty-5.53:5 >=kde-frameworks/kservice-5.53:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdesu-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4997c8d742bf4b4b072a831177a217c6
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.54.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.54.0
new file mode 100644
index 000000000000..e9aa711f418f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kpty-5.54:5 >=kde-frameworks/kservice-5.54:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kpty-5.54:5 >=kde-frameworks/kservice-5.54:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdesu-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=700c2a48b2b6577edbbdf66860382b5c
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.52.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.52.0
index fa12f24c10c7..e3a2720c3b28 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kjobwidgets-5.52:5 >=kde-frameworks/kparts-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwallet-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdewebkit-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a62b70b33961f64fab55d954e3c3c678
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.53.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.53.0
index adc95d7f4541..40f2d0b69912 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kjobwidgets-5.53:5 >=kde-frameworks/kparts-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwallet-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a0ab6cb6b04c4b11dfa7491d4f03e3a1
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.54.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.54.0
new file mode 100644
index 000000000000..ae1dd2a14ba2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwallet-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwallet-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=651a778ca22929c4edb2ce9ed0d0d03e
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.52.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.52.0
index 9b4a26334555..72a3d43cad6e 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.9.4:5 zeroconf? ( >=dev-qt/qtdbus-5.9.4:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdnssd-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6a4842894eed001c5413b5fd2b0e95dd
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.53.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.53.0
index 0ac50b23e5fe..c1886dab037c 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.11.1:5 zeroconf? ( >=dev-qt/qtdbus-5.11.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8b0866458f6dc910fc19a9e58d7a8d0c
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.54.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.54.0
new file mode 100644
index 000000000000..af47fa39dc7f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.11.1:5 zeroconf? ( >=dev-qt/qtdbus-5.11.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 zeroconf? ( >=dev-qt/qtdbus-5.11.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b10a6e21d47adc97ae3f1106091e4f8b
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.52.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.52.0
index e27682d5f217..172264e0392c 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.52.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.52: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.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kdoctools-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0127915a0dfcc4628855558cb29e92f
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.53.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.53.0
index 4eec2ae6eb6c..ca948dde9fc8 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.53.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.53: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.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb330990a61be591b58ef91f012d260f
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.54.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.54.0
new file mode 100644
index 000000000000..35e7368ade1c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54: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 nls? ( >=kde-frameworks/ki18n-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/karchive-5.54: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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=380882c6195f7eed6bea44f460f7f35e
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.52.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.52.0
index 7a3d911c2792..0dfc2addd1db 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kemoticons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=45458ecf64b753861b0b0b7d0a464df0
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.53.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.53.0
index edc5aaffaecb..4424f212b4db 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=47514a30ec49c18a827150f0d3ccd08c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.54.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.54.0
new file mode 100644
index 000000000000..7ec7f8d156ea
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kservice-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kservice-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cbbf64efa26d4958165da913bb81f134
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.52.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.52.0
index 977a50a1844d..1a36ea801ed4 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.52.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/ki18n-5.52:5 >=dev-qt/qtxml-5.9.4:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.52:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kfilemetadata-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8007af83a67512c6aa60322af5eed7a6
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.0
deleted file mode 100644
index bc5b6d556cb8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.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.53:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.53:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.7 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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.53:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 kernel_linux libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.53:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.53:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
-SLOT=5/5.53
-SRC_URI=mirror://kde/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=809f6167283cde6f86bf49d2b2e4de2d
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.0-r1 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.0-r1
new file mode 100644
index 000000000000..3100d2c748b1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.53.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.53:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.53:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.7 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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.53:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 kernel_linux libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.53:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.53:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.53
+SRC_URI=mirror://kde/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=aa670bb2d0022549314f038b73ee1066
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.54.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.54.0
new file mode 100644
index 000000000000..cb5f687ef678
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.54:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.54:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.7 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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 kernel_linux libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.54:5 >=dev-qt/qtxml-5.11.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( >=media-video/libav-12.2:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.54:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c3932e6cf7f46cd9cddadfb88d273b8d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.52.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.52.0
index 293a6ea05f49..4a61e1053548 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kcrash-5.52:5 >=kde-frameworks/kdbusaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5[X] >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kglobalaccel-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=86fc5d71baabe372e361158d79def57d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.53.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.53.0
index afa398e79d85..568b20742271 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kcrash-5.53:5 >=kde-frameworks/kdbusaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=837c32c8443de892e6f7000ab670c6f3
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.54.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.54.0
new file mode 100644
index 000000000000..79f8f1ddaebf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=10c7bc8d14aecd65a0b75bb1b348f65d
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.52.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.52.0
index 07f55b709db6..0ad55ab47659 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kguiaddons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69ed19307483f69794b8b42f7e5653a2
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.53.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.53.0
index edb9404caeda..27b2c28c7438 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d516be6def9b7d3dc01d0fc0ba9b39ac
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.54.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.54.0
new file mode 100644
index 000000000000..890cb1773a72
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1b493c7301560fe6bc57dea5af9dfa88
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.52.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.52.0
index 1318548181de..df0b488b2801 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.9.4:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kholidays-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5353ad1136f34df24ea7c45cf4cac4a8
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.53.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.53.0
index d8c5fbbaccb0..543cd2c35e11 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.11.1:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kholidays-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8446d4837923b7ef36314ab9caafd9db
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.54.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.54.0
new file mode 100644
index 000000000000..3b3ddfba6774
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.11.1:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kholidays-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7e37cabc8b1620dca84c15072554ea04
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.52.0 b/metadata/md5-cache/kde-frameworks/khtml-5.52.0
index 8a2c3377ad38..c2b2c9e10f99 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kcodecs-5.52:5 >=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kglobalaccel-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kjobwidgets-5.52:5 >=kde-frameworks/kjs-5.52:5 >=kde-frameworks/knotifications-5.52:5 >=kde-frameworks/kparts-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/ktextwidgets-5.52:5 >=kde-frameworks/kwallet-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=kde-frameworks/sonnet-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4: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.9.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/khtml-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f64c7805e636ecc4255384d3a20f7a54
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.53.0 b/metadata/md5-cache/kde-frameworks/khtml-5.53.0
index 13919681c04d..bfaaead5fd21 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kcodecs-5.53:5 >=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kglobalaccel-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kjobwidgets-5.53:5 >=kde-frameworks/kjs-5.53:5 >=kde-frameworks/knotifications-5.53:5 >=kde-frameworks/kparts-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/ktextwidgets-5.53:5 >=kde-frameworks/kwallet-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=kde-frameworks/sonnet-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bb200bdc0c712d307e00f5038511f22a
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.54.0 b/metadata/md5-cache/kde-frameworks/khtml-5.54.0
new file mode 100644
index 000000000000..259419087e04
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kjs-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwallet-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.11.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.11.1:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kjs-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwallet-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.11.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c490297361f5839ee9df5ffcad2a0b0a
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.52.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.52.0
index dd47b2379c1d..c50b5c5840fd 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/ki18n-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7b94480ef5e78983cb83652fdee0a063
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.53.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.53.0
index 9be8873dd179..91813e2b0daa 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/ki18n-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b47c946e4e67376f694c03e9c78f87d3
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.54.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.54.0
new file mode 100644
index 000000000000..d8feb4b48e37
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.54.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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-qt/qtdeclarative-5.11.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=dev-qt/qtdeclarative-5.11.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/ki18n-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f66f036768a65a2fb7c7c3f448d294dc
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.52.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.52.0
index 9c0193e45ad1..2d1223fbe163 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kiconthemes-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f55a8b2cd77c12a511f639332d4fe320
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.53.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.53.0
index 877939f303f6..50a4fa739c5a 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-f
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5da420ed90867cb55ce4d11abd86f980
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.54.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.54.0
new file mode 100644
index 000000000000..8ec5c2de4c83
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cb89039460d691ac9016ccafa2394b8b
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.52.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.52.0
index da33769bf4fb..31fa03f9eaea 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kidletime-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c236efaf3c2cb323f137553e9d72cf5
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.53.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.53.0
index 27b631bc76b9..ce6df99e82ba 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11e
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kidletime-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=892c86314a59184fad3f3b741313c004
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.54.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.54.0
new file mode 100644
index 000000000000..e9d4dcbd2c5a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.11.1:5 x11-libs/libXScrnSaver ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.11.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kidletime-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=013f4552e94fae8163f647c94ee715a4
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.52.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.52.0
index fb7c3fd3cc93..d45b0e7eaec0 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52:5 >=dev-qt/qtgui-5.9.4:5 eps? ( >=dev-qt/qtprintsupport-5.9.4:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kimageformats-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ca9614ac85e3d70c63cfae73f575ee1c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.53.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.53.0
index 58d8399161c2..bf787fb054cb 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.53:5 >=dev-qt/qtgui-5.11.1:5 eps? ( >=dev-qt/qtprintsupport-5.11.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ea4bc54e854631ee751bd9a2052056a2
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.54.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.54.0
new file mode 100644
index 000000000000..c35c97dfe63e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=dev-qt/qtgui-5.11.1:5 eps? ( >=dev-qt/qtprintsupport-5.11.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.54:5 >=dev-qt/qtgui-5.11.1:5 eps? ( >=dev-qt/qtprintsupport-5.11.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c1a98539e5d15718cd44b199d6e2044b
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.52.0 b/metadata/md5-cache/kde-frameworks/kinit-5.52.0
index 2c58e666e07c..ba983484c472 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kcrash-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kinit-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0f2d4f9fe8c30bc5695bf4ef0656da94
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.53.0-r1 b/metadata/md5-cache/kde-frameworks/kinit-5.53.0-r1
index c92b07cadff6..508c5763362c 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.53.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.53.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kcrash-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kinit-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aa1b89f92b0b83e2ba3f2b44ce2d7ffc
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.54.0 b/metadata/md5-cache/kde-frameworks/kinit-5.54.0
new file mode 100644
index 000000000000..fc9ada0025e6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.54:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kinit-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3b8ea85bc63e66ad3baa23b8d07a92f5
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.52.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.52.0-r1
index 51d12b232436..86572d2981f2 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.52.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.52.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kauth-5.52:5 >=kde-frameworks/karchive-5.52:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kio-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c3992aa3b15f38d89da7ccad30ce040
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.53.0 b/metadata/md5-cache/kde-frameworks/kio-5.53.0
index e5aefeccab94..1ac784ccde75 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.53.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kauth-5.53:5 >=kde-frameworks/karchive-5.53:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kio-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0432531006edb151e0cff1be06344a77
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.54.0 b/metadata/md5-cache/kde-frameworks/kio-5.54.0
new file mode 100644
index 000000000000..93a0993e0f91
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.54.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kbookmarks-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5=[ssl] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.54:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=dev-qt/qtconcurrent-5.11.1:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5
+RDEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kbookmarks-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5=[ssl] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.54:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kio-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1d15fb5a91fa994ea1d673dd9adcbd7c
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.52.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.52.0
index 7a57a62a9441..35f78066ccb0 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgraph
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kirigami2-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97b7105f66fad0f6d052e7c889656f4c
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.53.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.53.0
index 848a2efb4ffa..55cb5399fd00 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgra
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6637373171cdeb7431aac03b08fc373
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.54.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.54.0
new file mode 100644
index 000000000000..b35de3422d30
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/linguist-tools-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e0ec708131dda3fe93004567d319d2a6
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.52.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.52.0
index b31d63e92f40..937bd373263b 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kitemmodels-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6c2ef00ddef49ef55395436f9f97557e
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.53.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.53.0
index 748230edebf3..a40df18c6774 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2e6b7172bc5385781d4846304dde33c0
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.54.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.54.0
new file mode 100644
index 000000000000..5f0c510d0f81
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( >=dev-qt/qtwidgets-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3781ef3cff31758b9d1559e08421ff7a
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.52.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.52.0
index 14eeeb2fb735..56722f2cff96 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kitemviews-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=248f870d2353dd4c1b870f427b0644f9
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.53.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.53.0
index 1fccf63bb62e..a4548d42dcc0 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f678ca3501cc0e52da6a0609a3849bd6
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.54.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.54.0
new file mode 100644
index 000000000000..d25a32b98d4e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=61a3bf777f7a53b9e74fa5c370080780
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.52.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.52.0
index f89c6e6a0443..f4d48db3e72b 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11extras-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kjobwidgets-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d45b84a29fe3da66ecbd1f13ee8e14f3
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.53.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.53.0
index 5f736776fa5b..478d00edf104 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0e1394745976f49df6737e1c75ef274
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.54.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.54.0
new file mode 100644
index 000000000000..81efcce57202
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2489925bbeb4102b134a757fa596c49b
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.52.0 b/metadata/md5-cache/kde-frameworks/kjs-5.52.0
index 4fa8a116535c..954519c241db 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.52.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/kjs-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9258f93700d34f210cb6ed2f646a68af
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.53.0 b/metadata/md5-cache/kde-frameworks/kjs-5.53.0
index 190cef4cccf1..e4119f8a12f9 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.53.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d15d944aa8c7e9c074ae70332d4a16ee
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.54.0 b/metadata/md5-cache/kde-frameworks/kjs-5.54.0
new file mode 100644
index 000000000000..6eaf8bbabc50
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.54.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=44ea76af61937d04677a6c1fff9a040e
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.52.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.52.0
index e7313276abee..67ab584607a8 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kjs-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/kjsembed-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c357da774d2aeacc453a0dda1900c58d
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.53.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.53.0
index 3340ad783d73..f178d9b43a13 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kjs-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=75dec70514ac5b094a285c35d1c6117b
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.54.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.54.0
new file mode 100644
index 000000000000..56aceb1242ce
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kjs-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/designer-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kjs-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ad2fe181fb6425b0cb7d0962768e77fe
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.52.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.52.0
index e66b1d59b200..85fb5af2a9cb 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.52.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/kmediaplayer-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=afe8e4239752174598a25d9af47ca6d9
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.53.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.53.0
index 3043fb8e78b8..6775ce997800 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.53.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=efb5706daa4e1fee715408be94f47a3f
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.54.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.54.0
new file mode 100644
index 000000000000..a93da26a7242
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=67e164e411553a14ed312160e599833a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.52.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.52.0
index b0b4efcec026..4373835ada3a 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.52:5 >=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kitemviews-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/ktextwidgets-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kirigami-5.52:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/knewstuff-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=743dcb813b5e1c0dc1fd0c2036f6e79a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.53.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.53.0
index c3eb55add684..b4a706d11c5e 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.53:5 >=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kitemviews-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/ktextwidgets-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kirigami-5.53:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=13b6aba08768dc7bcfa23a04d2de732a
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.54.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.54.0
new file mode 100644
index 000000000000..c382dcb8583a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kirigami-5.54:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8f0b2c9269bf95d52b595eb639f1a953
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.52.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.52.0
index c33a5f77e11b..ca1e1f9088af 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.9.4:5 ) X? ( >=dev-qt/qtx11extras-5.9.4:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/knotifications-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=699b3039719e4629cddcf4d6d68138b7
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.53.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.53.0
index 690bd4bc0c66..548992e1981f 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/knotifications-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=53f62ff074a7a74261d12728929a3b13
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.54.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.54.0
new file mode 100644
index 000000000000..f00f93a69a6f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.11.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/knotifications-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=797299ec12ac856d61825bd98e5d13bf
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.52.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.52.0
index d4a1e83223b9..1e5752436248 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kio-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/knotifyconfig-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=345fd65da73b5e59f6bf4ea5c39b4ecc
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.53.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.53.0
index dee188ae778a..ec50c9fd7524 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kio-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e70389d20b610db520fe5273b4a68456
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.54.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.54.0
new file mode 100644
index 000000000000..9c99c9e2c5a9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 phonon? ( media-libs/phonon[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0d4b51b1f809fc04201cae822a5bb107
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.52.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.52.0
index f757f622b0c5..2fe6bfe792f9 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kpackage-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f57637e9dfa2eec913c6ea81547b2012
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.53.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.53.0
index 76a9a1987960..15d1c7d297b3 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kpackage-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd1ba46da2190506deb7bb8cf20128f2
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.54.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.54.0
new file mode 100644
index 000000000000..2d0196f149f6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 man? ( >=kde-frameworks/kdoctools-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kpackage-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6ce9040206f9eb3401a9ea1ac75d2d35
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.52.0 b/metadata/md5-cache/kde-frameworks/kparts-5.52.0
index 8e2ead347dcc..2a7f28988123 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kjobwidgets-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kparts-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=97d1e5da0338009ac3d8bdba264a68f0
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.53.0 b/metadata/md5-cache/kde-frameworks/kparts-5.53.0
index 84eed8d3fccb..f649a910c44a 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kjobwidgets-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kparts-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c063e83f093c6603ecc3d169945f4b7d
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.54.0 b/metadata/md5-cache/kde-frameworks/kparts-5.54.0
new file mode 100644
index 000000000000..5eba66c35ea0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/ktextwidgets-5.54:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kparts-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2be005339f423bf7dac70592714e5348
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.52.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.52.0
index 8e3c012c0007..a1ff803193a5 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kitemviews-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kpeople-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=be501b97c3c86db5d4f267fbe68ff301
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.53.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.53.0
index 3b7ae90fd5d4..d5393d46b603 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kitemviews-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kpeople-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7a6e7cdb8f8172a4cde7572bf4a3f398
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.54.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.54.0
new file mode 100644
index 000000000000..b864e127b456
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kpeople-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5933ac3beea33c3ba644cc32776a8fc1
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.52.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.52.0
index e4d1b141a35d..4a7dc0b70e29 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kplotting-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ec2fae61897520aeca57289826379b73
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.53.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.53.0
index 09b3b76d4b6d..cb205abec992 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kplotting-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=79c4af6c44ef03f54427354111e103c7
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.54.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.54.0
new file mode 100644
index 000000000000..987bdedb877b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kplotting-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1a6d945b3c29c7b7390654c23c35beb8
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.52.0 b/metadata/md5-cache/kde-frameworks/kpty-5.52.0
index d52a0b3389fc..4c319aa5ec03 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kpty-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cb635835fa9eb4687d7e6dc1ae14c79e
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.53.0 b/metadata/md5-cache/kde-frameworks/kpty-5.53.0
index ee26981bbd81..56d7bb6d779c 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kpty-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1fe4c8b718fe880462594f5cfdc944e
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.54.0 b/metadata/md5-cache/kde-frameworks/kpty-5.54.0
new file mode 100644
index 000000000000..289ee5339b79
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 sys-libs/libutempter sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/ki18n-5.54:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kpty-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3d35676bb1cea201b65fbc5cd720e7bf
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.52.0 b/metadata/md5-cache/kde-frameworks/kross-5.52.0
index 0337a4e7a0f6..b10262f7019b 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kparts-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kxmlgui-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtscript-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/portingAids/kross-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f292ec9b2a772e55bb0701d15afd7c3c
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.53.0 b/metadata/md5-cache/kde-frameworks/kross-5.53.0
index 94c769a4ece2..cd8b69f43218 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kparts-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kxmlgui-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b29fc092eb0d62907ae6472b7768de28
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.54.0 b/metadata/md5-cache/kde-frameworks/kross-5.54.0
new file mode 100644
index 000000000000..98a3c6c8d0e1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/designer-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3e22b5f90d4e4ff665b6863989bfd466
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.52.0 b/metadata/md5-cache/kde-frameworks/krunner-5.52.0
index 5107ae48a713..4e28777bfa62 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kio-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/plasma-5.52:5 >=kde-frameworks/solid-5.52:5 >=kde-frameworks/threadweaver-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/krunner-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed619a05c8b3c8bcee2eb35b94e19a6a
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.53.0 b/metadata/md5-cache/kde-frameworks/krunner-5.53.0
index 91500e29b29d..33e806392d18 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kio-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/plasma-5.53:5 >=kde-frameworks/solid-5.53:5 >=kde-frameworks/threadweaver-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/krunner-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=db9d6a663cbb1c8c3af500a5e8e00895
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.54.0 b/metadata/md5-cache/kde-frameworks/krunner-5.54.0
new file mode 100644
index 000000000000..bb068a9b8a49
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/plasma-5.54:5 >=kde-frameworks/solid-5.54:5 >=kde-frameworks/threadweaver-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/plasma-5.54:5 >=kde-frameworks/solid-5.54:5 >=kde-frameworks/threadweaver-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/krunner-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ba5faf17efa8a950263e23f1f6a7c842
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.52.0 b/metadata/md5-cache/kde-frameworks/kservice-5.52.0
index 5c612d5a1686..721a8d9befdb 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kd
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kservice-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=85d955d7c63446866fb366a5bcf377f7
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.53.0 b/metadata/md5-cache/kde-frameworks/kservice-5.53.0
index f22bae6df0fb..406cc2edfa45 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kd
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kservice-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=09975be7cb9f44871238ddafac810f2a
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.54.0 b/metadata/md5-cache/kde-frameworks/kservice-5.54.0
new file mode 100644
index 000000000000..56037f333b7b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.54:5 ) test? ( >=dev-qt/qtconcurrent-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kservice-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0ec786ced0fb8d8f8d38ac73aabe07a5
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.52.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.52.0
index e199f24bdf6c..1f8917de817b 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52:5 >=kde-frameworks/kauth-5.52:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/ktexteditor-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=aed3a9b72a7437e77f6ae9b19f477119
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.53.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.53.0
index 46d62d4a13bc..11397d17c8ac 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.53:5 >=kde-frameworks/kauth-5.53:5 >=kde-fra
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=097d1c4488d46d2ec863bf66b03df433
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.54.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.54.0
new file mode 100644
index 000000000000..7c995c42c1b4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=kde-frameworks/syntax-highlighting-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( >=kde-frameworks/kservice-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kauth-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/kparts-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=kde-frameworks/syntax-highlighting-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9bbc2cb20e6fabe759ee8b46777c5a10
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.52.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.52.0
index 07ddeecd2803..bf6bfa490973 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.52:5 >=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=kde-frameworks/sonnet-5.52:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/ktextwidgets-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8c8c5811d14e0ba553986be31678d735
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.53.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.53.0
index 212dcb2ee426..427fb8282ffb 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.53:5 >=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=kde-frameworks/sonnet-5.53:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6fabad070d346f56432eb25333080d5d
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.54.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.54.0
new file mode 100644
index 000000000000..9a6165a8834e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/sonnet-5.54:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 speech? ( >=dev-qt/qtspeech-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8949875165ecab7664ad807574398e72
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.52.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.52.0
index c90ef54a0118..a5159839a9ad 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.52:5 >=dev-qt/qtnetwork-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kunitconversion-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=08fd68ecb16d38ae8df6738f8a245440
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.53.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.53.0
index 4a7969ebf86f..c6f6150a9baa 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.53:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f07e965ef526a2d97bea58899350dbd
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.54.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.54.0
new file mode 100644
index 000000000000..f742384cc186
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.54:5 >=dev-qt/qtnetwork-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=dev-qt/qtnetwork-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=268f087441583f1925a25e58b59e3c61
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.52.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.52.0
index 6c947fcc0cb9..5c809c4952b2 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kdbusaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/knotifications-5.52:5 >=kde-frameworks/kservice-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kwallet-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd834142ef7f34c421fc4f580ce1e8e8
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.53.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.53.0
index 2646fc335cf9..d97245362a1d 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kdbusaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/knotifications-5.53:5 >=kde-frameworks/kservice-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kwallet-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa843abe470192f37ab9237dd0d463dc
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.54.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.54.0
new file mode 100644
index 000000000000..e3fa2029753d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kwallet-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b24de227af0f80b48cd61a2e908bd53e
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.52.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.52.0
index ec1bed12435c..533286e66d7f 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5[egl] >=dev-libs/way
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kwayland-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8887ad6b2d77b51cc2fc4f8b5f6cfb59
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.53.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.53.0
index b12e5a7ece1f..ca7102107030 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[egl] >=dev-libs/w
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kwayland-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=dd2723ac63a6febc4008c0d90f087e4c
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.54.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.54.0
new file mode 100644
index 000000000000..b7501d8f9298
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtgui-5.11.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.11.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kwayland-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=33b68c1c101e0d195d3d406ec10386ca
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.52.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.52.0
index d4530001af62..8b15ed1ebd3f 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kwidgetsaddons-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cc04caba7eac2a1d8dfdf390716c5b9
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.53.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.53.0
index 2cc4c2f179b2..103c8be0e5d1 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d0bb3c925152d79554ae51d8147cce52
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0
new file mode 100644
index 000000000000..adde8a022f0d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=417da7eac739ab660ff678f35a7b676c
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.52.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.52.0
index 1635fb357f9e..76c4149a080a 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 X? ( >=dev-qt/qtx11ext
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kwindowsystem-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c971f57aa8ace80bd57c8ad9505183f6
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.53.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.53.0
index 19667321feb7..692c57daef62 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11e
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ccb981e945cf209d808f5540e962a8ab
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.54.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.54.0
new file mode 100644
index 000000000000..e2c004dd2eaf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7f625593bff2aa033b358e5dc0332593
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.52.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.52.0
index 93fbd7d1ab02..1e7d01c1fc11 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52:5 >=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/kglobalaccel-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kitemviews-5.52:5 >=kde-frameworks/ktextwidgets-5.52:5 >=kde-frameworks/kwidgetsaddons-5.52:5 >=kde-frameworks/kwindowsystem-5.52:5 >=dev-qt/qtcore-5.9.4:5= >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 attica? ( >=kde-frameworks/attica-5.52:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kxmlgui-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=bcd89f3488df5cc3d80de05505d2a042
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.53.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.53.0
index 3a4da4c8309c..b2d1f8a04a50 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.53:5 >=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/kglobalaccel-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kitemviews-5.53:5 >=kde-frameworks/ktextwidgets-5.53:5 >=kde-frameworks/kwidgetsaddons-5.53:5 >=kde-frameworks/kwindowsystem-5.53:5 >=dev-qt/qtcore-5.11.1:5= >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 attica? ( >=kde-frameworks/attica-5.53:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=656c7f252593bf703cf05a7be3f4cbd9
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0
new file mode 100644
index 000000000000..124135630495
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtcore-5.11.1:5= >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 attica? ( >=kde-frameworks/attica-5.54:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=dev-qt/qtcore-5.11.1:5= >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 attica? ( >=kde-frameworks/attica-5.54:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=72c06ac7dd64caad57f89dad3b6708b4
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.52.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.52.0
index 00682706f226..d833018d9713 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.52.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-frameworks/kio-5.52:5 >=dev-qt/qtxml-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/kxmlrpcclient-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6d0a77273d94b9c255dddfb4a6116de
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.53.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.53.0
index 3e6b67647303..3868a5d3133c 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.53.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-frameworks/kio-5.53:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96056b6cc40ae1c2a8a6d224970c9d84
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.54.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.54.0
new file mode 100644
index 000000000000..8ad7fba15036
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtxml-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3ecbd49ff111f44130e2bc2dbcccf1a2
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.52.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.52.0
index 39693e9a4a9c..bedc5aeb0dea 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 net-misc/modemmanager >=k
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/modemmanager-qt-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9eadc8ddf1a7bfc9ab146665a39f252f
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.53.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.53.0
index 8fe4c006f0cf..c99849576d49 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-misc/modemmanager >
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5c525a7fd0b231bf4488f28d19b85179
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.54.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.54.0
new file mode 100644
index 000000000000..e7444b4e092f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-misc/modemmanager virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtxml-5.11.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=834d06b4315b1d9981a73854d5c5a6f4
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.52.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.52.0
index c821d62feb45..608569f38ae6 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtnetwork-5.9.4: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.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/networkmanager-qt-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fcc1b2d1183d0691afa239c5b670467e
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.53.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.53.0
index 237338b8d845..5a4a66b33117 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=net-misc/networkmanager-1.10.0[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96cde0c167d1a5febc3bed2143e8cea5
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.54.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.54.0
new file mode 100644
index 000000000000..6aaeaadfb396
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] !net-libs/libnm-qt:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6843e82ff38d6583265844547acf7f21
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.52.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.52.0
index b6c701e1ec80..4a87ef95ca0c 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/oxygen-icons5-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f658227f44d58a074d36ab947fcee345
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.53.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.53.0
index 3bb290fe0366..d0f5089eee5a 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=69018f9197a81921458af12e06b340cf
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.54.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.54.0
new file mode 100644
index 000000000000..be8fb00534ef
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.54.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.54:5 >=dev-qt/qtcore-5.11.1:5 test? ( >=dev-qt/qttest-5.11.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.11.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.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b963feee3ea96fc57d51c951a5698684
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.52.0 b/metadata/md5-cache/kde-frameworks/plasma-5.52.0
index bff5d72fecf3..6bf115261f2c 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.52:5 >=kde-frameworks/karchive-5.52:5 >=k
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/plasma-framework-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1868e34996c69ba0235afb9f57256237
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.53.0 b/metadata/md5-cache/kde-frameworks/plasma-5.53.0
index 6001acccf2fe..e30b8391bf2e 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.53:5 >=kde-frameworks/karchive-5.53:5 >=k
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=00c134fc2939c4a6898edbd88bdf1439
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.54.0 b/metadata/md5-cache/kde-frameworks/plasma-5.54.0
new file mode 100644
index 000000000000..6e92dde8c010
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdeclarative-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kirigami-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.54:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.54:5 X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kdeclarative-5.54:5 >=kde-frameworks/kglobalaccel-5.54:5 >=kde-frameworks/kguiaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kio-5.54:5 >=kde-frameworks/kirigami-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kpackage-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[gles2=] >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.54:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4a6d16a1e5cd9089a16fadec5bcbf688
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.52.0 b/metadata/md5-cache/kde-frameworks/prison-5.52.0
index 9b61f4d98aa4..232e3ce5d280 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.52.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/prison-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=af22358c6454441abd0590bc2b8ffec8
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.53.0 b/metadata/md5-cache/kde-frameworks/prison-5.53.0
index 09bc0bc381a2..f48522c11c2b 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.53.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/prison-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=368e5ab917a3dfcfa7e8973b7d80defd
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.54.0 b/metadata/md5-cache/kde-frameworks/prison-5.54.0
new file mode 100644
index 000000000000..fbca4b791d96
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.11.1:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/prison-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bae10965a08612f94a073175ca7bb7d4
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.52.0 b/metadata/md5-cache/kde-frameworks/purpose-5.52.0
index c583fa13c224..a87fa3d65f60 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.52.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52:5 >=kde-frameworks/ki18n-5.52:5 >=kde-
 RESTRICT=test
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/purpose-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5366ecf3f5acc56636a96fb9b6bedd5e
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.53.0 b/metadata/md5-cache/kde-frameworks/purpose-5.53.0
index 33177ee974ac..317ef9d91b08 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.53.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.53:5 >=kde-frameworks/ki18n-5.53:5 >=kde-
 RESTRICT=test
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/purpose-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f50e40871ea8765f9875effb067a7d5
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.54.0 b/metadata/md5-cache/kde-frameworks/purpose-5.54.0
new file mode 100644
index 000000000000..5453fa36b836
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.54.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.08.3:5 net-libs/accounts-qt ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kio-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.08.3:5 net-libs/accounts-qt ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/purpose-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8468dd9b404c2a1f82c03aa819824258
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.52.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.52.0
index 1808892e34d2..a4948d5fa143 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.52.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52:5 >=kde-frameworks/kiconthemes-5.52:5 >=kde-frameworks/kirigami-5.52:5 >=dev-qt/qtdeclarative-5.9.4:5= >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtgraphicaleffects-5.9.4:5 >=dev-qt/qtquickcontrols2-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/qqc2-desktop-style-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7463a822f3b0be7c01d39b9cd446db44
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.53.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.53.0
index 14eb6be40d2a..6696172f444a 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.53.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-3+ )
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.53:5 >=kde-frameworks/kiconthemes-5.53:5 >=kde-frameworks/kirigami-5.53:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ee6ae5981312f168d01b523ef58edd20
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.54.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.54.0
new file mode 100644
index 000000000000..c6a671770388
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kirigami-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kirigami-5.54:5 >=dev-qt/qtdeclarative-5.11.1:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=611b5c10fa7df0835824db3376d8d731
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.52.0 b/metadata/md5-cache/kde-frameworks/solid-5.52.0
index 8123ab0732b7..4325985cf288 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/solid-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7c380571bfc6f76d5673100b7a67b83d
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.53.0 b/metadata/md5-cache/kde-frameworks/solid-5.53.0
index 24761cb5756f..a83badff94ef 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/solid-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9e311cd2439e4e03270d1b692c7563c
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.54.0 b/metadata/md5-cache/kde-frameworks/solid-5.54.0
new file mode 100644
index 000000000000..aae289be41bb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) test? ( >=dev-qt/qtconcurrent-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/solid-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a1977bda3330f9fdf2587f328b05d07f
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.52.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.52.0
index 637b360bf08f..5ef03c982c06 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/sonnet-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4339118eab597b1cd4b0836d556c9e96
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.53.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.53.0
index 204d0cd4d277..40de8c287a42 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/sonnet-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b19fc5dc93002d5706752fc34f2e8359
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.54.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.54.0
new file mode 100644
index 000000000000..41bc313019e3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/sonnet-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3e39e5bcdc61bf677d3ff25c40ee819b
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.52.0 b/metadata/md5-cache/kde-frameworks/syndication-5.52.0
index 4b2d2b9d1447..36cf21cce0e3 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.52:5 >=dev-qt/qtxml-5.9.4:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/syndication-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=55dc8b3b12db3279af0aea8890b55cba
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.53.0 b/metadata/md5-cache/kde-frameworks/syndication-5.53.0
index 31d9bb07f3b1..bb75cf60cc8d 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.53:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/syndication-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c266743dd42283266661aef8993ea1c5
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.54.0 b/metadata/md5-cache/kde-frameworks/syndication-5.54.0
new file mode 100644
index 000000000000..0ee830cc80bf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.54:5 >=dev-qt/qtxml-5.11.1:5 test? ( >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.54:5 >=dev-qt/qtxml-5.11.1:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/syndication-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ae00aa426792ad4c15863aeb73973c61
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.52.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.52.0
index fffa9ede2436..45c25372a212 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/syntax-highlighting-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d01d3961fe87882ea21fa26b2c85ccbb
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.53.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.53.0
index 7f8685efc6e4..c279bc4bfcfa 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18cb61996279b6d7496657de55f83c88
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.54.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.54.0
new file mode 100644
index 000000000000..5693b31cc91d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.54.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a0b3554606797a559a3a5f5e611b0866
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.52.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.52.0
index 85b058787fe4..12984fd06965 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.52.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.52.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5 doc? ( >=dev-qt/qt-docs-5.9.4:5 )
 SLOT=5/5.52
 SRC_URI=mirror://kde/stable/frameworks/5.52/threadweaver-5.52.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=994bcff139c4bcb69047df0c51fb12c9
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.53.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.53.0
index 38cc6132efd8..c25fa05079e1 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.53.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.53.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.53:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 SLOT=5/5.53
 SRC_URI=mirror://kde/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9a3e71c6bbb866186bbdc79500a6d2b2
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.54.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.54.0
new file mode 100644
index 000000000000..3bed10cfd524
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.54.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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.54:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+SLOT=5/5.54
+SRC_URI=mirror://kde/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=393fcf5d2ced7a6d6e4554ccf8a538b3
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index b9b3263addf5..ab09bf2b859f 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/basket-2.49a_p20170225-r1 b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
index fd60cc7f0013..86cfbc1f5741 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/8de0345d99f3eb08d9406bd07e88b31afe46f315.tar.gz -> basket-2.49a_p20170225.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b8982d4e29d534e36286aeefe1164d73
diff --git a/metadata/md5-cache/kde-misc/basket-2.49a_p20181205 b/metadata/md5-cache/kde-misc/basket-2.49a_p20181205
index 7fffd0263026..ef505fc24ac0 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49a_p20181205
+++ b/metadata/md5-cache/kde-misc/basket-2.49a_p20181205
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 crypt? ( app-crypt/gpgme:= ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/60e38c6028e42efdaf042212097a34044c724a57.tar.gz -> basket-2.49a_p20181205.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cc60f7048710a5dc96dffbb1c30dd134
diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
index 18dde8a2d48a..6ef8818631bb 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.12.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2fd46f95b05b884bfae4ec67f75a982a
diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1
index a41bcc0ca4e5..62729f81d5b7 100644
--- a/metadata/md5-cache/kde-misc/gmailfeed-1.1
+++ b/metadata/md5-cache/kde-misc/gmailfeed-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[xml] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d77da5f98b14f5fc04066adf9edb000d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.3 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.3
index ba7cc6e29957..43e3a42bf353 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.3
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.3.3/src/kdeconnect-kde-1.3.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c266fc0e4fcd07b4d536194dba68808b
diff --git a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1 b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
index 67e79fa4a5c0..89c632afd1e5 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kdiff3-0.9.98_p20170219.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9d1f7176d2822696bc90adda083530ae
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.3 b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
index c8b10b4a394d..44c0b0956d75 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.3
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.3.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0fe247d1b7bc6ce9f946a58d58fbf2e2
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 2a7c2b4b2a20..2c83f0fc53b7 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.91
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.91
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 app-i18n/ibus dev-libs/glib:2 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.52.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466629206/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=377c8497e26837ca5966326ca75c39a9
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.5 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.5
index 5deb1a3511ad..30a3a23541a3 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.5
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-apps/libkgapi-18.08.3:5 >=dev-qt/qtwidgets-5.11.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-18.08.3:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-18.08.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.5/src/kio-gdrive-1.2.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cca8b0c270b28cad15a8c66c98a78de3
diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
index 9a6de00a8727..8f12a5301c12 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 !kde-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1f3b37bbdc9039ad1700326e33dd763a
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
index 8d9c3d6047ba..7fe40e8ecf5f 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4d37fb33026958d67b43584597c64b1c
diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0 b/metadata/md5-cache/kde-misc/kio-stash-1.0
index f14e36a785b0..48955134f0bb 100644
--- a/metadata/md5-cache/kde-misc/kio-stash-1.0
+++ b/metadata/md5-cache/kde-misc/kio-stash-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=babeb3280ff120275ff295b43295384d
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
index 45927f4f0dd2..87eef9597123 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.3
@@ -9,5 +9,5 @@ LICENSE=!webkit? ( BSD ) LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.3/src/kmarkdownwebview-0.5.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=19c26b2efccd46574cdfe509dd9a542d
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
index f046f10ecdf3..9565cb061251 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7b719c4eec81f3b6638bddbe90337b1
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0 b/metadata/md5-cache/kde-misc/krename-5.0.0
index bbbecdc4229b..cf85686dc5d0 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ca89b639c2f9332f18ad08638cdd51e
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0-r1 b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
index ee98b2b3c3f9..295997514f4a 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0-r1
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.53.0:5 >=kde-frameworks/kconfig-5.53.0:5 >=kde-frameworks/kcoreaddons-5.53.0:5 >=kde-frameworks/kcrash-5.53.0:5 >=kde-frameworks/ki18n-5.53.0:5 >=kde-frameworks/kiconthemes-5.53.0:5 >=kde-frameworks/kio-5.53.0:5 >=kde-frameworks/kitemviews-5.53.0:5 >=kde-frameworks/kjobwidgets-5.53.0:5 >=kde-frameworks/kjs-5.53.0:5 >=kde-frameworks/kservice-5.53.0:5 >=kde-frameworks/kwidgetsaddons-5.53.0:5 >=kde-frameworks/kxmlgui-5.53.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.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.53.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e5c999fc95533a69b6a75dcbd69a8f4e
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.1 b/metadata/md5-cache/kde-misc/krusader-2.7.1
index 209354f48665..60e18869189b 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.7.1
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-18.08.3:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.7.1/krusader-2.7.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed0393454ea9664088112753d6d933a1
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.2 b/metadata/md5-cache/kde-misc/kshutdown-4.2
index e234986b4fc7..5161530589a0 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.2
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.2.zip
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f0dbe65a0dba747c0566dc800e17ed99
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index 887997bcdbc6..4016639637e1 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-libs/libmnl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f3160e06ab2b4c691fa14292bb09fa15
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
index e8029011a319..255735bc6b64 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20180406
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdewebkit-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kwebkitpart/archive/ed6b8c87fabeb563109a093c1f79eeb03867b053.tar.gz -> kwebkitpart-1.4.0_pre20180406.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b4b0a94022d326177db6482488df1e9f
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.2 b/metadata/md5-cache/kde-misc/latte-dock-0.8.2
index 8c8d0ee19336..6dce840f0a4a 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.2
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=5f806e525f443db15f68715b7b12ccf8
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.3 b/metadata/md5-cache/kde-misc/latte-dock-0.8.3
index 53ed705f285b..a817311e13dc 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.3
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a224b1b6903afeb0575b5c841854a71
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.8.4 b/metadata/md5-cache/kde-misc/latte-dock-0.8.4
index 94bb1abf3e73..f24e96d9428d 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.8.4
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.8.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/karchive-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kcrash-5.52.0 >=kde-frameworks/kdbusaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/knewstuff-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kpackage-5.52.0 >=kde-frameworks/kwayland-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0[X] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtgui-5.11.1:5[xcb] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.8.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1a224b1b6903afeb0575b5c841854a71
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
index 9e485d41e12e..4500c9aaefe7 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=64aea936676d9345c4c9bd0c9c284420
diff --git a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3 b/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
index be7a3d158de5..c85b26117e94 100644
--- a/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-active-window-control-1.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5[X] >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-active-window-control/archive/v1.7.3.tar.gz -> plasma-active-window-control-1.7.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=95bcfabf50a8d1f81713d6360e412ab8
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
index c0821a628647..30ea71e6b412 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
+++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=6ba449d9805823486baca5cdc2923d26
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
index d14307fab386..2d490fdc25b5 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
+++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[xml] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.10.tar.gz -> plasma-applet-weather-widget-1.6.10.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b1329fd6b2c797c242c1ae8f62a2ae77
diff --git a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18 b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
index 5b803483cabf..7168974b94c0 100644
--- a/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
+++ b/metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.52.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-redshift-control/archive/v1.0.18.tar.gz -> plasma-applet-redshift-control-1.0.18.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=83338fbd56f7d908ed4098af0d8908cb
diff --git a/metadata/md5-cache/kde-misc/playbar2-2.5 b/metadata/md5-cache/kde-misc/playbar2-2.5
index 2f116b262925..9832990db943 100644
--- a/metadata/md5-cache/kde-misc/playbar2-2.5
+++ b/metadata/md5-cache/kde-misc/playbar2-2.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kconfigwidgets-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kdoctools-5.52.0 >=kde-frameworks/kglobalaccel-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kwindowsystem-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=kde-frameworks/plasma-5.52.0 >=dev-qt/qtcore-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5
 SLOT=0
 SRC_URI=https://github.com/audoban/PlayBar2/archive/v2.5.tar.gz -> playbar2-2.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81026cba98434a3ab9adb283c3d9e6ae
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.8 b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
index e9ccb1693a92..e3b66855342b 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.8
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/frameworkintegration-5.52.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.8.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9fbfa31036a248ab824cbea87fda964
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.9 b/metadata/md5-cache/kde-misc/rsibreak-0.12.9
index f61edf5290a9..148546519d4b 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.9
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/frameworkintegration-5.52.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.9.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4677958f07bfe464cb80c23269c06cc2
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
index 6b685620b385..5f96c6ae7b77 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.1.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libksane-18.08.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.1/skanlite-2.1.0.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=15f11a9cbc29f2e9e6a52e991fa0973c
diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
index bb360f7e698a..1bce68968d37 100644
--- a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
+++ b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=3aadcf4ec2190f0d3da95e229e382cca
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.3 b/metadata/md5-cache/kde-misc/tellico-3.1.3
index 80af61a3c555..ecad843dffef 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1.3
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=014f3670a91c0c76c51977ad92b5d9b4
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1.4 b/metadata/md5-cache/kde-misc/tellico-3.1.4
index 8456bf5c0ae5..f8954b1e7d2a 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1.4
+++ b/metadata/md5-cache/kde-misc/tellico-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7ddda836869dd1c76879f3c257dc4d92
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
index 3d209e9f5478..192c7b7ee41b 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/wacomtablet/3.1.0/wacomtablet-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fa7b1dc0f5f01abd6c83b77c0f48ec09
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
index b30e6490237b..0ed698f79dbf 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/wacomtablet/3.1.1/wacomtablet-3.1.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a3c9e3da0ad85ac5035e1d49e9036f4f
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.5 b/metadata/md5-cache/kde-misc/yakuake-3.0.5
index 6ed1c297844b..2ee8b6329fdc 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/konsole-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9c2079b7dc18d7e96e668dd51e9c2027
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1 b/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
index 7e8a6e185af2..8e49b871edef 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/konsole-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 absolute-position? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/yakuake-3.0.5-patches.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9667b6accea6434c765adb21294d730f
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.0 b/metadata/md5-cache/kde-misc/zanshin-0.5.0
index 022d44e0414f..0c4c40f65861 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.0
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.0
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f4a30809cd69d11747b27212f703598
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 6d6447f93e9a..146c35b60765 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.14.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.3
index 96dd07085478..8c22852d6c57 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.14.3
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.14.3:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/bluedevil-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=fdc821b6e611d7391692f142471a4700
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.14.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.4
deleted file mode 100644
index 18c56134b4c4..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.14.4
+++ /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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.14.4:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/bluedevil-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2ef9ad17a6c2125555e663f78dc41419
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.14.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.14.5
new file mode 100644
index 000000000000..35ee3b8104e2
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.14.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/bluedevil-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ff32b6dc71024a0e06d735a85dd6bd97
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-5.14.3
index 32affe49bdde..7a5352350712 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.14.3
+++ b/metadata/md5-cache/kde-plasma/breeze-5.14.3
@@ -10,5 +10,5 @@ PDEPEND=>=kde-frameworks/breeze-icons-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.3
 RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=65cf6af6024f01d3209f527bf0995e58
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.4 b/metadata/md5-cache/kde-plasma/breeze-5.14.4
deleted file mode 100644
index 8ae5b9be1883..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=wayland X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.4:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/breeze-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0897a37d05e07f18a352830eccfd020a
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-5.14.5
new file mode 100644
index 000000000000..93644fa813d9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.5:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=902f2a9b1871b976a0e49e18199689bf
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3
index 12d989eead2d..f4a4322d81eb 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-grub-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0eade5c4f90f4589cf675f124323039
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.4 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.4
deleted file mode 100644
index 7cb7b0946ca6..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.4
+++ /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.9.6 >=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.14.4/breeze-grub-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2843877d873fbe10977506d4b1b641af
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5
new file mode 100644
index 000000000000..77db9dfe792a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.14.5
@@ -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.9.6 >=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.14.5/breeze-grub-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1e39b0f0806f8f259b80fd80ec4e9ac0
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3
index 0bb9526b398d..d862fff35e3d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-gtk-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=567dd53c5b6e5818fe8028b2f8de28a9
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.4
deleted file mode 100644
index b02059545bd6..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.4
+++ /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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/breeze-gtk-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=65175df20adedd3db395a796d40bd0dd
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
new file mode 100644
index 000000000000..754158b81288
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
@@ -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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/breeze-gtk-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d4920207c925919c08bb2aae58447022
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3
index 3a997bc71464..3e1026faf148 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/breeze-plymouth-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=92f1a7ab28c1c2c252b358457b87d757
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.4 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.4
deleted file mode 100644
index 12a1d5041ea8..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.4
+++ /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.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.14.4/breeze-plymouth-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d102931c9f4e4795da06b19287a087d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5
new file mode 100644
index 000000000000..cd57ce99cfb0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.14.5
@@ -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.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.14.5/breeze-plymouth-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f2d2bbdd03218beae2a47dcba0b9062c
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.3
index b319b5cd88cf..5ffbe3cd6256 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.14.3
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/drkonqi-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=30ff2ee3f3f6858390e8465a45db526b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.4 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.4
deleted file mode 100644
index 006d2f34a374..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/drkonqi-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=89bd870e1df9ea5dd1e7d719ff0a1529
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.14.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.14.5
new file mode 100644
index 000000000000..ca29917aea6f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlrpcclient-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/drkonqi-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4e6f29d6e03b8b3085d7941631e08eb3
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3
index a31698e7ef46..a2f165be4664 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kactivitymanagerd-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=43a2537f951274ea25b6ebcf6c27bea9
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.4 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.4
deleted file mode 100644
index dee03b3feaac..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kactivitymanagerd-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b8cc09e9a044dd8b8207385fec579691
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5
new file mode 100644
index 000000000000..ad21acd953a7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kactivitymanagerd-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3d25e1581bd9a2b29f12ae26c9d3fddf
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3
index e6b5ca340496..aacc6ae6a5cc 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kde-cli-tools-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d59e73fe30cc1c1312c5446e80a983a
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.4
deleted file mode 100644
index 2dc3ef8eae5d..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kde-cli-tools-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f74d12e4c1b5579480e68eaf668d3a4
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5
new file mode 100644
index 000000000000..eba94933651a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kde-cli-tools-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b34a2725178e21db64801119146a4d0f
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3
index 03b776f86dc5..976a93189ed4 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.14.3:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kde-gtk-config-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8d3581bc4127a9a3e65a23e56beca8b1
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.4 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.4
deleted file mode 100644
index b01806d422fc..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.14.4:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kde-gtk-config-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a91d3e260e0d8f0ec5c728efbdd3714e
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5
new file mode 100644
index 000000000000..fe4a45731392
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.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.14.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kde-gtk-config-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3f541474a54e4be464404733bc2f4874
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.3
index 4d260c727eea..8302189e9b7e 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.14.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kdecoration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f0aec1217bd15b32de4e262d875842f
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.4 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.4
deleted file mode 100644
index f81a6293b78a..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kdecoration-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94360e2407eb22a96a0e597498495b84
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.14.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.14.5
new file mode 100644
index 000000000000..b7c648cb9a45
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=>=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kdecoration-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d27fb0682b4ce9b9791418d68bcc76ae
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3
index 0aecf90cad0b..b94feffab792 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.3:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kdeplasma-addons-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb0cab385259613b80431ca832bf2c19
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.4
deleted file mode 100644
index 685c3a125b24..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=share webengine debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.4:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kdeplasma-addons-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0edd6196cfd7cda858b7d9adfb4ea9ad
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
new file mode 100644
index 000000000000..a665e64b0e7d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=share webengine debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kunitconversion-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.52.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kdeplasma-addons-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1d0f1bbf7db697eeb81b4ea4b14c7cc2
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.3 b/metadata/md5-cache/kde-plasma/kgamma-5.14.3
index 5cafe9623fda..e26ee91fd19e 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kgamma5-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2826ece0ecda44de13340606da2a917
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.4 b/metadata/md5-cache/kde-plasma/kgamma-5.14.4
deleted file mode 100644
index 0394fe22084d..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kgamma5-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1bd4cddad05e1cdc13efaf4808f9ff64
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.14.5 b/metadata/md5-cache/kde-plasma/kgamma-5.14.5
new file mode 100644
index 000000000000..57c06af82919
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kgamma5-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=344e4c6f24d052a9ff1c964234bacc0b
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.3
index 15220a2e1c64..243ef21e39dc 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.14.3
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/khotkeys-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b0cd9bf3480dd54ca698424c4105211e
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.4
deleted file mode 100644
index 368b399f2995..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.4:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/khotkeys-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=95e6434f0e39adaeb4e7cdec71b7fc34
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.14.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.14.5
new file mode 100644
index 000000000000..9b81fb5be131
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5[X] >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.52.0:5 >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/khotkeys-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=8fe16f8f8d58e531710fcfcfd3615769
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3
index 9c07cabbdd9f..f170e4e790c7 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kinfocenter-5.14.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=18b1ab8718ad32fe29145c9b59ca0183
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.4
deleted file mode 100644
index 4f8ed22082ab..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.4:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kinfocenter-5.14.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b023d028c76d02b40dab79fcd7306f48
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5
new file mode 100644
index 000000000000..3a8217559c1b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Utility providing information about the computer hardware
+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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d2a745099038e0f26ebc72ce182ea6f0
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
index 6c2a21cda36d..9cd7ae38d5e7 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.14.3:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kmenuedit-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0c57e8455b4c7e6e23cfa6cbccab0505
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.4
deleted file mode 100644
index 34d3b0a998eb..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.14.4:5 ) >=kde-frameworks/kinit-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.14.4:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kmenuedit-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=01c93b30a0501457a0b8f2c0b3eace29
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5
new file mode 100644
index 000000000000..7615df346621
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.14.5:5 ) >=kde-frameworks/kinit-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.14.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kmenuedit-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d07e66e6d6240a5be74e913d9fa573cf
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.3 b/metadata/md5-cache/kde-plasma/kscreen-5.14.3
index fcf62121a5c1..6e491ac5d62b 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kscreen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f5fb705bf4a7112c6e638806753e215e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.4 b/metadata/md5-cache/kde-plasma/kscreen-5.14.4
deleted file mode 100644
index da8a06446c7b..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreen-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.14.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kscreen-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ecac89479ea101cc1b7cda83445f4a40
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.14.5 b/metadata/md5-cache/kde-plasma/kscreen-5.14.5
new file mode 100644
index 000000000000..3669066b8c02
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libkscreen-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.14.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kscreen-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=edcb1ca3f7b9efdd88e7769af8d3f400
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3
index bfa5a026ed04..c59151dde762 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.3
@@ -12,5 +12,5 @@ REQUIRED_USE=seccomp? ( pam )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kscreenlocker-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7f68532172195d2ef30979a1c6de52fa
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.4
deleted file mode 100644
index 2d727763badf..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.4:5
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.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/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=seccomp? ( pam )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kscreenlocker-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e55f2379eacce4847143a6673f097513
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5
new file mode 100644
index 000000000000..92ad44f272d3
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.14.5
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=consolekit +pam seccomp test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.14.5:5
+RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=seccomp? ( pam )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kscreenlocker-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d189a1b874c5d3c45013aca0f79a134a
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3
index 1703fe65714b..2151fadaf6f1 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/ksshaskpass-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b2cab7d5e3a16f8fb552673402e7520f
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.4 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.4
deleted file mode 100644
index 1343dd52d66a..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/ksshaskpass-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57696c74fca0a1cdd34dd7bb780a2f04
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
new file mode 100644
index 000000000000..2b2e1cd53df1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/ksshaskpass-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79b4a554b1f6054d950af40f8f3784bd
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.3
index 1c5494867044..94dffe55a40e 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.14.3
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-plasma/libksysguard-5.14.3:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/ksysguard-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c6bd1d5ea1662d4d5ef98be38f933a52
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.4
deleted file mode 100644
index d1e0bfbe2014..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.14.4:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.14.4:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/ksysguard-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=312350828af6abd4e79ec03d5254b6cb
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.14.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.14.5
new file mode 100644
index 000000000000..77fc75373310
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-plasma/libksysguard-5.14.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.14.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/ksysguard-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b3217e04e025d3bd341f736ed42dffe3
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3
index 1275cc05b790..a1b36566029e 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kwallet-pam-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=821a97e560f8126eedd1b35e6902f0ed
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.4 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.4
deleted file mode 100644
index 54dcd7f7449e..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.4
+++ /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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kwallet-pam-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a169502c6b7ab2f5254431b880bde23a
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5
new file mode 100644
index 000000000000..2d5679482882
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.14.5
@@ -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.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kwallet-pam-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7ae7ee4fc20a8351faf6f7cac2a4c72c
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3
index 2b034b9840a0..7971973965d9 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kwayland-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ecf48c4bf75aa37e2e7c780bee56a908
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.4 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.4
deleted file mode 100644
index 731463662fc1..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kwayland-integration-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cd5a205cd47e240096002acfff0e4d7b
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5
new file mode 100644
index 000000000000..993ab8017046
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kwayland-integration-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bd32020649bef0a4e369350e3a8c9f5c
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1 b/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1
index bc238a16e46e..0a155aae8da3 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.14.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kwin-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2bc8e22f31215322075e6464327cd72a
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.4 b/metadata/md5-cache/kde-plasma/kwin-5.14.4
deleted file mode 100644
index 08b9369f1ef8..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.14.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.4:5 >=kde-plasma/kdecoration-5.14.4:5 >=kde-plasma/kscreenlocker-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=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.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.4:5 >=kde-plasma/kdecoration-5.14.4:5 >=kde-plasma/kscreenlocker-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=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/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kwin-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f88140cb24eee302bc483ccc0a12b516
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.14.5 b/metadata/md5-cache/kde-plasma/kwin-5.14.5
new file mode 100644
index 000000000000..ab1b0371230b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.14.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=kde-plasma/kdecoration-5.14.5:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=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.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.14.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5= >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5= >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5[X] >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=kde-plasma/kdecoration-5.14.5:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=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/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kwin-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=98317e782d29490a49384aa424e1cf63
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.3 b/metadata/md5-cache/kde-plasma/kwrited-5.14.3
index ebcdc1f19026..3231c153bc3f 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.14.3
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/kwrited-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e956e498b17186cd7fdb98821c040d57
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.4 b/metadata/md5-cache/kde-plasma/kwrited-5.14.4
deleted file mode 100644
index 7b183d5b6842..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/kwrited-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c5c671b1578c36220d2ba1b007f536e2
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.14.5 b/metadata/md5-cache/kde-plasma/kwrited-5.14.5
new file mode 100644
index 000000000000..0f69605d990a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kpty-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/kwrited-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d62b165b20d687f5cc4e32d2e57f54dd
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.3
index 4e1c2c098c24..512e53969a7c 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.14.3
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kwayland-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtg
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.14.3/libkscreen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a657a9c336354ad9828974dc70779839
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.4 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.4
deleted file mode 100644
index 672720369f7a..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
-RESTRICT=test
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.14.4/libkscreen-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=633396aabb517472b527a9aaab23656f
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.14.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.14.5
new file mode 100644
index 000000000000..45b93093f760
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwayland-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 doc? ( >=dev-qt/qthelp-5.11.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.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 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kwayland-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
+RESTRICT=test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.14.5/libkscreen-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0cfc22c7c7fd450e7a624e97eaa8190f
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.3
index 6ce83fb89626..9d89fdd2f1b2 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.14.3
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/libksysguard-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=374b38ab7134ae7e6a0ee7edf4d5735e
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.4 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.4
deleted file mode 100644
index 5b48fa4ae77b..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.52.0:5 !minimal? ( >=kde-frameworks/plasma-5.52.0:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=minimal webkit X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/libksysguard-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=24579a170f13e067aeed128d57225415
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.14.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.14.5
new file mode 100644
index 000000000000..50ce993c4613
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.52.0:5 !minimal? ( >=kde-frameworks/plasma-5.52.0:5 ) X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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=minimal webkit X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/libksysguard-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bcfd7c59b29ab83a3f5fa589d70075df
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
index f8b609fee134..4084d988a829 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !kde-plasma/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f7132a11bd1e381c99f8fbe341cfa749
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.4 b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.4
deleted file mode 100644
index eca04f5d676d..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.14.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.50.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !kde-plasma/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43ffb84099f2cdde07fa13e6cb65c952
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5
new file mode 100644
index 000000000000..ddaeb10972ba
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.14.5:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.50.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/plasma-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !kde-plasma/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f20d04db109c946a252dd5fd5bc564ea
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.3 b/metadata/md5-cache/kde-plasma/milou-5.14.3
index 78ab56b57f65..e5db435f51cc 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.14.3
+++ b/metadata/md5-cache/kde-plasma/milou-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/milou-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=0cbdce19d8ad308d78a3eb4256f915b9
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.4 b/metadata/md5-cache/kde-plasma/milou-5.14.4
deleted file mode 100644
index 961f21bed779..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/milou-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d48acb23864c1c6c957d0880103358f5
diff --git a/metadata/md5-cache/kde-plasma/milou-5.14.5 b/metadata/md5-cache/kde-plasma/milou-5.14.5
new file mode 100644
index 000000000000..b106a37524f6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/milou-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=66a2f4bff0e8439e4d5ec97cf4834012
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.3 b/metadata/md5-cache/kde-plasma/oxygen-5.14.3
index 6e6403888acf..47a9d018909c 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.14.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/oxygen-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c8b50d177a58a97486983334ff35f171
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.4 b/metadata/md5-cache/kde-plasma/oxygen-5.14.4
deleted file mode 100644
index 30cd36750cc5..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) >=kde-frameworks/kservice-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=wayland debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.4:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/oxygen-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29b549706562609aa5fa4e053f6dc80d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.14.5 b/metadata/md5-cache/kde-plasma/oxygen-5.14.5
new file mode 100644
index 000000000000..072b7f2071ad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) >=kde-frameworks/kservice-5.52.0:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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=wayland debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/frameworkintegration-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-plasma/kdecoration-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/oxygen-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f189ebe611515e3eb498f129ba13659a
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3
index 805fb224cf98..5c5fad405186 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-browser-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c92cf829701d74d47d7a62f2ab00ee16
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.4
deleted file mode 100644
index 00acf36301c1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-browser-integration-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=986e4c0c8e7ca2f056d4bd424b4dc29a
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5
new file mode 100644
index 000000000000..9f2f3d61fc0f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-browser-integration-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7031cf51444c6ee10d7797e085f36b3a
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3
index f578fb99518e..3c5559f0d381 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/plasma-workspace-5.14.3:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.52.0:5 >=kde-plasma/breeze-5.14.3:5 >=kde-plasma/kde-cli-tools-5.14.3:5 >=kde-plasma/oxygen-5.14.3:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-desktop-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=252a062fb0189243b9ec0e5f54df48fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.4.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.4.1
deleted file mode 100644
index 305b83a85af1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.4:5 >=kde-plasma/plasma-workspace-5.14.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.4:5 >=kde-plasma/plasma-workspace-5.14.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.52.0:5 >=kde-plasma/breeze-5.14.4:5 >=kde-plasma/kde-cli-tools-5.14.4:5 >=kde-plasma/oxygen-5.14.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-desktop-5.14.4.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f92b0e1b8a132e3eb77b102566114f67
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
new file mode 100644
index 000000000000..79563a5f15be
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/plasma-workspace-5.14.5:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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 ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.52.0:5 >=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kpeople-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/plasma-workspace-5.14.5:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-plasma/oxygen-5.14.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/util-linux x11-apps/setxkbmap !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-misc/kcm-touchpad !kde-plasma/plasma-desktop:4 !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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-desktop-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=412a1f340578e23e291fb128366e084f
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3
index 7863a89b8550..148504abac70 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-integration-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=acabfc6e9fc7e3c4be31611c78d5c0c3
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.4
deleted file mode 100644
index 2a54fa8363c1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-integration-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=83c605c676641a7925529b63e868f593
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5
new file mode 100644
index 000000000000..8f397bd30838
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.14.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/breeze-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-integration-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9b0abdd45b10db88d2cd49cb2cf67e84
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
index d6ba59ff764d..5662f8f545c4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.14.3:5 >=kde-plasma/drkonqi-5.14.3:5 >=kde-plasma/kactivitymanagerd-5.14.3:5 >=kde-plasma/kde-cli-tools-5.14.3:5 >=kde-plasma/kdecoration-5.14.3:5 >=kde-plasma/kdeplasma-addons-5.14.3:5 >=kde-plasma/kgamma-5.14.3:5 >=kde-plasma/khotkeys-5.14.3:5 >=kde-plasma/kinfocenter-5.14.3:5 >=kde-plasma/kmenuedit-5.14.3:5 >=kde-plasma/kscreen-5.14.3:5 >=kde-plasma/kscreenlocker-5.14.3:5 >=kde-plasma/ksshaskpass-5.14.3:5 >=kde-plasma/ksysguard-5.14.3:5 >=kde-plasma/kwayland-integration-5.14.3:5 >=kde-plasma/kwin-5.14.3:5 >=kde-plasma/kwrited-5.14.3:5 >=kde-plasma/libkscreen-5.14.3:5 >=kde-plasma/libksysguard-5.14.3:5 >=kde-plasma/milou-5.14.3:5 >=kde-plasma/oxygen-5.14.3:5 >=kde-plasma/plasma-desktop-5.14.3:5 >=kde-plasma/plasma-integration-5.14.3:5 >=kde-plasma/plasma-workspace-5.14.3:5 >=kde-plasma/polkit-kde-agent-5.14.3:5 >=kde-plasma/powerdevil-5.14.3:5 >=kde-plasma/systemsettings-5.14.3:5 >=kde-plasma/user-manager-5.14.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.14.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.3:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.14.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.3:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.3:5 >=kde-plasma/kde-gtk-config-5.14.3:5 ) handbook? ( >=kde-apps/khelpcenter-18.08.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.14.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.3:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.14.3:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.3:5 >=kde-plasma/plymouth-kcm-5.14.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.3:5 )
 REQUIRED_USE=?? ( consolekit elogind systemd )
 SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=717eed3d026724f7cf4d23f8041fca93
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.4
deleted file mode 100644
index 959dce00c754..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.14.4:5 >=kde-plasma/drkonqi-5.14.4:5 >=kde-plasma/kactivitymanagerd-5.14.4:5 >=kde-plasma/kde-cli-tools-5.14.4:5 >=kde-plasma/kdecoration-5.14.4:5 >=kde-plasma/kdeplasma-addons-5.14.4:5 >=kde-plasma/kgamma-5.14.4:5 >=kde-plasma/khotkeys-5.14.4:5 >=kde-plasma/kinfocenter-5.14.4:5 >=kde-plasma/kmenuedit-5.14.4:5 >=kde-plasma/kscreen-5.14.4:5 >=kde-plasma/kscreenlocker-5.14.4:5 >=kde-plasma/ksshaskpass-5.14.4:5 >=kde-plasma/ksysguard-5.14.4:5 >=kde-plasma/kwayland-integration-5.14.4:5 >=kde-plasma/kwin-5.14.4:5 >=kde-plasma/kwrited-5.14.4:5 >=kde-plasma/libkscreen-5.14.4:5 >=kde-plasma/libksysguard-5.14.4:5 >=kde-plasma/milou-5.14.4:5 >=kde-plasma/oxygen-5.14.4:5 >=kde-plasma/plasma-desktop-5.14.4:5 >=kde-plasma/plasma-integration-5.14.4:5 >=kde-plasma/plasma-workspace-5.14.4:5 >=kde-plasma/polkit-kde-agent-5.14.4:5 >=kde-plasma/powerdevil-5.14.4:5 >=kde-plasma/systemsettings-5.14.4:5 >=kde-plasma/user-manager-5.14.4:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.14.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.4:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.14.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.4:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.4:5 >=kde-plasma/kde-gtk-config-5.14.4:5 ) handbook? ( >=kde-apps/khelpcenter-18.08.3:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.14.4:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.4:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.14.4:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.4:5 >=kde-plasma/plymouth-kcm-5.14.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.4:5 )
-REQUIRED_USE=?? ( consolekit elogind systemd )
-SLOT=5
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=12b4977083ffdf051d12fbe9e8a11325
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5
new file mode 100644
index 000000000000..a5ccdb4cdeaf
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.14.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://www.kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration consolekit crypt +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.14.5:5 >=kde-plasma/drkonqi-5.14.5:5 >=kde-plasma/kactivitymanagerd-5.14.5:5 >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-plasma/kdecoration-5.14.5:5 >=kde-plasma/kdeplasma-addons-5.14.5:5 >=kde-plasma/kgamma-5.14.5:5 >=kde-plasma/khotkeys-5.14.5:5 >=kde-plasma/kinfocenter-5.14.5:5 >=kde-plasma/kmenuedit-5.14.5:5 >=kde-plasma/kscreen-5.14.5:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=kde-plasma/ksshaskpass-5.14.5:5 >=kde-plasma/ksysguard-5.14.5:5 >=kde-plasma/kwayland-integration-5.14.5:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/kwrited-5.14.5:5 >=kde-plasma/libkscreen-5.14.5:5 >=kde-plasma/libksysguard-5.14.5:5 >=kde-plasma/milou-5.14.5:5 >=kde-plasma/oxygen-5.14.5:5 >=kde-plasma/plasma-desktop-5.14.5:5 >=kde-plasma/plasma-integration-5.14.5:5 >=kde-plasma/plasma-workspace-5.14.5:5 >=kde-plasma/polkit-kde-agent-5.14.5:5 >=kde-plasma/powerdevil-5.14.5:5 >=kde-plasma/systemsettings-5.14.5:5 >=kde-plasma/user-manager-5.14.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.14.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.14.5:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.14.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.14.5:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.14.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.14.5:5 >=kde-plasma/kde-gtk-config-5.14.5:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.14.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.14.5:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.14.5:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.14.5:5 >=kde-plasma/plymouth-kcm-5.14.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.14.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.14.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.14.5:5 )
+REQUIRED_USE=?? ( consolekit elogind systemd )
+SLOT=5
+_md5_=2661f44632efc154cceaf32745f87482
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3
index 216546388b2e..6b146cdbdaa0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.14.3:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-nm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=37e3e94e07d4d4d5d8bba8bc5d915912
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.4
deleted file mode 100644
index 2476a4378cd3..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.14.4:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-nm-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea57f22e55761d17b1bbefa6c4800acc
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
new file mode 100644
index 000000000000..47c5ec0d3c7a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5[teamd=] >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.52.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.14.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-nm-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=229ad4879c3902ec0399089f030c0014
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3
index 66e37b139881..a510c67c4234 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-pa-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b6a6dd992491c2d52293de85055d635d
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.4
deleted file mode 100644
index 3d4c391461a0..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-pa-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c5af4161057396a6d81a2658c2d57f1
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5
new file mode 100644
index 000000000000..604a3b2a1aac
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-pa-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=00b8ebda0d38a45ef32311a3b063eeb2
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3
index ea7d4c324f08..5f60ce7de1a2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-sdk-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96dc08b4e8e334caf9d58e6e931a905d
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.4
deleted file mode 100644
index 26dc1c0fe1f1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-sdk-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4be6b9e0ded434dfb6aac01b3b8b2ecc
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5
new file mode 100644
index 000000000000..dd74d41abfb6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.52.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-sdk-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6f71b330f0cb5fcc6b513149a7b64aae
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3
index c2a0a4b1c9f0..0dc4731b839c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-vault-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1238008c67b28658ca6a7a54a85f8645
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.4
deleted file mode 100644
index 28236007724a..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-vault-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d4da43d0c72e132d8c3bf55b3ddddbde
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5
new file mode 100644
index 000000000000..d84b4260361d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-plasma/libksysguard-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-vault-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=01c240e9f80b3bb43cc7634fb60bee8b
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3
index c5ac6d2b27f6..d0a9d26387c7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.3
@@ -12,5 +12,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1d14d3c23f82d1a0730beae9499022e2
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.4
deleted file mode 100644
index 2b45178d9a92..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.4
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.4:5 >=kde-plasma/kwin-5.14.4:5 >=kde-plasma/libksysguard-5.14.4:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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
-PDEPEND=>=kde-plasma/kde-cli-tools-5.14.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.4:5 >=kde-plasma/kwin-5.14.4:5 >=kde-plasma/libksysguard-5.14.4:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-apps/kio-extras-18.08.3:5 >=kde-plasma/ksysguard-5.14.4:5 >=kde-plasma/milou-5.14.4:5 >=kde-plasma/plasma-integration-5.14.4:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.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 ) !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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ec6f645684c5e42920c0596f0352b888
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5
new file mode 100644
index 000000000000..ac9a63f45ad5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.14.5
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/libksysguard-5.14.5:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.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
+PDEPEND=>=kde-plasma/kde-cli-tools-5.14.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kjs-5.52.0:5 >=kde-frameworks/kjsembed-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/krunner-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/kscreenlocker-5.14.5:5 >=kde-plasma/kwin-5.14.5:5 >=kde-plasma/libksysguard-5.14.5:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.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.52.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.52.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.52.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 ) >=kde-frameworks/kded-5.52.0:5 >=kde-frameworks/kdesu-5.52.0:5 >=kde-apps/kio-extras-18.08.3:5 >=kde-plasma/ksysguard-5.14.5:5 >=kde-plasma/milou-5.14.5:5 >=kde-plasma/plasma-integration-5.14.5:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.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 ) !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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=80a3840c80b6d5bda6a9a7373d2977df
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3
index 1a061a4b959f..eac94b6c2382 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-wallpapers-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=004a6bfdaf458783d87040aeb8d93e2f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.4
deleted file mode 100644
index f0a2af1f1351..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-workspace-wallpapers-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=58895646f1527d364e6fbe90b08803a7
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
new file mode 100644
index 000000000000..c1bac5e48142
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=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 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-wallpapers-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=63c231540421ed58aa3bd090c7cadf89
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3
index 11190e62f88d..cf56312ad3d4 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.14.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plymouth-kcm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1e76a3183e2f0ccc2d96af6e65a8815d
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.4 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.4
deleted file mode 100644
index 904892b7282a..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.14.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plymouth-kcm-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6f2842bc5580fe678f13503aa9774d18
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5
new file mode 100644
index 000000000000..294a268c60e4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.14.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plymouth-kcm-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d7aa3482e96798a6c2885679ee2a9adb
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3
index 53632c97aa01..e9293ae01c17 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/polkit-kde-agent-1-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d9443800d0c0adf359dbf6812003c49c
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.4
deleted file mode 100644
index d004156f6cf9..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/polkit-kde-agent-1-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=689cefa3683c9b893663ae3defd7e55d
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5
new file mode 100644
index 000000000000..2192796344f4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/polkit-kde-agent-1-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=da25c4d8b8862c7244ac28de98ac0f67
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
index 76365d9d9cfe..254365c3f8da 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.3:5 >=kde-plasma/libkworkspace-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.3:5 >=sys-power/upower-0.9.23 !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/powerdevil-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d6396d2061ee944154c1aa4170b620bf
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.4
deleted file mode 100644
index 5a3478bb8bca..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.4:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.4:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.4:5 >=sys-power/upower-0.9.23 !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/powerdevil-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=85c2e328a3bb4d1f31f66fb8d05a7b29
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.14.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.14.5
new file mode 100644
index 000000000000..8328c35549a0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.5:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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 +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5[policykit] >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-plasma/libkscreen-5.14.5:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.52.0:5 >=kde-frameworks/networkmanager-qt-5.52.0:5 ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=sys-power/upower-0.9.23 !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/powerdevil-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5f0c056c64af8d14519dff6f8a47e4fb
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3
index 206eb8f6f8e4..ecaecbea7408 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.14.3:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/sddm-kcm-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=36aa83b648f88f8808d4cb5aebd693f7
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.4 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.4
deleted file mode 100644
index f25f63ebf082..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.14.4:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/sddm-kcm-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e413f9bbe64e5204207dc246824563fc
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5
new file mode 100644
index 000000000000..ae0d2e91c5b6
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.14.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/sddm-kcm-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=654a04adfb78c49abdfe8d4f12fa6900
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.3
index 7af8c6b75df8..793e9e02096b 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.14.3
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.52.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.52.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/systemsettings-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=66ffb66837c5049cc6190bea0d72c7f6
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.4
deleted file mode 100644
index 6cee45ff2661..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.52.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.52.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/systemsettings-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7bf4a87b4d519a693e28765082f09ce0
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.14.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.14.5
new file mode 100644
index 000000000000..20c94b02f909
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.52.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kactivities-stats-5.52.0:5 >=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-plasma/libkworkspace-5.14.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.52.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.52.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.14.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/systemsettings-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=21418eea24b26b990108811aa989bc7a
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.3 b/metadata/md5-cache/kde-plasma/user-manager-5.14.3
index 10f494134b7d..386676126587 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.14.3
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/user-manager-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e8e8e67ac7a1f9d8988baae18ee50b09
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.4 b/metadata/md5-cache/kde-plasma/user-manager-5.14.4
deleted file mode 100644
index fe4a830fdbbb..000000000000
--- a/metadata/md5-cache/kde-plasma/user-manager-5.14.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/user-manager-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e74878eebc2e1be555c56f6bb252522b
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.14.5 b/metadata/md5-cache/kde-plasma/user-manager-5.14.5
new file mode 100644
index 000000000000..b8933ea4003b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.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.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/user-manager-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=259ed16b31d757d09c99a67ce2290083
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3
index ff8169dc43a6..90346c3982ea 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.3/plasma-workspace-5.14.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d3e069d5c054074c3f572842680be308
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.4 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.4
deleted file mode 100644
index d26b7e6d910b..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.4
+++ /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.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.14.4/plasma-workspace-5.14.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9fd7e176ae61c24d7692da44d74b0fcf
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5
new file mode 100644
index 000000000000..0b7d20dd5567
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.14.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/extra-cmake-modules-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=dev-qt/qtcore-5.9.6:5 >=dev-qt/qtdbus-5.9.6:5 >=dev-qt/qtgui-5.9.6:5 >=dev-qt/qtx11extras-5.9.6:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.14.5/plasma-workspace-5.14.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1478ab8b27a70d88fc61e7de97eefb0e
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 1a5d1a1cdc39..49edc6729cae 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/cone-0.92 b/metadata/md5-cache/mail-client/cone-0.92
index a48289f117ae..efb42053474a 100644
--- a/metadata/md5-cache/mail-client/cone-0.92
+++ b/metadata/md5-cache/mail-client/cone-0.92
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=5
 HOMEPAGE=https://www.courier-mta.org/cone/
 IUSE=crypt fam gnutls idn ipv6 ldap
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
+RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.92.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37ebcd7dde4c965b4e73c630b3b078a4
+_md5_=71791cfb301340b78479eb2a3a4ee8cc
diff --git a/metadata/md5-cache/mail-client/cone-0.95 b/metadata/md5-cache/mail-client/cone-0.95
index e11f4087219a..8d48879bdcd6 100644
--- a/metadata/md5-cache/mail-client/cone-0.95
+++ b/metadata/md5-cache/mail-client/cone-0.95
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=6
 HOMEPAGE=https://www.courier-mta.org/cone/
 IUSE=crypt fam gnutls idn ipv6 ldap
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
+RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.95.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b1841f8a9994c7ab58fde4d2a93901a9
+_md5_=44d8a3517a37afd812394b4b504b0c1d
diff --git a/metadata/md5-cache/mail-client/cone-0.96 b/metadata/md5-cache/mail-client/cone-0.96
index 7ecdc8d733c1..0db4391f7aee 100644
--- a/metadata/md5-cache/mail-client/cone-0.96
+++ b/metadata/md5-cache/mail-client/cone-0.96
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=CONE: COnsole News reader and Emailer
 EAPI=6
 HOMEPAGE=https://www.courier-mta.org/cone/
 IUSE=crypt fam gnutls idn ipv6 ldap
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:* dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
+RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/cone-0.96.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=780b2063e9384f0a4ed089a77c03aede
+_md5_=e3b052817a25e90d18e3c164925eac54
diff --git a/metadata/md5-cache/mail-client/kube-0.7.0 b/metadata/md5-cache/mail-client/kube-0.7.0
index fb71fb686f32..95b8c208a174 100644
--- a/metadata/md5-cache/mail-client/kube-0.7.0
+++ b/metadata/md5-cache/mail-client/kube-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://github.com/KDE/kube/archive/v0.7.0.tar.gz -> kube-0.7.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e58660ab6331e43cf18cb0b092102de2
diff --git a/metadata/md5-cache/mail-client/mutt-1.10.1 b/metadata/md5-cache/mail-client/mutt-1.10.1
index b9c820b1eea8..7d3bf505991a 100644
--- a/metadata/md5-cache/mail-client/mutt-1.10.1
+++ b/metadata/md5-cache/mail-client/mutt-1.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
 IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 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 hppa ia64 ~mips 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=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.10.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.10.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.10.1-patches-r0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fbb4248dda98ac6a7a0c3f01419973c
+_md5_=d1f9e77dce95043ceb970ada602bd6a0
diff --git a/metadata/md5-cache/mail-client/mutt-1.10.1-r1 b/metadata/md5-cache/mail-client/mutt-1.10.1-r1
deleted file mode 100644
index 2c69389d432c..000000000000
--- a/metadata/md5-cache/mail-client/mutt-1.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=http://www.mutt.org/
-IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
-SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.10.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.10.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.10.1-patches-r1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7eca0c0d8b043b32af53d43cfbafae15
diff --git a/metadata/md5-cache/mail-client/mutt-1.11.1 b/metadata/md5-cache/mail-client/mutt-1.11.1
deleted file mode 100644
index d2faacc779dc..000000000000
--- a/metadata/md5-cache/mail-client/mutt-1.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small but very powerful text-based mail client
-EAPI=6
-HOMEPAGE=http://www.mutt.org/
-IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
-REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
-SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.11.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.11.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.11.1-patches-r0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bb14f22e242aeadbcbfb0d35d165fbde
diff --git a/metadata/md5-cache/mail-client/mutt-1.11.1-r2 b/metadata/md5-cache/mail-client/mutt-1.11.1-r2
new file mode 100644
index 000000000000..e2c90e0ab8fa
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.11.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.11.1.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.11.1.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.11.1-patches-r2.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0e4397865ce3dbf3058a5b32fd7c233c
diff --git a/metadata/md5-cache/mail-client/mutt-1.11.2-r1 b/metadata/md5-cache/mail-client/mutt-1.11.2-r1
new file mode 100644
index 000000000000..53db8797b3d9
--- /dev/null
+++ b/metadata/md5-cache/mail-client/mutt-1.11.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=http://www.mutt.org/
+IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
+REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
+SLOT=0
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.11.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.11.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.11.2-patches-r1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c44b2ec42d1b26ce8fc9da666c79956
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 9ff1136517c0..e7e4eb7c067f 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/amavisd-new-2.11.1-r1 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r1
deleted file mode 100644
index fc2a6eb7804d..000000000000
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare setup
-DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 virtual/pkgconfig
-DESCRIPTION=High-performance interface between the MTA and content checkers
-EAPI=6
-HOMEPAGE=https://gitlab.com/amavis/amavis
-IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
-SLOT=0
-SRC_URI=https://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8a028852994b0a80e1560d730427e18a
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r2 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r2
deleted file mode 100644
index 9588d57714e3..000000000000
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare setup
-DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 virtual/pkgconfig
-DESCRIPTION=High-performance interface between the MTA and content checkers
-EAPI=6
-HOMEPAGE=https://gitlab.com/amavis/amavis
-IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 BSD-2
-RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
-SLOT=0
-SRC_URI=https://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c2ebaca0c0321e7c61645f80c97b5230
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
new file mode 100644
index 000000000000..763d53c05d5f
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install preinst prepare setup
+DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 virtual/pkgconfig
+DESCRIPTION=High-performance interface between the MTA and content checkers
+EAPI=6
+HOMEPAGE=https://gitlab.com/amavis/amavis
+IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
+SLOT=0
+SRC_URI=https://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=80c5404d30edd6862fc5c046bda7d5c3
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158 b/metadata/md5-cache/mail-filter/dcc-1.3.158
index 46df785bbf77..c7db3ce6ae96 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.158
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=5
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=DCC GPL-2
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.158.tar.Z
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1550162f4256b79a9188e051f85510ab
+_md5_=4ff03e1312237038edaaf37ba7b10bff
diff --git a/metadata/md5-cache/mail-filter/gld-1.7-r3 b/metadata/md5-cache/mail-filter/gld-1.7-r3
index 31f547cab6a2..98f4e944ec94 100644
--- a/metadata/md5-cache/mail-filter/gld-1.7-r3
+++ b/metadata/md5-cache/mail-filter/gld-1.7-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install preinst prepare
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) !postgres? ( virtual/mysql ) postgres? ( dev-db/postgresql:*[server] )
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) !postgres? ( virtual/mysql ) postgres? ( dev-db/postgresql:*[server] )
 DESCRIPTION=A standalone anti-spam greylisting algorithm on top of Postfix
 EAPI=5
 HOMEPAGE=http://www.gasmi.net/gld.html
 IUSE=libressl postgres
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) !postgres? ( virtual/mysql ) postgres? ( dev-db/postgresql:*[server] )
+RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) !postgres? ( virtual/mysql ) postgres? ( dev-db/postgresql:*[server] )
 SLOT=0
 SRC_URI=http://www.gasmi.net/down/gld-1.7.tgz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=edd03723c73c92c418160c9c06f885b8
+_md5_=31e9c78c24f750c60bc035d4befe0d38
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.4 b/metadata/md5-cache/mail-filter/imapfilter-2.5.4
index 4ad5439550bd..8e6be16f86f4 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.4
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.5.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+DEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
 DESCRIPTION=An IMAP mail filtering utility
 EAPI=5
 HOMEPAGE=http://imapfilter.hellug.gr
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
-RDEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+RDEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.4.tar.gz -> imapfilter-2.5.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5a330bafc765e3827c03e26c85699d4b
+_md5_=909eb6a09ac8d732f95dbc4a3b7ca949
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.6 b/metadata/md5-cache/mail-filter/imapfilter-2.5.6
index c38f6ec1f2fe..677841170381 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.6
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.5.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+DEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
 DESCRIPTION=An IMAP mail filtering utility
 EAPI=5
 HOMEPAGE=http://imapfilter.hellug.gr
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
-RDEPEND=dev-libs/openssl dev-libs/libpcre >=dev-lang/lua-5.1
+RDEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz -> imapfilter-2.5.6.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ab771c1d135996d627af476312ddbd5c
+_md5_=909eb6a09ac8d732f95dbc4a3b7ca949
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.7 b/metadata/md5-cache/mail-filter/imapfilter-2.5.7
index 11a399297b3e..9be4e2064101 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.7
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.5.7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:0 dev-libs/libpcre dev-lang/lua:*
+DEPEND=dev-libs/openssl:0= dev-libs/libpcre dev-lang/lua:*
 DESCRIPTION=An IMAP mail filtering utility
 EAPI=5
 HOMEPAGE=http://imapfilter.hellug.gr
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/openssl:0 dev-libs/libpcre dev-lang/lua:*
+RDEPEND=dev-libs/openssl:0= dev-libs/libpcre dev-lang/lua:*
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz -> imapfilter-2.5.7.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=719da37add025ed3804303dcb3deca5f
+_md5_=f3a07a4783d531df0a83fa6401287d88
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1 b/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1
index ffad5e4220e6..56f0a06e3526 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
 DESCRIPTION=An IMAP mail filtering utility
 EAPI=5
 HOMEPAGE=http://imapfilter.hellug.gr
 IUSE=libressl
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz -> imapfilter-2.5.7.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4080f79606da3d2be293e03a0c1e1d2e
+_md5_=c16c94898ffed040fe2bc3775f43b006
diff --git a/metadata/md5-cache/mail-filter/libdkim-1.0.21-r3 b/metadata/md5-cache/mail-filter/libdkim-1.0.21-r3
index b02103e210ae..e2aaf155fed2 100644
--- a/metadata/md5-cache/mail-filter/libdkim-1.0.21-r3
+++ b/metadata/md5-cache/mail-filter/libdkim-1.0.21-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) app-arch/unzip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) app-arch/unzip >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=DomainKeys Identified Mail library from Alt-N Inc
 EAPI=5
 HOMEPAGE=http://libdkim.sourceforge.net
@@ -10,4 +10,4 @@ RDEPEND=!mail-filter/libdkim-exim dev-libs/openssl
 SLOT=0
 SRC_URI=mirror://sourceforge/libdkim/libdkim-1.0.21.zip
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2835387bb8225b51146f01e3eef7c94f
+_md5_=c820671ed687ed27d080feae68065164
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3 b/metadata/md5-cache/mail-filter/opendkim-2.10.3
deleted file mode 100644
index 84e56de6f9bc..000000000000
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8:* ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A milter-based application to provide DKIM signing and verification
-EAPI=5
-HOMEPAGE=http://opendkim.org
-IUSE=+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound
-KEYWORDS=amd64 ~arm x86
-LICENSE=Sendmail-Open-Source BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( >=dev-libs/openssl-0.9.8:* ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc selinux? ( sec-policy/selinux-dkim )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=916c1a3387fe082c4a2dd96a60ce1507
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r2 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r2
deleted file mode 100644
index 31ffa4c35141..000000000000
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=config configure install postinst prepare setup
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A milter-based application to provide DKIM signing and verification
-EAPI=5
-HOMEPAGE=http://opendkim.org
-IUSE=+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Sendmail-Open-Source BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( >=sys-libs/db-3.2:* ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua:* ) ldap? ( net-nds/openldap ) lmdb? ( dev-db/lmdb ) memcached? ( dev-libs/libmemcached ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) !unbound? ( net-libs/ldns ) gnutls? ( >=net-libs/gnutls-2.11.7 ) sys-process/psmisc selinux? ( sec-policy/selinux-dkim )
-REQUIRED_USE=sasl? ( ldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc1db675f32bbf4c28fcb3185118ad0f
diff --git a/metadata/md5-cache/mail-filter/policyd-1.82-r2 b/metadata/md5-cache/mail-filter/policyd-1.82-r2
index db677bf4df08..35b125ab6743 100644
--- a/metadata/md5-cache/mail-filter/policyd-1.82-r2
+++ b/metadata/md5-cache/mail-filter/policyd-1.82-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/mysql !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl )
+DEPEND=virtual/mysql !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 DESCRIPTION=Policy daemon for postfix and other MTAs
 EAPI=5
 HOMEPAGE=http://policyd.sf.net/
 IUSE=libressl
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/mysql !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl )
+RDEPEND=virtual/mysql !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 SLOT=0
 SRC_URI=http://policyd.sourceforge.net/policyd-1.82.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d26e96a6b73f66edf1e9138d63a0d639
+_md5_=0ac730316a78c9ffe7b2cc9ff60fdefc
diff --git a/metadata/md5-cache/mail-filter/popfile-1.1.3 b/metadata/md5-cache/mail-filter/popfile-1.1.3
index 81028660f7b9..6140d6776d8a 100644
--- a/metadata/md5-cache/mail-filter/popfile-1.1.3
+++ b/metadata/md5-cache/mail-filter/popfile-1.1.3
@@ -6,8 +6,8 @@ HOMEPAGE=http://getpopfile.org
 IUSE=cjk ipv6 mysql ssl xmlrpc
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-perl/DBD-SQLite dev-perl/HTML-Tagset dev-perl/HTML-Template dev-perl/TimeDate dev-perl/DBI virtual/perl-Digest cjk? ( dev-perl/Encode-compat dev-perl/Text-Kakasi ) mysql? ( dev-perl/DBD-mysql ) ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay ) xmlrpc? ( dev-perl/PlRPC )
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-perl/DBD-SQLite dev-perl/HTML-Tagset dev-perl/HTML-Template dev-perl/TimeDate dev-perl/DBI virtual/perl-Digest cjk? ( dev-perl/Encode-compat dev-perl/Text-Kakasi ) mysql? ( dev-perl/DBD-mysql ) ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-libs/openssl:0 dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay ) xmlrpc? ( dev-perl/PlRPC )
 SLOT=0
 SRC_URI=http://getpopfile.org/downloads/popfile-1.1.3.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71396cc1deb740f165b1b7b052c21bcd
+_md5_=3ffc5c05df24141e28d849d3556076ab
diff --git a/metadata/md5-cache/mail-filter/sid-milter-1.0.0-r7 b/metadata/md5-cache/mail-filter/sid-milter-1.0.0-r7
index dda7e760212d..97b1b4987801 100644
--- a/metadata/md5-cache/mail-filter/sid-milter-1.0.0-r7
+++ b/metadata/md5-cache/mail-filter/sid-milter-1.0.0-r7
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) >=sys-libs/db-3.2:* || ( mail-filter/libmilter mail-mta/sendmail )
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=sys-libs/db-3.2:* || ( mail-filter/libmilter mail-mta/sendmail )
 DESCRIPTION=A milter-based application to provide Sender-ID verification service
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/sid-milter/
 IUSE=ipv6 libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=Sendmail-Open-Source
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) >=sys-libs/db-3.2:* || ( mail-filter/libmilter mail-mta/sendmail ) sys-apps/openrc
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=sys-libs/db-3.2:* || ( mail-filter/libmilter mail-mta/sendmail ) sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/sid-milter/sid-milter-1.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed2d22c73ab400a73f4f1b2ccda8ed1d
+_md5_=658af999b229ad91f6a2604572fa815f
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
index fd3d3bf31039..4f50772bc011 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0
+++ b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( dev-libs/openssl:0= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A drop-in connection-time spam filter for qmail
 EAPI=5
 HOMEPAGE=http://www.spamdyke.org/
 IUSE=+ssl
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl ) virtual/qmail
+RDEPEND=ssl? ( dev-libs/openssl:0= ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e839bfaa153bc60c837001329492a29
+_md5_=863a2c241ceb2ce22e500200e283cd97
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1
index 94e48ebc946b..9c24488ec810 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1
+++ b/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A drop-in connection-time spam filter for qmail
 EAPI=5
 HOMEPAGE=http://www.spamdyke.org/
 IUSE=libressl +ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/qmail
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e17d5bb5dead50d4a878e309a7292147
+_md5_=8409a28331bd7123443475fbd229dcec
diff --git a/metadata/md5-cache/mail-filter/spamdyke-5.0.1 b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
index e97f04efdd8d..150c86a22bb1 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-5.0.1
+++ b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A drop-in connection-time spam filter for qmail
 EAPI=5
 HOMEPAGE=http://www.spamdyke.org/
 IUSE=libressl +ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/qmail
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/qmail
 SLOT=0
 SRC_URI=http://www.spamdyke.org/releases/spamdyke-5.0.1.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=feca4d1ae77615916b8e14a95ebd13f3
+_md5_=56085853475b6ca6be0a0ca552ba6647
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 52cfd9862189..898aa38d604b 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/courier-0.75.0 b/metadata/md5-cache/mail-mta/courier-0.75.0
index 4f8e96d5405e..515e9ff94e80 100644
--- a/metadata/md5-cache/mail-mta/courier-0.75.0
+++ b/metadata/md5-cache/mail-mta/courier-0.75.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst prepare test
-DEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
 DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc s390 sparc x86
 LICENSE=GPL-2
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
-RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
+RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.75.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=123f9ca2dacbbaa5966649f8ac6320b7
+_md5_=123176dcb1a5eb1daa3b6d70bc34b2a8
diff --git a/metadata/md5-cache/mail-mta/courier-0.75.0-r1 b/metadata/md5-cache/mail-mta/courier-0.75.0-r1
index ffe5bdf99a3d..78383985ef2a 100644
--- a/metadata/md5-cache/mail-mta/courier-0.75.0-r1
+++ b/metadata/md5-cache/mail-mta/courier-0.75.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=An MTA designed specifically for maildirs
 EAPI=5
 HOMEPAGE=http://www.courier-mta.org/
 IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
 LICENSE=GPL-2
 PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
 RDEPEND=>=net-libs/courier-authlib-0.66.3 >=net-libs/courier-unicode-1.3 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( virtual/mysql ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( gnutls libressl )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-0.75.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dd6f30805155bf9fdd1316dcc9f6974
+_md5_=23ac03c79203bfb14767800fb599d86d
diff --git a/metadata/md5-cache/mail-mta/courier-1.0.5 b/metadata/md5-cache/mail-mta/courier-1.0.5
new file mode 100644
index 000000000000..fadbdb3791d9
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/courier-1.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=>=net-libs/courier-authlib-0.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DESCRIPTION=An MTA designed specifically for maildirs
+EAPI=7
+HOMEPAGE=http://www.courier-mta.org/
+IUSE=postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
+RDEPEND=>=net-libs/courier-authlib-0.69.0-r1 >=net-libs/courier-unicode-2.1 !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) libressl? ( dev-libs/libressl:= ) gnutls? ( net-libs/gnutls ) >=sys-libs/gdbm-1.8.0 dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( virtual/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11 ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/bincimap !net-mail/courier-imap !net-mail/cyrus-imapd !net-mail/uw-imap
+REQUIRED_USE=?? ( gnutls libressl )
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-1.0.5.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f8ef2a6f0027d8d51724156bfdd5e01e
diff --git a/metadata/md5-cache/mail-mta/exim-4.91-r2 b/metadata/md5-cache/mail-mta/exim-4.91-r2
index 6724114ac0d8..71b164143566 100644
--- a/metadata/md5-cache/mail-mta/exim-4.91-r2
+++ b/metadata/md5-cache/mail-mta/exim-4.91-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls?
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.91.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.91.tar.xz )
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3e7b5379b0eaf05db5d151607b6a24e
+_md5_=5d4bbc3a944683163437144e629edac2
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1 b/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1
deleted file mode 100644
index 592d69af128b..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) filecaps? ( sys-libs/libcap )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.0.tar.xz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17cb7268dc848748c6a6812e8657d4dd
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.1 b/metadata/md5-cache/mail-mta/msmtp-1.8.1
deleted file mode 100644
index be3ae1f72803..000000000000
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) filecaps? ( sys-libs/libcap )
-DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
-EAPI=7
-HOMEPAGE=https://marlam.de/msmtp/
-IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
-REQUIRED_USE=daemon? ( filecaps )
-SLOT=0
-SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.1.tar.xz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17cb7268dc848748c6a6812e8657d4dd
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.1-r1 b/metadata/md5-cache/mail-mta/msmtp-1.8.1-r1
new file mode 100644
index 000000000000..ede3f8633209
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) doc? ( virtual/texi2dvi ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) filecaps? ( sys-libs/libcap )
+DESCRIPTION=An SMTP client and SMTP plugin for mail user agents such as Mutt
+EAPI=7
+HOMEPAGE=https://marlam.de/msmtp/
+IUSE=daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls[idn?] ) !ssl? ( idn? ( net-dns/libidn2:= ) ) net-mail/mailbase mta? ( !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] )
+REQUIRED_USE=daemon? ( filecaps )
+SLOT=0
+SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.1.tar.xz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=e8af7161bd33485cf9a5a898313e6a68
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r1 b/metadata/md5-cache/mail-mta/netqmail-1.06-r1
index 550de4670b2b..0ea3df9819ce 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r1
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl ) >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl:0= ) >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=5
 HOMEPAGE=http://netqmail.org http://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl )
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2087023a776686b05e29b2e38e90742
+_md5_=d4ee077d965d18bbc2c45bc26cfb8e16
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r2 b/metadata/md5-cache/mail-mta/netqmail-1.06-r2
index b5f1c5488b01..99b855fd6213 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r2
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl ) sys-apps/groff >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl:0= ) sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=5
 HOMEPAGE=http://netqmail.org http://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume qmail-spp ssl vanilla
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl ) sys-apps/groff
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( dev-libs/openssl:0= ) sys-apps/groff
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7bc33c05a46b0b16dcde9a2ed08ca10
+_md5_=5655163d84fcb3d4b69c031ec0702ca5
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r3 b/metadata/md5-cache/mail-mta/netqmail-1.06-r3
index afe76e4a23c1..ae8e3291d358 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r3
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/groff >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=5
 HOMEPAGE=http://netqmail.org http://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume libressl qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/groff
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/groff
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2dcfc993cc8c8a45058d68606b7484e
+_md5_=80d8db651314f58571b0f5359d86149e
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r4 b/metadata/md5-cache/mail-mta/netqmail-1.06-r4
index 119d29fb0f5e..8f7007b73b1f 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r4
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/gentoo-functions sys-apps/groff >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=5
 HOMEPAGE=http://netqmail.org http://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume libressl qmail-spp ssl vanilla
 KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/gentoo-functions sys-apps/groff
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d06f4455e4ad123fe3fe286fb58a8bc3
+_md5_=9038c00e0d63bb5acebb33007f6ea1e7
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r5 b/metadata/md5-cache/mail-mta/netqmail-1.06-r5
index 684e2bf17e3b..4226048791aa 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r5
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2 >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2 >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=5
 HOMEPAGE=http://netqmail.org http://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume libressl qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 http://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2dbb33b46087f1495f6d6aa15eb60685
+_md5_=38bb141f4cd9d78b7bc7b3d37e9fea1f
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1 b/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1
deleted file mode 100644
index 64eca9343f65..000000000000
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst
-DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= dev-libs/libevent app-misc/ca-certificates net-mail/mailbase net-libs/libasr !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
-DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
-EAPI=7
-HOMEPAGE=https://www.opensmtpd.org
-IUSE=libressl pam +mta
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= dev-libs/libevent app-misc/ca-certificates net-mail/mailbase net-libs/libasr !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
-SLOT=0
-SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c7061e979f0cf4a0c7b1dd005e7c5b60
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1-r1 b/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1-r1
new file mode 100644
index 000000000000..a5475b201304
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst
+DEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= dev-libs/libevent app-misc/ca-certificates net-mail/mailbase net-libs/libasr !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
+DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
+EAPI=7
+HOMEPAGE=https://www.opensmtpd.org
+IUSE=libressl pam +mta
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
+RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( virtual/pam ) sys-libs/db:= dev-libs/libevent app-misc/ca-certificates net-mail/mailbase net-libs/libasr !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
+SLOT=0
+SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.0.3p1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=dafba4e7a442bb511e490c5d19337600
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4_pre20181202 b/metadata/md5-cache/mail-mta/postfix-3.4_pre20181202
deleted file mode 100644
index c4ba40efb74d..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.4_pre20181202
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=6
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.4-20181202.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f59b0e4d1bfd0e13f5576d6c3c8990c9
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4_pre20190106 b/metadata/md5-cache/mail-mta/postfix-3.4_pre20190106
new file mode 100644
index 000000000000..b583cb66ff46
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.4_pre20190106
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.4-20190106.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0151dd24f512f0d22f838c8d425d96d1
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.14.9 b/metadata/md5-cache/mail-mta/sendmail-8.14.9
index 8b4a562fe558..f707ca1c51ce 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.14.9
+++ b/metadata/md5-cache/mail-mta/sendmail-8.14.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
+DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
 DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=5
 HOMEPAGE=http://www.sendmail.org/
@@ -7,8 +7,8 @@ IUSE=ssl ldap sasl tcpd mbox ipv6 nis sockets
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=Sendmail GPL-2
 PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
+RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82890024388191be68693944a4e57414
+_md5_=1406d51390ab44f83f46f22baa438176
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1 b/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1
index d2323084799e..12616f2e5506 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1
+++ b/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
+DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
 DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=5
 HOMEPAGE=http://www.sendmail.org/
@@ -7,8 +7,8 @@ IUSE=ssl ldap libressl sasl tcpd mbox ipv6 nis sockets
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=Sendmail GPL-2
 PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
+RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7087fb2b12eca518e6dd917ba3f95ccb
+_md5_=bd9e6e298c2a337599358923ee274c2d
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index bea90dad33cb..dc3ee9b0d903 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/cantarell-0.101 b/metadata/md5-cache/media-fonts/cantarell-0.101
index 69611078193f..ae384cc3bbff 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.101
+++ b/metadata/md5-cache/media-fonts/cantarell-0.101
@@ -4,11 +4,11 @@ DESCRIPTION=Default fontset for GNOME Shell
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 IUSE=X
-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=OFL-1.1
 RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.101/cantarell-fonts-0.101.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=514497da4c3c04402d21b96815e9a9da
+_md5_=daa974b5657f99a63595b1980bfc41f8
diff --git a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3 b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
index a0a986139830..a443586376e7 100644
--- a/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
+++ b/metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
@@ -4,10 +4,10 @@ DESCRIPTION=Hacking with Style: TrueType VT220 Font
 EAPI=6
 HOMEPAGE=http://sensi.org/~svo/glasstty/
 IUSE=X
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=freedist
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-001.3.ttf
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6513e59ffd7fd551efae213d44eb470
+_md5_=cfa75cedeed0340ee4983b7582ab3a98
diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
index 98e178629ff9..36db41777295 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=OFL-1.1
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	font	773ed921fdd08bed71cb1103c45748a0	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c893d7400b2a58e8d303cf58232f583f
diff --git a/metadata/md5-cache/media-fonts/terminus-font-4.47 b/metadata/md5-cache/media-fonts/terminus-font-4.47
new file mode 100644
index 000000000000..44ee827ac62c
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/terminus-font-4.47
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=app-arch/gzip virtual/awk pcf? ( x11-apps/bdftopcf ) X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=A clean fixed font for the console and X11
+EAPI=6
+HOMEPAGE=http://terminus-font.sourceforge.net/
+IUSE=a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote ru-dv +ru-g ru-i ru-k X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=OFL-1.1 GPL-2
+REQUIRED_USE=X? ( pcf )
+SLOT=0
+SRC_URI=mirror://sourceforge/terminus-font/terminus-font-4.47/terminus-font-4.47.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	773ed921fdd08bed71cb1103c45748a0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=56aaedcd7044fe2668fb3fd80c9384a8
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ec071692501e..5c75d2248bc8 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/cura-3.3.1 b/metadata/md5-cache/media-gfx/cura-3.3.1
deleted file mode 100644
index e12046437de7..000000000000
--- a/metadata/md5-cache/media-gfx/cura-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-3.3[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.3 >=media-gfx/fdm-materials-3.3 >=dev-libs/libsavitar-3.3:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.3[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-3.3[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.3 >=media-gfx/fdm-materials-3.3 >=dev-libs/libsavitar-3.3:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.3[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-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=0
-SRC_URI=https://github.com/Ultimaker/Cura/archive/3.3.1.tar.gz -> cura-3.3.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3af1fa8b486d04cb63387525f01e44e6
diff --git a/metadata/md5-cache/media-gfx/cura-3.6.0 b/metadata/md5-cache/media-gfx/cura-3.6.0
new file mode 100644
index 000000000000..f4dc3ea1d8a9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/cura-3.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-3.6[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.6[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A 3D model slicing application for 3D printing
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/Cura
+IUSE=+usb zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/uranium-3.6[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.6[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[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_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+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=0
+SRC_URI=https://github.com/Ultimaker/Cura/archive/3.6.0.tar.gz -> cura-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=058d7cc09fe4db793300f872f1afc35d
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.3.0 b/metadata/md5-cache/media-gfx/curaengine-3.3.0
deleted file mode 100644
index c998c6258744..000000000000
--- a/metadata/md5-cache/media-gfx/curaengine-3.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libarcus-3.3.0:* dev-libs/protobuf doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A 3D model slicing engine for 3D printing
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/CuraEngine
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=~dev-libs/libarcus-3.3.0:* dev-libs/protobuf
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.3.0.tar.gz -> curaengine-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50f23c01d33fb376d09d7e06bb4d9055
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.4.1 b/metadata/md5-cache/media-gfx/curaengine-3.4.1
index 2485d4acff71..88aff8f25785 100644
--- a/metadata/md5-cache/media-gfx/curaengine-3.4.1
+++ b/metadata/md5-cache/media-gfx/curaengine-3.4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf dev-libs/stb doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A 3D model slicing engine for 3D printing
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/CuraEngine
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
-RDEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf
+RDEPEND=~dev-libs/libarcus-3.4.1:* dev-libs/protobuf dev-libs/stb
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.4.1.tar.gz -> curaengine-3.4.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50f23c01d33fb376d09d7e06bb4d9055
+_md5_=d154bfc0f0c2e3e859b1312c1a706030
diff --git a/metadata/md5-cache/media-gfx/curaengine-3.6.0 b/metadata/md5-cache/media-gfx/curaengine-3.6.0
new file mode 100644
index 000000000000..e38b7ba36d97
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/curaengine-3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-libs/libarcus-3.6.0:* dev-libs/protobuf dev-libs/stb doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A 3D model slicing engine for 3D printing
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/CuraEngine
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=~dev-libs/libarcus-3.6.0:* dev-libs/protobuf dev-libs/stb
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/3.6.0.tar.gz -> curaengine-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d154bfc0f0c2e3e859b1312c1a706030
diff --git a/metadata/md5-cache/media-gfx/digikam-5.9.0 b/metadata/md5-cache/media-gfx/digikam-5.9.0
index 9f52c73a195b..fb813d9ef97c 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.9.0
+++ b/metadata/md5-cache/media-gfx/digikam-5.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.9.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d4ffa69948fff8148ded432c0023afb7
diff --git a/metadata/md5-cache/media-gfx/digikam-6.0.0_beta3 b/metadata/md5-cache/media-gfx/digikam-6.0.0_beta3
index 2fadfbe2343a..d4252464d9cf 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.0.0_beta3
+++ b/metadata/md5-cache/media-gfx/digikam-6.0.0_beta3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/digikam/digikam-6.0.0-beta3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2262ddee2d2826c42581b8ea1a31e9c9
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.0 b/metadata/md5-cache/media-gfx/exiv2-0.27.0
deleted file mode 100644
index 13cdbfe624f1..000000000000
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,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? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext )
-DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
-EAPI=7
-HOMEPAGE=http://www.exiv2.org/
-IUSE=doc examples nls +png webready +xmp abi_x86_32 abi_x86_64 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 ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,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/27
-SRC_URI=http://exiv2.dyndns.org/builds/exiv2-0.27.0-Source.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=07b1776e49756ac7a6e7bfedf713459b
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.0-r1 b/metadata/md5-cache/media-gfx/exiv2-0.27.0-r1
new file mode 100644
index 000000000000..2aa67a87e86e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,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? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext )
+DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
+EAPI=7
+HOMEPAGE=http://www.exiv2.org/
+IUSE=doc examples nls +png webready +xmp abi_x86_32 abi_x86_64 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 ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,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/27
+SRC_URI=http://exiv2.dyndns.org/builds/exiv2-0.27.0a-Source.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1347da76355baf48752a69c8548a89b4
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-3.3.0 b/metadata/md5-cache/media-gfx/fdm-materials-3.3.0
deleted file mode 100644
index ce4d6b8c2b34..000000000000
--- a/metadata/md5-cache/media-gfx/fdm-materials-3.3.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=FDM materials for media-gfx/cura
-EAPI=6
-HOMEPAGE=https://github.com/Ultimaker/fdm_materials
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.3.0.tar.gz -> fdm-materials-3.3.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2553485f31b25b30230860237b28ee61
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-3.6.0 b/metadata/md5-cache/media-gfx/fdm-materials-3.6.0
new file mode 100644
index 000000000000..363f001cf69b
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fdm-materials-3.6.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=FDM materials for media-gfx/cura
+EAPI=6
+HOMEPAGE=https://github.com/Ultimaker/fdm_materials
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/3.6.0.tar.gz -> fdm-materials-3.6.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c8a3e77af1486735139d643d26a23296
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.4-r1 b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
index d1c0a8862e45..e34abb03c153 100644
--- a/metadata/md5-cache/media-gfx/geeqie-1.4-r1
+++ b/metadata/md5-cache/media-gfx/geeqie-1.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=6
 HOMEPAGE=http://www.geeqie.org
 IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )
+RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 SRC_URI=http://www.geeqie.org/geeqie-1.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=590c3a11508598984dcba4286aa8d5a6
+_md5_=3282ceb14e152361a3253cd5954ae06f
diff --git a/metadata/md5-cache/media-gfx/geeqie-9999 b/metadata/md5-cache/media-gfx/geeqie-9999
index 68d05b8b8f47..c87f3f07140a 100644
--- a/metadata/md5-cache/media-gfx/geeqie-9999
+++ b/metadata/md5-cache/media-gfx/geeqie-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-util/glib-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext
+DEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 DESCRIPTION=A lightweight GTK image viewer forked from GQview
 EAPI=7
 HOMEPAGE=http://www.geeqie.org
-IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp
+IUSE=debug doc exif ffmpegthumbnailer gpu-accel +gtk3 jpeg lcms lirc lua map tiff xmp
 LICENSE=GPL-2
-RDEPEND=gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) tiff? ( media-libs/tiff:0 )
+RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
 REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cde2b33018627187e74db14a56c9b482
+_md5_=db3ac741397e89a8c3511c12a381c4a5
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1 b/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
deleted file mode 100644
index 56984d9268e2..000000000000
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=perl? ( dev-lang/perl:= ) perl? ( dev-perl/Module-Build dev-perl/Locale-Maketext-Lexicon ) test? ( dev-libs/glib:2 media-libs/fontconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/fonttools[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) perl? ( virtual/perl-Test-Simple ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library providing rendering capabilities for complex non-Roman writing systems
-EAPI=6
-HOMEPAGE=http://graphite.sil.org/
-IUSE=perl 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= )
-SLOT=0
-SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.12.tgz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c2a89a9d4d2fa8a51f45a6ab921dfa71
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.6.2 b/metadata/md5-cache/media-gfx/gthumb-3.6.2
index cc168a633904..7df808924999 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.6.2
+++ b/metadata/md5-cache/media-gfx/gthumb-3.6.2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.36.0:2[dbus] >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.6/gthumb-3.6.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a513d232b533193d4e8651d195e67f91
+_md5_=d5d03b9af0ada732b9bce0aeb11457c9
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.16-r1 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.16-r1
deleted file mode 100644
index bab919eace18..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.16
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6c718b0a4248f424c192ca2b3ceb114
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.19 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.19
deleted file mode 100644
index b8100563cc05..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.19
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.19
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-19.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c6d854cb31610a7dc59f9e964a42b98
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.21 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.21
deleted file mode 100644
index 551018f8d302..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.21
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.21
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-21.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ea5c2bd95a298bf20a4b849a207b140
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.23 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.23
new file mode 100644
index 000000000000..4d3d38bfc9d4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.23
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.10.23
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-23.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=51a4a1a3e2fce5893c80324c63f9bf47
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.16 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.16
deleted file mode 100644
index 961537945fcf..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.16
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-16.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8db870f9e9c8f75c18aa5eaae1292b2f
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.19
deleted file mode 100644
index 66b7cc98f72e..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.19
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-19.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=269427579adbe5e1420e43448920a72b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.21 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.21
deleted file mode 100644
index d99792b5c023..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.21
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-21.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=269427579adbe5e1420e43448920a72b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.23 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.23
new file mode 100644
index 000000000000..c656ecd81770
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+SLOT=0/7.0.8.23
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-23.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	perl-functions	f2e3420aed32cf1abe33b4129b842636	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=420390044739e471040e927db22d30d7
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.2 b/metadata/md5-cache/media-gfx/inkscape-0.92.2
deleted file mode 100644
index b8aaf79e9433..000000000000
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.48 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/potrace media-gfx/scour[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.36 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A SVG based generic vector-drawing program
-EAPI=6
-HOMEPAGE=https://inkscape.org/
-IUSE=cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg python_targets_python2_7
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.48 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/potrace media-gfx/scour[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( media-libs/libcdr app-text/libwpg:0.3 dev-libs/librevenge ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( media-libs/libvisio app-text/libwpg:0.3 dev-libs/librevenge ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/uniconvertor dia? ( app-office/dia ) latex? ( media-gfx/pstoedit[plotutils] app-text/dvipsk app-text/texlive-core ) postscript? ( app-text/ghostscript-gpl )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.2.tar.bz2 https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8f635db9828694a235d76809f02784ba
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1 b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
index 97689d37f8e3..4f11d847d4e2 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.tar.bz2
+SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.tar.bz2 https://dev.gentoo.org/~asturm/distfiles/inkscape-0.92.3-poppler-patches.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7ddcfd04acd15a67673291f5893e2910
+_md5_=6b3359b65e429dc88f5b93acceb720f2
diff --git a/metadata/md5-cache/media-gfx/iscan-2.30.3.1 b/metadata/md5-cache/media-gfx/iscan-2.30.3.1
new file mode 100644
index 000000000000..7ee1f893ab24
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/iscan-2.30.3.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig X? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/libxml2 media-gfx/sane-backends virtual/libusb:1 virtual/udev gimp? ( media-gfx/gimp ) X? ( dev-libs/glib:2 media-libs/libpng:= media-libs/tiff:= virtual/jpeg:= x11-libs/gtk+:2 )
+DESCRIPTION=EPSON Image Scan! for Linux (including sane-epkowa backend)
+EAPI=7
+HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+IUSE=doc gimp l10n_ja X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 AVASYS
+RDEPEND=dev-libs/libxml2 media-gfx/sane-backends virtual/libusb:1 virtual/udev gimp? ( media-gfx/gimp ) X? ( dev-libs/glib:2 media-libs/libpng:= media-libs/tiff:= virtual/jpeg:= x11-libs/gtk+:2 ) media-gfx/iscan-data
+REQUIRED_USE=gimp? ( X )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.3-1.tar.gz doc? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_e.pdf l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/userg_revQ_j.pdf ) )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=defc9de2fdef1b52110ed6d142d68381
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
new file mode 100644
index 000000000000..b9b1cce35b56
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=udev? ( dev-libs/libxslt media-gfx/sane-backends )
+DESCRIPTION=Image Scan! for Linux data files
+EAPI=7
+HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+IUSE=udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.0-1.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=21a1304d0fa7b691f4d0d1228676c11a
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
index 5863d848f7d3..8b4d958cb38b 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0 >=kde-frameworks/kcompletion-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kconfigwidgets-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kdelibs4support-5.52.0 >=kde-frameworks/kguiaddons-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kiconthemes-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/ktextwidgets-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !media-gfx/kcoloredit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=https://github.com/KDE/kcoloredit/archive/50ac0509891343bc01a0aeffda5a44a1e65d9d04.tar.gz -> kcoloredit-2.0.0_p20171121.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=26065694f81a2a0048ed593d292f2098
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
index 7685e22eed73..1fb5546b6e78 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a9d6fafb4966f8036b9092e8d5a3fef5
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.4 b/metadata/md5-cache/media-gfx/kphotoalbum-5.4
index 2ec30c278fb0..726f880d2969 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.4
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-18.08.3:5 ) map? ( >=kde-apps/libkgeomap-18.08.3:5 ) raw? ( >=kde-apps/libkdcraw-18.08.3:5 ) || ( media-video/ffmpeg media-video/mplayer ) kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.4/kphotoalbum-5.4.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=80a242adafa473bab578963807fe2590
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2676d30b3cd911c937d2454b60911bf8
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.5 b/metadata/md5-cache/media-gfx/krita-4.1.5
index 2db6fe56b987..5c1d5372a937 100644
--- a/metadata/md5-cache/media-gfx/krita-4.1.5
+++ b/metadata/md5-cache/media-gfx/krita-4.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.1.5/krita-4.1.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e023c2d1be74ef0fa5a1f82494a158d2
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.7 b/metadata/md5-cache/media-gfx/krita-4.1.7
deleted file mode 100644
index a2396c2d4c50..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.3:5 >=dev-qt/qtdbus-5.11.3:5 >=dev-qt/qtdeclarative-5.11.3:5 >=dev-qt/qtgui-5.11.3:5[-gles2] >=dev-qt/qtnetwork-5.11.3:5 >=dev-qt/qtprintsupport-5.11.3:5 >=dev-qt/qtsvg-5.11.3:5 >=dev-qt/qtwidgets-5.11.3:5 >=dev-qt/qtx11extras-5.11.3:5 >=dev-qt/qtxml-5.11.3:5 dev-libs/boost:= dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.3:5 ) >=dev-qt/qtcore-5.11.3:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
-IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.3:5 >=dev-qt/qtdbus-5.11.3:5 >=dev-qt/qtdeclarative-5.11.3:5 >=dev-qt/qtgui-5.11.3:5[-gles2] >=dev-qt/qtnetwork-5.11.3:5 >=dev-qt/qtprintsupport-5.11.3:5 >=dev-qt/qtsvg-5.11.3:5 >=dev-qt/qtwidgets-5.11.3:5 >=dev-qt/qtx11extras-5.11.3:5 >=dev-qt/qtxml-5.11.3:5 dev-libs/boost:= dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.3:5
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.1.7/krita-4.1.7.101.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2194d0b79603ff6c1fc022c6f28e5aed
diff --git a/metadata/md5-cache/media-gfx/krita-4.1.7-r1 b/metadata/md5-cache/media-gfx/krita-4.1.7-r1
new file mode 100644
index 000000000000..1d606cd7658d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.1.7-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.3:5 >=dev-qt/qtdbus-5.11.3:5 >=dev-qt/qtdeclarative-5.11.3:5 >=dev-qt/qtgui-5.11.3:5[-gles2] >=dev-qt/qtnetwork-5.11.3:5 >=dev-qt/qtprintsupport-5.11.3:5 >=dev-qt/qtsvg-5.11.3:5 >=dev-qt/qtwidgets-5.11.3:5 >=dev-qt/qtx11extras-5.11.3:5 >=dev-qt/qtxml-5.11.3:5 dev-libs/boost:= dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext vc? ( >=dev-libs/vc-1.1.0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=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.52.0:5 test? ( >=dev-qt/qttest-5.11.3:5 ) >=dev-qt/qtcore-5.11.3:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/graphics/krita/ https://krita.org/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtconcurrent-5.11.3:5 >=dev-qt/qtdbus-5.11.3:5 >=dev-qt/qtdeclarative-5.11.3:5 >=dev-qt/qtgui-5.11.3:5[-gles2] >=dev-qt/qtnetwork-5.11.3:5 >=dev-qt/qtprintsupport-5.11.3:5 >=dev-qt/qtsvg-5.11.3:5 >=dev-qt/qtwidgets-5.11.3:5 >=dev-qt/qtx11extras-5.11.3:5 >=dev-qt/qtxml-5.11.3:5 dev-libs/boost:= dev-python/PyQt5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.11.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.1.7/krita-4.1.7.101.tar.gz https://dev.gentoo.org/~asturm/distfiles/krita-4.1.7-patchset.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd4f8f3ecddb1ddb63e526af3de23e94
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1 b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
index 3edf81ada43e..958aa1ad8392 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kuickshow/0.10.0/kuickshow-0.10.0.tar.xz -> kuickshow-0.10.0-r1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2c56a3c3dd8fc6f17dd2af1984d0d30a
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.1.1 b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
index a4a81a76370e..a3fb8e2c0ab1 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.1.1
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.1.1/kxstitch-2.1.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4c941c0f7464f48647844dfe1969a221
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.2 b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
index 868f35f9340a..8c284f06fc5b 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.2
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
@@ -3,9 +3,9 @@ DESCRIPTION=Palette quantization library that powers pngquant and other PNG opti
 EAPI=7
 HOMEPAGE=https://pngquant.org/lib/
 IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.2.tar.gz -> libimagequant-2.12.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d547ff3f943f3a4f131f95b13aaca1f2
+_md5_=3447f49715eacaf200a7a4580e47b72a
diff --git a/metadata/md5-cache/media-gfx/meshlab-2016.12-r4 b/metadata/md5-cache/media-gfx/meshlab-2016.12-r4
new file mode 100644
index 000000000000..a3ebdcca44aa
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/meshlab-2016.12-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-cpp/eigen:3 dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtxmlpatterns:5 >=media-gfx/jhead-3.00-r2 media-libs/glew:0 media-libs/qhull =media-libs/lib3ds-1* media-libs/openctm sci-libs/levmar sci-libs/mpir
+DESCRIPTION=the open source system for processing and editing 3D triangular meshes
+EAPI=6
+HOMEPAGE=http://www.meshlab.net
+IUSE=-minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtxmlpatterns:5 >=media-gfx/jhead-3.00-r2 media-libs/glew:0 media-libs/qhull =media-libs/lib3ds-1* media-libs/openctm sci-libs/levmar sci-libs/mpir
+SLOT=0
+SRC_URI=https://github.com/cnr-isti-vclab/meshlab/archive/v2016.12.tar.gz -> meshlab-2016.12.tar.gz https://github.com/cnr-isti-vclab/vcglib/archive/v1.0.1.tar.gz -> vcglib-1.0.1.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=0bcaa9adc66e3479089020ce4458e893
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.10.2 b/metadata/md5-cache/media-gfx/nomacs-3.10.2
index ff228b05fa41..bf1ac22e3edf 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.10.2
+++ b/metadata/md5-cache/media-gfx/nomacs-3.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=Qt-based image viewer
 EAPI=6
 HOMEPAGE=https://nomacs.org/
 IUSE=+jpeg +opencv raw tiff zip
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 x86 ~amd64-linux
 LICENSE=GPL-3+
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=media-gfx/exiv2-0.25:= opencv? ( media-libs/opencv:=[-qt4(-)] ) raw? ( >=media-libs/libraw-0.14:= ) tiff? ( dev-qt/qtimageformats:5 media-libs/tiff:0 ) zip? ( >=dev-libs/quazip-0.7.2[qt5(+)] )
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.10.2.tar.gz -> nomacs-3.10.2.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a7c7b67afe068b3942799d4912b74b19
+_md5_=9c95b539ee3ead9bf7467ae91f4c310c
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.7.1 b/metadata/md5-cache/media-gfx/photoqt-1.7.1
index fb701b091edb..d559b117efed 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.7.1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple but powerful Qt-based image viewer
 EAPI=6
 HOMEPAGE=https://photoqt.org/
 IUSE=devil exif freeimage graphicsmagick pdf raw
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= )
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-1.7.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=18476d2e8394192aaaec45ae1fd67dd9
+_md5_=ba57e7210267387840cd5781c7d55538
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.2 b/metadata/md5-cache/media-gfx/rawtherapee-5.2
deleted file mode 100644
index 931f6d99f3e4..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 app-arch/xz-utils virtual/pkgconfig dev-cpp/gtkmm:3.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=6
-HOMEPAGE=http://www.rawtherapee.com/
-IUSE=openmp
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
-SLOT=0
-SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.2.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3434dd65f41b266a4983cba33c2f7149
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.3 b/metadata/md5-cache/media-gfx/rawtherapee-5.3
deleted file mode 100644
index 23824ed22e45..000000000000
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 app-arch/xz-utils virtual/pkgconfig dev-cpp/gtkmm:3.0 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A powerful cross-platform raw image processing program
-EAPI=6
-HOMEPAGE=http://www.rawtherapee.com/
-IUSE=openmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3 dev-libs/expat dev-libs/libsigc++:2 media-libs/libcanberra[gtk3] media-libs/tiff:0 media-libs/libpng:0 media-libs/libiptcdata media-libs/lcms:2 media-libs/lensfun sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0
-SLOT=0
-SRC_URI=http://rawtherapee.com/shared/source/rawtherapee-5.3.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=954ed9f728e3450667bbc7d88942fa3e
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.5 b/metadata/md5-cache/media-gfx/rawtherapee-5.5
new file mode 100644
index 000000000000..80634ba4c57d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3 app-arch/xz-utils dev-cpp/gtkmm:3.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A powerful cross-platform raw image processing program
+EAPI=6
+HOMEPAGE=https://www.rawtherapee.com/
+IUSE=openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.5.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=384b28e43e54a8ab3d6bfc5a1569f7cd
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index d936ce9546e3..43f51fa773a5 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.0.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=096fa8c2f08cd4a870cc12b9e93ba8b5
diff --git a/metadata/md5-cache/media-gfx/zbar-0.20.1-r1 b/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
new file mode 100644
index 000000000000..53cd47eee622
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) 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(-)?] ) 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_python3_7(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) 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(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) java? ( >=virtual/jdk-1.8 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library and tools for reading barcodes from images or video
+EAPI=6
+HOMEPAGE=https://github.com/mchehab/zbar
+IUSE=graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) 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(-)?] ) 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_python3_7(-),python_single_target_python2_7(+)] gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) 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(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( X python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.20.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=29e30527b1fedbff4d64725518119269
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c21dacc986a1..1c09140a0f2e 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/allegro-4.4.2-r2 b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
new file mode 100644
index 000000000000..3f994b65e464
--- /dev/null
+++ b/metadata/md5-cache/media-libs/allegro-4.4.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) ) virtual/pkgconfig X? ( x11-base/xorg-proto ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=cross-platform multimedia library
+EAPI=6
+HOMEPAGE=https://liballeg.org/
+IUSE=alsa fbcon jack jpeg opengl oss png svga test vga vorbis X
+KEYWORDS=~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=Allegro MIT GPL-2+ ZLIB
+RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) svga? ( media-libs/svgalib ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm opengl? ( virtual/glu virtual/opengl ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/alleg/allegro-4.4.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=760b80186a0ceadf949bceb7fbb6ba63
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.8 b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
new file mode 100644
index 000000000000..a298615c2fed
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] ) doc? ( >=app-doc/doxygen-1.2.6 )
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=7
+HOMEPAGE=https://alsa-project.org/
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] )
+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_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://alsaproject/lib/alsa-lib-1.1.8.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3f4219650f21cf7bfde054771e3740a6
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.1.8 b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
new file mode 100644
index 000000000000..524836a20d99
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/alsa-lib-1.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(-)?]
+DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer
+EAPI=7
+HOMEPAGE=https://alsa-project.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.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(-)?]
+SLOT=0
+SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.1.8.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=41cc0278c532c57944c9e8538ff88266
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.10 b/metadata/md5-cache/media-libs/gexiv2-0.10.10
new file mode 100644
index 000000000000..ff01763a94c3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=GObject-based wrapper around the Exiv2 library
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
+IUSE=gtk-doc +introspection python static-libs test vala 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 ~amd64-fbsd
+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 ) 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.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.10.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bf99765c9ba400525ce80deda5b585e0
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.9 b/metadata/md5-cache/media-libs/gexiv2-0.10.9
deleted file mode 100644
index b722a4dcfc36..000000000000
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common virtual/pkgconfig test? ( dev-python/pygobject media-gfx/exiv2[xmp] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-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 ) 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 media-gfx/exiv2:= introspection? ( dev-libs/gobject-introspection:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) )
-DESCRIPTION=GObject-based wrapper around the Exiv2 library
-EAPI=7
-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 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-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 ) 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 media-gfx/exiv2:= 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 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.9.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db7c9fe39a56489fed0926895240fde2
diff --git a/metadata/md5-cache/media-libs/gexiv2-9999 b/metadata/md5-cache/media-libs/gexiv2-9999
new file mode 100644
index 000000000000..bb4316815f95
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gexiv2-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-python/pygobject:3 media-gfx/exiv2[xmp] ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+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.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=GObject-based wrapper around the Exiv2 library
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
+IUSE=gtk-doc +introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+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 ) 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.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
+SLOT=0
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=88e8ead68b46cbd2bbcab08fead393f2
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.2 b/metadata/md5-cache/media-libs/graphene-1.8.2
index 88a4ba99e72f..6cf90a5e12da 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.2
+++ b/metadata/md5-cache/media-libs/graphene-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A thin layer of types for graphic libraries
 EAPI=6
 HOMEPAGE=https://ebassi.github.io/graphene/
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.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(-)?] introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.2/graphene-1.8.2.tar.xz
 _eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f8433f78f51482feec95a019fa054318
+_md5_=d55f24718c9c5bb8ed65834135e8eb25
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
index 49173e417aee..8f011376ebcf 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips 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.14.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.14.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(-)?,egl?,introspection?,gles2=,opengl=] 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(-)?] ) vnc? ( 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? ( >=media-plugins/gst-plugins-gtk-1.14.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(-)?] ) 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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=52730a24dcc289d22231043c1cc27160
+_md5_=be4eb6c8a028b8cd76bef48b90315b03
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
index 79152ea019e4..88626a667284 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis 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 nls
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=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.14.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(-)?] >=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(-)?] 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=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(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.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(-)?] ) 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(-)?] ) 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(-)?] ) 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(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,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(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-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(-)?] 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(-)?] 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(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,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(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-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(-)?] 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(-)?] 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(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=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=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=884d9f9895686aec1c344c791fbb987e
+_md5_=02ba882d03ddfaa70339e04dea758bc7
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
index 135ada55f40c..8cfba80c27af 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins 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 nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1+
 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/gst-plugins-base-1.14.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/gstreamer-1.14.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(-)?] >=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(-)?] >=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(-)?] 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(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=36371d0727cad9d38499be90116a9668
+_md5_=38f28629e060b60b981ad23a021d4ea2
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
index 10209df29e1e..5d44d5fa1d19 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.14.3
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins 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 nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 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.14.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.14.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(-)?] >=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-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b3b47065a1a170776f51cfdf14a92c9
+_md5_=12c3d483265a1d196109270776b28d1b
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
index 5e822a4216c7..29e666201427 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
@@ -4,10 +4,10 @@ DESCRIPTION=A GStreamer based RTSP server
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html
 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
+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.14.2: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.14.2: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.14.2: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-plugins/gst-plugins-srtp-1.14.2: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? ( >=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.14.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d07166cdaef7bcf1b04594541d34ffdd
+_md5_=c0a40b3096d11ea627435d62f19958c5
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.4 b/metadata/md5-cache/media-libs/gstreamer-1.14.4
index 00c7ea62f839..f205dbfc3c7a 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.4
@@ -4,10 +4,10 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 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(-)?] caps? ( 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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,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/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,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.13.1:1.0
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	e85f015e815dd463b0c206d781ef45a5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ec8357d645feaf8d8620cad4076c794
+_md5_=9818f82bbc479b05d87becdc636ceb1b
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
index 99dab206bc98..1161d9d3e926 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.14.3
@@ -4,7 +4,7 @@ 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
+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.14.3:1.0[introspection?] >=media-libs/gst-plugins-base-1.14.3:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.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=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.14.3.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f333b6273f86f2baf0953d32327804bc
+_md5_=fe25519f3667ce531264b26f49298199
diff --git a/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1 b/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
index d5e21ee6bef0..101fcf345c93 100644
--- a/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Open-source HEVC encoder
 EAPI=7
 HOMEPAGE=http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/ultravideo/kvazaar/archive/v1.2.0.tar.gz -> kvazaar-1.2.0.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v1.2.1.tar.gz -> greatest-1.2.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f2597f6f510944d337bdb2b10a5f0967
+_md5_=ed58ae46ba347b9ac6678b89461b49a5
diff --git a/metadata/md5-cache/media-libs/libextractor-1.8-r1 b/metadata/md5-cache/media-libs/libextractor-1.8-r1
index ec261ac20bfd..26018db7c0ea 100644
--- a/metadata/md5-cache/media-libs/libextractor-1.8-r1
+++ b/metadata/md5-cache/media-libs/libextractor-1.8-r1
@@ -1,14 +1,14 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/iso-codes dev-libs/glib:2 <media-gfx/exiv2-0.27:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/tidy-html5 ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
+DEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/tidy-html5 ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 DESCRIPTION=Library to extract metadata from files of arbitrary type
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libextractor/
 IUSE=apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-3
-RDEPEND=app-text/iso-codes dev-libs/glib:2 <media-gfx/exiv2-0.27:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/tidy-html5 ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
+RDEPEND=app-text/iso-codes dev-libs/glib:2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl apparmor? ( sys-libs/libapparmor ) archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/tidy-html5 ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !sci-biology/glimmer
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libextractor/libextractor-1.8.tar.gz
-_md5_=6493036eb4f1e8619973a5af3a849cd8
+_md5_=95372453e20979dff14edcefcd756b1c
diff --git a/metadata/md5-cache/media-libs/libggi-2.2.2-r1 b/metadata/md5-cache/media-libs/libggi-2.2.2-r1
index 00ef019c7808..bcfab232f6f9 100644
--- a/metadata/md5-cache/media-libs/libggi-2.2.2-r1
+++ b/metadata/md5-cache/media-libs/libggi-2.2.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Provides an opaque interface to the display's acceleration function
 EAPI=7
 HOMEPAGE=https://ibiblio.org/ggicore/packages/libggi.html
 IUSE=3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=media-libs/libgii-1.0.2 aalib? ( >=media-libs/aalib-1.2-r1 ) svga? ( >=media-libs/svgalib-1.4.2 ) X? ( x11-libs/libXt x11-libs/libXxf86dga x11-libs/libXxf86vm )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libggi-2.2.2.src.tar.bz2
-_md5_=4620b191f374fe2254aa50498f077844
+_md5_=4d57061bf36657eba300710ea36c83b9
diff --git a/metadata/md5-cache/media-libs/libldac-2.0.2-r1 b/metadata/md5-cache/media-libs/libldac-2.0.2-r1
new file mode 100644
index 000000000000..0624b4b17e56
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libldac-2.0.2-r1
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=LDAC codec library from AOSP
+EAPI=7
+HOMEPAGE=https://android.googlesource.com/platform/external/libldac/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/EHfive/ldacBT/releases/download/1.1-ldac.2.0.2/ldacBT.tar.gz -> libldac-2.0.2-1.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b225544c0cc1585123e8e7d71c074c96
diff --git a/metadata/md5-cache/media-libs/libpng-1.2.57 b/metadata/md5-cache/media-libs/libpng-1.2.57
deleted file mode 100644
index b261a11ba406..000000000000
--- a/metadata/md5-cache/media-libs/libpng-1.2.57
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=media-libs/libpng-1.2*:0 app-arch/xz-utils >=app-portage/elt-patches-20170815
-DESCRIPTION=Portable Network Graphics library
-EAPI=6
-HOMEPAGE=http://www.libpng.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 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=libpng
-RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=media-libs/libpng-1.2*:0
-SLOT=1.2
-SRC_URI=mirror://sourceforge/libpng/libpng-1.2.57.tar.xz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4a9dbc7ef5d9035d017b3246ef5283f8
diff --git a/metadata/md5-cache/media-libs/libpng-1.5.28 b/metadata/md5-cache/media-libs/libpng-1.5.28
deleted file mode 100644
index 894c615a0ea1..000000000000
--- a/metadata/md5-cache/media-libs/libpng-1.5.28
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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(-)?] !=media-libs/libpng-1.5*:0 app-arch/xz-utils >=app-portage/elt-patches-20170815
-DESCRIPTION=Portable Network Graphics library
-EAPI=6
-HOMEPAGE=http://www.libpng.org/
-IUSE=apng neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=libpng
-RDEPEND=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(-)?] !=media-libs/libpng-1.5*:0
-SLOT=1.5
-SRC_URI=mirror://sourceforge/libpng/libpng-1.5.28.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.5.28-apng.patch.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3777e62829f4d32268fd3eae9b8ab947
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.35-r1 b/metadata/md5-cache/media-libs/libpng-1.6.35-r1
index 5dd15a7135bd..d27e38097dcb 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.35-r1
+++ b/metadata/md5-cache/media-libs/libpng-1.6.35-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=6
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng cpu_flags_x86_sse neon 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.35.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.35-apng.patch.gz )
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=536ca7132eb1111f1bf05d5f9e9fc8cb
+_md5_=e6d949e1dfbf49fd597db220465a8413
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.3.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.3.0
index f0589e2e68d8..37fef26b376b 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.3.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-0.3.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7651fbbdde1dddd865f771c20100a3c8
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.9 b/metadata/md5-cache/media-libs/libsdl2-2.0.9
index 4fb834d479ec..58d7f7e1b792 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.9
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) kms? ( >=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(-)?] >=media-libs/mesa-9.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(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) vulkan? ( video ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ef85104f11d995a663668309cc7ddef
+_md5_=85802fc70fe0ade16a9e4c72520d451d
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-2.1.1 b/metadata/md5-cache/media-libs/libsoundtouch-2.1.1
new file mode 100644
index 000000000000..3db9f833433a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsoundtouch-2.1.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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=Audio processing library for changing tempo, pitch and playback rates
+EAPI=7
+HOMEPAGE=https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch
+IUSE=cpu_flags_x86_sse openmp 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 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1
+SLOT=0/1
+SRC_URI=https://gitlab.com/soundtouch/soundtouch/-/archive/2.1.1/soundtouch-2.1.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7cee028d01772428c0a1582f7ca78506
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-2.1.2 b/metadata/md5-cache/media-libs/libsoundtouch-2.1.2
new file mode 100644
index 000000000000..8c732ad4215e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsoundtouch-2.1.2
@@ -0,0 +1,12 @@
+BDEPEND=>=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(-)?] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Audio processing library for changing tempo, pitch and playback rates
+EAPI=7
+HOMEPAGE=https://www.surina.net/soundtouch/ https://gitlab.com/soundtouch/soundtouch
+IUSE=cpu_flags_x86_sse openmp 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 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1
+SLOT=0/1
+SRC_URI=https://gitlab.com/soundtouch/soundtouch/-/archive/2.1.2/soundtouch-2.1.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=663160b4649ad4ff38dc87d7c85132b6
diff --git a/metadata/md5-cache/media-libs/mlt-6.12.0 b/metadata/md5-cache/media-libs/mlt-6.12.0
index cd14442a8a94..4945b3fbed66 100644
--- a/metadata/md5-cache/media-libs/mlt-6.12.0
+++ b/metadata/md5-cache/media-libs/mlt-6.12.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
 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
 LICENSE=GPL-3
-RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.12.0/mlt-6.12.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=85f0459494fe876ea9c1578e92decdbb
+_md5_=14c3edb55f94c4421c37e585abae8b15
diff --git a/metadata/md5-cache/media-libs/mlt-6.12.0-r1 b/metadata/md5-cache/media-libs/mlt-6.12.0-r1
new file mode 100644
index 000000000000..95e32891d043
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mlt-6.12.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 ) virtual/pkgconfig compressed-lumas? ( virtual/imagemagick-tools[png] ) lua? ( >=dev-lang/swig-2.0 virtual/pkgconfig ) python? ( >=dev-lang/swig-2.0 ) ruby? ( >=dev-lang/swig-2.0 )
+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
+LICENSE=GPL-3
+RDEPEND=>=media-libs/libebur128-1.2.2 ffmpeg? ( libav? ( >=media-video/libav-12: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_python3_7(-),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-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.12.0/mlt-6.12.0.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f8680d338eafe217a47f0232a539cfda
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.13 b/metadata/md5-cache/media-libs/openimageio-1.8.13
deleted file mode 100644
index 405e2fca4f1d..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-1.8.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library for reading and writing images
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype 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_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-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 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.13.tar.gz -> openimageio-1.8.13.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=351852aeec9262c5e5b6a9597cfc59a7
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17 b/metadata/md5-cache/media-libs/openimageio-1.8.17
new file mode 100644
index 000000000000..5e029fc7b1a0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.17
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] )
+DESCRIPTION=A library for reading and writing images
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+IUSE=colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype 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_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
+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 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=de670f9b5bf5f73f0cbdf10634671c69
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.7 b/metadata/md5-cache/media-libs/openimageio-1.8.7
deleted file mode 100644
index a15bde6c9cbd..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-1.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= ) doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library for reading and writing images
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype 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_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 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 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 colorio? ( media-libs/opencolorio:= ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( virtual/glu virtual/opengl media-libs/glew:= ) ptex? ( media-libs/ptex:= ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-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 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.7.tar.gz -> openimageio-1.8.7.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b2e1b982ef0a32bcef94dbcf0602ae67
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1 b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
index 789a1d258a7a..57cc3b847ee5 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=https://www.openjpeg.org
 IUSE=doc 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94aa264a0136709c268f21ba60e282c9
+_md5_=1cab2dc467114e29ed9228f17ccddae2
diff --git a/metadata/md5-cache/media-libs/opusfile-0.6 b/metadata/md5-cache/media-libs/opusfile-0.6
index be7ebe1b0f40..c7f988953722 100644
--- a/metadata/md5-cache/media-libs/opusfile-0.6
+++ b/metadata/md5-cache/media-libs/opusfile-0.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure
-DEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl:= ) doc? ( app-doc/doxygen )
+DEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen )
 DESCRIPTION=A high-level decoding and seeking API for .opus files
 EAPI=5
 HOMEPAGE=https://www.opus-codec.org/
 IUSE=doc fixed-point +float +http static-libs
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
-RDEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl:= )
+RDEPEND=media-libs/libogg media-libs/opus http? ( dev-libs/openssl:0= )
 REQUIRED_USE=^^ ( fixed-point float )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/opus/opusfile-0.6.tar.gz
-_md5_=98f50fcf8956ca353b15b218385b5f06
+_md5_=90d47c8fc5f37c2f4ab14054fdc5d7c1
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.1-r1 b/metadata/md5-cache/media-libs/phonon-4.10.1-r1
deleted file mode 100644
index e388d4115345..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-DESCRIPTION=KDE multimedia API
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug designer gstreamer pulseaudio +vlc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.10.1/phonon-4.10.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f631a9b45c30d7116537170716f2ec7
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.2 b/metadata/md5-cache/media-libs/phonon-4.10.2
new file mode 100644
index 000000000000..8365ce49982d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-4.10.2
@@ -0,0 +1,15 @@
+BDEPEND=kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
+DESCRIPTION=KDE multimedia API
+EAPI=7
+HOMEPAGE=https://phonon.kde.org/
+IUSE=debug designer gstreamer pulseaudio +vlc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
+RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/4.10.2/phonon-4.10.2.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e6654a8f007f948e06ac3805747feb59
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1-r1 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1-r1
deleted file mode 100644
index ed62f30586dd..000000000000
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
-DESCRIPTION=Phonon VLC backend
-EAPI=7
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.1/phonon-backend-vlc-0.10.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31faa5de0ffba6f85f4863156aa5399b
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.2 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.2
new file mode 100644
index 000000000000..3886de59d8c5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.10.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
+DESCRIPTION=Phonon VLC backend
+EAPI=7
+HOMEPAGE=https://phonon.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.2/phonon-backend-vlc-0.10.2.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c4ea7fd98ed8d0d0ae4d75814352df0b
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.4 b/metadata/md5-cache/media-libs/sdl2-image-2.0.4
index 9dbf5fa0b2aa..b4e6937002f0 100644
--- a/metadata/md5-cache/media-libs/sdl2-image-2.0.4
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Image file loading library
 EAPI=7
 HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
 IUSE=gif jpeg png static-libs tiff webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.4.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=04b2a9e84e7491102514ac437acd0aa6
+_md5_=0af65a65ade0bfc327440998d1c7f02d
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
index 83ed2d7fed2a..c2ce9a23723c 100644
--- a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer Mixer Library
 EAPI=7
 HOMEPAGE=https://www.libsdl.org/projects/SDL_mixer/
 IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 opus playtools static-libs timidity tremor vorbis +wav abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~x86
+KEYWORDS=amd64 ~arm ~hppa x86
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !mad? ( media-sound/mpg123[abi_x86_32(-)?,abi_x86_64(-)?,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/opusfile-0.2 ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) tremor? ( vorbis )
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.4.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=c8a4a445039ecefb3f036d39e718da06
+_md5_=e449675d058491d26b6f29626ae6475f
diff --git a/metadata/md5-cache/media-libs/vidstab-1.1.0 b/metadata/md5-cache/media-libs/vidstab-1.1.0
new file mode 100644
index 000000000000..f423fba7b690
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vidstab-1.1.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Video stabilization library
+EAPI=7
+HOMEPAGE=http://public.hronopik.de/vid.stab/
+IUSE=openmp cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz -> vidstab-1.1.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fc0a36c1e78eb44d978f4e6044704cd2
diff --git a/metadata/md5-cache/media-libs/vidstab-1.1.0-r1 b/metadata/md5-cache/media-libs/vidstab-1.1.0-r1
new file mode 100644
index 000000000000..f473b407edf7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vidstab-1.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=Video stabilization library
+EAPI=6
+HOMEPAGE=http://public.hronopik.de/vid.stab/
+IUSE=openmp cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 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+
+SLOT=0
+SRC_URI=https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz -> vidstab-1.1.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=065930e2c83c7a7a6578f0ac081a6dbc
diff --git a/metadata/md5-cache/media-libs/vidstab-9999 b/metadata/md5-cache/media-libs/vidstab-9999
new file mode 100644
index 000000000000..51cee77f67cb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vidstab-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Video stabilization library
+EAPI=6
+HOMEPAGE=http://public.hronopik.de/vid.stab/
+IUSE=openmp cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 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+
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0cfc959fa7dcd57a0356de4e5662be52
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r1 b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
index 064738bc35fb..95d63524c82d 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/brotli virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Encode/decode WOFF2 font format
 EAPI=6
 HOMEPAGE=https://github.com/google/woff2
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3785132f289e23393a3c8b10d408f043
+_md5_=bba9f5c6c19309288e31b41c7fe2184a
diff --git a/metadata/md5-cache/media-libs/zimg-2.5 b/metadata/md5-cache/media-libs/zimg-2.5
index 6529b7f3b0a6..9fe9b04978ed 100644
--- a/metadata/md5-cache/media-libs/zimg-2.5
+++ b/metadata/md5-cache/media-libs/zimg-2.5
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=5
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.5.tar.gz -> zimg-2.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14eed79af09b460c1ad95b31b7fb3af1
+_md5_=260f0f8af0830f11b73596a1ed0fba77
diff --git a/metadata/md5-cache/media-libs/zimg-2.7.4 b/metadata/md5-cache/media-libs/zimg-2.7.4
index ab8a7bebfd16..3bb956cb38a1 100644
--- a/metadata/md5-cache/media-libs/zimg-2.7.4
+++ b/metadata/md5-cache/media-libs/zimg-2.7.4
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=5
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.7.4.tar.gz -> zimg-2.7.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ecf982f1590acd2b71a1938d1f3a8fe
+_md5_=32602856765028414df80be8d6f87737
diff --git a/metadata/md5-cache/media-libs/zimg-2.7.5 b/metadata/md5-cache/media-libs/zimg-2.7.5
index eb421b4b6d59..475675891984 100644
--- a/metadata/md5-cache/media-libs/zimg-2.7.5
+++ b/metadata/md5-cache/media-libs/zimg-2.7.5
@@ -4,9 +4,9 @@ DESCRIPTION=Scaling, colorspace conversion, and dithering library
 EAPI=5
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.7.5.tar.gz -> zimg-2.7.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ecf982f1590acd2b71a1938d1f3a8fe
+_md5_=32602856765028414df80be8d6f87737
diff --git a/metadata/md5-cache/media-libs/zita-convolver-3.1.0 b/metadata/md5-cache/media-libs/zita-convolver-3.1.0
index 9bb90f911ce4..ce9f26b00d52 100644
--- a/metadata/md5-cache/media-libs/zita-convolver-3.1.0
+++ b/metadata/md5-cache/media-libs/zita-convolver-3.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ library implementing a real-time convolution matrix
 EAPI=5
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html
 IUSE=cpu_flags_x86_sse
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-3.1.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=271b6179bd28d842db937feed8a8b724
+_md5_=c848ac3090299e8f1fe700b95a918ee4
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index c2b7e87215f4..95c65a2fc3ee 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/alsa-plugins-1.1.7 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7
deleted file mode 100644
index 320e4c049a2f..000000000000
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=ALSA extra plugins
-EAPI=7
-HOMEPAGE=http://www.alsa-project.org/
-IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=mirror://alsaproject/plugins/alsa-plugins-1.1.7.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1bf773f1b5505315410d52a84165b6cf
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7-r1
new file mode 100644
index 000000000000..17a5584a29b6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=ALSA extra plugins
+EAPI=7
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=mirror://alsaproject/plugins/alsa-plugins-1.1.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c4e49ddbea51f827efda4c377db886ab
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8 b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8
new file mode 100644
index 000000000000..6dd3da64c2e0
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.1.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=ALSA extra plugins
+EAPI=7
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream abi_x86_32 abi_x86_64 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 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) 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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) 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(-)?] ) speex? ( >=media-libs/speex-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/speexdsp[abi_x86_32(-)?,abi_x86_64(-)?,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=mirror://alsaproject/plugins/alsa-plugins-1.1.8.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e82b7b2c322610e6972e86fbd841708a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
index 363aeb0b61e5..5d30bd1b81f1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=ATSC A/52 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-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(-)?] 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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=baf43c51aac19db0d5a93f79c09b197a
+_md5_=10172dc8c6ed2bcbe287bf9a27f5a67d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
index ccf88bfffa02..5ced7948627d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=AMRNB encoder/decoder and AMRWB 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
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b45af0a1048d3cb7e4d38247706e20e9
+_md5_=32516fecc9b34e9dd940122873ae2f75
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
index 136e808060bc..c80ad46ce72b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5218886e373451d053a2c6f78ec0f58
+_md5_=4afa0b0d4a31b2e3a42e563ae6007611
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
index 4bafac3e00c3..15d5a02595a9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=51b642c2b31a8fd206be8198b318d369
+_md5_=c38c9985028bf249c5728d7e25073921
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
index c91807faa23b..8f4d139a0bfd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bs2b-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bdca409278716fd7fea776411bdb5225
+_md5_=42e6a266f7f1ce0ddc0bfc77cb52e468
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
index e0affd50bf20..0b57b9f05d5c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f9624b0eca3752eff0b3a9a3216384c8
+_md5_=1dfb3ed8a6f22e09087bb454209aba45
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
index 6db234c4238c..fe49a561d55c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=CD Audio Source (cdda) 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 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-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(-)?] >=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-base-1.14.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-base/gst-plugins-base-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=793fc12057327ad52f82876262f657bf
+_md5_=33d3d4df20827bc2c4723d758f7961d6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
index 0bbf13268943..076d4ffbc579 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14b4d2f8f393b3d8c27f41803dd6740e
+_md5_=b2b8f3097b01760ba0adf6b531467601
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
index fb9f31f7488c..833d16381ef9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6c51f50a92ed8d776e33fdaf846f32f1
+_md5_=200c3190eea96d9f0ef6be7b5510ec2f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
index fe842482f530..b15278a66bac 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ~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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=53fa6dd48a19ae69d851bee28597d561
+_md5_=b67a14bdd8fcfc7170371a4ffcef5153
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4
index ca5b5ee0eea3..c5672a0e8253 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=DV demuxer and 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.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.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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=de27df373625818b686aa82fd34098b0
+_md5_=6a8093b3515fba64692bc4fdcda13dda
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
index 511677c2097e..78e8a88beb59 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d0e408b558658edaa233863483dcc7b6
+_md5_=e5a37742ee1c25de31afee7a918a6fe4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
index be36fcf6f61b..89102b4191ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=DVD read 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ebb5698de92340ebe23426207143f12b
+_md5_=82c7e4d6eb7e08bfe3d3c2a0b09b3937
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
index 0754c1170d8b..36abf849c1d7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32c3ae60c16c9bce66a3ac2d2f1a0947
+_md5_=115adfb6f74d7a658b1c9ad17a0f930d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
index 0eac5106b2f3..d4d98718062f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13f03513785447df3a4616525869e96f
+_md5_=4b951b333a9ffc2c882035ae3534998f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
index 1f7d596bbbb4..1de7d37181a5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=FLAC encoder/decoder/tagger 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=324257900c03fb97d8d88a3e3ed87d65
+_md5_=2fa3950bfc9889936311fcc09906f239
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
index 73e2f2dc8e1f..a8f0e71f8cb4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
@@ -4,11 +4,11 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a39bcc9c822c482b66b087f065fc71cb
+_md5_=203a2442ab71964569b204144f3e5b24
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
index 84733522425c..3b70eba70816 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+egl gles2 +opengl 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.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(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15: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(-)?] gles2? ( >=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(-)?] ) opengl? ( >=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(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=828aa5d2f6e37629f04f7e6b17d41197
+_md5_=69bcd4948675e40a895c39843ab176b0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
index 461479b10676..bd023816d85e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d05412a938e3a29c49e030f7268129b8
+_md5_=3c57ab7396166aa34773540835b7ce41
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
index 354e6a0e7a80..81acb8cf61db 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.14.4
@@ -4,11 +4,11 @@ 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0fe3d81601982145f3138669317b64d1
+_md5_=c601a99e90179a5986d71b7327ce1685
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4
index 82577ec3b185..0bcd444ee5fc 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=JPEG image 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3b24579eeb5d3a7e7f4c64c696077e8f
+_md5_=f8397738c39fdc81867398203271b4ca
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
index 8f7a5382f981..a43852c56342 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a340246d9c8f17d20487c23cd41004c2
+_md5_=93dc829f44dc8ecb6e0edefbddd004f0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4
index 14dba7663268..b53e59669966 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3e8bf51a2b5898b1cb9d296a0d16fb0b
+_md5_=67ad027836c1faabfc2e81a69842bb2e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.3.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.3.4.5
index c83c7c880035..32c4142f437f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.3.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.3.4.5
@@ -4,11 +4,11 @@ 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 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.14.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.14.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(-)?] <media-video/ffmpeg-4 ) libav? ( 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(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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.14.4.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-3.4.5.tar.bz2 )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b8a0f2e2d9a53ffae5154a64007c0e4d
+_md5_=786ea63a9194d4439b5d5600039e625b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
index 209aad58a957..bf68b9ab0b7e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=152e1cc3cda361436bfa287bbc5ed08a
+_md5_=e11ad9fd5c11a6b856b69d9d58c20f86
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
index 2145c8722f5c..89b321a07951 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c1c289dbf0be7bcd09c6c1f94aaecefe
+_md5_=bb8537876bbf97aa9f21280b13d4a791
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
index 45bcf4b1a082..f268fdf3fa84 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=PNG image 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=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fbb773324ce272668f6bf57fccab01f3
+_md5_=d16832092cc27013f52b5a5ea49c7856
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4
index 760889cee722..5b6614fed625 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Visualization 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.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-plugins/libvisual-plugins-0.4.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.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-base-1.14.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-base/gst-plugins-base-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7b0f2d1ef41011da78bc67dae61bccf2
+_md5_=7c5a3de28c39989512993c8be2de1fc4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
index fc8e1a487843..91157116baf8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lv2-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9954a51b4a429ce79df84829ee24dab
+_md5_=4db12831dbce66a1bc7d18eb054976a5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
index b53f6ea0b71b..7b5ef3fb3ce7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.14.3
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.14.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.14.3:1.0[alsa?,ogg?,theora?,vorbis?,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(-)?] >=media-libs/gst-plugins-good-1.14.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.14.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.14.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.14.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-plugins/gst-plugins-cdio-1.14.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.14.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.14.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.14.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-bad-1.14.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.14.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-plugins/gst-plugins-a52dec-1.14.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-plugins/gst-plugins-dvdread-1.14.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-plugins/gst-plugins-mpeg2dec-1.14.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-plugins/gst-plugins-resindvd-1.14.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.14.2: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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.14.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.14.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.14.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.14.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.14.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.14.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.14.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.14.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.14.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-plugins/gst-plugins-mpg123-1.14.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.14.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.14.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.14.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.14.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.14.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.14.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.14.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-plugins/gst-plugins-mpeg2dec-1.14.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.14.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.14.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.14.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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=098dbdc7d6590c72237bd3927a761c8c
+_md5_=b01128af5c81d2c04a2f8989825f6fad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
index abc0789d6399..b9c1a7f42b5d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57424b7fd54e58f6259bd60842d17ec6
+_md5_=4bc5b14c376a089727a2d45b147ba468
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
index a8afa297c263..529d413f3547 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 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 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4827323eb0ccbfd3064a4900aba3c803
+_md5_=b848d322a08be708870448feb8d818c6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
index 5cff842b271b..feb122b61e6b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=221f5207cdeb21c5a39a0dddcccdace3
+_md5_=dc6f15c41308cc771128f35cff74b4bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
index 03db9a6d1fbd..142faa92d5e8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 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 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,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-good-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bd6edcbbc51d0385d256d5d55d078fac
+_md5_=a05de4cf0aeb8acced561cc2a89b8512
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
index ba256f488aee..43a1d1e41b03 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=MP3 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 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=95568b13ddb9dd4e09306751bd157b6a
+_md5_=b53c08eb10118d4ebeaf6ae8a2788e4e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
index 1ea260a60c8f..c0096a297bca 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f8f2bb1c42fad8d3c209e8f51eda4dff
+_md5_=0faf0da015261268cdfddbbea05d7209
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
index f59435573e34..e4e16e214771 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=925ca5644fe6a3ef29cfe8ffdd1604a9
+_md5_=430c6ec5461fd5aea4b4646ce3edf1d4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
index 2370a71b069a..ef785e790aa0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=059120661418b415ed87e41676a5030a
+_md5_=5de44df1b128ae1e5b3820adfe8a916e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
index fe3c27133785..81b8a8331597 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=718bb37e23975e4a26d59b24c186482b
+_md5_=5ef84c9aff43cb7f79bb79be591eee3e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
index b848bbc2d6e4..ba19f9363ee8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-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(-)?] >=media-libs/gst-plugins-base-1.14.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(-)?,ogg] >=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-base-1.14.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-base/gst-plugins-base-1.14.4.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=68db6ca1a8ac00a9b277a4e92389f0a3
+_md5_=c93892b417b95d124e3e1e78a6737496
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
index ba7528b02e29..13c5f5005555 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=OSS (Open Sound System) 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f6c11bc14178381fce452bcbdef0f1c
+_md5_=05e85d3b020252ec3450e68d99035072
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
index c2a1f6250900..4052901e6ffe 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=PulseAudio sound server 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.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-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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c6d9651e86edf45b51ec1e4acf697a2
+_md5_=d10a42bae56b5bd0cf23737fa56e6e85
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4
index 4c46d59eeb63..b2fd33b63f52 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Fiwewire DV/HDV capture 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 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef4a466148f20033aefa315488485c41
+_md5_=c93275e37ed262bc0d125d94b32a83ad
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
index e86be5753a85..1e6805b187cb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.14.3
@@ -4,11 +4,11 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips 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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c612651ed10c75ba800cc802832eb9ab
+_md5_=28825cdf313d2ddf572d1d8e5a409725
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
index 07e27ea1a9f5..f3f9f45aace1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=319f8eb617505aadcca18705802c93fc
+_md5_=3fd13829d98d8e1402024df6eaaed767
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4
index 8ef1b1dfd768..05d50ce40495 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Icecast server 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=~alpha ~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7f55d8d3fc629cc0cea2647236c5bece
+_md5_=0e6e1336ced3143382653e4e328d728e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
index 6db928d1cf20..dfce847f4289 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Sid 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1: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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fdad16833d3ca0dfd5fd6d6f26091382
+_md5_=3b722464f1e49728689fcd9477dfda89
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
index 89ca15a551ca..50d2d083e3ec 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=45ccdf7f6d7e88063b4e55cf0817cb18
+_md5_=74bbd9e616691249b14bd49be2f18648
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
index cb44161baa08..4df64a276288 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Beats-per-minute detection and pitch controlling plugin for GStreame
 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6bad2d9502ff835ebfeb32e009aa6098
+_md5_=e8b77ac80c300d1e0958e3daec3a58ef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
index bb5579743c2e..88f957d46b84 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP client 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48: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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9ec663abcbfbf39057c62388ec031f1
+_md5_=6e1934f03db8107b66b481aaed89573b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4
index 67a9626cd2dc..ea5b0ae9f807 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Speex 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=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f2c95a4ca94f6069ce34272af7807c9
+_md5_=26ac6866a1c34a4dc6f11736d02723c4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
index 27f75049c439..fc3771358d5e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.14.3
@@ -4,11 +4,11 @@ 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 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.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(-)?] >=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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=03850b5bc69211df226b11f40e204c6a
+_md5_=95f8123cab6718c87790ac4356340550
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4
index c4d17c831a91..7bdac657b15e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=ID3v2/APEv2 tagger 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=87eb0eca2b6dcca4f7b181c71f599fd4
+_md5_=c25fa3e6504c9a20946a764e2c79dfea
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4
index a65b9e0de316..4153003138e1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG2 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
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=44cbfbca9d09e7d3de19947e22e7bc61
+_md5_=ec1b2ffd1a15af5ce5c3bfac9884ae56
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
index 4fa6a88fab38..e4e6db75a65b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=94fb84c8462730ff6a12919782eaf437
+_md5_=f1c8b92684e4a01935de2783ee7f4334
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
index b32b9d130de1..18f9c46b7c20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=media-libs/gst-plugins-base-1.14.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(-)?] udev? ( >=virtual/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=852de2c6f4b20268ed4997c035dead27
+_md5_=c75375b01840044751d0784290940f71
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
index a4d0cff6eb9e..4075b0a91f35 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin for GStrea
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
 IUSE=+drm +egl gles2 +opengl 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 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=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(-)?] >=media-libs/gstreamer-1.14.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.14.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-bad-1.14.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(-)?] >=x11-libs/libva-1.4.0:=[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(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.14.3:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,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? ( >=media-libs/gst-plugins-base-1.14.3:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,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(-)?] ) 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(-)?] ) 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/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,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 gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.14.3.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=07e6df7a4479c5b22d8c4df43d9fd800
+_md5_=0be1b62aac92fa565d936b0a867d8915
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
index 9d6c9e464139..d6ab32075ae6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ca613cee763931f95691426df889afd9
+_md5_=d5d4d7c53b516b1d39a18f2d5754a1cb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
index 33f5aff345b3..809507584197 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c7427ef1b7ec88286bf799567d6017ef
+_md5_=9dbd8a28f0dab6594c83283a47a1aa84
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4
index 3db8ec846bab..8a36911e33ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=VP8/VP9 video 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=798e608933aa42a3420d6547c1a0dee9
+_md5_=fe4cc578e34b56490926c419a8b7f67e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
index fa3fce9ca675..27403bc34bab 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Wavpack audio 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=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5207362fcc127ff811dfdf0d0444ad8e
+_md5_=98a16dc8bfd4ba6f75c840dd6820b68a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
index 36af055f0425..6c61b7917af0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=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(-)?] >=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-ugly-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=761b5b63321592a1fb1d091ab70503d2
+_md5_=babd2a033991b513c3a1c8fe69650707
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
index 6a8ab8710c84..d482b36aead2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.14.3
@@ -4,11 +4,11 @@ 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
+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.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=facfab39b25b8b18589c0509955453b3
+_md5_=68300d3e60c767e222be4fc0f7a4ed6f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
index 4d07e2ac31be..5c6c168ed189 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream 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 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.2:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-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/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=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-good-1.14.2: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-good/gst-plugins-good-1.14.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f1ea43b94c08e43749cf02afcf243c99
+_md5_=2f9976303199629553cabe8343aa35bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
index b2fa623e05b8..45fab299940e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream 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 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.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(-)?] >=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/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=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-good-1.14.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f1ea43b94c08e43749cf02afcf243c99
+_md5_=2f9976303199629553cabe8343aa35bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4
index 1a71b6ce7330..8e92ed499876 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=X11 video capture stream 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 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.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(-)?] >=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/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=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-good-1.14.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-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=afdb7a58510582916055eb2158c68d6c
+_md5_=2bd97ca69bc8f5258e9c4c108abddd2c
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
index 64f5625ce620..b5ef4546b257 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/libkipi-18.08.3:5= >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 flashexport? ( >=kde-frameworks/karchive-5.52.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.52.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.9.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e3ac1fab866c9c284e0d528869c4dcbd
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.3 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.3
new file mode 100644
index 000000000000..b0d8d3cb0538
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=MythTV PVR for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/janbar/pvr.mythtv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
+SLOT=0
+SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.3-Leia.tar.gz -> kodi-pvr-mythtv-5.10.3.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=13c5e35bc4fc72539cedfd5ab9d034a6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11
new file mode 100644
index 000000000000..0b2fb9090988
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's NextPVR client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/3.3.11-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.11.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2 b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
index 49ec3c40ed0a..e47c20e2ebe9 100644
--- a/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
+++ b/metadata/md5-cache/media-plugins/mda-lv2-1.2.2
@@ -3,10 +3,10 @@ DEPEND=media-libs/lv2 || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[t
 DESCRIPTION=LV2 port of the MDA plugins by Paul Kellett
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/mda-lv2/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=media-libs/lv2
 SLOT=0
 SRC_URI=http://download.drobilla.net/mda-lv2-1.2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	078a2344a27766b776071d0b9718679d
-_md5_=ed21f62ab9717a12925ab83853bde461
+_md5_=509fd4c7750b5068ad006d8f78fcce64
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 251f6b2aba1a..f9ea3e97763f 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/js8call-0.10.0 b/metadata/md5-cache/media-radio/js8call-0.10.0
deleted file mode 100644
index 602caffaa933..000000000000
--- a/metadata/md5-cache/media-radio/js8call-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Weak signal ham radio communication
-EAPI=6
-HOMEPAGE=https://groups.io/g/js8call
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
-SLOT=0
-SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.10.0.tar.bz2 -> js8call-0.10.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=287db9098afffac5d074133cfdfe29b2
diff --git a/metadata/md5-cache/media-radio/js8call-0.10.1 b/metadata/md5-cache/media-radio/js8call-0.10.1
deleted file mode 100644
index bdee81a46e92..000000000000
--- a/metadata/md5-cache/media-radio/js8call-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Weak signal ham radio communication
-EAPI=6
-HOMEPAGE=https://groups.io/g/js8call
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
-SLOT=0
-SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.10.1.tar.bz2 -> js8call-0.10.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=287db9098afffac5d074133cfdfe29b2
diff --git a/metadata/md5-cache/media-radio/js8call-0.12.0 b/metadata/md5-cache/media-radio/js8call-0.12.0
new file mode 100644
index 000000000000..75ecc43b3d2b
--- /dev/null
+++ b/metadata/md5-cache/media-radio/js8call-0.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Weak signal ham radio communication
+EAPI=6
+HOMEPAGE=https://groups.io/g/js8call
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
+SLOT=0
+SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.12.0.tar.bz2 -> js8call-0.12.0.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=14cd3111b1fc8b0b63817ec804fb15a2
diff --git a/metadata/md5-cache/media-radio/js8call-0.8.0 b/metadata/md5-cache/media-radio/js8call-0.8.0
deleted file mode 100644
index a137408b4368..000000000000
--- a/metadata/md5-cache/media-radio/js8call-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Weak signal ham radio communication
-EAPI=6
-HOMEPAGE=https://groups.io/g/js8call
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
-SLOT=0
-SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.8.0.tar.bz2 -> js8call-0.8.0.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e3c3a23fee1f00201b2523e193aa2607
diff --git a/metadata/md5-cache/media-radio/js8call-0.8.2 b/metadata/md5-cache/media-radio/js8call-0.8.2
deleted file mode 100644
index da1a806ec6a3..000000000000
--- a/metadata/md5-cache/media-radio/js8call-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Weak signal ham radio communication
-EAPI=6
-HOMEPAGE=https://groups.io/g/js8call
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
-SLOT=0
-SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.8.2.tar.bz2 -> js8call-0.8.2.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=287db9098afffac5d074133cfdfe29b2
diff --git a/metadata/md5-cache/media-radio/js8call-0.8.3 b/metadata/md5-cache/media-radio/js8call-0.8.3
deleted file mode 100644
index a7fe27a26041..000000000000
--- a/metadata/md5-cache/media-radio/js8call-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Weak signal ham radio communication
-EAPI=6
-HOMEPAGE=https://groups.io/g/js8call
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc media-libs/hamlib doc? ( dev-ruby/asciidoctor )
-SLOT=0
-SRC_URI=https://bitbucket.org/widefido/js8call/get/v0.8.3.tar.bz2 -> js8call-0.8.3.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=287db9098afffac5d074133cfdfe29b2
diff --git a/metadata/md5-cache/media-radio/tqsl-2.3.1 b/metadata/md5-cache/media-radio/tqsl-2.3.1
index 702377b9b65d..f418ed37808c 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.3.1
+++ b/metadata/md5-cache/media-radio/tqsl-2.3.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0= sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=ARRL Logbook of the World
 EAPI=6
 HOMEPAGE=http://www.arrl.org/tqsl-download
 KEYWORDS=~amd64 ~x86
 LICENSE=LOTW
-RDEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
+RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
 SLOT=0
 SRC_URI=mirror://sourceforge/trustedqsl/tqsl-2.3.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c51740016c66b94c26dcb37d8eae4263
+_md5_=8572db60eff8721c78d3b5a6cf25211e
diff --git a/metadata/md5-cache/media-radio/tqsl-2.4.1 b/metadata/md5-cache/media-radio/tqsl-2.4.1
index 3a5bf783ae66..c238d0f3c8a4 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.4.1
+++ b/metadata/md5-cache/media-radio/tqsl-2.4.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0= sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0= sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=ARRL Logbook of the World
 EAPI=6
 HOMEPAGE=http://www.arrl.org/tqsl-download
 KEYWORDS=~amd64 ~x86
 LICENSE=LOTW
-RDEPEND=dev-libs/expat:= dev-libs/openssl:= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
+RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
 SLOT=0
 SRC_URI=https://github.com/rich0/trustedqsl-tqsl/archive/v2.4.1.tar.gz -> tqsl-2.4.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e0fc992b3cc242ae57a7cfe9d384f86a
+_md5_=0d9b74a37281bd6f8a1123f277394b33
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index def3a09ab5f2..4299a7ab0342 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/alsa-utils-1.1.8 b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
new file mode 100644
index 000000000000..2b03be4308f5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=media-libs/alsa-lib-1.1.8 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) doc? ( app-text/xmlto )
+DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
+EAPI=7
+HOMEPAGE=https://alsa-project.org/
+IUSE=bat doc +libsamplerate +ncurses nls selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.1.8 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
+SLOT=0.9
+SRC_URI=mirror://alsaproject/utils/alsa-utils-1.1.8.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=f666245b37a22f6bf897251c3caa4260
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20170727 b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
index 2c61baf0c10a..6d3599baff62 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20170727
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/audex-0.95_pre20170727.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e6e1204b0330f02df081a493aacd3e07
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-1.3.1 b/metadata/md5-cache/media-sound/bluez-alsa-1.3.1
index e7b924afa781..130c65cdcfc2 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-1.3.1
+++ b/metadata/md5-cache/media-sound/bluez-alsa-1.3.1
@@ -1,14 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,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= aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
 DESCRIPTION=Bluetooth Audio ALSA Backend
 EAPI=7
 HOMEPAGE=https://github.com/Arkq/bluez-alsa
 IUSE=aac debug hcitop static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
+RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,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= aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://github.com/Arkq/bluez-alsa/archive/v1.3.1.tar.gz -> bluez-alsa-1.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=188f8fd413aacd485b901e339939f608
+_md5_=6f7de14e90160c8a1eb6575c42bceae9
diff --git a/metadata/md5-cache/media-sound/bluez-alsa-9999 b/metadata/md5-cache/media-sound/bluez-alsa-9999
index 69ff170a999e..f9cb272f891e 100644
--- a/metadata/md5-cache/media-sound/bluez-alsa-9999
+++ b/metadata/md5-cache/media-sound/bluez-alsa-9999
@@ -1,12 +1,12 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,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= aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
 DESCRIPTION=Bluetooth Audio ALSA Backend
 EAPI=7
 HOMEPAGE=https://github.com/Arkq/bluez-alsa
 IUSE=aac debug hcitop 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
-RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
+RDEPEND=>=dev-libs/glib-2.26[dbus,abi_x86_32(-)?,abi_x86_64(-)?,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/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sbc-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(-)?] >=net-wireless/bluez-5.0[abi_x86_32(-)?,abi_x86_64(-)?,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= aac? ( >=media-libs/fdk-aac-0.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(-)?] ) hcitop? ( dev-libs/libbsd sys-libs/ncurses:0= )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=188f8fd413aacd485b901e339939f608
+_md5_=6f7de14e90160c8a1eb6575c42bceae9
diff --git a/metadata/md5-cache/media-sound/cantata-2.3.3 b/metadata/md5-cache/media-sound/cantata-2.3.3
new file mode 100644
index 000000000000..c34582bfd07d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cantata-2.3.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Featureful and configurable Qt client for the music player daemon (MPD)
+EAPI=6
+HOMEPAGE=https://github.com/CDrummond/cantata
+IUSE=cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-lang/perl[ithreads] || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( || ( cdio cdda ) taglib ) cdio? ( udisks || ( cddb musicbrainz ) ) mtp? ( taglib udisks ) musicbrainz? ( || ( cdio cdda ) taglib ) replaygain? ( taglib )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.3.3/cantata-2.3.3.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d094326172604bc35db55873a30402a7
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index b0dfc7833e4d..8c78965c045c 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) projectm? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=6
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41f8b9152327fe6f19a366f3b7fea73a
+_md5_=ce97d3c4812d13b2f8e34ea7fb773d33
diff --git a/metadata/md5-cache/media-sound/cmusfm-0.2.5 b/metadata/md5-cache/media-sound/cmusfm-0.2.5
index f4c92a6b2379..686ecac60332 100644
--- a/metadata/md5-cache/media-sound/cmusfm-0.2.5
+++ b/metadata/md5-cache/media-sound/cmusfm-0.2.5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-misc/curl dev-libs/openssl libnotify? ( x11-libs/libnotify ) >=app-portage/elt-patches-20170815
+DEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) >=app-portage/elt-patches-20170815
 DESCRIPTION=Last.fm scrobbler for cmus music player
 EAPI=5
 HOMEPAGE=https://github.com/Arkq/cmusfm
 IUSE=libnotify
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=net-misc/curl dev-libs/openssl libnotify? ( x11-libs/libnotify ) media-sound/cmus
+RDEPEND=net-misc/curl dev-libs/openssl:0= libnotify? ( x11-libs/libnotify ) media-sound/cmus
 SLOT=0
 SRC_URI=https://github.com/Arkq/cmusfm/archive/v0.2.5.tar.gz -> cmusfm-0.2.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdd300a5cf8e9bd57ec0275f86b43d0e
+_md5_=2ba03946ffc477744d34754bf4053f86
diff --git a/metadata/md5-cache/media-sound/elisa-0.3.0 b/metadata/md5-cache/media-sound/elisa-0.3.0
index ebc87764f6ff..e21f7eb6cc15 100644
--- a/metadata/md5-cache/media-sound/elisa-0.3.0
+++ b/metadata/md5-cache/media-sound/elisa-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/elisa/0.3.0/elisa-0.3.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b7aede86c24e9fa062f0e67c7fd9772f
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.2 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.2
new file mode 100644
index 000000000000..3466bd91bab1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.28.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31.6 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] >=dev-util/intltool-0.26 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple sound recorder
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/SoundRecorder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/gjs >=dev-libs/glib-2.46:2 >=dev-libs/gobject-introspection-1.31.6 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection,ogg] media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-flac:1.0 media-plugins/gst-plugins-pulse:1.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.28/gnome-sound-recorder-3.28.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b2f98e6d4acfe4baf89a20e8acb730b8
diff --git a/metadata/md5-cache/media-sound/grip-3.10.0 b/metadata/md5-cache/media-sound/grip-3.10.0
new file mode 100644
index 000000000000..2a227f9e95f0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/grip-3.10.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure prepare
+DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
+DESCRIPTION=GTK+ based Audio CD Player/Ripper
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/grip/
+IUSE=vorbis
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/grip/grip-3.10.0.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=08e58eb6017b89e204dd648a894c4092
diff --git a/metadata/md5-cache/media-sound/grip-3.4.3 b/metadata/md5-cache/media-sound/grip-3.4.3
deleted file mode 100644
index 1d768106bdcc..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ed5e10c01192bd67e3c92e9d6733b35
diff --git a/metadata/md5-cache/media-sound/grip-3.7.1 b/metadata/md5-cache/media-sound/grip-3.7.1
deleted file mode 100644
index 23faf7c97366..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0ca3b8c9b8c9f8094af0546017f5fe3
diff --git a/metadata/md5-cache/media-sound/grip-3.8.1 b/metadata/md5-cache/media-sound/grip-3.8.1
deleted file mode 100644
index f2ee5da04f9b..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0ca3b8c9b8c9f8094af0546017f5fe3
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
index eb02ee2459a7..dbc418e9f5fb 100644
--- a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
+++ b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.08.3:5 >=kde-apps/libkcompactdisc-18.08.3:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-18.08.3:5 !media-sound/kaudiocreator:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kaudiocreator-1.3_p20170806.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=f12a736d7616b5183467851f98c2eae2
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.1 b/metadata/md5-cache/media-sound/kid3-3.6.1
index 2f4d3cf71c4f..cae765c8726a 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.1
+++ b/metadata/md5-cache/media-sound/kid3-3.6.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.6.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c9acb6ed82800dd6bc6371dcd670a015
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.2 b/metadata/md5-cache/media-sound/kid3-3.6.2
index ad4edbaabe21..fa3bf2df8bd5 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.2
+++ b/metadata/md5-cache/media-sound/kid3-3.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.6.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4a75b23c8d5330ada09ede12622f7301
diff --git a/metadata/md5-cache/media-sound/kid3-3.7.0 b/metadata/md5-cache/media-sound/kid3-3.7.0
index 68019dd72da8..99910688198d 100644
--- a/metadata/md5-cache/media-sound/kid3-3.7.0
+++ b/metadata/md5-cache/media-sound/kid3-3.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.7.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e0b8122295f2102386cd40edd5557ac2
diff --git a/metadata/md5-cache/media-sound/lmms-1.1.90 b/metadata/md5-cache/media-sound/lmms-1.1.90
deleted file mode 100644
index 346d6430cfb3..000000000000
--- a/metadata/md5-cache/media-sound/lmms-1.1.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cross-platform music production software
-EAPI=6
-HOMEPAGE=https://lmms.io
-IUSE=alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
-SLOT=0
-SRC_URI=https://github.com/LMMS/lmms/archive/v1.1.90.tar.gz -> lmms-1.1.90.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=09be4839287fbccd65c4909dcd4e79b5
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.4 b/metadata/md5-cache/media-sound/mpd-0.21.4
new file mode 100644
index 000000000000..673b8e475e1e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.4
@@ -0,0 +1,16 @@
+BDEPEND=>dev-util/meson-0.47.1 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.4.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a1869a2ceb9133aa1414d39d3b4a8e02
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.33 b/metadata/md5-cache/media-sound/ncmpc-0.33
new file mode 100644
index 000000000000..b09a3117be50
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpc-0.33
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-util/meson-0.47 >=dev-libs/boost-1.62 virtual/pkgconfig doc? ( dev-python/sphinx )
+DESCRIPTION=A ncurses client for the Music Player Daemon (MPD)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
+IUSE=+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=http://www.musicpd.org/download/ncmpc/0/ncmpc-0.33.tar.xz
+_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1aefb09af20ad93f1b64a742ad6fd54a
diff --git a/metadata/md5-cache/media-sound/picard-2.0.4 b/metadata/md5-cache/media-sound/picard-2.0.4
index 68ca4a4ebb93..404afccedaae 100644
--- a/metadata/md5-cache/media-sound/picard-2.0.4
+++ b/metadata/md5-cache/media-sound/picard-2.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Cross-platform music tagger
 EAPI=6
 HOMEPAGE=https://picard.musicbrainz.org
 IUSE=nls python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=23eaec9da6e74e5f20d45d451221da00
+_md5_=ecca5690be476880c09615181ca4f96c
diff --git a/metadata/md5-cache/media-sound/pulseaudio-modules-bt-9999 b/metadata/md5-cache/media-sound/pulseaudio-modules-bt-9999
new file mode 100644
index 000000000000..f04e45a71f12
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-modules-bt-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/fdk-aac virtual/ffmpeg media-libs/sbc media-libs/libldac >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 >=net-misc/ofono-1.13 media-sound/pulseaudio[-bluetooth]
+DESCRIPTION=PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)
+EAPI=7
+HOMEPAGE=https://github.com/EHfive/pulseaudio-modules-bt
+LICENSE=LGPL-2.1
+RDEPEND=media-libs/fdk-aac virtual/ffmpeg media-libs/sbc media-libs/libldac >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 >=net-misc/ofono-1.13 media-sound/pulseaudio[-bluetooth]
+SLOT=0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6960450fe1be15981b879c92217e1342
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.4.3 b/metadata/md5-cache/media-sound/pulseeffects-4.4.3
deleted file mode 100644
index ff50a91e9500..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=6
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.4.3.tar.gz -> pulseeffects-4.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f611889b2a10f1d219121ae1f1c18252
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.4.6 b/metadata/md5-cache/media-sound/pulseeffects-4.4.6
new file mode 100644
index 000000000000..1639fb1bd201
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=6
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.4.6.tar.gz -> pulseeffects-4.4.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7e403901734870493570638dd71f5691
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.2 b/metadata/md5-cache/media-sound/rhythmbox-3.4.2
index 118519d4e838..782cb7f39d4a 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.2
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.16:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.0:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.16:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.0:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Music management and playback software for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
@@ -11,4 +11,4 @@ REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5aee092d7544aa2983d74768d3c624aa
+_md5_=bd1e2782271992e14de16e069d5dc699
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.3 b/metadata/md5-cache/media-sound/rhythmbox-3.4.3
new file mode 100644
index 000000000000..e3e0a7463b08
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.0:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Music management and playback software for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
+IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av 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
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.0:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f310ba48c41870f22f495bb5f93c921d
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
index 5fcc3c56ef94..6a7e0887f5dd 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=kde-apps/libkcddb-18.08.3:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=31746966f4ad40eada64ad04dd2b727c
diff --git a/metadata/md5-cache/media-sound/spotify-1.0.96 b/metadata/md5-cache/media-sound/spotify-1.0.96
new file mode 100644
index 000000000000..2ec37b48a4be
--- /dev/null
+++ b/metadata/md5-cache/media-sound/spotify-1.0.96
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=dev-util/patchelf-0.9_p20180129 >=sys-apps/sed-4
+DESCRIPTION=Spotify is a social music platform
+EAPI=6
+HOMEPAGE=https://www.spotify.com/ch-de/download/previews/
+IUSE=libnotify systray pax_kernel pulseaudio
+KEYWORDS=~amd64
+LICENSE=Spotify
+RDEPEND=dev-libs/openssl:0 dev-libs/nss gnome-base/gconf gnome-extra/zenity media-libs/alsa-lib media-libs/harfbuzz media-libs/fontconfig media-libs/mesa net-misc/curl[ssl] net-print/cups[ssl] x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libXtst dev-python/pygobject:3 dev-python/dbus-python libnotify? ( x11-libs/libnotify ) pulseaudio? ( media-sound/pulseaudio ) systray? ( gnome-extra/gnome-integration-spotify )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e193253cd7458f2860e0efd16869d6c2
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501
deleted file mode 100644
index 541735017e38..000000000000
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20180501
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.52.0 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) >=dev-qt/designer-5.11.1:5 >=dev-qt/linguist-tools-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Multi-source social music player
-EAPI=6
-HOMEPAGE=https://www.tomahawk-player.org/
-IUSE=telepathy xmpp debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BSD
-RDEPEND=>=kde-frameworks/attica-5.52.0 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=0
-SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/34c1f88171f00a3e9fae57250799f3d3623b5f74.tar.gz -> tomahawk-0.9.0_pre20180501.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a8bc1564314299220877142029fbd70
diff --git a/metadata/md5-cache/media-sound/whipper-0.7.0 b/metadata/md5-cache/media-sound/whipper-0.7.0
deleted file mode 100644
index 731e52a5bf89..000000000000
--- a/metadata/md5-cache/media-sound/whipper-0.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libsndfile test? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Python CD-DA ripper preferring accuracy over speed (forked from morituri)
-EAPI=6
-HOMEPAGE=https://github.com/whipper-team/whipper
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-cdr/cdrdao dev-libs/gobject-introspection[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libcdio-paranoia-0.94_p2 dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycdio[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-musicbrainz-ngs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/flac media-libs/libsndfile media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/sox[flac] 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/whipper-team/whipper/archive/v0.7.0.tar.gz -> whipper-0.7.0.tar.gz
-_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3a6a685aa7b4038e247325cde8fcff5e
diff --git a/metadata/md5-cache/media-sound/whipper-0.7.0-r1 b/metadata/md5-cache/media-sound/whipper-0.7.0-r1
new file mode 100644
index 000000000000..d84fb9099bc6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/whipper-0.7.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libsndfile test? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=A Python CD-DA ripper preferring accuracy over speed (forked from morituri)
+EAPI=7
+HOMEPAGE=https://github.com/whipper-team/whipper
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-cdr/cdrdao >=dev-libs/libcdio-paranoia-0.94_p2 dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycdio[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-musicbrainz-ngs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/flac media-libs/libsndfile media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/sox[flac] 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/whipper-team/whipper/archive/v0.7.0.tar.gz -> whipper-0.7.0.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=71a560e8bd32e29ea295b1189c4da2d2
diff --git a/metadata/md5-cache/media-sound/whipper-0.7.3 b/metadata/md5-cache/media-sound/whipper-0.7.3
new file mode 100644
index 000000000000..970c90f9a818
--- /dev/null
+++ b/metadata/md5-cache/media-sound/whipper-0.7.3
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libsndfile test? ( dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=A Python CD-DA ripper preferring accuracy over speed (forked from morituri)
+EAPI=7
+HOMEPAGE=https://github.com/whipper-team/whipper
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-cdr/cdrdao dev-libs/gobject-introspection[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libcdio-paranoia-0.94_p2 dev-python/pycdio[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-musicbrainz-ngs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/flac media-libs/libsndfile media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-sound/sox[flac] 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/whipper-team/whipper/archive/v0.7.3.tar.gz -> whipper-0.7.3.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=15b21e9028ae574a0c6d7bfdcc9bf0de
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.4.1 b/metadata/md5-cache/media-sound/yoshimi-1.4.1
deleted file mode 100644
index bd10fc04f0fe..000000000000
--- a/metadata/md5-cache/media-sound/yoshimi-1.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A software synthesizer based on ZynAddSubFX
-EAPI=6
-HOMEPAGE=http://yoshimi.sourceforge.net/
-IUSE=+lv2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.4.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b6a1d356dd1bfdad2c320f4ffe490210
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.5.1.1 b/metadata/md5-cache/media-sound/yoshimi-1.5.1.1
deleted file mode 100644
index b245cb66e962..000000000000
--- a/metadata/md5-cache/media-sound/yoshimi-1.5.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A software synthesizer based on ZynAddSubFX
-EAPI=6
-HOMEPAGE=http://yoshimi.sourceforge.net/
-IUSE=+lv2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0 sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.5.1.1.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3be60bf3a3084d6a36cb3f34dcc85ebb
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.5.10 b/metadata/md5-cache/media-sound/yoshimi-1.5.10
new file mode 100644
index 000000000000..ac757922c5e3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/yoshimi-1.5.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A software synthesizer based on ZynAddSubFX
+EAPI=6
+HOMEPAGE=http://yoshimi.sourceforge.net/
+IUSE=+lv2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/mxml-2.5 >=media-libs/alsa-lib-1.0.17 media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/yoshimi/yoshimi-1.5.10.tar.bz2
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e1e9f79ff8ef916816a5f801c4b04347
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 32ce991b521d..e1bbbc877507 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/kodi-18.0_rc5 b/metadata/md5-cache/media-tv/kodi-18.0_rc5
new file mode 100644
index 000000000000..50cb0ecadded
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-18.0_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( >=app-pda/libplist-2.0.0 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/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=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_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp 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-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) 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(+)] ) >=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.3:= 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] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/ninja >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=6
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] airplay? ( >=app-pda/libplist-2.0.0 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/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=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_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/libcdio-0.94 dev-libs/libfmt dev-libs/libfstrcmp 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-4.0.1:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1 nfs? ( >=net-fs/libnfs-2.0.0:= ) 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(+)] ) >=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.3:= 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 ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) ^^ ( gbm wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz ) https://github.com/xbmc/xbmc/archive/18.0rc5-Leia.tar.gz -> kodi-18.0rc5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1e45aecb263e9e6eba2050ca9df7159b
diff --git a/metadata/md5-cache/media-tv/mythtv-29.1-r1 b/metadata/md5-cache/media-tv/mythtv-29.1-r1
new file mode 100644
index 000000000000..b497d0964d0f
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-29.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst preinst prepare setup unpack
+DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) 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_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm virtual/pkgconfig x11-base/xorg-proto virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=6
+HOMEPAGE=https://www.mythtv.org
+IUSE=alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/mysql virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.7.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) 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_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
+REQUIRED_USE=python_targets_python2_7 bluray? ( xml ) theora? ( vorbis )
+SLOT=0/29.1
+SRC_URI=https://github.com/MythTV/mythtv/archive/d8a2db77f5731cf32c6d31127452391c6cf7f91f.tar.gz -> mythtv-29.1-r1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
+_md5_=1d0d64294120bd9f2ca71f822ffaeb57
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.7 b/metadata/md5-cache/media-tv/tvheadend-4.2.7
index 69e6c59c57c5..4e1d6f4b95a2 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.7
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.7
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup
-DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57 ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers )
+DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57 ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers )
 DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib kernel_linux
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57 ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
+RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) dvben50221? ( media-tv/linuxtv-dvb-apps ) ffmpeg? ( media-video/ffmpeg:0/55.57.57 ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )
 SLOT=0
 SRC_URI=https://github.com/tvheadend/tvheadend/archive/v4.2.7.tar.gz -> tvheadend-4.2.7.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17109ecbae3f947f2557644b400c1181
+_md5_=50eccd0bf96923b028a1054ff0f7b279
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 73c3e4f73bd6..4da9bf53c24d 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -1,13 +1,13 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup unpack
-DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) )
+DEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) x265? ( media-libs/x265 ) )
 DESCRIPTION=Tvheadend is a TV streaming server and digital video recorder
 EAPI=7
 HOMEPAGE=https://tvheadend.org/
 IUSE=dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib kernel_linux
 LICENSE=GPL-3
-RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
+RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) uriparser? ( dev-libs/uriparser ) zeroconf? ( net-dns/avahi ) zlib? ( sys-libs/zlib ) dvb? ( media-tv/dtv-scan-tables ) xmltv? ( media-tv/xmltv )
 REQUIRED_USE=ddci? ( dvb )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=232c2f9e671cc507602622cdc32790ea
+_md5_=1b66c8c1a49ff81259b41abefe0c5100
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 707304409196..d31eea83d908 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/dvdbackup-0.4.1 b/metadata/md5-cache/media-video/dvdbackup-0.4.1
deleted file mode 100644
index f19837628756..000000000000
--- a/metadata/md5-cache/media-video/dvdbackup-0.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=media-libs/libdvdread-4.2.0_pre nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Backup content from DVD to hard disk
-EAPI=4
-HOMEPAGE=http://dvdbackup.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libdvdread-4.2.0_pre nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/dvdbackup/dvdbackup-0.4.1.tar.bz2
-_md5_=30b93719735594f55c637c24a6d8ec3e
diff --git a/metadata/md5-cache/media-video/dvdbackup-0.4.2 b/metadata/md5-cache/media-video/dvdbackup-0.4.2
index 730e4572d342..030c40d18ad0 100644
--- a/metadata/md5-cache/media-video/dvdbackup-0.4.2
+++ b/metadata/md5-cache/media-video/dvdbackup-0.4.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure
 DEPEND=>=media-libs/libdvdread-4.2.0_pre nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
 DESCRIPTION=Backup content from DVD to hard disk
-EAPI=4
+EAPI=7
 HOMEPAGE=http://dvdbackup.sourceforge.net/
 IUSE=nls
 KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
@@ -9,4 +9,4 @@ LICENSE=GPL-3
 RDEPEND=>=media-libs/libdvdread-4.2.0_pre nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/dvdbackup/dvdbackup-0.4.2.tar.xz
-_md5_=88173a7ff0cf799df989fb22aafa3a6b
+_md5_=df8241ea13324cdd06ea6f6f9c3d047c
diff --git a/metadata/md5-cache/media-video/guvcview-2.0.6 b/metadata/md5-cache/media-video/guvcview-2.0.6
index a49da13de8b6..5ca2fc0d75a0 100644
--- a/metadata/md5-cache/media-video/guvcview-2.0.6
+++ b/metadata/md5-cache/media-video/guvcview-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Qt5 or GTK+3 interface for capturing and viewing video from v
 EAPI=6
 HOMEPAGE=http://guvcview.sourceforge.net/
 IUSE=gsl libav pulseaudio qt5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.10 media-libs/libpng:0= media-libs/libsdl2 media-libs/libv4l >=media-libs/portaudio-19_pre virtual/ffmpeg virtual/libusb:1 virtual/udev gsl? ( >=sci-libs/gsl-1.15 ) !libav? ( >=media-video/ffmpeg-2.8:0= ) libav? ( media-video/libav:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( >=x11-libs/gtk+-3.6:3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/guvcview/guvcview-src-2.0.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2b6d10aacc94adfd2492df0e0d793cd
+_md5_=3cf9c4e1e78285db944b7c58076a1762
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.15 b/metadata/md5-cache/media-video/kaffeine-2.0.15
index 3f1d612ec6b5..18828c627674 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.15
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.15.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=94cf46b1752ca5d57d0b31b118b01c64
diff --git a/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1 b/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
index 26f5adab1c91..643774b626cb 100644
--- a/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
+++ b/metadata/md5-cache/media-video/kamerka-0.12_p20161002-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0 >=kde-frameworks/kconfig-5.52.0 >=kde-frameworks/kconfigwidgets-5.52.0 >=kde-frameworks/kcoreaddons-5.52.0 >=kde-frameworks/kdeclarative-5.52.0 >=kde-frameworks/kdelibs4support-5.52.0 >=kde-frameworks/ki18n-5.52.0 >=kde-frameworks/kio-5.52.0 >=kde-frameworks/knotifications-5.52.0 >=kde-frameworks/kwidgetsaddons-5.52.0 >=kde-frameworks/kxmlgui-5.52.0 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libv4l media-libs/phonon[qt5(+)] >=media-libs/qimageblitz-0.0.6_p20131029[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=https://github.com/dos1/kamerka/archive/a201df47a0849a09a20617fedfee26a407dc847c.tar.gz -> kamerka-0.12_p20161002.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7eda9be7aac8329396db4044acf75b3
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1 b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
index 9193339647a3..e1219661fe1a 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=>=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kmediaplayer-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9f54b69cd1c7143adc2f3454c6590992
diff --git a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5 b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
index 858548eba1ec..f72d43a0fce0 100644
--- a/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
+++ b/metadata/md5-cache/media-video/plasma-mediacenter-5.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.52.0:5 >=kde-frameworks/kfilemetadata-5.52.0:5 ) >=kde-plasma/plasma-workspace-5.12.5:5 >=dev-qt/qtmultimedia-5.11.1:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma-mediacenter/5.7.5/plasma-mediacenter-5.7.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d8715ec7136750a89735050447a89aca
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.6-r1 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.6-r1
index 30f922a9dab8..9711add1ce39 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.6-r1
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) mpv? ( media-video/mpv[libmpv] ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) !media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.6.tar.gz -> subtitlecomposer-0.6.6.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=671b4d50e4ba3e7fd73699e26944f1ca
diff --git a/metadata/md5-cache/media-video/vcdimager-0.7.24 b/metadata/md5-cache/media-video/vcdimager-0.7.24
index 8e5814d06782..19c5fc9a9298 100644
--- a/metadata/md5-cache/media-video/vcdimager-0.7.24
+++ b/metadata/md5-cache/media-video/vcdimager-0.7.24
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libcdio-0.90-r1:0=[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt xml? ( dev-libs/libxml2:2 ) virtual/pkgconfig
+DEPEND=>=dev-libs/libcdio-0.90-r1:0=[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,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/libcdio-1.0 dev-libs/popt xml? ( dev-libs/libxml2:2 ) virtual/pkgconfig
 DESCRIPTION=GNU VCDimager
 EAPI=6
 HOMEPAGE=http://www.vcdimager.org/
 IUSE=+xml 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 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libcdio-0.90-r1:0=[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt xml? ( dev-libs/libxml2:2 )
+RDEPEND=>=dev-libs/libcdio-0.90-r1:0=[-minimal,abi_x86_32(-)?,abi_x86_64(-)?,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/libcdio-1.0 dev-libs/popt xml? ( dev-libs/libxml2:2 )
 SLOT=0
 SRC_URI=mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=194bf41cd60ed0778d2156ac6e64bebe
+_md5_=a056f35e1b4cf64d79ec6f8e6afa5e76
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index c641efca015f..cef0d134e82b 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/bwping-1.10 b/metadata/md5-cache/net-analyzer/bwping-1.10
new file mode 100644
index 000000000000..43d90c960467
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bwping-1.10
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
+EAPI=7
+HOMEPAGE=http://bwping.sourceforge.net/
+IUSE=ipv6
+KEYWORDS=~amd64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/bwping/1.10/bwping-1.10.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e4f192616491eec7c62ef4312601b164
diff --git a/metadata/md5-cache/net-analyzer/bwping-1.8 b/metadata/md5-cache/net-analyzer/bwping-1.8
deleted file mode 100644
index 6dba653fcc6a..000000000000
--- a/metadata/md5-cache/net-analyzer/bwping-1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=A tool to measure bandwidth and RTT between two hosts using ICMP
-EAPI=5
-HOMEPAGE=http://bwping.sourceforge.net/
-IUSE=ipv6
-KEYWORDS=~amd64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/bwping/1.8/bwping-1.8.tar.gz
-_md5_=52675d6154f5c35bbe57b713e8be558e
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r2 b/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r2
new file mode 100644
index 000000000000..2d9670544f32
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 ) doc? ( app-text/ghostscript-gpl sys-apps/groff ) test? ( dev-libs/check ) sys-devel/flex virtual/yacc sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A suite for man in the middle attacks
+EAPI=6
+HOMEPAGE=https://github.com/Ettercap/ettercap
+IUSE=doc gtk ipv6 libressl ncurses +plugins test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
+SLOT=0
+SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.2.tar.gz -> ettercap-0.8.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f1c29237f04fb0ea169b8cfe6ccef1fe
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index f2e3e9aebcfd..f63d8224708d 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( sys-libs/ncurses:0= ) plugins? ( >=net-misc/curl-7.26.0 ) doc? ( app-text/ghostscript-gpl sys-apps/groff ) sys-devel/flex virtual/yacc sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 ) doc? ( app-text/ghostscript-gpl sys-apps/groff ) test? ( dev-libs/check ) sys-devel/flex virtual/yacc sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A suite for man in the middle attacks
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/Ettercap/ettercap
-IUSE=doc gtk ipv6 libressl ncurses +plugins
+IUSE=doc gtk ipv6 libressl ncurses +plugins test
 LICENSE=GPL-2+
-RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( sys-libs/ncurses:0= ) plugins? ( >=net-misc/curl-7.26.0 )
+RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e48299ce69bc8aef25f437c1cdbd22ef
+_md5_=5e55abaeba9d898727b4cc1eae02042f
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
deleted file mode 100644
index 506357417798..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),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/pkgconfig
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=6
-HOMEPAGE=http://www.fail2ban.org/
-IUSE=selinux systemd 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
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_python3_4? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_python3_5? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_python3_6? ( || ( dev-python/python-systemd[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(+)?] sys-apps/systemd[python(-),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_single_target_pypy? ( >=virtual/pypy-5:0= ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),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=systemd? ( !python_single_target_pypy ) ^^ ( 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_single_target_pypy? ( python_targets_pypy ) 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/fail2ban/fail2ban/tarball/0.10.3.1 -> fail2ban-0.10.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7b445aeadf29e3932c0a6cc9ab6d8e45
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-99999999 b/metadata/md5-cache/net-analyzer/fail2ban-99999999
index b2d643a7ba0e..f2e29ace331e 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-99999999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-99999999
@@ -9,4 +9,4 @@ RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/fr
 REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( 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_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=486f22543dba48082bc6a73fce94f9b1
+_md5_=6d486f48772baef0d70c22e50f8a6466
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.2 b/metadata/md5-cache/net-analyzer/nagstamon-3.2
deleted file mode 100644
index 0030b9815320..000000000000
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)] dev-python/lxml[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/PyQt5[gui,multimedia,svg,widgets,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/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[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/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[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/cryptography[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/secretstorage[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/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[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(-)] virtual/python-typing[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(-)] 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=systray monitor for displaying realtime status of several monitoring systems
-EAPI=6
-HOMEPAGE=https://nagstamon.ifw-dresden.de
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=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(-)] dev-python/lxml[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/PyQt5[gui,multimedia,svg,widgets,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/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[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/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[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/cryptography[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/secretstorage[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/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[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(-)] virtual/python-typing[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 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=48b5ac3ff4ebfc7c31cab412b1bf9d73
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.2.1 b/metadata/md5-cache/net-analyzer/nagstamon-3.2.1
new file mode 100644
index 000000000000..1bad2317d696
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] dev-python/lxml[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/PyQt5[gui,multimedia,svg,widgets,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/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[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/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[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/cryptography[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/secretstorage[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/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[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(-)] virtual/python-typing[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(-)] 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=systray monitor for displaying realtime status of several monitoring systems
+EAPI=6
+HOMEPAGE=https://nagstamon.ifw-dresden.de
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=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(-)] dev-python/lxml[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/PyQt5[gui,multimedia,svg,widgets,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/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[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/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[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/cryptography[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/secretstorage[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/python-xlib-0.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-kerberos[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(-)] virtual/python-typing[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 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c73a99c4d5aeb73465636c6acce58867
diff --git a/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3 b/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
index 0ceebea60653..5745f85f8b1d 100644
--- a/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
+++ b/metadata/md5-cache/net-analyzer/openvas-cli-1.4.3
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-analyzer/openvas-libraries-8.0.4 !net-analyzer/openvas-client virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=net-analyzer/openvas-libraries-8.0.4
 DESCRIPTION=A remote security scanner for Linux (OpenVAS-cli)
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.openvas.org/
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-analyzer/openvas-libraries-8.0.4 !net-analyzer/openvas-client
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2209/openvas-cli-1.4.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3f02e25a463ee559716a9122644b00c3
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ed593141e583a4a38494a4119b1b7918
diff --git a/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5 b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
index cc3037d7c114..63635b6bc2f3 100644
--- a/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
+++ b/metadata/md5-cache/net-analyzer/openvas-libraries-8.0.5
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba !net-analyzer/openvas-libnasl net-libs/gnutls net-libs/libpcap >=net-libs/libssh-0.5.0 net-analyzer/net-snmp ldap? ( net-nds/openldap ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba net-analyzer/net-snmp net-libs/gnutls net-libs/libpcap >=net-libs/libssh-0.5.0 ldap? ( net-nds/openldap )
 DESCRIPTION=A remote security scanner for Linux (openvas-libraries)
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.openvas.org/
 IUSE=ldap
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba !net-analyzer/openvas-libnasl net-libs/gnutls net-libs/libpcap >=net-libs/libssh-0.5.0 net-analyzer/net-snmp ldap? ( net-nds/openldap )
+RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16 >=dev-libs/hiredis-0.10.1 dev-libs/libgcrypt:0 dev-libs/libksba net-analyzer/net-snmp net-libs/gnutls net-libs/libpcap >=net-libs/libssh-0.5.0 ldap? ( net-nds/openldap ) !net-analyzer/openvas-libnasl
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2191/openvas-libraries-8.0.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=40f14ac2dcb00b48b9f6be64b1c03f1a
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c6dbd613e7f21318bc827f5e5aeb6969
diff --git a/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2 b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
index 15bce62ccc90..4cdee3919367 100644
--- a/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
+++ b/metadata/md5-cache/net-analyzer/openvas-manager-6.0.6-r2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-analyzer/openvas-libraries-8.0.5 >=dev-db/sqlite-3 dev-db/redis !net-analyzer/openvas-administrator virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEPEND=dev-db/redis >=dev-db/sqlite-3 >=net-analyzer/openvas-libraries-8.0.5
 DESCRIPTION=A remote security scanner for Linux (openvas-manager)
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.openvas.org/
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=net-analyzer/openvas-libraries-8.0.5 >=dev-db/sqlite-3 dev-db/redis !net-analyzer/openvas-administrator
+RDEPEND=dev-db/redis >=dev-db/sqlite-3 >=net-analyzer/openvas-libraries-8.0.5 !net-analyzer/openvas-administrator
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2195/openvas-manager-6.0.6.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5013619f141ef3db58fd647432a65fa9
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3b83a66a5d27ac58824f4204d22a31a2
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1 b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
index 4a4d0a39aca0..b36b6ac1e936 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-5.0.4-r1
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2 !net-analyzer/openvas-plugins !net-analyzer/openvas-server virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2
 DESCRIPTION=A remote security scanner for Linux (OpenVAS-scanner)
-EAPI=5
+EAPI=7
 HOMEPAGE=http://www.openvas.org/
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gpgme >=dev-libs/glib-2.16:2 dev-libs/libgcrypt:0 >=net-analyzer/openvas-libraries-8.0.2 !net-analyzer/openvas-plugins !net-analyzer/openvas-server
 SLOT=0
 SRC_URI=http://wald.intevation.org/frs/download.php/2129/openvas-scanner-5.0.4.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=74dd3f2f48ecea378ad693c5f8091a45
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5fe87f84c1d8570eb36cfc836e3bd430
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.2.6 b/metadata/md5-cache/net-analyzer/tcpreplay-4.2.6
deleted file mode 100644
index cc22e952986f..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpreplay-4.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-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-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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.2.6/tcpreplay-4.2.6.tar.gz -> tcpreplay-4.2.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad8e48ff21efabac42a83348f3767cbb
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1 b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
deleted file mode 100644
index f51de071e0d4..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
+++ /dev/null
@@ -1,13 +0,0 @@
-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-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 ~arm ~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	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23c386d3a163c7d96472099bf118ed2a
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.1 b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.1
new file mode 100644
index 000000000000..0189b4815db8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+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 )
+DESCRIPTION=utilities for editing and replaying previously captured network traffic
+EAPI=7
+HOMEPAGE=http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay
+IUSE=debug pcapnav +tcpdump
+KEYWORDS=~amd64 ~arm ~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.1/tcpreplay-4.3.1.tar.xz -> tcpreplay-4.3.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3e538518608a2511ee0b74f6550ef72f
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5
new file mode 100644
index 000000000000..78bad358f87f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p5
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=A Tool for analyzing network packet dumps
+EAPI=7
+HOMEPAGE=http://www.tcptrace.org/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-5.debian.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e6a36952e3febe525ccf149e6de24085
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.6 b/metadata/md5-cache/net-analyzer/wireshark-2.6.6
new file mode 100644
index 000000000000..08a67a512d13
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=6
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+SLOT=0/2.6.6
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.6.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eff52f381c590b71582da73733c26219
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c21a78a27284..3005f592f1f7 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/avahi-0.7-r1 b/metadata/md5-cache/net-dns/avahi-0.7-r1
index 6775018ff253..33d0ac3b378c 100644
--- a/metadata/md5-cache/net-dns/avahi-0.7-r1
+++ b/metadata/md5-cache/net-dns/avahi-0.7-r1
@@ -4,11 +4,11 @@ DESCRIPTION=System which facilitates service discovery on a local network
 EAPI=6
 HOMEPAGE=http://avahi.org/
 IUSE=autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux 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 python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libdaemon dev-libs/expat dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gdbm? ( sys-libs/gdbm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 ) gtk? ( x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk3? ( x11-libs/gtk+: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(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( sys-libs/libcap ) introspection? ( dev-libs/gobject-introspection:= ) mono? ( dev-lang/mono gtk? ( dev-dotnet/gtk-sharp ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) introspection? ( dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) bookmarks? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) selinux? ( sec-policy/selinux-avahi )
 REQUIRED_USE=python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.7.tar.gz -> avahi-0.7.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59482bac02e13c2022d5dad14a2d5db5
+_md5_=f03c7d3806038b354a3ebd1f7df16186
diff --git a/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1 b/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
index 19f519c2699d..1115b1752e6c 100644
--- a/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
+++ b/metadata/md5-cache/net-dns/bind-9.12.2_p2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=BIND - Berkeley Internet Name Domain - Name Server
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6 json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs +threads urandom xml +zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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 ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) seccomp? ( sys-libs/libseccomp ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )
 REQUIRED_USE=idn? ( !libidn2 ) libidn2? ( !idn ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz !threads ) odbc? ( dlz ) ldap? ( dlz ) gost? ( !libressl ssl ) threads? ( caps ) dnstap? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P2/?version=tar-gz -> bind-9.12.2_p2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5d1f3f30cf58e553c6151b8dba25f4b9
+_md5_=a35719a55ad814fb27ce2191dbab0d02
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p1 b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p1
index a925aeab6a9c..aa4704d00d65 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=5
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P1/?version=tar-gz -> bind-9.12.2_p1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2951a1d170465b8c5583fbda28befb5
+_md5_=52afff3335ea8fc0492144d56d83a524
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2 b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2
index 07245ecaf373..4398464a539e 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P2/?version=tar-gz -> bind-9.12.2_p2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1111e643413e93abd2f95390c7eed479
+_md5_=77db6d626f6987db07b1c33c4b9cce66
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1 b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
index de8140e7e2db..edc34b0f1807 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.2_p2-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) virtual/pkgconfig
 DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2 ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.2-P2/?version=tar-gz -> bind-9.12.2_p2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=73753c13b19337e723f2c355a189dbc3
+_md5_=c39adaddfacd5e2fad4a8a8d8387c900
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80
index 33b8476a643f..b79f08d086e4 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80
@@ -5,11 +5,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=7
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=593703793d2505ba12018ee05857cc26
+_md5_=9710a577129d34f4e1d60d7e0eb80140
diff --git a/metadata/md5-cache/net-dns/libidn2-2.1.0 b/metadata/md5-cache/net-dns/libidn2-2.1.0
new file mode 100644
index 000000000000..e780b9fe879e
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn2-2.1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/help2man
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,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=An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-3+
+RDEPEND=dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,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/4.0.0
+SRC_URI=mirror://gnu/libidn/libidn2-2.1.0.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=712d21bff8136f23e9dc71e509f7fb2b
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index d1a41f36119f..13c10287e81d 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/firehol-3.1.3 b/metadata/md5-cache/net-firewall/firehol-3.1.3
index b9eee0a560b0..e9c1fffc4b58 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.3
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.3
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.3/firehol-3.1.3.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a6abb64a938b82eae9ceff132384c2f7
+_md5_=12631716ecf2c20be68fd109fdd96610
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.3-r1 b/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
index ee2bd1fe4e22..d70a3b381c80 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.3-r1
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.3/firehol-3.1.3.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0e2f2aacdf84efc204c41b4d13202e1b
+_md5_=fed3c4080786b0233469af5772a401b8
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.4 b/metadata/md5-cache/net-firewall/firehol-3.1.4
index 26eea9cdbb68..e169ffa8c214 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.4
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.4
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.4/firehol-3.1.4.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5445696b22b5e910bda8c0c842325a3a
+_md5_=95fd2c836520f8298f7828051d84dca5
diff --git a/metadata/md5-cache/net-firewall/firehol-3.1.6 b/metadata/md5-cache/net-firewall/firehol-3.1.6
index 89736c0abfdf..8c25584c35a1 100644
--- a/metadata/md5-cache/net-firewall/firehol-3.1.6
+++ b/metadata/md5-cache/net-firewall/firehol-3.1.6
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils
 SLOT=0
 SRC_URI=https://github.com/firehol/firehol/releases/download/v3.1.6/firehol-3.1.6.tar.xz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=554656d7a495964daad55b2a36c46243
+_md5_=69bc0d161b5a08adfbec4b2138c0346c
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.0-r2 b/metadata/md5-cache/net-firewall/nftables-0.9.0-r2
new file mode 100644
index 000000000000..5a5c05ba186c
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0= >=app-text/docbook2X-0.8.8-r4 doc? ( >=app-text/dblatex-0.3.7 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=6
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json +modern_kernel +readline kernel_linux
+KEYWORDS=~amd64 ~arm ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0=
+SLOT=0
+SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.9.0.tar.gz -> nftables-0.9.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=8ababe65878a99ad139307f8348bb276
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index cdec45483e3d..67534c4b640b 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/mc-2019.01.10.00.38.22 b/metadata/md5-cache/net-fs/mc-2019.01.10.00.38.22
new file mode 100644
index 000000000000..20b301ceac1d
--- /dev/null
+++ b/metadata/md5-cache/net-fs/mc-2019.01.10.00.38.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Minio client provides alternatives for ls, cat on cloud storage and filesystems
+EAPI=6
+HOMEPAGE=https://github.com/minio/mc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!!app-misc/mc
+SLOT=0
+SRC_URI=https://github.com/minio/mc/archive/RELEASE.2019-01-10T00-38-22Z.tar.gz -> mc-2019.01.10.00.38.22.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=40943f4cae2daa541ea10706fef6ad7b
diff --git a/metadata/md5-cache/net-fs/minio-2018.12.27.18.33.08 b/metadata/md5-cache/net-fs/minio-2018.12.27.18.33.08
index 71833f474e54..0705a4003f7b 100644
--- a/metadata/md5-cache/net-fs/minio-2018.12.27.18.33.08
+++ b/metadata/md5-cache/net-fs/minio-2018.12.27.18.33.08
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=An Amazon S3 compatible object storage server
 EAPI=6
 HOMEPAGE=https://github.com/minio/minio
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~amd64-linux
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2018-12-27T18-33-08Z.tar.gz -> minio-2018.12.27.18.33.08.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=546e38d414a400b1cd13cca9fd977cff
+_md5_=77e7d0e63cfa6465950444c2b9c515ad
diff --git a/metadata/md5-cache/net-fs/minio-2019.01.10.00.21.20 b/metadata/md5-cache/net-fs/minio-2019.01.10.00.21.20
new file mode 100644
index 000000000000..c7ad6b4e875a
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-2019.01.10.00.21.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/RELEASE.2019-01-10T00-21-20Z.tar.gz -> minio-2019.01.10.00.21.20.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=77e7d0e63cfa6465950444c2b9c515ad
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.11 b/metadata/md5-cache/net-fs/netatalk-3.1.11
deleted file mode 100644
index 583cbab468ea..000000000000
--- a/metadata/md5-cache/net-fs/netatalk-3.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Open Source AFP server
-EAPI=5
-HOMEPAGE=http://netatalk.sourceforge.net/
-IUSE=acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2 BSD
-RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) utils? ( dev-lang/perl dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=ldap? ( acl ) tracker? ( dbus ) utils? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0/17.0
-SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.11/netatalk-3.1.11.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2e615d3ebe64be3564b9a0e5c498de16
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.12 b/metadata/md5-cache/net-fs/netatalk-3.1.12
new file mode 100644
index 000000000000..cf7b9dc2b4be
--- /dev/null
+++ b/metadata/md5-cache/net-fs/netatalk-3.1.12
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex
+DESCRIPTION=Open Source AFP server
+EAPI=7
+HOMEPAGE=http://netatalk.sourceforge.net/
+IUSE=acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 BSD
+RDEPEND=!app-editors/yudit dev-libs/libevent:0= >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) utils? ( dev-lang/perl dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=ldap? ( acl ) tracker? ( dbus ) utils? ( || ( python_targets_python2_7 ) )
+RESTRICT=test
+SLOT=0/18.0
+SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.12/netatalk-3.1.12.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=f2ca388c3489f614dec913e157964707
diff --git a/metadata/md5-cache/net-fs/netatalk-3.1.8 b/metadata/md5-cache/net-fs/netatalk-3.1.8
deleted file mode 100644
index 83b0d592357f..000000000000
--- a/metadata/md5-cache/net-fs/netatalk-3.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!app-editors/yudit dev-libs/libevent >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) virtual/yacc sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Open Source AFP server
-EAPI=5
-HOMEPAGE=http://netatalk.sourceforge.net/
-IUSE=acl cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2 BSD
-RDEPEND=!app-editors/yudit dev-libs/libevent >=dev-libs/libgcrypt-1.2.3:0 sys-apps/coreutils >=sys-libs/db-4.2.52:= sys-libs/tdb acl? ( sys-apps/attr sys-apps/acl ) cracklib? ( sys-libs/cracklib ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0 ) tcpd? ( sys-apps/tcp-wrappers ) tracker? ( app-misc/tracker ) 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_python2_7(-)] ) zeroconf? ( net-dns/avahi[dbus] ) utils? ( dev-lang/perl dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=ldap? ( acl ) utils? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0/17.0
-SRC_URI=mirror://sourceforge/project/netatalk/netatalk/3.1.8/netatalk-3.1.8.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=92c917efc0c7448c1274c4d00d2883ea
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.22.1 b/metadata/md5-cache/net-fs/openafs-1.6.22.1
index 078e5418cddf..79fcb8327d05 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.22.1
+++ b/metadata/md5-cache/net-fs/openafs-1.6.22.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=virtual/libintl fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=The OpenAFS distributed file system
 EAPI=6
 HOMEPAGE=https://www.openafs.org/
 IUSE=bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups
 KEYWORDS=amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.22.1 )
+RDEPEND=virtual/libintl fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.22.1 )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.1/openafs-1.6.22.1-src.tar.bz2 https://openafs.org/dl/openafs/1.6.22.1/openafs-1.6.22.1-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e078c429865d63d48042f1921a329cc0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=09b33471127a87bda885b3ae6323bf19
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.22.2 b/metadata/md5-cache/net-fs/openafs-1.6.22.2
index 74b89e956e55..0e8f77592c21 100644
--- a/metadata/md5-cache/net-fs/openafs-1.6.22.2
+++ b/metadata/md5-cache/net-fs/openafs-1.6.22.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=virtual/libintl fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=The OpenAFS distributed file system
 EAPI=6
 HOMEPAGE=https://www.openafs.org/
 IUSE=bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups
 KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.22.2 )
+RDEPEND=virtual/libintl fuse? ( sys-fs/fuse:0= ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.22.2 )
 SLOT=0
 SRC_URI=https://openafs.org/dl/openafs/1.6.22.2/openafs-1.6.22.2-src.tar.bz2 https://openafs.org/dl/openafs/1.6.22.2/openafs-1.6.22.2-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20170822.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=95de04aa6a632b3170e3b334a3230623
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=128bdb0056c34262bc7b5c1590791e09
diff --git a/metadata/md5-cache/net-fs/openafs-1.8.2-r1 b/metadata/md5-cache/net-fs/openafs-1.8.2-r1
new file mode 100644
index 000000000000..4032cc1488a5
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-1.8.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-devel/flex virtual/yacc api? ( app-doc/doxygen media-gfx/graphviz ) doc? ( dev-libs/libxslt || ( dev-java/fop app-text/dblatex app-text/docbook-sgml-utils[jadetex] ) ) perl? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare pretend setup
+DEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( virtual/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=The OpenAFS distributed file system
+EAPI=7
+HOMEPAGE=https://www.openafs.org/
+IUSE=api bitmap-later debug doc fuse kauth kerberos +modules +namei ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write kernel_linux kernel_linux
+KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=!net-fs/openafs-kernel virtual/libintl amd64? ( tsm? ( app-backup/tsm ) ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 ) fuse? ( sys-fs/fuse:0= ) kauth? ( virtual/pam ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://openafs.org/dl/openafs/1.8.2/openafs-1.8.2-src.tar.bz2 https://openafs.org/dl/openafs/1.8.2/openafs-1.8.2-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20190106.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5c60c397ae5d607611102637ef917966
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 59463c784bcd..06875f212ee1 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.5 b/metadata/md5-cache/net-ftp/lftp-4.7.5
index 728a444a4cf2..c97628d89c17 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.5
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.7.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45463e17230c099f45966e5d65e6a21c
+_md5_=3892a69c415565ad7c2942e9b8dbfd5a
diff --git a/metadata/md5-cache/net-ftp/lftp-4.8.4 b/metadata/md5-cache/net-ftp/lftp-4.8.4
index af22e015dc00..91430ee047f7 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.8.4
+++ b/metadata/md5-cache/net-ftp/lftp-4.8.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://lftp.tech/ftp/lftp-4.8.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66ef80c61f2a6cecaa39e54c192e6daa
+_md5_=e32eeea045af33aed3bc7622528598e8
diff --git a/metadata/md5-cache/net-ftp/lftp-9999 b/metadata/md5-cache/net-ftp/lftp-9999
index 96843af454f1..a1c48161df02 100644
--- a/metadata/md5-cache/net-ftp/lftp-9999
+++ b/metadata/md5-cache/net-ftp/lftp-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) dev-libs/gnulib =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) dev-libs/gnulib =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
 EAPI=6
 HOMEPAGE=https://lftp.tech/
 IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2 ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn2:= ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=934a47a30cdc6027785f404f8ab8e8b6
+_md5_=6b11cfd7dc5d79bc78d9954c7ac31ebc
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 97c1d18be875..aaeb8aa2d5dd 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0-r1 b/metadata/md5-cache/net-im/choqok-1.6.0-r1
index 630a66bdec20..e3ce9671fe1f 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0-r1
+++ b/metadata/md5-cache/net-im/choqok-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.52.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kdewebkit-5.52.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e10df1f8f1d10d1a2b3f8f190b876e05
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 6d1a7aef70d3..961a412b38b6 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/irssi-1.0.7-r1 b/metadata/md5-cache/net-irc/irssi-1.0.7-r1
deleted file mode 100644
index b9a4817052a9..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=+perl selinux socks5 +proxy libressl
-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=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.0.7/irssi-1.0.7.tar.xz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cb0283ebb29b188f33c0d77c2783aef2
diff --git a/metadata/md5-cache/net-irc/irssi-1.1.1-r2 b/metadata/md5-cache/net-irc/irssi-1.1.1-r2
deleted file mode 100644
index 64b2e26cb146..000000000000
--- a/metadata/md5-cache/net-irc/irssi-1.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
-DESCRIPTION=A modular textUI IRC client with IPv6 support
-EAPI=6
-HOMEPAGE=https://irssi.org/
-IUSE=+perl selinux socks5 +proxy libressl
-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=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/irssi/irssi/releases/download/1.1.1/irssi-1.1.1.tar.xz
-_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6b9b7bea67cd574a1ba4c8ff3736b52d
diff --git a/metadata/md5-cache/net-irc/irssi-1.1.2 b/metadata/md5-cache/net-irc/irssi-1.1.2
new file mode 100644
index 000000000000..a891027e4d46
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irssi-1.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
+DESCRIPTION=A modular textUI IRC client with IPv6 support
+EAPI=6
+HOMEPAGE=https://irssi.org/
+IUSE=+perl selinux socks5 +proxy libressl
+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=GPL-2
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/irssi/irssi/releases/download/1.1.2/irssi-1.1.2.tar.xz
+_eclasses_=ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=bf6e0ba6432370cd94f09ecc9eb4e12c
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5 b/metadata/md5-cache/net-irc/konversation-1.7.5
index cc1deb9942da..7a05ba1cba1c 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.5
+++ b/metadata/md5-cache/net-irc/konversation-1.7.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kbookmarks-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kidletime-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.5/src/konversation-1.7.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=e1ec4a72075f2560df4e023f6d39b596
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index e803674ce80e..c721ee137f63 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/courier-authlib-0.69.0 b/metadata/md5-cache/net-libs/courier-authlib-0.69.0
index a361cfb0a430..d18f43090201 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.69.0
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.69.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.0 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 DESCRIPTION=Courier authentication library
 EAPI=7
 HOMEPAGE=https://www.courier-mta.org/authlib/
 IUSE=berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3
-RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.0 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.69.0.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d9fde1153c31d104193e7958fd8719d1
+_md5_=8ec31f334441ed701908f977bd3067c6
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1 b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1
new file mode 100644
index 000000000000..e2e425692c36
--- /dev/null
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.69.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=Courier authentication library
+EAPI=7
+HOMEPAGE=https://www.courier-mta.org/authlib/
+IUSE=berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.1 gdbm? ( sys-libs/gdbm ) !gdbm? ( sys-libs/db:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ldap? ( >=net-nds/openldap-1.2.11 ) mysql? ( dev-db/mysql-connector-c ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RESTRICT=!berkdb? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-authlib-0.69.0.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=12cff19635480b811f1137965b94fd8d
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.19 b/metadata/md5-cache/net-libs/gnutls-3.5.19
index f294b7a4ebf6..4a9a1ad7d709 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.19
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.19
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) ) test-full? ( guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
+DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) valgrind? ( dev-util/valgrind ) test? ( seccomp? ( sys-libs/libseccomp ) ) test-full? ( guile? ( >=dev-scheme/guile-2 ) app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=6
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.19.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=51fe7bdca527ebd1cd7b68842eaf75e5
+_md5_=df683a7017e62141cf2b835b0c88021a
diff --git a/metadata/md5-cache/net-libs/gnutls-3.5.19-r1 b/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
index 3bfd5f7e003c..6a3911d2c031 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
+++ b/metadata/md5-cache/net-libs/gnutls-3.5.19-r1
@@ -1,15 +1,15 @@
 BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder app-misc/datefudge dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
+DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=7
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) 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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.5/gnutls-3.5.19.tar.xz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=a8e273e5c3c5518c8a8aca3aa9d5393d
+_md5_=6d3189b0210de67c2c695d6dcceabd97
diff --git a/metadata/md5-cache/net-libs/gnutls-3.6.5 b/metadata/md5-cache/net-libs/gnutls-3.6.5
index 270d735c2ce3..f3c9ea5a0e20 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.6.5
+++ b/metadata/md5-cache/net-libs/gnutls-3.6.5
@@ -1,15 +1,15 @@
-BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) tools? ( sys-devel/autogen ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist] net-dialup/ppp net-misc/socat ) >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
+DEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( seccomp? ( sys-libs/libseccomp ) )
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=7
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=dev-libs/libtasn1-4.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/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,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/nettle-3.4.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] tools? ( sys-devel/autogen:= ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.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(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.6/gnutls-3.6.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1cf25b962dafdf955f0513d037066aa5
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=05ab10e8b465c3b43f191cbb4fdaaa25
diff --git a/metadata/md5-cache/net-libs/kdav2-0.2.0 b/metadata/md5-cache/net-libs/kdav2-0.2.0
index f946ad288594..4f26e91987bf 100644
--- a/metadata/md5-cache/net-libs/kdav2-0.2.0
+++ b/metadata/md5-cache/net-libs/kdav2-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 >=dev-qt/qtxmlpatterns-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kdav2/0.2.0/src/kdav2-0.2.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eb5c5e9cc8b9c36afe2148f35c33bc98
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1 b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
index 17fb3bc6471e..b0e909e3efc0 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.2.0/src/kimap2-0.2.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ed07e24edea48b82ef1aa4c7da81ac72
diff --git a/metadata/md5-cache/net-libs/libbitcoinconsensus-0.17.1 b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.17.1
new file mode 100644
index 000000000000..a3a4506fff63
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbitcoinconsensus-0.17.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Bitcoin Core consensus library
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9c1bc0f52e174deb2791ea55e8269e30
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1-r1 b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
index aa11bc6b9cb4..b793a785a7f1 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.1-r1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= !net-libs/libktorrent:4 !dev-libs/botan[gmp(-)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/libktorrent-2.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=cd630996a3ab7cd66315c0c1238a83af
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
index 780685973323..b6dd01257b81 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdewebkit-5.52.0:
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8f8fb03993ccabd819ec98060259dd8c
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
index 3e4048f81ad5..bd8cd62fea7d 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=dev-qt/qtnetwork-5.11.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=ba4fda50abae19b0b5896bfd4fbc6558
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503 b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
index 2eacf9a4bdb3..f39876aee70f 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.0.20180503
@@ -4,9 +4,9 @@ DESCRIPTION=UPnP client library and a simple UPnP client
 EAPI=6
 HOMEPAGE=http://miniupnp.free.fr/
 IUSE=ipv6 kernel_linux static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.0.20180503.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d29d6092dda8b2bbbdd59533bf0973ef
+_md5_=3b13cc770ab6231246a0d4fb90dabc76
diff --git a/metadata/md5-cache/net-libs/nodejs-10.15.0 b/metadata/md5-cache/net-libs/nodejs-10.15.0
index 2ebc6007b39b..c5ed80b68cbb 100644
--- a/metadata/md5-cache/net-libs/nodejs-10.15.0
+++ b/metadata/md5-cache/net-libs/nodejs-10.15.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.15.0 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.15.0 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
+RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-62.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v10.15.0/node-v10.15.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c70ed65afd1b6816c8d5c32612e83f0a
+_md5_=18cec15d870be46ffefe79070b3b60ea
diff --git a/metadata/md5-cache/net-libs/nodejs-11.6.0 b/metadata/md5-cache/net-libs/nodejs-11.6.0
index 7ad6fcbec0dc..b674127d7b12 100644
--- a/metadata/md5-cache/net-libs/nodejs-11.6.0
+++ b/metadata/md5-cache/net-libs/nodejs-11.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.24.1:= >=net-dns/c-ares-1.15.0 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.24.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.24.1:= >=net-dns/c-ares-1.15.0 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
+RDEPEND=>=dev-libs/libuv-1.24.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.34.0 sys-libs/zlib icu? ( >=dev-libs/icu-63.1:= ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v11.6.0/node-v11.6.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9da794c0773f502c71c487351d4f598
+_md5_=55febc04503103b334084fdbd965f52d
diff --git a/metadata/md5-cache/net-libs/nodejs-6.16.0 b/metadata/md5-cache/net-libs/nodejs-6.16.0
index f05cc27798e9..9afb110593d6 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.16.0
+++ b/metadata/md5-cache/net-libs/nodejs-6.16.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.16.1:= >net-libs/http-parser-2.8.1:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.16.1:= >net-libs/http-parser-2.8.1:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.16.0/node-v6.16.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aec7fb1f92688535449a01db05d30cb2
+_md5_=7cbb1108977f7da4a0a8bcd2bd265427
diff --git a/metadata/md5-cache/net-libs/nodejs-8.15.0 b/metadata/md5-cache/net-libs/nodejs-8.15.0
index 08a3991c6922..bd3d4b76601e 100644
--- a/metadata/md5-cache/net-libs/nodejs-8.15.0
+++ b/metadata/md5-cache/net-libs/nodejs-8.15.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >net-libs/http-parser-2.8.1:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v8.15.0/node-v8.15.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c923eab725e6915b1f2b6935aa7a3e0e
+_md5_=5c56aec677b2827bd2a2d66c196cc462
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 53ba1bb02970..e386c665ecc8 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/libuv-1.19.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/libuv-1.19.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( =dev-libs/openssl-1.1.0*:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
+RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( =dev-libs/openssl-1.1.0*:0= )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e78d92baf87a1340673133ad8f02e19
+_md5_=5bffa1646d45166f309085c940ecbcde
diff --git a/metadata/md5-cache/net-libs/signond-8.59 b/metadata/md5-cache/net-libs/signond-8.59
deleted file mode 100644
index 3ef51ed40514..000000000000
--- a/metadata/md5-cache/net-libs/signond-8.59
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy doc? ( app-doc/doxygen ) test? ( dev-qt/qttest:5 )
-DESCRIPTION=Signon daemon for libaccounts-glib
-EAPI=6
-HOMEPAGE=https://01.org/gsso/
-IUSE=doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy !<net-libs/libproxy-0.4.12[kde]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> signond-8.59.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=1703378845beef3520f33c93c9d8bcf7
diff --git a/metadata/md5-cache/net-libs/stem-1.7.1 b/metadata/md5-cache/net-libs/stem-1.7.1
new file mode 100644
index 000000000000..c1911126a49f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/stem-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-vpn/tor ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Stem is a Python controller library for Tor
+EAPI=6
+HOMEPAGE=https://stem.torproject.org
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=net-vpn/tor 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/s/stem/stem-1.7.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=78d1b3d180ba76861bbe4729ff9b74fe
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
index d1208c191256..110eabbf17b8 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.08.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.11.1:5 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.08/src/telepathy-logger-qt-17.08.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=661790bb8010e5c01d5e9b0db455d8cf
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.22.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.22.5
new file mode 100644
index 000000000000..ff82d55ba1b1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.22.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 dev-util/glib-utils >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open source web browser engine
+EAPI=6
+HOMEPAGE=https://www.webkitgtk.org
+IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 >=media-libs/freetype-2.4.2:2 >=dev-libs/libgcrypt-1.6.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.3.3:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= >=dev-libs/libgcrypt-1.7.0:0= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
+REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.22.5.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4dfa6b11067d008df0fbfe9067e4c11b
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.0 b/metadata/md5-cache/net-libs/zeromq-4.3.0
index 29059441a7de..7a0cbc298248 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.0
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=A brokerless kernel
 EAPI=7
 HOMEPAGE=http://www.zeromq.org/
 IUSE=doc drafts pgm +sodium static-libs test unwind elibc_Darwin
-KEYWORDS=~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-3
 RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.0/zeromq-4.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=408917bb2bc8edf4649072769cd90d27
+_md5_=44f6e020a6e13026c509450409a46614
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 1c4bdb70e84d..940b209cb0a3 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/courier-imap-4.17.3 b/metadata/md5-cache/net-mail/courier-imap-4.17.3
index 973eebe552cd..83d3e3a01551 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.17.3
+++ b/metadata/md5-cache/net-mail/courier-imap-4.17.3
@@ -4,11 +4,11 @@ DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=6
 HOMEPAGE=https://www.courier-mta.org/imap/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.61 <=net-libs/courier-unicode-2 >=net-libs/courier-unicode-1.3 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 REQUIRED_USE=|| ( berkdb gdbm )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.17.3.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9f71ad9fe3813231ad6c6b61af08a33b
+_md5_=d0d19ecff3bd29b3dc98adfa3e90fb31
diff --git a/metadata/md5-cache/net-mail/courier-imap-4.18.2 b/metadata/md5-cache/net-mail/courier-imap-4.18.2
index df0dcb49efc6..fe6f8752ae64 100644
--- a/metadata/md5-cache/net-mail/courier-imap-4.18.2
+++ b/metadata/md5-cache/net-mail/courier-imap-4.18.2
@@ -4,7 +4,7 @@ DESCRIPTION=An IMAP daemon designed specifically for maildirs
 EAPI=6
 HOMEPAGE=https://www.courier-mta.org/imap/
 IUSE=berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=net-libs/courier-authlib-0.66.4 >=net-libs/courier-unicode-2 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db:= ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 REQUIRED_USE=|| ( berkdb gdbm )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-imap-4.18.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=72ce747c5450540dfe5b25daf1f4b2a2
+_md5_=33122a6ffc2bfccc3d72297193c53265
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f9219e65d259..ae7ca6e35f54 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/bird-1.6.5 b/metadata/md5-cache/net-misc/bird-1.6.5
new file mode 100644
index 000000000000..b63421669e33
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-1.6.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug ipv6
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.5.tar.gz
+_md5_=b05339c07aa8cacbab7e1587e90a3ef0
diff --git a/metadata/md5-cache/net-misc/bird-2.0.3 b/metadata/md5-cache/net-misc/bird-2.0.3
new file mode 100644
index 000000000000..12c270c628b2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.3.tar.gz
+_md5_=8271e95c3943cab9924876c14b1f8ac5
diff --git a/metadata/md5-cache/net-misc/curl-7.61.1 b/metadata/md5-cache/net-misc/curl-7.61.1
index d0e6448d42f3..45f5fbe1eafe 100644
--- a/metadata/md5-cache/net-misc/curl-7.61.1
+++ b/metadata/md5-cache/net-misc/curl-7.61.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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(-)?]
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.61.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83078493bbac3c7531fcac27440cde34
+_md5_=50b246c863eeebe68856d719128c5662
diff --git a/metadata/md5-cache/net-misc/curl-7.61.1-r1 b/metadata/md5-cache/net-misc/curl-7.61.1-r1
index f83004111546..ddd9704510d5 100644
--- a/metadata/md5-cache/net-misc/curl-7.61.1-r1
+++ b/metadata/md5-cache/net-misc/curl-7.61.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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(-)?]
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.61.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c906ed3eaf182b271fc5197f9a9eac27
+_md5_=493d5d7ad2b909adb8688f0a8b0f76ad
diff --git a/metadata/md5-cache/net-misc/curl-7.62.0 b/metadata/md5-cache/net-misc/curl-7.62.0
index 0481b92add09..6f32415853d3 100644
--- a/metadata/md5-cache/net-misc/curl-7.62.0
+++ b/metadata/md5-cache/net-misc/curl-7.62.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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(-)?]
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[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(-)?] ) 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=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.62.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=755c216bc08bdf2b5e6d11d2b9f685a4
+_md5_=ad146188c0a8e8c2e0d2f88c04e05577
diff --git a/metadata/md5-cache/net-misc/curl-7.63.0-r1 b/metadata/md5-cache/net-misc/curl-7.63.0-r1
index 9f605f786b92..b1248cc3d5c9 100644
--- a/metadata/md5-cache/net-misc/curl-7.63.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.63.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,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/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?]
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] 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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,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-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,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/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.63.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a9cfc8c6d051943813ab73d496d6550
+_md5_=bd1b7d42b9ef7e4cb43b385ed998e1cf
diff --git a/metadata/md5-cache/net-misc/dropbox-cli-1.6.0-r1 b/metadata/md5-cache/net-misc/dropbox-cli-1.6.0-r1
index b4bdbb4ccda0..f469b11fff03 100644
--- a/metadata/md5-cache/net-misc/dropbox-cli-1.6.0-r1
+++ b/metadata/md5-cache/net-misc/dropbox-cli-1.6.0-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Cli interface for dropbox (python), part of nautilus-dropbox
 EAPI=6
 HOMEPAGE=https://www.dropbox.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=net-misc/dropbox python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/dropbox-cli-1.6.0.py.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3d7b8d12421e3e74f23d59c83df87db9
+_md5_=e5b43012f7a1c62dbe7945d4fa915d59
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.5 b/metadata/md5-cache/net-misc/electrum-3.0.5
deleted file mode 100644
index 48230ff873c5..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.0.5/Electrum-3.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c117260badd3464cbe76001f141c5276
diff --git a/metadata/md5-cache/net-misc/electrum-3.0.6 b/metadata/md5-cache/net-misc/electrum-3.0.6
deleted file mode 100644
index 3b34b8ec5568..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/ecdsa[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonrpclib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pbkdf2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyaes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/PySocks[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tlslite[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/protobuf-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-dnspython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.0.6/Electrum-3.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9cb5d31db83e7671aa151af40ec33afa
diff --git a/metadata/md5-cache/net-misc/electrum-3.1.1 b/metadata/md5-cache/net-misc/electrum-3.1.1
deleted file mode 100644
index c490564095ba..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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/ecdsa[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/jsonrpclib[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/pbkdf2[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/pyaes[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/PySocks[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/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/tlslite[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/protobuf-python[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(-)] virtual/python-dnspython[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(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.1.1/Electrum-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=92940e15eaec70ac3b7f11b37a5be0b0
diff --git a/metadata/md5-cache/net-misc/electrum-3.1.2 b/metadata/md5-cache/net-misc/electrum-3.1.2
deleted file mode 100644
index fa0b8adce405..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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/ecdsa[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/jsonrpclib[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/pbkdf2[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/pyaes[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/PySocks[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/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/tlslite[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/protobuf-python[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(-)] virtual/python-dnspython[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(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.1.2/Electrum-3.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=695eb16f095c85e1e15c6f1bf248a90c
diff --git a/metadata/md5-cache/net-misc/electrum-3.2.2 b/metadata/md5-cache/net-misc/electrum-3.2.2
deleted file mode 100644
index 59745aab2c2b..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb l10n_ar l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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/ecdsa[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/jsonrpclib[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/pbkdf2[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/pyaes[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/PySocks[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/qrcode[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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/tlslite[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/protobuf-python[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(-)] virtual/python-dnspython[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(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,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(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses?] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses?] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_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=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.2.2/Electrum-3.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=04dae63b6fbc200a21177b7fc9615c6b
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.2 b/metadata/md5-cache/net-misc/electrum-3.3.2
new file mode 100644
index 000000000000..cc7b2aa3a1ec
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-3.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=User friendly Bitcoin client
+EAPI=6
+HOMEPAGE=https://electrum.org/
+IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://download.electrum.org/3.3.2/Electrum-3.3.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d672b2538639616e61708c3f11fc3463
diff --git a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
deleted file mode 100644
index 722edd439b0a..000000000000
--- a/metadata/md5-cache/net-misc/gerbera-1.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!!net-misc/mediatomb <=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=UPnP Media Server (Based on MediaTomb)
-EAPI=6
-HOMEPAGE=https://github.com/gerbera/gerbera
-IUSE=curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!!net-misc/mediatomb <=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/gerbera/gerbera/archive/v1.1.0.tar.gz -> gerbera-1.1.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b873d90595d5b0eb4dc2393b675e74c4
diff --git a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
index eeb8d62da7a0..2e44da6f7970 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
 DESCRIPTION=UPnP Media Server (Based on MediaTomb)
 EAPI=6
 HOMEPAGE=https://github.com/gerbera/gerbera
 IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.2.0.tar.gz -> gerbera-1.2.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0f154104ed2299da415768d084c67261
+_md5_=3033eaa22ef8cb50546f5287fa14782c
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index 9d2503489530..8c15ad0962dd 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=UPnP Media Server (Based on MediaTomb)
 EAPI=6
 HOMEPAGE=https://github.com/gerbera/gerbera
 IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib kernel_linux
 LICENSE=GPL-2
-RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2685d6df94eeb9ea404bf2fa8d3d1425
+_md5_=76fe10fd67f0cfb09f85a1000de4a8a4
diff --git a/metadata/md5-cache/net-misc/htpdate-1.2.0 b/metadata/md5-cache/net-misc/htpdate-1.2.0
index 35bdef7e0e69..e454b71e1e38 100644
--- a/metadata/md5-cache/net-misc/htpdate-1.2.0
+++ b/metadata/md5-cache/net-misc/htpdate-1.2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Synchronize local workstation with time offered by remote webservers
 EAPI=6
 HOMEPAGE=http://www.vervest.org/htp/
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 ~sh x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vervest.org/htp/archive/c/htpdate-1.2.0.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8938d59a7e8331e80e9f171e427ae381
+_md5_=777cddab09270d8ff149ba58e87370a6
diff --git a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211 b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
index db9116956dd4..a3b2cb3a0d9f 100644
--- a/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
+++ b/metadata/md5-cache/net-misc/knemo-0.8.0_pre20161211
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=kde-plasma/libksysguard-5.12.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libnl:3 sys-apps/net-tools wifi? ( net-wireless/wireless-tools ) !net-misc/knemo:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=eaa583196f2d7348b47ee246a0a48115
diff --git a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1 b/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
index e0904a71517e..1377b60a58b4 100644
--- a/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
+++ b/metadata/md5-cache/net-misc/lldpd-0.9.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.9.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c92cd207f4c623db502487ddb1dee2e
+_md5_=3090d858fdb9868675d358e8e3509729
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.1 b/metadata/md5-cache/net-misc/lldpd-1.0.1
index b05fb06d3a67..35214b5d70a3 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2b99cdcf9a780caf1eeb5afb9c512797
+_md5_=45abd8720f97aa2c6fc81a2672703a1d
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.1-r1 b/metadata/md5-cache/net-misc/lldpd-1.0.1-r1
index 3756a167dfef..10346e9226d6 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.1-r1
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fb153358d1b64f8f60b199c6435651d
+_md5_=809bb8ec781264e49b5e93dc93fe1919
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.3 b/metadata/md5-cache/net-misc/lldpd-1.0.3
index a503e036f82a..5fe8620ef4ac 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.3
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
 EAPI=6
 HOMEPAGE=https://vincentbernat.github.com/lldpd/
 IUSE=cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs test readline xml zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5:= sys-libs/readline:0= snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
 REQUIRED_USE=graph? ( doc )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a602483fcdc6f7504bb7d2667228034
+_md5_=94cd1774dc723cf00d0425138fc77df3
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.6 b/metadata/md5-cache/net-misc/mosh-1.2.6
index 110b31f3758e..34eea85080d0 100644
--- a/metadata/md5-cache/net-misc/mosh-1.2.6
+++ b/metadata/md5-cache/net-misc/mosh-1.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
 IUSE=+client examples +mosh-hardening +server ufw +utempter
 KEYWORDS=amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.2.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=e7c88200ba5197242f0fc23f320ad30e
+_md5_=62da71903a133e832cf265fca499ffe5
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.0 b/metadata/md5-cache/net-misc/mosh-1.3.0
index 4d0354e49668..b96e187d31ca 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.0
+++ b/metadata/md5-cache/net-misc/mosh-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
 IUSE=+client examples +mosh-hardening +server ufw +utempter
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=a0eae3a60d197d7dc8a9c3038f3d3489
+_md5_=8c87fafa2bfba60d384f8a8420aa2063
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2 b/metadata/md5-cache/net-misc/mosh-1.3.2
index 420e0eee0d4d..096e02c031fd 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
-IUSE=+client examples +mosh-hardening +server ufw +utempter
+IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 KEYWORDS=amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=ca0b1a5681f730cd5891287a47eba073
+_md5_=04882bbb54ec6d03ebc6155947a718df
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index ebc08b92a7b2..49589d587734 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) dev-vcs/git[curl] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter ) dev-vcs/git[curl] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=6
 HOMEPAGE=https://mosh.org
-IUSE=+client examples +mosh-hardening +server ufw +utempter
+IUSE=+client examples libressl +mosh-hardening +server ufw +utempter
 LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+RDEPEND=dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cfd32849d8ccf05fe236ab6eea94845
+_md5_=8ca22c37f562d2fc78c98863c289580b
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p11 b/metadata/md5-cache/net-misc/ntp-4.2.8_p11
deleted file mode 100644
index 694da4a0988f..000000000000
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Network Time Protocol suite/programs
-EAPI=6
-HOMEPAGE=http://www.ntp.org/
-IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
-LICENSE=HPND BSD ISC
-PDEPEND=openntpd? ( net-misc/openntpd )
-RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
-SLOT=0
-SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p11-manpages.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52ac714b593f895f165ddbe123dd7cff
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p12 b/metadata/md5-cache/net-misc/ntp-4.2.8_p12
index 0980efd957c6..76f9f89f4bae 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p12
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p12
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=6
 HOMEPAGE=http://www.ntp.org/
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p12-manpages.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bc03423ad0b816dfc43954fe24a05a5
+_md5_=2782b707443899e7f73ab1a443f385a7
diff --git a/metadata/md5-cache/net-misc/rclone-1.42 b/metadata/md5-cache/net-misc/rclone-1.42
deleted file mode 100644
index ca0aecb0ea59..000000000000
--- a/metadata/md5-cache/net-misc/rclone-1.42
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A program to sync files to and from various cloud storage providers
-EAPI=6
-HOMEPAGE=https://rclone.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/ncw/rclone/archive/v1.42.tar.gz -> rclone-1.42.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-1.43.1 b/metadata/md5-cache/net-misc/rclone-1.43.1
deleted file mode 100644
index 4eee53708a06..000000000000
--- a/metadata/md5-cache/net-misc/rclone-1.43.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.9
-DESCRIPTION=A program to sync files to and from various cloud storage providers
-EAPI=6
-HOMEPAGE=https://rclone.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/ncw/rclone/archive/v1.43.1.tar.gz -> rclone-1.43.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-misc/rclone-1.44 b/metadata/md5-cache/net-misc/rclone-1.44
index 94f0d4a7e447..495c3555d634 100644
--- a/metadata/md5-cache/net-misc/rclone-1.44
+++ b/metadata/md5-cache/net-misc/rclone-1.44
@@ -3,9 +3,9 @@ DEPEND=>=dev-lang/go-1.9
 DESCRIPTION=A program to sync files to and from various cloud storage providers
 EAPI=6
 HOMEPAGE=https://rclone.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncw/rclone/archive/v1.44.tar.gz -> rclone-1.44.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2c53abcdf6fe8ec4c359c7434aea02b2
+_md5_=f0a0c364128b8032547d28cdac26dff8
diff --git a/metadata/md5-cache/net-misc/rclone-1.45 b/metadata/md5-cache/net-misc/rclone-1.45
new file mode 100644
index 000000000000..244bb1714ffa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rclone-1.45
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A program to sync files to and from various cloud storage providers
+EAPI=6
+HOMEPAGE=https://rclone.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/ncw/rclone/archive/v1.45.tar.gz -> rclone-1.45.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2be610164b1ae9e4d5116425e85f2288
diff --git a/metadata/md5-cache/net-misc/rclone-9999 b/metadata/md5-cache/net-misc/rclone-9999
index 4956f54b24b7..7f235972b922 100644
--- a/metadata/md5-cache/net-misc/rclone-9999
+++ b/metadata/md5-cache/net-misc/rclone-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://rclone.org/
 LICENSE=MIT
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs	2e6aa7a0bfd0d17fb4da52dedfb96376	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c53abcdf6fe8ec4c359c7434aea02b2
+_md5_=2be610164b1ae9e4d5116425e85f2288
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.8.4 b/metadata/md5-cache/net-misc/rdesktop-1.8.4
new file mode 100644
index 000000000000..6da4513c6951
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( net-libs/libgssglue ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr ) x11-libs/libXt
+DESCRIPTION=A Remote Desktop Protocol Client
+EAPI=7
+HOMEPAGE=http://www.rdesktop.org/
+IUSE=alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( net-libs/libgssglue ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
+SLOT=0
+SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.4/rdesktop-1.8.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=6731cf31468804703fd86d93ec0aede9
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.2 b/metadata/md5-cache/net-misc/s3cmd-2.0.2
index bc5b9a616cb0..05d152d5b79c 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.0.2
+++ b/metadata/md5-cache/net-misc/s3cmd-2.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client for Amazon S3
 EAPI=6
 HOMEPAGE=https://s3tools.org/s3cmd
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ia64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-magic[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.0.2.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c694b033de8f99f78162c8cbe267967
+_md5_=aa98e21f750ae1b160df6535445a52da
diff --git a/metadata/md5-cache/net-misc/smb4k-2.1.1 b/metadata/md5-cache/net-misc/smb4k-2.1.1
index 865996a13686..b5115ea06264 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.1.1
+++ b/metadata/md5-cache/net-misc/smb4k-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-5.52.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-2.1.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1ba3aa121fb70a2548e5afa90f687885
diff --git a/metadata/md5-cache/net-misc/sshrc-0.6.2 b/metadata/md5-cache/net-misc/sshrc-0.6.2
index 61b6abc2a070..739972aef478 100644
--- a/metadata/md5-cache/net-misc/sshrc-0.6.2
+++ b/metadata/md5-cache/net-misc/sshrc-0.6.2
@@ -3,9 +3,9 @@ DESCRIPTION=Bring your .bashrc, .vimrc, etc. from your local machine when you ss
 EAPI=7
 HOMEPAGE=https://github.com/Russell91/sshrc
 IUSE=mosh
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=virtual/ssh:0= mosh? ( net-misc/mosh:0[client] )
 SLOT=0
 SRC_URI=https://github.com/Russell91/sshrc/archive/0.6.2.tar.gz -> sshrc-0.6.2.tar.gz
-_md5_=b706540b85eacb01f8df7d4661a1f602
+_md5_=2888a7cfa87c1c5b4b70edb4c8728cdc
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index ca0d35aa149a..2b9eb0143c36 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c0228d0f6967e05391c7e94259241fb
diff --git a/metadata/md5-cache/net-misc/usbip-4.13 b/metadata/md5-cache/net-misc/usbip-4.13
index b621adf04da6..d46b94055983 100644
--- a/metadata/md5-cache/net-misc/usbip-4.13
+++ b/metadata/md5-cache/net-misc/usbip-4.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dee5fc21d6bb4ea70efe7d68b4009a5f
diff --git a/metadata/md5-cache/net-misc/wget-1.19.5-r1 b/metadata/md5-cache/net-misc/wget-1.19.5-r1
deleted file mode 100644
index 38bdea623096..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.19.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.19.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fdbe1a2d44c5b5a2dcd190597dee21b
diff --git a/metadata/md5-cache/net-misc/wget-1.20 b/metadata/md5-cache/net-misc/wget-1.20
deleted file mode 100644
index 6c88d9dbbe5d..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/wget/
-IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59f00c904855ea7ed1350eb84f6a7faa
diff --git a/metadata/md5-cache/net-misc/wget-1.20.1 b/metadata/md5-cache/net-misc/wget-1.20.1
index 889961d889eb..3993b9fe5a5b 100644
--- a/metadata/md5-cache/net-misc/wget-1.20.1
+++ b/metadata/md5-cache/net-misc/wget-1.20.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
+DEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) app-arch/xz-utils virtual/pkgconfig static? ( idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) nls? ( sys-devel/gettext )
 DESCRIPTION=Network utility to retrieve files from the WWW
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wget/
 IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
-RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14 ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
+RDEPEND=!static? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
 REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://gnu/wget/wget-1.20.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59f00c904855ea7ed1350eb84f6a7faa
+_md5_=4f2e18c9e1d303a0d0bd0c4f1100837a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.12.17 b/metadata/md5-cache/net-misc/youtube-dl-2018.12.17
deleted file mode 100644
index 4439b30aa70c..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2018.12.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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(-)]
-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(+)] )
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-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 ~arm64 hppa ppc ppc64 x86 ~amd64-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.12.17/youtube-dl-2018.12.17.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=329c457313e387eaa5b10906823c34fa
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.01.02 b/metadata/md5-cache/net-misc/youtube-dl-2019.01.02
new file mode 100644
index 000000000000..6484969478c4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.01.02
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(+)] )
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+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 ~arm64 hppa ppc ppc64 x86 ~amd64-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/2019.01.02/youtube-dl-2019.01.02.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d981fe4d4a7ae19450795378ac688c1d
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.01.10 b/metadata/md5-cache/net-misc/youtube-dl-2019.01.10
new file mode 100644
index 000000000000..e42d747eac9d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.01.10
@@ -0,0 +1,15 @@
+BDEPEND=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(-)]
+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(+)] )
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+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 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-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/2019.01.10/youtube-dl-2019.01.10.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=eac856de9b1fa9f2fe19983f47290c84
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 87d3786947bd..4e7c969d4ae3 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/newsboat-2.10.2 b/metadata/md5-cache/net-news/newsboat-2.10.2
deleted file mode 100644
index f5242fee44b5..000000000000
--- a/metadata/md5-cache/net-news/newsboat-2.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] app-text/asciidoc dev-lang/perl virtual/pkgconfig sys-devel/gettext test? ( dev-libs/boost sys-devel/bc )
-DESCRIPTION=An RSS/Atom feed reader for text terminals
-EAPI=6
-HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://newsboat.org/releases/2.10.2/newsboat-2.10.2.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2df768c01cc4296487f2032341a1798d
diff --git a/metadata/md5-cache/net-news/newsboat-2.11.1 b/metadata/md5-cache/net-news/newsboat-2.11.1
deleted file mode 100644
index 92b6da9af6c0..000000000000
--- a/metadata/md5-cache/net-news/newsboat-2.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] app-text/asciidoc virtual/pkgconfig sys-devel/gettext test? ( >=dev-cpp/catch-2 )
-DESCRIPTION=An RSS/Atom feed reader for text terminals
-EAPI=6
-HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://newsboat.org/releases/2.11.1/newsboat-2.11.1.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b23391d175752318d871d3fe25bc28fa
diff --git a/metadata/md5-cache/net-news/newsboat-2.12 b/metadata/md5-cache/net-news/newsboat-2.12
deleted file mode 100644
index 55a97c3e629b..000000000000
--- a/metadata/md5-cache/net-news/newsboat-2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode] app-text/asciidoc virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=An RSS/Atom feed reader for text terminals
-EAPI=6
-HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
-SLOT=0
-SRC_URI=https://newsboat.org/releases/2.12/newsboat-2.12.tar.xz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=11cd36b277dd3635d8afaa642963dfc5
diff --git a/metadata/md5-cache/net-news/newsboat-2.13 b/metadata/md5-cache/net-news/newsboat-2.13
index dc9df345aa59..33e68d0f855a 100644
--- a/metadata/md5-cache/net-news/newsboat-2.13
+++ b/metadata/md5-cache/net-news/newsboat-2.13
@@ -3,10 +3,10 @@ DEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-l
 DESCRIPTION=An RSS/Atom feed reader for text terminals
 EAPI=6
 HOMEPAGE=https://newsboat.org/ https://github.com/newsboat/newsboat
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.18.0 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.13/newsboat-2.13.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=11cd36b277dd3635d8afaa642963dfc5
+_md5_=392f03e7bd85048fbdc737901c6def14
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 72c33c278211..c0ddff66395a 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/kwooty-1.1.0_p20150623 b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
index c13b41ba14fe..05d881927129 100644
--- a/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
+++ b/metadata/md5-cache/net-nntp/kwooty-1.1.0_p20150623
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwooty-1.1.0_p20150623.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2f35dcc945e9be2d0e23c2735a5900f0
diff --git a/metadata/md5-cache/net-nntp/pan-0.142 b/metadata/md5-cache/net-nntp/pan-0.142
deleted file mode 100644
index 45711cb8e68c..000000000000
--- a/metadata/md5-cache/net-nntp/pan-0.142
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= ) app-text/yelp-tools >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A newsreader for GNOME
-EAPI=6
-HOMEPAGE=http://pan.rebelbase.com/
-IUSE=dbus gnome-keyring libnotify spell ssl
-KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
-SLOT=0
-SRC_URI=http://pan.rebelbase.com/download/releases/0.142/source/pan-0.142.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6597d14087eaddb288b9175a4f96bf52
diff --git a/metadata/md5-cache/net-nntp/pan-0.145 b/metadata/md5-cache/net-nntp/pan-0.145
index 237f92655a98..07ef067611d9 100644
--- a/metadata/md5-cache/net-nntp/pan-0.145
+++ b/metadata/md5-cache/net-nntp/pan-0.145
@@ -4,10 +4,10 @@ DESCRIPTION=A newsreader for GNOME
 EAPI=6
 HOMEPAGE=http://pan.rebelbase.com/
 IUSE=dbus gnome-keyring libnotify spell ssl
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 dev-libs/gmime:2.6 >=sys-libs/zlib-1.2.0 >=x11-libs/gtk+-2.16:2 gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 ) libnotify? ( >=x11-libs/libnotify-0.4.1:0= ) spell? ( >=app-text/enchant-1.6 >=app-text/gtkspell-2.0.7:2 ) ssl? ( >=net-libs/gnutls-3:0= )
 SLOT=0
 SRC_URI=http://pan.rebelbase.com/download/releases/0.145/source/pan-0.145.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=506e31317ff1cf628c6dcecb130d1364
+_md5_=afd5e7fcc4ab7f66cdc259a0dcf6ecc2
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 346896758ee4..ae6563fd41f5 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/bitcoin-cli-0.17.1 b/metadata/md5-cache/net-p2p/bitcoin-cli-0.17.1
new file mode 100644
index 000000000000..6f41a002c16a
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-cli-0.17.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Command-line JSON-RPC client specifically for interfacing with bitcoind
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=knots libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/univalue-1.0.4:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=da0bfc8293cf3141aba4186b44bdaf82
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1
new file mode 100644
index 000000000000..487072041a7d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare pretend
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= ) dev-qt/linguist-tools:5 knots? ( gnome-base/librsvg media-gfx/imagemagick[png] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
+EAPI=6
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 system-leveldb? ( virtual/bitcoin-leveldb ) bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) dev-libs/libevent:= !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=188bb53f2a6870e60e071847789c818e
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.17.1 b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
new file mode 100644
index 000000000000..8dd25ed835bc
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+DESCRIPTION=Original Bitcoin crypto-currency wallet for automated services
+EAPI=7
+HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
+IUSE=+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] >=dev-libs/univalue-1.0.4:= system-leveldb? ( virtual/bitcoin-leveldb ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
+SLOT=0
+SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5b7f7a6b3794ad3521d33ff55fc9ee70
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.1
index b102276c8a7e..58f1d479e363 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.50.0:5 >=kde-frameworks/kconfig-5.50.0:5 >=kde-frameworks/kconfigwidgets-5.50.0:5 >=kde-frameworks/kcoreaddons-5.50.0:5 >=kde-frameworks/kcrash-5.50.0:5 >=kde-frameworks/kdbusaddons-5.50.0:5 >=kde-frameworks/ki18n-5.50.0:5 >=kde-frameworks/kiconthemes-5.50.0:5 >=kde-frameworks/kio-5.50.0:5 >=kde-frameworks/knotifications-5.50.0:5 >=kde-frameworks/knotifyconfig-5.50.0:5 >=kde-frameworks/kparts-5.50.0:5 >=kde-frameworks/kwidgetsaddons-5.50.0:5 >=kde-frameworks/kwindowsystem-5.50.0:5 >=kde-frameworks/kxmlgui-5.50.0:5 >=kde-frameworks/solid-5.50.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.50.0:5 >=kde-frameworks/kitemviews-5.50.0:5 >=kde-frameworks/kross-5.50.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=kde-frameworks/syndication-5.50.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.50.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.12.5:5 ) stats? ( >=kde-frameworks/kplotting-5.50.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.50.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.50.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.50.0:5 >=kde-apps/kio-extras-18.08.3:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.50.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1.1/ktorrent-5.1.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4648bb0ccf8246ee6184edbca4207f4d
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.4.1 b/metadata/md5-cache/net-p2p/nicotine+-1.4.1
deleted file mode 100644
index cb40bf75b5f8..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=5
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> nicotine+-1.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7254d01ab4e6020c72cac98e48f49db
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1 b/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1
new file mode 100644
index 000000000000..6f1f796b8b0d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=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_python3_7(-),python_single_target_python2_7(+)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A fork of nicotine, a Soulseek client in Python
+EAPI=7
+HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> nicotine+-1.4.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=63061e4274704a06093cf191a68f1342
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.0.0 b/metadata/md5-cache/net-p2p/syncthing-1.0.0
new file mode 100644
index 000000000000..adb4e966e59e
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=6
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MPL-2.0
+RDEPEND=selinux? ( sec-policy/selinux-syncthing )
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.0.0.tar.gz -> syncthing-1.0.0.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c37594c245824e1e6d9f59997146cada
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index dd30467d0652..4848f53d3d73 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.10 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.10
deleted file mode 100644
index a3bb9dbb7aaf..000000000000
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-print/cups
-DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
-EAPI=6
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa620593175010796eecfbfe73cb9a/epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz
-_md5_=403b45a8772c89752fb88a3a744f7397
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.15 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.15
deleted file mode 100644
index 07234e35c512..000000000000
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-print/cups
-DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
-EAPI=6
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/06/25/43/f63808b4062f7f527e09e75a8f0dd9db46c573fe/epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz
-_md5_=11b0707d18370714031ce13fc16801e3
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.17 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.17
deleted file mode 100644
index 85448219583a..000000000000
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-print/cups
-DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
-EAPI=6
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/06/66/09/4ac2bf69bb1ddf4a9ad525596615cbb40fe4dad5/epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz
-_md5_=d352fe9ec8cc51fb112dbebd911af384
diff --git a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.5 b/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.5
deleted file mode 100644
index f13871f1537e..000000000000
--- a/metadata/md5-cache/net-print/epson-inkjet-printer-escpr-1.6.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-print/cups
-DESCRIPTION=Epson Inkjet Printer Driver (ESC/P-R)
-EAPI=6
-HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz
-_md5_=cb44aadef9040d82d9108f98e4bcd88c
diff --git a/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1 b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
new file mode 100644
index 000000000000..3332f1064215
--- /dev/null
+++ b/metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
+DESCRIPTION=A set of CUPS printer drivers for SPL (Samsung Printer Language) printers
+EAPI=7
+HOMEPAGE=http://splix.sourceforge.net/
+IUSE=+jbig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/ghostscript-gpl-9.02 >=net-print/cups-1.4.0 jbig? ( media-libs/jbigkit )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/splix-2.0.0_p20130826.tar.bz2 https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=753e40d9d32184255379eeb24a8b805c
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 983797ee8707..8f247f79b5ea 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.8.15 b/metadata/md5-cache/net-proxy/haproxy-1.8.15
deleted file mode 100644
index 3f004df1347d..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.15
+++ /dev/null
@@ -1,14 +0,0 @@
-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 kernel_linux
-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.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0321bfadf4af535d2cfe84efeef41581
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.17 b/metadata/md5-cache/net-proxy/haproxy-1.8.17
new file mode 100644
index 000000000000..e3a090dec4f8
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.17
@@ -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 kernel_linux
+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.17.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1a4291c795ff060a87e3555f6ee29053
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.0 b/metadata/md5-cache/net-proxy/haproxy-1.9.0
deleted file mode 100644
index 5530aa24ba09..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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 kernel_linux
-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.9/src/haproxy-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d83c324b2840dbe2f5c509bf767fb171
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.1 b/metadata/md5-cache/net-proxy/haproxy-1.9.1
new file mode 100644
index 000000000000..8534940e7685
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.1
@@ -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 kernel_linux
+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.9/src/haproxy-1.9.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0c6227bd9b6ec285c14c921f908c39d6
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index db2e9df45d87..0a3d8ab60fc8 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/openfortivpn-1.8.1 b/metadata/md5-cache/net-vpn/openfortivpn-1.8.1
new file mode 100644
index 000000000000..955ed0dde2bc
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/openfortivpn-1.8.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=A Fortinet compatible VPN client
+EAPI=7
+HOMEPAGE=https://github.com/adrienverge/openfortivpn
+IUSE=libressl kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-3-with-openssl-exception openssl
+RDEPEND=net-dialup/ppp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://github.com/adrienverge/openfortivpn/archive/v1.8.1.tar.gz -> openfortivpn-1.8.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2305505cb05d1900f4d52c37f6086701
diff --git a/metadata/md5-cache/net-vpn/peervpn-0.044-r4 b/metadata/md5-cache/net-vpn/peervpn-0.044-r4
index 637b1624bb81..09e97371c1f3 100644
--- a/metadata/md5-cache/net-vpn/peervpn-0.044-r4
+++ b/metadata/md5-cache/net-vpn/peervpn-0.044-r4
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-libs/openssl:0= virtual/pkgconfig
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0= ) virtual/pkgconfig
 DESCRIPTION=P2P mesh VPN
 EAPI=6
 HOMEPAGE=https://github.com/peervpn/peervpn
+IUSE=libressl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0=
+RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0= )
 SLOT=0
 SRC_URI=https://github.com/peervpn/peervpn/archive/eb35174277fbf745c5ee0d5875d659dad819adfc.tar.gz -> peervpn-0.044.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a007d43a7e9198ef983ff6c46432e0c7
+_md5_=f593421bf80d2361f6a97af7c73a55ba
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.7.2 b/metadata/md5-cache/net-vpn/strongswan-5.7.2
new file mode 100644
index 000000000000..20832929f91c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.7.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=7
+HOMEPAGE=https://www.strongswan.org/
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=!net-misc/openswan gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.7.2.tar.bz2
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=7bb03f350ab065322d48814f3662b49d
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.5.6_rc b/metadata/md5-cache/net-vpn/tor-0.3.5.6_rc
deleted file mode 100644
index 47703857ca08..000000000000
--- a/metadata/md5-cache/net-vpn/tor-0.3.5.6_rc
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install setup
-DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
-DESCRIPTION=Anonymizing overlay network for TCP
-EAPI=7
-HOMEPAGE=http://www.torproject.org/
-IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
-LICENSE=BSD GPL-2
-RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
-SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.3.5.6-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.5.6-rc.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3675533ae3da0d50ff43b58f5d3db109
diff --git a/metadata/md5-cache/net-vpn/tor-0.3.5.7 b/metadata/md5-cache/net-vpn/tor-0.3.5.7
new file mode 100644
index 000000000000..f360346ce547
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.3.5.7
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=7
+HOMEPAGE=http://www.torproject.org/
+IUSE=caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=app-text/asciidoc dev-libs/libevent[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.3.5.7.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.3.5.7.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=8499a9d533e2ae44ac2a4de9aaf2ac96
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f08e0ae3e0ea..6a1c04cf5f66 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/bluez-5.50-r1 b/metadata/md5-cache/net-wireless/bluez-5.50-r1
index b162a2e0141f..aa82d568411e 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.50-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.50-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=6
 HOMEPAGE=http://www.bluez.org
 IUSE=alsa btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session 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 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,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.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( 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_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.50.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5462ba96dff2aa2372fbbbf46d253a7f
+_md5_=24cf7190ab1fef754005bea3181c849a
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.11.5 b/metadata/md5-cache/net-wireless/gqrx-2.11.5
deleted file mode 100644
index 22c40ee656ca..000000000000
--- a/metadata/md5-cache/net-wireless/gqrx-2.11.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
-EAPI=6
-HOMEPAGE=http://gqrx.dk/
-IUSE=gr-audio portaudio pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
-REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
-SLOT=0
-SRC_URI=https://github.com/csete/gqrx/archive/v2.11.5.tar.gz -> gqrx-2.11.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6d1e1fa8035a3e17acb331afa457f1f8
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1 b/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
new file mode 100644
index 000000000000..325b26175bef
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gqrx-2.11.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Software defined radio receiver powered by GNU Radio and Qt
+EAPI=6
+HOMEPAGE=http://gqrx.dk/
+IUSE=gr-audio portaudio pulseaudio
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
+REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
+SLOT=0
+SRC_URI=https://github.com/csete/gqrx/archive/v2.11.5.tar.gz -> gqrx-2.11.5.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=13bfa32dd0b79181b753a3bef3c5654d
diff --git a/metadata/md5-cache/net-wireless/gr-air-modes-9999 b/metadata/md5-cache/net-wireless/gr-air-modes-9999
index 25432234486b..77f24ed9f70b 100644
--- a/metadata/md5-cache/net-wireless/gr-air-modes-9999
+++ b/metadata/md5-cache/net-wireless/gr-air-modes-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.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_python3_7(-),python_single_target_python2_7(+)] sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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_python3_7(-),python_single_target_python2_7(+)] dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr fgfs? ( games-simulation/flightgear sci-libs/scipy ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
 DESCRIPTION=This module implements a complete Mode S and ADS-B receiver for Gnuradio
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.cgran.org/wiki/gr-air-modes
-IUSE=rtlsdr fgfs uhd python_targets_python2_7
+IUSE=fgfs rtlsdr uhd python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] fgfs? ( sci-libs/scipy games-simulation/flightgear ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.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_python3_7(-),python_single_target_python2_7(+)]
+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_python3_7(-),python_single_target_python2_7(+)] dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr fgfs? ( games-simulation/flightgear sci-libs/scipy ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5c252edc736a5a696e004fb12f20d3d7
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=abafbdf4b1dd7545d4074648fd7c2bb1
diff --git a/metadata/md5-cache/net-wireless/gr-baz-9999 b/metadata/md5-cache/net-wireless/gr-baz-9999
index 990db831b5dc..ef73c977175a 100644
--- a/metadata/md5-cache/net-wireless/gr-baz-9999
+++ b/metadata/md5-cache/net-wireless/gr-baz-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost[threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Gnuradio baz
-EAPI=5
-HOMEPAGE=http://wiki.spench.net/wiki/Gr-baz
+EAPI=7
+HOMEPAGE=https://wiki.spench.net/wiki/Gr-baz
 IUSE=armadillo doc rtlsdr uhd python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=dev-libs/boost[threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+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_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:=[threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e2397f87cfa83772820dfde29568aa44
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1647e8bda8d3f55335f8c57fc53d7db5
diff --git a/metadata/md5-cache/net-wireless/gr-foo-9999 b/metadata/md5-cache/net-wireless/gr-foo-9999
index 4d18431ab1d0..d59058e5464f 100644
--- a/metadata/md5-cache/net-wireless/gr-foo-9999
+++ b/metadata/md5-cache/net-wireless/gr-foo-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig:0
 DESCRIPTION=Some GNU Radio blocks that bastianbl uses
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/rftap/gr-rftap
 IUSE=python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/9999
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c063cfccf84d6ec61665bd962f8954ef
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bf6892b6a6a2d344bbe2cefcc3f9df5f
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index 1158952c918f..3f1054ea35a2 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install 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_python3_7(-),python_single_target_python2_7(+)] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig dev-util/cppunit dev-lang/swig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=paints monochrome images into the waterfall of a receiver
-EAPI=5
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Paints monochrome images into the waterfall of a receiver
+EAPI=7
 HOMEPAGE=https://github.com/drmpeg/gr-paint
 IUSE=doc python_targets_python2_7
 LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] media-gfx/imagemagick
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/imagemagick
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0116f6c7d50a850482af9b2cc35c3da9
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=41519c9793ce7cb8329de00f0061c5ec
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index b7c05340fac2..b792dabd2fb6 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/swig:0 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=gnuradio FM RDS Receiver
-EAPI=5
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=GNU Radio FM RDS Receiver
+EAPI=7
 HOMEPAGE=https://github.com/bastibl/gr-rds
 IUSE=python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/9999
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71803d67f34b43badc8c1fee4217d4e9
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=35e220935e08ee41c95af9a857e8e56e
diff --git a/metadata/md5-cache/net-wireless/gr-rftap-9999 b/metadata/md5-cache/net-wireless/gr-rftap-9999
index a6438cfd6b45..8d56b4026f04 100644
--- a/metadata/md5-cache/net-wireless/gr-rftap-9999
+++ b/metadata/md5-cache/net-wireless/gr-rftap-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/swig:0 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 DESCRIPTION=RFtap Module for GNU Radio
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/rftap/gr-rftap
 IUSE=python_targets_python2_7
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+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_python3_7(-),python_single_target_python2_7(+)] 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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0/9999
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b737507f29742ecb635f002455742c18
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=358048d658ea67199f5934b3d9daf399
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1
deleted file mode 100644
index 78716103a362..000000000000
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=tools for communicating with HackRF SDR platform
-EAPI=6
-HOMEPAGE=http://greatscottgadgets.com/hackrf/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=BSD
-RDEPEND==net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0=
-SLOT=0
-SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bdec2a224ec07e28e2cfd4311fc097d1
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
new file mode 100644
index 000000000000..0cf765b0297a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=tools for communicating with HackRF SDR platform
+EAPI=6
+HOMEPAGE=http://greatscottgadgets.com/hackrf/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=BSD
+RDEPEND==net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0=
+SLOT=0
+SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a3928d5029173b7f2173831948d9c1ee
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.01_beta2 b/metadata/md5-cache/net-wireless/kismet-2019.01_beta2
new file mode 100644
index 000000000000..de4f628b3ad0
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2019.01_beta2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare setup
+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_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=6
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~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_python3_7(-),python_single_target_python2_7(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( dev-libs/libusb:= ) dev-libs/protobuf-c:= dev-libs/protobuf:= sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) selinux? ( sec-policy/selinux-kismet )
+SLOT=0/2019.01_beta2
+SRC_URI=https://www.kismetwireless.net/code/kismet-2019-01-BETA2.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a7951686e98e9ad2e441511bd39f83d2
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 0f9738eea2d0..2d67c7862c7c 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97cebe6053c143ba6484658f68e83d20
+_md5_=a7951686e98e9ad2e441511bd39f83d2
diff --git a/metadata/md5-cache/net-wireless/multimode-1.00-r2 b/metadata/md5-cache/net-wireless/multimode-1.00-r2
deleted file mode 100644
index a047fb073047..000000000000
--- a/metadata/md5-cache/net-wireless/multimode-1.00-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-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_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=multimode radio decoder for rtl-sdr devices using gnuradio
-EAPI=5
-HOMEPAGE=https://www.cgran.org/browser/projects/multimode/trunk
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gr-osmosdr-0.0.1 <net-wireless/gnuradio-3.7:=[grc,utils,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/rtl-sdr-0.5.0
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.sbrac.org/files/multimode-r1.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=839a698a87726411f5e883b23440f1d5
diff --git a/metadata/md5-cache/net-wireless/sdrplay-2.13.1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1
deleted file mode 100644
index 3ae683f9183a..000000000000
--- a/metadata/md5-cache/net-wireless/sdrplay-2.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=virtual/pkgconfig
-DESCRIPTION=SDRplay API/HW driver for all RSPs
-EAPI=6
-HOMEPAGE=https://www.sdrplay.com
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64 ~x86
-LICENSE=SDRplay
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5aaab86dd59d44b3e195c70107d459cd
diff --git a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
new file mode 100644
index 000000000000..5695a479bce0
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=virtual/libusb:1 virtual/udev virtual/pkgconfig
+DESCRIPTION=SDRplay API/HW driver for all RSPs
+EAPI=6
+HOMEPAGE=https://www.sdrplay.com
+IUSE=abi_x86_32 abi_x86_64
+KEYWORDS=~amd64 ~x86
+LICENSE=SDRplay
+RDEPEND=virtual/libusb:1 virtual/udev
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=d039fa2929056ba9469f001cdbc9bcbb
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-0.4.0 b/metadata/md5-cache/net-wireless/soapybladerf-0.4.0
new file mode 100644
index 000000000000..4fee0fda8ba2
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapybladerf-0.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for the Blade RF
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyBladeRF
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-0.4.0.tar.gz -> soapybladerf-0.4.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d7344e89c917c652f3f58c7d9d0a015a
diff --git a/metadata/md5-cache/net-wireless/soapybladerf-9999 b/metadata/md5-cache/net-wireless/soapybladerf-9999
index 98442f235da3..e3e6ea5c3854 100644
--- a/metadata/md5-cache/net-wireless/soapybladerf-9999
+++ b/metadata/md5-cache/net-wireless/soapybladerf-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr:= >=net-wireless/bladerf-2018.08:=
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=026670961410e04c00ec32e595524fb1
+_md5_=d7344e89c917c652f3f58c7d9d0a015a
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0
new file mode 100644
index 000000000000..5cf552a878ca
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for the Pluto SDR
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.1.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1bcdb8801d020f0bb93df67839d58665
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-9999 b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
index e2bf84dc5c3f..d31c13e2eac6 100644
--- a/metadata/md5-cache/net-wireless/soapyplutosdr-9999
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
@@ -7,4 +7,4 @@ LICENSE=LGPL-2.1+
 RDEPEND=net-wireless/soapysdr:= net-libs/libiio:= net-libs/libad9361-iio:=
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4a0c1c7499024ce4d8a6290a9585eede
+_md5_=1bcdb8801d020f0bb93df67839d58665
diff --git a/metadata/md5-cache/net-wireless/soapyrtlsdr-0.3.0 b/metadata/md5-cache/net-wireless/soapyrtlsdr-0.3.0
new file mode 100644
index 000000000000..112d22b22f2a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyrtlsdr-0.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr:= net-wireless/rtl-sdr sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=SoapySDR RTL-SDR Support Module
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyRTLSDR
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=net-wireless/soapysdr:= net-wireless/rtl-sdr
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-0.3.0.tar.gz -> soapyrtlsdr-0.3.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=80a8e6904eb8674725a51ea73d39b3f4
diff --git a/metadata/md5-cache/net-wireless/soapyrtlsdr-9999 b/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
index e285a921f3a3..7af2298444b8 100644
--- a/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
+++ b/metadata/md5-cache/net-wireless/soapyrtlsdr-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr:= net-wireless/rtl-sdr
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eb3cb22451bead995170b54bc0a905b4
+_md5_=80a8e6904eb8674725a51ea73d39b3f4
diff --git a/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0 b/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
index 1973b24a54b6..165634a28002 100644
--- a/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
+++ b/metadata/md5-cache/net-wireless/soapysdrplay-0.1.0
@@ -9,4 +9,4 @@ RDEPEND=net-wireless/soapysdr net-wireless/sdrplay
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-0.1.0.tar.gz -> soapysdrplay-0.1.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b157241c457d842a114fc8e779518002
+_md5_=9e37e1323b0b22ec7f21b0d7a6d8f871
diff --git a/metadata/md5-cache/net-wireless/soapysdrplay-0.2.0 b/metadata/md5-cache/net-wireless/soapysdrplay-0.2.0
new file mode 100644
index 000000000000..4b281f9c702e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapysdrplay-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr net-wireless/sdrplay sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for SDRPlay
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapySDRPlay
+KEYWORDS=~amd64 ~x86
+LICENSE=Boost-1.0
+RDEPEND=net-wireless/soapysdr net-wireless/sdrplay
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-0.2.0.tar.gz -> soapysdrplay-0.2.0.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9e37e1323b0b22ec7f21b0d7a6d8f871
diff --git a/metadata/md5-cache/net-wireless/soapysdrplay-9999 b/metadata/md5-cache/net-wireless/soapysdrplay-9999
index 23fd64de90d7..020d1281b21f 100644
--- a/metadata/md5-cache/net-wireless/soapysdrplay-9999
+++ b/metadata/md5-cache/net-wireless/soapysdrplay-9999
@@ -7,4 +7,4 @@ LICENSE=Boost-1.0
 RDEPEND=net-wireless/soapysdr net-wireless/sdrplay
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=b157241c457d842a114fc8e779518002
+_md5_=9e37e1323b0b22ec7f21b0d7a6d8f871
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1 b/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1
index 0bdc6af4f422..f597689b8f54 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1
+++ b/metadata/md5-cache/net-wireless/soapyuhd-0.3.4-r1
@@ -9,4 +9,4 @@ RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-0.3.4.tar.gz -> soapyuhd-0.3.4.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=de8d857f11037d513072857dcae437fa
+_md5_=521872ecb0b08b0092c3e603ff8d1965
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-9999 b/metadata/md5-cache/net-wireless/soapyuhd-9999
index b3016384349b..3946e9ca6814 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-9999
+++ b/metadata/md5-cache/net-wireless/soapyuhd-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
 SLOT=0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=de8d857f11037d513072857dcae437fa
+_md5_=521872ecb0b08b0092c3e603ff8d1965
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.1.0 b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
new file mode 100644
index 000000000000..a1ed12b9edae
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install 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_python3_7(-),python_single_target_python2_7(+)] e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo] doc? ( app-doc/doxygen ) dev-python/mako app-arch/unzip app-arch/gzip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
+EAPI=6
+HOMEPAGE=https://kb.ettus.com
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~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_python3_7(-),python_single_target_python2_7(+)] e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
+REQUIRED_USE=python_targets_python2_7 b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+SLOT=0/3.13
+SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.1.0.tar.gz -> EttusResearch-UHD-3.13.1.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.1.0/uhd-images_3.13.1.0.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=953f1d01fe8b330cad7ba4d61aeae0ab
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.5 b/metadata/md5-cache/net-wireless/unifi-5.10.5
new file mode 100644
index 000000000000..71332146f255
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.10.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.9
+SRC_URI=https://dl.ubnt.com/unifi/5.10.5-6ba4d1bfe5/UniFi.unix.zip -> unifi-5.10.5.zip
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=0356a2a9d00c693a408f739b1543227d
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index 9924af43150e..ea2b16e1a10c 100644
--- a/metadata/md5-cache/perl-core/Manifest.gz
+++ b/metadata/md5-cache/perl-core/Manifest.gz
diff --git a/metadata/md5-cache/perl-core/Unicode-Collate-1.250.0 b/metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
index db43636d72e5..c1227b2b546f 100644
--- a/metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
+++ b/metadata/md5-cache/perl-core/Unicode-Collate-1.250.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-XSLoader virtual/pe
 DESCRIPTION=Unicode Collate Algorithm
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Unicode-Collate
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Spec virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SADAHIRO/Unicode-Collate-1.25.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=52f904cc8ea9dc60557868d5c998db23
+_md5_=e9e2e6956b06e82e4701e128da579e59
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index f8b78411cc6d..a9b1ad6987c4 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 9fe51afcaeef..cc5c6e52374f 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup unpack
-DEPEND=virtual/opengl virtual/jpeg:0 media-libs/libpng:0= >=dev-lang/lua-5.1:* gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) !gtk? ( media-libs/freeglut ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt media-libs/glew:0 virtual/glu virtual/opengl virtual/jpeg:0 media-libs/libpng:0= glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora ) dev-cpp/eigen virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=OpenGL 3D space simulator
 EAPI=6
 HOMEPAGE=https://celestia.space
-IUSE=cairo gtk nls pch theora threads
+IUSE=glut gtk nls +qt5 theora
 LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/jpeg:0 media-libs/libpng:0= >=dev-lang/lua-5.1:* gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) !gtk? ( media-libs/freeglut ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora )
+RDEPEND=>=dev-lang/lua-5.1:* dev-libs/libfmt media-libs/glew:0 virtual/glu virtual/opengl virtual/jpeg:0 media-libs/libpng:0= glut? ( media-libs/freeglut ) gtk? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 x11-libs/gdk-pixbuf:2 x11-libs/pango ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
+REQUIRED_USE=|| ( glut gtk qt5 )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5531e7b86c4c2cfd28b814e9ce8c97c8
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=54a56acbc8f807cfff5452c82ff48720
diff --git a/metadata/md5-cache/sci-astronomy/kstars-2.9.5 b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
index cae2ed7ff7fd..f125d6e4d7ee 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-2.9.5
+++ b/metadata/md5-cache/sci-astronomy/kstars-2.9.5
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-2.9.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=2ee93e5ed8469b8ca67fc056e53ec5b7
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.0.0 b/metadata/md5-cache/sci-astronomy/kstars-3.0.0
index 337699f854b5..b03f92a6d453 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.0.0
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kauth-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.0.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=9cbf03bcb93efbb52c79ee9f601459eb
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.18.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
index 16adffdb484f..f39562678cbb 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qtconcurrent:5 nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qtconcurrent:5 nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=3D photo-realistic skies in real time
 EAPI=6
 HOMEPAGE=https://www.stellarium.org/
 IUSE=debug gps media nls stars test test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.18.2/stellarium-0.18.2.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1210997005461d132b2a2c340988ec9a
+_md5_=8c07a99f16548c486de54c74e9aeff4f
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 0695652b9294..095b5fb9e3df 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/apbs-1.4.1-r2 b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
index 1d29124d68ae..49f560b3fdb0 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) 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_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 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_python3_7(-),python_single_target_python2_7(+)]
 DESCRIPTION=Evaluation of electrostatic properties of nanoscale biomolecular systems
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.poissonboltzmann.org/apbs/
 IUSE=debug doc examples fast +fetk iapbs mpi openmp python tools python_targets_python2_7
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
@@ -11,4 +11,4 @@ REQUIRED_USE=iapbs? ( fetk ) mpi? ( !python ) python? ( tools fetk iapbs python_
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/archive/74fcb8676de69ed04ddab8976a8b05a6caaf4d65.zip -> apbs-1.4.1.zip
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6a96394a927ad8fef2bf8994cd06837c
+_md5_=b7b214fa754f69638687bac2d11fb805
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.2 b/metadata/md5-cache/sci-chemistry/gromacs-2016.2
deleted file mode 100644
index 39c608166299..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.2
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.2.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f7ac23698680faf20fa93d11dbe806d0
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019 b/metadata/md5-cache/sci-chemistry/gromacs-2019
new file mode 100644
index 000000000000..421c101e634a
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/mscgen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=6
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+SLOT=0/2019
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019.tar.gz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4ecfe7c56d2f3eee4e66266331cacbd3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019_rc1 b/metadata/md5-cache/sci-chemistry/gromacs-2019_rc1
deleted file mode 100644
index 09ae540cd4ed..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/mscgen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2019_rc1
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019-rc1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019-rc1.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4ecfe7c56d2f3eee4e66266331cacbd3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999 b/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
deleted file mode 100644
index 998b8b31ee43..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-4.6.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick sys-apps/coreutils ) doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmp +single-precision test +threads zsh-completion cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) gsl? ( sci-libs/gsl ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/4.6.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=57cea6479f7ddbc27d3b3edd851eba09
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
deleted file mode 100644
index a2abd05826cb..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=5
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~alpha amd64 arm ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/5.0.4
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.0.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.0.4.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=196e018fa35ecee56645d007f65e1498
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
deleted file mode 100644
index 52d86ff9acc7..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.0.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/5.0.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5de46319b3b11a45ad4da785dad395fb
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
deleted file mode 100644
index a5a4f2179a93..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas boost cuda +doc -double-precision +fftw lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/5.1.3
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-5.1.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-5.1.3.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a57db3b76c9d839531175b0d8588a8a8
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999 b/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
deleted file mode 100644
index dea338491fd2..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-5.1.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas boost cuda +doc -double-precision +fftw lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) boost? ( >=dev-libs/boost-1.55 ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/5.1.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a57db3b76c9d839531175b0d8588a8a8
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index a2663a14caee..38a82704dfea 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-5.0.1
new file mode 100644
index 000000000000..f1a0b19af05e
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/boost-1.61[context,nls,threads,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_python3_7(-),python_single_target_python2_7(+)] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= <=media-libs/glm-0.9.9.2 media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=6
+HOMEPAGE=http://www.kicad-pcb.org
+IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) >=dev-libs/boost-1.61[context,nls,threads,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_python3_7(-),python_single_target_python2_7(+)] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= <=media-libs/glm-0.9.9.2 media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( occ oce )
+SLOT=0
+SRC_URI=https://launchpad.net/kicad/5.0/5.0.1/+download/kicad-5.0.1.tar.xz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=c28b89cf23ae52080bf721a5a17cdcc9
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1
new file mode 100644
index 000000000000..f881f9cdcd4b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=6
+HOMEPAGE=https://kicad.github.io/footprints/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.0.0
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-footprints/archive/5.0.1.tar.gz -> kicad-footprints-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2f76beb5884fd329299ab9769cf3222d
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
new file mode 100644
index 000000000000..6f914b2e8271
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools GUI translations.
+EAPI=6
+HOMEPAGE=https://github.com/KiCad/kicad-i18n
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.0.0
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-i18n/archive/5.0.1.tar.gz -> kicad-i18n-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5507c1057cbc71347ca68ea1b4d5c1b2
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1
new file mode 100644
index 000000000000..4210c23c9fe4
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-5.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=7
+HOMEPAGE=http://www.kicad-pcb.org
+IUSE=doc nls
+KEYWORDS=~amd64
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-5.0.1 >=sci-electronics/kicad-symbols-5.0.1 >=sci-electronics/kicad-footprints-5.0.1 >=sci-electronics/kicad-packages3d-5.0.1 >=sci-electronics/kicad-templates-5.0.1 doc? ( >=app-doc/kicad-doc-5.0.1 ) nls? ( >=sci-electronics/kicad-i18n-5.0.1 )
+SLOT=0
+_md5_=53bb9e1d5f60869664c3d58dbae0d7ac
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
new file mode 100644
index 000000000000..ad13a7412b7e
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=6
+HOMEPAGE=https://kicad.github.io/packages3d/
+IUSE=occ +oce
+KEYWORDS=~amd64
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.0.0[occ=,oce=]
+REQUIRED_USE=|| ( occ oce )
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.0.1.tar.gz -> kicad-packages3d-5.0.1.tar.gz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9609c042f42c414548b1360003c34145
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1
new file mode 100644
index 000000000000..619ac1428e68
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=6
+HOMEPAGE=https://kicad.github.io/symbols/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.0.0
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-symbols/archive/5.0.1.tar.gz -> kicad-symbols-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=bdd4d04c970bcae7606e4038beaa5d00
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1
new file mode 100644
index 000000000000..22c3a566f090
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
+EAPI=6
+HOMEPAGE=https://github.com/kicad/kicad-templates
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-5.0.0
+SLOT=0
+SRC_URI=https://github.com/KiCad/kicad-templates/archive/5.0.1.tar.gz -> kicad-templates-5.0.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9ad7db85c5aa6a163d7c53cb49708263
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 8bb8bb18c1a4..18a983bad7f0 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
index 010a3ccc3fb9..07cc22a95623 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.24.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) >=dev-util/gtk-doc-am-1.13 >=sys-devel/gettext-0.19.6 virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GLib geocoding library that uses the Yahoo! Place Finder service
+DESCRIPTION=GLib helper library for geocoding services
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/geocode-glib
 IUSE=+introspection test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2
+LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2581ed49e60502d8dbc87a4064b335b7
+_md5_=9616d4bbd7e642cf3c3d1c63b1068b72
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.0 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.0
new file mode 100644
index 000000000000..b6ef5d60bdb6
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.13 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GLib helper library for geocoding services
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/geocode-glib
+IUSE=gtk-doc +introspection test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/geocode-glib/3.26/geocode-glib-3.26.0.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2f717cb362035ea683d796bb6fcad1d0
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.14 b/metadata/md5-cache/sci-geosciences/gpxsee-5.14
deleted file mode 100644
index 84a20a9518cc..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-5.14
+++ /dev/null
@@ -1,12 +0,0 @@
-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=https://github.com/tumic0/GPXSee/archive/5.14.tar.gz -> gpxsee-5.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f1d542d6ce5400d66275fe5eaf0685a
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.17 b/metadata/md5-cache/sci-geosciences/gpxsee-5.17
deleted file mode 100644
index f5f70697dbdc..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-5.17
+++ /dev/null
@@ -1,12 +0,0 @@
-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=https://github.com/tumic0/GPXSee/archive/5.17.tar.gz -> gpxsee-5.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4f1d542d6ce5400d66275fe5eaf0685a
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-7.1 b/metadata/md5-cache/sci-geosciences/gpxsee-7.1
new file mode 100644
index 000000000000..e73a62c274a5
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-7.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=https://github.com/tumic0/GPXSee/archive/7.1.tar.gz -> gpxsee-7.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2afab3540eeb6a92a776511198258a93
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
deleted file mode 100644
index dcd534a0f290..000000000000
--- a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.3-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Qt based map editor for the openstreetmap.org project
-EAPI=6
-HOMEPAGE=http://www.merkaartor.be https://github.com/openstreetmap/merkaartor
-IUSE=debug exif gps libproxy
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsingleapplication[X,qt5(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.17-r2 ) libproxy? ( net-libs/libproxy )
-SLOT=0
-SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.3.tar.gz -> merkaartor-0.18.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9d00a1febdbfe5c56c20efc1f8e86d3f
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.1
new file mode 100644
index 000000000000..7577c4e5a09b
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=GPS mapping utility
+EAPI=6
+HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/designer:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-libs/quazip >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj sci-libs/alglib
+SLOT=0
+SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.12.1.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1622f19496b6431901a860b37b222643
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3 b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
deleted file mode 100644
index 5e47dc26d9bc..000000000000
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork:5[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GPS mapping utility
-EAPI=6
-HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork:5[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj
-SLOT=0
-SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.6.3.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5d92028a6bc7be118e418f6f2785b456
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 1fc093fcd725..4177f65663d9 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/cholmod-2.1.2 b/metadata/md5-cache/sci-libs/cholmod-2.1.2
index 8d495328d271..40fc657cc3db 100644
--- a/metadata/md5-cache/sci-libs/cholmod-2.1.2
+++ b/metadata/md5-cache/sci-libs/cholmod-2.1.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( sci-libs/metis sci-libs/parmetis ) ) virtual/pkgconfig doc? ( virtual/latex-base ) >=app-portage/elt-patches-20170815
+DEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) ) virtual/pkgconfig doc? ( virtual/latex-base ) >=app-portage/elt-patches-20170815
 DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=5
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc lapack metis minimal static-libs
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )
-RDEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( sci-libs/metis sci-libs/parmetis ) )
+RDEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/cholmod-2.1.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fec68886a13ffce4a83275f2357a46ff
+_md5_=d6ff7961f5f3325a792e5d73ef199a10
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3 b/metadata/md5-cache/sci-libs/oce-0.18.3
deleted file mode 100644
index 8a5b9ad8d95b..000000000000
--- a/metadata/md5-cache/sci-libs/oce-0.18.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl media-libs/freetype virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
-EAPI=6
-HOMEPAGE=https://github.com/tpaviot/oce
-IUSE=examples freeimage gl2ps +openmp tbb vtk elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl media-libs/freetype virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=?? ( openmp tbb )
-SLOT=0.18.3
-SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1245b25c5d0a54463157f97413286acc
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3-r1 b/metadata/md5-cache/sci-libs/oce-0.18.3-r1
new file mode 100644
index 000000000000..6f61c7c2c956
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/oce-0.18.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl media-libs/freetype virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=6
+HOMEPAGE=https://github.com/tpaviot/oce
+IUSE=examples freeimage gl2ps +openmp tbb vtk elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl media-libs/freetype virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=?? ( openmp tbb )
+SLOT=0.18.3
+SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a9553df555bb5767080967762df0fa9c
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3 b/metadata/md5-cache/sci-libs/parmetis-4.0.3
index 1ab9aecc6eff..0f3c2c228db2 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=mpi? ( virtual/mpi ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Parallel (MPI) unstructured graph partitioning library
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
 IUSE=doc double-precision examples int64 mpi openmp pcre static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -10,4 +10,4 @@ RDEPEND=mpi? ( virtual/mpi ) !<sci-libs/metis-5
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz ) examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz )
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8f767b06cbc1c76241207122aa5b6c95
+_md5_=fd48b07fe7bad70d2d26195a7b59195c
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c18737c04092..fc6c44205a39 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/msieve-1.53 b/metadata/md5-cache/sci-mathematics/msieve-1.53
new file mode 100644
index 000000000000..ec82fe09e675
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/msieve-1.53
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=ecm? ( sci-mathematics/gmp-ecm[-gwnum] ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib:= )
+DESCRIPTION=A C library implementing a suite of algorithms to factor large integers
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/msieve/
+IUSE=zlib +ecm mpi
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=ecm? ( sci-mathematics/gmp-ecm[-gwnum] ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz -> msieve-1.53.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d898f23553dbd44db34712860058291f
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.2.0 b/metadata/md5-cache/sci-mathematics/pspp-1.2.0
index 1833cdb2690d..c84c801b4697 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.2.0
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Program for statistical analysis of sampled data
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/pspp/pspp.html
 IUSE=cairo doc emacs examples gtk ncurses nls perl postgres static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= x11-libs/spread-sheet-widget ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] )
 SLOT=0/1.2.0
 SRC_URI=mirror://gnu/pspp/pspp-1.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb37d69e59ea7ef0428974031aec6f94
+_md5_=73b4a836c3072075e330fa09b605301b
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.0 b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
index 16401a3994fa..a39ee4a85321 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.0
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdewebkit-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rkward/0.7.0/src/rkward-0.7.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c96ac8a55e0111a22a3d6aab793202f4
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.3-r1 b/metadata/md5-cache/sci-mathematics/z3-4.8.3-r1
new file mode 100644
index 000000000000..27499f7b470e
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.8 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An efficient theorem prover
+EAPI=6
+HOMEPAGE=http://z3.codeplex.com/
+IUSE=doc examples gmp isabelle java openmp python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0/4.8
+SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.3.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a331d04928cdcae45ee9fcbaec16a8ed
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 9dcedfdcbe8d..017a4af8ff01 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/clhep-2.1.4.1 b/metadata/md5-cache/sci-physics/clhep-2.1.4.1
deleted file mode 100644
index 44020367574e..000000000000
--- a/metadata/md5-cache/sci-physics/clhep-2.1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://www.cern.ch/clhep
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3 LGPL-3
-SLOT=2/2.1.4.1
-SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.4.1.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=37f678d51ae659eda4887cb4149656cd
diff --git a/metadata/md5-cache/sci-physics/clhep-2.1.4.2 b/metadata/md5-cache/sci-physics/clhep-2.1.4.2
deleted file mode 100644
index a026213ac417..000000000000
--- a/metadata/md5-cache/sci-physics/clhep-2.1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://www.cern.ch/clhep
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-SLOT=2/2.1.4.2
-SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.4.2.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.2.0.1 b/metadata/md5-cache/sci-physics/clhep-2.2.0.1
deleted file mode 100644
index a42cfb715b7d..000000000000
--- a/metadata/md5-cache/sci-physics/clhep-2.2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://www.cern.ch/clhep
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-SLOT=2/2.2.0.1
-SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.1.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.2.0.5 b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
index 89723345d273..d9819072c9f3 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.2.0.5
+++ b/metadata/md5-cache/sci-physics/clhep-2.2.0.5
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://www.cern.ch/clhep
+EAPI=7
+HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 IUSE=doc static-libs test
 KEYWORDS=amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.2.0.5
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.2.0.5.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14963d8ad907d59c640db17c805c775b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=60b334ce5f826d52d922579936c4644f
diff --git a/metadata/md5-cache/sci-physics/clhep-2.3.1.0 b/metadata/md5-cache/sci-physics/clhep-2.3.1.0
deleted file mode 100644
index 36b375f617f2..000000000000
--- a/metadata/md5-cache/sci-physics/clhep-2.3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( virtual/latex-base ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://www.cern.ch/clhep
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-SLOT=2/2.3.1.0
-SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.3.1.0.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d7345ee6444f68bccd4ce18ab297a892
diff --git a/metadata/md5-cache/sci-physics/clhep-2.3.3.1 b/metadata/md5-cache/sci-physics/clhep-2.3.3.1
deleted file mode 100644
index f167183fd2a3..000000000000
--- a/metadata/md5-cache/sci-physics/clhep-2.3.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=High Energy Physics C++ library
-EAPI=5
-HOMEPAGE=http://cern.ch/clhep
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-SLOT=2/2.3.3.1
-SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.3.3.1.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=77cde31ea3ddce69f5f42e555bb2760f
diff --git a/metadata/md5-cache/sci-physics/clhep-2.4.0.4 b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
index a07ddeb6072a..cdf29aa7670e 100644
--- a/metadata/md5-cache/sci-physics/clhep-2.4.0.4
+++ b/metadata/md5-cache/sci-physics/clhep-2.4.0.4
@@ -1,12 +1,12 @@
+BDEPEND=doc? ( app-doc/doxygen[latex] ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[latex] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=High Energy Physics C++ library
-EAPI=6
-HOMEPAGE=http://cern.ch/clhep
+EAPI=7
+HOMEPAGE=http://proj-clhep.web.cern.ch/proj-clhep/
 IUSE=doc test threads
 KEYWORDS=amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3 LGPL-3
 SLOT=2/2.4.0.4
 SRC_URI=http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.4.0.4.tgz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e6473f3c0ba72c0740f1bd2b500a727a
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f3fc97e534517e90c183bf35ed097dd3
diff --git a/metadata/md5-cache/sci-physics/sassena-1.4.2 b/metadata/md5-cache/sci-physics/sassena-1.4.2
index 0a0ff8d69255..018ff665905f 100644
--- a/metadata/md5-cache/sci-physics/sassena-1.4.2
+++ b/metadata/md5-cache/sci-physics/sassena-1.4.2
@@ -1,12 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost[mpi] sci-libs/hdf5[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 virtual/mpi virtual/blas virtual/lapack sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/boost[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 sci-libs/hdf5[mpi] virtual/blas virtual/lapack virtual/mpi
 DESCRIPTION=Software for Calculating Scattering Diagrams on Massively Parallel Computers
-EAPI=5
-HOMEPAGE=http://www.sassena.org
+EAPI=7
+HOMEPAGE=https://github.com/benlabs/sassena
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost[mpi] sci-libs/hdf5[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 virtual/mpi virtual/blas virtual/lapack
+RDEPEND=dev-libs/boost[mpi] dev-libs/libxml2 sci-libs/fftw:3.0 sci-libs/hdf5[mpi] virtual/blas virtual/lapack virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/benlabs/sassena/archive/v1.4.2.tar.gz -> sassena-1.4.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7db271ad90c4b04e0048f6c7d25e9eae
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3888db3d261832c917b11da40c04bd81
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index b761955fa62b..9a141a6d1ff9 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/labplot-2.5.0-r1 b/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
index 24b15fec4253..04c1d2b2ef2e 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
+++ b/metadata/md5-cache/sci-visualization/labplot-2.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtserialport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-18.08.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.5.0/labplot-2.5.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=b29d3ef59099bb97dc50cc2a917806cd
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index 3f11ce7d7ea0..b301e926f882 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -7,5 +7,5 @@ IUSE=cantor fftw fits hdf5 libcerf netcdf root debug +handbook test
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/syntax-highlighting-5.52.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtserialport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-apps/cantor-18.08.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=a7778dc20f820c16b5fe50b05e19dd65
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b9368987171f..1d49ce8b16b1 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/bat-0.9.0 b/metadata/md5-cache/sys-apps/bat-0.9.0
new file mode 100644
index 000000000000..83a3e8e18026
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bat-0.9.0
@@ -0,0 +1,14 @@
+BDEPEND=>=virtual/rust-1.29.0 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=sys-libs/zlib
+DESCRIPTION=A cat(1) clone with wings
+EAPI=7
+HOMEPAGE=https://github.com/sharkdp/bat
+IUSE=test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/sharkdp/bat/archive/v0.9.0.tar.gz -> bat-0.9.0.tar.gz https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/assert_cmd/0.10.1/download -> assert_cmd-0.10.1.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/1.0.1/download -> bincode-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/clicolors-control/0.2.0/download -> clicolors-control-0.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/console/0.6.2/download -> console-0.6.2.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/error-chain/0.12.0/download -> error-chain-0.12.0.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/flate2/1.0.4/download -> flate2-1.0.4.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/git2/0.7.5/download -> git2-0.7.5.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.10/download -> libgit2-sys-0.7.10.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.1/download -> linked-hash-map-0.5.1.crate https://crates.io/api/v1/crates/lock_api/0.1.4/download -> lock_api-0.1.4.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.1/download -> memchr-2.1.1.crate https://crates.io/api/v1/crates/miniz-sys/0.1.11/download -> miniz-sys-0.1.11.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/onig/4.2.1/download -> onig-4.2.1.crate https://crates.io/api/v1/crates/onig_sys/69.0.0/download -> onig_sys-69.0.0.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/plist/0.3.0/download -> plist-0.3.0.crate https://crates.io/api/v1/crates/predicates/1.0.0/download -> predicates-1.0.0.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.21/download -> proc-macro2-0.4.21.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.2/download -> rand_core-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.3/download -> regex-syntax-0.6.3.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.80/download -> serde-1.0.80.crate https://crates.io/api/v1/crates/serde_derive/1.0.80/download -> serde_derive-1.0.80.crate https://crates.io/api/v1/crates/serde_json/1.0.33/download -> serde_json-1.0.33.crate https://crates.io/api/v1/crates/shell-words/0.1.0/download -> shell-words-0.1.0.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.19/download -> syn-0.15.19.crate https://crates.io/api/v1/crates/syntect/3.0.2/download -> syntect-3.0.2.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/termios/0.3.1/download -> termios-0.3.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/ucd-util/0.1.2/download -> ucd-util-0.1.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.6/download -> walkdir-2.2.6.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.7.0/download -> xml-rs-0.7.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.2/download -> yaml-rust-0.4.2.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=1b7f0c97ffb3974773e3f1494b414b2a
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.5 b/metadata/md5-cache/sys-apps/diffutils-3.5
deleted file mode 100644
index 75049ce451bf..000000000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diffutils/
-IUSE=nls static
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/diffutils/diffutils-3.5.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce71f96ebf62eab69018cad09c3d3249
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.7 b/metadata/md5-cache/sys-apps/diffutils-3.7
new file mode 100644
index 000000000000..21fa95699ab5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/diffutils-3.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure test
+DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
+DESCRIPTION=Tools to make diffs and compare files
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/diffutils/
+IUSE=nls static
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gnu/diffutils/diffutils-3.7.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.7.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3307ef138a61778c7054d7e6b4a2eb5f
diff --git a/metadata/md5-cache/sys-apps/ed-1.14.1a b/metadata/md5-cache/sys-apps/ed-1.14.1a
deleted file mode 100644
index 54001f499497..000000000000
--- a/metadata/md5-cache/sys-apps/ed-1.14.1a
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=sys-apps/texinfo
-DESCRIPTION=Your basic line editor
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ed/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://fossies.org/linux/privat/ed-1.14.1a.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d46693cdbb9665499ee74046d2c80b82
diff --git a/metadata/md5-cache/sys-apps/ed-1.14.2 b/metadata/md5-cache/sys-apps/ed-1.14.2
index 216b40424f30..2fd9ac33f08e 100644
--- a/metadata/md5-cache/sys-apps/ed-1.14.2
+++ b/metadata/md5-cache/sys-apps/ed-1.14.2
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo
 DESCRIPTION=Your basic line editor
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/ed/
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=http://fossies.org/linux/privat/ed-1.14.2.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2960289be280b759926cc531db20e193
+_md5_=26ca73c492de85be0be91cf38df88efc
diff --git a/metadata/md5-cache/sys-apps/ed-1.15 b/metadata/md5-cache/sys-apps/ed-1.15
new file mode 100644
index 000000000000..c8f31bec002b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ed-1.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=sys-apps/texinfo
+DESCRIPTION=Your basic line editor
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/ed/
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/ed-1.15.tar.xz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=40f146164964bfcee7aff98fa6215550
diff --git a/metadata/md5-cache/sys-apps/exa-0.8.0 b/metadata/md5-cache/sys-apps/exa-0.8.0
index 8a44aad88343..b466be806b40 100644
--- a/metadata/md5-cache/sys-apps/exa-0.8.0
+++ b/metadata/md5-cache/sys-apps/exa-0.8.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DEPEND=>=virtual/rust-1.17 virtual/cargo
 DESCRIPTION=A modern replacement for 'ls' written in Rust
 EAPI=6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/rust-1.17
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/ansi_term/0.8.0/download -> ansi_term-0.8.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/byteorder/0.4.2/download -> byteorder-0.4.2.crate https://crates.io/api/v1/crates/cmake/0.1.25/download -> cmake-0.1.25.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.5/download -> datetime-0.4.5.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/exa/0.8.0/download -> exa-0.8.0.crate https://crates.io/api/v1/crates/gcc/0.3.53/download -> gcc-0.3.53.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/git2/0.6.8/download -> git2-0.6.8.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.30/download -> libc-0.2.30.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.14/download -> libgit2-sys-0.6.14.crate https://crates.io/api/v1/crates/libz-sys/1.0.16/download -> libz-sys-1.0.16.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/magenta/0.1.1/download -> magenta-0.1.1.crate https://crates.io/api/v1/crates/magenta-sys/0.1.1/download -> magenta-sys-0.1.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num/0.1.40/download -> num-0.1.40.crate https://crates.io/api/v1/crates/num-bigint/0.1.40/download -> num-bigint-0.1.40.crate https://crates.io/api/v1/crates/num-complex/0.1.40/download -> num-complex-0.1.40.crate https://crates.io/api/v1/crates/num-integer/0.1.35/download -> num-integer-0.1.35.crate https://crates.io/api/v1/crates/num-iter/0.1.34/download -> num-iter-0.1.34.crate https://crates.io/api/v1/crates/num-rational/0.1.39/download -> num-rational-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.1.40/download -> num-traits-0.1.40.crate https://crates.io/api/v1/crates/num_cpus/1.6.2/download -> num_cpus-1.6.2.crate https://crates.io/api/v1/crates/number_prefix/0.2.7/download -> number_prefix-0.2.7.crate https://crates.io/api/v1/crates/pad/0.1.4/download -> pad-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/1.0.0/download -> percent-encoding-1.0.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.16/download -> rand-0.3.16.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.7/download -> scoped_threadpool-0.1.7.crate https://crates.io/api/v1/crates/term_grid/0.1.6/download -> term_grid-0.1.6.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/url/1.5.1/download -> url-1.5.1.crate https://crates.io/api/v1/crates/users/0.5.3/download -> users-0.5.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.5/download -> zoneinfo_compiled-0.4.5.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=9ca7ad290120d2f6a559a3668eb2f8da
diff --git a/metadata/md5-cache/sys-apps/exa-0.8.0-r1 b/metadata/md5-cache/sys-apps/exa-0.8.0-r1
new file mode 100644
index 000000000000..50d202f41916
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/exa-0.8.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DEPEND=git? ( dev-libs/libgit2:= net-libs/http-parser:= )
+DESCRIPTION=A modern replacement for 'ls' written in Rust
+EAPI=7
+HOMEPAGE=https://the.exa.website/
+IUSE=+git debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=git? ( dev-libs/libgit2:= net-libs/http-parser:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/ansi_term/0.8.0/download -> ansi_term-0.8.0.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/byteorder/0.4.2/download -> byteorder-0.4.2.crate https://crates.io/api/v1/crates/cmake/0.1.25/download -> cmake-0.1.25.crate https://crates.io/api/v1/crates/conv/0.3.3/download -> conv-0.3.3.crate https://crates.io/api/v1/crates/custom_derive/0.1.7/download -> custom_derive-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.5/download -> datetime-0.4.5.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/exa/0.8.0/download -> exa-0.8.0.crate https://crates.io/api/v1/crates/gcc/0.3.53/download -> gcc-0.3.53.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/git2/0.6.8/download -> git2-0.6.8.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.8/download -> lazy_static-0.2.8.crate https://crates.io/api/v1/crates/libc/0.2.30/download -> libc-0.2.30.crate https://crates.io/api/v1/crates/libgit2-sys/0.6.14/download -> libgit2-sys-0.6.14.crate https://crates.io/api/v1/crates/libz-sys/1.0.16/download -> libz-sys-1.0.16.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.3.8/download -> log-0.3.8.crate https://crates.io/api/v1/crates/magenta/0.1.1/download -> magenta-0.1.1.crate https://crates.io/api/v1/crates/magenta-sys/0.1.1/download -> magenta-sys-0.1.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num/0.1.40/download -> num-0.1.40.crate https://crates.io/api/v1/crates/num-bigint/0.1.40/download -> num-bigint-0.1.40.crate https://crates.io/api/v1/crates/num-complex/0.1.40/download -> num-complex-0.1.40.crate https://crates.io/api/v1/crates/num-integer/0.1.35/download -> num-integer-0.1.35.crate https://crates.io/api/v1/crates/num-iter/0.1.34/download -> num-iter-0.1.34.crate https://crates.io/api/v1/crates/num-rational/0.1.39/download -> num-rational-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.1.40/download -> num-traits-0.1.40.crate https://crates.io/api/v1/crates/num_cpus/1.6.2/download -> num_cpus-1.6.2.crate https://crates.io/api/v1/crates/number_prefix/0.2.7/download -> number_prefix-0.2.7.crate https://crates.io/api/v1/crates/pad/0.1.4/download -> pad-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/1.0.0/download -> percent-encoding-1.0.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.16/download -> rand-0.3.16.crate https://crates.io/api/v1/crates/redox_syscall/0.1.31/download -> redox_syscall-0.1.31.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.7/download -> scoped_threadpool-0.1.7.crate https://crates.io/api/v1/crates/term_grid/0.1.6/download -> term_grid-0.1.6.crate https://crates.io/api/v1/crates/term_size/0.3.0/download -> term_size-0.3.0.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.5/download -> unicode-normalization-0.1.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.4/download -> unicode-width-0.1.4.crate https://crates.io/api/v1/crates/url/1.5.1/download -> url-1.5.1.crate https://crates.io/api/v1/crates/users/0.5.3/download -> users-0.5.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.2/download -> vcpkg-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.5/download -> zoneinfo_compiled-0.4.5.crate
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=869577fca604b42762b74f34e8d1cf83
diff --git a/metadata/md5-cache/sys-apps/fd-7.2.0 b/metadata/md5-cache/sys-apps/fd-7.2.0
index 343858fb02e5..5aa8f223f567 100644
--- a/metadata/md5-cache/sys-apps/fd-7.2.0
+++ b/metadata/md5-cache/sys-apps/fd-7.2.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/rust-1.20.0
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v7.2.0.tar.gz -> fd-7.2.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.6.6/download -> aho-corasick-0.6.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam/0.3.2/download -> crossbeam-0.3.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.1/download -> ctrlc-3.1.1.crate https://crates.io/api/v1/crates/diff/0.1.11/download -> diff-0.1.11.crate https://crates.io/api/v1/crates/filetime/0.2.1/download -> filetime-0.2.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/globset/0.4.1/download -> globset-0.4.1.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/ignore/0.4.3/download -> ignore-0.4.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/log/0.4.4/download -> log-0.4.4.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.2/download -> regex-1.0.2.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/same-file/1.0.2/download -> same-file-1.0.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.0/download -> utf8-ranges-1.0.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.0/download -> walkdir-2.2.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=afd63954fa810feb8008c7ca1096760d
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=c1e33e7caff08db941ce0d3ff16bc58b
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.1.4 b/metadata/md5-cache/sys-apps/fwupd-1.1.4
deleted file mode 100644
index 485cb847915d..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.43.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[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_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) app-arch/gcab app-arch/libarchive || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=sys-apps/dbus
-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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/libarchive:= dev-db/sqlite >=dev-libs/appstream-glib-0.7.4:=[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_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( dev-libs/json-glib sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.1.4.tar.gz -> fwupd-1.1.4.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2549dae970c5053996dea15dbced9937
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.0 b/metadata/md5-cache/sys-apps/fwupd-1.2.0
deleted file mode 100644
index ba2c2f5a6491..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.46.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.3 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=sys-apps/dbus
-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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.3 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.0.tar.gz -> fwupd-1.2.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a2649e354ed90aacd46b347257a0bae0
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.1 b/metadata/md5-cache/sys-apps/fwupd-1.2.1
deleted file mode 100644
index 4955243ff743..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=sys-apps/dbus
-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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) dell? ( uefi )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.1.tar.gz -> fwupd-1.2.1.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=14c30d5f49abf53b88dabae07cf1425b
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.2-r1 b/metadata/md5-cache/sys-apps/fwupd-1.2.2-r1
new file mode 100644
index 000000000000..1a1df7dd4c66
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/pango[introspection] doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=sys-apps/dbus
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) dell? ( uefi )
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.2.tar.gz -> fwupd-1.2.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0b123cc9691d78f75f930ac5511eeb35
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.3 b/metadata/md5-cache/sys-apps/fwupd-1.2.3
new file mode 100644
index 000000000000..191c6dd32858
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) x11-libs/pango[introspection] doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils ) nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=sys-apps/dbus
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.5 dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) !systemd? ( >=sys-auth/consolekit-1.0.0 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) dell? ( uefi )
+SLOT=0
+SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.3.tar.gz -> fwupd-1.2.3.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=0b123cc9691d78f75f930ac5511eeb35
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.4 b/metadata/md5-cache/sys-apps/groff-1.22.4
index aa84f4f3730e..ed64b9d65047 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.4
+++ b/metadata/md5-cache/sys-apps/groff-1.22.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE ) dev-lang/perl
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE ) dev-lang/perl sys-apps/texinfo
 DESCRIPTION=Text formatter used for man pages
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/groff/groff.html
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz mirror://gnu-alpha/groff/groff-1.22.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4554dec31e7cbb53ac9a5fb6829a8c5e
+_md5_=c6cf1fd0bfde2fe71bf66f6f0d5798db
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.20.0 b/metadata/md5-cache/sys-apps/iproute2-4.20.0
new file mode 100644
index 000000000000..ba318fbe1ea6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iproute2-4.20.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux ) app-arch/xz-utils iptables? ( virtual/pkgconfig ) >=sys-devel/bison-2.4 sys-devel/flex >=sys-kernel/linux-headers-3.16 virtual/pkgconfig elibc_glibc? ( >=sys-libs/glibc-2.7 )
+DESCRIPTION=kernel routing and traffic control utilities
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
+IUSE=atm berkdb caps elf +iptables ipv6 minimal selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!net-misc/arpd dev-libs/libbsd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf ) iptables? ( >=net-firewall/iptables-1.4.20:= ) berkdb? ( sys-libs/db:= ) atm? ( net-dialup/linux-atm ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/net/iproute2/iproute2-4.20.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5434911883a8c0f9d216cc14df21b5c1
diff --git a/metadata/md5-cache/sys-apps/lsd-0.11.1-r1 b/metadata/md5-cache/sys-apps/lsd-0.11.1-r1
new file mode 100644
index 000000000000..dd80c4aafcda
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lsd-0.11.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.30.1 virtual/cargo
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
+EAPI=7
+HOMEPAGE=https://github.com/Peltoche/lsd
+IUSE=test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/Peltoche/lsd/archive/0.11.1.tar.gz -> lsd-0.11.1.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.8.1/download -> users-0.8.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=31765cc41f4a89071416e89600d4d1cc
diff --git a/metadata/md5-cache/sys-apps/makedev-3.23.1-r1 b/metadata/md5-cache/sys-apps/makedev-3.23.1-r1
new file mode 100644
index 000000000000..bdee62a92561
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/makedev-3.23.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=program used for creating device files in /dev
+EAPI=6
+HOMEPAGE=https://people.redhat.com/nalin/MAKEDEV/
+IUSE=build selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!<sys-apps/baselayout-2.0.0_rc
+SLOT=0
+SRC_URI=https://people.redhat.com/nalin/MAKEDEV/MAKEDEV-3.23-1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b5aa77a3548661e3b97db31ae7ec845
diff --git a/metadata/md5-cache/sys-apps/man-db-2.8.3 b/metadata/md5-cache/sys-apps/man-db-2.8.3
deleted file mode 100644
index a019791fc3cf..000000000000
--- a/metadata/md5-cache/sys-apps/man-db-2.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext )
-DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/man-db/
-IUSE=berkdb +gdbm +manpager nls seccomp selinux static-libs zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-PDEPEND=manpager? ( app-text/manpager )
-RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mandb )
-SLOT=0
-SRC_URI=mirror://nongnu/man-db/man-db-2.8.3.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a1a3536343b87886369bb3f0d5142b5c
diff --git a/metadata/md5-cache/sys-apps/man-db-2.8.5 b/metadata/md5-cache/sys-apps/man-db-2.8.5
new file mode 100644
index 000000000000..176bf8586efe
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-db-2.8.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/man-db/
+IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+PDEPEND=manpager? ( app-text/manpager )
+RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mandb )
+SLOT=0
+SRC_URI=mirror://nongnu/man-db/man-db-2.8.5.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5d557bfeb509c5898ae2bcc3b0acf716
diff --git a/metadata/md5-cache/sys-apps/man-db-9999 b/metadata/md5-cache/sys-apps/man-db-9999
index 9f8043eb4505..a1dd19b78a1c 100644
--- a/metadata/md5-cache/sys-apps/man-db-9999
+++ b/metadata/md5-cache/sys-apps/man-db-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst preinst setup unpack
-DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) app-arch/xz-utils virtual/pkgconfig nls? ( >=app-text/po4a-0.45 sys-devel/gettext ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=a man replacement that utilizes berkdb instead of flat files
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/man-db/
-IUSE=berkdb +gdbm +manpager nls seccomp selinux static-libs zlib
+IUSE=berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib
 LICENSE=GPL-3
 PDEPEND=manpager? ( app-text/manpager )
 RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mandb )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a1a3536343b87886369bb3f0d5142b5c
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5d557bfeb509c5898ae2bcc3b0acf716
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.62 b/metadata/md5-cache/sys-apps/moreutils-0.62
index e3b3a6fc3b47..d190e53720f5 100644
--- a/metadata/md5-cache/sys-apps/moreutils-0.62
+++ b/metadata/md5-cache/sys-apps/moreutils-0.62
@@ -4,10 +4,10 @@ DESCRIPTION=a collection of tools that nobody thought to write when Unix was you
 EAPI=6
 HOMEPAGE=https://joeyh.name/code/moreutils/
 IUSE=+doc +perl
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/moreutils-0.62.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=66632dc04da4948b5b7f5d1b88a56edd
+_md5_=04005121b5ffe9df812bb37b2b4fe443
diff --git a/metadata/md5-cache/sys-apps/nix-2.2.1 b/metadata/md5-cache/sys-apps/nix-2.2.1
new file mode 100644
index 000000000000..e947d4007be0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nix-2.2.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/editline:0= dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35
+DESCRIPTION=A purely functional package manager
+EAPI=7
+HOMEPAGE=https://nixos.org/nix
+IUSE=+etc_profile +gc doc s3 sodium
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/editline:0= dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) s3? ( dev-libs/aws-sdk-cpp ) sodium? ( dev-libs/libsodium:0= )
+SLOT=0
+SRC_URI=http://nixos.org/releases/nix/nix-2.2.1/nix-2.2.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=0a689d5b866ad8807aff0907a93fcd9c
diff --git a/metadata/md5-cache/sys-apps/openrc-0.38.3 b/metadata/md5-cache/sys-apps/openrc-0.38.3
index 8c4e1ba5fbaa..bf5ee8ac76d7 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.38.3
+++ b/metadata/md5-cache/sys-apps/openrc-0.38.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=6
 HOMEPAGE=https://github.com/openrc/openrc/
 IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 ) !<app-shells/gentoo-bashcomp-20180302 !<app-shells/gentoo-zsh-completions-20180228
 SLOT=0
 SRC_URI=https://github.com/openrc/openrc/archive/0.38.3.tar.gz -> openrc-0.38.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=427f8af1493cc9c780b86e0539b8d1c0
+_md5_=fbc910ef29fdfca82d1467644b4d543f
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.9.4 b/metadata/md5-cache/sys-apps/pkgcore-0.9.4
deleted file mode 100644
index c42e509fb4ca..000000000000
--- a/metadata/md5-cache/sys-apps/pkgcore-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/snakeoil-0.7.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(-)] 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/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/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(-)] test? ( python_targets_python2_7? ( dev-python/mock[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(-)]
-DESCRIPTION=a framework for package management
-EAPI=5
-HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=dev-python/snakeoil-0.7.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/pkgcore/pkgcore/releases/download/v0.9.4/pkgcore-0.9.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50cfed2b6e95b8dae53025334db6aa7b
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index 4b0536fbfa68..5f39214d5a0c 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=a framework for package management
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcore
-IUSE=doc test python_targets_python3_6
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND==dev-python/snakeoil-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=de33831ce50ac4bf6a5bbfe9359af99e
+_md5_=1ab423031d41ec39a3563d05f1fc4c19
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.52-r1 b/metadata/md5-cache/sys-apps/portage-2.3.52-r1
deleted file mode 100644
index de085947f22b..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.52-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 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(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.52.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.52.tar.bz2 https://github.com/gentoo/portage/commit/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2f7ffc8cdee6ea284fee51e57670b7bb
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.53-r1 b/metadata/md5-cache/sys-apps/portage-2.3.53-r1
deleted file mode 100644
index 297c19addaa5..000000000000
--- a/metadata/md5-cache/sys-apps/portage-2.3.53-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 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(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
-REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-2.3.53.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.53.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4c2994816ab5c71768774c0dd401e881
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.54-r1 b/metadata/md5-cache/sys-apps/portage-2.3.54-r1
new file mode 100644
index 000000000000..356e92355d5c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.54-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 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(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.54.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.54.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9518fcada09b46e6ff554eb91a5f8eb2
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.55 b/metadata/md5-cache/sys-apps/portage-2.3.55
new file mode 100644
index 000000000000..45939b08b737
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.55
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 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(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.55.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.55.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=9518fcada09b46e6ff554eb91a5f8eb2
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 45f0c5f72ccc..8ba4c4684bd5 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=15e4c90226e9bcb1f80377978dbed1ce
+_md5_=ea0b2572daca6a35882fb7cb2ef603c0
diff --git a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1 b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
index bb704f145539..8cb908f0eb98 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
+++ b/metadata/md5-cache/sys-apps/ripgrep-0.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.6.8/download -> aho-corasick-0.6.8.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/base64/0.9.2/download -> base64-0.9.2.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bytecount/0.3.2/download -> bytecount-0.3.2.crate https://crates.io/api/v1/crates/byteorder/1.2.6/download -> byteorder-1.2.6.crate https://crates.io/api/v1/crates/cc/1.0.24/download -> cc-1.0.24.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.2.4/download -> crossbeam-channel-0.2.4.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.5.2/download -> crossbeam-epoch-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/encoding_rs/0.8.6/download -> encoding_rs-0.8.6.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.2/download -> encoding_rs_io-0.1.2.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/globset/0.4.2/download -> globset-0.4.2.crate https://crates.io/api/v1/crates/grep/0.2.2/download -> grep-0.2.2.crate https://crates.io/api/v1/crates/grep-cli/0.1.1/download -> grep-cli-0.1.1.crate https://crates.io/api/v1/crates/grep-matcher/0.1.1/download -> grep-matcher-0.1.1.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.1/download -> grep-pcre2-0.1.1.crate https://crates.io/api/v1/crates/grep-printer/0.1.1/download -> grep-printer-0.1.1.crate https://crates.io/api/v1/crates/grep-regex/0.1.1/download -> grep-regex-0.1.1.crate https://crates.io/api/v1/crates/grep-searcher/0.1.1/download -> grep-searcher-0.1.1.crate https://crates.io/api/v1/crates/ignore/0.4.4/download -> ignore-0.4.4.crate https://crates.io/api/v1/crates/itoa/0.4.2/download -> itoa-0.4.2.crate https://crates.io/api/v1/crates/lazy_static/1.1.0/download -> lazy_static-1.1.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/lock_api/0.1.3/download -> lock_api-0.1.3.crate https://crates.io/api/v1/crates/log/0.4.5/download -> log-0.4.5.crate https://crates.io/api/v1/crates/memchr/2.0.2/download -> memchr-2.0.2.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.0/download -> parking_lot_core-0.3.0.crate https://crates.io/api/v1/crates/pcre2/0.1.0/download -> pcre2-0.1.0.crate https://crates.io/api/v1/crates/pcre2-sys/0.1.1/download -> pcre2-sys-0.1.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.18/download -> proc-macro2-0.4.18.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.0.5/download -> regex-1.0.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.2/download -> regex-syntax-0.6.2.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/ripgrep/0.10.0/download -> ripgrep-0.10.0.crate https://crates.io/api/v1/crates/ryu/0.2.6/download -> ryu-0.2.6.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/same-file/1.0.3/download -> same-file-1.0.3.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/serde/1.0.77/download -> serde-1.0.77.crate https://crates.io/api/v1/crates/serde_derive/1.0.77/download -> serde_derive-1.0.77.crate https://crates.io/api/v1/crates/serde_json/1.0.27/download -> serde_json-1.0.27.crate https://crates.io/api/v1/crates/simd/0.2.2/download -> simd-0.2.2.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.1/download -> syn-0.15.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/1.0.3/download -> termcolor-1.0.3.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.1/download -> ucd-util-0.1.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.1/download -> utf8-ranges-1.0.1.crate https://crates.io/api/v1/crates/version_check/0.1.4/download -> version_check-0.1.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.5/download -> walkdir-2.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8ad28926c32f1971038232d6830d622a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=11916f58812ace4295a023dbbf69f9df
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.15 b/metadata/md5-cache/sys-apps/sandbox-2.15
new file mode 100644
index 000000000000..e38d4ad67bc0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sandbox-2.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst test
+DEPEND=app-arch/xz-utils >=app-misc/pax-utils-0.1.19
+DESCRIPTION=sandbox'd LD_PRELOAD hack
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.15.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cada76b84e15bda474e7dde684a75b13
diff --git a/metadata/md5-cache/sys-apps/systemd-239-r3 b/metadata/md5-cache/sys-apps/systemd-239-r3
new file mode 100644
index 000000000000..66860e98c33c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-239-r3
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.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-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.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-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v239/systemd-239.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-239-patches-2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9f82377cb0eca10924afa7a74edfd772
diff --git a/metadata/md5-cache/sys-apps/systemd-240-r1 b/metadata/md5-cache/sys-apps/systemd-240-r1
deleted file mode 100644
index e1818b50595c..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-240-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.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-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v240/systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=69b57eb05e1b061bfd670e2008c171a5
diff --git a/metadata/md5-cache/sys-apps/systemd-240-r2 b/metadata/md5-cache/sys-apps/systemd-240-r2
new file mode 100644
index 000000000000..a8b1b9950e0b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-240-r2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.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-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v240/systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=aa70042744d1dbe3aecef3a28042bb7e
diff --git a/metadata/md5-cache/sys-apps/systemd-240-r3 b/metadata/md5-cache/sys-apps/systemd-240-r3
new file mode 100644
index 000000000000..a93364b8d3f5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-240-r3
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.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-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v240/systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	3e788d86170dfcd5b06824d898315e18	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=2cccc5b7e294f525b6ba3d713aeddd56
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.3 b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
index 5c2b881a6ca2..1d2f92280bc0 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.3
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
@@ -3,10 +3,10 @@ DESCRIPTION=A timer-based entropy generator
 EAPI=5
 HOMEPAGE=http://www.vanheusden.com/te/
 IUSE=debug selinux
-KEYWORDS=amd64 ~mips x86
+KEYWORDS=amd64 ~arm ~mips x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.3.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5f5a597ffc5992cc4784d7f1c82dc0e
+_md5_=19c2a8a5ee1328f48c221192c1eae52f
diff --git a/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4 b/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
new file mode 100644
index 000000000000..1c54fbda60d9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usermode-utilities-20070815-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile prepare
+DEPEND=fuse? ( sys-fs/fuse:0= ) sys-libs/readline:0=
+DESCRIPTION=Tools for use with Usermode Linux virtual machines
+EAPI=7
+HOMEPAGE=http://user-mode-linux.sourceforge.net/
+IUSE=fuse
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=fuse? ( sys-fs/fuse:0= ) sys-libs/readline:0=
+SLOT=0
+SRC_URI=http://user-mode-linux.sourceforge.net/uml_utilities_20070815.tar.bz2
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e8472c8c9cca2e274935b9eef5944cfd
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33-r1 b/metadata/md5-cache/sys-apps/util-linux-2.33-r1
index 4085c682b7c0..319c01b9344f 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.33-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Various useful Linux utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 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?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54a4fff9f8d95eff8d57bed4f78636a5
+_md5_=322c3aa3fb9db9fab93beeff9fe1a333
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.33.1 b/metadata/md5-cache/sys-apps/util-linux-2.33.1
new file mode 100644
index 000000000000..05c1ad3ac9aa
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.33.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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-20170815 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+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?] ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a9d74288d8ead81532bb34a8e69c025d
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 67ad796a247f..743a5af8b4a5 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/authenticator-0.2.4 b/metadata/md5-cache/sys-auth/authenticator-0.2.4
new file mode 100644
index 000000000000..c16c4b11b853
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Two-factor authentication code generator for GNOME
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/World/Authenticator
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 test
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-libs/gd x11-libs/gtk+:3
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6ceaed4599b83bf081666d5636268912
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index 5b2dd6908dee..f9b0b555802f 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
-DEPEND=app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3 >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Two-factor authentication code generator for GNOME
 EAPI=6
-HOMEPAGE=https://github.com/bilelmoussaoui/Authenticator
-IUSE=python_targets_python3_5 python_targets_python3_6 test
+HOMEPAGE=https://gitlab.gnome.org/World/Authenticator
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 test
 LICENSE=GPL-2+
-RDEPEND=app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/gnome-screenshot x11-libs/gtk+:3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] app-crypt/libsecret dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyotp[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/python-gnupg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] dev-python/pyzbar[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] media-libs/gd x11-libs/gtk+:3
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=209a4fb04fa4b50744352a84e1129074
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=d1f21f1eec6bfe2eab288c2549bf340e
diff --git a/metadata/md5-cache/sys-auth/fprintd-0.5.1 b/metadata/md5-cache/sys-auth/fprintd-0.5.1
deleted file mode 100644
index 946b98e43603..000000000000
--- a/metadata/md5-cache/sys-auth/fprintd-0.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=D-Bus service to access fingerprint readers
-EAPI=4
-HOMEPAGE=https://cgit.freedesktop.org/libfprint/fprintd/
-IUSE=doc pam static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_5_1.tar.bz2 -> fprintd-0.5.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f5459c40ce7b95a074116182845228b2
diff --git a/metadata/md5-cache/sys-auth/fprintd-0.8.1 b/metadata/md5-cache/sys-auth/fprintd-0.8.1
new file mode 100644
index 000000000000..3c6c710788e5
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/fprintd-0.8.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/gtk-doc-am dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt )
+DESCRIPTION=D-Bus service to access fingerprint readers
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/libfprint/fprintd/
+IUSE=doc pam static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
+SLOT=0
+SRC_URI=https://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_8_1.tar.bz2 -> fprintd-0.8.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4de64331f7bee5774fcd0188e13f815b
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13 b/metadata/md5-cache/sys-auth/munge-0.5.13
index 603a67817e37..b7419a63e9ad 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An authentication service for creating and validating credentials
 EAPI=6
 HOMEPAGE=https://github.com/dun/munge
 IUSE=debug gcrypt static-libs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 )
+RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=57f737727cac5a8f0bcaabeb23c5b559
+_md5_=66ca964ec325f386ba856738b594d940
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13-r1 b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
index 18f422fb74a0..b7419a63e9ad 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r1
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=An authentication service for creating and validating credentials
 EAPI=6
 HOMEPAGE=https://github.com/dun/munge
 IUSE=debug gcrypt static-libs
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0 )
+RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=0c47dd39a6b70b86e247173f9b4af821
+_md5_=66ca964ec325f386ba856738b594d940
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.6 b/metadata/md5-cache/sys-auth/pam-script-1.1.6
deleted file mode 100644
index ad694059a794..000000000000
--- a/metadata/md5-cache/sys-auth/pam-script-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pam
-DESCRIPTION=PAM module for running scripts during authorization, password change and session
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-script/pam-script-1.1.6.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=cffdecbb685a2e6599a0f79fa45cf699
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.7 b/metadata/md5-cache/sys-auth/pam-script-1.1.7
deleted file mode 100644
index 96931d722aab..000000000000
--- a/metadata/md5-cache/sys-auth/pam-script-1.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pam
-DESCRIPTION=PAM module for running scripts during authorization, password change and session
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/dist/pam-script-1.1.7.tar.gz
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=3b65baf5a8577a06d21e003651f53832
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.9 b/metadata/md5-cache/sys-auth/pam-script-1.1.9
new file mode 100644
index 000000000000..725436e958bf
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pam-script-1.1.9
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/pam
+DESCRIPTION=PAM module for running scripts during authorization, password change and session
+EAPI=7
+HOMEPAGE=https://github.com/jeroennijhof/pam_script/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/pam
+SLOT=0
+SRC_URI=https://github.com/jeroennijhof/pam_script/archive/1.1.9.tar.gz -> pam-script-1.1.9.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3da09ceeade8c339caae1684c60ea724
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r2 b/metadata/md5-cache/sys-auth/polkit-0.115-r2
index b6f8fded4ff4..7ff7432917cc 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
 IUSE=elogind examples gtk +introspection jit kde nls pam selinux systemd test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 >=lxde-base/lxsession-0.5.2 ) ) kde? ( kde-plasma/polkit-kde-agent ) !systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
 RDEPEND=dev-lang/spidermonkey:52[-debug] dev-libs/glib:2 dev-libs/expat elogind? ( sys-auth/elogind ) introspection? ( dev-libs/gobject-introspection ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=750b790fcf4644e38dda897d994a0879
+_md5_=1ddae8d7e58f19f3a0c164a7a67a2bc7
diff --git a/metadata/md5-cache/sys-auth/sakcl-0.1.0 b/metadata/md5-cache/sys-auth/sakcl-0.1.0
index 9df560cb5422..4c390d45baba 100644
--- a/metadata/md5-cache/sys-auth/sakcl-0.1.0
+++ b/metadata/md5-cache/sys-auth/sakcl-0.1.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) virtual/cargo
 DESCRIPTION=OpenSSH AuthorizedKeysCmd provider utilizing LDAP
 EAPI=6
@@ -10,5 +10,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/byteorder/1.2.3/download -> byteorder-1.2.3.crate https://crates.io/api/v1/crates/bytes/0.4.8/download -> bytes-0.4.8.crate https://crates.io/api/v1/crates/cc/1.0.15/download -> cc-1.0.15.crate https://crates.io/api/v1/crates/cfg-if/0.1.3/download -> cfg-if-0.1.3.crate https://crates.io/api/v1/crates/clap/2.31.2/download -> clap-2.31.2.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/crossbeam-deque/0.3.1/download -> crossbeam-deque-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.4.1/download -> crossbeam-epoch-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.3.2/download -> crossbeam-utils-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.21/download -> futures-0.1.21.crate https://crates.io/api/v1/crates/idna/0.1.4/download -> idna-0.1.4.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.0.0/download -> lazy_static-1.0.0.crate https://crates.io/api/v1/crates/lazycell/0.6.0/download -> lazycell-0.6.0.crate https://crates.io/api/v1/crates/lber/0.1.6/download -> lber-0.1.6.crate https://crates.io/api/v1/crates/ldap3/0.6.0/download -> ldap3-0.6.0.crate https://crates.io/api/v1/crates/libc/0.2.41/download -> libc-0.2.41.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.1/download -> log-0.4.1.crate https://crates.io/api/v1/crates/matches/0.1.6/download -> matches-0.1.6.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mio/0.6.14/download -> mio-0.6.14.crate https://crates.io/api/v1/crates/mio-uds/0.6.6/download -> mio-uds-0.6.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/net2/0.2.32/download -> net2-0.2.32.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/nom/2.2.1/download -> nom-2.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.31/download -> openssl-sys-0.9.31.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.3.8/download -> proc-macro2-0.3.8.crate https://crates.io/api/v1/crates/proc-macro2/0.4.3/download -> proc-macro2-0.4.3.crate https://crates.io/api/v1/crates/quote/0.5.2/download -> quote-0.5.2.crate https://crates.io/api/v1/crates/quote/0.6.2/download -> quote-0.6.2.crate https://crates.io/api/v1/crates/rand/0.3.22/download -> rand-0.3.22.crate https://crates.io/api/v1/crates/rand/0.4.2/download -> rand-0.4.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.38/download -> redox_syscall-0.1.38.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/sakcl/0.1.0/download -> sakcl-0.1.0.crate https://crates.io/api/v1/crates/schannel/0.1.12/download -> schannel-0.1.12.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/serde/1.0.60/download -> serde-1.0.60.crate https://crates.io/api/v1/crates/serde_derive/1.0.60/download -> serde_derive-1.0.60.crate https://crates.io/api/v1/crates/slab/0.3.0/download -> slab-0.3.0.crate https://crates.io/api/v1/crates/slab/0.4.0/download -> slab-0.4.0.crate https://crates.io/api/v1/crates/smallvec/0.2.1/download -> smallvec-0.2.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/structopt/0.2.8/download -> structopt-0.2.8.crate https://crates.io/api/v1/crates/structopt-derive/0.2.8/download -> structopt-derive-0.2.8.crate https://crates.io/api/v1/crates/syn/0.13.11/download -> syn-0.13.11.crate https://crates.io/api/v1/crates/syn/0.14.0/download -> syn-0.14.0.crate https://crates.io/api/v1/crates/take/0.1.0/download -> take-0.1.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.9.0/download -> textwrap-0.9.0.crate https://crates.io/api/v1/crates/tokio/0.1.6/download -> tokio-0.1.6.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-executor/0.1.2/download -> tokio-executor-0.1.2.crate https://crates.io/api/v1/crates/tokio-fs/0.1.0/download -> tokio-fs-0.1.0.crate https://crates.io/api/v1/crates/tokio-io/0.1.6/download -> tokio-io-0.1.6.crate https://crates.io/api/v1/crates/tokio-proto/0.1.1/download -> tokio-proto-0.1.1.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.1/download -> tokio-reactor-0.1.1.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.0/download -> tokio-tcp-0.1.0.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.3/download -> tokio-threadpool-0.1.3.crate https://crates.io/api/v1/crates/tokio-timer/0.2.3/download -> tokio-timer-0.2.3.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.0/download -> tokio-udp-0.1.0.crate https://crates.io/api/v1/crates/tokio-uds/0.1.7/download -> tokio-uds-0.1.7.crate https://crates.io/api/v1/crates/tokio-uds-proto/0.1.1/download -> tokio-uds-proto-0.1.1.crate https://crates.io/api/v1/crates/toml/0.4.6/download -> toml-0.4.6.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/url/1.7.0/download -> url-1.7.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.3/download -> vcpkg-0.2.3.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.4/download -> winapi-0.3.4.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	c11c4632a7a9d8e0b76e9f4412e76163	multiprocessing	cac3169468f893670dac3e7cb940e045
+_eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
 _md5_=b576997cb48b87f829ffa665d5efce4e
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r1 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r1
index 1f12df92bd04..42b5d9e00c78 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r1
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Utility to manage SSH public keys stored in LDAP
 EAPI=6
 HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
 IUSE=schema test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-ldap-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(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) 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? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.0.tar.gz -> ssh-ldap-pubkey-1.3.0.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=716c3c3436027f2f34b110da34af5cac
+_md5_=a0342cb1f68863afae7f2f4013e4b94b
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
index b535661de6af..4eabbd9d49df 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Utility to manage SSH public keys stored in LDAP
 EAPI=6
 HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
 IUSE=schema test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-ldap-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(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) 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? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.0.tar.gz -> ssh-ldap-pubkey-1.3.0.tar.gz https://github.com/jirutka/ssh-ldap-pubkey/commit/130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch -> ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch https://github.com/jirutka/ssh-ldap-pubkey/commit/8d718357dfa5a62f919e61cf620a862cae87e833.patch -> ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=c7498a7c60af716e0d3b782d61f3cb10
+_md5_=1d29d56eb2543913c11da066f5760c63
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 2dcf61a6293a..5e0160e84637 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/kvpm-0.9.10 b/metadata/md5-cache/sys-block/kvpm-0.9.10
index 31d5c912b33f..eb8322f3dda9 100644
--- a/metadata/md5-cache/sys-block/kvpm-0.9.10
+++ b/metadata/md5-cache/sys-block/kvpm-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/util-linux >=sys-block/parted-2.3 >=sys-fs/lvm2-2.02.120 !sys-block/kvpm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=81ac6084688dd6a95d9309513fbaa88b
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9-r1 b/metadata/md5-cache/sys-block/partimage-0.6.9-r1
new file mode 100644
index 000000000000..aa4d48b29b19
--- /dev/null
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=!static? ( pam? ( virtual/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= ssl? ( dev-libs/openssl:0= ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Console-based application to efficiently save raw partition data to image file
+EAPI=6
+HOMEPAGE=http://www.partimage.org/
+IUSE=nls nologin pam ssl static
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= ssl? ( dev-libs/openssl:0= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6223fbbfd7b5161a807a239322777690
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.3.1 b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
index 6329289d6f90..2cc159fd0cc6 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.3.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.0:5= >=kde-plasma/kde-cli-tools-5.12.5:5[kdesu] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.3.1/src/partitionmanager-3.3.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=d698b467fbb70bafeb18061295fa0aa7
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 7ab3d736a242..aa42c311db42 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/efibootmgr-16 b/metadata/md5-cache/sys-boot/efibootmgr-16
index 881592e90fea..19d8a8184eec 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-16
+++ b/metadata/md5-cache/sys-boot/efibootmgr-16
@@ -3,10 +3,10 @@ DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
 DESCRIPTION=User-space application to modify the EFI boot manager
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/efibootmgr
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/16/efibootmgr-16.tar.bz2
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f41e055fcb9c16567cca160665ce8455
+_md5_=6e3f93dfaf9d5c2462680676dc025390
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r10 b/metadata/md5-cache/sys-boot/grub-static-0.97-r10
deleted file mode 100644
index cc7684b0e7da..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prerm setup
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=GNU GRUB Legacy boot loader (static build)
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-IUSE=kernel_linux
-KEYWORDS=-* amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.97-r10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eddc4eea556717945f8a5e44f547c110
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r12 b/metadata/md5-cache/sys-boot/grub-static-0.97-r12
deleted file mode 100644
index f3515080a410..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prerm setup
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=GNU GRUB Legacy boot loader (static build)
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-IUSE=kernel_linux
-KEYWORDS=-* amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.97-r12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0a9c204046860092b2e20eaa2b933d6
diff --git a/metadata/md5-cache/sys-boot/grub-static-0.97-r9 b/metadata/md5-cache/sys-boot/grub-static-0.97-r9
deleted file mode 100644
index a5315e080b40..000000000000
--- a/metadata/md5-cache/sys-boot/grub-static-0.97-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prerm setup
-DEPEND=!<sys-boot/grub-2
-DESCRIPTION=GNU GRUB Legacy boot loader (static build)
-EAPI=0
-HOMEPAGE=https://www.gnu.org/software/grub/
-IUSE=kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=GPL-2
-RDEPEND=!<sys-boot/grub-2
-SLOT=0
-SRC_URI=mirror://gentoo/grub-static-0.97-r9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efde9233702ccbc5bb5901f4e5db74d5
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-1.0_p20130222 b/metadata/md5-cache/sys-boot/vboot-utils-1.0_p20130222
deleted file mode 100644
index ef5e3d00cb89..000000000000
--- a/metadata/md5-cache/sys-boot/vboot-utils-1.0_p20130222
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=app-crypt/trousers app-arch/xz-utils:= dev-libs/libyaml:= dev-libs/openssl:0= sys-apps/util-linux:= >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Chrome OS verified boot tools
-EAPI=5
-HOMEPAGE=http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=app-arch/xz-utils:= dev-libs/libyaml:= dev-libs/openssl:0= sys-apps/util-linux:=
-SLOT=0
-SRC_URI=http://kojipkgs.fedoraproject.org/packages/vboot-utils/20130222gite6cf2c2/3.fc19/src/vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=528c8785754e954672cdfd388f750c0d
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-42_p20150219 b/metadata/md5-cache/sys-boot/vboot-utils-42_p20150219
deleted file mode 100644
index 9acd69149260..000000000000
--- a/metadata/md5-cache/sys-boot/vboot-utils-42_p20150219
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] ) app-crypt/trousers
-DESCRIPTION=Chrome OS verified boot tools
-EAPI=5
-HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
-IUSE=libressl minimal static
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= )
-SLOT=0
-SRC_URI=mirror://gentoo/vboot-utils-42_p20150219.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f594f33e9f85d5e99a51bfe694b05fc
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-51_p20160427 b/metadata/md5-cache/sys-boot/vboot-utils-51_p20160427
deleted file mode 100644
index e7a21728fd8e..000000000000
--- a/metadata/md5-cache/sys-boot/vboot-utils-51_p20160427
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] ) app-crypt/trousers
-DESCRIPTION=Chrome OS verified boot tools
-EAPI=5
-HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
-IUSE=libressl minimal static
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
-LICENSE=BSD
-RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= )
-SLOT=0
-SRC_URI=mirror://gentoo/vboot-utils-51_p20160427.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a81ac54494cb2dd4683e498107918f8a
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-59_p20170413 b/metadata/md5-cache/sys-boot/vboot-utils-59_p20170413
index 44b1fa5b1d1c..d92471abc733 100644
--- a/metadata/md5-cache/sys-boot/vboot-utils-59_p20170413
+++ b/metadata/md5-cache/sys-boot/vboot-utils-59_p20170413
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare test
-DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] ) app-crypt/trousers
+DEPEND=!static? ( !libressl? ( <dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= ) static? ( !libressl? ( <dev-libs/openssl-1.1:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] ) app-crypt/trousers
 DESCRIPTION=Chrome OS verified boot tools
 EAPI=6
 HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
 IUSE=libressl minimal static
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=BSD
-RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= )
+RDEPEND=!static? ( !libressl? ( <dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= ) !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= )
 SLOT=0
 SRC_URI=mirror://gentoo/vboot-utils-59_p20170413.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ec4ad847d4a5e28aa16885a0a363a61
+_md5_=1e299b55f502330149b0805de3d804e6
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229 b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229
new file mode 100644
index 000000000000..f3367aba9693
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= dev-libs/libzip:= !minimal? ( dev-libs/libyaml:= app-arch/xz-utils:= ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) sys-apps/util-linux:=[static-libs(+)] dev-libs/libzip:=[static-libs(+)] !minimal? ( dev-libs/libyaml:=[static-libs(+)] app-arch/xz-utils:=[static-libs(+)] ) ) app-crypt/trousers
+DESCRIPTION=Chrome OS verified boot tools
+EAPI=6
+HOMEPAGE=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot
+IUSE=libressl minimal static
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=BSD
+RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux:= dev-libs/libzip:= !minimal? ( dev-libs/libyaml:= app-arch/xz-utils:= ) )
+SLOT=0
+SRC_URI=mirror://gentoo/vboot-utils-72_p20181229.tar.xz https://dev.gentoo.org/~zmedico/dist/vboot-utils-72_p20181229.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ede5ec2be8044786f7bd9f484800c14
diff --git a/metadata/md5-cache/sys-boot/woeusb-3.2.12 b/metadata/md5-cache/sys-boot/woeusb-3.2.12
new file mode 100644
index 000000000000..66902d16f36e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/woeusb-3.2.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3[X] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Creates windows installer on usb media from an iso image
+EAPI=6
+HOMEPAGE=https://github.com/slacka/WoeUSB
+IUSE=minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3[X] )
+SLOT=0
+SRC_URI=https://github.com/slacka/WoeUSB/archive/v3.2.12.tar.gz -> woeusb-3.2.12.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89
+_md5_=9623a3378bcbd301fec5ba62377918af
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 609d0b9cec3e..99718275c21d 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/ceph-13.2.4 b/metadata/md5-cache/sys-cluster/ceph-13.2.4
new file mode 100644
index 000000000000..65bcf22fcfd6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) mgr? ( <net-libs/nodejs-9.0 >net-libs/nodejs-8.10 ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( 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/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Ceph distributed filesystem
+EAPI=6
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
+RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) mgr? ( <net-libs/nodejs-9.0 >net-libs/nodejs-8.10 ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/cherrypy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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/pecan[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] 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/werkzeug[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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_python3_4 python_targets_python3_5 python_targets_python3_6 ) ?? ( jemalloc tcmalloc )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.4.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=117c77a449dcfc69fabe36c0af4b7cef
diff --git a/metadata/md5-cache/sys-cluster/cinder-13.0.1 b/metadata/md5-cache/sys-cluster/cinder-13.0.1
deleted file mode 100644
index 47390677c1bd..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-13.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.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/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 ) 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=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
-EAPI=6
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
-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_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/pbr-2.1.0 >=dev-python/Babel-2.3.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/Babel-2.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/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(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.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/eventlet-0.20.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/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.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(-)] >=dev-python/iso8601-0.1.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/jsonschema-2.6.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/jsonschema-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(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/keystoneauth-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(-)] >=dev-python/keystonemiddleware-4.17.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/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.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/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.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/oslo-concurrency-3.26.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/oslo-context-2.19.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/oslo-db-4.27.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/oslo-log-3.36.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/oslo-messaging-5.29.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/oslo-middleware-3.31.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-reports-1.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/oslo-rootwrap-5.8.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/oslo-serialization-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/oslo-serialization-2.19.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/oslo-service-1.24.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/oslo-service-1.28.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/oslo-utils-3.33.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/oslo-versionedobjects-1.31.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/osprofiler-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/paramiko-2.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/paste-2.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/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-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/prettytable-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/psutil-3.2.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/pyparsing-2.1.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-barbicanclient-4.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/python-glanceclient-2.8.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-keystoneclient-3.8.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-novaclient-9.1.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-swiftclient-3.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/pytz-2013.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(-)] >=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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-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/routes-2.3.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/taskflow-2.16.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/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/simplejson-3.5.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.10.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.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(-)] !~dev-python/pymysql-0.7.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(-)] >=dev-python/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.1.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(-)] !~dev-python/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.1.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(-)] !~dev-python/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/suds-0.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(-)] >=dev-python/webob-1.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/oslo-i18n-3.15.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/oslo-vmware-2.17.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/os-brick-2.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/os-win-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/tooz-1.58.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/google-api-python-client-1.4.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/castellan-0.16.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/cryptography-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/cursive-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(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-13.0.1 https://tarballs.openstack.org/cinder/cinder-13.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=429069aeb9429d7d74eec8f232d1ca60
diff --git a/metadata/md5-cache/sys-cluster/cinder-13.0.2 b/metadata/md5-cache/sys-cluster/cinder-13.0.2
index d267f282c3bb..58e44e52a82c 100644
--- a/metadata/md5-cache/sys-cluster/cinder-13.0.2
+++ b/metadata/md5-cache/sys-cluster/cinder-13.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-vo
 EAPI=6
 HOMEPAGE=https://launchpad.net/cinder
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/pbr-2.1.0 >=dev-python/Babel-2.3.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/Babel-2.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/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(-)] >=dev-python/defusedxml-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.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/eventlet-0.20.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/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/httplib2-0.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(-)] >=dev-python/iso8601-0.1.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/jsonschema-2.6.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/jsonschema-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(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/keystoneauth-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(-)] >=dev-python/keystonemiddleware-4.17.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/lxml-3.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/lxml-3.7.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/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.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/oslo-concurrency-3.26.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/oslo-context-2.19.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/oslo-db-4.27.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/oslo-log-3.36.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/oslo-messaging-5.29.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/oslo-middleware-3.31.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/oslo-policy-1.30.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/oslo-privsep-1.23.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/oslo-reports-1.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/oslo-rootwrap-5.8.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/oslo-serialization-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/oslo-serialization-2.19.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/oslo-service-1.24.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/oslo-service-1.28.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/oslo-utils-3.33.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/oslo-versionedobjects-1.31.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/osprofiler-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/paramiko-2.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/paste-2.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/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prettytable-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/prettytable-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/psutil-3.2.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/pyparsing-2.1.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-barbicanclient-4.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/python-glanceclient-2.8.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-keystoneclient-3.8.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-novaclient-9.1.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-swiftclient-3.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/pytz-2013.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(-)] >=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/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/retrying-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/routes-2.3.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/taskflow-2.16.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/rtslib-fb-2.1.65[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/simplejson-3.5.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.10.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.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(-)] !~dev-python/pymysql-0.7.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(-)] >=dev-python/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.1.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(-)] !~dev-python/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.1.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(-)] !~dev-python/sqlalchemy-1.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(-)] !~dev-python/sqlalchemy-1.1.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/sqlalchemy-migrate-0.11.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/stevedore-1.20.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/suds-0.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(-)] >=dev-python/webob-1.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/oslo-i18n-3.15.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/oslo-vmware-2.17.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/os-brick-2.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/os-win-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/tooz-1.58.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/google-api-python-client-1.4.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/castellan-0.16.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/cryptography-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/cursive-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(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils 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=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-13.0.2 https://tarballs.openstack.org/cinder/cinder-13.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a7043a6c66e976cfb6652f8b3664a87b
+_md5_=d23f871f8c62a5d7dd628c99e2f18755
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.4.3 b/metadata/md5-cache/sys-cluster/keepalived-1.4.3
deleted file mode 100644
index 7402ecf95033..000000000000
--- a/metadata/md5-cache/sys-cluster/keepalived-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
-EAPI=6
-HOMEPAGE=http://www.keepalived.org/
-IUSE=dbus debug ipv6 -json snmp
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
-SLOT=0
-SRC_URI=http://www.keepalived.org/software/keepalived-1.4.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=da286aaea03167bc0d8c6e79f8217287
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.4.5 b/metadata/md5-cache/sys-cluster/keepalived-1.4.5
deleted file mode 100644
index 3b741e15949a..000000000000
--- a/metadata/md5-cache/sys-cluster/keepalived-1.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4 >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
-EAPI=6
-HOMEPAGE=http://www.keepalived.org/
-IUSE=dbus debug ipv6 -json snmp
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
-SLOT=0
-SRC_URI=http://www.keepalived.org/software/keepalived-1.4.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=90c75184a345ff11dd1803261c8349ec
diff --git a/metadata/md5-cache/sys-cluster/keepalived-2.0.11 b/metadata/md5-cache/sys-cluster/keepalived-2.0.11
new file mode 100644
index 000000000000..bdb1e245ad41
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/keepalived-2.0.11
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4
+DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
+EAPI=7
+HOMEPAGE=http://www.keepalived.org/
+IUSE=dbus debug ipv6 -json snmp
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
+SLOT=0
+SRC_URI=http://www.keepalived.org/software/keepalived-2.0.11.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7494995918bf235012d0e930f37c6d9e
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.12 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.12
new file mode 100644
index 000000000000..5ee7f36fb47e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.10.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3025afb260a53c1e6833f872910e81c0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.6
new file mode 100644
index 000000000000..e2dd6c4b226e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.11.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3025afb260a53c1e6833f872910e81c0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.4
new file mode 100644
index 000000000000..9eb527915b68
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=3025afb260a53c1e6833f872910e81c0
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.1
new file mode 100644
index 000000000000..7436c8b833f9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.9
+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.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=272d3bfeeef55d77a39ac44f6d21fd1b
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.12 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.12
new file mode 100644
index 000000000000..d675823b82e5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1c836392677a007194cbfdd9a84108dc
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.6
new file mode 100644
index 000000000000..1c38dc3b3d83
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.11.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1c836392677a007194cbfdd9a84108dc
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.4
new file mode 100644
index 000000000000..3f6e5b7b9da6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=1c836392677a007194cbfdd9a84108dc
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.1 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.1
new file mode 100644
index 000000000000..7bf3c161ba3d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.9
+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.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=169717724b800041f53c62e3e7b57484
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.10.12 b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.12
new file mode 100644
index 000000000000..715311808936
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.10.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=761c2f7ec633a651a021888656ea1d87
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.11.6 b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.6
new file mode 100644
index 000000000000..3e69f54205ff
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.11.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=761c2f7ec633a651a021888656ea1d87
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.12.4 b/metadata/md5-cache/sys-cluster/kube-proxy-1.12.4
new file mode 100644
index 000000000000..652e7e705f8b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=761c2f7ec633a651a021888656ea1d87
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.13.1 b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.1
new file mode 100644
index 000000000000..186f65c36df4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.9
+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.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=96a760fa364c075ebe56cfeb0e68e3c8
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.12 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.12
new file mode 100644
index 000000000000..a12d6f11cb73
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.10.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c8a24baa2de0fc6dfa3f737d93ff3791
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.6
new file mode 100644
index 000000000000..0576f4b25c51
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.11.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c8a24baa2de0fc6dfa3f737d93ff3791
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.4
new file mode 100644
index 000000000000..8ac01b87c2f3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c8a24baa2de0fc6dfa3f737d93ff3791
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.1 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.1
new file mode 100644
index 000000000000..f7b4a980cb07
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Scheduler
+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.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=25de4ebafe99ef5070510e27ba31a73c
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.10.12 b/metadata/md5-cache/sys-cluster/kubectl-1.10.12
new file mode 100644
index 000000000000..903feffd24c0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.10.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=41286532f1c58f95615ad90bfb910dbc
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.11.6 b/metadata/md5-cache/sys-cluster/kubectl-1.11.6
new file mode 100644
index 000000000000..2724a0f66653
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.11.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=41286532f1c58f95615ad90bfb910dbc
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.12.4 b/metadata/md5-cache/sys-cluster/kubectl-1.12.4
new file mode 100644
index 000000000000..6c97c6e6913e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=41286532f1c58f95615ad90bfb910dbc
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.0 b/metadata/md5-cache/sys-cluster/kubectl-1.13.0
deleted file mode 100644
index 6f6ccfd68a7b..000000000000
--- a/metadata/md5-cache/sys-cluster/kubectl-1.13.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
-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.13.0.tar.gz -> kubernetes-1.13.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=b5b07d5d9cd12468a189712e02476532
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.13.2 b/metadata/md5-cache/sys-cluster/kubectl-1.13.2
new file mode 100644
index 000000000000..d06713f91f46
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.13.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.11 dev-go/go-bindata >=dev-lang/go-1.9
+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.13.2.tar.gz -> kubernetes-1.13.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1e000ed162577ab325183ac791f2ab5a
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.10.12 b/metadata/md5-cache/sys-cluster/kubelet-1.10.12
new file mode 100644
index 000000000000..c20148a8dc01
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.10.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.10.12.tar.gz -> kubernetes-1.10.12.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=72e6b382c6580c2ae2902dc371373222
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.11.6 b/metadata/md5-cache/sys-cluster/kubelet-1.11.6
new file mode 100644
index 000000000000..3fcffaaedc41
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.11.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.11.6.tar.gz -> kubernetes-1.11.6.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=72e6b382c6580c2ae2902dc371373222
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.12.4 b/metadata/md5-cache/sys-cluster/kubelet-1.12.4
new file mode 100644
index 000000000000..4437f21466b0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.12.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.9
+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.12.4.tar.gz -> kubernetes-1.12.4.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=72e6b382c6580c2ae2902dc371373222
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.13.1 b/metadata/md5-cache/sys-cluster/kubelet-1.13.1
new file mode 100644
index 000000000000..ed7ed3b19a2c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.13.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.9
+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.13.1.tar.gz -> kubernetes-1.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc
+_md5_=48f7866949d9003d5a79078826090a13
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ed9e75472eab..09c05a0d9387 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/autoconf-archive-2017.03.21 b/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
deleted file mode 100644
index f871a867cc4b..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2017.03.21
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=GNU Autoconf Macro Archive
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
-SLOT=0
-SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2017.03.21.tar.xz
-_md5_=a46b047ed032bea78a077811eabce01c
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2017.09.28 b/metadata/md5-cache/sys-devel/autoconf-archive-2017.09.28
deleted file mode 100644
index 5b866bd4b975..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2017.09.28
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=GNU Autoconf Macro Archive
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
-SLOT=0
-SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2017.09.28.tar.xz
-_md5_=c2d99f34971252e6f843766bd8f8a7e7
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2019.01.06 b/metadata/md5-cache/sys-devel/autoconf-archive-2019.01.06
new file mode 100644
index 000000000000..af09904a564e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2019.01.06
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=GNU Autoconf Macro Archive
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!=gnome-base/gnome-common-3.14.0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
+SLOT=0
+SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2019.01.06.tar.xz
+_md5_=88704dcba53f828da794eec315d51aa2
diff --git a/metadata/md5-cache/sys-devel/clang-7.0.1 b/metadata/md5-cache/sys-devel/clang-7.0.1
index 356aa3b7de20..cfe637c5654f 100644
--- a/metadata/md5-cache/sys-devel/clang-7.0.1
+++ b/metadata/md5-cache/sys-devel/clang-7.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7
 SRC_URI=https://releases.llvm.org/7.0.1/cfe-7.0.1.src.tar.xz https://releases.llvm.org/7.0.1/clang-tools-extra-7.0.1.src.tar.xz test? ( https://releases.llvm.org/7.0.1/llvm-7.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.0.1-manpages.tar.bz2 )
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=370a7a0777f559f84e4d6e16e2c4ab5c
+_md5_=277f944bb9e35e4cd010e520c4095abc
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index b066041ffec3..91f8c3b74ff9 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.1:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=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_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=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_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-9999 default-compiler-rt? ( =sys-libs/compiler-rt-9999* ) default-libcxx? ( >=sys-libs/libcxx-9999 )
-RDEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.1:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=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_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+RDEPEND=~sys-devel/llvm-9999:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=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_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
 SLOT=8
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e36ff95816afb09633b3d90d9553c97a
+_md5_=96001e3ad0d30c6a6581997e583a8d59
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.0 b/metadata/md5-cache/sys-devel/gcc-config-2.0
index 7f9c322461c9..0abc1fcaae1f 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.0
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=Utility to manage compilers
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.0.tar.xz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bc39bc787c5291abf60d64f6bde0d766
+_md5_=86d1c6eefbe4f8d7d26a6444c72bbc66
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1461 b/metadata/md5-cache/sys-devel/gdb-apple-1461
deleted file mode 100644
index a6305ebba5aa..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-apple-1461
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3* nls? ( sys-devel/gettext )
-DESCRIPTION=Apple branch of the GNU Debugger, Developer Tools 3.2.2
-EAPI=6
-HOMEPAGE=https://sourceware.org/gdb/
-IUSE=nls
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2 GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1461.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c75e973dc6ae0c0eca07bfa7e8d9e47
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-1752 b/metadata/md5-cache/sys-devel/gdb-apple-1752
index fcebce16997c..ad8f05877e35 100644
--- a/metadata/md5-cache/sys-devel/gdb-apple-1752
+++ b/metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3* nls? ( sys-devel/gettext )
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= =dev-db/sqlite-3* nls? ( sys-devel/gettext ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
 DESCRIPTION=Apple branch of the GNU Debugger, Developer Tools 4.3
 EAPI=6
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=nls
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2 GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= =dev-db/sqlite-3*
 SLOT=0
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-1752.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=203b9398b1acf7a39644df9903211183
+_md5_=35a32b7d73416c7957d71c143cd1b398
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-768-r1 b/metadata/md5-cache/sys-devel/gdb-apple-768-r1
deleted file mode 100644
index 4fd2b6c881da..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-apple-768-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3* nls? ( sys-devel/gettext )
-DESCRIPTION=Apple branch of the GNU Debugger, 10.5
-EAPI=6
-HOMEPAGE=https://sourceware.org/gdb/
-IUSE=nls
-KEYWORDS=~ppc-macos ~x86-macos
-LICENSE=APSL-2 GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-768.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97cd13c2a0d3fec4970c123d4ee7c97c
diff --git a/metadata/md5-cache/sys-devel/gdb-apple-966 b/metadata/md5-cache/sys-devel/gdb-apple-966
deleted file mode 100644
index 1673697b0ed6..000000000000
--- a/metadata/md5-cache/sys-devel/gdb-apple-966
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3* nls? ( sys-devel/gettext )
-DESCRIPTION=Apple branch of the GNU Debugger, Developer Tools 3.1.3
-EAPI=6
-HOMEPAGE=https://sourceware.org/gdb/
-IUSE=nls
-KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
-LICENSE=APSL-2 GPL-2
-RDEPEND=>=sys-libs/ncurses-5.2-r2 =dev-db/sqlite-3*
-SLOT=0
-SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-966.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=adc0a78a1d6b8adc8a9972aa2bc22428
diff --git a/metadata/md5-cache/sys-devel/remake-3.82.0.9 b/metadata/md5-cache/sys-devel/remake-3.82.0.9
deleted file mode 100644
index 1a232beb4b38..000000000000
--- a/metadata/md5-cache/sys-devel/remake-3.82.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=readline? ( sys-libs/readline )
-DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
-EAPI=4
-HOMEPAGE=http://bashdb.sourceforge.net/remake/
-IUSE=readline
-KEYWORDS=amd64 ~hppa ppc x86
-LICENSE=GPL-1
-RDEPEND=readline? ( sys-libs/readline )
-SLOT=0
-SRC_URI=mirror://sourceforge/bashdb/remake-3.82+dbg0.9.tar.bz2
-_md5_=e1f7e86a5e84471a7830eeb5df0d21bc
diff --git a/metadata/md5-cache/sys-devel/remake-4.1.1.1 b/metadata/md5-cache/sys-devel/remake-4.1.1.1
deleted file mode 100644
index c1437cc6f541..000000000000
--- a/metadata/md5-cache/sys-devel/remake-4.1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=readline? ( sys-libs/readline:0= ) guile? ( >=dev-scheme/guile-1.8:= )
-DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
-EAPI=5
-HOMEPAGE=http://bashdb.sourceforge.net/remake/
-IUSE=guile readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-1
-RDEPEND=readline? ( sys-libs/readline:0= ) guile? ( >=dev-scheme/guile-1.8:= )
-SLOT=0
-SRC_URI=mirror://sourceforge/bashdb/remake-4.1+dbg1.1.tar.bz2
-_md5_=8e0b24b12b5cdec638593659b16f759e
diff --git a/metadata/md5-cache/sys-devel/remake-4.2.1.1.4-r1 b/metadata/md5-cache/sys-devel/remake-4.2.1.1.4-r1
index f6a64b0b3306..69da4c3a6813 100644
--- a/metadata/md5-cache/sys-devel/remake-4.2.1.1.4-r1
+++ b/metadata/md5-cache/sys-devel/remake-4.2.1.1.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=patched version of GNU make with improved error reporting, tracing a
 EAPI=6
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 IUSE=guile readline
-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-1
 RDEPEND=readline? ( sys-libs/readline:0= ) guile? ( >=dev-scheme/guile-1.8:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-4.2.1+dbg-1.4.tar.bz2
-_md5_=623d8a7115461aa6135e7618569a3af9
+_md5_=304e1917f56a06682eb497c9dd874ed6
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 5008af4858a7..b8d91d953ab5 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/android-file-transfer-linux-3.5 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.5
deleted file mode 100644
index 0b34eae55b7d..000000000000
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Android File Transfer for Linux
-EAPI=6
-HOMEPAGE=https://github.com/whoozle/android-file-transfer-linux
-IUSE=fuse qt5
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=https://github.com/whoozle/android-file-transfer-linux/archive/v3.5.tar.gz -> android-file-transfer-linux-3.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=66b9fb415b5a1223c97cb870d1e969f5
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150323 b/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150323
deleted file mode 100644
index 469dc626bd93..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150323
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User space headers for aufs3
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-3.19_p20150323.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ac16f0e0bad50616e29acec552997c39
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150420 b/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150420
deleted file mode 100644
index 1ea54ea09534..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-headers-3.19_p20150420
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User space headers for aufs3
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-3.19_p20150420.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ac16f0e0bad50616e29acec552997c39
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20150420 b/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20150420
deleted file mode 100644
index 924bd29d22a9..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20150420
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User space headers for aufs3
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.0_p20150420.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a9c6c5f0a442b4173b8f4dbfa61c4d5a
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20151116 b/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20151116
deleted file mode 100644
index babb814c1214..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-headers-4.0_p20151116
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User space headers for aufs3
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.0_p20151116.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ac16f0e0bad50616e29acec552997c39
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709 b/metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
new file mode 100644
index 000000000000..9fb6faf3e611
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs-headers-4.14_p20180709
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=User space headers for aufs3
+EAPI=7
+HOMEPAGE=http://aufs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.14_p20180709.tar.xz
+_md5_=ae7af469c2b8515c5756553907007cec
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20161010 b/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20161010
deleted file mode 100644
index dcefa3c974ba..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20161010
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=User space headers for aufs3
-EAPI=6
-HOMEPAGE=http://aufs.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.1_p20161010.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f4e00aa54940322cbded312ee0d488e6
diff --git a/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130 b/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130
index 6982de4fea47..17b8d8d3a86f 100644
--- a/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130
+++ b/metadata/md5-cache/sys-fs/aufs-headers-4.1_p20170130
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-headers-4.1_p20170130.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc9bee87d10a2514fe615e6f0fb0c818
+_md5_=b465e5707fc8846c36ab32f11620b1d2
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323 b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
deleted file mode 100644
index b0ed3250673b..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150323
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-3.19_p20150323
-DESCRIPTION=Utilities are always necessary for aufs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-3.19_p20150323.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ae61d7d55bedb420dccf0c015ea7bc2
diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420 b/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420
deleted file mode 100644
index a11a788a9503..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-util-3.19_p20150420
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-3.19_p20150420
-DESCRIPTION=Utilities are always necessary for aufs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-3.19_p20150420.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ae61d7d55bedb420dccf0c015ea7bc2
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420 b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
deleted file mode 100644
index b5d9ec7c3fc5..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20150420
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-4.0_p20150420
-DESCRIPTION=Utilities are always necessary for aufs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.0_p20150420.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2957009473e07b0ea4273debb8e7450
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116 b/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116
deleted file mode 100644
index cd077777b422..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-util-4.0_p20151116
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-4.0_p20151116
-DESCRIPTION=Utilities are always necessary for aufs
-EAPI=5
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.0_p20151116.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3358b0aef124b3e2332817d15f7c8910
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709 b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
new file mode 100644
index 000000000000..10a09f2dfbb7
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs-util-4.14_p20180709
@@ -0,0 +1,13 @@
+DEFINED_PHASES=prepare setup
+DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-4.14_p20180709
+DESCRIPTION=Utilities are always necessary for aufs
+EAPI=7
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.14_p20180709.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7d767f3238f572e0207eb750d72bce59
diff --git a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010 b/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010
deleted file mode 100644
index 13051e8fc0d2..000000000000
--- a/metadata/md5-cache/sys-fs/aufs-util-4.1_p20161010
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318 ~sys-fs/aufs-headers-4.1_p20161010
-DESCRIPTION=Utilities are always necessary for aufs
-EAPI=6
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs2 !<sys-fs/aufs3-3_p20130318
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs-util-4.1_p20161010.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be512ab755a3c0774c857b1bf7ca9129
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.5 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.5
index 2da030a6acfc..0e4d94b332b5 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.5
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=6
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0e62ae655166db7a3ff76203caf78c5c
+_md5_=cd4aa371d5a4559537bb68e0040db4e4
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.5-r1 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.5-r1
index f590c8950401..09e8b20045ec 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.5-r1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=6
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2e081d571bc1a6cc0054b2a072f7af92
+_md5_=000170afbb63ebe17b74d92b5f3f57f9
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.6 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.6
index 4fba114b75d5..9b99e3bb11bd 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.0.6
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=6
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=+gcrypt kernel nettle openssl +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) 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 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0e62ae655166db7a3ff76203caf78c5c
+_md5_=cd4aa371d5a4559537bb68e0040db4e4
diff --git a/metadata/md5-cache/sys-fs/dfc-3.0.5-r1 b/metadata/md5-cache/sys-fs/dfc-3.0.5-r1
deleted file mode 100644
index d8f7e6eb521f..000000000000
--- a/metadata/md5-cache/sys-fs/dfc-3.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=nls? ( virtual/libintl sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A simple CLI tool that display file system usage, with colors
-EAPI=5
-HOMEPAGE=http://projects.gw-computing.net/projects/dfc
-IUSE=nls
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://projects.gw-computing.net/attachments/download/467/dfc-3.0.5.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f6f2e93c14baa4e40cf420df19c15c4c
diff --git a/metadata/md5-cache/sys-fs/dosfstools-4.1 b/metadata/md5-cache/sys-fs/dosfstools-4.1
index 6de0c606e018..95da1f101e6f 100644
--- a/metadata/md5-cache/sys-fs/dosfstools-4.1
+++ b/metadata/md5-cache/sys-fs/dosfstools-4.1
@@ -4,10 +4,10 @@ DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
 EAPI=5
 HOMEPAGE=https://github.com/dosfstools/dosfstools
 IUSE=compat test +udev
-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=udev? ( virtual/libudev )
 SLOT=0
 SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v4.1/dosfstools-4.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33ba3ec19792e5b76af7de4c19259b7d
+_md5_=b7bbf11d7f3f92b19e279293eecd3a56
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.8-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.8-r1
deleted file mode 100644
index 7d4966c9ddad..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-2.9.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=An interface for filesystems implemented in userspace
-EAPI=6
-HOMEPAGE=https://github.com/libfuse/libfuse
-IUSE=examples kernel_linux kernel_FreeBSD static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
-RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
-SLOT=0
-SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=c15cd3129c0cb67e1bdecea23d1a63fe
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9 b/metadata/md5-cache/sys-fs/fuse-2.9.9
new file mode 100644
index 000000000000..7ccd0ba76640
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=An interface for filesystems implemented in userspace
+EAPI=7
+HOMEPAGE=https://github.com/libfuse/libfuse
+IUSE=examples kernel_linux kernel_FreeBSD static-libs kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
+RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
+SLOT=0
+SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac
+_md5_=7a3461276dab9805d007385d020c691b
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.6 b/metadata/md5-cache/sys-fs/fuse-3.2.6
deleted file mode 100644
index 0fd984149a46..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-3.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pytest[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=An interface for filesystems implemented in userspace
-EAPI=6
-HOMEPAGE=https://github.com/libfuse/libfuse
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=sys-fs/fuse-common
-SLOT=3
-SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.6/fuse-3.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-3.3.0-r1 b/metadata/md5-cache/sys-fs/fuse-3.3.0-r1
deleted file mode 100644
index 1fddcb6a8c71..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-3.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.7 dev-python/pytest[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pytest[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=An interface for filesystems implemented in userspace
-EAPI=6
-HOMEPAGE=https://github.com/libfuse/libfuse
-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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
-SLOT=3
-SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.3.0/fuse-3.3.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06e5f1fa2c67f9c1269dc94149c2a534
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.1 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
index bc2a80f07884..cbaec6ce6c64 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.1
@@ -4,9 +4,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=6
 HOMEPAGE=https://github.com/rvoicilas/inotify-tools/wiki
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rvoicilas/inotify-tools/archive/3.20.1.tar.gz -> inotify-tools-3.20.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9ccd3bd5e7da3618e1724d2b52a1348e
+_md5_=deb82da9c34c0c22ddc1e3094ec3f1ce
diff --git a/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1 b/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
new file mode 100644
index 000000000000..c773d21234f0
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lessfs-1.7.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=berkdb? ( sys-libs/db:* ) crypt? ( dev-libs/openssl:0= ) lzo? ( dev-libs/lzo ) snappy? ( app-arch/snappy ) >=dev-db/tokyocabinet-1.4.42 app-crypt/mhash >=sys-fs/fuse-2.8.0:0=
+DESCRIPTION=A high performance inline data deduplicating filesystem
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/lessfs/
+IUSE=berkdb crypt debug filelog memtrace lzo snappy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=berkdb? ( sys-libs/db:* ) crypt? ( dev-libs/openssl:0= ) lzo? ( dev-libs/lzo ) snappy? ( app-arch/snappy ) >=dev-db/tokyocabinet-1.4.42 app-crypt/mhash >=sys-fs/fuse-2.8.0:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/lessfs/lessfs/lessfs-1.7.0/lessfs-1.7.0.tar.gz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=183ca41132413e1de56f5918619bd871
diff --git a/metadata/md5-cache/sys-fs/lufis-0.3-r1 b/metadata/md5-cache/sys-fs/lufis-0.3-r1
new file mode 100644
index 000000000000..4ea1d4430c8c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lufis-0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
+DESCRIPTION=Wrapper to use lufs modules with fuse kernel support
+EAPI=7
+HOMEPAGE=http://fuse.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=!<sys-fs/lufs-0.9.7-r3 >=sys-fs/fuse-1.3:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse/lufis-0.3.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=cdd418cc0637291ad72431ac54fcb5b7
diff --git a/metadata/md5-cache/sys-fs/mtpfs-1.0 b/metadata/md5-cache/sys-fs/mtpfs-1.0
deleted file mode 100644
index b8128c58b82d..000000000000
--- a/metadata/md5-cache/sys-fs/mtpfs-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=dev-libs/glib:2 media-libs/libid3tag media-libs/libmad media-libs/libmtp sys-fs/fuse
-DESCRIPTION=A FUSE filesystem providing access to MTP devices
-EAPI=4
-HOMEPAGE=https://www.adebenham.com/mtpfs/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 media-libs/libid3tag media-libs/libmad media-libs/libmtp sys-fs/fuse
-SLOT=0
-SRC_URI=https://www.adebenham.com/debian/mtpfs-1.0.tar.gz
-_md5_=c8571d16f7f272ad277edf0d2308bc9d
diff --git a/metadata/md5-cache/sys-fs/mtpfs-1.1-r3 b/metadata/md5-cache/sys-fs/mtpfs-1.1-r3
deleted file mode 100644
index 258eead10b17..000000000000
--- a/metadata/md5-cache/sys-fs/mtpfs-1.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=dev-libs/glib:2 >=media-libs/libmtp-1.1.2 sys-fs/fuse mad? ( media-libs/libid3tag media-libs/libmad ) virtual/pkgconfig
-DESCRIPTION=A FUSE filesystem providing access to MTP devices
-EAPI=5
-HOMEPAGE=https://www.adebenham.com/mtpfs/
-IUSE=debug mad
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 >=media-libs/libmtp-1.1.2 sys-fs/fuse mad? ( media-libs/libid3tag media-libs/libmad )
-SLOT=0
-SRC_URI=https://www.adebenham.com/files/mtp/mtpfs-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2937268bb89f5181ac5741d9b009ab2
diff --git a/metadata/md5-cache/sys-fs/mtpfs-1.1-r5 b/metadata/md5-cache/sys-fs/mtpfs-1.1-r5
new file mode 100644
index 000000000000..d4e2a9ac8def
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mtpfs-1.1-r5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure postinst prepare
+DEPEND=dev-libs/glib:2 >=media-libs/libmtp-1.1.2 <sys-fs/fuse-3:0= mad? ( media-libs/libid3tag media-libs/libmad )
+DESCRIPTION=A FUSE filesystem providing access to MTP devices
+EAPI=7
+HOMEPAGE=https://www.adebenham.com/mtpfs/
+IUSE=debug mad
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 >=media-libs/libmtp-1.1.2 <sys-fs/fuse-3:0= mad? ( media-libs/libid3tag media-libs/libmad )
+SLOT=0
+SRC_URI=https://www.adebenham.com/files/mtp/mtpfs-1.1.tar.gz
+_md5_=93298b4a53f9083e74c943fc5bcad273
diff --git a/metadata/md5-cache/sys-fs/squashfuse-0.1.103 b/metadata/md5-cache/sys-fs/squashfuse-0.1.103
new file mode 100644
index 000000000000..2d36b3791fcd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/squashfuse-0.1.103
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) lzo? ( >=dev-libs/lzo-2.06:= ) lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= ) virtual/pkgconfig
+DESCRIPTION=FUSE filesystem to mount squashfs archives
+EAPI=7
+HOMEPAGE=https://github.com/vasi/squashfuse
+IUSE=lz4 lzma lzo static-libs +zlib zstd
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) lzo? ( >=dev-libs/lzo-2.06:= ) lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=|| ( lz4 lzma lzo zlib zstd )
+SLOT=0
+SRC_URI=https://github.com/vasi/squashfuse/releases/download/0.1.103/squashfuse-0.1.103.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=50974276cc7b80f76bcce54169a73012
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index 22939facc134..a31d873370de 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -4,7 +4,7 @@ DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace de
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl +kmod selinux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~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=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 !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a6cca6f63a78dc390f32934fd6abaf82
+_md5_=2214a197fb6fdc98e1f9ae109428bfa0
diff --git a/metadata/md5-cache/sys-fs/udev-240-r1 b/metadata/md5-cache/sys-fs/udev-240-r1
deleted file mode 100644
index 4a2dc46462d8..000000000000
--- a/metadata/md5-cache/sys-fs/udev-240-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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 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.45.1 >=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 kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~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 !<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/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=636329a159d83722d4173cd9e289038e
diff --git a/metadata/md5-cache/sys-fs/udev-240-r2 b/metadata/md5-cache/sys-fs/udev-240-r2
new file mode 100644
index 000000000000..a71809e1fb58
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-240-r2
@@ -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 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.45.1 >=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 kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~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 !<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/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9028353dce435ceb5e371ab291f59d10
diff --git a/metadata/md5-cache/sys-fs/udftools-1.1-r1 b/metadata/md5-cache/sys-fs/udftools-1.1-r1
deleted file mode 100644
index 30f872e7987d..000000000000
--- a/metadata/md5-cache/sys-fs/udftools-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/readline:0=
-DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
-EAPI=5
-HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0=
-SLOT=0
-SRC_URI=https://github.com/pali/udftools/releases/download/1.1/udftools-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9c0e3b8df15a83984a80194f3bc50a9
diff --git a/metadata/md5-cache/sys-fs/udftools-2.0-r2 b/metadata/md5-cache/sys-fs/udftools-2.0-r2
index 984d220c043c..09d186cc5623 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.0-r2
+++ b/metadata/md5-cache/sys-fs/udftools-2.0-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Ben Fennema's tools for packet writing and the UDF filesystem
 EAPI=6
 HOMEPAGE=https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/2.0/udftools-2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2bc67f5777a24d7a771c2a19f3df8e8
+_md5_=51de58e3734130f82b8a82df6370b3c8
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.12-r1 b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.12-r1
new file mode 100644
index 000000000000..43d665a87d1a
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.12-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND==sys-kernel/spl-0.7.12* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=app-portage/elt-patches-20170815
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=5
+HOMEPAGE=https://zfsonlinux.org/
+IUSE=custom-cflags debug +rootfs kernel_linux kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=CDDL debug? ( GPL-2+ )
+RDEPEND==sys-kernel/spl-0.7.12* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ebba7d401a4abb63a42fe8b9441a082d
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index cd892de5bfe9..fa686f3963fd 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/aufs-sources-4.14.83 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
index 2de74f5bb92e..2dc5ddf4cef1 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.83
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-90.base.tar.xz mirror://gentoo/genpatches-4.14-90.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-90.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9c44718e75455213267059abf144146b
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.87 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.87
index 36e9ec22a476..d72c4defa272 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.87
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.87
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.87
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-94.base.tar.xz mirror://gentoo/genpatches-4.14-94.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-94.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b07093dcce0e1b74c51ca60acac2d428
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.88 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.88
index 5eadb722e7d0..351d0cdc9643 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.88
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.88
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.88
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-95.base.tar.xz mirror://gentoo/genpatches-4.14-95.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-95.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a479950b38c0ba63ba7daad1d851cb42
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.89 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.89
index c1036fe533fc..9cce130069c9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.89
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.89
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.89
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-96.base.tar.xz mirror://gentoo/genpatches-4.14-96.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-96.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88f6bcf8b30db0cce6cf18ac270739d7
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.90 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.90
index 9633309fe2f7..fa472d94e3ba 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.90
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.90
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.90
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-97.base.tar.xz mirror://gentoo/genpatches-4.14-97.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-97.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccc2fed8e817dcbee4930b3660791720
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.91 b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.91
index 05ca2df5ff70..79e838eb17d9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.14.91
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.14.91
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.91
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.14.56+_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.14-98.base.tar.xz mirror://gentoo/genpatches-4.14-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-98.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a3ad3c067204bbdac6cee1c3c2943cf
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.10
index ad964f23334d..24818d0b6188 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.10
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.10
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.10
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-11.base.tar.xz mirror://gentoo/genpatches-4.19-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-11.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a92855cb85631bf0c6508f9642a8546
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.12
index c69251f262f8..a0d277cf5347 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.12
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-13.base.tar.xz mirror://gentoo/genpatches-4.19-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-13.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e0d02f1ea0661c1595aad72c64cbd66
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.13
index a313eaa7e84f..ec06cf7130c1 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-14.base.tar.xz mirror://gentoo/genpatches-4.19-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-14.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40c128ea1e5103d6534d424df37e59db
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.8 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.8
index 7b17f0b6f4bb..f709fcb0c9a7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.8
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.8
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-9.base.tar.xz mirror://gentoo/genpatches-4.19-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-9.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9e90e5d10314dce2d112b6fef0cf753
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.9 b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.9
index ce71e2aec293..9e153a5f1b34 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.19.9
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.19.9
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.19_p20181217.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.19-10.base.tar.xz mirror://gentoo/genpatches-4.19-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-10.experimental.tar.xz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f14dd630bf9a4a703c57dad221ff1a62
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
index 85fbe47bcf9b..31b48320a48a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.63
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.63
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-69.base.tar.xz mirror://gentoo/genpatches-4.14-69.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-69.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=88edc7fd66a293652319552872e228e2
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
index 6511b3d74d4c..173ffa801d4e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.66
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.66
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-72.base.tar.xz mirror://gentoo/genpatches-4.14-72.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-72.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5f8b5ea95724c5da6f209548a3032509
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
index e8c73e832dd3..dc5a3ba6d8f8 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.67
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.67
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-73.base.tar.xz mirror://gentoo/genpatches-4.14-73.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-73.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=09a69adeca57626f23d18a45250b26ff
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
index 6d36e2131b63..fafad6075711 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.69
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.69
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-75.base.tar.xz mirror://gentoo/genpatches-4.14-75.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-75.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=fd0db79c5a74eefa245caa7dca40fd91
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
index 65b61a84edac..382ca500669c 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.71
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-77.base.tar.xz mirror://gentoo/genpatches-4.14-77.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-77.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=98b37cc3952e24ff0f765f22fd9aec46
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
index 55b7b1e72114..05166cec68c5 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.73
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.73
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-79.base.tar.xz mirror://gentoo/genpatches-4.14-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-79.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=085ff130ba0a97322b5fa5a7fc9b9eb0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
index 24963911d51f..4a86f39d0e16 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.75
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.75
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-81.base.tar.xz mirror://gentoo/genpatches-4.14-81.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-81.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4aaa7d1e5433c87fe7c8ed0e23972e4b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
index c58fe8612458..7e277d618c57 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.78
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-85.base.tar.xz mirror://gentoo/genpatches-4.14-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-85.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=ffd76a558c1c04b1c5cf6fa596d6aa78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81 b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
index c75cd5136023..972ec1adc5ca 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.14.81
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.81
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-88.base.tar.xz mirror://gentoo/genpatches-4.14-88.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-88.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.14/4.14-sched-MuQSS_162.patch -> ck-sources-4.14-muqss.patch https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch https://github.com/ckolivas/linux/commit/7bb09fbdf490f5de8eafc635ab858b1f38dca84c.patch -> ck-sources-4.14-irqregsdeclaration-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=47b079e6b9fe245a4e85be39702611d0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
index d7d7df7e70cc..3fd76d22411f 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.11
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-14.base.tar.xz mirror://gentoo/genpatches-4.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-14.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=19e59bbb661dacc6a839e7100cafa92d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
index 4465655d173b..3c336b93f4de 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-16.base.tar.xz mirror://gentoo/genpatches-4.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-16.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=946e2d0c28bb9b6e5c26aec001a7ceb8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
index 5581f06a7650..ad38532c71af 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-19.base.tar.xz mirror://gentoo/genpatches-4.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-19.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=bded78c0fb5630e7d20dc7533170065f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
index b249a398ee54..880e24733a61 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-23.base.tar.xz mirror://gentoo/genpatches-4.18-23.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-23.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=31300c723d63a5310f338eb721d0df44
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
index 41b4800f74e3..2e6b0a1a4ccc 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-8.base.tar.xz mirror://gentoo/genpatches-4.18-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-8.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1146cc2d704051fb09b40413daff2a63
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
index 04b9c5c28960..b99cbb83e162 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-10.base.tar.xz mirror://gentoo/genpatches-4.18-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-10.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=be230d062a9a2177e56b84e7a1c1a671
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
index 60001ea9d303..9d482b3c9bdb 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.18.9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://gentoo/genpatches-4.18-12.base.tar.xz mirror://gentoo/genpatches-4.18-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.18-12.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.18/0001-MultiQueue-Skiplist-Scheduler-version-v0.173.patch -> ck-sources-4.18-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2b8df6b48346ec27fb6a94c256d9e8e0
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2 b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
index 5eb1aefd4b4c..3580e70c8c21 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.19.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://gentoo/genpatches-4.19-3.base.tar.xz mirror://gentoo/genpatches-4.19-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-3.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.19/0001-MultiQueue-Skiplist-Scheduler-version-v0.180.patch -> ck-sources-4.19-muqss.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=acab435a08ab2ff759f832856c5cf3e7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
index 2e4b68f1c0e6..58368a034827 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.120
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.120
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-124.base.tar.xz mirror://gentoo/genpatches-4.9-124.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-124.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=720f70fbaa2e445dc077c743e7668847
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
index 638968c0b1cd..293245619ff8 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.123
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.123
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-127.base.tar.xz mirror://gentoo/genpatches-4.9-127.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-127.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d964548267e4142a87f1551f3ae679f8
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
index 4f85fad1eeb1..826926a21148 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.124
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.124
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-128.base.tar.xz mirror://gentoo/genpatches-4.9-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-128.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=583c54a6edf2d8f84940f24e0c899152
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
index 01beeb1e4af1..1bc3cf05c8c6 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.126
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.126
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-130.base.tar.xz mirror://gentoo/genpatches-4.9-130.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-130.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=98e0ce1fb63f410cfdd5a2051c8fbe0c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
index 9b8d0e5b0546..747c5530b27a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.128
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.128
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-132.base.tar.xz mirror://gentoo/genpatches-4.9-132.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-132.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f8e1950cc82180923344b353d4b9cb26
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
index 9c01649bcb83..55aff8d09b89 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.130
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.130
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-134.base.tar.xz mirror://gentoo/genpatches-4.9-134.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-134.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=035fedf0fc1d114fd67ed46b5de4aec7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
index 3585a69073be..238228d14f47 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.132
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.132
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-136.base.tar.xz mirror://gentoo/genpatches-4.9-136.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-136.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2f84d80ba564e8662c27588801389ecc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
index f622207c8746..db9c8e7edd44 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.135
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.135
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-139.base.tar.xz mirror://gentoo/genpatches-4.9-139.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-139.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7f6ce089d60648491b0a20622553331a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
index 14f15fe39603..a4c094c64f01 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.137
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.137
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-141.base.tar.xz mirror://gentoo/genpatches-4.9-141.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-141.experimental.tar.xz ) http://ck.kolivas.org/patches/muqss/4.0/4.9/4.9-sched-MuQSS_150.patch -> ck-sources-4.9-muqss.patch https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=6b89323e1bf9e099b76084dbd34af781
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.83 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.83
index 1965880d6dbc..8b716ad44ad4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.83
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.83
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.83
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-90.base.tar.xz mirror://gentoo/genpatches-4.14-90.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-90.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=247dcb6eacf7525981365101698e9706
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.87 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.87
index 14929bde8c5a..0a8278effd6b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.87
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.87
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.87
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-94.base.tar.xz mirror://gentoo/genpatches-4.14-94.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-94.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a0691c3bb69bb5e6f96614b17c5272de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.88 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.88
index 1eef79d756b7..fe8d1f4ce390 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.88
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.88
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.88
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-95.base.tar.xz mirror://gentoo/genpatches-4.14-95.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-95.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=35e59f2551e5a065fe52426b2c0b3420
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.89 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.89
index 6cec184242f5..435d285a4249 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.89
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.89
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.89
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-96.base.tar.xz mirror://gentoo/genpatches-4.14-96.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-96.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=f0126e819ea60673bafd701198a5a12f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.90 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.90
index 121d288ce9bb..530e12826294 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.90
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.90
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.90
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-97.base.tar.xz mirror://gentoo/genpatches-4.14-97.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-97.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c868f2f8a704d8eaa01677f2e43b4151
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.91 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.91
index ef8acdcabc32..383a68e68e0c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.91
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.91
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.91
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-98.base.tar.xz mirror://gentoo/genpatches-4.14-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-98.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=1594273b5b643ebf47c74f58bf4a07fd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.92 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.92
new file mode 100644
index 000000000000..8c425f4588cb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.92
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.92
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-99.base.tar.xz mirror://gentoo/genpatches-4.14-99.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-99.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1ccd6ac6994ff88aa88c1b387fad4ec0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.10
deleted file mode 100644
index e98671e0d151..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.10
+++ /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 including the Gentoo patchset for the 4.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.10
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-11.base.tar.xz mirror://gentoo/genpatches-4.19-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-11.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f8a3eee40da56b16549663dfce442e55
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.12
deleted file mode 100644
index 0916233f734e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.12
+++ /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 including the Gentoo patchset for the 4.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-13.base.tar.xz mirror://gentoo/genpatches-4.19-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-13.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2b62a4d699c69614d3df24ab130e7a42
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.13
deleted file mode 100644
index 41e17d7ca842..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.13
+++ /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 including the Gentoo patchset for the 4.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.13
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-14.base.tar.xz mirror://gentoo/genpatches-4.19-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-14.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=748dff53d3daf2addad04c4140c72d06
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.14
new file mode 100644
index 000000000000..d1ccb638d385
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.14
@@ -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.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-15.base.tar.xz mirror://gentoo/genpatches-4.19-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-15.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4f61b6807ea5b05a6763f4b5fcefdcc1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.8
deleted file mode 100644
index 900273ba0268..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.8
+++ /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 including the Gentoo patchset for the 4.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-9.base.tar.xz mirror://gentoo/genpatches-4.19-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-9.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=80fc755acf120ae01b4521900253cc5c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.9
deleted file mode 100644
index 371df6a96807..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.9
+++ /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 including the Gentoo patchset for the 4.19 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-10.base.tar.xz mirror://gentoo/genpatches-4.19-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-10.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1a42a1728a7ea73eb6a5a84245cfa507
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.0
index 54ec20bcad33..c826bad99063 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.20.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz mirror://gentoo/genpatches-4.20-1.base.tar.xz mirror://gentoo/genpatches-4.20-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-1.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=d099b7cb7c47d9d39ce0d2dbb557b742
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.1
new file mode 100644
index 000000000000..780e86ed4cc9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.20 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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.20.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz mirror://gentoo/genpatches-4.20-2.base.tar.xz mirror://gentoo/genpatches-4.20-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.20-2.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=66610594ee63ca46306cbbd073ab8b61
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.164 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.164
index fb9cbd701d6b..c37a3e956901 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.164
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.164
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.164
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-165.base.tar.xz mirror://gentoo/genpatches-4.4-165.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-165.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=5f4960c93766bb3008ded95ea6fcc248
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.165 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.165
index 08d1efa3f192..15715c44d218 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.165
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.165
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.165
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-166.base.tar.xz mirror://gentoo/genpatches-4.4-166.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-166.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=3a8c74db2f49df622bb3cc16130ad9f3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.166 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.166
index 204260643f0b..01754a0305dc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.166
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.166
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.166
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-167.base.tar.xz mirror://gentoo/genpatches-4.4-167.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-167.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=825f36447dc4c3a8362c8ecdc32d2a90
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.167 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.167
index aaad4c02c437..fdd23824aeec 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.167
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.167
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.167
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-168.base.tar.xz mirror://gentoo/genpatches-4.4-168.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-168.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2507f6458fe521305ab38f2f9039d53d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.168 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.168
index 12496c9a5c13..47c2ecf368ec 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.168
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.168
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.168
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-169.base.tar.xz mirror://gentoo/genpatches-4.4-169.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-169.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=e6c9c5b7a98d47555510a7d3866dc88f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.169 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.169
index e799c63148a8..d16b1ed1f8f4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.169
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.169
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.169
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-170.base.tar.xz mirror://gentoo/genpatches-4.4-170.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-170.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c989e54fd0348102331f0f449c07e44f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.140 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.140
index e0bffee4495e..f1537a613372 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.140
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.140
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.140
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-143.base.tar.xz mirror://gentoo/genpatches-4.9-143.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-143.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2c2261cd1951fb2f8c82b5fa5d5d990e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.143 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.143
index 137c5a289fa2..80dddf3132f7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.143
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.143
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.143
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-146.base.tar.xz mirror://gentoo/genpatches-4.9-146.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-146.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=a8b77315d6b97aa5b01b71bfdffae10c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.144 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.144
index 592413ccd918..24918725c64f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.144
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.144
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.144
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-147.base.tar.xz mirror://gentoo/genpatches-4.9-147.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-147.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=752508b448caa518a3159daa5036167b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.146 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.146
index 16a9e9fae12b..7ee667129213 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.146
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.146
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.146
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-149.base.tar.xz mirror://gentoo/genpatches-4.9-149.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-149.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=7bff5f8ef1fc361647b0c1b87266d9b8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.147 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.147
index 21cf55eba4f8..bcdf61f27a08 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.147
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.147
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.147
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-150.base.tar.xz mirror://gentoo/genpatches-4.9-150.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-150.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=acbee97143ec03d0024eebfd606ba4d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.148 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.148
index 305a02ac21df..9addde502752 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.148
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.148
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.148
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-151.base.tar.xz mirror://gentoo/genpatches-4.9-151.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-151.experimental.tar.xz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=97192c01363c78f13a781491c9ac9c89
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.149 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.149
new file mode 100644
index 000000000000..28502c7e24c2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.149
@@ -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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.149
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-152.base.tar.xz mirror://gentoo/genpatches-4.9-152.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-152.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=179305af22a89537055bb41cc636f54f
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc1
deleted file mode 100644
index 365d40fa7b6f..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc1
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc1/v4.19 -> patch-4.20-rc1.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc2
deleted file mode 100644
index 6de158dc9809..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc2
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc2/v4.19 -> patch-4.20-rc2.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc3
deleted file mode 100644
index 21ec1a32bdc6..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc3
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc3/v4.19 -> patch-4.20-rc3.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc4
deleted file mode 100644
index cbb2484f3c9e..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc4
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc4/v4.19 -> patch-4.20-rc4.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc5
deleted file mode 100644
index c63a3ebedc44..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc5
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc5/v4.19 -> patch-4.20-rc5.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc6
deleted file mode 100644
index 9f4ebdc0f745..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc6
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc6/v4.19 -> patch-4.20-rc6.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.20_rc7 b/metadata/md5-cache/sys-kernel/git-sources-4.20_rc7
deleted file mode 100644
index e60e7821cdb8..000000000000
--- a/metadata/md5-cache/sys-kernel/git-sources-4.20_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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20_rc7
-SRC_URI=https://git.kernel.org/torvalds/p/v4.20-rc7/v4.19 -> patch-4.20-rc7.patch mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=6a24f4c282b496baac397b9382409123
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.0_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.0_rc1
new file mode 100644
index 000000000000..5d6f48968561
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.0_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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0_rc1
+SRC_URI=https://git.kernel.org/torvalds/p/v5.0-rc1/v4.20 -> patch-5.0-rc1.patch mirror://kernel/linux/kernel/v5.x/linux-4.20.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=22e86ad51190b32656b78cd52b4fff7e
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20181218 b/metadata/md5-cache/sys-kernel/linux-firmware-20181218
index 16c599c84bf5..91321eb58473 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20181218
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20181218
@@ -3,11 +3,11 @@ DESCRIPTION=Linux firmware files
 EAPI=6
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 IUSE=savedconfig savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
 LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ freedist
 RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-0f22c8527439eaaf5c3fcf87b31c89445b6fa84d.tar.gz -> linux-firmware-20181218.tar.gz
 _eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=e2a76bfe56af45ad7eed1e8032fc94d8
+_md5_=cee38cbeeeb769875e1f85a938f72062
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 1e40b3124180..449df29af5c3 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c6dba421d6a7969c37cdc11fd00d5ab
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.13 b/metadata/md5-cache/sys-kernel/linux-headers-4.13
index d73bb0febfb6..bd7ddf4257e6 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.13
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.13.tar.xz mirror://gentoo/gentoo-headers-4.13-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fffe9f0f2e5c552ddfaf57035e9b69f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index f688f3fd7819..caeccf13cb3c 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-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-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=d90bffb5a198844872b457d5b7e198b6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=ea519b5c90c4e516ea16f4ecccf8ea74
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
index 74dd7c383db5..b0ee8de84ba7 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.15-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.15.tar.xz mirror://gentoo/gentoo-headers-4.15-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=de73a8185ad57767345e19a83f25589b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16 b/metadata/md5-cache/sys-kernel/linux-headers-4.16
index 6be6a45a36ff..6fb92dcdbd0a 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0dad6a0bcfcf795e0c8b816dac7bb60e
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2 b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
index f9e40500b1d8..baef9b55533f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16-r2
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.16-r1.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16-r1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=c3291fa0f169cfeed7015e3faa79157a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.17 b/metadata/md5-cache/sys-kernel/linux-headers-4.17
index 75e63adf6231..1b4daae1042b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.17
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.17
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.17.tar.xz mirror://gentoo/gentoo-headers-4.17-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=0856b9aa1b980303bcf4e438892f7b59
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.18 b/metadata/md5-cache/sys-kernel/linux-headers-4.18
index 6b21d8c1abbb..fc3f06c40027 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.18.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.18.tar.xz mirror://gentoo/gentoo-headers-4.18-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.18-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4bffdb63720ff27517495b7fd50287d6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.19 b/metadata/md5-cache/sys-kernel/linux-headers-4.19
index 901dd6119581..0423ecf4aa65 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.19.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.19.tar.xz mirror://gentoo/gentoo-headers-4.19-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.19-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4bffdb63720ff27517495b7fd50287d6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.20 b/metadata/md5-cache/sys-kernel/linux-headers-4.20
index 9e051b5e6e30..af6cea325b42 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.20
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.20.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.20.tar.xz mirror://gentoo/gentoo-headers-4.20-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.20-1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=4bffdb63720ff27517495b7fd50287d6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.4 b/metadata/md5-cache/sys-kernel/linux-headers-4.4
index d7f1b2e67b79..6292488acd7f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.4
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.4.tar.xz mirror://gentoo/gentoo-headers-4.4-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=903a29e10ec18ca449ba52903dfd65ea
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.9 b/metadata/md5-cache/sys-kernel/linux-headers-4.9
index 50a0bff4c57e..2616669de341 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.9.tar.xz mirror://gentoo/gentoo-headers-4.9-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a01e7c1bac3602cb2ebb2662db480e10
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.88 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
index 664f89734ba0..0a608319e221 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.88
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.88
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.88.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=32d27058ee81b41580e70337b53da0ce
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19 b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
index 4e3eb40df356..5dbb2d7cd28a 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.17.19
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.17.19
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.17.19.xz mirror://kernel/linux/kernel/v4.x/linux-4.17.tar.xz mirror://gentoo/mipsgit-4.17.0-20180705.diff.xz mirror://gentoo/mips-sources-4.17.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21a2581acc260da5444d50d70d20288c
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index 97bb751c7fc1..c74536be146d 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.20.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0aa621ac7763cb319a46536dfe80bda
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.167 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
index 346c63c85d47..3383b01c1b77 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.167
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.167
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.167.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f9f868564d228c89bf01883098b39d27
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.145 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
index 5e3ce8327cbb..fbe4d48fa0fb 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.145
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.145
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.145.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=86e9a9b67bcf2833987367769d669aa6
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
index b1515946f7fb..62283b30ddde 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.10_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.10_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.10.tar.xz https://pf.natalenko.name/sources/4.10/patch-4.10-pf3.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
index b2949cf4200c..16a83a0ded1c 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.11_p3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf3.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
index f0eba9fb5f00..0424d8d817ab 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.11_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.11_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz https://pf.natalenko.name/sources/4.11/patch-4.11-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
index e8d13a84b5ea..771c2904fbc1 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.13_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.13_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://pf.natalenko.name/sources/4.13/patch-4.13-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=12595c5b1f402c06ea9c0e382c6ef939
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
index a2d74fd62d26..72249cd63314 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.4_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://pf.natalenko.name/sources/4.4/patch-4.4-pf8.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4 b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
index d340b571275a..87e66cb4f75a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.5.tar.xz https://pf.natalenko.name/sources/4.5/patch-4.5-pf4.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8 b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
index 10be7b739430..f884d5ba1a7d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.8_p8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://pf.natalenko.name/sources/4.8/patch-4.8-pf8.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3d02954c3ede09216e82bc9de9f914bf
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
index bcc494b7100d..2732d33dce06 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.10.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
index 756c5f27d125..e8dcf5eb60b1 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.11.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.11.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
index f1b34be19509..81fd7dde940e 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.12.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
index cc7ac95fef0b..0a2f71d18d14 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.13.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.13.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
index bcf4b9d9652d..4b2366d46568 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
new file mode 100644
index 000000000000..0575d7843102
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.19.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Raspberry PI kernel sources
+EAPI=5
+HOMEPAGE=https://github.com/raspberrypi/linux
+IUSE=symlink build
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.9999
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2da249c494dca0e19c87641ef4855aa5
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
index 4d29d5f01809..c246504a7740 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
index d33bc9dcc6c0..3d8b08c07b58 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.9.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=42a7377bfd0899f7045885338ab11929
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
index 153bc136d34f..20afa58b7a51 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.123_p107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.123_p107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.123.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.123-rt107.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.123-rt107.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
index 218373d1e8b5..406405cf4c08 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.18.125_p108
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.125.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.125-rt108.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.125-rt108.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
new file mode 100644
index 000000000000..1b5f0d906eee
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
@@ -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 3.18 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/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=3.18.129_p110
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.129.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-3.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.129-rt110.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.129-rt110.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
index be67b92eae5f..8ffc4a37a275 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.71_p44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.71_p44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://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.71-rt44.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.71-rt44.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
index 575bb13f08fd..b374e64ce816 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.78_p47
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.14.78_p47
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.78.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://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.78-rt47.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.78-rt47.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49 b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
new file mode 100644
index 000000000000..b632de09135d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.14.87_p49
@@ -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/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.87_p49
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.87.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://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.87-rt49.patch.xz mirror://kernel/linux/kernel/projects/rt/4.14/older/patch-4.14.87-rt49.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12 b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
index bda007b14114..b9e73c9763ba 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.16.18_p12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.16.18_p12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.16.18.xz mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://kernel/linux/kernel/projects/rt/4.16/patch-4.16.18-rt12.patch.xz mirror://kernel/linux/kernel/projects/rt/4.16/older/patch-4.16.18-rt12.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9 b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
index 3bbf9a6b69ad..5bc79e776f07 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.18.16_p9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.18.16_p9
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.18.16.xz mirror://kernel/linux/kernel/v4.x/linux-4.18.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-4.18 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.18-gnu/deblob-check -> deblob-check-4.18 ) mirror://kernel/linux/kernel/projects/rt/4.18/patch-4.18.16-rt9.patch.xz mirror://kernel/linux/kernel/projects/rt/4.18/older/patch-4.18.16-rt9.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
new file mode 100644
index 000000000000..07c66bc3be5f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.10_p8
@@ -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.19 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/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.10_p8
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.10.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.10-rt8.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.10-rt8.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=d932aac0bada87f774a7d095025eb628
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4 b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
index cdaf5c44c94e..9aba09e398e0 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.19.5_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.19.5_p4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-4.19 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.19-gnu/deblob-check -> deblob-check-4.19 ) mirror://kernel/linux/kernel/projects/rt/4.19/patch-4.19.5-rt4.patch.xz mirror://kernel/linux/kernel/projects/rt/4.19/older/patch-4.19.5-rt4.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2e0c711bdf3a60eb764cc44a4bf16a69
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
index 0561c46acfdd..6361eb6b4a0a 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.162_p175
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.162_p175
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.162.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://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.162-rt175.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.162-rt175.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176 b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
index 099bc566c500..8ef874c730c4 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.4.164_p176
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.164_p176
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.164.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.4-gnu/deblob-4.4 https://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.164-rt176.patch.xz mirror://kernel/linux/kernel/projects/rt/4.4/older/patch-4.4.164-rt176.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
index adfdb77e98b2..93712ebfdc9d 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.115_p93
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.9.115_p93
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.115.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.115-rt93.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.115-rt93.patch.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=938063b624f47c634e309538dccbfd39
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125 b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
new file mode 100644
index 000000000000..8e12fd870e87
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-4.9.146_p125
@@ -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.9 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/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.146_p125
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.146.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-4.9 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://kernel/linux/kernel/projects/rt/4.9/patch-4.9.146-rt125.patch.xz mirror://kernel/linux/kernel/projects/rt/4.9/older/patch-4.9.146-rt125.patch.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=7dd4abac9eef41dfb3911ad066604b3d
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.12-r1 b/metadata/md5-cache/sys-kernel/spl-0.7.12-r1
new file mode 100644
index 000000000000..c78360f93df3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.12-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) >=app-portage/elt-patches-20170815
+DESCRIPTION=The Solaris Porting Layer provides many of the Solaris kernel APIs
+EAPI=5
+HOMEPAGE=https://zfsonlinux.org/
+IUSE=custom-cflags debug kernel_linux kernel_linux kernel_linux
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
+RESTRICT=debug? ( strip ) test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/spl-0.7.12.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92fe446b59b4f5f443914f168be15a7d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.62 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.62
index 74bbd3c4e1da..81999d2f85b3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.62
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.16.62
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=3.16.62
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.16.62.xz mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.90 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.90
deleted file mode 100644
index d5e86ccf875a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.90
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.90
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.90.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.92 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.92
new file mode 100644
index 000000000000..c9bdc1aca54c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.92
@@ -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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.92
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.92.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.12
deleted file mode 100644
index 6b4345d33f76..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.12
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.14
new file mode 100644
index 000000000000..112d4c37d253
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.14
@@ -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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.14
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.14.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.0
deleted file mode 100644
index c1d6bcb5cf04..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.0
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.20.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.1 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.1
new file mode 100644
index 000000000000..3d54f0d32586
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.20.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.20.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.20.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.169 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.169
index fe7918c2de62..5caa7afc7a95 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.169
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.169
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=4.4.169
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.169.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.147 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.147
deleted file mode 100644
index 3610bd96e5b4..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.147
+++ /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=6
-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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.147
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.147.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2ead754e2d13399315552b908a9adea0
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.149 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.149
new file mode 100644
index 000000000000..a10da0d4863c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.149
@@ -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=6
+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? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.149
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.149.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index 4cd2f238b2e9..d62bbe8c3a5a 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	97f96577827180eddaa76c6bce3470ee	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa63226fe1bc8f52b3b2b1fa23047775
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
index 28412b0c0538..de91feefdbea 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
index 91a760c78543..c937e3850d0e 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.15.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999 b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
index 1920da90d48f..ff4a3f912305 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-4.16.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.16.9999
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	bc2f2b5caeb6f89c673a8a4dced6511e	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=322112777abd81f4f8a030331bb728e1
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index b5f2166cc2ab..0a83903fc260 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/efivar-36 b/metadata/md5-cache/sys-libs/efivar-36
deleted file mode 100644
index d5320384b3d7..000000000000
--- a/metadata/md5-cache/sys-libs/efivar-36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
-DESCRIPTION=Tools and library to manipulate EFI variables
-EAPI=6
-HOMEPAGE=https://github.com/rhinstaller/efivar
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt
-SLOT=0/1
-SRC_URI=https://github.com/rhinstaller/efivar/releases/download/36/efivar-36.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74c9f766fc8d8a20595837b207796a15
diff --git a/metadata/md5-cache/sys-libs/efivar-37 b/metadata/md5-cache/sys-libs/efivar-37
index 3ffb39970522..dffd62c2a4aa 100644
--- a/metadata/md5-cache/sys-libs/efivar-37
+++ b/metadata/md5-cache/sys-libs/efivar-37
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
 DESCRIPTION=Tools and library to manipulate EFI variables
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/efivar
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt
 SLOT=0/1
 SRC_URI=https://github.com/rhinstaller/efivar/releases/download/37/efivar-37.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74c9f766fc8d8a20595837b207796a15
+_md5_=44b0669774a28cdf2af2e436dfa5fe96
diff --git a/metadata/md5-cache/sys-libs/glibc-2.28-r5 b/metadata/md5-cache/sys-libs/glibc-2.28-r5
new file mode 100644
index 000000000000..84b975641a44
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.28-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 sys-devel/bison !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 !<sys-devel/bison-2.7 !<sys-devel/make-4 doc? ( sys-apps/texinfo ) test? ( >=net-dns/libidn2-2.0.5 ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DESCRIPTION=GNU libc C library
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla
+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 ) >=net-dns/libidn2-2.0.5 sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RESTRICT=strip
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.28.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.28-patches-8.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=da0e9e7f376255ee13eaf1a852f3c43e
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.3.0 b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
index 75e298b60523..8dcbeb51cbf3 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.3.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5/7
 SRC_URI=mirror://kde/stable/kpmcore/3.3.0/src/kpmcore-3.3.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=96b2634efaf50528187c4e6aaf393689
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.8-r1 b/metadata/md5-cache/sys-libs/libselinux-2.8-r1
index c4505fcc3b03..81e400acb959 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.8-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-2.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby24 ruby_targets_ruby25 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_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 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[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(-)?] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libselinux-2.8.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=fe781d3aa3c3fae42f68dcb1f284c0e6
+_md5_=2340923615db0a6c8c4afd95de433d90
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.20-r1 b/metadata/md5-cache/sys-libs/musl-1.1.20-r1
index 44aeda90041d..3b1b95a9ea81 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.20-r1
+++ b/metadata/md5-cache/sys-libs/musl-1.1.20-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Light, fast and simple C library focused on standards-conformance an
 EAPI=6
 HOMEPAGE=http://www.musl-libc.org/
 IUSE=headers-only
-KEYWORDS=-* amd64 ~arm ~arm64 ~mips ~ppc x86
+KEYWORDS=-* amd64 arm ~arm64 ~mips ppc x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.1.20.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=90227bb74d3ac4ab7e5d78dd9ce7679a
+_md5_=7165184a49e288f7669d317dffa8a661
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.22 b/metadata/md5-cache/sys-libs/openipmi-2.0.22
index 354e3325b5e7..0b9448868a47 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.22
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.22
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library interface to IPMI
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl python tcl python_targets_python2_7
 KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.22.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76ef2af12ab22b54498e78db8deeb95c
+_md5_=75acad5d32ef932bd3fa266bcadccaca
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.25 b/metadata/md5-cache/sys-libs/openipmi-2.0.25
index a9723bd7aa2f..08d08c7f16ff 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.25
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.25
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library interface to IPMI
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl python tcl python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.25.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8f4bf11a32526770f64749dee66ce93
+_md5_=fa2191dc21f3863271efb92519741d0c
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.26 b/metadata/md5-cache/sys-libs/openipmi-2.0.26
index fc5e1da793b8..c5234c91a74b 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.26
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.26
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21 virtual/pkgconfig
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
 IUSE=crypt snmp perl python tcl python_targets_python2_7
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.26.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4457602561adc2c223fe4040b4bbe24d
+_md5_=f9231edae80dee1ef83e41d3889df204
diff --git a/metadata/md5-cache/sys-libs/readline-8.0 b/metadata/md5-cache/sys-libs/readline-8.0
new file mode 100644
index 000000000000..46d6fead4002
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:0=[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(-)?] virtual/pkgconfig
+DESCRIPTION=Another cute console display library
+EAPI=6
+HOMEPAGE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[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(-)?]
+SLOT=0/8
+SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aa54d632cf5434babab9b59f9c50b9b6
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2018g-r1 b/metadata/md5-cache/sys-libs/timezone-data-2018g-r1
deleted file mode 100644
index 5972bce8a30f..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2018g-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=6
-HOMEPAGE=https://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
-IUSE=nls leaps_timezone elibc_FreeBSD
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2018g.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2018g.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9d6342af458ada870646ff3c393fed4
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2018i b/metadata/md5-cache/sys-libs/timezone-data-2018i
new file mode 100644
index 000000000000..bcbe2808637d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/timezone-data-2018i
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=6
+HOMEPAGE=https://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
+IUSE=nls leaps_timezone elibc_FreeBSD
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2018i.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2018i.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b93a43e0d69963bb604cc95dda043354
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
index 3648f1a48b5a..6bca861ca7a0 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.31
@@ -3,11 +3,11 @@ DESCRIPTION=C library for developing embedded Linux systems
 EAPI=6
 HOMEPAGE=https://uclibc-ng.org/
 IUSE=debug hardened iconv ipv6 symlink-compat headers-only savedconfig
-KEYWORDS=-* ~amd64 ~arm ~mips ~ppc ~x86
+KEYWORDS=-* amd64 arm ~mips ppc x86
 LICENSE=LGPL-2
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d639088f86a70f3069ab0a140ea7a2bd
+_md5_=ea1be4db924289d542801bd010177298
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
index 88e18c4dc99f..b2611619751a 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -1,12 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=C library for developing embedded Linux systems
-EAPI=6
+EAPI=7
 HOMEPAGE=https://uclibc-ng.org/
 IUSE=debug hardened iconv ipv6 symlink-compat headers-only savedconfig
 LICENSE=LGPL-2
 RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
 RESTRICT=strip test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d639088f86a70f3069ab0a140ea7a2bd
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=97f73bb736099267381e3b954c2cbbc7
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index fdcf4cfd3e03..dcb03bd23812 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2 b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
index b19ecf96b9d4..8fea34f7049d 100644
--- a/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
+++ b/metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for LevelDB versions known to be compatible with Bitcoin Core 0.9+
 EAPI=5
 KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-RDEPEND=|| ( =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
+RDEPEND=|| ( =dev-libs/leveldb-1.20 =dev-libs/leveldb-1.18-r2 =dev-libs/leveldb-1.18 =dev-libs/leveldb-1.17 =dev-libs/leveldb-1.15.0-r1 )
 SLOT=0
-_md5_=1a8ec27f950ffdbde57e075e6fcca853
+_md5_=4bcc9e27d1ac3beb75514d153023bcfe
diff --git a/metadata/md5-cache/virtual/libmysqlclient-18 b/metadata/md5-cache/virtual/libmysqlclient-18
index 50103ad533fe..e02d0d44efdb 100644
--- a/metadata/md5-cache/virtual/libmysqlclient-18
+++ b/metadata/md5-cache/virtual/libmysqlclient-18
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for MySQL client libraries
 EAPI=5
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=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 ~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 ~x64-solaris ~x86-solaris
 RDEPEND=|| ( dev-db/mysql-connector-c:0/18[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(-)?] dev-db/mariadb:0/18[client-libs(+),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(-)?] dev-db/mysql:0/18[client-libs(+),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(-)?] dev-db/percona-server:0/18[client-libs(+),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(-)?] dev-db/mariadb-galera:0/18[client-libs(+),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(-)?] dev-db/mysql-cluster:0/18[client-libs(+),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(-)?] )
 SLOT=0/18
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd1b87a50572fb6eedbf713b264ff2ca
+_md5_=7ba6103c6cc39dc3de68e99479141666
diff --git a/metadata/md5-cache/virtual/man-0-r1 b/metadata/md5-cache/virtual/man-0-r1
index 710d26385da1..7afecea63e48 100644
--- a/metadata/md5-cache/virtual/man-0-r1
+++ b/metadata/md5-cache/virtual/man-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for man
-EAPI=5
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+EAPI=6
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RDEPEND=|| ( sys-apps/man-db sys-apps/man )
 SLOT=0
-_md5_=8dd970a8ffa94a4f984d5b8f642f04fd
+_md5_=74c57e0997fb16f6d44726b057f3efe7
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.240.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.240.0
index 517a0b17636f..e008d31138f7 100644
--- a/metadata/md5-cache/virtual/perl-Archive-Tar-2.240.0
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.240.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Archive-Tar
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Archive-Tar-2.240.0 ) dev-lang/perl:= !<perl-core/Archive-Tar-2.240.0 !>perl-core/Archive-Tar-2.240.0-r999
 SLOT=0
-_md5_=26b8ac5f9086751ae51723924ba0cd72
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.240.0 b/metadata/md5-cache/virtual/perl-B-Debug-1.240.0
index a1229a27553f..0e5187e0a8d1 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.240.0
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.240.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for B-Debug
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/B-Debug-1.240.0 ) dev-lang/perl:= !<perl-core/B-Debug-1.240.0 !>perl-core/B-Debug-1.240.0-r999
 SLOT=0
-_md5_=26b8ac5f9086751ae51723924ba0cd72
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.180.0 b/metadata/md5-cache/virtual/perl-CPAN-2.180.0
index c2518f4a332a..fb95a43c5552 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.180.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.180.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/CPAN-2.180.0 ) dev-lang/perl:= !<perl-core/CPAN-2.180.0 !>perl-core/CPAN-2.180.0-r999
 SLOT=0
-_md5_=1fa9fa59c48b64840864f1bf47e48d66
+_md5_=d42d40ba409c9ea28917832a592f75d1
diff --git a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r1 b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r1
index 8cb85d7189e2..d1ee39101c7f 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r1
+++ b/metadata/md5-cache/virtual/perl-CPAN-Meta-2.150.10-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN-Meta
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/CPAN-Meta-2.150.10 ) dev-lang/perl:= !<perl-core/CPAN-Meta-2.150.10 !>perl-core/CPAN-Meta-2.150.10-r999 >=virtual/perl-CPAN-Meta-YAML-0.11.0 >=virtual/perl-JSON-PP-2.271.30 >=virtual/perl-Parse-CPAN-Meta-1.441.400
 SLOT=0
-_md5_=b21ffad9b9a8f8f8aa7d7e4382d9af16
+_md5_=da3f31a6be4a5f4c55dedc54dad95d42
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.420.0 b/metadata/md5-cache/virtual/perl-Carp-1.420.0
index 4160671db1ac..976e23893841 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.420.0
+++ b/metadata/md5-cache/virtual/perl-Carp-1.420.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Carp-1.420.0 ) dev-lang/perl:= !<perl-core/Carp-1.420.0 !>perl-core/Carp-1.420.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.74.0-r1 b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.74.0-r1
index e8ef0ae2b8bb..bd00236367df 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.74.0-r1
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Bzip2-2.74.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Bzip2
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Compress-Raw-Bzip2-2.74.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Bzip2-2.74.0 !>perl-core/Compress-Raw-Bzip2-2.74.0-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.74.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.74.0
index 82bfd69567c0..1f306c1eff24 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.74.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.74.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Compress-Raw-Zlib-2.74.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.74.0 !>perl-core/Compress-Raw-Zlib-2.74.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-DB_File-1.840.0-r1 b/metadata/md5-cache/virtual/perl-DB_File-1.840.0-r1
index 239f281fd569..2b0d392f377b 100644
--- a/metadata/md5-cache/virtual/perl-DB_File-1.840.0-r1
+++ b/metadata/md5-cache/virtual/perl-DB_File-1.840.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for DB_File
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.28*[berkdb] =dev-lang/perl-5.26*[berkdb] ~perl-core/DB_File-1.840.0 ) dev-lang/perl:= !<perl-core/DB_File-1.840.0 !>perl-core/DB_File-1.840.0-r999
 SLOT=0
-_md5_=0aca96fc07699401386026f52521e4f8
+_md5_=cb508e1c64d8b556ee611c41f88d1954
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.167.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.167.0
index a256ce57ff0c..23c0009d399b 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.167.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.167.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Data-Dumper-2.167.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.167.0 !>perl-core/Data-Dumper-2.167.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.350.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.350.0
index ab5ce719235e..0507e771c301 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.350.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.350.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Devel-PPPort-3.350.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.350.0 !>perl-core/Devel-PPPort-3.350.0-r999
 SLOT=0
-_md5_=7393554dcbe4b83182077f4ea6c8a199
+_md5_=b8c49858e52970a29b02f0104a0814f5
diff --git a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0 b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0
index d48dd807f37d..c2b97ae8b1d8 100644
--- a/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0
+++ b/metadata/md5-cache/virtual/perl-Digest-MD5-2.550.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-MD5
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Digest-MD5-2.550.0 ) dev-lang/perl:= !<perl-core/Digest-MD5-2.550.0 !>perl-core/Digest-MD5-2.550.0-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-5.960.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-5.960.0
index 09d85f1390f5..746dff8dda33 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-5.960.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-5.960.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Digest-SHA-5.960.0 ) dev-lang/perl:= !<perl-core/Digest-SHA-5.960.0 !>perl-core/Digest-SHA-5.960.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.880.0 b/metadata/md5-cache/virtual/perl-Encode-2.880.0
index ae5ed07ee7aa..eb43dabdf033 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.880.0
+++ b/metadata/md5-cache/virtual/perl-Encode-2.880.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Encode-2.880.0 ) dev-lang/perl:= !<perl-core/Encode-2.880.0 !>perl-core/Encode-2.880.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.240.0 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.240.0
index d1aef58bf54c..9ddb667d7ac1 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.240.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.240.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/ExtUtils-MakeMaker-7.240.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.240.0 !>perl-core/ExtUtils-MakeMaker-7.240.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.340.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.340.0
index 6708ba47efe0..6b4b254adf7c 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.340.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.340.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/ExtUtils-ParseXS-3.340.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.340.0 !>perl-core/ExtUtils-ParseXS-3.340.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.670.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.670.0
index 6dce6483bb8d..9c601aebbfd8 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.670.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.670.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/File-Spec-3.670.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.670.0 !>perl-core/File-Spec-3.670.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Filter-Simple-0.930.0 b/metadata/md5-cache/virtual/perl-Filter-Simple-0.930.0
index 654585f9d2f9..adf8d19acad7 100644
--- a/metadata/md5-cache/virtual/perl-Filter-Simple-0.930.0
+++ b/metadata/md5-cache/virtual/perl-Filter-Simple-0.930.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for perl-core/Filter-Simple
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Filter-Simple-0.930.0 ) dev-lang/perl:= !<perl-core/Filter-Simple-0.930.0 !>perl-core/Filter-Simple-0.930.0-r999
 SLOT=0
-_md5_=63161b3fba01fb59daa5e7a9eba459d2
+_md5_=00c96f627ec423c3f4200e3e22243f3d
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.490.0 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.490.0
index 0fe52b65688f..e9a22c1b57ac 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.490.0
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.490.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Getopt-Long-2.490.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.490.0 !>perl-core/Getopt-Long-2.490.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1 b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1
index 245b857176d5..94307fd49cb1 100644
--- a/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1
+++ b/metadata/md5-cache/virtual/perl-HTTP-Tiny-0.70.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for HTTP-Tiny
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/HTTP-Tiny-0.70.0 ) dev-lang/perl:= !<perl-core/HTTP-Tiny-0.70.0 !>perl-core/HTTP-Tiny-0.70.0-r999
 SLOT=0
-_md5_=063a19b99fe6b6f247b601d8ae16fe00
+_md5_=59233125eb40ac9ec6fe7b71f5d181ea
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.420.0 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.420.0
index 11a166cbcc4c..777c900d16ee 100644
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.420.0
+++ b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.420.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for I18N-LangTags
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/I18N-LangTags-0.420.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.420.0 !>perl-core/I18N-LangTags-0.420.0-r999
 SLOT=0
-_md5_=957fbfa97331508972836abd9551d311
+_md5_=ec84f97973ceeb63f9f1fd098a482b37
diff --git a/metadata/md5-cache/virtual/perl-IO-1.380.0 b/metadata/md5-cache/virtual/perl-IO-1.380.0
index b6588d3269d8..99886c52a90a 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.380.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.380.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/IO-1.380.0 ) dev-lang/perl:= !<perl-core/IO-1.380.0 !>perl-core/IO-1.380.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-IO-Compress-2.74.0-r1 b/metadata/md5-cache/virtual/perl-IO-Compress-2.74.0-r1
index 093efae193bc..3f1efbc5d2c1 100644
--- a/metadata/md5-cache/virtual/perl-IO-Compress-2.74.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Compress-2.74.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Compress
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/IO-Compress-2.74.0 ) dev-lang/perl:= !<perl-core/IO-Compress-2.74.0 !>perl-core/IO-Compress-2.74.0-r999 >=virtual/perl-Compress-Raw-Zlib-2.74.0 >=virtual/perl-Compress-Raw-Bzip2-2.74.0
 SLOT=0
-_md5_=daed3edf22928d4e7732c33a2cd16bcc
+_md5_=9431d1259a6add38bd40a2b3d6235861
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.380.0 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.380.0
index 871c12c77c9a..c68effbdf498 100644
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.380.0
+++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.380.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Socket-IP
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/IO-Socket-IP-0.380.0 ) dev-lang/perl:= !<perl-core/IO-Socket-IP-0.380.0 !>perl-core/IO-Socket-IP-0.380.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.960.0 b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.960.0
index 1cb9bb54ce67..b4e8a92cd314 100644
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-0.960.0
+++ b/metadata/md5-cache/virtual/perl-IPC-Cmd-0.960.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IPC-Cmd
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/IPC-Cmd-0.960.0 ) dev-lang/perl:= !<perl-core/IPC-Cmd-0.960.0 !>perl-core/IPC-Cmd-0.960.0-r999
 SLOT=0
-_md5_=26b8ac5f9086751ae51723924ba0cd72
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.274.0.200_rc b/metadata/md5-cache/virtual/perl-JSON-PP-2.274.0.200_rc
index 9bf0a28d280f..4170d9519b7c 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.274.0.200_rc
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.274.0.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/JSON-PP-2.274.0.200_rc ) dev-lang/perl:= !<perl-core/JSON-PP-2.274.0.200_rc !>perl-core/JSON-PP-2.274.0.200_rc-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r6 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r6
index bf51f112fb25..04c6cc12bf22 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r6
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.260.100_rc-r6
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/Locale-Maketext-1.260.100_rc ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.260.100_rc !>perl-core/Locale-Maketext-1.260.100_rc-r999
 SLOT=0
-_md5_=8b6cf27929bba0ee56804b958a1d1da3
+_md5_=35439882fffc2b5aa87c1ebb68d5c492
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.280.0 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.280.0
index 50b8e778a182..6239cada38bc 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.280.0
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.280.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Locale-Maketext-1.280.0 ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.280.0 !>perl-core/Locale-Maketext-1.280.0-r999
 SLOT=0
-_md5_=7279306aa5f524e710611d746a70a388
+_md5_=1215d24bc241c8a29c38fa9e553e77ad
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0
index 7be541eb43d6..69df3b9d9667 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Locale-Maketext-1.290.0 ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.290.0 !>perl-core/Locale-Maketext-1.290.0-r999
 SLOT=0
-_md5_=6d663eb199a1df88727003eeff91420b
+_md5_=4e69827773f1fd2bcb4ffc7eb024c53c
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.806-r1 b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.806-r1
index 2ae74c140b80..57fe51bdc7a1 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.806-r1
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.806-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Math-BigInt-1.999.806 ) dev-lang/perl:= !<perl-core/Math-BigInt-1.999.806 !>perl-core/Math-BigInt-1.999.806-r999
 SLOT=0
-_md5_=85814dca5ec75ea783abd06b3201f113
+_md5_=b8c49858e52970a29b02f0104a0814f5
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.500 b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.500
index 4045d9f38e77..e24779251a8d 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.500
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.500
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt-FastCalc
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Math-BigInt-FastCalc-0.500.500 ) dev-lang/perl:= !<perl-core/Math-BigInt-FastCalc-0.500.500 !>perl-core/Math-BigInt-FastCalc-0.500.500-r999
 SLOT=0
-_md5_=85814dca5ec75ea783abd06b3201f113
+_md5_=b8c49858e52970a29b02f0104a0814f5
diff --git a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.100 b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.100
index 0221063ec1b3..e26aac7e4add 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.100
+++ b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.100
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigRat
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Math-BigRat-0.261.100 ) dev-lang/perl:= !<perl-core/Math-BigRat-0.261.100 !>perl-core/Math-BigRat-0.261.100-r999
 SLOT=0
-_md5_=85814dca5ec75ea783abd06b3201f113
+_md5_=b8c49858e52970a29b02f0104a0814f5
diff --git a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r1 b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r1
index 29736d8fbda0..10c6d09865a1 100644
--- a/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r1
+++ b/metadata/md5-cache/virtual/perl-Math-Complex-1.590.100-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-Complex
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Math-Complex-1.590.100 ) dev-lang/perl:= !<perl-core/Math-Complex-1.590.100 !>perl-core/Math-Complex-1.590.100-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.804.140 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.804.140
index 946031127f3f..434306461a6e 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.804.140
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.804.140
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26.2* =dev-lang/perl-5.24.4* ~perl-core/Module-CoreList-5.201.804.140 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.804.140 !>perl-core/Module-CoreList-5.201.804.140-r999
 SLOT=0
-_md5_=273a325af9cbda9c00158fb8d5fe702d
+_md5_=8d351fc608f9d172c4032a873441cdaf
diff --git a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r1 b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r1
index f0296672bdf8..5d65cd57ee3d 100644
--- a/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r1
+++ b/metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.680.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Load-Conditional
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Module-Load-Conditional-0.680.0 ) dev-lang/perl:= !<perl-core/Module-Load-Conditional-0.680.0 !>perl-core/Module-Load-Conditional-0.680.0-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.33-r1 b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.33-r1
index de78de7a377f..5dd4574ef3b2 100644
--- a/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.33-r1
+++ b/metadata/md5-cache/virtual/perl-Module-Metadata-1.0.33-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-Metadata
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Module-Metadata-1.0.33 ) dev-lang/perl:= !<perl-core/Module-Metadata-1.0.33 !>perl-core/Module-Metadata-1.0.33-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.550.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.550.0
index bf3c19f1503f..a231bd2d9635 100644
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.550.0
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.550.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Net-Ping
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Net-Ping-2.550.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.550.0 !>perl-core/Net-Ping-2.550.0-r999
 SLOT=0
-_md5_=a99c86067d73194b4420fe937363f5a7
+_md5_=eee8c2cdf3195e96178b5539b7c71600
diff --git a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-2.150.10-r1 b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-2.150.10-r1
index a81be0ca5d4e..e1e50fd554d2 100644
--- a/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-2.150.10-r1
+++ b/metadata/md5-cache/virtual/perl-Parse-CPAN-Meta-2.150.10-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Parse-CPAN-Meta
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Parse-CPAN-Meta-2.150.10 ) dev-lang/perl:= !<perl-core/Parse-CPAN-Meta-2.150.10 !>perl-core/Parse-CPAN-Meta-2.150.10-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Perl-OSType-1.10.0-r1 b/metadata/md5-cache/virtual/perl-Perl-OSType-1.10.0-r1
index 6c43e0fd8489..d76e75525447 100644
--- a/metadata/md5-cache/virtual/perl-Perl-OSType-1.10.0-r1
+++ b/metadata/md5-cache/virtual/perl-Perl-OSType-1.10.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Perl-OSType
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Perl-OSType-1.10.0 ) dev-lang/perl:= !<perl-core/Perl-OSType-1.10.0 !>perl-core/Perl-OSType-1.10.0-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r1 b/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r1
index 68c2325e79f4..6ab5d2c7ad32 100644
--- a/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r1
+++ b/metadata/md5-cache/virtual/perl-Pod-Simple-3.350.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Pod-Simple
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Pod-Simple-3.350.0 ) dev-lang/perl:= !<perl-core/Pod-Simple-3.350.0 !>perl-core/Pod-Simple-3.350.0-r999
 SLOT=0
-_md5_=93a0b0e3e5c9b740825306f97860ef6a
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Safe-2.400.0-r1 b/metadata/md5-cache/virtual/perl-Safe-2.400.0-r1
index c96a8c5d5750..eb62c0ad6282 100644
--- a/metadata/md5-cache/virtual/perl-Safe-2.400.0-r1
+++ b/metadata/md5-cache/virtual/perl-Safe-2.400.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Safe
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Safe-2.400.0 ) dev-lang/perl:= !<perl-core/Safe-2.400.0 !>perl-core/Safe-2.400.0-r999
 SLOT=0
-_md5_=a8865a609a17007810560196f4370949
+_md5_=3d51d441385a04150063163b0ecbc244
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.460.200_rc b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.460.200_rc
index ca21912153c8..6ef04583791b 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.460.200_rc
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.460.200_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Scalar-List-Utils-1.460.200_rc ) dev-lang/perl:= !<perl-core/Scalar-List-Utils-1.460.200_rc !>perl-core/Scalar-List-Utils-1.460.200_rc-r999
 SLOT=0
-_md5_=13b05ee646ac06eb9d4980227c66a01d
+_md5_=73f594f6ed99ea1ccf1727b807a8d5a7
diff --git a/metadata/md5-cache/virtual/perl-Storable-2.620.0 b/metadata/md5-cache/virtual/perl-Storable-2.620.0
index 65c7c6059cf7..cdff54d3262d 100644
--- a/metadata/md5-cache/virtual/perl-Storable-2.620.0
+++ b/metadata/md5-cache/virtual/perl-Storable-2.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Storable-2.620.0 ) dev-lang/perl:= !<perl-core/Storable-2.620.0 !>perl-core/Storable-2.620.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r1 b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r1
index 699143f72baf..9752ae8f3d8d 100644
--- a/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r1
+++ b/metadata/md5-cache/virtual/perl-Sys-Syslog-0.350.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Sys-Syslog
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Sys-Syslog-0.350.0 ) dev-lang/perl:= !<perl-core/Sys-Syslog-0.350.0 !>perl-core/Sys-Syslog-0.350.0-r999
 SLOT=0
-_md5_=93a0b0e3e5c9b740825306f97860ef6a
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r1 b/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r1
index caad582fca1a..b2e2c09da221 100644
--- a/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r1
+++ b/metadata/md5-cache/virtual/perl-Term-ANSIColor-4.60.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Term-ANSIColor
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Term-ANSIColor-4.60.0 ) dev-lang/perl:= !<perl-core/Term-ANSIColor-4.60.0 !>perl-core/Term-ANSIColor-4.60.0-r999
 SLOT=0
-_md5_=0abc0ac96d2e60b17bea83ae931add9b
+_md5_=1d21b53d86ed785e7ff0ddd4c681c47a
diff --git a/metadata/md5-cache/virtual/perl-Term-ReadLine-1.170.0-r1 b/metadata/md5-cache/virtual/perl-Term-ReadLine-1.170.0-r1
index 4af30e5e52a3..5d0f3b86a3de 100644
--- a/metadata/md5-cache/virtual/perl-Term-ReadLine-1.170.0-r1
+++ b/metadata/md5-cache/virtual/perl-Term-ReadLine-1.170.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Term-ReadLine
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26.2* ~perl-core/Term-ReadLine-1.170.0 ) dev-lang/perl:= !<perl-core/Term-ReadLine-1.170.0 !>perl-core/Term-ReadLine-1.170.0-r999
 SLOT=0
-_md5_=4e48a00b7e83ff8d6191d29aec3dcfd5
+_md5_=400d24ec2f24825ba4f2bfd806307f35
diff --git a/metadata/md5-cache/virtual/perl-Test-1.300.0 b/metadata/md5-cache/virtual/perl-Test-1.300.0
index 9d34b852e5ce..47d58b2cf044 100644
--- a/metadata/md5-cache/virtual/perl-Test-1.300.0
+++ b/metadata/md5-cache/virtual/perl-Test-1.300.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Test-1.300.0 ) dev-lang/perl:= !<perl-core/Test-1.300.0 !>perl-core/Test-1.300.0-r999
 SLOT=0
-_md5_=26b8ac5f9086751ae51723924ba0cd72
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.380.0 b/metadata/md5-cache/virtual/perl-Test-Harness-3.380.0
index 30565a3a2c9c..7a45f5191d77 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.380.0
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.380.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Test-Harness-3.380.0 ) dev-lang/perl:= !<perl-core/Test-Harness-3.380.0 !>perl-core/Test-Harness-3.380.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.73 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.73
index b805e75ffea9..92337fad32b6 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.73
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.73
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Test-Simple-1.302.73 ) dev-lang/perl:= !<perl-core/Test-Simple-1.302.73 !>perl-core/Test-Simple-1.302.73-r999
 SLOT=0
-_md5_=26b8ac5f9086751ae51723924ba0cd72
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Thread-Queue-3.120.0-r1 b/metadata/md5-cache/virtual/perl-Thread-Queue-3.120.0-r1
index d4ec548a1957..9d46ea1caa4c 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Queue-3.120.0-r1
+++ b/metadata/md5-cache/virtual/perl-Thread-Queue-3.120.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Queue
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Thread-Queue-3.120.0 ) dev-lang/perl:= !<perl-core/Thread-Queue-3.120.0 !>perl-core/Thread-Queue-3.120.0-r999
 SLOT=0
-_md5_=834fe62fe7601cb45067c904a2421a3d
+_md5_=77149c3d19aed71cc1c1fe22c82a66f1
diff --git a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r1 b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r1
index 11ad15e7cb7d..b0925d824f22 100644
--- a/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r1
+++ b/metadata/md5-cache/virtual/perl-Thread-Semaphore-2.130.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Thread-Semaphore
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Thread-Semaphore-2.130.0 ) dev-lang/perl:= !<perl-core/Thread-Semaphore-2.130.0 !>perl-core/Thread-Semaphore-2.130.0-r999
 SLOT=0
-_md5_=834fe62fe7601cb45067c904a2421a3d
+_md5_=77149c3d19aed71cc1c1fe22c82a66f1
diff --git a/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1 b/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
index 578a3ae7506d..a5182bb8fa12 100644
--- a/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
+++ b/metadata/md5-cache/virtual/perl-Time-Local-1.250.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Local
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/Time-Local-1.250.0 ) dev-lang/perl:= !<perl-core/Time-Local-1.250.0 !>perl-core/Time-Local-1.250.0-r999
 SLOT=0
-_md5_=93a0b0e3e5c9b740825306f97860ef6a
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.190.0-r1 b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.190.0-r1
index b870867962de..e5ccc41dd703 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.190.0-r1
+++ b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.190.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Collate
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/Unicode-Collate-1.190.0 ) dev-lang/perl:= !<perl-core/Unicode-Collate-1.190.0 !>perl-core/Unicode-Collate-1.190.0-r999
 SLOT=0
-_md5_=1887a481887ee9b39691a33c5d4b5c48
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0 b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
index bef0938c5de5..3185fe9c69c1 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
+++ b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Collate
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Unicode-Collate-1.250.0 ) dev-lang/perl:= !<perl-core/Unicode-Collate-1.250.0 !>perl-core/Unicode-Collate-1.250.0-r999
 SLOT=0
-_md5_=64f7c008c829c5f7ae8f165f5a074b00
+_md5_=a97671faae5fc912daa96caf56db12af
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.270.0 b/metadata/md5-cache/virtual/perl-XSLoader-0.270.0
index af5a2dc9639d..399f1f748aa8 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.270.0
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.270.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/XSLoader-0.270.0 ) dev-lang/perl:= !<perl-core/XSLoader-0.270.0 !>perl-core/XSLoader-0.270.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-bignum-0.470.0 b/metadata/md5-cache/virtual/perl-bignum-0.470.0
index a3998ec5131f..fcb3342f8464 100644
--- a/metadata/md5-cache/virtual/perl-bignum-0.470.0
+++ b/metadata/md5-cache/virtual/perl-bignum-0.470.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for bignum
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/bignum-0.470.0 ) dev-lang/perl:= !<perl-core/bignum-0.470.0 !>perl-core/bignum-0.470.0-r999
 SLOT=0
-_md5_=85814dca5ec75ea783abd06b3201f113
+_md5_=b8c49858e52970a29b02f0104a0814f5
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.100.0 b/metadata/md5-cache/virtual/perl-libnet-3.100.0
index 52b9c08233e9..938fdc4211a3 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.100.0
+++ b/metadata/md5-cache/virtual/perl-libnet-3.100.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/libnet-3.100.0 ) dev-lang/perl:= !<perl-core/libnet-3.100.0 !>perl-core/libnet-3.100.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-parent-0.236.0-r1 b/metadata/md5-cache/virtual/perl-parent-0.236.0-r1
index 8c6f266dc864..b683f27f5541 100644
--- a/metadata/md5-cache/virtual/perl-parent-0.236.0-r1
+++ b/metadata/md5-cache/virtual/perl-parent-0.236.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for parent
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/parent-0.236.0 ) dev-lang/perl:= !<perl-core/parent-0.236.0 !>perl-core/parent-0.236.0-r999
 SLOT=0
-_md5_=a1fb8519e04f1cb9c2a695fbc74e7864
+_md5_=007bf2d2f62bda3e1b16ac0dc4b4c2cc
diff --git a/metadata/md5-cache/virtual/perl-podlators-4.90.0 b/metadata/md5-cache/virtual/perl-podlators-4.90.0
index f2fc2995cd3d..b975de2391ab 100644
--- a/metadata/md5-cache/virtual/perl-podlators-4.90.0
+++ b/metadata/md5-cache/virtual/perl-podlators-4.90.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/podlators-4.90.0 ) dev-lang/perl:= !<perl-core/podlators-4.90.0 !>perl-core/podlators-4.90.0-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/perl-threads-2.150.0 b/metadata/md5-cache/virtual/perl-threads-2.150.0
index a40f2ce2f775..278a9e6080cc 100644
--- a/metadata/md5-cache/virtual/perl-threads-2.150.0
+++ b/metadata/md5-cache/virtual/perl-threads-2.150.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.26*[ithreads] ~perl-core/threads-2.150.0 ) dev-lang/perl:= !<perl-core/threads-2.150.0 !>perl-core/threads-2.150.0-r999
 SLOT=0
-_md5_=771a34e5c6e0cced2644cf43e61dd7d8
+_md5_=68b65c15cf28fb9d9f7900a9954e7576
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.560.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.560.0
index 5313566c30f2..727e73353f53 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.560.0
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.560.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/threads-shared-1.560.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.560.0 !>perl-core/threads-shared-1.560.0-r999
 SLOT=0
-_md5_=9a4fef3d178c6fc6cf16ca001a3b60b3
+_md5_=86e9dae36419deaeafcc3d551c98c115
diff --git a/metadata/md5-cache/virtual/perl-version-0.991.700 b/metadata/md5-cache/virtual/perl-version-0.991.700
index 955c3fcce196..6d605f353d93 100644
--- a/metadata/md5-cache/virtual/perl-version-0.991.700
+++ b/metadata/md5-cache/virtual/perl-version-0.991.700
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=6
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.26* ~perl-core/version-0.991.700 ) dev-lang/perl:= !<perl-core/version-0.991.700 !>perl-core/version-0.991.700-r999
 SLOT=0
-_md5_=7eb4ce80f2fb519c7e203512ad8998e3
+_md5_=ad8cb5828b7eeb5dc09de0d933267073
diff --git a/metadata/md5-cache/virtual/pypy-5.10.0 b/metadata/md5-cache/virtual/pypy-5.10.0
deleted file mode 100644
index ada99a7bd255..000000000000
--- a/metadata/md5-cache/virtual/pypy-5.10.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy Python implementation
-EAPI=6
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy-5.10.0:0/41[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy-bin-5.10.0:0/41[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/41
-_md5_=93e86a21f7871d0e943cb86a8aa8f082
diff --git a/metadata/md5-cache/virtual/pypy3-5.10.1 b/metadata/md5-cache/virtual/pypy3-5.10.1
deleted file mode 100644
index 80a2456ac469..000000000000
--- a/metadata/md5-cache/virtual/pypy3-5.10.1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A virtual for PyPy3 Python implementation
-EAPI=6
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=|| ( >=dev-python/pypy3-5.10.1:0/510[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?] >=dev-python/pypy3-bin-5.10.1:0/510[gdbm(-)?,sqlite?,tk?] )
-SLOT=0/510
-_md5_=924b50862164867fad8ad3b7cb7428b8
diff --git a/metadata/md5-cache/virtual/ruby-ssl-11 b/metadata/md5-cache/virtual/ruby-ssl-11
new file mode 100644
index 000000000000..bc7153130da6
--- /dev/null
+++ b/metadata/md5-cache/virtual/ruby-ssl-11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=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_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
+EAPI=6
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] ) 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_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=009e605e74f0053b684ee0d33361eeed
diff --git a/metadata/md5-cache/virtual/rubygems-11 b/metadata/md5-cache/virtual/rubygems-11
deleted file mode 100644
index d3f5aad232ce..000000000000
--- a/metadata/md5-cache/virtual/rubygems-11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_rbx? ( dev-lang/rubinius )
-DESCRIPTION=Virtual ebuild for rubygems
-EAPI=5
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_rbx
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_rbx? ( dev-lang/rubinius )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_rbx )
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e6b73a621113a8c1d6e3b0ef449098b2
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 247b4d29a2f4..58e190e42597 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.12.0 b/metadata/md5-cache/www-apache/mod_h2-1.12.0
new file mode 100644
index 000000000000..82c0ac5fffff
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.12.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.12.0/mod_http2-1.12.0.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.1 b/metadata/md5-cache/www-apache/passenger-6.0.1
new file mode 100644
index 000000000000..c0a537f06f58
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-6.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-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_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=6
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-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_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.1.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e1a26d3d81d81e3072f0a83b184ba24b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index cee89df9cc3d..5178eac9fa2d 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/drupal-8.6.5 b/metadata/md5-cache/www-apps/drupal-8.6.5
new file mode 100644
index 000000000000..ea35f07b9175
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.6.5
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.6.5.tar.gz
+_eclasses_=webapp	6ae2395d7f341093c36057cb4f69101a
+_md5_=daaf68e6aae38be5ba496d91b5d77ae6
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index f481b5ccf24f..320866175ada 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=config install postinst setup unpack
-DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Icinga Web 2 - Frontend for icinga2
 EAPI=6
 HOMEPAGE=http://www.icinga.org/
-IUSE=apache2 fpm ldap mysql nginx pdf postgres apache2
+IUSE=apache2 apache2-server fpm ldap mysql nginx pdf postgres apache2
 LICENSE=GPL-2
-RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=^^ ( apache2 nginx )
+RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ead648ce0e47780e4ff28b7abec006f
+_md5_=4528817bb49f8c7ad4501bfac1d61d46
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6462388bec71..594dc571fb10 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-71.0.3578.98 b/metadata/md5-cache/www-client/chromium-71.0.3578.98
index 76238b8e438a..9be1b96ea921 100644
--- a/metadata/md5-cache/www-client/chromium-71.0.3578.98
+++ b/metadata/md5-cache/www-client/chromium-71.0.3578.98
@@ -12,4 +12,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-71.0.3578.98.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=cca17bc8d74e12514f2dea5f57479f14
+_md5_=3374d36142a7aa4fd11747a59c33b578
diff --git a/metadata/md5-cache/www-client/chromium-72.0.3626.28-r1 b/metadata/md5-cache/www-client/chromium-72.0.3626.28-r1
index ce4fd22865d5..dafb650ad4fe 100644
--- a/metadata/md5-cache/www-client/chromium-72.0.3626.28-r1
+++ b/metadata/md5-cache/www-client/chromium-72.0.3626.28-r1
@@ -12,4 +12,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-72.0.3626.28.tar.xz https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes.patch.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d567c5f3ff5d9b92c9b56a9651a47cd6
+_md5_=2a3a35699d0604d293efa6db3ea62fad
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.2 b/metadata/md5-cache/www-client/epiphany-3.30.2
index 968bf656cb4b..46eb3dffca6a 100644
--- a/metadata/md5-cache/www-client/epiphany-3.30.2
+++ b/metadata/md5-cache/www-client/epiphany-3.30.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme !<media-plugins/gst-plugins-opus-1.14.4-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a5a9fc374a12375ebd24fd4262adef36
+_md5_=0b928cb03b03c23444ad2bbda047f081
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1 b/metadata/md5-cache/www-client/falkon-3.0.1
index f50d68c91a14..340f05d5e826 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.52.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=1c331b0be4ca319ce8dd3ee910d91d0d
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1-r1 b/metadata/md5-cache/www-client/falkon-3.0.1-r1
index 017c365563a7..882616156f58 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1-r1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwebchannel-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.52.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=4095114a2b6df8dcbe12d162df99f9ce
diff --git a/metadata/md5-cache/www-client/firefox-64.0.2 b/metadata/md5-cache/www-client/firefox-64.0.2
new file mode 100644
index 000000000000..fc2445763364
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-64.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.40.1 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.25.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.6.4 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils >=sys-devel/llvm-4.0.1 >=sys-devel/clang-4.0.1 clang? ( >=sys-devel/llvm-4.0.1[gold] >=sys-devel/lld-4.0.1 ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.28.0 >=virtual/rust-1.28.0 amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) >=sys-apps/sed-4 virtual/pkgconfig || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pulseaudio +screenshot selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx test wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.40.1 >=dev-libs/nspr-4.19 >=app-text/hunspell-1.5.4:* dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-60.2:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.25.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ach.xpi -> firefox-64.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/af.xpi -> firefox-64.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/an.xpi -> firefox-64.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ar.xpi -> firefox-64.0.2-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/as.xpi -> firefox-64.0.2-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ast.xpi -> firefox-64.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/az.xpi -> firefox-64.0.2-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/bg.xpi -> firefox-64.0.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/bn-BD.xpi -> firefox-64.0.2-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/bn-IN.xpi -> firefox-64.0.2-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/br.xpi -> firefox-64.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/bs.xpi -> firefox-64.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ca.xpi -> firefox-64.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/cak.xpi -> firefox-64.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/cs.xpi -> firefox-64.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/cy.xpi -> firefox-64.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/da.xpi -> firefox-64.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/de.xpi -> firefox-64.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/dsb.xpi -> firefox-64.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/el.xpi -> firefox-64.0.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/en-GB.xpi -> firefox-64.0.2-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/en-ZA.xpi -> firefox-64.0.2-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/eo.xpi -> firefox-64.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/es-AR.xpi -> firefox-64.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/es-CL.xpi -> firefox-64.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/es-ES.xpi -> firefox-64.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/es-MX.xpi -> firefox-64.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/et.xpi -> firefox-64.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/eu.xpi -> firefox-64.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/fa.xpi -> firefox-64.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ff.xpi -> firefox-64.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/fi.xpi -> firefox-64.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/fr.xpi -> firefox-64.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-64.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-64.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/gd.xpi -> firefox-64.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/gl.xpi -> firefox-64.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/gn.xpi -> firefox-64.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-64.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/he.xpi -> firefox-64.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-64.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/hr.xpi -> firefox-64.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/hsb.xpi -> firefox-64.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/hu.xpi -> firefox-64.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-64.0.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/id.xpi -> firefox-64.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/is.xpi -> firefox-64.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/it.xpi -> firefox-64.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ja.xpi -> firefox-64.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ka.xpi -> firefox-64.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/kab.xpi -> firefox-64.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/kk.xpi -> firefox-64.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/km.xpi -> firefox-64.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/kn.xpi -> firefox-64.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ko.xpi -> firefox-64.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/lij.xpi -> firefox-64.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/lt.xpi -> firefox-64.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/lv.xpi -> firefox-64.0.2-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/mai.xpi -> firefox-64.0.2-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/mk.xpi -> firefox-64.0.2-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ml.xpi -> firefox-64.0.2-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/mr.xpi -> firefox-64.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ms.xpi -> firefox-64.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-64.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/nl.xpi -> firefox-64.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-64.0.2-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/or.xpi -> firefox-64.0.2-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-64.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/pl.xpi -> firefox-64.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-64.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-64.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/rm.xpi -> firefox-64.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ro.xpi -> firefox-64.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ru.xpi -> firefox-64.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/si.xpi -> firefox-64.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/sk.xpi -> firefox-64.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/sl.xpi -> firefox-64.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/son.xpi -> firefox-64.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/sq.xpi -> firefox-64.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/sr.xpi -> firefox-64.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-64.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/ta.xpi -> firefox-64.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/te.xpi -> firefox-64.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/th.xpi -> firefox-64.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/tr.xpi -> firefox-64.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/uk.xpi -> firefox-64.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/uz.xpi -> firefox-64.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/vi.xpi -> firefox-64.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/xh.xpi -> firefox-64.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-64.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/64.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-64.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/64.0.2/source/firefox-64.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-64.0-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-64.0-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-64.0-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-64.0-patches-01.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozcoreconf-v6	1139e0e37e324d9066382d5f359f574a	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=035f1b7f2ddc5f1294cb68266ea48d47
diff --git a/metadata/md5-cache/www-client/firefox-bin-64.0 b/metadata/md5-cache/www-client/firefox-bin-64.0
deleted file mode 100644
index f2cc5385aa9c..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-64.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ach.xpi -> firefox-64.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/af.xpi -> firefox-64.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/an.xpi -> firefox-64.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ar.xpi -> firefox-64.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/as.xpi -> firefox-64.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ast.xpi -> firefox-64.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/az.xpi -> firefox-64.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/bg.xpi -> firefox-64.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/bn-BD.xpi -> firefox-64.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/bn-IN.xpi -> firefox-64.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/br.xpi -> firefox-64.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/bs.xpi -> firefox-64.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ca.xpi -> firefox-64.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/cs.xpi -> firefox-64.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/cy.xpi -> firefox-64.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/da.xpi -> firefox-64.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/de.xpi -> firefox-64.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/el.xpi -> firefox-64.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/en-GB.xpi -> firefox-64.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/en-ZA.xpi -> firefox-64.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/eo.xpi -> firefox-64.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/es-AR.xpi -> firefox-64.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/es-CL.xpi -> firefox-64.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/es-ES.xpi -> firefox-64.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/es-MX.xpi -> firefox-64.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/et.xpi -> firefox-64.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/eu.xpi -> firefox-64.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/fa.xpi -> firefox-64.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/fi.xpi -> firefox-64.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/fr.xpi -> firefox-64.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/fy-NL.xpi -> firefox-64.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ga-IE.xpi -> firefox-64.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/gd.xpi -> firefox-64.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/gl.xpi -> firefox-64.0-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/gu-IN.xpi -> firefox-64.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/he.xpi -> firefox-64.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/hi-IN.xpi -> firefox-64.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/hr.xpi -> firefox-64.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/hsb.xpi -> firefox-64.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/hu.xpi -> firefox-64.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/hy-AM.xpi -> firefox-64.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/id.xpi -> firefox-64.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/is.xpi -> firefox-64.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/it.xpi -> firefox-64.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ja.xpi -> firefox-64.0-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/kk.xpi -> firefox-64.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/km.xpi -> firefox-64.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/kn.xpi -> firefox-64.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ko.xpi -> firefox-64.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/lt.xpi -> firefox-64.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/lv.xpi -> firefox-64.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/mai.xpi -> firefox-64.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/mk.xpi -> firefox-64.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ml.xpi -> firefox-64.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/mr.xpi -> firefox-64.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ms.xpi -> firefox-64.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/nb-NO.xpi -> firefox-64.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/nl.xpi -> firefox-64.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/nn-NO.xpi -> firefox-64.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/or.xpi -> firefox-64.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/pa-IN.xpi -> firefox-64.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/pl.xpi -> firefox-64.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/pt-BR.xpi -> firefox-64.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/pt-PT.xpi -> firefox-64.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/rm.xpi -> firefox-64.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ro.xpi -> firefox-64.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ru.xpi -> firefox-64.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/si.xpi -> firefox-64.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/sk.xpi -> firefox-64.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/sl.xpi -> firefox-64.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/son.xpi -> firefox-64.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/sq.xpi -> firefox-64.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/sr.xpi -> firefox-64.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/sv-SE.xpi -> firefox-64.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/ta.xpi -> firefox-64.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/te.xpi -> firefox-64.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/th.xpi -> firefox-64.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/tr.xpi -> firefox-64.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/uk.xpi -> firefox-64.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/uz.xpi -> firefox-64.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/vi.xpi -> firefox-64.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/xh.xpi -> firefox-64.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/zh-CN.xpi -> firefox-64.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0/linux-i686/xpi/zh-TW.xpi -> firefox-64.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/64.0/linux-x86_64/en-US/firefox-64.0.tar.bz2 -> firefox-bin_x86_64-64.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/64.0/linux-i686/en-US/firefox-64.0.tar.bz2 -> firefox-bin_i686-64.0.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5cf775d818acd2f636ccd74d6807d3a9
diff --git a/metadata/md5-cache/www-client/firefox-bin-64.0.2 b/metadata/md5-cache/www-client/firefox-bin-64.0.2
new file mode 100644
index 000000000000..75e9319f4de4
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-64.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ach.xpi -> firefox-64.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/af.xpi -> firefox-64.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/an.xpi -> firefox-64.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ar.xpi -> firefox-64.0.2-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/as.xpi -> firefox-64.0.2-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ast.xpi -> firefox-64.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/az.xpi -> firefox-64.0.2-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/bg.xpi -> firefox-64.0.2-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/bn-BD.xpi -> firefox-64.0.2-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/bn-IN.xpi -> firefox-64.0.2-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/br.xpi -> firefox-64.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/bs.xpi -> firefox-64.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ca.xpi -> firefox-64.0.2-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/cs.xpi -> firefox-64.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/cy.xpi -> firefox-64.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/da.xpi -> firefox-64.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/de.xpi -> firefox-64.0.2-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/el.xpi -> firefox-64.0.2-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/en-GB.xpi -> firefox-64.0.2-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/en-ZA.xpi -> firefox-64.0.2-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/eo.xpi -> firefox-64.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/es-AR.xpi -> firefox-64.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/es-CL.xpi -> firefox-64.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/es-ES.xpi -> firefox-64.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/es-MX.xpi -> firefox-64.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/et.xpi -> firefox-64.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/eu.xpi -> firefox-64.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/fa.xpi -> firefox-64.0.2-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/fi.xpi -> firefox-64.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/fr.xpi -> firefox-64.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-64.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-64.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/gd.xpi -> firefox-64.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/gl.xpi -> firefox-64.0.2-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-64.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/he.xpi -> firefox-64.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-64.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/hr.xpi -> firefox-64.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/hsb.xpi -> firefox-64.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/hu.xpi -> firefox-64.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-64.0.2-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/id.xpi -> firefox-64.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/is.xpi -> firefox-64.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/it.xpi -> firefox-64.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ja.xpi -> firefox-64.0.2-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/kk.xpi -> firefox-64.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/km.xpi -> firefox-64.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/kn.xpi -> firefox-64.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ko.xpi -> firefox-64.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/lt.xpi -> firefox-64.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/lv.xpi -> firefox-64.0.2-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/mai.xpi -> firefox-64.0.2-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/mk.xpi -> firefox-64.0.2-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ml.xpi -> firefox-64.0.2-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/mr.xpi -> firefox-64.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ms.xpi -> firefox-64.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-64.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/nl.xpi -> firefox-64.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-64.0.2-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/or.xpi -> firefox-64.0.2-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-64.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/pl.xpi -> firefox-64.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-64.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-64.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/rm.xpi -> firefox-64.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ro.xpi -> firefox-64.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ru.xpi -> firefox-64.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/si.xpi -> firefox-64.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/sk.xpi -> firefox-64.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/sl.xpi -> firefox-64.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/son.xpi -> firefox-64.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/sq.xpi -> firefox-64.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/sr.xpi -> firefox-64.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-64.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/ta.xpi -> firefox-64.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/te.xpi -> firefox-64.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/th.xpi -> firefox-64.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/tr.xpi -> firefox-64.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/uk.xpi -> firefox-64.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/uz.xpi -> firefox-64.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/vi.xpi -> firefox-64.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/xh.xpi -> firefox-64.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-64.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//64.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-64.0.2-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/64.0.2/linux-x86_64/en-US/firefox-64.0.2.tar.bz2 -> firefox-bin_x86_64-64.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/64.0.2/linux-i686/en-US/firefox-64.0.2.tar.bz2 -> firefox-bin_i686-64.0.2.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	b2f01ad412baf81650c23fcf0975fa33	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=00a0b2f68a078825a5858e060ca9b162
diff --git a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98 b/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
index 8f83ed1e5b4c..36b9cff4d2a4 100644
--- a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
+++ b/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_71.0.3578.98-1_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=911752aed2d75da3bc1659e32001a9ce
+_md5_=6104cc386ab4b1682bb66c5962f8dd94
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.28 b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.28
deleted file mode 100644
index ad792f5305db..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.28
+++ /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=kernel_linux +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[X] >=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_72.0.3626.28-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=911752aed2d75da3bc1659e32001a9ce
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.53 b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.53
new file mode 100644
index 000000000000..471ab94fd6e8
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.53
@@ -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=kernel_linux +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[X] >=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_72.0.3626.53-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3642.0 b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3642.0
deleted file mode 100644
index 97dadf343011..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3642.0
+++ /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=kernel_linux +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[X] >=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_73.0.3642.0-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=911752aed2d75da3bc1659e32001a9ce
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3664.3 b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3664.3
new file mode 100644
index 000000000000..1bae618b660d
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3664.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=kernel_linux +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[X] >=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_73.0.3664.3-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/opera-57.0.3098.102 b/metadata/md5-cache/www-client/opera-57.0.3098.102
deleted file mode 100644
index e7e3ac0b0e03..000000000000
--- a/metadata/md5-cache/www-client/opera-57.0.3098.102
+++ /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=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +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=https://download1.operacdn.com/pub/opera/desktop/57.0.3098.102/linux/opera-stable_57.0.3098.102_amd64.deb https://download2.operacdn.com/pub/opera/desktop/57.0.3098.102/linux/opera-stable_57.0.3098.102_amd64.deb https://download3.operacdn.com/pub/opera/desktop/57.0.3098.102/linux/opera-stable_57.0.3098.102_amd64.deb https://download4.operacdn.com/pub/opera/desktop/57.0.3098.102/linux/opera-stable_57.0.3098.102_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-57.0.3098.106 b/metadata/md5-cache/www-client/opera-57.0.3098.106
deleted file mode 100644
index 3c5be02768fa..000000000000
--- a/metadata/md5-cache/www-client/opera-57.0.3098.106
+++ /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=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +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=https://download1.operacdn.com/pub/opera/desktop/57.0.3098.106/linux/opera-stable_57.0.3098.106_amd64.deb https://download2.operacdn.com/pub/opera/desktop/57.0.3098.106/linux/opera-stable_57.0.3098.106_amd64.deb https://download3.operacdn.com/pub/opera/desktop/57.0.3098.106/linux/opera-stable_57.0.3098.106_amd64.deb https://download4.operacdn.com/pub/opera/desktop/57.0.3098.106/linux/opera-stable_57.0.3098.106_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d273a0c88b520998ecc63bd54d7d475e
diff --git a/metadata/md5-cache/www-client/opera-57.0.3098.110 b/metadata/md5-cache/www-client/opera-57.0.3098.110
new file mode 100644
index 000000000000..362d97cfc2c6
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-57.0.3098.110
@@ -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=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +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=https://download1.operacdn.com/pub/opera/desktop/57.0.3098.110/linux/opera-stable_57.0.3098.110_amd64.deb https://download2.operacdn.com/pub/opera/desktop/57.0.3098.110/linux/opera-stable_57.0.3098.110_amd64.deb https://download3.operacdn.com/pub/opera/desktop/57.0.3098.110/linux/opera-stable_57.0.3098.110_amd64.deb https://download4.operacdn.com/pub/opera/desktop/57.0.3098.110/linux/opera-stable_57.0.3098.110_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eba038b7c78ffdc2e401b966a6f94363
diff --git a/metadata/md5-cache/www-client/opera-57.0.3098.116 b/metadata/md5-cache/www-client/opera-57.0.3098.116
new file mode 100644
index 000000000000..b12be8938a6b
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-57.0.3098.116
@@ -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=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +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=https://download1.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download2.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download3.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb https://download4.operacdn.com/pub/opera/desktop/57.0.3098.116/linux/opera-stable_57.0.3098.116_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=eba038b7c78ffdc2e401b966a6f94363
diff --git a/metadata/md5-cache/www-client/opera-beta-58.0.3135.26 b/metadata/md5-cache/www-client/opera-beta-58.0.3135.26
deleted file mode 100644
index a95261691260..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-58.0.3135.26
+++ /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=https://www.opera.com/
-IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-beta/58.0.3135.26/linux/opera-beta_58.0.3135.26_amd64.deb https://download2.operacdn.com/pub/opera-beta/58.0.3135.26/linux/opera-beta_58.0.3135.26_amd64.deb https://download3.operacdn.com/pub/opera-beta/58.0.3135.26/linux/opera-beta_58.0.3135.26_amd64.deb https://download4.operacdn.com/pub/opera-beta/58.0.3135.26/linux/opera-beta_58.0.3135.26_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-beta-58.0.3135.37 b/metadata/md5-cache/www-client/opera-beta-58.0.3135.37
new file mode 100644
index 000000000000..636a0a82cf0c
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-58.0.3135.37
@@ -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=https://www.opera.com/
+IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download2.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download3.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb https://download4.operacdn.com/pub/opera-beta/58.0.3135.37/linux/opera-beta_58.0.3135.37_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3167.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3167.0
deleted file mode 100644
index 6c05d820b127..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-59.0.3167.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=https://www.opera.com/
-IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/59.0.3167.0/linux/opera-developer_59.0.3167.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3167.0/linux/opera-developer_59.0.3167.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3167.0/linux/opera-developer_59.0.3167.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3167.0/linux/opera-developer_59.0.3167.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3173.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3173.0
deleted file mode 100644
index 1936a8b40da9..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-59.0.3173.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=https://www.opera.com/
-IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3173.0/linux/opera-developer_59.0.3173.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ea7d35380002c190fab8b56c8ce87871
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3187.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3187.0
new file mode 100644
index 000000000000..677b3d8b74ce
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-59.0.3187.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=https://www.opera.com/
+IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/59.0.3187.0/linux/opera-developer_59.0.3187.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3187.0/linux/opera-developer_59.0.3187.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3187.0/linux/opera-developer_59.0.3187.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3187.0/linux/opera-developer_59.0.3187.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/opera-developer-59.0.3192.0 b/metadata/md5-cache/www-client/opera-developer-59.0.3192.0
new file mode 100644
index 000000000000..52e68fd2c523
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-59.0.3192.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=https://www.opera.com/
+IUSE=kernel_linux +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? ( https://download1.operacdn.com/pub/opera-developer/59.0.3192.0/linux/opera-developer_59.0.3192.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/59.0.3192.0/linux/opera-developer_59.0.3192.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/59.0.3192.0/linux/opera-developer_59.0.3192.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/59.0.3192.0/linux/opera-developer_59.0.3192.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/otter-0.9.99.2 b/metadata/md5-cache/www-client/otter-0.9.99.2
deleted file mode 100644
index eb867b491ffb..000000000000
--- a/metadata/md5-cache/www-client/otter-0.9.99.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=6
-HOMEPAGE=http://otter-browser.org/
-IUSE=webengine +webkit spell
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 )
-REQUIRED_USE=|| ( webengine webkit )
-SLOT=0
-SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.99.2.tar.gz -> otter-0.9.99.2.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f5fd8d1d4ccf507346cd69f881dccb60
diff --git a/metadata/md5-cache/www-client/otter-1.0.01 b/metadata/md5-cache/www-client/otter-1.0.01
new file mode 100644
index 000000000000..2b2ea1d793a9
--- /dev/null
+++ b/metadata/md5-cache/www-client/otter-1.0.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
+EAPI=6
+HOMEPAGE=http://otter-browser.org/
+IUSE=webengine +webkit spell
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) webkit? ( dev-qt/qtwebkit:5 )
+REQUIRED_USE=|| ( webengine webkit )
+SLOT=0
+SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v1.0.01.tar.gz -> otter-1.0.01.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a140cce20a71d57603be0746fe8324c8
diff --git a/metadata/md5-cache/www-client/surfraw-2.3.0 b/metadata/md5-cache/www-client/surfraw-2.3.0
index af9d05b8a698..30302500c17c 100644
--- a/metadata/md5-cache/www-client/surfraw-2.3.0
+++ b/metadata/md5-cache/www-client/surfraw-2.3.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install postinst preinst
 DESCRIPTION=A fast unix command line interface to WWW
 EAPI=6
 HOMEPAGE=http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://surfraw.alioth.debian.org/dist/surfraw-2.3.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc17f90b4442f28b88a2e44b96853fab
+_md5_=97b9dfe6b3584c4a4f51404136519907
diff --git a/metadata/md5-cache/www-client/surfraw-99999 b/metadata/md5-cache/www-client/surfraw-99999
new file mode 100644
index 000000000000..35ad0e36a99a
--- /dev/null
+++ b/metadata/md5-cache/www-client/surfraw-99999
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare unpack
+DESCRIPTION=A fast unix command line interface to WWW
+EAPI=7
+HOMEPAGE=http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw
+LICENSE=public-domain
+RDEPEND=dev-lang/perl
+RESTRICT=test
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=778262c14b9e66efb793c8b73340559a
diff --git a/metadata/md5-cache/www-client/vivaldi-2.1.1337.51_p1-r1 b/metadata/md5-cache/www-client/vivaldi-2.1.1337.51_p1-r1
deleted file mode 100644
index 2ee4fc31b861..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.1.1337.51_p1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/libiconv >=sys-apps/sed-4
-DESCRIPTION=A browser for our friends
-EAPI=6
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +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/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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/stable/vivaldi-stable_2.1.1337.51-1_amd64.deb -> vivaldi-2.1.1337.51_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.1.1337.51-1_armhf.deb -> vivaldi-2.1.1337.51_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.1.1337.51-1_i386.deb -> vivaldi-2.1.1337.51_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=eb87adb31a0ad532c99cd48bfac05600
diff --git a/metadata/md5-cache/www-client/vivaldi-2.2.1388.34_p1 b/metadata/md5-cache/www-client/vivaldi-2.2.1388.34_p1
deleted file mode 100644
index b740e7735d11..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.2.1388.34_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 browser for our friends
-EAPI=6
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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/stable/vivaldi-stable_2.2.1388.34-1_amd64.deb -> vivaldi-2.2.1388.34_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.34-1_armhf.deb -> vivaldi-2.2.1388.34_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.34-1_i386.deb -> vivaldi-2.2.1388.34_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=895bfe307a404b56331b847d5fc46db0
diff --git a/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1 b/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
index e0bd9df87eeb..81fbe01e6949 100644
--- a/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
+++ b/metadata/md5-cache/www-client/vivaldi-2.2.1388.37_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=6
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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
+KEYWORDS=-* amd64 ~arm x86
 LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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]
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_amd64.deb -> vivaldi-2.2.1388.37_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_armhf.deb -> vivaldi-2.2.1388.37_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.2.1388.37-1_i386.deb -> vivaldi-2.2.1388.37_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=895bfe307a404b56331b847d5fc46db0
+_md5_=18196e51fa06eec0da4d76ccd0d8daee
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1400.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1400.4_p1
deleted file mode 100644
index aa4d01262bf0..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1400.4_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 browser for our friends
-EAPI=5
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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_2.3.1400.4-1_amd64.deb -> vivaldi-snapshot-2.3.1400.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1400.4-1_arm64.deb -> vivaldi-snapshot-2.3.1400.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1400.4-1_armhf.deb -> vivaldi-snapshot-2.3.1400.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1400.4-1_i386.deb -> vivaldi-snapshot-2.3.1400.4_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7aabfb0de07b9e271c8a338b481f0f09
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
index e55e8cbc3edb..6459b7d4dd26 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1401.7_p1
@@ -6,9 +6,9 @@ HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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]
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_amd64.deb -> vivaldi-snapshot-2.3.1401.7_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_arm64.deb -> vivaldi-snapshot-2.3.1401.7_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_armhf.deb -> vivaldi-snapshot-2.3.1401.7_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1401.7-1_i386.deb -> vivaldi-snapshot-2.3.1401.7_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7aabfb0de07b9e271c8a338b481f0f09
+_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1420.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1420.4_p1
new file mode 100644
index 000000000000..f5b8a27723c6
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.3.1420.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss 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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1420.4-1_amd64.deb -> vivaldi-snapshot-2.3.1420.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1420.4-1_arm64.deb -> vivaldi-snapshot-2.3.1420.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1420.4-1_armhf.deb -> vivaldi-snapshot-2.3.1420.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.3.1420.4-1_i386.deb -> vivaldi-snapshot-2.3.1420.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=43e4a0e477a804369bcec7cc8539d966
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 45b651cf34e3..1b8f7dc6bb0c 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/adobe-flash-32.0.0.101 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.101
deleted file mode 100644
index 5a4a969166e2..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.101
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=6
-HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
-IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 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=AdobeFlash-11.x
-RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/nspr[abi_x86_32(-)?,abi_x86_64(-)?,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/nss[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.4 x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !www-plugins/adobe-flash:0 )
-REQUIRED_USE=|| ( nsplugin ppapi )
-RESTRICT=strip mirror
-SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.101/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.101-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.101/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.101-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.101/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.101-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.101/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.101-ppapi.x86_64.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a38e8612a365f6d8b7dc193c9fcf2206
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.114 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.114
new file mode 100644
index 000000000000..5e901782d025
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.114
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=>=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Adobe Flash Player
+EAPI=6
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+IUSE=+nsplugin +ppapi abi_x86_32 abi_x86_64 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=AdobeFlash-11.x
+RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/nspr[abi_x86_32(-)?,abi_x86_64(-)?,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/nss[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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/glibc-2.4 x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !www-plugins/adobe-flash:0 )
+REQUIRED_USE=|| ( nsplugin ppapi )
+RESTRICT=strip mirror
+SLOT=22
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.114/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.114-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.114/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.114-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.114/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.114-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.114/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.114-ppapi.x86_64.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=2dc002aba745e63b5b6b261d94190f42
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
index b9f7ee43ef6d..ba97b15f2856 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
@@ -10,4 +10,4 @@ RESTRICT=bindist mirror strip
 SLOT=stable
 SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_71.0.3578.98-1_amd64.deb
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=d58b784292d2ea3658550689b4e7cbc7
+_md5_=963150373d6cf0defcd68312e710eea7
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.28_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.28_beta
deleted file mode 100644
index 1ab35c5f0c6e..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.28_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_72.0.3626.28-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.53_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.53_beta
new file mode 100644
index 000000000000..bd7ca98bdc71
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.53_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_72.0.3626.53-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3642.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3642.0_alpha
deleted file mode 100644
index 7155ea313406..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3642.0_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_73.0.3642.0-1_amd64.deb
-_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
-_md5_=f3a3562d16034ecff6c99838db35fbfa
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3664.3_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3664.3_alpha
new file mode 100644
index 000000000000..cd4bcf8cac42
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-73.0.3664.3_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<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_73.0.3664.3-1_amd64.deb
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	unpacker	ee2f5086cd7e7b747b061f58db14d89e
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index de1171261c08..d28c545123e0 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/lighttpd-1.4.52 b/metadata/md5-cache/www-servers/lighttpd-1.4.52
deleted file mode 100644
index b3c840e67fc9..000000000000
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.52
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
-DESCRIPTION=Lightweight high-performance web server
-EAPI=7
-HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
-IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
-REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
-SLOT=0
-SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.52.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d536063b0e5b50b81694cdf9973d5cda
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.52-r1 b/metadata/md5-cache/www-servers/lighttpd-1.4.52-r1
new file mode 100644
index 000000000000..7a72986c65a3
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.52-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=7
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
+REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.52.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=205c0dfd230728589c30f561ac9a080a
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.85 b/metadata/md5-cache/www-servers/tomcat-7.0.85
deleted file mode 100644
index 41ad0c393b45..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-7.0.85
+++ /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.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.85/src/apache-tomcat-7.0.85-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ebcd804443da7c6d709cee6d7eaa93d2
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.88 b/metadata/md5-cache/www-servers/tomcat-7.0.88
deleted file mode 100644
index 4b1aefa0863a..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-7.0.88
+++ /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.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=7
-SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.88/src/apache-tomcat-7.0.88-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=978ec7bbe4701efbbeb830fa9559e5fd
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.90 b/metadata/md5-cache/www-servers/tomcat-7.0.90
index 4a7ae58716af..aae185734ad2 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.90
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.90
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.90/src/apache-tomcat-7.0.90-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=978ec7bbe4701efbbeb830fa9559e5fd
+_md5_=e09e7c0cf31155a7dd47e98a7f788ad6
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.92 b/metadata/md5-cache/www-servers/tomcat-7.0.92
new file mode 100644
index 000000000000..2bfe293abc41
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.92
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<dev-java/tomcat-native-1.1.24 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.92/src/apache-tomcat-7.0.92-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=52a23c1ab5d53f257937af6e1ab88391
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.50 b/metadata/md5-cache/www-servers/tomcat-8.0.50
deleted file mode 100644
index dbdcf738bb92..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.0.50
+++ /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.50/src/apache-tomcat-8.0.50-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=87e4fd282a60c7f9a708a5616a170ac0
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.52 b/metadata/md5-cache/www-servers/tomcat-8.0.52
index d1131a545544..e863c5485602 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.52
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.52
@@ -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.52/src/apache-tomcat-8.0.52-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=26dc3b06c6a2ac760d180b0a1017b511
+_md5_=821a5f27092618af74828661f19b0429
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.30 b/metadata/md5-cache/www-servers/tomcat-8.5.30
deleted file mode 100644
index 2f626937fde1..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.30
+++ /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.30/src/apache-tomcat-8.5.30-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c74c310745e04e78a42fd699844574e0
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.31 b/metadata/md5-cache/www-servers/tomcat-8.5.31
index 8cb5e4755b20..1294858c1c9e 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.31
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.31
@@ -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.31/src/apache-tomcat-8.5.31-src.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4e34c06d98eab33c591e7357c9f90526
+_md5_=2b81730061474ef55efdbf4f8b260d96
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
index 104cc770abeb..f8b044bbb413 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.17.1-r1
@@ -1,14 +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:= ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_asyncio? ( virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool 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 ) )
+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:= ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_asyncio? ( virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool 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=6
 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 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 python_targets_python3_7 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~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:= ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_asyncio? ( virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) 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 ) )
+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:= ) 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_asyncio? ( virtual/python-greenlet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) python_gevent? ( >=dev-python/gevent-1.3.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) selinux? ( sec-policy/selinux-uwsgi ) uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool ) 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_targets_python3_7 ) ) python_asyncio? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) 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.17.1.tar.gz -> uwsgi-2.0.17.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b13045b127aab385141b1f8a84d35848
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0b1168fb8fb3d1129ace72c317aeb69d
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index abaa280d8383..3e68784cbe1b 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/copyq-3.5.0 b/metadata/md5-cache/x11-apps/copyq-3.5.0
deleted file mode 100644
index a6148263a726..000000000000
--- a/metadata/md5-cache/x11-apps/copyq-3.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXtst webkit? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Clipboard manager with advanced features
-EAPI=6
-HOMEPAGE=https://github.com/hluk/CopyQ
-IUSE=test webkit
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXtst webkit? ( dev-qt/qtwebkit:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hluk/CopyQ/archive/v3.5.0.tar.gz -> CopyQ-3.5.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9605cbc6dc1390ce238a5b79c59c84e5
diff --git a/metadata/md5-cache/x11-apps/copyq-3.7.2 b/metadata/md5-cache/x11-apps/copyq-3.7.2
new file mode 100644
index 000000000000..50b4317c302c
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/copyq-3.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXtst webkit? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Clipboard manager with advanced features
+EAPI=6
+HOMEPAGE=https://github.com/hluk/CopyQ
+IUSE=test webkit
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXtst webkit? ( dev-qt/qtwebkit:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hluk/CopyQ/archive/v3.7.2.tar.gz -> CopyQ-3.7.2.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=00a75342170a1fb682827cd9fc7a5608
diff --git a/metadata/md5-cache/x11-apps/xauth-1.0.10 b/metadata/md5-cache/x11-apps/xauth-1.0.10
index 36b5c80dc843..955884d6a604 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.0.10
+++ b/metadata/md5-cache/x11-apps/xauth-1.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=X authority file utility
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
 IUSE=ipv6 test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xauth-1.0.10.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
-_md5_=d2ac11d46089c23a12b6bdab10fa0f6c
+_md5_=24c051d5370979301edb1909ad9223f3
diff --git a/metadata/md5-cache/x11-apps/xcursorgen-1.0.7 b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7
new file mode 100644
index 000000000000..53a9bcdb5373
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xcursorgen-1.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=create an X cursor file from a collection of PNG images
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXcursor media-libs/libpng:0=
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xcursorgen-1.0.7.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	3177e7a1a6d7ed77cd228f01de48336b
+_md5_=9923fb4f6ca4df8e62cb73186381c18f
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index d9ced348a6ff..6a1ccc1e281c 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index c7c20f3d6b5c..b295e4416e68 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/meson-0.45.1 >=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 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<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/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
 _eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=23e50629f5f20366be27a5b443f6331f
+_md5_=b475b687a71dfed3b7b7dd287dd683e4
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index a95f7c99e166..f2c9e431a561 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
new file mode 100644
index 000000000000..cbf2c453b93a
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~amd64-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=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/libvdpau-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-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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/410
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/410.93/NVIDIA-FreeBSD-x86_64-410.93.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/410.93/NVIDIA-Linux-x86_64-410.93.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.93.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cf723d1caf0fa8504cdadffd3b76063a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.18 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.18
deleted file mode 100644
index e58674b63504..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.18
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~amd64-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=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/libvdpau-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-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(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/415
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.18/NVIDIA-FreeBSD-x86_64-415.18.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.18/NVIDIA-Linux-x86_64-415.18.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.18.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2594b487d2771c792b34b276681f662e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.23 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.23
deleted file mode 100644
index feca00ca7f49..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~amd64-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=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/libvdpau-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-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(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=bindist mirror
-SLOT=0/415
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.23/NVIDIA-FreeBSD-x86_64-415.23.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.23/NVIDIA-Linux-x86_64-415.23.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.23.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3564a3309ce544a61f4e20f2b43043ae
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
index 3defdc27c657..f20cca00c5b7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
 HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
 IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64 ~amd64-fbsd
+KEYWORDS=-* amd64 ~amd64-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=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/libvdpau-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-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(-)?] ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/415
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.25/NVIDIA-FreeBSD-x86_64-415.25.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.25/NVIDIA-Linux-x86_64-415.25.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.25.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3564a3309ce544a61f4e20f2b43043ae
+_md5_=3d1c17116e86345e10ac76651dfa4caf
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index d6135bd0c0f8..8ade0bd387ab 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/gtk+-2.24.31-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
deleted file mode 100644
index a04ad1d8266c..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.31-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.10.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(-)?] >=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(-)?] >=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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=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/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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXrandr-1.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.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(-)?] >=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(-)?] !aqua? ( x11-base/xorg-proto ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x86_64 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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.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(-)?] >=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(-)?] >=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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=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/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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXrandr-1.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.31 !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
-REQUIRED_USE=xinerama? ( !aqua )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.31.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=49ec40f07f01f5eddfd068039711e133
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32 b/metadata/md5-cache/x11-libs/gtk+-2.24.32
deleted file mode 100644
index 0fb74836ecd9..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.10.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(-)?] >=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(-)?] >=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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=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/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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXrandr-1.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.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(-)?] >=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(-)?] !aqua? ( x11-base/xorg-proto ) test? ( x11-themes/hicolor-icon-theme media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x86_64 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
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.10.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(-)?] >=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(-)?] >=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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=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/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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXrandr-1.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.32 !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
-REQUIRED_USE=xinerama? ( !aqua )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f60ff2e4e1ce83b3e8e11d264d00bada
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
index b310ea45de41..cb809bc26808 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x86_64 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
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.10.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(-)?] >=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(-)?] >=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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=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/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/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/libXrandr-1.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(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.32 !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset-r1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d9b5ddb940945ab3115fa4d4ef952ff8
+_md5_=c7f5007f6ddb37761e5a7a0060235789
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.19 b/metadata/md5-cache/x11-libs/gtk+-3.22.19
deleted file mode 100644
index 0a675e1d67d7..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.19
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.0[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.37.3[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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.9 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19.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(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,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-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.0[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.37.3[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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.9 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.19.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=88304e72938372b4f6631bdb353da10c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.30 b/metadata/md5-cache/x11-libs/gtk+-3.22.30
deleted file mode 100644
index be980fbc93a4..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.30
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.0[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.37.3[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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19.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(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,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-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.0[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.37.3[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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.30.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e98e6d756d5b5b75955dbec4e6815ccb
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.1 b/metadata/md5-cache/x11-libs/gtk+-3.24.1
index 88c71a16c94d..d46c29d0aa3e 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.1
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.4[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.41.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/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.19.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(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.4[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.41.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/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.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(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama 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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,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-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[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(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,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/libepoxy-1.4[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[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(-)?] >=x11-libs/pango-1.41.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/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-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(-)?] >=dev-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,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.12 media-libs/mesa[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(-)?] >=x11-libs/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/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(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.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(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,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-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=75484ffd9431b8468662e5dc79851506
+_md5_=ae6b162191a79a28ba3f65316cf3405f
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.4 b/metadata/md5-cache/x11-libs/qscintilla-2.10.4
deleted file mode 100644
index e37575fe74d5..000000000000
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
-EAPI=6
-HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=designer doc
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
-SLOT=0/13
-SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8086688c02566b2e53c77a511dc1c3f
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.8 b/metadata/md5-cache/x11-libs/qscintilla-2.10.8
index 5979a439ba20..bf7e84c16bf5 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.8
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.8
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
 EAPI=7
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc
-KEYWORDS=~amd64 ~arm ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/13
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.8.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=0c865b52d6326b7223fff365a3ee9814
+_md5_=236d1927b927e3281ed7b75f64cc93c8
diff --git a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3 b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3
index 9d951d153dc1..54e11758c0e0 100644
--- a/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3
+++ b/metadata/md5-cache/x11-libs/spread-sheet-widget-0.3
@@ -3,9 +3,9 @@ DEPEND=x11-libs/gtk+:3
 DESCRIPTION=GNU Spread Sheet Widget
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/ssw/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnu-alpha/ssw/spread-sheet-widget-0.3.tar.gz
-_md5_=f4b481c3aea056838882c8790cda7371
+_md5_=7d481b346d1622425f6896f28b1bfef9
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
index 437053526571..b8e6d3c0da58 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit
 EAPI=6
 HOMEPAGE=https://wxwidgets.org/
 IUSE=+X aqua doc debug gstreamer libnotify opengl sdl tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 PDEPEND=>=app-eselect/eselect-wxwidgets-20131230
 RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,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/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,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? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf[abi_x86_32(-)?,abi_x86_64(-)?,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/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gstreamer? ( media-libs/gstreamer: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.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) ) aqua? ( x11-libs/gtk+:2[aqua=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) )
 SLOT=3.0
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.4/wxWidgets-3.0.4-docs-html.tar.bz2 )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=02fe0445fa9a2eb58777e13e62ce87e4
+_md5_=ecd7f128dd984b52279af8a99ea2efe2
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4ba6470600bd..14dfcdf43579 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/kronometer-2.2.1 b/metadata/md5-cache/x11-misc/kronometer-2.2.1
index ba31b4a1eb01..ca4a53bedadc 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.1
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=dev-qt/qtdbus-5.9.3:5 >=dev-qt/qtgui-5.9.3:5 >=dev-qt/qtwidgets-5.9.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.1/src/kronometer-2.2.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=7df043a82831534ad3fe2639a0efa3e8
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
new file mode 100644
index 000000000000..368539bf68b9
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A background browser and setter for X
+EAPI=6
+HOMEPAGE=https://github.com/l3ib/nitrogen
+IUSE=nls xinerama
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=https://github.com/l3ib/nitrogen/releases/download/1.6.1/nitrogen-1.6.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6d664973ca7f1ca1116e5ff9b213d498
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.2 b/metadata/md5-cache/x11-misc/rofi-1.5.2
new file mode 100644
index 000000000000..93cbe4d7fa19
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=A window switcher, run dialog and dmenu replacement
+EAPI=7
+HOMEPAGE=https://github.com/DaveDavenport/rofi/
+IUSE=test windowmode
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+SLOT=0
+SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.2/rofi-1.5.2.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4b74f8a5198f0eb7003dc2fda042e01d
diff --git a/metadata/md5-cache/x11-misc/rofi-99999 b/metadata/md5-cache/x11-misc/rofi-99999
new file mode 100644
index 000000000000..b156e2822af4
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rofi-99999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure prepare unpack
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=A window switcher, run dialog and dmenu replacement
+EAPI=7
+HOMEPAGE=https://github.com/DaveDavenport/rofi/
+IUSE=test windowmode
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=140adcc3e59329d7a7bdd4335ac3bd99
diff --git a/metadata/md5-cache/x11-misc/synergy-1.9.1 b/metadata/md5-cache/x11-misc/synergy-1.9.1
index 72c043063f14..4fd0da6ccbe8 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.9.1
+++ b/metadata/md5-cache/x11-misc/synergy-1.9.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=!libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl ) 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 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) 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 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
 DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple computers
 EAPI=6
 HOMEPAGE=https://symless.com/synergy https://github.com/symless/synergy-core
 IUSE=libressl qt5
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:* ) libressl? ( dev-libs/libressl ) 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 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) qt5? ( !x11-misc/qsynergy )
+RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) 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 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-dns/avahi[mdnsresponder-compat] ) qt5? ( !x11-misc/qsynergy )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.9.1-stable.tar.gz -> synergy-1.9.1.tar.gz https://dev.gentoo.org/~jer/synergy.png
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=124336211558535c66edd51d262ca0c1
+_md5_=cfa994197f70103ada67189c247a6c4b
diff --git a/metadata/md5-cache/x11-misc/synergy-2.0.0 b/metadata/md5-cache/x11-misc/synergy-2.0.0
index 7a73d1e4ac36..c3d14ad34444 100644
--- a/metadata/md5-cache/x11-misc/synergy-2.0.0
+++ b/metadata/md5-cache/x11-misc/synergy-2.0.0
@@ -1,13 +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-base/xorg-proto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+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-base/xorg-proto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
 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-core
 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 )
+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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=68356f8d4d5c884b1aeca2f08914c87f
+_md5_=ef22fee11dce4a1173bdb83fa1faa292
diff --git a/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5 b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5
new file mode 100644
index 000000000000..4626ccb83ab8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/unclutter-xfixes-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile
+DEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter app-text/asciidoc virtual/pkgconfig
+DESCRIPTION=A rewrite of unclutter using the x11-xfixes extension
+EAPI=7
+HOMEPAGE=https://github.com/Airblader/unclutter-xfixes
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libev x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi !x11-misc/unclutter
+SLOT=0
+SRC_URI=https://github.com/Airblader/unclutter-xfixes/archive/v1.5.tar.gz -> unclutter-xfixes-1.5.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=1f709aa7015b9253f736585f8ad3d080
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1
new file mode 100644
index 000000000000..882bc13a7cf4
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
+EAPI=6
+HOMEPAGE=https://www.virtualgl.org/
+IUSE=libressl 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
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/virtualgl/files/2.5.2/VirtualGL-2.5.2.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cf36e635888fb012c85ee5c0fca078f6
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.1
new file mode 100644
index 000000000000..3584a07429d5
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
+EAPI=6
+HOMEPAGE=https://www.virtualgl.org/
+IUSE=libressl 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
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/virtualgl/2.6.1/VirtualGL-2.6.1.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd281c7059d7200e06edbea414d4ede3
diff --git a/metadata/md5-cache/x11-misc/virtualgl-9999 b/metadata/md5-cache/x11-misc/virtualgl-9999
new file mode 100644
index 000000000000..3c7ec5ce9abb
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/virtualgl-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
+EAPI=6
+HOMEPAGE=https://www.virtualgl.org/
+IUSE=libressl 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
+LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,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/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fd281c7059d7200e06edbea414d4ede3
diff --git a/metadata/md5-cache/x11-misc/xpad-5.2.0 b/metadata/md5-cache/x11-misc/xpad-5.2.0
deleted file mode 100644
index f5c2fe5ecc7b..000000000000
--- a/metadata/md5-cache/x11-misc/xpad-5.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a sticky note application for jotting down things to remember
-EAPI=6
-HOMEPAGE=https://launchpad.net/xpad
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango
-SLOT=0
-SRC_URI=https://launchpad.net/xpad/trunk/5.2.0/+download/xpad-5.2.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8a5be11ea9575628d3ab5092e727a107
diff --git a/metadata/md5-cache/x11-misc/xpad-5.4.0 b/metadata/md5-cache/x11-misc/xpad-5.4.0
new file mode 100644
index 000000000000..fb967fc16d47
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xpad-5.4.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango >=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=a sticky note application for jotting down things to remember
+EAPI=7
+HOMEPAGE=https://launchpad.net/xpad
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.56:2 app-accessibility/at-spi2-atk dev-libs/atk sys-devel/gettext x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/gtksourceview:3.0 x11-libs/libICE x11-libs/libSM x11-libs/pango
+SLOT=0
+SRC_URI=https://launchpad.net/xpad/trunk/5.4.0/+download/xpad-5.4.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=588fd2b145c38a828a94de7ed740bd22
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 25f3c0800200..5aa8834c6d11 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.2.3 b/metadata/md5-cache/x11-terms/alacritty-0.2.3
index e89f86da4311..8ca10cf4386e 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.2.3
+++ b/metadata/md5-cache/x11-terms/alacritty-0.2.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 sys-libs/zlib x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr x11-misc/xclip virtual/opengl wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/jwilm/alacritty/archive/v0.2.3.tar.gz -> alacritty-0.2.3.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/alacritty.png https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/advapi32-sys/0.2.0/download -> advapi32-sys-0.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/andrew/0.1.4/download -> andrew-0.1.4.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.1.1/download -> approx-0.1.1.crate https://crates.io/api/v1/crates/approx/0.3.0/download -> approx-0.3.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arraydeque/0.4.3/download -> arraydeque-0.4.3.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bindgen/0.33.2/download -> bindgen-0.33.2.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/bytes/0.4.10/download -> bytes-0.4.10.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.6/download -> bzip2-sys-0.1.6.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cexpr/0.2.3/download -> cexpr-0.2.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cgl/0.2.3/download -> cgl-0.2.3.crate https://crates.io/api/v1/crates/cgmath/0.16.1/download -> cgmath-0.16.1.crate https://crates.io/api/v1/crates/clang-sys/0.22.0/download -> clang-sys-0.22.0.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/clipboard/0.4.6/download -> clipboard-0.4.6.crate https://crates.io/api/v1/crates/clipboard-win/2.1.2/download -> clipboard-win-2.1.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.35/download -> cmake-0.1.35.crate https://crates.io/api/v1/crates/cocoa/0.18.4/download -> cocoa-0.18.4.crate https://crates.io/api/v1/crates/color_quant/1.0.1/download -> color_quant-1.0.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/copypasta/0.0.1/download -> copypasta-0.0.1.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation/0.6.3/download -> core-foundation-0.6.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-graphics/0.13.0/download -> core-graphics-0.13.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-text/13.1.1/download -> core-text-13.1.1.crate https://crates.io/api/v1/crates/core-text/9.2.0/download -> core-text-9.2.0.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.6.2/download -> crossbeam-deque-0.6.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.1/download -> crossbeam-epoch-0.6.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.0/download -> crossbeam-utils-0.6.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.1/download -> crossbeam-utils-0.6.1.crate https://crates.io/api/v1/crates/deflate/0.7.19/download -> deflate-0.7.19.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.0.3/download -> downcast-rs-1.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate https://crates.io/api/v1/crates/either/1.5.0/download -> either-1.5.0.crate https://crates.io/api/v1/crates/embed-resource/1.1.4/download -> embed-resource-1.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.10/download -> encoding_rs-0.8.10.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/euclid/0.17.3/download -> euclid-0.17.3.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/filetime/0.2.3/download -> filetime-0.2.3.crate https://crates.io/api/v1/crates/flate2/1.0.4/download -> flate2-1.0.4.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/font-loader/0.6.0/download -> font-loader-0.6.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/freetype-rs/0.19.0/download -> freetype-rs-0.19.0.crate https://crates.io/api/v1/crates/freetype-sys/0.7.0/download -> freetype-sys-0.7.0.crate https://crates.io/api/v1/crates/fsevent/0.2.17/download -> fsevent-0.2.17.crate https://crates.io/api/v1/crates/fsevent-sys/0.1.6/download -> fsevent-sys-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.25/download -> futures-0.1.25.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/gif/0.10.1/download -> gif-0.10.1.crate https://crates.io/api/v1/crates/gl_generator/0.10.0/download -> gl_generator-0.10.0.crate https://crates.io/api/v1/crates/gl_generator/0.9.0/download -> gl_generator-0.9.0.crate https://crates.io/api/v1/crates/gleam/0.6.6/download -> gleam-0.6.6.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glutin/0.19.0/download -> glutin-0.19.0.crate https://crates.io/api/v1/crates/httparse/1.3.3/download -> httparse-1.3.3.crate https://crates.io/api/v1/crates/humantime/1.1.1/download -> humantime-1.1.1.crate https://crates.io/api/v1/crates/hyper/0.11.27/download -> hyper-0.11.27.crate https://crates.io/api/v1/crates/hyper-tls/0.1.4/download -> hyper-tls-0.1.4.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/image/0.20.1/download -> image-0.20.1.crate https://crates.io/api/v1/crates/inflate/0.4.3/download -> inflate-0.4.3.crate https://crates.io/api/v1/crates/inotify/0.6.1/download -> inotify-0.6.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.15/download -> jpeg-decoder-0.1.15.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/2.2.0/download -> khronos_api-2.2.0.crate https://crates.io/api/v1/crates/khronos_api/3.0.0/download -> khronos_api-3.0.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/0.4.0/download -> lazycell-0.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.0/download -> lazycell-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.43/download -> libc-0.2.43.crate https://crates.io/api/v1/crates/libflate/0.1.18/download -> libflate-0.1.18.crate https://crates.io/api/v1/crates/libloading/0.5.0/download -> libloading-0.5.0.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.1/download -> linked-hash-map-0.5.1.crate https://crates.io/api/v1/crates/lock_api/0.1.4/download -> lock_api-0.1.4.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lzw/0.10.0/download -> lzw-0.10.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.1.1/download -> memchr-2.1.1.crate https://crates.io/api/v1/crates/memmap/0.6.2/download -> memmap-0.6.2.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mime/0.3.12/download -> mime-0.3.12.crate https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download -> mime_guess-2.0.0-alpha.6.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/mio/0.6.16/download -> mio-0.6.16.crate https://crates.io/api/v1/crates/mio-extras/2.0.5/download -> mio-extras-2.0.5.crate https://crates.io/api/v1/crates/mio-more/0.1.0/download -> mio-more-0.1.0.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/named_pipe/0.3.0/download -> named_pipe-0.3.0.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/3.2.1/download -> nom-3.2.1.crate https://crates.io/api/v1/crates/nom/4.1.1/download -> nom-4.1.1.crate https://crates.io/api/v1/crates/notify/4.0.6/download -> notify-4.0.6.crate https://crates.io/api/v1/crates/num-derive/0.2.3/download -> num-derive-0.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-iter/0.1.37/download -> num-iter-0.1.37.crate https://crates.io/api/v1/crates/num-rational/0.2.1/download -> num-rational-0.2.1.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/objc/0.2.5/download -> objc-0.2.5.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.crate https://crates.io/api/v1/crates/openssl-sys/0.9.39/download -> openssl-sys-0.9.39.crate https://crates.io/api/v1/crates/ordered-float/0.5.2/download -> ordered-float-0.5.2.crate https://crates.io/api/v1/crates/ordered-float/1.0.1/download -> ordered-float-1.0.1.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owning_ref/0.3.3/download -> owning_ref-0.3.3.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/phf/0.7.23/download -> phf-0.7.23.crate https://crates.io/api/v1/crates/phf_codegen/0.7.23/download -> phf_codegen-0.7.23.crate https://crates.io/api/v1/crates/phf_generator/0.7.23/download -> phf_generator-0.7.23.crate https://crates.io/api/v1/crates/phf_shared/0.7.23/download -> phf_shared-0.7.23.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/png/0.12.0/download -> png-0.12.0.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.23/download -> proc-macro2-0.4.23.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.2/download -> rand_core-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.0.6/download -> regex-1.0.6.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.3/download -> regex-syntax-0.6.3.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/reqwest/0.8.8/download -> reqwest-0.8.8.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.4.3/download -> rusttype-0.4.3.crate https://crates.io/api/v1/crates/rusttype/0.7.2/download -> rusttype-0.7.2.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.80/download -> serde-1.0.80.crate https://crates.io/api/v1/crates/serde_derive/1.0.80/download -> serde_derive-1.0.80.crate https://crates.io/api/v1/crates/serde_json/1.0.33/download -> serde_json-1.0.33.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.3/download -> serde_urlencoded-0.5.3.crate https://crates.io/api/v1/crates/serde_yaml/0.8.7/download -> serde_yaml-0.8.7.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.7/download -> servo-fontconfig-sys-4.0.7.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.4/download -> servo-freetype-sys-4.0.4.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/slab/0.3.0/download -> slab-0.3.0.crate https://crates.io/api/v1/crates/slab/0.4.1/download -> slab-0.4.1.crate https://crates.io/api/v1/crates/smallvec/0.6.5/download -> smallvec-0.6.5.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.4.1/download -> smithay-client-toolkit-0.4.1.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.2.5/download -> static_assertions-0.2.5.crate https://crates.io/api/v1/crates/stb_truetype/0.2.4/download -> stb_truetype-0.2.4.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.20/download -> syn-0.15.20.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/terminfo/0.6.1/download -> terminfo-0.6.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tiff/0.2.1/download -> tiff-0.2.1.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/tokio/0.1.11/download -> tokio-0.1.11.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.3/download -> tokio-current-thread-0.1.3.crate https://crates.io/api/v1/crates/tokio-executor/0.1.5/download -> tokio-executor-0.1.5.crate https://crates.io/api/v1/crates/tokio-fs/0.1.4/download -> tokio-fs-0.1.4.crate https://crates.io/api/v1/crates/tokio-io/0.1.10/download -> tokio-io-0.1.10.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.6/download -> tokio-reactor-0.1.6.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.2/download -> tokio-tcp-0.1.2.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.8/download -> tokio-threadpool-0.1.8.crate https://crates.io/api/v1/crates/tokio-timer/0.2.7/download -> tokio-timer-0.2.7.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.2/download -> tokio-udp-0.1.2.crate https://crates.io/api/v1/crates/tokio-uds/0.2.3/download -> tokio-uds-0.2.3.crate https://crates.io/api/v1/crates/try-lock/0.1.0/download -> try-lock-0.1.0.crate https://crates.io/api/v1/crates/ucd-util/0.1.2/download -> ucd-util-0.1.2.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.2.0/download -> unicase-2.2.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.6.5/download -> uuid-0.6.5.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/want/0.0.4/download -> want-0.0.4.crate https://crates.io/api/v1/crates/wayland-client/0.21.4/download -> wayland-client-0.21.4.crate https://crates.io/api/v1/crates/wayland-commons/0.21.4/download -> wayland-commons-0.21.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.21.4/download -> wayland-protocols-0.21.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.21.4/download -> wayland-scanner-0.21.4.crate https://crates.io/api/v1/crates/wayland-sys/0.21.4/download -> wayland-sys-0.21.4.crate https://crates.io/api/v1/crates/which/1.0.5/download -> which-1.0.5.crate https://crates.io/api/v1/crates/widestring/0.2.2/download -> widestring-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/winit/0.18.0/download -> winit-0.18.0.crate https://crates.io/api/v1/crates/winreg/0.4.0/download -> winreg-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.2.2/download -> x11-clipboard-0.2.2.crate https://crates.io/api/v1/crates/x11-dl/2.18.3/download -> x11-dl-2.18.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xdg/2.1.0/download -> xdg-2.1.0.crate https://crates.io/api/v1/crates/xml-rs/0.7.0/download -> xml-rs-0.7.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.2/download -> yaml-rust-0.4.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=852726e1311c28cc73c2f590cbf5c23c
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.2.4 b/metadata/md5-cache/x11-terms/alacritty-0.2.4
index 56ac564f005f..f3c4fe40d499 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.2.4
+++ b/metadata/md5-cache/x11-terms/alacritty-0.2.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 sys-libs/zlib x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr x11-misc/xclip virtual/opengl wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/jwilm/alacritty/archive/v0.2.4.tar.gz -> alacritty-0.2.4.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/alacritty.png https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/advapi32-sys/0.2.0/download -> advapi32-sys-0.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/andrew/0.1.4/download -> andrew-0.1.4.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.1.1/download -> approx-0.1.1.crate https://crates.io/api/v1/crates/approx/0.3.0/download -> approx-0.3.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arraydeque/0.4.3/download -> arraydeque-0.4.3.crate https://crates.io/api/v1/crates/arrayvec/0.4.8/download -> arrayvec-0.4.8.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/base64/0.10.0/download -> base64-0.10.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bindgen/0.33.2/download -> bindgen-0.33.2.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/0.9.1/download -> bitflags-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/bytes/0.4.11/download -> bytes-0.4.11.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.7/download -> bzip2-sys-0.1.7.crate https://crates.io/api/v1/crates/cc/1.0.25/download -> cc-1.0.25.crate https://crates.io/api/v1/crates/cexpr/0.2.3/download -> cexpr-0.2.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cgl/0.2.3/download -> cgl-0.2.3.crate https://crates.io/api/v1/crates/cgmath/0.16.1/download -> cgmath-0.16.1.crate https://crates.io/api/v1/crates/clang-sys/0.22.0/download -> clang-sys-0.22.0.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/clipboard/0.4.6/download -> clipboard-0.4.6.crate https://crates.io/api/v1/crates/clipboard-win/2.1.2/download -> clipboard-win-2.1.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.35/download -> cmake-0.1.35.crate https://crates.io/api/v1/crates/cocoa/0.18.4/download -> cocoa-0.18.4.crate https://crates.io/api/v1/crates/color_quant/1.0.1/download -> color_quant-1.0.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/copypasta/0.0.1/download -> copypasta-0.0.1.crate https://crates.io/api/v1/crates/core-foundation/0.2.3/download -> core-foundation-0.2.3.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation/0.6.3/download -> core-foundation-0.6.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.2.3/download -> core-foundation-sys-0.2.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-graphics/0.13.0/download -> core-graphics-0.13.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-text/13.1.1/download -> core-text-13.1.1.crate https://crates.io/api/v1/crates/core-text/9.2.0/download -> core-text-9.2.0.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.1.2/download -> crc32fast-1.1.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.6.2/download -> crossbeam-deque-0.6.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.6.1/download -> crossbeam-epoch-0.6.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.2/download -> crossbeam-utils-0.6.2.crate https://crates.io/api/v1/crates/deflate/0.7.19/download -> deflate-0.7.19.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.0.3/download -> downcast-rs-1.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate https://crates.io/api/v1/crates/either/1.5.0/download -> either-1.5.0.crate https://crates.io/api/v1/crates/embed-resource/1.1.4/download -> embed-resource-1.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.13/download -> encoding_rs-0.8.13.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/env_logger/0.6.0/download -> env_logger-0.6.0.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/euclid/0.19.4/download -> euclid-0.19.4.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/failure/0.1.3/download -> failure-0.1.3.crate https://crates.io/api/v1/crates/failure_derive/0.1.3/download -> failure_derive-0.1.3.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/flate2/1.0.6/download -> flate2-1.0.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/font-loader/0.6.0/download -> font-loader-0.6.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/freetype-rs/0.19.0/download -> freetype-rs-0.19.0.crate https://crates.io/api/v1/crates/freetype-sys/0.7.0/download -> freetype-sys-0.7.0.crate https://crates.io/api/v1/crates/fsevent/0.2.17/download -> fsevent-0.2.17.crate https://crates.io/api/v1/crates/fsevent-sys/0.1.6/download -> fsevent-sys-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.25/download -> futures-0.1.25.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/gif/0.10.1/download -> gif-0.10.1.crate https://crates.io/api/v1/crates/gl_generator/0.10.0/download -> gl_generator-0.10.0.crate https://crates.io/api/v1/crates/gleam/0.6.8/download -> gleam-0.6.8.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glutin/0.19.0/download -> glutin-0.19.0.crate https://crates.io/api/v1/crates/httparse/1.3.3/download -> httparse-1.3.3.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/hyper/0.11.27/download -> hyper-0.11.27.crate https://crates.io/api/v1/crates/hyper-tls/0.1.4/download -> hyper-tls-0.1.4.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/image/0.20.1/download -> image-0.20.1.crate https://crates.io/api/v1/crates/inflate/0.4.3/download -> inflate-0.4.3.crate https://crates.io/api/v1/crates/inotify/0.6.1/download -> inotify-0.6.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.15/download -> jpeg-decoder-0.1.15.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.0.0/download -> khronos_api-3.0.0.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lazycell/0.4.0/download -> lazycell-0.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.crate https://crates.io/api/v1/crates/libflate/0.1.19/download -> libflate-0.1.19.crate https://crates.io/api/v1/crates/libloading/0.5.0/download -> libloading-0.5.0.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.1/download -> linked-hash-map-0.5.1.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lzw/0.10.0/download -> lzw-0.10.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.1.1/download -> memchr-2.1.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mime/0.3.12/download -> mime-0.3.12.crate https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download -> mime_guess-2.0.0-alpha.6.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/mio/0.6.16/download -> mio-0.6.16.crate https://crates.io/api/v1/crates/mio-extras/2.0.5/download -> mio-extras-2.0.5.crate https://crates.io/api/v1/crates/mio-more/0.1.0/download -> mio-more-0.1.0.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/named_pipe/0.3.0/download -> named_pipe-0.3.0.crate https://crates.io/api/v1/crates/native-tls/0.1.5/download -> native-tls-0.1.5.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.0/download -> nix-0.11.0.crate https://crates.io/api/v1/crates/nix/0.12.0/download -> nix-0.12.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/3.2.1/download -> nom-3.2.1.crate https://crates.io/api/v1/crates/nom/4.1.1/download -> nom-4.1.1.crate https://crates.io/api/v1/crates/notify/4.0.6/download -> notify-4.0.6.crate https://crates.io/api/v1/crates/num-derive/0.2.3/download -> num-derive-0.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-iter/0.1.37/download -> num-iter-0.1.37.crate https://crates.io/api/v1/crates/num-rational/0.2.1/download -> num-rational-0.2.1.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.8.0/download -> num_cpus-1.8.0.crate https://crates.io/api/v1/crates/objc/0.2.5/download -> objc-0.2.5.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.9.24/download -> openssl-0.9.24.crate https://crates.io/api/v1/crates/openssl-sys/0.9.39/download -> openssl-sys-0.9.39.crate https://crates.io/api/v1/crates/ordered-float/0.5.2/download -> ordered-float-0.5.2.crate https://crates.io/api/v1/crates/ordered-float/1.0.1/download -> ordered-float-1.0.1.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot/0.7.0/download -> parking_lot-0.7.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/phf/0.7.23/download -> phf-0.7.23.crate https://crates.io/api/v1/crates/phf_codegen/0.7.23/download -> phf_codegen-0.7.23.crate https://crates.io/api/v1/crates/phf_generator/0.7.23/download -> phf_generator-0.7.23.crate https://crates.io/api/v1/crates/phf_shared/0.7.23/download -> phf_shared-0.7.23.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/png/0.12.0/download -> png-0.12.0.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand/0.6.1/download -> rand-0.6.1.crate https://crates.io/api/v1/crates/rand_chacha/0.1.0/download -> rand_chacha-0.1.0.crate https://crates.io/api/v1/crates/rand_core/0.2.2/download -> rand_core-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.0/download -> rand_xorshift-0.1.0.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/relay/0.1.1/download -> relay-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/reqwest/0.8.8/download -> reqwest-0.8.8.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.4.3/download -> rusttype-0.4.3.crate https://crates.io/api/v1/crates/rusttype/0.7.3/download -> rusttype-0.7.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.1.16/download -> security-framework-0.1.16.crate https://crates.io/api/v1/crates/security-framework-sys/0.1.16/download -> security-framework-sys-0.1.16.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.81/download -> serde-1.0.81.crate https://crates.io/api/v1/crates/serde_derive/1.0.81/download -> serde_derive-1.0.81.crate https://crates.io/api/v1/crates/serde_json/1.0.33/download -> serde_json-1.0.33.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.4/download -> serde_urlencoded-0.5.4.crate https://crates.io/api/v1/crates/serde_yaml/0.8.8/download -> serde_yaml-0.8.8.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.7/download -> servo-fontconfig-sys-4.0.7.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.4/download -> servo-freetype-sys-4.0.4.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/slab/0.3.0/download -> slab-0.3.0.crate https://crates.io/api/v1/crates/slab/0.4.1/download -> slab-0.4.1.crate https://crates.io/api/v1/crates/smallvec/0.6.7/download -> smallvec-0.6.7.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.4.3/download -> smithay-client-toolkit-0.4.3.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.1/download -> static_assertions-0.3.1.crate https://crates.io/api/v1/crates/stb_truetype/0.2.4/download -> stb_truetype-0.2.4.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.22/download -> syn-0.15.22.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/terminfo/0.6.1/download -> terminfo-0.6.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tiff/0.2.1/download -> tiff-0.2.1.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/tokio/0.1.13/download -> tokio-0.1.13.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-core/0.1.17/download -> tokio-core-0.1.17.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.4/download -> tokio-current-thread-0.1.4.crate https://crates.io/api/v1/crates/tokio-executor/0.1.5/download -> tokio-executor-0.1.5.crate https://crates.io/api/v1/crates/tokio-fs/0.1.4/download -> tokio-fs-0.1.4.crate https://crates.io/api/v1/crates/tokio-io/0.1.10/download -> tokio-io-0.1.10.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.7/download -> tokio-reactor-0.1.7.crate https://crates.io/api/v1/crates/tokio-service/0.1.0/download -> tokio-service-0.1.0.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.2/download -> tokio-tcp-0.1.2.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.9/download -> tokio-threadpool-0.1.9.crate https://crates.io/api/v1/crates/tokio-timer/0.2.8/download -> tokio-timer-0.2.8.crate https://crates.io/api/v1/crates/tokio-tls/0.1.4/download -> tokio-tls-0.1.4.crate https://crates.io/api/v1/crates/tokio-udp/0.1.3/download -> tokio-udp-0.1.3.crate https://crates.io/api/v1/crates/tokio-uds/0.2.4/download -> tokio-uds-0.2.4.crate https://crates.io/api/v1/crates/try-lock/0.1.0/download -> try-lock-0.1.0.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.2.0/download -> unicase-2.2.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.6.5/download -> uuid-0.6.5.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/want/0.0.4/download -> want-0.0.4.crate https://crates.io/api/v1/crates/wayland-client/0.21.7/download -> wayland-client-0.21.7.crate https://crates.io/api/v1/crates/wayland-commons/0.21.7/download -> wayland-commons-0.21.7.crate https://crates.io/api/v1/crates/wayland-protocols/0.21.7/download -> wayland-protocols-0.21.7.crate https://crates.io/api/v1/crates/wayland-scanner/0.21.7/download -> wayland-scanner-0.21.7.crate https://crates.io/api/v1/crates/wayland-sys/0.21.7/download -> wayland-sys-0.21.7.crate https://crates.io/api/v1/crates/which/1.0.5/download -> which-1.0.5.crate https://crates.io/api/v1/crates/widestring/0.2.2/download -> widestring-0.2.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/winit/0.18.0/download -> winit-0.18.0.crate https://crates.io/api/v1/crates/winreg/0.4.0/download -> winreg-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.2.2/download -> x11-clipboard-0.2.2.crate https://crates.io/api/v1/crates/x11-dl/2.18.3/download -> x11-dl-2.18.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.2/download -> yaml-rust-0.4.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	c11c4632a7a9d8e0b76e9f4412e76163	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
 _md5_=85ec441b56e46447ae59d1dc0f32a898
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.2.5 b/metadata/md5-cache/x11-terms/alacritty-0.2.5
new file mode 100644
index 000000000000..6f8e9052fd6f
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/alacritty-0.2.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/cmake sys-libs/ncurses >=virtual/rust-1.31.1 virtual/cargo
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=media-libs/fontconfig:= media-libs/freetype:2
+DESCRIPTION=GPU-accelerated terminal emulator
+EAPI=7
+HOMEPAGE=https://github.com/jwilm/alacritty
+IUSE=test debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 sys-libs/zlib x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr x11-misc/xclip virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/jwilm/alacritty/archive/v0.2.5.tar.gz -> alacritty-0.2.5.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/alacritty.png https://crates.io/api/v1/crates/adler32/1.0.3/download -> adler32-1.0.3.crate https://crates.io/api/v1/crates/advapi32-sys/0.2.0/download -> advapi32-sys-0.2.0.crate https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/andrew/0.1.4/download -> andrew-0.1.4.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.1.1/download -> approx-0.1.1.crate https://crates.io/api/v1/crates/approx/0.3.1/download -> approx-0.3.1.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arraydeque/0.4.3/download -> arraydeque-0.4.3.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.1/download -> autocfg-0.1.1.crate https://crates.io/api/v1/crates/backtrace/0.3.13/download -> backtrace-0.3.13.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.28/download -> backtrace-sys-0.1.28.crate https://crates.io/api/v1/crates/base64/0.10.0/download -> base64-0.10.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bindgen/0.33.2/download -> bindgen-0.33.2.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/build_const/0.2.1/download -> build_const-0.2.1.crate https://crates.io/api/v1/crates/byteorder/1.2.7/download -> byteorder-1.2.7.crate https://crates.io/api/v1/crates/bytes/0.4.11/download -> bytes-0.4.11.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.7/download -> bzip2-sys-0.1.7.crate https://crates.io/api/v1/crates/cc/1.0.28/download -> cc-1.0.28.crate https://crates.io/api/v1/crates/cexpr/0.2.3/download -> cexpr-0.2.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/cgl/0.2.3/download -> cgl-0.2.3.crate https://crates.io/api/v1/crates/cgmath/0.16.1/download -> cgmath-0.16.1.crate https://crates.io/api/v1/crates/clang-sys/0.22.0/download -> clang-sys-0.22.0.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/clipboard/0.4.6/download -> clipboard-0.4.6.crate https://crates.io/api/v1/crates/clipboard-win/2.1.2/download -> clipboard-win-2.1.2.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.35/download -> cmake-0.1.35.crate https://crates.io/api/v1/crates/cocoa/0.18.4/download -> cocoa-0.18.4.crate https://crates.io/api/v1/crates/color_quant/1.0.1/download -> color_quant-1.0.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/core-foundation/0.5.1/download -> core-foundation-0.5.1.crate https://crates.io/api/v1/crates/core-foundation/0.6.3/download -> core-foundation-0.6.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.5.1/download -> core-foundation-sys-0.5.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-graphics/0.13.0/download -> core-graphics-0.13.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-text/13.1.1/download -> core-text-13.1.1.crate https://crates.io/api/v1/crates/core-text/9.2.0/download -> core-text-9.2.0.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.1.2/download -> crc32fast-1.1.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.6/download -> crossbeam-channel-0.3.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.6.3/download -> crossbeam-deque-0.6.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.7.0/download -> crossbeam-epoch-0.7.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.3/download -> crossbeam-utils-0.6.3.crate https://crates.io/api/v1/crates/deflate/0.7.19/download -> deflate-0.7.19.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.0.3/download -> downcast-rs-1.0.3.crate https://crates.io/api/v1/crates/dtoa/0.4.3/download -> dtoa-0.4.3.crate https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate https://crates.io/api/v1/crates/either/1.5.0/download -> either-1.5.0.crate https://crates.io/api/v1/crates/embed-resource/1.1.4/download -> embed-resource-1.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.14/download -> encoding_rs-0.8.14.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/env_logger/0.6.0/download -> env_logger-0.6.0.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/euclid/0.19.4/download -> euclid-0.19.4.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/filetime/0.2.4/download -> filetime-0.2.4.crate https://crates.io/api/v1/crates/flate2/1.0.6/download -> flate2-1.0.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/font-loader/0.6.0/download -> font-loader-0.6.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/freetype-rs/0.19.0/download -> freetype-rs-0.19.0.crate https://crates.io/api/v1/crates/freetype-sys/0.7.0/download -> freetype-sys-0.7.0.crate https://crates.io/api/v1/crates/fsevent/0.2.17/download -> fsevent-0.2.17.crate https://crates.io/api/v1/crates/fsevent-sys/0.1.6/download -> fsevent-sys-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.25/download -> futures-0.1.25.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/gdi32-sys/0.2.0/download -> gdi32-sys-0.2.0.crate https://crates.io/api/v1/crates/gif/0.10.1/download -> gif-0.10.1.crate https://crates.io/api/v1/crates/gleam/0.6.8/download -> gleam-0.6.8.crate https://crates.io/api/v1/crates/gl_generator/0.10.0/download -> gl_generator-0.10.0.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glutin/0.19.0/download -> glutin-0.19.0.crate https://crates.io/api/v1/crates/h2/0.1.14/download -> h2-0.1.14.crate https://crates.io/api/v1/crates/http/0.1.14/download -> http-0.1.14.crate https://crates.io/api/v1/crates/httparse/1.3.3/download -> httparse-1.3.3.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/hyper/0.12.19/download -> hyper-0.12.19.crate https://crates.io/api/v1/crates/hyper-tls/0.3.1/download -> hyper-tls-0.3.1.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/image/0.20.1/download -> image-0.20.1.crate https://crates.io/api/v1/crates/indexmap/1.0.2/download -> indexmap-1.0.2.crate https://crates.io/api/v1/crates/inflate/0.4.4/download -> inflate-0.4.4.crate https://crates.io/api/v1/crates/inotify/0.6.1/download -> inotify-0.6.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.2/download -> iovec-0.1.2.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.15/download -> jpeg-decoder-0.1.15.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.0.0/download -> khronos_api-3.0.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.46/download -> libc-0.2.46.crate https://crates.io/api/v1/crates/libflate/0.1.19/download -> libflate-0.1.19.crate https://crates.io/api/v1/crates/libloading/0.5.0/download -> libloading-0.5.0.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.1/download -> linked-hash-map-0.5.1.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/lzw/0.10.0/download -> lzw-0.10.0.crate https://crates.io/api/v1/crates/MacTypes-sys/1.3.0/download -> MacTypes-sys-1.3.0.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.1.2/download -> memchr-2.1.2.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/mime/0.3.12/download -> mime-0.3.12.crate https://crates.io/api/v1/crates/mime_guess/2.0.0-alpha.6/download -> mime_guess-2.0.0-alpha.6.crate https://crates.io/api/v1/crates/miniz_oxide/0.2.0/download -> miniz_oxide-0.2.0.crate https://crates.io/api/v1/crates/miniz_oxide_c_api/0.2.0/download -> miniz_oxide_c_api-0.2.0.crate https://crates.io/api/v1/crates/mio/0.6.16/download -> mio-0.6.16.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.5/download -> mio-extras-2.0.5.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/named_pipe/0.3.0/download -> named_pipe-0.3.0.crate https://crates.io/api/v1/crates/native-tls/0.2.2/download -> native-tls-0.2.2.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.12.0/download -> nix-0.12.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/3.2.1/download -> nom-3.2.1.crate https://crates.io/api/v1/crates/nom/4.1.1/download -> nom-4.1.1.crate https://crates.io/api/v1/crates/notify/4.0.6/download -> notify-4.0.6.crate https://crates.io/api/v1/crates/num_cpus/1.9.0/download -> num_cpus-1.9.0.crate https://crates.io/api/v1/crates/num-derive/0.2.3/download -> num-derive-0.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-iter/0.1.37/download -> num-iter-0.1.37.crate https://crates.io/api/v1/crates/num-rational/0.2.1/download -> num-rational-0.2.1.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/objc/0.2.5/download -> objc-0.2.5.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.16/download -> openssl-0.10.16.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.40/download -> openssl-sys-0.9.40.crate https://crates.io/api/v1/crates/ordered-float/0.5.2/download -> ordered-float-0.5.2.crate https://crates.io/api/v1/crates/ordered-float/1.0.1/download -> ordered-float-1.0.1.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.6.4/download -> parking_lot-0.6.4.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.3.1/download -> parking_lot_core-0.3.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/png/0.12.0/download -> png-0.12.0.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.24/download -> proc-macro2-0.4.24.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.10/download -> quote-0.6.10.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand/0.6.3/download -> rand-0.6.3.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.2.2/download -> rand_core-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.3.0/download -> rand_core-0.3.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_os/0.1.0/download -> rand_os-0.1.0.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.50/download -> redox_syscall-0.1.50.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.4/download -> regex-syntax-0.6.4.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/reqwest/0.9.5/download -> reqwest-0.9.5.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.13/download -> rustc-demangle-0.1.13.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.4.3/download -> rusttype-0.4.3.crate https://crates.io/api/v1/crates/rusttype/0.7.3/download -> rusttype-0.7.3.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/safemem/0.3.0/download -> safemem-0.3.0.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/schannel/0.1.14/download -> schannel-0.1.14.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/security-framework/0.2.1/download -> security-framework-0.2.1.crate https://crates.io/api/v1/crates/security-framework-sys/0.2.2/download -> security-framework-sys-0.2.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.84/download -> serde-1.0.84.crate https://crates.io/api/v1/crates/serde_derive/1.0.84/download -> serde_derive-1.0.84.crate https://crates.io/api/v1/crates/serde_json/1.0.34/download -> serde_json-1.0.34.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.4/download -> serde_urlencoded-0.5.4.crate https://crates.io/api/v1/crates/serde_yaml/0.8.8/download -> serde_yaml-0.8.8.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.7/download -> servo-fontconfig-sys-4.0.7.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.3/download -> servo-freetype-sys-4.0.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/slab/0.4.1/download -> slab-0.4.1.crate https://crates.io/api/v1/crates/smallvec/0.6.7/download -> smallvec-0.6.7.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.4.4/download -> smithay-client-toolkit-0.4.4.crate https://crates.io/api/v1/crates/socket2/0.3.8/download -> socket2-0.3.8.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.1/download -> static_assertions-0.3.1.crate https://crates.io/api/v1/crates/stb_truetype/0.2.5/download -> stb_truetype-0.2.5.crate https://crates.io/api/v1/crates/string/0.1.2/download -> string-0.1.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.24/download -> syn-0.15.24.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tempfile/3.0.5/download -> tempfile-3.0.5.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/terminfo/0.6.1/download -> terminfo-0.6.1.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/tiff/0.2.1/download -> tiff-0.2.1.crate https://crates.io/api/v1/crates/time/0.1.41/download -> time-0.1.41.crate https://crates.io/api/v1/crates/tokio/0.1.14/download -> tokio-0.1.14.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.4/download -> tokio-current-thread-0.1.4.crate https://crates.io/api/v1/crates/tokio-executor/0.1.6/download -> tokio-executor-0.1.6.crate https://crates.io/api/v1/crates/tokio-fs/0.1.5/download -> tokio-fs-0.1.5.crate https://crates.io/api/v1/crates/tokio-io/0.1.11/download -> tokio-io-0.1.11.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.8/download -> tokio-reactor-0.1.8.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.10/download -> tokio-threadpool-0.1.10.crate https://crates.io/api/v1/crates/tokio-timer/0.2.8/download -> tokio-timer-0.2.8.crate https://crates.io/api/v1/crates/tokio-udp/0.1.3/download -> tokio-udp-0.1.3.crate https://crates.io/api/v1/crates/tokio-uds/0.2.5/download -> tokio-uds-0.2.5.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.2.0/download -> unicase-2.2.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.7/download -> unicode-normalization-0.1.7.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/user32-sys/0.2.0/download -> user32-sys-0.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/uuid/0.7.1/download -> uuid-0.7.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/want/0.0.6/download -> want-0.0.6.crate https://crates.io/api/v1/crates/wayland-client/0.21.10/download -> wayland-client-0.21.10.crate https://crates.io/api/v1/crates/wayland-commons/0.21.10/download -> wayland-commons-0.21.10.crate https://crates.io/api/v1/crates/wayland-protocols/0.21.10/download -> wayland-protocols-0.21.10.crate https://crates.io/api/v1/crates/wayland-scanner/0.21.10/download -> wayland-scanner-0.21.10.crate https://crates.io/api/v1/crates/wayland-sys/0.21.10/download -> wayland-sys-0.21.10.crate https://crates.io/api/v1/crates/which/1.0.5/download -> which-1.0.5.crate https://crates.io/api/v1/crates/widestring/0.2.2/download -> widestring-0.2.2.crate https://crates.io/api/v1/crates/widestring/0.4.0/download -> widestring-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.1/download -> winapi-util-0.1.1.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/winit/0.18.0/download -> winit-0.18.0.crate https://crates.io/api/v1/crates/winpty-sys/0.4.3/download -> winpty-sys-0.4.3.crate https://crates.io/api/v1/crates/winreg/0.4.0/download -> winreg-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.2.2/download -> x11-clipboard-0.2.2.crate https://crates.io/api/v1/crates/x11-dl/2.18.3/download -> x11-dl-2.18.3.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.2/download -> yaml-rust-0.4.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=2b68a30973a3f5606637a815d27e64f1
diff --git a/metadata/md5-cache/x11-terms/kitty-0.12.1 b/metadata/md5-cache/x11-terms/kitty-0.12.1
deleted file mode 100644
index 91847511336d..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=sys-apps/sed-4
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/archive/v0.12.1.tar.gz -> kitty-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1ffe76604fc1428c79dedfaa0fd7e1ea
diff --git a/metadata/md5-cache/x11-terms/kitty-0.12.3 b/metadata/md5-cache/x11-terms/kitty-0.12.3
deleted file mode 100644
index ec33e7f6caf7..000000000000
--- a/metadata/md5-cache/x11-terms/kitty-0.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
-EAPI=6
-HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.12.3/kitty-0.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6629ae3f72b8b34e12874e35644febee
diff --git a/metadata/md5-cache/x11-terms/kitty-0.13.2 b/metadata/md5-cache/x11-terms/kitty-0.13.2
new file mode 100644
index 000000000000..71a7ec310563
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.13.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
+EAPI=6
+HOMEPAGE=https://github.com/kovidgoyal/kitty
+IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.13.2/kitty-0.13.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=ecfa88269c3b090608ac036af7e5f70a
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 5a6bdf15951f..0840087a9eb5 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools ) sys-libs/ncurses virtual/pkgconfig >=dev-python/sphinx-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=6
 HOMEPAGE=https://github.com/kovidgoyal/kitty
 IUSE=debug doc imagemagick wayland python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 ) imagemagick? ( virtual/imagemagick-tools )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_7(+)?] >=media-libs/harfbuzz-1.5.0:= sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 media-libs/fontconfig x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) imagemagick? ( virtual/imagemagick-tools )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=31dfe63fbdeaa463fd2fd2ffb2a23457
+_md5_=ecfa88269c3b090608ac036af7e5f70a
diff --git a/metadata/md5-cache/x11-terms/xterm-333 b/metadata/md5-cache/x11-terms/xterm-333
deleted file mode 100644
index 35b18339f5fd..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-333
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=7
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-333.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=4961164c3e8ba473008ee0ba26e9da8f
diff --git a/metadata/md5-cache/x11-terms/xterm-337 b/metadata/md5-cache/x11-terms/xterm-337
index 14caec2ef287..a0637ff008c2 100644
--- a/metadata/md5-cache/x11-terms/xterm-337
+++ b/metadata/md5-cache/x11-terms/xterm-337
@@ -5,10 +5,10 @@ DESCRIPTION=Terminal Emulator for X Windows
 EAPI=7
 HOMEPAGE=https://invisible-island.net/xterm/
 IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-337.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=146d474c4d38d67f3fe24459d6570783
+_md5_=e494488d583f64f3f64ef53e5dced201
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 33d0090dda6e..0b57df8bf00f 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/QGnomePlatform-0.3-r1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.3-r1
deleted file mode 100644
index 14525202d5d5..000000000000
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtwidgets:5= x11-libs/gtk+:3[X]
-DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
-EAPI=6
-HOMEPAGE=https://github.com/MartinBriza/QGnomePlatform
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtwidgets:5= x11-libs/gtk+:3[X]
-SLOT=0
-SRC_URI=https://github.com/MartinBriza/QGnomePlatform/archive/0.3/QGnomePlatform-0.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8448d32a4b44a1dee360c94e3b218afb
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.5 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.5
new file mode 100644
index 000000000000..7f47054c01ee
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-qt/qtwidgets-5.6:5= x11-libs/gtk+:3[X]
+DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
+EAPI=7
+HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtwidgets-5.6:5= x11-libs/gtk+:3[X]
+SLOT=0
+SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.5/QGnomePlatform-0.5.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=784f4536349b4e8cc1cc06110794cce8
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2
deleted file mode 100644
index 57c6b4cdce4a..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.22.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME default icon theme
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
-IUSE=branding
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=71ab6518dd20fb463166eb6de203a03b
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
index 473983989697..68f8dfaae7f6 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=26783e7dd1eb17e515fd4b25a1508a6c
+_md5_=a30697cdd9f1115f375e32536528a4fd
diff --git a/metadata/md5-cache/x11-themes/icewm-extra-themes-1.1 b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.1
new file mode 100644
index 000000000000..d158859aba01
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/icewm-extra-themes-1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Extra themes for IceWM
+EAPI=7
+HOMEPAGE=https://github.com/bbidulock/icewm-extra-themes
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-wm/icewm
+SLOT=0
+SRC_URI=https://github.com/bbidulock/icewm-extra-themes/releases/download/1.1/icewm-extra-themes-1.1.tar.xz
+_md5_=6dc2541f01a2672c632e3c841fb6ecbb
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
index aa634bb67a27..f155050c7f0e 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/v1.9.0.tar.gz -> qtcurve-1.9.0.tar.gz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=8ae7dee759abab99bc911a03057c49b7
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 4dbd59be89e2..70ad55422bfb 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -9,5 +9,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration
 REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	ba231eff766d5f9495fb24e7bc70c51b	kde5-functions	574d71bd8a0887e7ec19d34523b2c134	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
 _md5_=c2f5c89b51dd619d7c220945f3ac7ec3
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 59169352dfc3..31b2a3dbdfd0 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/icewm-1.5.0-r1 b/metadata/md5-cache/x11-wm/icewm-1.5.0-r1
new file mode 100644
index 000000000000..4d565d931407
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/icewm-1.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc gnome-base/librsvg x11-base/xorg-proto nls? ( >=sys-devel/gettext-0.19.6 ) truetype? ( >=media-libs/freetype-2.0.9 )
+DESCRIPTION=Ice Window Manager with Themes
+EAPI=7
+HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
+IUSE=+alsa ao bidi debug nls truetype uclibc xinerama
+KEYWORDS=~amd64 ~ppc ~sparc ~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/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( alsa ao )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.5.0/icewm-1.5.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=be26a858fd9c6a53fc5cee49124bbb9a
diff --git a/metadata/md5-cache/x11-wm/icewm-1.5.1 b/metadata/md5-cache/x11-wm/icewm-1.5.1
new file mode 100644
index 000000000000..618dbfa65f63
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/icewm-1.5.1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/fontconfig x11-libs/gdk-pixbuf:2[X] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) app-text/asciidoc gnome-base/librsvg x11-base/xorg-proto nls? ( >=sys-devel/gettext-0.19.6 ) truetype? ( >=media-libs/freetype-2.0.9 )
+DESCRIPTION=Ice Window Manager with Themes
+EAPI=7
+HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
+IUSE=+alsa ao bidi debug nls truetype uclibc xinerama
+KEYWORDS=~amd64 ~ppc ~sparc ~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/libXft x11-libs/libXrandr x11-libs/libXrender alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) truetype? ( x11-libs/libXext ) xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( alsa ao )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.5.1/icewm-1.5.1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=be26a858fd9c6a53fc5cee49124bbb9a
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index b74a0707afdc..5edc1b21c784 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/xfce4-panel-4.13.4 b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.4
new file mode 100644
index 000000000000..e42db4b798ac
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.13.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.22:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= ) dev-lang/perl dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Panel for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.22:3=[introspection?] x11-libs/libX11:= x11-libs/libwnck:3= >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:=[introspection?] >=xfce-base/xfconf-4.13:= introspection? ( dev-libs/gobject-introspection:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-4.13.4.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=89b655f930bbf419ab8f6292c9fa3322
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index a30ad584823d..6eec89c1ce2a 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/xfce4-alsa-plugin-0.1.2_p20190102 b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.2_p20190102
new file mode 100644
index 000000000000..18d226db2cd2
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.1.2_p20190102
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection] || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Simple ALSA volume control for xfce4-panel
+EAPI=6
+HOMEPAGE=https://github.com/equeim/xfce4-alsa-plugin
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/alsa-lib >=xfce-base/xfce4-panel-4.13 x11-libs/gtk+:3[introspection]
+SLOT=0
+SRC_URI=https://github.com/equeim/xfce4-alsa-plugin/archive/10159129e14a59d14b5761441aaaf7c2f41a3673.tar.gz -> xfce4-alsa-plugin-10159129e14a59d14b5761441aaaf7c2f41a3673.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=86b81badbe359c5e06905e10deda5168
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 707d610d8417..616fd526eb94 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2018-12-31T12:38:39Z
+TIMESTAMP 2019-01-12T15:38:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwqDc9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw6CgRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCIcQ/9GxsD2RuXOOctxiKEf4jgEIr87dLDrtJwJLp590y57TqvTWuQaCzYvSIH
-S+HCcdqYdSW+GtNa7MSY9W7aF7pQ3Ier21J4IDxuy8aYaPL7XWy6ubXX01rhci4G
-Y8e4cklPjNQQMH7obZsQrz4rgkP2dSpdw/mMWstkBw56nq7Yt4cLNlT0wh40YV3m
-ucMFtdSIaVxb+cwcNQv8HxPxe1r1g+96nHWAOLSDFVmVmZJ6+/vXd/Fu5YVFnZqe
-WTybWghX3BfQ0Qu6RhssP2x+xE183Sw/zBM+QtXXLZJmZplZrm6q3mV5MrhbnRJk
-HtFhNReu1jeeKaEfaDx5HhbbNw9b8eUuqB+GmvKHIxy8NToDmw7u2EMs06wm7tXr
-HQ3qwcSJUe48Z/t2l9gkamUzQuWNR9XuszemmwCF67jGteoTbVQAAak0z7nIUahm
-myIXi1+yINkmVhUM/pFUCYuozZJU1/yHKRChXmxcwVDLBZtC/uowRUL+ylvAMsVq
-bRC+UNRrnXKE520Jf/8Mv9L3UhFSRRdQ+t/XgAEsPAZoada2su0azj1eDlkkskQJ
-qKKYcFBCtp7B/Gn1l7unmO2qnNgO6CvwygLKqU4KRIfZgXhXehgYwJdxAfM813/Q
-Q0BYFnl6uZQFMcjtIrgHvMB1SQrGmgPJ286z9HcvH/ubG9G3F3E=
-=MO6c
+klArRg/+Ol7SyU3Io9PEL69Ip+8TO6pC1qgC18ibW2Tpd8kIBCytcNMF9K5CS4XW
+AoP2XWT1VFi5d7swRgSjX5VHiA1Rbf/zLxKmmkBZrirpDUR4LXtOUZEqCLjwvI9v
+HRTsE7R9fDInsNFqsNVc/XXhgcd+VafBFtjzR5R31jfd/Um1sOqPPQBqUDEEMEsP
+0pKKjINhadinkLvxgn5yprftr45RFL0VmWFYo2ZqHUNKdhsmOWnuvwwl7/ym7dNP
+l5ck0345veAb8u6Db9NLnU++u70RH/P5tdbdw12L/Qh1FNQsVsm+737Xn0RKaqG2
+hVfzb0XGEjqUgtLTTNllqj8QAyZrH1z+ekbhjid75eYmwv2bZLY/tNI73EMRpiGQ
+Y7NrmdU1t0n0m1iiy116Vyut1b9O4bXm1OdCmwEtNQw5GdRTTTrRvSawOz/KEQAP
+XKIGyNyQc6J/oLWi07agNK/tAfVf/nX+ajHwJnGeJy+nCsFxgmxBA11iNn9oCcpU
+uh8OZU19cFYUM+kHtBiEnh0jyYRuFpHHm4CpyYdNUmrxMGCbton72Na4uww4j9oM
+s5EWr12ZhwW7MsvB5ShlEZ4q48u8ko8ilP07suVEqrmNooBoA0ruvvPQDD4ihp/s
+URfYBzq6DAwy9AYxr3lXANVabqDjuqHC4DmkLCyhnjt4AekR8nU=
+=o280
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e94cbeaac45c..b313ae2c9fb6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Dec 2018 12:38:35 +0000
+Sat, 12 Jan 2019 15:38:40 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 8f2887c63a2e..a8c53b0ee854 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -651,6 +651,10 @@
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
     </member>
+    <member>
+      <email>soap@gentoo.org</email>
+      <name>David Seifert</name>
+    </member>
     <member is-lead="1">
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
@@ -1186,6 +1190,10 @@
       <name>Gilles Dartiguelongue</name>
     </member>
     <member>
+      <email>floppym@gentoo.org</email>
+      <name>Mike Gilbert</name>
+    </member>
+    <member>
       <email>pacho@gentoo.org</email>
       <name>Pacho Ramos</name>
     </member>
@@ -2186,11 +2194,6 @@
       <name>Ian Stakenvicius</name>
     </member>
     <member>
-      <email>bircoph@gentoo.org</email>
-      <name>Andrew Savchenko</name>
-      <role>pgo</role>
-    </member>
-    <member>
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
       <role>Package Maintainer</role>
@@ -2932,7 +2935,7 @@
     <member>
       <email>alicef@gentoo.org</email>
       <name>Alice Ferrazzi</name>
-      <role>Facebook (admin), G+ (owner), Twitter, Events, Telegram (admin), Slack (admin), Discord (admin)</role>
+      <role>Mastodon (Admin), Twitter (Admin), Events, Slack (admin), Discord (admin)</role>
     </member>
     <member>
       <email>cynede@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index 81d1c201bd57..0b7375166a21 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 31 12:38:35 UTC 2018
+Sat Jan 12 15:38:40 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4848dea19bb8..68f52fe7c79c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Dec 2018 12:45:01 +0000
+Sat, 12 Jan 2019 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b7d9344806ab..7c6258557665 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-35f4591df05a0748eadbefb847a5d362803b7edb 1546258960 2018-12-31T12:22:40+00:00
+d8ceba0c44613850dbbcd81794f66048c85060e7 1547306278 2019-01-12T15:17:58+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d7b6f968196b..773471e341aa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1546259701 Mon 31 Dec 2018 12:35:01 PM UTC
+1547307301 Sat 12 Jan 2019 03:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e94cbeaac45c..b313ae2c9fb6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 31 Dec 2018 12:38:35 +0000
+Sat, 12 Jan 2019 15:38:40 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3eee4795ec62..f15fc99aceb1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 5afc064665db..2dca34f1ca75 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -1,7 +1,7 @@
+DIST bwping-1.10.tar.gz 88986 BLAKE2B b30147d028757f8d158e4be26739b6f6750a7d7fc0a917958ec4229890f02efe635b99ecc0ea5bc137a3a1513946f926bc97f7114ea8b3a497ec596ea4671454 SHA512 80142ef3ce833f4d2358e1c34a2e6af7f3ccdd5bf53073fd0ee12e01601c815f10e3fa76c7f8d17afb0db9a32ecf6d3fa4274e1d5965c429dfa3d2ad2370ab65
 DIST bwping-1.7.tar.gz 90441 BLAKE2B 2f8c4690388860470ac7f814ef29bc3de1738f0e46f53286000829a0483c8f000f2bd8d5f7d0fbf8ed9b8bdfb105576c7960a24da8f3f3fac36fd49d4b34370e SHA512 74b695a80c2fa54693af1afab78417dc6ca35130bbd9367950681ddbbebe36b38166068532e8296f336c5cad8230339b4fb4fb975f4b066cdacba8a99179cac7
-DIST bwping-1.8.tar.gz 90751 BLAKE2B 409b4e4e9ebf083ad06613f7bc173f984b40b3f201e9b50bb80fc09ee55d31274d5b2af38f5091b5e17dee9156148d2eb5e1b708a8310e69f67dafc07591bac6 SHA512 d6d5e4b347ad7fcccbc980fb2f10b2528c874af618263b54aae923dee7d334057c703d58a65c9225a158b0cc29f0a14396891dba784642531197fb3960743067
 DIST bwping-1.9.tar.gz 90877 BLAKE2B f19b865b30cf92e80f7482c8c19b9fa364b95ec3359993a1a328eb114f6f478bde5cbd7fa43d0a31745f6ef430064cbf972a38caa2a6ad8dff38c5c96561b9d0 SHA512 6d70fc7a1b7965b4859e05be088d11af8e92ab844903ea5303e9b9be4cc37deaf02a7ee40ecba5d0ebf1ba2f047d0d156be25f7c62fe136ec3f703a7ef940ccf
+EBUILD bwping-1.10.ebuild 471 BLAKE2B 8fe23434bf1d07214fef35a14722ac34df276660a7216f670a8a7b5ca11ab4f0587b2691ed18e489df9abe4d22741db892c83bf646c7afadbf444f48c53a8c52 SHA512 59e1899501c8bc433bb9bbc0c7260eed27402628785372548638084c2b6a20fc29f7fdeb261b3714183b3d177eb61c1fe874c689040a470edd95281149800bb8
 EBUILD bwping-1.7-r1.ebuild 413 BLAKE2B fe0207442e38ee224b650126ae837f67b7df4dd52e17603628c46967b7fe659c2d8c44a6d6d40297b0879a099a84652c935ea3b2dd3d75ddc47b0115bc62a03f SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f
-EBUILD bwping-1.8.ebuild 415 BLAKE2B dd194c432b928cb4c696b4424d6b5f65af043d54dbc95549a73cdd864cc4151131c45d8a9d3cbbb21c47062138c147da6e2cb288a02fdf2f6bdc3ccc151bd0b1 SHA512 b920655976c17e7a73a3a7f7f7f444241bcc787fa94fead1ca7125f5a1a4b11930df5e50ac254044f80cbba5191ce29530c75f512d7753c4ca61ee9f9b108efb
 EBUILD bwping-1.9.ebuild 415 BLAKE2B e3e994562d53530ae3f925d911d220ce3b4d99207aef29d2ea702869018c7d28cea53dd2527f882d097740c9663324587938a409fc67b2ad951be346ebdb4034 SHA512 147edbc346d231e9134e8052d5c252e43bf4351f48e424754f191098fd9ac3396ae1bf3b50f526ca84724273ba3808ac152c3c589dc996b65f1a4f1b15c05005
 MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/bwping-1.10.ebuild b/net-analyzer/bwping/bwping-1.10.ebuild
new file mode 100644
index 000000000000..864760342b38
--- /dev/null
+++ b/net-analyzer/bwping/bwping-1.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
+HOMEPAGE="http://bwping.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
diff --git a/net-analyzer/bwping/bwping-1.8.ebuild b/net-analyzer/bwping/bwping-1.8.ebuild
deleted file mode 100644
index ab4b64b32645..000000000000
--- a/net-analyzer/bwping/bwping-1.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP"
-HOMEPAGE="http://bwping.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 67dcac6e2b5f..7b0dcf9f6bdb 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,6 +1,8 @@
 AUX cve-2017-6430.patch 2437 BLAKE2B 4267c1028467734e45f0a2b730498b6b1de86d9aca95377d7afe76d872ae05c0c9c5e600e8c35f7e0f74d00a125cbffce7f372d543e1728a83121c234ef65366 SHA512 fd3477e7ab087d2b0fdfff6ef331ca8ae4aa838ece54a84d4e597d57cf45425a4dc4be60b9caadf0af25ebe8072eea542092e400e6fe219696b0dc13ca4e205b
+AUX ettercap-0.8.2-openssl-1.1.patch 8769 BLAKE2B 6c9d7e8c60264b6ac0724891f9cbc9b2436bb943680d3e8612aee152bd360ea9f38a778175906787039041e654b49f91353f4cdc678f36753e289270c4b148b3 SHA512 0ba60719cde9648aae37499c1caa6f3e0630e31f1e819945648d778aa6359f0b3771d7673f16a81c4e7ea8efdcf84bf3fb55979d952cb767cb5334f5d154ca9d
 DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B 851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9 SHA512 18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
 EBUILD ettercap-0.8.2-r1.ebuild 1714 BLAKE2B 2ffce7cce8e652e21470b00f70ef35d90ef768a9344abbebcbd92bed23ba008794932e622a3c31002651ff64e27336819943c14c92621fdb79b2d30d63da8852 SHA512 dda9381deb9b088fb39b7c1de4f7421b43c231d0c7535428ea148533787ece0a8bf31a93e580cfe108cfebd73da2b0ed1668274fa93d47042b1342447753be56
+EBUILD ettercap-0.8.2-r2.ebuild 1796 BLAKE2B 79051d2ae904a6d57ec71cf7a280aeccebe8cd0146be8cdd207cc6ff9ee568d2d19078e3849a2b295ad2d25dd6b8d0c906979a11a6a7bc1e62f93e250cf21943 SHA512 6212493404eb51ac612cb4a57fed7bedfce406935cbd5554c9e3a4c08e34d6c5e30d02cccb6891a0acc2e04bf95ddaa6e5de909c1b179321b53cb44675725e06
 EBUILD ettercap-0.8.2.ebuild 1660 BLAKE2B 6cf57f82a93894c9bff14d56e823494fd7fd5fcce0285bd19e6316b5db7292e4a19874eccadfaa40ced9e2e3736007e94c30eb96f92f9b3bf714e75dd87f512e SHA512 d8a2b9dc5f6952cbffb15fe18689a7e3587a8d40e52159e65aaea9199f0de43da48bfc6b9c5ee6ab008f24f424d8350b0095246689d7ce36c4cd0a8c9f4f1015
-EBUILD ettercap-9999.ebuild 1969 BLAKE2B 22405e3d575543b2b0c0b7b5021e082fd71c60e5d84adad6234904a6dd1524740961ae73844565bf0fb453b3d6ccd9c9af771ddd6d973ee29529a22fb160ffb8 SHA512 d94cd0e2655ba36f02a1fb2431c8902f4b60f3f9389f30631c8dbfc73ebce9021069800f74c97faaf31aa33d4370bb3b523998242b448aa04fa8b5f875d90493
+EBUILD ettercap-9999.ebuild 1711 BLAKE2B 0ed80f63f24c4c595f2b1caf410259fbe974d0833bf8bdaa14f964009a9bd5c75540fcd6beff17622a355bce45408ea2ca52d2378196c7b37a515c6222d96441 SHA512 9d4fd99f08e11126ba68519404490c7000997aa349805a8d4a6d271e52fcda764dc3c8164a3f5ddfe63e819343d24c7f792d229da9d44ec56f039c87854e37ec
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..6fa10f902c26
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
+else
+	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+
+IUSE="doc gtk ipv6 libressl ncurses +plugins test"
+
+RDEPEND="dev-libs/libbsd
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.1
+	sys-libs/zlib
+	gtk? (
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
+		media-libs/freetype
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( >=sys-libs/ncurses-5.3:= )
+	plugins? ( >=net-misc/curl-7.26.0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl
+		sys-apps/groff )
+	test? ( dev-libs/check )
+	sys-devel/flex
+	virtual/yacc"
+PATCHES=(
+	"${FILESDIR}"/cve-2017-6430.patch
+	"${FILESDIR}"/${P}-openssl-1.1.patch
+)
+
+src_prepare() {
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURSES="$(usex ncurses)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_PLUGINS="$(usex plugins)"
+		-DENABLE_IPV6="$(usex ipv6)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_PDF_DOCS="$(usex doc)"
+		-DBUNDLED_LIBS=OFF
+		-DSYSTEM_LIBS=ON
+		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+	)
+		#right now we only support gtk2, but ettercap also supports gtk3
+		#do we care? do we want to support both?
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index c8f2e6e8f41b..b83933eda5d6 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
@@ -16,10 +16,10 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
-	KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-#IUSE="doc gtk ipv6 ncurses +plugins test"
-IUSE="doc gtk ipv6 libressl ncurses +plugins"
+
+IUSE="doc gtk ipv6 libressl ncurses +plugins test"
 
 RDEPEND="dev-libs/libbsd
 	dev-libs/libpcre
@@ -37,11 +37,12 @@ RDEPEND="dev-libs/libbsd
 		>=x11-libs/gtk+-2.2.2:2
 		>=x11-libs/pango-1.2.3
 	)
-	ncurses? ( sys-libs/ncurses:0= )
+	ncurses? ( >=sys-libs/ncurses-5.3:= )
 	plugins? ( >=net-misc/curl-7.26.0 )"
 DEPEND="${RDEPEND}
 	doc? ( app-text/ghostscript-gpl
 		sys-apps/groff )
+	test? ( dev-libs/check )
 	sys-devel/flex
 	virtual/yacc"
 
@@ -52,21 +53,17 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable ncurses CURSES)
-		$(cmake-utils_use_enable gtk)
-		$(cmake-utils_use_enable plugins)
-		$(cmake-utils_use_enable ipv6)
-		$(cmake-utils_use_enable doc PDF_DOCS)
+		-DENABLE_CURSES="$(usex ncurses)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_PLUGINS="$(usex plugins)"
+		-DENABLE_IPV6="$(usex ipv6)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_PDF_DOCS="$(usex doc)"
 		-DBUNDLED_LIBS=OFF
 		-DSYSTEM_LIBS=ON
 		-DINSTALL_SYSCONFDIR="${EROOT}"etc
 	)
 		#right now we only support gtk2, but ettercap also supports gtk3
 		#do we care? do we want to support both?
-
-		#we want to enable testing but it fails right now
-		#we want to disable the bundled crap, but we are missing at least "libcheck"
-		#if we want to enable tests, we need to fix it, and either package libcheck or allow bundled version
-		#$(cmake-utils_use_enable test TESTS)
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch b/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch
new file mode 100644
index 000000000000..b7703d3ef5ca
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.2-openssl-1.1.patch
@@ -0,0 +1,254 @@
+From f0d63b27c82df2ad5f7ada6310727d841b43fbcc Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Mon, 27 Jun 2016 12:41:33 +0200
+Subject: [PATCH 1/2] First draft of openssl 1.1 compatibility layer (from
+ https://github.com/curl/curl/commit/cfe16c22d7891a1f65ea8cd4c5352504a2afbddc)
+ Closes: #739
+
+---
+ src/dissectors/ec_ssh.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/ec_sslwrap.c        | 14 ++++++++
+ 2 files changed, 106 insertions(+), 1 deletion(-)
+
+Index: ettercap-0.8.2/src/dissectors/ec_ssh.c
+===================================================================
+--- ettercap-0.8.2.orig/src/dissectors/ec_ssh.c
++++ ettercap-0.8.2/src/dissectors/ec_ssh.c
+@@ -36,6 +36,10 @@
+ #include <openssl/md5.h>
+ #include <zlib.h>
+ 
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
++#endif
++
+ #define SMSG_PUBLIC_KEY 2
+ #define CMSG_SESSION_KEY 3
+ #define CMSG_USER 4
+@@ -138,6 +142,11 @@
+    char tmp[MAX_ASCII_ADDR_LEN];
+    u_int32 ssh_len, ssh_mod;
+    u_char ssh_packet_type, *ptr, *key_to_put;
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++   BIGNUM *h_n, *s_n, *m_h_n, *m_s_n;
++   BIGNUM *h_e, *s_e, *m_h_e, *m_s_e;
++   BIGNUM *h_d, *s_d, *m_h_d, *m_s_d;
++#endif
+ 
+    /* don't complain about unused var */
+    (void) DECODE_DATA; 
+@@ -383,12 +392,25 @@
+             if (session_data->ptrkey == NULL) { 
+                /* Initialize RSA key structures (other fileds are set to 0) */
+                session_data->serverkey = RSA_new();
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++               s_n = BN_new();
++               s_e = BN_new();
++               RSA_set0_key(session_data->serverkey, s_n, s_e, s_d);
++#else
+                session_data->serverkey->n = BN_new();
+                session_data->serverkey->e = BN_new();
++#endif
+ 
+                session_data->hostkey = RSA_new();
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++               h_n = BN_new();
++               h_e = BN_new();
++               RSA_set0_key(session_data->hostkey, h_n, h_e, h_d);
++#else
+                session_data->hostkey->n = BN_new();
+                session_data->hostkey->e = BN_new();
++#endif
+ 
+                /* Get the RSA Key from the packet */
+                NS_GET32(server_mod,ptr);
+@@ -396,19 +418,37 @@
+                   DEBUG_MSG("Dissector_ssh Bougs Server_Mod");
+                   return NULL;
+                }
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++               RSA_get0_key(session_data->serverkey, &s_n, &s_e, &s_d);
++               get_bn(s_e, &ptr);
++               get_bn(s_n, &ptr);
++#else
+                get_bn(session_data->serverkey->e, &ptr);
+                get_bn(session_data->serverkey->n, &ptr);
++#endif
+ 
+                NS_GET32(host_mod,ptr);
+                if (ptr + (host_mod/8) > PACKET->DATA.data + PACKET->DATA.len) {
+                   DEBUG_MSG("Dissector_ssh Bougs Host_Mod");
+                   return NULL;
+                }
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++               RSA_get0_key(session_data->hostkey, &h_n, &h_e, &h_d);
++               get_bn(h_e, &ptr);
++               get_bn(h_n, &ptr);
++#else
+                get_bn(session_data->hostkey->e, &ptr);
+                get_bn(session_data->hostkey->n, &ptr);
++#endif
+ 
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++               server_exp = BN_get_word(s_e);
++               host_exp   = BN_get_word(h_e);
++#else
+                server_exp = *(session_data->serverkey->e->d);
+                host_exp   = *(session_data->hostkey->e->d);
++#endif
+ 
+                /* Check if we already have a suitable RSA key to substitute */
+                index_ssl = &ssh_conn_key;
+@@ -424,7 +464,7 @@
+                   SAFE_CALLOC(*index_ssl, 1, sizeof(ssh_my_key));
+ 
+                   /* Generate the new key */
+-                  (*index_ssl)->myserverkey = (RSA *)RSA_generate_key(server_mod, server_exp, NULL, NULL);
++                  (*index_ssl)->myserverkey = (RSA *)RSA_generate_key_ex(server_mod, server_exp, NULL, NULL);
+                   (*index_ssl)->myhostkey = (RSA *)RSA_generate_key(host_mod, host_exp, NULL, NULL);
+                   (*index_ssl)->server_mod = server_mod;
+                   (*index_ssl)->host_mod = host_mod;
+@@ -443,11 +483,25 @@
+ 
+             /* Put our RSA key in the packet */
+             key_to_put+=4;
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            RSA_get0_key(session_data->ptrkey->myserverkey, &m_s_n, &m_s_e, &m_s_d);
++            put_bn(m_s_e, &key_to_put);
++            put_bn(m_s_n, &key_to_put);
++#else
+             put_bn(session_data->ptrkey->myserverkey->e, &key_to_put);
+             put_bn(session_data->ptrkey->myserverkey->n, &key_to_put);
++#endif
+             key_to_put+=4;
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            RSA_get0_key(session_data->ptrkey->myhostkey, &m_h_n, &m_h_e, &m_h_d);
++            put_bn(m_h_e, &key_to_put);
++            put_bn(m_h_n, &key_to_put);
++#else
+             put_bn(session_data->ptrkey->myhostkey->e, &key_to_put);
+             put_bn(session_data->ptrkey->myhostkey->n, &key_to_put);
++#endif
+ 
+             /* Recalculate SSH crc */
+             *(u_int32 *)(PACKET->DATA.data + PACKET->DATA.len - 4) = htonl(CRC_checksum(PACKET->DATA.data+4, PACKET->DATA.len-8, CRC_INIT_ZERO));
+@@ -482,19 +536,34 @@
+             key_to_put = ptr;
+ 
+             /* Calculate real session id and our fake session id */
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            temp_session_id = ssh_session_id(cookie, h_n, s_n);
++#else
+             temp_session_id = ssh_session_id(cookie, session_data->hostkey->n, session_data->serverkey->n);
++#endif
+             if (temp_session_id)
+                memcpy(session_id1, temp_session_id, 16);
++
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            temp_session_id=ssh_session_id(cookie, m_h_n, m_s_n);
++#else
+             temp_session_id=ssh_session_id(cookie, session_data->ptrkey->myhostkey->n, session_data->ptrkey->myserverkey->n);
++#endif
++
+             if (temp_session_id)
+                memcpy(session_id2, temp_session_id, 16);
+ 
+             /* Get the session key */
+             enckey = BN_new();
++
+             get_bn(enckey, &ptr);
+ 
+             /* Decrypt session key */
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            if (BN_cmp(m_s_n, m_h_n) > 0) {
++#else
+             if (BN_cmp(session_data->ptrkey->myserverkey->n, session_data->ptrkey->myhostkey->n) > 0) {
++#endif
+               rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myserverkey);
+               rsa_private_decrypt(enckey, enckey, session_data->ptrkey->myhostkey);
+             } else {
+@@ -534,7 +603,11 @@
+                  BN_add_word(bn, sesskey[i]);
+             }
+ 
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++            if (BN_cmp(s_n, h_n) < 0) {
++#else
+             if (BN_cmp(session_data->serverkey->n, session_data->hostkey->n) < 0) {
++#endif
+                rsa_public_encrypt(bn, bn, session_data->serverkey);
+                rsa_public_encrypt(bn, bn, session_data->hostkey);
+             } else {
+@@ -716,7 +789,16 @@
+    u_char *inbuf, *outbuf;
+    int32 len, ilen, olen;
+ 
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++   BIGNUM *n;
++   BIGNUM *e;
++   BIGNUM *d;
++   RSA_get0_key(key, &n, &e, &d);
++   olen = BN_num_bytes(n);
++#else
+    olen = BN_num_bytes(key->n);
++#endif
++
+    outbuf = malloc(olen);
+    if (outbuf == NULL) /* oops, couldn't allocate memory */
+       return;
+@@ -744,7 +826,16 @@
+    u_char *inbuf, *outbuf;
+    int32 len, ilen, olen;
+ 
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++   BIGNUM *n;
++   BIGNUM *e;
++   BIGNUM *d;
++   RSA_get0_key(key, &n, &e, &d);
++   olen = BN_num_bytes(n);
++#else
+    olen = BN_num_bytes(key->n);
++#endif
++
+    outbuf = malloc(olen);
+    if (outbuf == NULL) /* oops, couldn't allocate memory */
+       return;
+Index: ettercap-0.8.2/src/ec_sslwrap.c
+===================================================================
+--- ettercap-0.8.2.orig/src/ec_sslwrap.c
++++ ettercap-0.8.2/src/ec_sslwrap.c
+@@ -53,6 +53,10 @@
+ #define OPENSSL_NO_KRB5 1
+ #include <openssl/ssl.h>
+ 
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */
++#endif
++
+ #define BREAK_ON_ERROR(x,y,z) do {  \
+    if (x == -E_INVALID) {            \
+       SAFE_FREE(z.DATA.disp_data);  \
+@@ -974,9 +978,19 @@
+    index = X509_get_ext_by_NID(server_cert, NID_authority_key_identifier, -1);
+    if (index >=0) {
+       ext = X509_get_ext(server_cert, index);
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++      ASN1_OCTET_STRING* os;
++      os = X509_EXTENSION_get_data (ext);
++#endif
+       if (ext) {
++#ifdef HAVE_OPAQUE_RSA_DSA_DH
++         os->data[7] = 0xe7;
++         os->data[8] = 0x7e;
++         X509_EXTENSION_set_data (ext, os);
++#else
+          ext->value->data[7] = 0xe7;
+          ext->value->data[8] = 0x7e;
++#endif
+          X509_add_ext(out_cert, ext, -1);
+       }
+    }
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index a6d6d5b272ae..52fa7cb4cedb 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,6 +1,4 @@
-DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
-EBUILD fail2ban-0.10.3.1.ebuild 3341 BLAKE2B 0b0f7d1f4ca20d23ef9d787c04bc984e9859900f9e3fec4c691338d6638a32e6e9fa4948ce31895821a7cc4787806051059687864c2cde8fce7f13f26ef0e084 SHA512 63c23a53745ce27797eeb686fb896d3dfaf86b7a1c4a7cfddaf1f2438fef6c44dead638719f884d4ed46fe19d40edd204dad20a0d05121d1646d51a5b4a40e60
 EBUILD fail2ban-0.10.4.ebuild 3363 BLAKE2B 178fa4a4dee059f63fe8d799ebd5fd54620eb529453f4505266f47358b8cc375cf689cce0310d5cd35bb8fbbd6cc5bb9438232e73e04a075f8059bd854cff65e SHA512 f64f1ba67a5e54ab4f1953438d9d580ae1ffa30e099656c364d3b3f7ff8a20d5cb9736df417dfde36a7a665e43abc68efa5a31f8b329f6950dd713142d677aaa
-EBUILD fail2ban-99999999.ebuild 3215 BLAKE2B 8399290d5bfe3ccc696ba20ae5610bdc514defd6bd10ed0065130af0fb6b9283d8b2b60c70b6a58db7fd378d67a37832f6d0ce699d427785f5755524fd1da723 SHA512 ce07e767c99bbcaafa1305d38fea51d19ddd5ff57e215e7ae72d20ef39084a7f8c1a6a8b0d698e7571d6065bce775d2e9a1ceab2829ae4af4ad758c826d93958
+EBUILD fail2ban-99999999.ebuild 3176 BLAKE2B b058e85d40049d4e839fff75563e5b0ac829054adca875aaecad58bbd755389e2c9e0eea8096dbabf2ae4c078dd1b300de3ea8167befc658382d3e2deed873c6 SHA512 ab9e0a9ccb165d8510c597c772a65ddb6e0cccb852ca23f6225de57b9431a8d404930becc64c8af6f4568b281d95ceb1ed8fc6e32550531a13cc9e0e3eb80848
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
deleted file mode 100644
index 3dda24f6f476..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.3.1.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="http://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="selinux systemd"
-
-# TODO support ipfw and ipfilter
-RDEPEND="
-	kernel_linux? ( net-firewall/iptables )
-	kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
-	net-misc/whois
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-	)' 'python*' ) )
-"
-
-REQUIRED_USE="systemd? ( !python_single_target_pypy )"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	eapply_user
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-
-	sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if python_is_python3; then
-		./fail2ban-2to3 || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
-
-	# not FILESDIR
-	newconfd files/gentoo-confd ${PN}
-	newinitd files/gentoo-initd ${PN}
-	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die
-	systemd_dounit "${T}/${PN}.service"
-	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK  if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_7 = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2ban!"
-		elog
-		elog "Fail2ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite]; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite"
-	fi
-
-	if has_version sys-apps/systemd[-python]; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index a00563b4c262..c0387412503e 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,6 @@ python_install_all() {
 	# not FILESDIR
 	newconfd files/gentoo-confd ${PN}
 	newinitd files/gentoo-initd ${PN}
-	systemd_dounit files/${PN}.service
 	sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}"/${PN}.service || die
 	systemd_dounit "${T}"/${PN}.service
 	systemd_dotmpfilesd files/${PN}-tmpfiles.conf
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index d830fe192c0e..545bd68c6ca0 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -7,4 +7,4 @@ AUX gsad.service 386 BLAKE2B a87330e9d243b4cf951e5a9d21821a501ac2b4a4fbd37e95155
 AUX gsad.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 DIST greenbone-security-assistant-6.0.9.tar.gz 1476238 BLAKE2B 3311056256885102518e3b0e3106c23965e5a69ad4cfe13a2b34c68079a916466915b3296c80984656ff8a9f9b0aa35f5256c225250ae549d9727ad61f3a6b2b SHA512 4afb50f044b6853181c3c3e6466e7329915356bbcccecf98b89d9dc39a193392f45850f9073ac055ec826753af78e8a6368e7f9ac52734a3b5e254d124180d68
 EBUILD greenbone-security-assistant-6.0.9.ebuild 1308 BLAKE2B 3698cf939f27d441dbdc9feeb5b29be859e2b80360eec531e3a2e54b58d12f18d7be7f7f82d4152f0331e471cf8d862e8ffb942366391662b0706edfb3404f69 SHA512 c44a805020ed43474435946aa514a5cd712b7e0872d30600bbf4d875f8f9f8837bb43efab5104c263bf4bf05d10de89cdcf82ff0ad21e8e3f7b9b50b56c69905
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index dd0112a1781f..7ded7e178665 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -2,8 +2,8 @@ AUX nagstamon-2.0-setup.patch 1095 BLAKE2B 6dfc2516266a1cc70b527573fd941a7cc41d9
 AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6
 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f
-DIST Nagstamon-3.2.tar.gz 545142 BLAKE2B 22346395a23fbc875e5262cf4a9c23d1350c060ddba1a2a554d86bfa4b7b2500e5f7d6163f015c7dc6ab71669f613287235e19246de0ba3c6c22c362158710e8 SHA512 6a49dd1a86d8388cb3092b1971eebde5783d7cca46c36e93adcd5afecf041163d75c70ef5f7e59d725e8744b86785f0f2fee5e14475023a19362babe142659c8
+DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6
 EBUILD nagstamon-2.0.1.ebuild 1193 BLAKE2B 9364c8ec44986d3352e29ba9a543cb417f812c114746e5743bf5993463d34adff33c75967c8bb3fae6783cda1a5653601afcdcf03d4c6d86c3eb1d4f79fb6f68 SHA512 4e4e469d11fcb40dfc5a3a2f0ce5c95886432c92f11116f9e860fb7f3ae7a0159ea26108bf32729ef75807bc37e885e96cb97b22e9b806057eeac0e27ae298e1
 EBUILD nagstamon-3.0.2-r1.ebuild 1383 BLAKE2B 19c84d6faa5a09290a73da7252060e5a23fa52f0c040e8fad80154269595f291933c8150e6b714cd4882e3164696e0f35aed75144f6b5cec8fe3e37e101f1596 SHA512 42ed49a6983b713c208e7cf59214fbd25056cfb014d73ead0039d1a127238d59718218e2ff9731ea6a9eedbe959a234360d703f162d947fb3c424c80de4f3e36
-EBUILD nagstamon-3.2.ebuild 1509 BLAKE2B d3fe8a51cf09f29f6636b973873747d520e2323bf1d4c737aed6a2178ee3e10f1b043d18a22ed9d678872f51870c4511411e6794bc4cb2560b40216d71870f0f SHA512 034530306d182fdb7a6bdbe2d1c628a759a02476789cf0062fee0d933f413f7cdf49a3ca5eb377f0baff10fc22be04c6ac99f953d1fcb2e88724c31dcae30c93
+EBUILD nagstamon-3.2.1.ebuild 1509 BLAKE2B d6881601f24d5b93909bd1f40ed14743531368bc6f8dc9986693a62b3e4c813e0d80efe31dc170298990a60b5ae192d9d295da62271a1a46dc653fe3800a6774 SHA512 fd69b0d24c2a6830dcc6e46aa2ed155bbf676c6322e5dd757440b1f43ba3d94514d963efda997a2f94757d6bd28cffca8a5daabb1435773e2488b3d495028270
 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64
diff --git a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
new file mode 100644
index 000000000000..50e2743bf1d8
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_p/-}"
+
+DESCRIPTION="status monitor for the desktop"
+DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
+HOMEPAGE="https://nagstamon.ifw-dresden.de"
+SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
+	dev-python/requests-kerberos[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	# pre-compressed already
+	rm Nagstamon/resources/nagstamon.1.gz || die
+	sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
+
+	mv ${PN}.py ${PN} || die
+
+	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+}
diff --git a/net-analyzer/nagstamon/nagstamon-3.2.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.ebuild
deleted file mode 100644
index d734e9dc56f8..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils python-r1 distutils-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="status monitor for the desktop"
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.ifw-dresden.de"
-SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
-	dev-python/requests-kerberos[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/${PN}-3.0-setup.patch"
-
-src_prepare() {
-	default_src_prepare
-
-	# pre-compressed already
-	rm Nagstamon/resources/nagstamon.1.gz || die
-	sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
-
-	mv ${PN}.py ${PN} || die
-
-	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
-}
diff --git a/net-analyzer/openvas-cli/Manifest b/net-analyzer/openvas-cli/Manifest
index b9f6b7f49ba0..9efa6ca7dff2 100644
--- a/net-analyzer/openvas-cli/Manifest
+++ b/net-analyzer/openvas-cli/Manifest
@@ -1,3 +1,3 @@
 DIST openvas-cli-1.4.3.tar.gz 108228 BLAKE2B d8f657fde8d1cac257dac8e87fdea23401ce1f89ccb08a63c8c63f5aae9c83ff663193425eabb86481ee697ecf6bf1f893325ba472a794c83586464d24e7ecbc SHA512 a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3
-EBUILD openvas-cli-1.4.3.ebuild 695 BLAKE2B 3c6009be2cc54c75afca95a38f70c81373bdc7cdf1c24ff9789f45da8e733c59ffe75cf7a66528dfaae91f089f053da70b4f1a5d85ea5b8d0ee18c9301a11597 SHA512 102809a74751aaa126f9aec10e6f013e52ffeac6eae7a92bf8f645a6878bc13c067ff4ee1970c3cf1bd553644977190cb3e4bbb0087fb6b62e82baf368825cb6
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+EBUILD openvas-cli-1.4.3.ebuild 700 BLAKE2B ae3f5caeacb945926cc42296b4c42742cc78c30b08493e925974bd6b7f31ffe24bee8526f3047bcf06a3cca93d118f34ea0a6a4332c9969c6a521e645f3cb676 SHA512 31dba434ab0eb9cb00417304ccc0146b53e8b87379114c6f5529e8d0f70ab654342ac5a924b56f7120d765e8d37d1d107fa2476660b0e8a4fece623556e75f62
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-cli/metadata.xml b/net-analyzer/openvas-cli/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/openvas-cli/metadata.xml
+++ b/net-analyzer/openvas-cli/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
index 726bf0767d7c..4d74bab65036 100644
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit cmake-utils
+EAPI=7
 
 DL_ID=2209
+inherit cmake-utils
 
 DESCRIPTION="A remote security scanner for Linux (OpenVAS-cli)"
 HOMEPAGE="http://www.openvas.org/"
 SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	>=net-analyzer/openvas-libraries-8.0.4
-	!net-analyzer/openvas-client"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+RDEPEND="${DEPEND}
+	!net-analyzer/openvas-client
+"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"/${P/_beta/+beta}
 
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index 6e498ef3e98b..bdd060062ae2 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -2,5 +2,5 @@ AUX openvas-libraries-7.0.4-libssh.patch 664 BLAKE2B e1d0c53fbf665685514337d5491
 AUX openvas-libraries-8.0.1-include.patch 3363 BLAKE2B b79ca4d652d04631343e6d918b34768d171a7a12ad2abe037e1d60b394044d1cbcde7b9ea6a50b33fa65b9b1746feba86d4fc388540c82fe9f0f7fb335c5086d SHA512 f3427464c1d3cdc875d4ef56d831e3dabed6431ef75450d86d2ba977379579e0b9f15544a22d336c24849b5aef08824139a18c137f62081718e5663e141cf114
 AUX openvas-libraries-8.0.5-underlinking.patch 1966 BLAKE2B fef13eb8eb768da537e223d85a99f5759412884dc7c56fbd03276dea7f9afa000f9e5d791ea54aab7c0ca04e53701c45da823adc29d5964eeb0903ddce8f56c1 SHA512 ca917e7615aff2f056aac8fe15f5e7670e2df7e260886155dbe8331121ef8bb8809ca7bf3bea4baa5c159c7c5e0e5fac6459d3c34080a41893dd612b0662d55d
 DIST openvas-libraries-8.0.5.tar.gz 603947 BLAKE2B 493a6b2f5cea7e78ce69b9fe730a4d6df89601e0c48cfbc3b0ab1480326c32bb479768c4a54d08bfcb67db0b2ad4ca28990ead57554abd9fd877e7f79b339d8f SHA512 3d788f931c55941663187f8038c15d0ff97799048c8ea9e5615ff22de3c5e6b5e4eaa599e41676778fadc50528c086060b6268b5edfbaf7289f0e498dbb1423b
-EBUILD openvas-libraries-8.0.5.ebuild 1256 BLAKE2B 02179bb4b7334e2acab2ceb337e71b7a6298b0e213410b58686cf7fc852585116bad9a0455450ae2129157fe686cd6064ba862e50f1ccea4511827a8c01458e5 SHA512 21c1b7ea4a6ba63dd96124a83ed447517fa80ecc708fe13eb02cd6893726b0bfda50960d644edb280a1e11544ca0cc292db89d6548c98c6b91827152f3a82f70
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+EBUILD openvas-libraries-8.0.5.ebuild 1262 BLAKE2B 21f6520e857d2b940280d6e9d6a1dbe7f7e52337589e9b66c2c136f63c717e5a6bc5abc22afdc3792dd1722ed2e154709464274e6fc045f64cf5b2d91f56f763 SHA512 b060bf8c8b5986ed901a11d222274a1ae018fc9d2ed92e9204567c25d5ac79f1e7dbb20ba77d8943a2335c9639a43be120d226e2537ef4ea309f7a44f39c7273
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/net-analyzer/openvas-libraries/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/openvas-libraries/metadata.xml
+++ b/net-analyzer/openvas-libraries/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
index e279652477ff..988e909151bc 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit cmake-utils
+EAPI=7
 
 DL_ID=2191
+inherit cmake-utils
 
 DESCRIPTION="A remote security scanner for Linux (openvas-libraries)"
 HOMEPAGE="http://www.openvas.org/"
@@ -16,23 +15,26 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="ldap"
 
-RDEPEND="
+DEPEND="
 	app-crypt/gpgme
 	>=dev-libs/glib-2.16
 	>=dev-libs/hiredis-0.10.1
 	dev-libs/libgcrypt:0
 	dev-libs/libksba
-	!net-analyzer/openvas-libnasl
+	net-analyzer/net-snmp
 	net-libs/gnutls
 	net-libs/libpcap
 	>=net-libs/libssh-0.5.0
-	net-analyzer/net-snmp
-	ldap? (	net-nds/openldap )"
-DEPEND="${RDEPEND}
+	ldap? (	net-nds/openldap )
+"
+RDEPEND="${DEPEND}
+	!net-analyzer/openvas-libnasl
+"
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	"
+"
 
 S="${WORKDIR}"/${P}
 
@@ -42,13 +44,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
 	"${FILESDIR}"/${PN}-8.0.1-include.patch
 	"${FILESDIR}"/${P}-underlinking.patch
-	)
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	sed \
 		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
 		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-analyzer/openvas-manager/Manifest b/net-analyzer/openvas-manager/Manifest
index a85a967cae53..30850380e6d1 100644
--- a/net-analyzer/openvas-manager/Manifest
+++ b/net-analyzer/openvas-manager/Manifest
@@ -5,5 +5,5 @@ AUX openvasmd.init 452 BLAKE2B 714f516172815230b9a2b4ac9f8a4eeefc0a8eba6410914ee
 AUX openvasmd.logrotate 178 BLAKE2B ba33a53ff1b38efe18906625f678e3263b3222cda8f2a49e0274cadbd423ef5cd6684a52133175d5f524550f0e057ec6128f9f14745ea890bcbc205c93a5feb5 SHA512 dad461ea48cc49c3f5e77bd69c09f2551a42e588cbd479b91ae1410ba88ae0c783ee5b273a34edb46ca196e7ba19227168efce842b1a5c39e6a46516b6fab5db
 AUX openvasmd.service 362 BLAKE2B ec99c9f570310665ea0fc84569f996a1eb9c0b22128310f8f7161cb11f9729ef61b1631d2855215633b1dab392790e84ea11f7d79dbd3e315c4e73f5563a3f22 SHA512 8753699635050da10b7d317caa60361c59f832b6a1624d9fc2cbedffadbd554fddf612a92ad1e0ef057b83420b36468fc9f7ee67e3161d4c37816e0c8e9239a8
 DIST openvas-manager-6.0.6.tar.gz 1928570 BLAKE2B 6a94dfcfb99404f6b274faf0ac3c8ca1a3d65c9feb9bc8d11818e2c23e6d73a74d619519ed30eb42e74a686ffe43eeb6016ab1065cdecbc8f83ccd34257b5185 SHA512 4c4ae0ac35d6fc6820b47da6e5e6aae1b4d14c771791b7ae2e35123d8117319f05c7619de665b96de9d92fb59e417311656d3460dff992d3ce4db217731c5900
-EBUILD openvas-manager-6.0.6-r2.ebuild 1273 BLAKE2B 3efd72f06a0dadea7b89d8ea52504399790be8bab8e62ce00c39c2fb80f4c63c859c3ba893717e93dbfde9c12f73b01fa50cbdd673ec08400a6ac8de26ee9917 SHA512 e2a3323238fc42a6d19efe6cfa1a1b3ab518b94c7614754550da9118f4e28fd8a4d507ec47469ee38d09a3a590f60d7b190b6175ee8ba483bfe5e91ac4ab24d4
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+EBUILD openvas-manager-6.0.6-r2.ebuild 1278 BLAKE2B 290db543ab1941d2b827458b3caef1f0427208ff5c738576be8a8fd315f40af6385405afdba52da5c85539806d67143792915033d988b5788bb16b33f5ab7132 SHA512 3f39dff221f5a5b6bff825475c232c6ca22337f63b99608dbad342d8055db1761059359ec575079f65cc34261deedfed54a642042246e261f79eb9b42a9126d5
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-manager/metadata.xml b/net-analyzer/openvas-manager/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/openvas-manager/metadata.xml
+++ b/net-analyzer/openvas-manager/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
index d852593f5651..64a151553116 100644
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvasmd
+EAPI=7
 
 DL_ID=2195
+MY_PN=openvasmd
+inherit cmake-utils systemd
 
 DESCRIPTION="A remote security scanner for Linux (openvas-manager)"
 HOMEPAGE="http://www.openvas.org/"
@@ -15,35 +13,39 @@ SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.t
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
-RDEPEND="
-	>=net-analyzer/openvas-libraries-8.0.5
-	>=dev-db/sqlite-3
+DEPEND="
 	dev-db/redis
-	!net-analyzer/openvas-administrator"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	>=dev-db/sqlite-3
+	>=net-analyzer/openvas-libraries-8.0.5
+"
+RDEPEND="${DEPEND}
+	!net-analyzer/openvas-administrator
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.1-bsdsource.patch
-	)
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	sed \
 		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
 		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLOCALSTATEDIR="${EPREFIX}/var"
 		-DSYSCONFDIR="${EPREFIX}/etc"
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 3394a3524ccd..c3ca837683ec 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -10,5 +10,5 @@ AUX openvassd.logrotate 209 BLAKE2B d3ac1128f5c91a9e2a247a9fedc928045d1321853410
 AUX openvassd.service 353 BLAKE2B cbced6ebe3a4e1ecf12534ec14d860a4f221824cf9cdcee0eddb3da7d7566b841a8a52fd118c9fdfd3d875ec1728856a4eb9619f22a1111aab3c48f68eabb150 SHA512 418ca16f7cbfd5a2e7aff031810c9166743738eaa8b38ded7eb763796364c77dd4d19a09705a2da81df1b4591e2a0f7beed5d075c75a205133148903ec23f8f4
 AUX openvassd.tmpfiles.d 28 BLAKE2B b9343651fc4923451b02a5f72cad7da95e4d790a7b77eb72ca239588568a5d2b88cad1f9f698ad61403c332a44005989e8d6e67ff1ad06cab26abdf67f8d8621 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754
 DIST openvas-scanner-5.0.4.tar.gz 236282 BLAKE2B 3105afe0fd819773b33c8194e0addaad70af4692578fe3bfbd76166004ca99e25f2f22a946810fe52da747242f1e45bae00766c4687676ec70df2d7349fa4509 SHA512 51267f832a104897a497b5dc71d1b804de4db77742e2234d111a00b1e0e01536613b16ff48d23a37013178b016b39408a25d18a694980c7e6fc600824e05e149
-EBUILD openvas-scanner-5.0.4-r1.ebuild 1552 BLAKE2B 52ef94df13c4e3ac61bc89a7083fdbe5d078d0e7a44bd88be12548b73279b7b609ef8a50700faa0dced183192f16be7829a5f70b63d6677f0cbf28d121a2d31f SHA512 c8f54b34ef1721e0d0f5319a8334949fd6eb97f100bc9b91ceca23960ef2e2c3d10734736e2157a14cdc42aab474f5975504e06c0aa936d160119841933e6fc2
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+EBUILD openvas-scanner-5.0.4-r1.ebuild 1558 BLAKE2B 72a9e2d5ed1d6ee81be46eeb4cd23383a5ffc73b0d8bd4901fc4f17c2c98068141fb9a75b565ef40e4c525cfc36829ac090520318180b38af61e5ab4618da04b SHA512 8a6f8a1fbe310ad43eb341f02dee3b75da7dc3031a9d5407f6cca41787d558ef77d2301dd96ee6a56752ed6b91b26ee2e44cfea648c021651c2fdc59bf458b72
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
index 4d550d82f4f0..ac7d2ea314e2 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=openvassd
+EAPI=7
 
 DL_ID=2129
+MY_PN=openvassd
+inherit cmake-utils systemd
 
 DESCRIPTION="A remote security scanner for Linux (OpenVAS-scanner)"
 HOMEPAGE="http://www.openvas.org/"
@@ -15,18 +13,22 @@ SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P/_beta/+beta}.t
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	app-crypt/gpgme
 	>=dev-libs/glib-2.16:2
 	dev-libs/libgcrypt:0
 	>=net-analyzer/openvas-libraries-8.0.2
+"
+RDEPEND="${DEPEND}
 	!net-analyzer/openvas-plugins
-	!net-analyzer/openvas-server"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	!net-analyzer/openvas-server
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P/_beta/+beta}
 
@@ -34,13 +36,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-mkcertclient.patch
 	"${FILESDIR}"/${PN}-4.0.3-rulesdir.patch
 	"${FILESDIR}"/${PN}-4.0.3-run.patch
-	)
+)
 
 src_prepare() {
+	cmake-utils_src_prepare
 	sed \
 		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
 		-i CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-analyzer/openvas-tools/Manifest b/net-analyzer/openvas-tools/Manifest
index 7e4b756f6091..f9851977ef3f 100644
--- a/net-analyzer/openvas-tools/Manifest
+++ b/net-analyzer/openvas-tools/Manifest
@@ -1,3 +1,3 @@
 DIST openvas-tools-0_pre20512.tar.xz 46100 BLAKE2B 4d497ef59620818c872756b9b251fa813b255d172e0e9968a130700f7851342b7a238790637e3fe93d93b664e2cc01af28d55c006ae38a64480be26fd4f824eb SHA512 ab524c18a9c9cbfbc742d19c55c7eacc99c39d9209d3f915a6e0070c662f9761cc55b1166dfb48cdaab2607a07ea0640ff9f0a3d48a364409e516a3142f96cbb
 EBUILD openvas-tools-0_pre20512.ebuild 562 BLAKE2B 66992b6e76a532348fb3cfdfc0ac010c8e7b1f244189a353db2201d53139fa12cbd6892e86ec9e8e4e4f1bccb8863c171fab22a6a394fffdf55fce0ac096decc SHA512 26026784420869596ac51e1c1437bf5a6bc2040287091ae386c693a5b83f3f922ecd8bd2e1c3d8c91b6d9dc730378feb05413c38c492250329b5f4fd9219d01f
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/openvas-tools/metadata.xml b/net-analyzer/openvas-tools/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/openvas-tools/metadata.xml
+++ b/net-analyzer/openvas-tools/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/openvas/Manifest b/net-analyzer/openvas/Manifest
index 340730ed79f1..adb102e85b7b 100644
--- a/net-analyzer/openvas/Manifest
+++ b/net-analyzer/openvas/Manifest
@@ -1,3 +1,3 @@
 AUX README.gentoo 1029 BLAKE2B e44091e9ea96dd210d0e31033212893c8197bff4393b8cb6a4ce38bc53ed43b8ecad649f8b47683346c0c353c7c06e29e64d298be19ba0fc8db2d0d36411b2cf SHA512 aeff351d306e4bc818b48d254c9efd618818b9ae1025285e97105908746628db469b4fa4620cb0db3032f58f50f3615779cf35c098e3e7819c01c24ee0adefc5
 EBUILD openvas-8.0.5-r1.ebuild 1460 BLAKE2B 4e0553cdf1cdd6055e7940d96c5e2336d557f09dbcbac2ca23f78e38cfe6062e6926a79c4afdd0f0d5fbf1a0659c0866e5e0cabc23958a36a974c25ad38181a3 SHA512 46582e09a8bada805ec596ff3d11493a678d33b5133b815b4812a5258733853af3f42664657d98e53ad8de47ad1f3e7bf404ea8b63406e25d8ca7f91ae564d30
-MISC metadata.xml 292 BLAKE2B f3a6fa2bcf1e6e8e1ea40c19ef0064af31e3ef2a9c78e6fa60058a3a9594ec09552ba69dfc791e3d9087f376c08c73789782c28f8cfdf449535dd0d1f9d50766 SHA512 6e85f9ffe2dd906265dbd40ce11254d73ed28ff45d5db913571fe0e289a339dbc93e0a2464ae506a6e21fd3730f4a5cccf245b771f746503800d455e6d894911
+MISC metadata.xml 238 BLAKE2B b91a7f19a4d87dcd97331129a73b88ef7b3e61da88b6e2b1832cbc8e5f6feee8c1e178ba49315486bbd64bc5fe374ce6adfb2e7d3d93d797abfd92569faa6b84 SHA512 25c65cad6aecb4c0b9c49ab598ede40d984bfec04205e28255db36e9f4a0c3dd26d20f4a9f6fe93b7c5503925b81fe7e9ea58afb5805ad08f2f24b2565073a8b
diff --git a/net-analyzer/openvas/metadata.xml b/net-analyzer/openvas/metadata.xml
index deaaa375afde..38b8343826ee 100644
--- a/net-analyzer/openvas/metadata.xml
+++ b/net-analyzer/openvas/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hanno@gentoo.org</email>
-  </maintainer>
+<!-- maintainer-needed -->
   <use>
     <flag name="pdf">Enable pdf report creation</flag>
   </use>
diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest
index 283520237b60..a7583d6fc950 100644
--- a/net-analyzer/ospd/Manifest
+++ b/net-analyzer/ospd/Manifest
@@ -1,3 +1,3 @@
 DIST ospd-1.0.0.tar.gz 39656 BLAKE2B 754a7fcca382617ce7eed33d8d148d516c550435da7abed0e294e216898c0ad96d53bae62e5396b590812015c9a71be5346187d521c4051d5b2dc04345336b59 SHA512 64b1b42c5292dc8cf8b1ffde9082f4d05ff62f4d0bf2ed7b2b5d2ba4d3c3611ae8af30b39c8becb9f6bdc36eb519a0b881cdeb50891e5a2273003f6181cbebfb
 EBUILD ospd-1.0.0.ebuild 656 BLAKE2B ddddf826a72c516f10f3421ea7a7f45ebfa0b42dad541842d6a9209f60c6c6584bab1d9d43b4b9c0e22be54f7a4951667149dfdc17d710a828b0bd01613a48c2 SHA512 059abfdeb1701da5897b6c3d30b69228c04e7ba52e238a865861f7104465b7b94226bb391e084aeeb46c5db37bcb312054dd1af4b8908f3d20401786f7166c23
-MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
index 38ce6c17a3f2..6f49eba8f496 100644
--- a/net-analyzer/ospd/metadata.xml
+++ b/net-analyzer/ospd/metadata.xml
@@ -1,7 +1,5 @@
 <?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>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index 6aab899394f3..6aeef4c1a34b 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,9 +1,8 @@
 AUX tcpreplay-4.1.0-enable-pcap_findalldevs.patch 601 BLAKE2B 33c38be287593dfeb2693bf6ce9fb259db42bcce63ce05904fb510aa8775c9acad045ce974cd1c4aea01975e053b7fc2e5794a3f0b2f21d2a910e4f08d1f29cf SHA512 6aa44d082e068de90a431071d94e4351257e5074f1b36617c1d7226ed18c5a6e76f06a0e9f20f41772e1d33af72ea23cbaa29a4dcf3018a567412a0d0fac72de
 AUX tcpreplay-4.1.2-CVE-2017-6429.patch 858 BLAKE2B 988facdce3f6264edbd4712548248ee52db5347361d8dbece0a691d941f77d5e7751cd43def5dddf85c8028935b65e945e1adbab2966197ba6e38233bd73bfcf SHA512 934a42f9b70c882780a4a2fe3c9621b8a8380199ea63056291d27cbce006afcddc7331f9b73c8c244e89229c8526c55d2f534bedba50fb3d28ec3b873f700e3f
+AUX tcpreplay-4.3.0-enable-pcap_findalldevs.patch 333 BLAKE2B 1beb39a7263bf8491998760e4a62ac8908300e28c43500812d37d2512f9d63fcd175b93c1b384e03e9570e741dd95dea09ead017a014a4b62b3449833fe9b248 SHA512 3d035736c0656f6ace85b45af595866e06c8464641023e9d1606c288e598cde18eb96b1be8300514f6f31bc83756ae76b436402666036456571201ca38fe5026
 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
+DIST tcpreplay-4.3.1.tar.xz 746804 BLAKE2B c1feb541b8243b00b2fa6ee9742ced4ef47c58a58d3a95be88faa0fa4301da0cb962a620df724cd4526ea31e74a0e7d7161eb44afea37467a19976a20855e0e0 SHA512 2dbad1a88ed19db897cc1222883c02eb7f0808f64cafb3c3ef8f21c0cfcb14d3ebb92a8a01ea203ca128ed675d2e7dcdb30d0bce30eb79e729d9d45d309f9220
 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 1927 BLAKE2B dfc35af47ade8207971ace379041582cf537a84ff866702a87cec4e9a0fce3248b473491e07fdac8773d06e267305b5309d52a636cbc17e4b35add19ead3f903 SHA512 b21165352d6bd301ef2f5a413a2636c9faa8018b44449d5971783fa2114716ddf3a38daf9f019f38dc676ca775e4d7f9bcfb571c89757cc054afdd71ff40c7fd
+EBUILD tcpreplay-4.3.1.ebuild 1923 BLAKE2B b51180c65c8770244a3a0c2fee360ea15f55b26f5e4c20698f7523fdadfe5949e4930991fd55e43e024ac800724b0460be64e4bc07e6dabd414936833439e451 SHA512 57bb6e1cc42b79b38e18e5ecc0bdfd5eb3ac9e46cb86857e6f02ba52e9b366f8daacf1d1b458268e63d9ffa7d59f54f3be8f30778aa1ed03417726e29a4fd4b1
 MISC metadata.xml 1116 BLAKE2B 23c8b7009a77b68831affc57432a87a31fde213d7e7ee88f68ced4a4e21a56c55f97497e610fc486a42c699759ef1edf1904fa9b0fe976df4fc9930535f97037 SHA512 58cb13a648ba7b9f9fd8c7a7cdfd37d56f0d7b957824a55d63001a8708f93d529b29e52df051bdce0c87eb672d24c7b2c35ee8a1e94ba062e2a1e12dd0d0ee1b
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch
new file mode 100644
index 000000000000..6c4d2c02dc0a
--- /dev/null
+++ b/net-analyzer/tcpreplay/files/tcpreplay-4.3.0-enable-pcap_findalldevs.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1499,6 +1499,8 @@
+     AC_MSG_WARN(Unable to do tests when cross-compiling)
+ fi
+ 
++disable_pcap_findalldevs=no
++
+ dnl Allows user to choose which nic to use for testing purposes
+ AC_ARG_WITH(testnic,
+     AC_HELP_STRING([--with-testnic=NIC], [Select which network card to use for testing]),
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.2.6.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.2.6.ebuild
deleted file mode 100644
index ee0ea9dffd4b..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.2.6.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 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.gz -> ${P}.tar.gz"
-
-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-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
deleted file mode 100644
index d9206da3d29c..000000000000
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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 ~arm ~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-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
new file mode 100644
index 000000000000..1dfd57b11cd6
--- /dev/null
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~arm ~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.3.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) \
+		--enable-dynamic-link \
+		--enable-local-libopts \
+		--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-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 50894099ae22..8e78f033e794 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,5 +1,8 @@
+AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c54d3926f2443fb4c62bb37756ad9dbf0010e145421f684eb4ce04cde621f32aa3a6da22e37b5336868647d0bdf4755002c805 SHA512 d20a36a0ca57991f333d783db2442f14fcf06b1e88936b527edcf2973d82dbc88514eae5e051197d7dc4ce25f16bc10799bb91f5baf4a98076c22f60fecb2065
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
+DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6
 EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
+EBUILD tcptrace-6.6.7_p5.ebuild 1250 BLAKE2B 786c6ff2d34b2155830acb942d3a37731335ccc81642ab9c43118ea39e3ac01df8cfdb7824c67ce1994cd93572f9cf6b34d75ffe0bce12fa14c9ac3ab05b4a37 SHA512 3ec354b314768b594e3b31eef8df45d41af4faa84db0b0100c30bebfca2e5078eadacad0481da923dac53956f3b385b69ed0d285ae0726382ae4e410756c71ac
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/files/tcptrace-6.6.7-_DEFAULT_SOURCE.patch b/net-analyzer/tcptrace/files/tcptrace-6.6.7-_DEFAULT_SOURCE.patch
new file mode 100644
index 000000000000..4513f5100498
--- /dev/null
+++ b/net-analyzer/tcptrace/files/tcptrace-6.6.7-_DEFAULT_SOURCE.patch
@@ -0,0 +1,14 @@
+--- a/configure.in
++++ b/configure.in
+@@ -93,9 +93,9 @@
+   *cygwin*)	V_PCAP_LDLIBS="-lwpcap";
+ esac
+ 
+-dnl define _BSD_SOURCE for libc-2
++dnl define _DEFAULT_SOURCE for libc-2
+ if [[ -f /lib/libc-2* ]]; then
+- V_DEFINES="$V_DEFINES -D_BSD_SOURCE"
++ V_DEFINES="$V_DEFINES -D_DEFAULT_SOURCE"
+ fi
+ 
+ AC_SUBST(V_CCOPT)
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
new file mode 100644
index 000000000000..acb7c415420a
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${P/_p*}.tar.gz
+	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-cross-compile.patch
+	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	default
+
+	eapply \
+		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
+
+	eautoreconf
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3d1e3513c4f9..1f119c06c439 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,6 +6,7 @@ AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c
 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
 AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
 AUX wireshark-2.6.3-docbook.patch 1457 BLAKE2B 8e0c940b522a9ec11781f594c30343a3b9b2b81b70c91bfe5afbf36b3e1a341374a7182bdb317a2738de5e0a1dbf98b709d19d2f339a305be9e46d8f2303c17e SHA512 181f259a6330204bde89ddf8bf8ea10a80b3c47c25eb252060acd820dbf8cca2c4b390af765fd174722e909ec7a9fd903245bcce1f6d7f82fecd3e26994bbf19
+AUX wireshark-2.6.6-androiddump-wsutil.patch 324 BLAKE2B f72415948a15cdfa2eae24bd2af00c64ede367007c8ee969ae76a7d391a209f47d96431a61484ac9d780111f05e2262083601a9e3ca81453b6a5a1293979021e SHA512 2b26ac08ade3ba51c53fd17db7722fd7182330bf68ac3db851b19e246f8ac808cf7f5e6a85a58d91a2566a254c4e57b14b61188e56f75e3df0028a7ae0726125
 AUX wireshark-2.9.0-tfshark-libm.patch 134 BLAKE2B 364acc14eaf74d134b9905c240a3a6074138a259ce6a0a4a08496884d34961cbcbcba6204a47c62e015207d551abe5c5b30430333f185773347157162a027d4d SHA512 5cbbe6fc9aef5f26216ede7e5ece4fa8b5e2aeebc478c761a8b5ee5310f24fef8b2588fc04938fa9bfc4875d6df2835f82b4d15c4b818f9ac500d2fc2465d362
 AUX wireshark-99999999-androiddump-wsutil.patch 343 BLAKE2B 665e3329615524fa145b0b6f996aa950f0337ef4fd6a53d26887453744f8f3dcbcd499654f679edd07d2e07224e542247583233a8c0be1d130bc9196dc56ee01 SHA512 9f013bb9fd7d0dad834c2079210a1b15adbd5650a7fc320e7dfab7c9c6d0fa9f0b4e3fd3b1972f91ec47484933244c6b91dfbf4eb62409391562bc7ee4ee7f5e
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
@@ -15,11 +16,13 @@ DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d
 DIST wireshark-2.6.3.tar.xz 28384004 BLAKE2B f275c73173fbaf3f819c58f28859362e9c53ae50cf2649ac42c8d172362241eb00d7f43d0aead184ec67cb8da34d405124be10c5bf31226c2cb4800b8a01955b SHA512 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80
 DIST wireshark-2.6.4.tar.xz 28218232 BLAKE2B d54d7661801667f78f0c3248f4099c77ef016222ae942dc7a5776af2c5c18f7b00305556ac84df6afd19cf3d2bd59e78365067dd9402f978ae0a7db76c1730ca SHA512 bc740548901b30f2e44c2b0933717288615fa38edc5e092607a8b12c60ecfacaa5aa7c59d7644cf29238d0d636fbe03d85559a0f2de81a3bf8ceac55fcf9ff07
 DIST wireshark-2.6.5.tar.xz 28390292 BLAKE2B f9847ef113b0c63e739be305603b42c5112da2e94b3110b9b104325af97801bd2b3d9d89cd334b59d460433520069cc2ba726e96aa9f22af112a28a653b9e29c SHA512 fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f
+DIST wireshark-2.6.6.tar.xz 28407404 BLAKE2B 5135789d345b675814a6394d5ba1469585b9eab917885730125b8a007aecd9cb48a510fc9e7479148cadf625807bac9017b854797e4bb2e562d7dc7f76140826 SHA512 b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56
 DIST wireshark-2.9.0.tar.xz 29438416 BLAKE2B 17bbffe6e079133c4319a49a3672a4359b9e8eed1493b7440a2924c4bd57c45a1cbeee2ee50d4f3d96cbda436fa48eb6ba66bc61061f5fdbf71d1711c5467b43 SHA512 f24d873d75510488e0e60f75abce5820457786ff540ede3fb19fd45fea269527323ef5b5157ff83d2aaeabd60d03bac0a3dfc14495468d9478a8e5d7a30ad47b
 EBUILD wireshark-2.4.5.ebuild 7324 BLAKE2B 37579953238776d82c3887994830e72d6df6b928471f6d5ae955c53a58b0b70887c139c0962d5a27119da15ec6af0e416793d41ea3aa4ee18374f441abec0876 SHA512 f8fa063eff8b7c3e76fe2861b287a8c65368710b2cdbec670453a54e5d629a060dc368d05a6c6efb2ad8031174613026c79a3d8eea9fe9e43caa3953e5a72d74
 EBUILD wireshark-2.6.3.ebuild 6603 BLAKE2B b9406cf5e104ab342ff8b9eaedd2b0a01b79b6f0bd6a79657c2860d53fcb648cb5868b97ec559b9cce5cdd9ed0ef5cb985edcfd093e60da16dbb42035cabec23 SHA512 95f5f555a393ce995c55a8dee07189fac90fc3032642dcecbf0f50e777d3bc919321d048c68e9bda3553ded1c92383235804cd47f6e0c9aa3303d116684e60d3
 EBUILD wireshark-2.6.4-r1.ebuild 6514 BLAKE2B 0203f94f5919cf7ee0d9434cdaea93383cc816568886fe050da346cd6bf285967214c3d75d579b76c130b9d41bcfaae81b02fb1b5865a46a3dccac81818371be SHA512 57b01b0093b4cb9cf083df51451c198fe740e34bc08e3709ae546df696681813c1dd89d582e68af72a41ca7318adec1ebe4d027ddb464ced5cab13622b239400
 EBUILD wireshark-2.6.5.ebuild 6517 BLAKE2B 61bacb528d11a3312b1f9a5208ef8b59674f1174ec4d66c880ab0fe40a6a77f499e315c8ff81e37d6e543a0ea45444195c789965d9776d797def00b1b7bf6434 SHA512 b897b6bbc389fb81ae54ea6556974007824e639fdd958e2478607dc45610ce0177032421cffaf1b3fdf18ad3b03d90f70c6696b1fb225a86d213bb13cb3f2369
+EBUILD wireshark-2.6.6.ebuild 6517 BLAKE2B b902d514a145b9f2e055df3b08470c31e7ac9b13ac436ace41396620b0bc63b8642b4059e03aa0080b8025ca0e94f939829fc5dcce8acceaa20db6628c530859 SHA512 dcc4b50c637af3a6020b2f3e3a17b586e37cb50f0028f95b5003f624e52f2191476ac6f606ee7a59fcf820d602231d5869675b22d3015f39fb38137428caa4e2
 EBUILD wireshark-2.9.0-r1.ebuild 6407 BLAKE2B 7d3335139c47b88c547903736cc03f4dfa6a09849fbe16725e622e1d3ecfc5b30790cabb12a30e6eb8465db4f651f4b52bf70ed5d9a2fefd7c23e63296980669 SHA512 cd11911051e20402ceee753682c88ce452f3c404666a8b9f65d14e58b5e4f243bce61f5b62ba50d56b3c863012fd6a53a097ff8bbf3776b279fc72b503e96a9b
 EBUILD wireshark-99999999.ebuild 6370 BLAKE2B 0eb32ecf1f3fa6645af1c66f552e9971d4ef9b9b1697823551ab9158cd54c18f8b5b8d65ee379d0cfd7034d72c7afa0a6e8d1d474673ed13461eff9780b4a9d0 SHA512 3685a02a533e54bbe2117621c324d17c681286c9e33ac5e48eab502224494e1b9bfb181c372433cb19c4d7aa5b5e79d79b5004702d325356fe8cdfba3c345d8f
 MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
new file mode 100644
index 000000000000..654c2c82db17
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.6-androiddump-wsutil.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2843,6 +2843,7 @@
+ 		if(HAVE_LIBPCAP)
+ 			set(androiddump_LIBS
+ 				ui
++				wsutil
+ 				${GLIB2_LIBRARIES}
+ 				${PCAP_LIBRARIES}
+ 			)
+@@ -2853,6 +2854,7 @@
+ 		set(androiddump_LIBS
+ 			ui
+ 			wiretap
++			wsutil
+ 			${GLIB2_LIBRARIES}
+ 			${ZLIB_LIBRARIES}
+ 			${CMAKE_DL_LIBS}
diff --git a/net-analyzer/wireshark/wireshark-2.6.6.ebuild b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
new file mode 100644
index 000000000000..852878b84a7c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.6.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+	+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+	+sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+	zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0
+	netlink? ( dev-libs/libnl:3 )
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	filecaps? ( sys-libs/libcap )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+	"${FILESDIR}"/${PN}-2.6.6-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DBUILD_wireshark_gtk=$(usex gtk)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=no
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PORTAUDIO=$(usex portaudio)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 939015e7a2e0..7b38a657ef2a 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 9a283e61f805..ea9d5039189e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -7,6 +7,6 @@ AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9
 DIST avahi-0.6.32.tar.gz 934004 BLAKE2B 76bbff65075bbc49d52b1e406373c4856622c22364cb5f1a4ccc0bf04a6dc7d54c58753a8cce6622e4fc62dc22086659ffbd157aeb1a6a30de353d08fd08a307 SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
 EBUILD avahi-0.6.32.ebuild 5485 BLAKE2B a16979e77772ecf824dd03db48ae39d9c3ad8bba89211cc7c15ed3bec0cb57db0a793b14f3e0d55ff5afb52312fda6b8e5ca77ea17c1830f3be8a21d1cd9e6f6 SHA512 2290435448ddadfd4bc4b48b40e6cd2bce036e0022c20f717d5d782f7622627ff6116cc2057642a8a0291f17afb207182a0fd3ce1ec1c68313f9342350e51c41
-EBUILD avahi-0.7-r1.ebuild 5144 BLAKE2B c9ded0e7faeff53fc2f23cd40e43d5696c66d9afd00ab5e0ac7fb17f47636718dda0fdd0973c8336714c6a5e6a189a7d3578a9cbc652c61121cd20028776b977 SHA512 a18169b2a2dd206a56e4e9fe29c7a2e4450feeca2aa5c0acce687ce564286fee4752ababf06e42111c4e03b875bda40abea850129a76b3628efd1b541cd203ae
+EBUILD avahi-0.7-r1.ebuild 5143 BLAKE2B 49679babf67928cbc925042e890abcbb60d97c7c967964712673a39a79dff3701dd05f53186b611c58c7d8df3d0d62f940c7306e17f91b0934494252ef833474 SHA512 6caee5018f83eb7a8b51bf5656c345ce36f5dcffd714bcdf318b82830381cb33711db62eed94c76e59e5577521e3daef58ac2761fa95caf65306e42c2697cef1
 EBUILD avahi-0.7-r2.ebuild 5134 BLAKE2B 9a9b443e14be9510834a1bbfdb90ba7b33a1152b9f154af134c37d5f9559e08f33a40662b9da6f7f574cbd45a4ae540688c42d0c77ee34e1c32224f03ec6e0b6 SHA512 eedd21a35fec2554c6a3f26838d74b6a7bc360f26f979e0cac74cc8fd7106482f82327866cc8b3d948cc1e11472937481d39ad2ade8df9b60b5f3f05ef9dab11
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r1.ebuild
index 7f4a2d670226..72a21b859955 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index f94e06d43df8..0b9333e13bdb 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -7,7 +7,7 @@ DIST bind-9.12.2_p2.tar.gz 9422128 BLAKE2B c7d56f025f381a0136aa67ccd49a3254fcfe5
 EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5044a7086e6ba8752a16cd2dbaa6b47e518b3885f2592318364b6dbbb78c7b120aea9da9dae6c05214b1ad6b3d0fba8a8 SHA512 946118c94832fc9583ebcac861b6fa7b9d673c29b744d02af8733732a61dd743ccc289e7f002319e8e351183d0d94a302af00bb0377e08bb433041cde8f455a5
 EBUILD bind-tools-9.11.4_p2.ebuild 3208 BLAKE2B 2283d2ace001715cb60542f169c5604fa049b2105a848991b4b7b2a2b66d8630c10e1d65cb832209ff74a26184e1dd93762fbd63348fa9bfe1850cfce1634f4d SHA512 7d5e6d989b952e6400e272fa02383c201342c0373f36a8561f22df549ec12fb7d414adf60689bb9801006e552779b13f5efd1b339ca1a161c1b9166bf4e0f92b
 EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
-EBUILD bind-tools-9.12.2_p1.ebuild 3439 BLAKE2B 3b924df8db1dd9034ea43e9f12da6f180fec964d146820a0b3dc1b4395b4fad579ea98be33f7e38da7ddedf02808274237b5af69231044c55192f1c80c776bba SHA512 65f9e22ba1c9816865abf24b6746b3f519b61ee3a79ccff5b198a0b8399cc96e7aabbc99c3e98f4251fee3f18d96b8ef135699c0411cdd3c0b1c3af519c68a57
-EBUILD bind-tools-9.12.2_p2-r1.ebuild 3567 BLAKE2B 0dae73150ab67611c9eedc6aed1a240e7752da730c2c50631eeb2ad910257df59576fec517901df420455b101c293b436d5103a525c60c02f852c073acb9ed3c SHA512 05fc8f6115e3a178f347914cd35faf87f9a42e8b6dbb47e37618f2ebcc529cbffc37a95c5f0b2c0a5a9de0fcee3f774517e470537343c43c6b9c08113f116ee9
-EBUILD bind-tools-9.12.2_p2.ebuild 3500 BLAKE2B f4cd34890a0427f88efddc39d1c13ac5ad6ddbf556c5341dd755d71d9b573e9664a00a0362bc5b58a3d1a5931e85dd9537b7225a7382bc2e68ec505b980624cd SHA512 902440e7475a939acbfe67a4ce56edcb2ddfda46424d320f160b72dbef3387c183d707035157a5ae918e4b266768da880fc8219594a75f575daec9543988b2ab
+EBUILD bind-tools-9.12.2_p1.ebuild 3438 BLAKE2B 8cb59aed873b3c1d460bec195852db75341c45d38737c445e28d33436e5fc81dde4cae32edd78847da259442bf1b6a68f349d6f8f9d72cf1786941db8c4ac146 SHA512 060a78f687599fc7083503030858e0ed25df9ba0edac85a56177676531800ddc4f10d07c4558c711729c684db92f3c71352b517f7bcb202b95420d2c81f0acbf
+EBUILD bind-tools-9.12.2_p2-r1.ebuild 3568 BLAKE2B d01b860e75921fed62240f805c2117572777340d04ca2432061787af0cbd34807c6ca49752c59f3abe60f55ff27e1e25ddd8cbc0821fd67cdd126cebbf9a21c6 SHA512 0d662b1f60b34e769f017296842567c40e051d8d22b6794bbe20cc55fb396376c748f8e760a02fa55194404d8032fa4d6b32f02ebc18a96856724837a8e4682a
+EBUILD bind-tools-9.12.2_p2.ebuild 3502 BLAKE2B 5d419e729479f76536bcb23b934a55c208d91ae8ee3e9a89c2252707d1a96b533fbb2379294798c19952079d9367f2a7d236ed4adf4b35b301bdb24f98cab458 SHA512 bf49480f605635ca80d2d89487c12bd275e7e09ad6b661d9c184c262397803c2f6923be9dcce9ee7730e0b4ca25bcf793472a0f2cb6479186478afe8fab64666
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild
index f4e0311bb53c..80461a0f46f6 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -32,7 +32,7 @@ CDEPEND="
 	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
 	xml? ( dev-libs/libxml2 )
 	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2 )
+	libidn2? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
 	libedit? ( dev-libs/libedit )
 	!libedit? (
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
index e2618ed763a1..446ed7f678e3 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
@@ -40,7 +40,7 @@ CDEPEND="
 	)
 	xml? ( dev-libs/libxml2 )
 	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2 )
+	libidn2? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
 	libedit? ( dev-libs/libedit )
 	!libedit? (
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild
index 19907a9f7c31..3aedc5cc4327 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ CDEPEND="
 	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
 	xml? ( dev-libs/libxml2 )
 	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2 )
+	libidn2? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
 	libedit? ( dev-libs/libedit )
 	!libedit? (
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index ad27fe4a4393..fa571f68caf4 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,6 +21,6 @@ EBUILD bind-9.11.3-r1.ebuild 12181 BLAKE2B 8efe68cae507e1d58df6081419c9db121d7b5
 EBUILD bind-9.11.4_p2.ebuild 12227 BLAKE2B f92c267892ca96749ab23e61a958fc2d7d1e0750cdc461d8a7f28967fd3936e9c72bac0875a690237e3e5c104a0495ed6c76bbd74f47cc026c054ddfb1b728e6 SHA512 282fea5fa00fa226a983e6321bebba11c5abf321baa632296a40d66ba9b0c77977cba8e299130883081bfbb6a58e48c9e154ce6635cfd725f9ab72a14a8df169
 EBUILD bind-9.12.1_p2-r1.ebuild 12140 BLAKE2B 3c4198382162186541ca90b176b5c3bed82be1e38d48f2e5b2a3d2329e9a9b757b7b69362e5c9276ca158e250a3764d411aad3e55655f21ef92c3bade0dd0890 SHA512 e36ce712b00c80f4518907e7e58e01a1d83b0118544ee3ea5cf15d8906574e09d834831c6af6da23e0cd1884bc1b070720cc85f52a02ff11b13ab3d3b3983236
 EBUILD bind-9.12.2_p1.ebuild 12169 BLAKE2B 365eee1da0687002f634366c1cee23c5dc89457a17d55d2bdad09cb4dee212a22d8059048c4b1bebac77454d9420dc02671879ec3256241a412653c012af98b2 SHA512 e7624673a93893b33bb9c4307968d5673d9cf5ce97eb7c5f99d51ad56da80befee7cb10cc0363a014f2a1707e7951da61c662b928860b74cc848ac9fe8e32518
-EBUILD bind-9.12.2_p2-r1.ebuild 12359 BLAKE2B 0525a4e9db74c589cbbd37297eef8d3719c118915747de1829e1e066e9b90f7362c339f33c56d720bf87f96d0fa0fdadf36947b128c6c800abf9283b569343cd SHA512 65dc6934bf8cf7345cef52e2d640d73652a68fd77caddd995708c87e08b6a2ced1317d54c993a2ff1cf1d7cd17f88b2073c5b42d44a872ff35efcdec2380e97c
+EBUILD bind-9.12.2_p2-r1.ebuild 12358 BLAKE2B f79c57fcfa2a440225b29c3ee883f367db9d7c14cb23e01b168aba6d91716b4337091d0af1adb5d5de0198ebabb20a841ed65556f75dbb5185f8d3219949ea80 SHA512 c97c6c37989359ffb2de6eb308e1aeb614c3aea93d5c901227a7305f4e7a77f07ca19b4f13bd013146c0c66f645d266b94cb5c2fca2a2c0c7824b4f26b7eeb86
 EBUILD bind-9.12.2_p2.ebuild 12291 BLAKE2B 4753e676680d30b6335b2345851dcd05a4d29404f2d543f47dbb80007748ef1e474e4e4671b682a4f5af857b7df78fd1ceaf1afc5685897c5232767ee3cdb9e8 SHA512 75c3631b02a630c7e2a7e452ed65b0ef355b9108b4db84aedd44f7cfbb282aa22f8f5392a2c23f7aefa832a23c7a1c9032ea5037be5a6680269c008e038c1cd4
 MISC metadata.xml 1352 BLAKE2B 89e5d161d824bd1b9a9e9c6ab49457b12d856a8eeb4dba9fb2f3ea987fb88ef708aca88d0d654aeba4ade9d49dc190f9d3e18f86e2c2c874e017aabe7ea8f079 SHA512 47171fcafd8b7b316166e8ba565cc3126ccf2cca4b447abffb7120c34f9ea22243539857d040bf17c509862a9d42d564ccbe151e533a4961516799c5d73d30ab
diff --git a/net-dns/bind/bind-9.12.2_p2-r1.ebuild b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
index 908689d620a2..e52d53d23b67 100644
--- a/net-dns/bind/bind-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.12.2_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Re dlz/mysql and threads, needs to be verified..
@@ -36,7 +36,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
 json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index d2cda00f2658..9fdfb5262fdd 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,5 +8,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
 DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068
 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7
-EBUILD dnsmasq-2.80.ebuild 4745 BLAKE2B b0947292ed5aba9b62f5200c5f3f8a6dab2872b7cae377ed952b7cf336adcbe22003013df4598f8bea9281200e1da56a969522544f2351f6fdfe223c5069aff4 SHA512 8c9508ac2a46a1694bab2fe4d28d4e22277355f8f78a4b1639facefe40c2c92ab2e2205a421acbf08c75560080330327de955e428e72b97e12f9bf2c06686029
+EBUILD dnsmasq-2.80.ebuild 4744 BLAKE2B f023491813d30fffc7d14fef5a6f0edbe946f6fa2440169a9a56ff4a080eecb75c86158d6d2ed97d5d2b9fec360a3666448bbc4b825807088683f4d6d7dd739c SHA512 a14e0af3908e178abcaf5f164925524dfa9552a0009725d7aeb0ecb3be8b68da818ad1b943f8e0dfb3a9146cc72ec72b6db0dd4ace7abf71bf3dd2e24faa27a0
 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc
diff --git a/net-dns/dnsmasq/dnsmasq-2.80.ebuild b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
index f1a640437b55..c20677173843 100644
--- a/net-dns/dnsmasq/dnsmasq-2.80.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.80.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Copyright 2017-2018 Sony Interactive Entertainment Inc.
 # Distributed under the terms of the GNU General Public License v2
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
 IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 47ae9594672a..18476541a851 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,5 +1,7 @@
 DIST libidn2-2.0.4.tar.gz 2008524 BLAKE2B 7163e1eff498031c7433911533b34d993876b55d9b324aaef39c93db2cceee78dec4c8cfbf4d9dabd1dbbb03a8cbd65021f26a94758f57b32ef98dc869f744b6 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2
 DIST libidn2-2.0.5.tar.gz 2091929 BLAKE2B 1eb52ae7c9295bf4b5d6e36e6852ffb54b10663a0e3cea06df110bd7798fcb0d1b8e3b7169e4a11e800a23fc9f606167dcb7fc2d4a684e861d73a236de5c578c SHA512 9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79
+DIST libidn2-2.1.0.tar.gz 2102683 BLAKE2B ef8b29e458598f59044a058e2121b08a0034cf0a14d9a7952e83722a38e03cb66152271a62b690be3ede7dad36cdb69849f1a7ccd6e61c4f75256afeb6b1d1bb SHA512 003f3bdb872f9c6f5db80bc5ad5e5dd8f414e14139f4ae15b451e955eba18f612fda8b159796e9631d741fa0a2d731e6d489f9901d2561ac35b716efe56557a2
 EBUILD libidn2-2.0.4.ebuild 1226 BLAKE2B 1c59cb393e3eb99006bfe99f21fb48de733a5cb55bb9729531e4b0f40c30ab90f187f100609aaa5ad6c98499fadf66ad457ddd96a5897703cefe00fc0e03b768 SHA512 7a77cbb77800e71ef7c77befbfb2ce16a7a74cd75f35f674686fa8435acad15b216794e6b3473d7adac6cb6e9554c6b59c37830162c66711d3af4765847ba06a
 EBUILD libidn2-2.0.5.ebuild 1239 BLAKE2B 2e1caba85c2a501947afd2a8d6291a64feb35487b6ceeeed7d0479944d3257fdbb8f189999c66bb2a774f377bbe6351b8fcabedd13ed7c72497a61caab7146ea SHA512 df5f8e536da174a039f1538c53da6827515eacd0198e8aa00c3fb71c9cca9ed52a024c68d0834e4acecca981f87462472a30c7d00a46d2a9cf5ea9da8f03e067
+EBUILD libidn2-2.1.0.ebuild 1251 BLAKE2B 6a888aeaed3965d9255f8375083a512f5d913a7e10c45ecd92f9c6ff88a0a68a1f7be0972e605c6704f7af1ee8d5e35d8453eafa4511dd766608ce61d6aea3a8 SHA512 9a5a2da4c2165578589678b37a0959d219747c77b25de943cbb187f4aaeb0bc6f9306147c326c2c44fca8b63e0b1002540bd7607dc0e4f38709aa32f2c608ee8
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/net-dns/libidn2/libidn2-2.1.0.ebuild b/net-dns/libidn2/libidn2-2.1.0.ebuild
new file mode 100644
index 000000000000..d5e87e2879a9
--- /dev/null
+++ b/net-dns/libidn2/libidn2-2.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
+HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
+SRC_URI="
+	mirror://gnu/libidn/${P}.tar.gz
+"
+
+LICENSE="GPL-2+ LGPL-3+"
+SLOT="0/4.0.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libunistring[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
+		# reason in the Makefile)
+		sed -i -e '/^TMPDIR = /d' Makefile.in || die
+		export TMPDIR="${T}"
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-doc \
+		--disable-gtk-doc
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 41352e7040ba..5d9950f8a100 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index effebd51c57d..57e697c5c29a 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,12 +1,12 @@
-AUX firehol.conf.d 70 BLAKE2B 4cac98cfe930a9309fc38989c2887278018d757b3981d352a0f9835e2eeb76cd7ff8256814b4fd4dd0fd9d887145264a73fbae92452309ec96838b51447ff313 SHA512 e6b21b493526770bf5619d09b63f8e6cf7f94fb8059fc8ff2d1f19776cab1320218e103d73219534817464314430faca4e437644befa5330610d948c2ade1a35
-AUX firehol.initrd 1144 BLAKE2B 4be520c35519daf3467e55eb041ad8a70102c2bbeb023181fc39585077fe8dce3e6a7faf48814a7b56a094fad9d61b38af6ee7d4b9b4abbbc1c4b41cb2b6472e SHA512 c582e5f3ebdaf7a8f68c137936bf52600bef2d5f7dc4443db6fbc6eac16ad367d69cb936ad2c1bc6e0f6aa3fcaeac7efd8c40f056fa6ea9a7d876ca3c07767ac
-AUX fireqos.conf.d 65 BLAKE2B 121c8df85e9c110e45633c84f3fd4ba9e006bb70dffbdee1507f92d763c13ae9ce370a5807753d31b0033e23d39004ea147d9fb75bf4f2fbadc6baf070ccaca3 SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c
-AUX fireqos.initrd 832 BLAKE2B 15254240e2a3348b1e4780e5e9806fe335ba66146b2ad7e5af08bb8439f711f5bbde5b984d9885313b7045223627a7af06536a3f42001e4a61a0f893b09d4403 SHA512 87e5b8cff3a6c76780c5bf370e8f628c8e45aa2347d06e68aef65229b7b5f4a2770156019380e892991259145af55be7a84a2b55164530ec34e966baacd666cc
+AUX firehol.confd 70 BLAKE2B 4cac98cfe930a9309fc38989c2887278018d757b3981d352a0f9835e2eeb76cd7ff8256814b4fd4dd0fd9d887145264a73fbae92452309ec96838b51447ff313 SHA512 e6b21b493526770bf5619d09b63f8e6cf7f94fb8059fc8ff2d1f19776cab1320218e103d73219534817464314430faca4e437644befa5330610d948c2ade1a35
+AUX firehol.initd 1141 BLAKE2B 4bdeb545542780b4544c07ad675a2ab63c80177126841eaeab63cefb7755d5a55a4c74e4c2344b250823dfae1a074e53c7cfbaf0ff43315993e442da22337519 SHA512 db1aa27c4923a229c15db268e97e848f50f0515b75b84a6422c8e338c679ff71943286c9a2483c0d88b157cc925dc2d532923e14a559f33456f977680516b7c6
+AUX fireqos.confd 65 BLAKE2B 121c8df85e9c110e45633c84f3fd4ba9e006bb70dffbdee1507f92d763c13ae9ce370a5807753d31b0033e23d39004ea147d9fb75bf4f2fbadc6baf070ccaca3 SHA512 4dd394f3d896d8bf782cf1157f5bf420ca0e9b2c6238986f3fb17630ec0e12bfcad4ffc6fe2258a7d257e157fed11e01aef26965f3d97c78643c6467639a822c
+AUX fireqos.initd 829 BLAKE2B f09905f02189f155455886dd1896a183f2f529d0737939a7065bb52b57870f22805e3e6c029510cc5b57b36e596eb829bcc7651c6a80657ff4e399acc542fa90 SHA512 8364537d3e10c68d309fc40f4b2f88a2a593c38fd6f134b1c09cf937be00f7d96eeba05c83824c9460367bf892a8f79547321784c8f8a4708f856df9a88693f4
 DIST firehol-3.1.3.tar.xz 1476220 BLAKE2B 19ac9db805fc4452b447a45a7ed35c781bc8595f3ede0af7de0ff5a89ab50a9f8a634e0754869774d767b50d720019a5ac466e9d1726a75a34a283473b17a94b SHA512 6c75b57650d918cfc485f6eb01d69694acd5c7b487a10a566fc26b8d5e0cd6a6a9a09bd8d3219bf4e78aa4fe47f83e5ac399107a07770b787e1ccba3078c5f3f
 DIST firehol-3.1.4.tar.xz 1481320 BLAKE2B 0fabef4a853aece966a8f273cc82947a6e63ac44ccac2494d5d6a2f0916658a78cfe0c28cc2414e797411e4795216400b1fa95193a619f7e26fe545182a5fc44 SHA512 1a17b6e810274b346f66788c4c4736421583e6a4ed76df7a1d7f46dcb99e434460998c05755c8342941413d23c02e2ca0d0bf2123cb555a6c7513d24983a13ed
 DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
-EBUILD firehol-3.1.3-r1.ebuild 1381 BLAKE2B 442b043dba8d51c41e2035a8be52fd6e1a2ca2062f4eb0ffc3e1d8b4708d447be8cc901bf617300956b09ac18047c1c52dfaeccfdd9e89737aee42f29b47c549 SHA512 4a621a3a5bfb636c4d1c599cc784f6b453e956c08e33a6c4fdef50018778e0f375ceae939de2d7b4f15cffee561601e3fd7bf41619831f3bbaa987779a94fd41
-EBUILD firehol-3.1.3.ebuild 1328 BLAKE2B d70a23bcbc413c4e0e50aae2487cbe6321da4e805cb39a844ba52a28d72485c4493b27c98922c03ac453fd57ed15ab4484189cee894adbb21e96fdf93e9c9629 SHA512 919cfa1cf6ea9e1023610501766b36888d95ad325bf23c528b99941fdb432c9cdd47c7a674a630df626cfb3a820ae77d7aee2a7564c8efc705e3c7a2a4c7b6c5
-EBUILD firehol-3.1.4.ebuild 1376 BLAKE2B f653d541e4c344863c6edefa8d71cd286b8f3319d0fdad6d564c6c5c8d34351e5f0d2a43211dab9e3a6fc31ae7b2c0325fe70d7d432932b163bd7331467c9afd SHA512 16aac22739391f331fad92136a2f12abcb4d50bbef6b95c23fa49cba98f20dcc8facf1ec4fd77154a60fcafdd274e7ed87bb545a83ebaeb19e3ccf47da763fe5
-EBUILD firehol-3.1.6.ebuild 1437 BLAKE2B 5bdd4fff150374ee0017c4035939845dbf9aecd5a4f090bf9a83a7be7fc3f4c0d4172fe95e1cccd0c7951656eaf972ef2a8dbdf0864becad5da8264ba603589e SHA512 2916e183be6474dc078b86779448f0028a21d523048339ad3d0718da676d74646a3336084a9a3f1063d5df2651087bf65431f5ba00c27dd5e374f9a1ab37282b
+EBUILD firehol-3.1.3-r1.ebuild 1374 BLAKE2B 5d4bb0400ffd486fea5302bd4288fdfdbf3839f5e6c30aa967afe7d5a613e42eaeada633e5c913e4eeed6123c4bd671f041769c2e424c9ef902c693c6229078b SHA512 17c008ecb04c267b5568360d1f89d6809a9aec17ccf3beb98979df91d5c5df568cca4b3c5df91e5ee6644dbb76cc7644de3fd22cbfd8c35bb5aae84d7d2ca919
+EBUILD firehol-3.1.3.ebuild 1321 BLAKE2B 5160111e2939d25a8cca9d4479d88facd80ae7c5dcd93a0e278481edaf1c912266d76157ab3db0d7908782946d6632d3abae71f0b64033cb7bceaec30b21f45e SHA512 6be61cbef86add228244d129e7ff9060cd90d74edc563f568aa55a1f17bd2a483c5c035d396feefefe6a5f92aca9fd63e1c9b0eec1aefd0f76721aa3a606deed
+EBUILD firehol-3.1.4.ebuild 1372 BLAKE2B f3249920863d8736d21da864e390828f05a368e58f8ab3d857151410a840c6c84a18d455b344a9a2ccc5516cb27a7b86a18d22cd67156b13a33e121e7a6e3fec SHA512 b9f5c95333e0f287eef761ae036bface8ec9e549786c1937f695fd37199cbcb3cd3d70a46fb56cb7224a1badf0e43ab4ad2cfacb171ed81c696bcdf2e2d374c1
+EBUILD firehol-3.1.6.ebuild 1433 BLAKE2B 00c0cd01a1a8addd0b6352ef9ce46e06fd33509e134ae637bd3701ffaedc0437c9670f593501f0fd8830237a1d047a899e20df7ecb24dccf408e0f14472400b0 SHA512 1f4e79dcc4dc6d567350979211feff43728951f4a6152e14a216b3bd3ed18a49d9b64747627a0221f1191ac8706012c96072bc503f6021465ca2b417eb25ee68
 MISC metadata.xml 434 BLAKE2B 43111da215ea3d6d6af807ee1b629a3ff72dfefe15fa429a6ea5b112cbfb881d1bf848b50a266c32b820a7aec3e14e419c64657cc0a205c1e759c77b64a17b52 SHA512 9ab3275ada67cf2da92f07d9a332f098330caa81b0a7f5d17a321a03cf6b441e029efab9a8f3eaaff7d7181eb503721aa954c14e0a7982e4f35e16c8eaa57898
diff --git a/net-firewall/firehol/files/firehol.conf.d b/net-firewall/firehol/files/firehol.confd
index c8b06e0eaf09..c8b06e0eaf09 100644
--- a/net-firewall/firehol/files/firehol.conf.d
+++ b/net-firewall/firehol/files/firehol.confd
diff --git a/net-firewall/firehol/files/firehol.initd b/net-firewall/firehol/files/firehol.initd
new file mode 100644
index 000000000000..719f336c46f1
--- /dev/null
+++ b/net-firewall/firehol/files/firehol.initd
@@ -0,0 +1,66 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="save panic try"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	after bootmisc
+	before net
+	provide firewall
+}
+
+checkrules() {
+	if [ ! -f ${FIREHOL_CONF} ]; then
+		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man firehol.conf for more info."
+		return 1
+	fi
+}
+
+start() {
+	checkrules || return 1
+	ebegin "Starting FireHOL"
+		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping FireHOL"
+		/usr/sbin/firehol stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting Firewall"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+try() {
+	ebegin "Trying FireHOL configuration"
+	/usr/sbin/firehol ${FIREHOL_CONF} try
+	eend $?
+}
+
+status() {
+	ebegin "Showing FireHOL status"
+	/usr/sbin/firehol status
+	eend $?
+}
+
+panic() {
+	ebegin "FireHOL PANIC"
+	/usr/sbin/firehol panic
+	eend $?
+}
+
+save() {
+	ebegin "Saving FireHOL configuration"
+	/usr/sbin/firehol save
+	eend $?
+}
diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd
deleted file mode 100644
index 05fc3a2f11c0..000000000000
--- a/net-firewall/firehol/files/firehol.initrd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="save panic try"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	after bootmisc
-	before net
-	provide firewall
-}
-
-checkrules() {
-	if [ ! -f ${FIREHOL_CONF} ]; then
-		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
-		eerror "and fill it with some rules."
-		eerror "man firehol.conf for more info."
-		return 1
-	fi
-}
-
-start() {
-	checkrules || return 1
-	ebegin "Starting FireHOL"
-		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping FireHOL"
-		/usr/sbin/firehol stop > /dev/null
-	eend $?
-}
-
-restart() {
-        ebegin "Restarting Firewall"
-                svc_stop;
-                svc_start;
-        eend $?
-}
-
-try() {
-	ebegin "Trying FireHOL configuration"
-	/usr/sbin/firehol ${FIREHOL_CONF} try
-	eend $?
-}
-
-status() {
-	ebegin "Showing FireHOL status"
-	/usr/sbin/firehol status
-	eend $?
-}
-
-panic() {
-	ebegin "FireHOL PANIC"
-	/usr/sbin/firehol panic
-	eend $?
-}
-
-save() {
-	ebegin "Saving FireHOL configuration"
-	/usr/sbin/firehol save
-	eend $?
-}
diff --git a/net-firewall/firehol/files/fireqos.conf.d b/net-firewall/firehol/files/fireqos.confd
index 55fa2e037e01..55fa2e037e01 100644
--- a/net-firewall/firehol/files/fireqos.conf.d
+++ b/net-firewall/firehol/files/fireqos.confd
diff --git a/net-firewall/firehol/files/fireqos.initd b/net-firewall/firehol/files/fireqos.initd
new file mode 100644
index 000000000000..de94ce9840e5
--- /dev/null
+++ b/net-firewall/firehol/files/fireqos.initd
@@ -0,0 +1,44 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after bootmisc
+	before net
+}
+
+checkrules() {
+	if [ ! -f ${FIREQOS_CONF} ]; then
+		eerror "Not starting FireQOS. Create ${FIREQOS_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man fireqos.conf for more info."
+		return 1
+	fi
+}
+
+start() {
+	checkrules || return 1
+	ebegin "Starting FireQOS"
+		/usr/sbin/fireqos start ${FIREQOS_CONF} -- ${FIREQOS_EXTRA_ARGS} > /dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping FireQOS"
+		/usr/sbin/fireqos stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting FireQOS"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+status() {
+	ebegin "Showing FireQOS status"
+	/usr/sbin/fireqos status
+	eend $?
+}
diff --git a/net-firewall/firehol/files/fireqos.initrd b/net-firewall/firehol/files/fireqos.initrd
deleted file mode 100644
index 628cc9d3c4a1..000000000000
--- a/net-firewall/firehol/files/fireqos.initrd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after bootmisc
-	before net
-}
-
-checkrules() {
-	if [ ! -f ${FIREQOS_CONF} ]; then
-		eerror "Not starting FireQOS. Create ${FIREQOS_CONF}"
-		eerror "and fill it with some rules."
-		eerror "man fireqos.conf for more info."
-		return 1
-	fi
-}
-
-start() {
-	checkrules || return 1
-	ebegin "Starting FireQOS"
-		/usr/sbin/fireqos start ${FIREQOS_CONF} -- ${FIREQOS_EXTRA_ARGS} > /dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping FireQOS"
-		/usr/sbin/fireqos stop > /dev/null
-	eend $?
-}
-
-restart() {
-        ebegin "Restarting FireQOS"
-                svc_stop;
-                svc_start;
-        eend $?
-}
-
-status() {
-	ebegin "Showing FireQOS status"
-	/usr/sbin/fireqos status
-	eend $?
-}
diff --git a/net-firewall/firehol/firehol-3.1.3-r1.ebuild b/net-firewall/firehol/firehol-3.1.3-r1.ebuild
index 866cded9cb60..db92d61855d5 100644
--- a/net-firewall/firehol/firehol-3.1.3-r1.ebuild
+++ b/net-firewall/firehol/firehol-3.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -57,8 +57,8 @@ src_configure() {
 src_install() {
 	default
 
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
 }
diff --git a/net-firewall/firehol/firehol-3.1.3.ebuild b/net-firewall/firehol/firehol-3.1.3.ebuild
index b153a88c3196..11a79fd5b628 100644
--- a/net-firewall/firehol/firehol-3.1.3.ebuild
+++ b/net-firewall/firehol/firehol-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,8 +54,8 @@ src_configure() {
 src_install() {
 	default
 
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
 }
diff --git a/net-firewall/firehol/firehol-3.1.4.ebuild b/net-firewall/firehol/firehol-3.1.4.ebuild
index 67745a1203cb..d9c5fb2ca8de 100644
--- a/net-firewall/firehol/firehol-3.1.4.ebuild
+++ b/net-firewall/firehol/firehol-3.1.4.ebuild
@@ -57,8 +57,8 @@ src_configure() {
 src_install() {
 	default
 
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
 }
diff --git a/net-firewall/firehol/firehol-3.1.6.ebuild b/net-firewall/firehol/firehol-3.1.6.ebuild
index 626180343e17..8bddf14115b7 100644
--- a/net-firewall/firehol/firehol-3.1.6.ebuild
+++ b/net-firewall/firehol/firehol-3.1.6.ebuild
@@ -60,8 +60,8 @@ src_configure() {
 src_install() {
 	default
 
-	newconfd "${FILESDIR}"/firehol.conf.d firehol
-	newinitd "${FILESDIR}"/firehol.initrd firehol
-	newconfd "${FILESDIR}"/fireqos.conf.d fireqos
-	newinitd "${FILESDIR}"/fireqos.initrd fireqos
+	newconfd "${FILESDIR}"/firehol.confd firehol
+	newinitd "${FILESDIR}"/firehol.initd firehol
+	newconfd "${FILESDIR}"/fireqos.confd fireqos
+	newinitd "${FILESDIR}"/fireqos.initd fireqos
 }
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index 1957586692d9..5e70d7dbeaf3 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -1,4 +1,7 @@
+AUX libexec/nftables-mk.sh 984 BLAKE2B 5a9a8005a814da3a16befcb8e59754f5fe7c6381c22d1992940c1f01cb420ff41418095f22ca9367cf230e71cee53b8a08568c5f160c525d8b9c5a8a6b5e8a7b SHA512 a09ae5b144c2424b8ec7d41fe7e2f84eb246e08a9a4b3bdfa19368a2d005fad6aa3538b64305cf357e704b646ae1b408629221d74e19a3b1d91b6d5ec41630a4
 AUX libexec/nftables.sh 3643 BLAKE2B 83818eb88db2d30c58b348e12b5c5baf7599f4e301ac12455a70f1c98e369e4febab3020ddb1c5b83e6d3777b3a98bd30a5baf73d90ac00e1278d88fc1565b8b SHA512 efc9b4f9520c78b6248f16bd5708669872e8abf949f6f4b81182f331f8532dfeaae2df648e8878e9b5cbd66c0259daab71035ea922754807654b2b3bc86b4352
+AUX nftables-mk.confd 899 BLAKE2B f4c3d82fbae87fb0d755af786a98db591b6a667cf33660ba9275ada2e6417fad1899a7f29762f23c112fc5c9e178bc7590c3b2ba26617853c3577917bd7d3edf SHA512 505ed05674a04367f1a3d5cf6447596ad1c3b2e9c920697f12f58a20d94c2a39b0041bb4911678511c4548566a69d964661d4afc3e7e27997943b875f204c602
+AUX nftables-mk.init 2090 BLAKE2B 62f56586ca4ba0acbd3ac41f4904041d625388771bbafc32833055a5f3c00f251e1d9a04bb41dd672f33d13a0825f7e4470a30d7e874df1abd41508148ef42b0 SHA512 819b2d60b42207cb70d95b700557e873fe18c5f6e8437683240beb317f773cf8e18755086e24652a9bcff49c6f96af8cd9e3f3b62c9f433779eff4e3f3935197
 AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b232a044c2fd64f8e50b9b55a4fe670174c3eabf3d176ee0158c1043baec4b76b0802e7e97bc862fcf SHA512 8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144
 AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c89b59fc7e3ea0dff0e98d767cee2c00a5462023fdf6f59e813dec7063768a34187f2404377e498f7 SHA512 ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
@@ -8,5 +11,6 @@ DIST nftables-0.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e2
 EBUILD nftables-0.8-r3.ebuild 1959 BLAKE2B a029fd4444f5aeddedfbdcb3659f879c4a8f6246c25042449cb5ffa7809401a7ef512275dc1f45c50b51bc2807b3679d1c386bcb2470522ba1a338dc728bdb15 SHA512 6bd510183e9d1cec3fa05970adccf28ac21c7ad839f3a6236ee584d1308c48988ee2b006630ecd558954cb80a7a8faf6e78ab9b06b29df4b2a69161a9e848c71
 EBUILD nftables-0.8.5.ebuild 1937 BLAKE2B b24ea2b8978dc0294c2d27a90aa205916ddeb04c2b66f0adc7e870705a6ffac8ac0e3bf5a95e3c79c27965f780c0ca94ba21bcb5abad49ce49b50ff00c2046fd SHA512 f5f461225c68ed17450380d467f79d87302f0d1c1d69ddb15f90b6a938ea79906e165e6564db8135f07eafc35fb89acfab7659a97d62c7c71ac0376953ff6954
 EBUILD nftables-0.9.0-r1.ebuild 2079 BLAKE2B 303d82b14d13f49c7ed5222d69025eaf0d73e3ec617655b33224b8a1f14e4a16a9d9e71a60270cb3e015bb009efb43ccb419a722a4780cdba50cc2ea341a3eda SHA512 68386a156baa050c83f6233516f8e37f871a2be203d71c751eeefbfbbfe52f114201c2a6eced8bfa194ca8e87c9ad62d6370096c0ceab6e60927cf236c12dfe6
+EBUILD nftables-0.9.0-r2.ebuild 2343 BLAKE2B d726f8bef9ddd5860fff0d91cf29185a32432fc24ad31b173330dd4f881809f66e62e805dcbb9d1e4bbc9f0c3c8185ceadaa4db7882266a1747f9d5f522e1e9e SHA512 953a2e64cf4ddc2591335b245ca8a0b18056cb55c46f7796fd1e4de2f774ab3bb2b3bb6be70b49c7c7d1b4d4780f1e5e3335b84d1d97e9a4a99443aecadc91e1
 EBUILD nftables-0.9.0.ebuild 1989 BLAKE2B 3c1e318030d8287b0db2b2ebda3e528703ac73bdf146c147c5c7f8929e9339f9c4c6df08fc829a0ad55f4634b0910e8acfeeb9a31577ba6e61663839c6978a5f SHA512 627c70f4bb60fdbea3f57e676acfb84ed0a4779b6b98b352be766463ca2c564ebcd1a540719e2085b59b8b87fd8dfe7bb1cc6b6d91ec5fe4aac79f53c3c1c496
-MISC metadata.xml 466 BLAKE2B 535df1fe78a4cc4da0375e8db9b3d641ed19736f1992d361203f2e2088aaad7d86a0d547cc9b9139f36837cf6edf6dadea3c17f54b562e6061db52579659f806 SHA512 59494d7efc5f49a417c623410bbda4f891a47a4e1a8a43c8b7357978618401e80595c52113d7aaf8a6171ccacca50fe101c9b5bdbe070f0e993829b72693c931
+MISC metadata.xml 701 BLAKE2B 14244e9f37e87bc6e4a9cc917b7f2e55bcb61135af3a9ff258334ef9d40ade40312760f30ddab907d75f4c4492cc8d8d2217d022f5e04672988c25d65ec1d85a SHA512 070e4dcaf6f323f93fac80352d2c2ae1512611ffc3261e7b3c85acee9f490f90e238b39aad2a7d4959c75fe7c96545b8c12318b09d4c56d8116df80364bf09a6
diff --git a/net-firewall/nftables/files/libexec/nftables-mk.sh b/net-firewall/nftables/files/libexec/nftables-mk.sh
new file mode 100644
index 000000000000..b6ad37867b6d
--- /dev/null
+++ b/net-firewall/nftables/files/libexec/nftables-mk.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+main() {
+	local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}
+	case "$1" in
+		"check")
+			nft -c -f "${NFTABLES_SAVE}"
+		;;
+		"clear")
+			nft flush ruleset
+		;;
+		"list")
+			nft ${SAVE_OPTIONS} list ruleset
+		;;
+		"load")
+			( echo "flush ruleset;"; cat "${NFTABLES_SAVE}" ) | nft -f -
+		;;
+		"panic")
+			panic hard | nft -f -
+		;;
+		"soft_panic")
+			panic soft | nft -f -
+		;;
+		"store")
+			local tmp_save="${NFTABLES_SAVE}.tmp"
+			umask 600;
+			(
+				echo "#!/sbin/nft -f"
+				echo "flush ruleset;"
+				nft ${SAVE_OPTIONS} list ruleset
+			) > "$tmp_save" && mv ${tmp_save} ${NFTABLES_SAVE}
+		;;
+	esac
+}
+
+panic() {
+	local erule;
+	[ "$1" = soft ] && erule="ct state established,related accept;" || erule="";
+	cat <<EOF
+table inet filter {
+	chain input {
+		type filter hook input priority 0;
+		$erule
+		drop
+	}
+	chain forward {
+		type filter hook forward priority 0;
+		drop
+	}
+	chain output {
+		type filter hook output priority 0;
+		$erule
+		drop
+	}
+}
+EOF
+}
+
+main "$@"
diff --git a/net-firewall/nftables/files/nftables-mk.confd b/net-firewall/nftables/files/nftables-mk.confd
new file mode 100644
index 000000000000..5cda24030f93
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-mk.confd
@@ -0,0 +1,26 @@
+# /etc/conf.d/nftables
+
+# Location in which nftables initscript will save set rules on
+# service shutdown
+NFTABLES_SAVE="/var/lib/nftables/rules-save"
+
+# Options to pass to nft on save
+SAVE_OPTIONS="-n"
+
+# Save state on stopping nftables
+SAVE_ON_STOP="yes"
+
+# Only for OpenRC systems.
+# Set to "hard" or "soft" to panic when stopping instead of
+# clearing the rules
+# Soft panic loads a ruleset dropping any new or invalid connections
+# Hard panic loads a ruleset dropping all traffic
+PANIC_ON_STOP=""
+
+# If you need to log nftables messages as soon as nftables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"
diff --git a/net-firewall/nftables/files/nftables-mk.init b/net-firewall/nftables/files/nftables-mk.init
new file mode 100644
index 000000000000..f7e3dce8ada2
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-mk.init
@@ -0,0 +1,104 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="check clear list panic save soft_panic"
+extra_started_commands="reload"
+
+depend() {
+	need localmount #434774
+	before net
+}
+
+checkkernel() {
+	if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then
+		eerror "Your kernel lacks nftables support, please load"
+		eerror "appropriate modules and try again."
+		return 1
+	fi
+	return 0
+}
+
+checkconfig() {
+	if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then
+		eerror "Not starting nftables. First create some rules then run:"
+		eerror "/etc/init.d/${SVCNAME} save"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkkernel || return 1
+	check || return 1
+}
+
+start() {
+	ebegin "Loading ${SVCNAME} state and starting firewall"
+	/usr/libexec/nftables/nftables.sh load "${NFTABLES_SAVE}"
+	eend $?
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+		save || return 1
+	fi
+
+	ebegin "Stopping firewall"
+	if [ "${PANIC_ON_STOP}" = "hard" ]; then
+		/usr/libexec/nftables/nftables.sh panic
+	elif [ "${PANIC_ON_STOP}" = "soft" ]; then
+		/usr/libexec/nftables/nftables.sh soft_panic
+	else
+		/usr/libexec/nftables/nftables.sh clear
+	fi
+	eend $?
+}
+
+reload() {
+	start_pre || return 1
+	start
+}
+
+clear() {
+	ebegin "Clearing rules"
+	/usr/libexec/nftables/nftables.sh clear
+	eend $?
+}
+
+list() {
+	/usr/libexec/nftables/nftables.sh list
+}
+
+check() {
+	ebegin "Checking rules"
+	/usr/libexec/nftables/nftables.sh check "${NFTABLES_SAVE}"
+	eend $?
+}
+
+save() {
+	ebegin "Saving ${SVCNAME} state"
+	checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"
+	checkpath -q -m 0600 -f "${NFTABLES_SAVE}"
+	/usr/libexec/nftables/nftables.sh store "${NFTABLES_SAVE}"
+	eend $?
+}
+
+panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping all packets"
+	/usr/libexec/nftables/nftables.sh panic
+	eend $?
+}
+
+soft_panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping new connections"
+	/usr/libexec/nftables/nftables.sh soft_panic
+	eend $?
+}
diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index 1a891a6e5330..dcc71d66d6f8 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/metadata.xml
@@ -9,7 +9,12 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>klondike@gentoo.org</email>
+		<name>Francisco Blas Izquierdo Riera</name>
+	</maintainer>
 	<use>
 		<flag name="json">Enable JSON support via <pkg>dev-libs/jansson</pkg></flag>
+		<flag name="modern_kernel">Install init scripts for 3.18 or higher kernels with atomic rule updates</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-firewall/nftables/nftables-0.9.0-r2.ebuild b/net-firewall/nftables/nftables-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..346d321bb376
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.9.0-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="debug doc +gmp json +modern_kernel +readline"
+
+RDEPEND=">=net-libs/libmnl-1.0.3:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.1.1:0="
+
+DEPEND="${RDEPEND}
+	>=app-text/docbook2X-0.8.8-r4
+	doc? ( >=app-text/dblatex-0.3.7 )
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+S="${WORKDIR}/v${PV}"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern_kernel && kernel_is lt 3 18; then
+			eerror "The modern_kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc pdf-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	local mksuffix=""
+	use modern_kernel && mksuffix="-mk"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+	systemd_enable_service basic.target ${PN}-restore.service
+
+	docinto /usr/share/doc/${PF}/skels
+	dodoc "${D}"/etc/nftables/*
+	rm -R "${D}"/etc/nftables
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT%/}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f ${save_file} ]]; then
+		touch ${save_file}
+	fi
+
+	elog "If you are creating firewall rules before the next system restart "
+	elog "the nftables-restore service must be manually started in order to "
+	elog "save those rules on shutdown."
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 5792cede9f91..f99041df2176 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index d546d2d5824f..cf340fa2407b 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -7,6 +7,7 @@ DIST mc-2018.11.30.01.52.08.tar.gz 1732768 BLAKE2B 22c7329dc808c7d4900e8d7b738cb
 DIST mc-2018.12.05.22.59.07.tar.gz 1732742 BLAKE2B 33cf0023d3350d739567cf9d402f3011b83ec74801b3811c249944de2c1d0e67ee43afa1327ed41c6f4e259bb7c55f7839f8f9241dec05d4ffbe5d4406c2d9c7 SHA512 82f9784ce50810390bb991816455373c91d08b5e0630f85754a3abc66cfcfc74665cf8f5877cde10893583f1f9911e458e1caac9bcbddbf7b727e7c9f5f57a71
 DIST mc-2018.12.12.19.02.22.tar.gz 1734072 BLAKE2B 23539e764308d91012ec7fde5531066f88cf654f5cb98d9424b7697610df5dd0b0257f3926fbe35370b28c96abcb82c00fe4061e6cfe8adf8a130800a2bb3bef SHA512 c0f65b1e438f72716ff04e755654d021de37852f5eb2d2a16954c6b6e6356b9f9a31ce018b791e71c7deced82acb0be32c2bf4e27b4d6bd3ce9df91ecaf155cf
 DIST mc-2018.12.19.22.58.03.tar.gz 1732775 BLAKE2B 300a514c3eca52ab9b136c1d6a01055593d40f2b207229fa9f32f2fa3b3dce30a28fd4e39dd97ca51ddf920a91d2b45ecf44e843d7de9f271896717391f7242c SHA512 9fe0afbd4bb39d609b6e6e67a159997dd6b9ee43cc741282d05e9a55d4c24aa56258ad2eee08991112aa89002ac8a4c0042505b979d5ac49cb3714fd810da354
+DIST mc-2019.01.10.00.38.22.tar.gz 1791858 BLAKE2B ae89c935634190e347be8c2f0a3dfff12872b4eca7aa17b79b5e05d7cb9be6fe39ff7b0ccbb6ddf5851ae3ee84a89eebf289d801340519e91470b3f5c60f7c37 SHA512 626e5adf5a3dcda0945e5fb37394097550f2976626da50e795b389d1d78545b1a2907c9b9fded5ce26823694e7e3981a69fa18ed00ae21d5c405c69c165ae1ce
 EBUILD mc-2018.09.06.23.26.56.ebuild 1178 BLAKE2B 30e3b7ef2c39f0d0e930b7a1127ef9544077add85260ebe73251edf81f681934e85fa1dcdb2bb131f41b14a5fa12c8f627e54ef408f7b23f2dcea4fb78e390ac SHA512 19111a0ca521095705c8f09df126aa50325f99488c968a415f60874f63f370eca0f8043803464ffe9ca9753b0e445a809a2ed41fdda1f8fddcf93b00ab4bad29
 EBUILD mc-2018.09.10.23.39.12.ebuild 1178 BLAKE2B 1828f65d44b115d8a52690dbbdd6d2a756aec8b4ddd5e7ca4da0dc5c678d336adac6b7f4d78fd9118abf3c4293b879e4e584e913d3e5e6a262a965b21ca8a342 SHA512 f456334d9eaf2d41a2b8ffa3c50933fa8e8ec624ad02885eb63a0abe3d726fb890ded0d57059180157ff4aeabaa4b3849ed43497a6dc39d8648bc217c5454ebb
 EBUILD mc-2018.09.26.00.42.43.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
@@ -16,4 +17,5 @@ EBUILD mc-2018.11.30.01.52.08.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef0
 EBUILD mc-2018.12.05.22.59.07.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2018.12.12.19.02.22.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2018.12.19.22.58.03.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
+EBUILD mc-2019.01.10.00.38.22.ebuild 1175 BLAKE2B 61b24bb99216fb058dd20fcd87259f67e60cd486c642cb31cd7e445d15ece2275c45001a834b591e4e1b9b4b113185a8f1ebc1dadf011c52de433d1edc731ab1 SHA512 7da8bd683173d5a4aca42cff1776909f85b3a7bb84e5445b28f78e2c8b2b77a34f3fac4f92c8a7629dfc6cdc3977fc053f7b2108a0ae4b19957e0a7bb68a0dd1
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2019.01.10.00.38.22.ebuild b/net-fs/mc/mc-2019.01.10.00.38.22.ebuild
new file mode 100644
index 000000000000..7a3a66e507b5
--- /dev/null
+++ b/net-fs/mc/mc-2019.01.10.00.38.22.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MC_RELEASE="${MY_PV}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index fd0c9498203f..4f55b2243d64 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -10,6 +10,7 @@ DIST minio-2018.12.06.01.27.43.tar.gz 9087439 BLAKE2B fbbde99442ce0b1573251ca93a
 DIST minio-2018.12.13.02.04.19.tar.gz 9091219 BLAKE2B 7d4619cb3d88c4c115e0361edecf73df7d7d6b5ed86487653aa8ee30c75bf1fbb026011b25d8a5270616b89d1c3a9df3ca1aedb6d4339914e48744982c79991a SHA512 4d4542644738ffd8541ad118f74957aee272afa47c82469cda85994aa4c228dcf08126606c4cf3684c5a2a0ca9a55c1841230dfd0983dc17c4873e8ecceb7176
 DIST minio-2018.12.19.23.46.24.tar.gz 9096254 BLAKE2B 252c8e84e9df0f5e2f85f5f5a0930a53f960b25c03a381961adeb338f70d7ec3e172c369fb52c4aa14c039e48c0611f90f627ede797b3469ed08d2a4ffd0653c SHA512 c1acfca6fdba3490fcd89e0c910b0b9da0c2ca04fe8e5d17acf6001f313fa7ba64a548921a35c531e9998f7bef1535fc239e95382f78e2ee0a9fd40bc87bb2bc
 DIST minio-2018.12.27.18.33.08.tar.gz 9102593 BLAKE2B 40e1a014edcfe84f9310bd09b0d4e5853b3ef8e1cc7e1a0805aaf83f55320a516df0c930c78d5b7726625d9f2d521dbee534b949f31b63438ac19971f75e493c SHA512 92ec8b8d1094d3b125f3522063895274e9aa0144063c4ac64a3919dfc65a6ee26e7a1bc03063f61acdb6b5b14681448f3451598939a8f17d107205091049279c
+DIST minio-2019.01.10.00.21.20.tar.gz 9272639 BLAKE2B e8d64c436795894ad6e20cfc5acc193598312a6c1d7e20b58a1250f0bcc4791f004afd1dfed4d0e2d506f4690290d0d29596a263853c216456555792e84da5b2 SHA512 fe68bbd56f131ba4e189114b45fbf2f95925cce3a11384503c67debdc9eb04cf1c034f28f792adbcca373783cf74f3f57853a6e61241a5864898e19946c31e6f
 EBUILD minio-2018.10.18.00.28.58.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.10.25.01.27.03.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.11.06.01.01.02.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
@@ -20,5 +21,6 @@ EBUILD minio-2018.11.30.03.56.59.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d
 EBUILD minio-2018.12.06.01.27.43.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.12.13.02.04.19.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.12.19.23.46.24.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
-EBUILD minio-2018.12.27.18.33.08.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
+EBUILD minio-2018.12.27.18.33.08.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
+EBUILD minio-2019.01.10.00.21.20.ebuild 1358 BLAKE2B 5d9bc5f7b20f436d01e37d5924da48406355a2eebf03ecabde4b16050c9c1066c395601e561f995a4c07fc89443b92af8ecee803efb62d5768cbcb57039288fb SHA512 9ee0b128d3812148700216d4bbb3d98a18d8aaf4198e043b4b431de6b6376a35f780940e79067b5f7a38dc6a0d3b0550d6761579a54e8c8e5d85479105f305c9
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2018.12.27.18.33.08.ebuild b/net-fs/minio/minio-2018.12.27.18.33.08.ebuild
index 9adcc45356de..8154fe5911ee 100644
--- a/net-fs/minio/minio-2018.12.27.18.33.08.ebuild
+++ b/net-fs/minio/minio-2018.12.27.18.33.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
 MY_PV=${MY_PV//./-}
 EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
 ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~amd64-linux"
 
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
diff --git a/net-fs/minio/minio-2019.01.10.00.21.20.ebuild b/net-fs/minio/minio-2019.01.10.00.21.20.ebuild
new file mode 100644
index 000000000000..8154fe5911ee
--- /dev/null
+++ b/net-fs/minio/minio-2019.01.10.00.21.20.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~amd64-linux"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index d2c81174d459..79d7a3ff43ca 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,9 +1,7 @@
 AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.10.tar.bz2 1811929 BLAKE2B 9249b6e32ae8a5c3cefd461e182fa4972c3b65c19cc8f25f3eeaa00b8f2694ee2e03d1adf702e59a7a8da5d3f53d047c18f99a13bbfbc6d4b29b888ee20f1906 SHA512 dd1f49307b5298a784e2b487c0da94459632bab8353cf505cd4b104f4c0b55bbb77caf73e8b4c60af64018b345df78337accac3b5ed6cb5620309b163a86d32b
-DIST netatalk-3.1.11.tar.bz2 1812227 BLAKE2B a416d8fe96df6869ac63b0d41ede37e21f7a49528f12719a74497813749b5cf523c2f3cba5a5034cb2a978c2c83ea1d516a24b71f28fa584bc5c9261f129274c SHA512 330e584f34b5f5e8714b3eca8e11adb93134cc0afa73e9bc25ddadcf3e9a96779a2979dfc08a64d343b148bc2d4e0e0f25b08d9c46d6b68057611d04ecfd06ea
-DIST netatalk-3.1.8.tar.bz2 1802404 BLAKE2B 101285dc9c031b95a6e353a215ba119e6e25a7c3741e4ce40d86c21479fe33c2b268923d5ff060b97f3c35cb10c99d94c4da2fa4a089c8dfcef08a28044ed186 SHA512 734745743b2d5fe39f3d6716f377e6255d6a061e3c615a4fe30db388ec6d848f6db063d733dfa24ccf967f1e9042841bce4824f4bed391952c4304ee11e11b0d
+DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
 EBUILD netatalk-3.1.10.ebuild 4963 BLAKE2B 3e7636fad9f27c80543c9faf8ff1837160fbdc8b3a27cca6c1caf2f97ef99034dc3fc952b9227b41b951bff1794aef0d6fa87c1fc4024cc9796d35437ee83c2f SHA512 9984c07268251cfb30d6e43138f7cd5b6b1e8cb2e265e519e3af9392b55dd33acf5731e2114f96d6f214da7c3be01d986096cfa28c95b226076f1475e0163098
-EBUILD netatalk-3.1.11.ebuild 4966 BLAKE2B 97915653146ce829cf72ff86cc73734f3d4a87393868696105c017e4892e932ca93f550dce875dd3925be346ffc2e537da72f726b0a7aa2025b1a1c491099ec1 SHA512 fc71d343e461e36242c80456aad94fe205465bf8b332620ff83f337fc49d233949648fe5f1d574cd3c3d85eb17b4c7bca8f5e799d71b1aa13fdcddbcadf8099f
-EBUILD netatalk-3.1.8.ebuild 4867 BLAKE2B 64cd1d25d51d2caa987275f24bc99a1d3cdde24a8bbfdee61527350b92d749f8203eb5b3e67f268c4f7ce7c9b5a64d71d884a760afb8373e548ca549b356d6c1 SHA512 086e53f7ddfc438e0b173e7f6e208a2245d224e44a70fde07fca5294f299c18fc04a75986fa02b9e5759c5319886514d319fb91ee5ec94209a29663dc02e7a63
+EBUILD netatalk-3.1.12.ebuild 4872 BLAKE2B dabced8b6522a54a02580a0a1cf8569c0a1817222831f197e096198ea8fc516fdcd6bc610bd4d43584d9643aaa1b636a0ada430394b4f01d142fd363127c3a7c SHA512 71d236944f5a772cc98e54252602b4d4a70502bf79b0e0ecd44bffd3783d4a606920b16fb0675a6f914b2b291c1b6d5099478b37e0ea4df3340360074c282c08
 MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/netatalk-3.1.11.ebuild b/net-fs/netatalk/netatalk-3.1.11.ebuild
deleted file mode 100644
index 761f1c4f0041..000000000000
--- a/net-fs/netatalk/netatalk-3.1.11.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/17.0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent:0=
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52:=
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl:0 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	tracker? ( dbus )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
-	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
-)
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_enable zeroconf)
-		$(use_with acl acls)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo-openrc
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use zeroconf; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3 ${v}; then
-			for fle in afp_signature.conf afp_voluuid.conf; do
-				if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-					if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-						mv \
-							"${ROOT}"etc/netatalk/${fle} \
-							"${ROOT}"var/lib/netatalk/
-					fi
-				fi
-			done
-
-			echo ""
-			elog "Starting from version 3.0 only uses a single init script again"
-			elog "Please update your runlevels accordingly"
-			echo ""
-			elog "Dependencies should be resolved automatically depending on settings"
-			elog "but please report issues with this on https://bugs.gentoo.org/ if"
-			elog "you find any."
-			echo ""
-			elog "Following config files are obsolete now:"
-			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-			elog "in favour of"
-			elog "/etc/afp.conf"
-			echo ""
-			elog "Please convert your existing configs before you restart your daemon"
-			echo ""
-			elog "The new AppleDouble default backend is appledouble = ea"
-			elog "Existing entries will be updated on access, but can do an offline"
-			elog "conversion with"
-			elog "dbd -ruve /path/to/Volume"
-			echo ""
-			elog "For general notes on the upgrade, please visit"
-			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-			echo ""
-			break
-		fi
-	done
-}
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
new file mode 100644
index 000000000000..026d6442f0e8
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools flag-o-matic multilib pam python-r1 systemd
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0/18.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
+
+CDEPEND="
+	!app-editors/yudit
+	dev-libs/libevent:0=
+	>=dev-libs/libgcrypt-1.2.3:0
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52:=
+	sys-libs/tdb
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	cracklib? ( sys-libs/cracklib )
+	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tracker? ( app-misc/tracker )
+	utils? ( ${PYTHON_DEPS} )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${CDEPEND}
+	utils? (
+		dev-lang/perl
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+	)"
+DEPEND="${CDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+RESTRICT="test"
+
+REQUIRED_USE="
+	ldap? ( acl )
+	tracker? ( dbus )
+	utils? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
+	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
+)
+
+src_prepare() {
+	default
+	append-flags -fno-strict-aliasing
+
+	if ! use utils; then
+		sed \
+			-e "s:shell_utils::g" \
+			-i contrib/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=()
+
+	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	# TODO:
+	# systemd : --with-init-style=systemd
+	myeconfargs+=(
+		$(use_enable debug)
+		$(use_enable debug debugging)
+		$(use_enable pgp pgp-uam)
+		$(use_enable kerberos)
+		$(use_enable kerberos krbV-uam)
+		$(use_enable quota)
+		$(use_enable tcpd tcp-wrappers)
+		$(use_enable zeroconf)
+		$(use_with acl acls)
+		$(use_with cracklib)
+		$(use_with dbus afpstats)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		$(use_with tracker)
+		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
+		$(use_with tracker tracker-pkgconfig-version $(ver_cut 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
+		--enable-overwrite
+		--disable-krb4-uam
+		--disable-afs
+		--with-libevent-header=/usr/include
+		--with-libevent-lib=/usr/$(get_libdir)
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--disable-silent-rules
+		--with-init-style=gentoo-openrc
+		--without-libevent
+		--without-tdb
+		--with-lockfile=/run/lock/${PN}
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_install() {
+	default
+
+	if use zeroconf; then
+		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+	else
+		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
+	fi
+
+	# The pamd file isn't what we need, use pamd_mimic_system
+	rm -rf "${ED}/etc/pam.d" || die
+	pamd_mimic_system netatalk auth account password session
+
+	sed \
+		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
+		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
+		distrib/initscripts/service.systemd.tmpl \
+		> "${T}"/service.systemd || die
+	systemd_newunit "${T}"/service.systemd ${PN}.service
+
+	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
+}
+
+pkg_postinst() {
+	local fle v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ $(ver_test ${v} -lt 3) ]]; then
+			for fle in afp_signature.conf afp_voluuid.conf; do
+				if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
+					if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
+						mv \
+							"${ROOT}"etc/netatalk/${fle} \
+							"${ROOT}"var/lib/netatalk/
+					fi
+				fi
+			done
+
+			echo ""
+			elog "Starting from version 3.0 only uses a single init script again"
+			elog "Please update your runlevels accordingly"
+			echo ""
+			elog "Dependencies should be resolved automatically depending on settings"
+			elog "but please report issues with this on https://bugs.gentoo.org/ if"
+			elog "you find any."
+			echo ""
+			elog "Following config files are obsolete now:"
+			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
+			elog "in favour of"
+			elog "/etc/afp.conf"
+			echo ""
+			elog "Please convert your existing configs before you restart your daemon"
+			echo ""
+			elog "The new AppleDouble default backend is appledouble = ea"
+			elog "Existing entries will be updated on access, but can do an offline"
+			elog "conversion with"
+			elog "dbd -ruve /path/to/Volume"
+			echo ""
+			elog "For general notes on the upgrade, please visit"
+			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
+			echo ""
+			break
+		fi
+	done
+}
diff --git a/net-fs/netatalk/netatalk-3.1.8.ebuild b/net-fs/netatalk/netatalk-3.1.8.ebuild
deleted file mode 100644
index 30f0a1ece1d3..000000000000
--- a/net-fs/netatalk/netatalk-3.1.8.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic multilib pam python-r1 systemd versionator
-
-DESCRIPTION="Open Source AFP server"
-HOMEPAGE="http://netatalk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-3)/${P}.tar.bz2"
-
-LICENSE="GPL-2 BSD"
-SLOT="0/17.0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="acl cracklib dbus debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
-
-CDEPEND="
-	!app-editors/yudit
-	dev-libs/libevent
-	>=dev-libs/libgcrypt-1.2.3:0
-	sys-apps/coreutils
-	>=sys-libs/db-4.2.52:=
-	sys-libs/tdb
-	acl? (
-		sys-apps/attr
-		sys-apps/acl
-	)
-	cracklib? ( sys-libs/cracklib )
-	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl:0 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	tracker? ( app-misc/tracker )
-	utils? ( ${PYTHON_DEPS} )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${CDEPEND}
-	utils? (
-		dev-lang/perl
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-	)"
-DEPEND="${CDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-RESTRICT="test"
-
-REQUIRED_USE="
-	ldap? ( acl )
-	utils? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
-	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
-)
-
-src_prepare() {
-	if ! use utils; then
-		sed \
-			-e "s:shell_utils::g" \
-			-i contrib/Makefile.am || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=()
-
-	append-flags -fno-strict-aliasing
-
-	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
-	# to sed the Makefiles to not do rc-update.
-	# TODO:
-	# systemd : --with-init-style=systemd
-	myeconfargs+=(
-		$(use_enable debug)
-		$(use_enable debug debugging)
-		$(use_enable pgp pgp-uam)
-		$(use_enable kerberos)
-		$(use_enable kerberos krbV-uam)
-		$(use_enable quota)
-		$(use_enable tcpd tcp-wrappers)
-		$(use_enable zeroconf)
-		$(use_with acl acls)
-		$(use_with cracklib)
-		$(use_with dbus afpstats)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with samba smbsharemodes)
-		$(use_with shadow)
-		$(use_with ssl ssl-dir)
-		$(use_with tracker)
-		$(use_with tracker tracker-pkgconfig-version $(get_version_component_range 1-2 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')))
-		--enable-overwrite
-		--disable-krb4-uam
-		--disable-afs
-		--with-libevent-header=/usr/include
-		--with-libevent-lib=/usr/$(get_libdir)
-		--with-bdb=/usr
-		--with-uams-path=/usr/$(get_libdir)/${PN}
-		--disable-silent-rules
-		--with-init-style=gentoo
-		--without-libevent
-		--without-tdb
-		--with-lockfile=/run/lock/${PN}
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use zeroconf; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
-	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
-	fi
-
-	# The pamd file isn't what we need, use pamd_mimic_system
-	rm -rf "${ED}/etc/pam.d" || die
-	pamd_mimic_system netatalk auth account password session
-
-	sed \
-		-e "s|:SBINDIR:|${EPREFIX}/usr/sbin|g" \
-		-e "s|:PATH_NETATALK_LOCK:|/run/lock/netatalk|g" \
-		distrib/initscripts/service.systemd.tmpl \
-		> "${T}"/service.systemd || die
-	systemd_newunit "${T}"/service.systemd ${PN}.service
-
-	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
-}
-
-pkg_postinst() {
-	local fle v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 3 ${v}; then
-			for fle in afp_signature.conf afp_voluuid.conf; do
-				if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
-					if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
-						mv \
-							"${ROOT}"etc/netatalk/${fle} \
-							"${ROOT}"var/lib/netatalk/
-					fi
-				fi
-			done
-
-			echo ""
-			elog "Starting from version 3.0 only uses a single init script again"
-			elog "Please update your runlevels accordingly"
-			echo ""
-			elog "Dependencies should be resolved automatically depending on settings"
-			elog "but please report issues with this on https://bugs.gentoo.org/ if"
-			elog "you find any."
-			echo ""
-			elog "Following config files are obsolete now:"
-			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
-			elog "in favour of"
-			elog "/etc/afp.conf"
-			echo ""
-			elog "Please convert your existing configs before you restart your daemon"
-			echo ""
-			elog "The new AppleDouble default backend is appledouble = ea"
-			elog "Existing entries will be updated on access, but can do an offline"
-			elog "conversion with"
-			elog "dbd -ruve /path/to/Volume"
-			echo ""
-			elog "For general notes on the upgrade, please visit"
-			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-			echo ""
-			break
-		fi
-	done
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 9abd1e00b3e8..49ab51539a29 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,7 +2,11 @@ DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
 DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
+DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b SHA512 99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653
+DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601 SHA512 8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-EBUILD openafs-1.6.22.1.ebuild 7025 BLAKE2B bf11a12986899a5807f09da71cd2bea0a4b5f4f51ed66be78a96007df1e7649e1ab37adaee5c1faab13b0c4d354406df6f82980d3ea02bd2e9b50cccecbb6d25 SHA512 04055fd88ad4479ffc2f1f17c214b20588a81177a175f850232a0facffe0823ee58350220b7bce09ab8fd735573bbabddafd23a03f2ec9123294482de37dac8b
-EBUILD openafs-1.6.22.2.ebuild 7027 BLAKE2B 16d9d79f95b996982baaf1e5334afa7f5c3b5aa7f02e306b05045a0328e393350fcff4cdc5f7a59e933321172332bce47c7afd672d9dd7f4adcd0fba75fddf3b SHA512 33418b31c69fcfddff0134350389994a58515554358ce71981d43cab3d9c1e0c3e29f090fb68e64497971d9220dd1a74113a658a3ffcd57a02f2c8c602228a97
-MISC metadata.xml 799 BLAKE2B caf76c428f163ce06736336ed8fc7c3904704007802675062940b4f2b0c249118085536253274f01536be1753f68438308b7dc2209e306f0062d678c9b9c1a76 SHA512 c18b15cf358b99aae5e2cd7fa8c2e6255b70e71586c42479da411890795b052a161698ec8cccb0beac000e3c60b7e1d569decd54a599b6bc8b570f8664a9a3c1
+DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d SHA512 bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16
+EBUILD openafs-1.6.22.1.ebuild 6990 BLAKE2B f2b7e8b03a47a4d274f6ff1cd1e10af59dbbe6c861d5a00d0871aa862de50625db3fd9f83ce960984b09e90b90e6097e5fcd1a86289758b464163ce349a69c5b SHA512 6cd10c62c10d28fc3af24e1e3adcccf75b2f36becff5228eb8d0cc3e1a99bdc621388be93be302ec86144bfc1236b8c7d711ad6d1bcd20a39531bb140d1c5773
+EBUILD openafs-1.6.22.2.ebuild 6992 BLAKE2B 2a4bb61cc25cf8c653c2a3ffc36062d484dc196fced583d3c3034c019c71ff1500503f9e8f0318e7bbe85616493b2264d1fee03f03c4248557f9d6709b10198e SHA512 6176e3c4b47b5b52f262a6d87e98987d0e17b90874f806bbe3743c89665c3f085fd5e2c8b90cf61ed8f623e6224d5c2c99e40fd1f26f7915556ac5e04430d4e2
+EBUILD openafs-1.8.2-r1.ebuild 10904 BLAKE2B 7fc3b1127a17447158558fdab55cc6066e48771616a3da5ae3556abe6da5f0597ea4d320722793f278479e431e6432c723aec7d626d35b9f6c1c05ccf7454566 SHA512 f88e2244e28910a4712c486ed4c49bce1e5d935b385c3373d472a516fd52873a30edb8debd1c0fbfcb723cb5fd0de1a6804d32cf47089481b16eed1c6cae0530
+MISC metadata.xml 1430 BLAKE2B cb3538d4816c5ebae039e2aba5bf3b2acf21a499c8f18f504862922507830f6534d6c0e0434052c62ae1e34676479ac8dd794a3e8f82504328589c8e86bd7455 SHA512 f57967dcc50858e63db43af63128b4a6d5a6db78019178a5a44a0a9ef770de4d274f26ad00f7e5abebfa900795cdfecd6a9019202419a426606ea1419eb4d948
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 4e38bd3d43bd..32ca71d15eb8 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -9,12 +9,23 @@
 	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name="bitmap-later">Enable fast startup of file server by
-	not reading bitmap till needed.</flag>
+	<flag name="api">Build API documentation using <pkg>app-doc/doxygen</pkg>.
+	May take a *long* time to build.</flag>
+	<flag name="bitmap-later">Enable fast startup of file server by not
+	reading bitmap till needed.</flag>
 	<flag name="fuse">Build fuse client.</flag>
+	<flag name="kauth">Install the DEPRECATED kauth server, PAM modules, and utilities</flag>
 	<flag name="modules">Build libafs kernel module. Disable only if you know
 	what you're doing: without this module OpenAFS client will not work.</flag>
+	<flag name="namei">Enable namei fileserver instead of inode fileserver.
+	You should disable this option only if compatibility with inode format AFS
+	storage is required.
+	</flag>
 	<flag name="pthreaded-ubik">Enable installation of pthreaded ubik applications.</flag>
 	<flag name="supergroups">Enable support for nested pts groups.</flag>
+	<flag name="tsm">Enable use of the Tivoli TSM API libraries from <pkg>app-backup/tsm</pkg>
+	for butc support. AMD64 only.</flag>
+	<flag name="ubik-read-while-write">Enable vlserver read from db cache during
+	write locks (EXPERIMENTAL)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild b/net-fs/openafs/openafs-1.6.22.1.ebuild
index b28e663b51da..c8d779968717 100644
--- a/net-fs/openafs/openafs-1.6.22.1.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
 
-MY_PV=$(delete_version_separator '_')
+MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
 PVER="20170822"
 
@@ -27,7 +27,7 @@ IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +
 
 CDEPEND="
 	virtual/libintl
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? ( virtual/pam )"
diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild
index 249ca428710e..d1b9080afba6 100644
--- a/net-fs/openafs/openafs-1.6.22.2.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
 
-MY_PV=$(delete_version_separator '_')
+MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
 PVER="20170822"
 
@@ -27,7 +27,7 @@ IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +
 
 CDEPEND="
 	virtual/libintl
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
 	ncurses? ( sys-libs/ncurses:0= )
 	pam? ( virtual/pam )"
diff --git a/net-fs/openafs/openafs-1.8.2-r1.ebuild b/net-fs/openafs/openafs-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..581e282d0b7e
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.2-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-mod flag-o-matic pam systemd toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+PVER=20190106
+KERNEL_LIMIT=4.21
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="api bitmap-later debug doc fuse kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/flex
+	virtual/yacc
+	api? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	doc? (
+		dev-libs/libxslt
+		|| (
+			dev-java/fop
+			app-text/dblatex
+			app-text/docbook-sgml-utils[jadetex]
+		)
+	)
+	perl? ( dev-lang/swig )"
+DEPEND="
+	!net-fs/openafs-kernel
+	virtual/libintl
+	amd64? ( tsm? ( app-backup/tsm ) )
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd:4.3
+	)
+	fuse? ( sys-fs/fuse:0= )
+	kauth? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ncurses? ( sys-libs/ncurses:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+MODULES_OPTIONAL_USE="modules"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_pretend() {
+	if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+		ewarn ""
+		ewarn "Alternatively, you may:"
+		ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it."
+		ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS."
+		ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited."
+	fi
+}
+
+pkg_setup() {
+	use kernel_linux && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+	# fix xml docs to use local dtd files
+	sed -i 's|http://www.oasis-open.org/docbook/xml/4.3|/usr/share/sgml/docbook/xml-dtd-4.3|' \
+		doc/xml/*/*000.xml || die
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf -I src/external/rra-c-util/m4
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache || die
+}
+
+src_configure() {
+	local -a myconf
+
+	if use debug; then
+		use kauth && myconf+=( --enable-debug-pam )
+		use modules && myconf+=( --enable-debug-kernel )
+	fi
+
+	if use modules; then
+		if use kernel_linux; then
+			if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+				myconf+=( --enable-linux-d_splice_alias-extra-iput )
+			fi
+			myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+					  --with-linux-kernel-build="${KV_OUT_DIR}" )
+		elif use kernel_FreeBSD; then
+			myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
+		fi
+	fi
+
+	use amd64 && use tsm && myconf+=( --enable-tivoli-tsm )
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-strip-binaries \
+		$(use_enable bitmap-later) \
+		$(use_enable debug) \
+		$(use_enable debug debug-locks) \
+		$(use_enable debug debug-lwp) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable kauth) \
+		$(use_enable modules kernel-module) \
+		$(use_enable namei namei-fileserver) \
+		$(use_enable ncurses gtx) \
+		$(use_enable pthreaded-ubik) \
+		$(use_enable supergroups) \
+		$(use_enable ubik-read-while-write) \
+		$(use_with api dot) \
+		$(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with perl swig) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1
+	local d
+	if use doc; then
+		emake -C doc/xml/AdminGuide auagd000.pdf
+		emake -C doc/xml/AdminRef auarf000.pdf
+		emake -C doc/xml/QuickStartUnix auqbg000.pdf
+		emake -C doc/xml/UserGuide auusg000.pdf
+	fi
+	use api && doxygen doc/doxygen/Doxyfile
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	if use modules; then
+		if use kernel_linux; then
+			local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+			[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+			MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+			linux-mod_src_install
+		elif use kernel_FreeBSD; then
+			insinto /boot/modules
+			doins "${S}"/src/libafs/MODLOAD/libafs.ko
+		fi
+	fi
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use kauth; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump* || die
+
+	# avoid collision with mit_krb5's version of kpasswd
+	if use kauth; then
+		mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+	fi
+
+	# avoid collision with heimdal's pagsh
+	if has_version app-crypt/heimdal; then
+		mv "${ED}"/usr/bin/pagsh{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die
+	fi
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use kauth && doman src/pam/pam_afs.5
+	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+			src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	rm -rf doc/txt/winnotes || die # unneeded docs
+	if use doc; then
+		DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING )
+		newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf
+		newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf
+		newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
+		newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
+	fi
+	use api && DOCS+=( doc/doxygen/output/html )
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	if use modules; then
+		# Update linker.hints file
+		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+		use kernel_linux && linux-mod_pkg_postinst
+	fi
+
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+	elog
+	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_postrm() {
+	if use modules; then
+		# Update linker.hints file
+		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+		use kernel_linux && linux-mod_pkg_postrm
+	fi
+}
+
+pkg_config() {
+	elog "Setting cache options for systemd."
+
+	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+	if [ ${CACHESIZE} -lt 131070 ]; then
+		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+	elif [ ${CACHESIZE} -lt 524288 ]; then
+		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+	elif [ ${CACHESIZE} -lt 1048576 ]; then
+		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+	elif [ ${CACHESIZE} -lt 2209715 ]; then
+		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+	else
+		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+	fi
+
+	# Replace existing env var if exists, else append line
+	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+		die "Updating ${SERVICED_FILE} failed."
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 5793d68c0e4d..c48bcaea31bd 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 45de85faf151..f1bc05ba5774 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -14,7 +14,7 @@ AUX lftp-4.8.2-libdir-openssl.patch 658 BLAKE2B 430dab0713f82c3c10ac7395b8ca9ca1
 AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8370cdf511303df4b17346275d936ebfcb658262102c01e61e11861d69e4c54f45baeddb246c062f3c66eadf8b0bcd SHA512 4a47a2e63bfe80faa640edc92c645e89d5c0063c0adc992f0b0613e01cfa0599f61f9bd07568432673addb1a981f101c474b1a0d99fd50fced455c9700b886e6
 DIST lftp-4.7.5.tar.xz 1567232 BLAKE2B 6ff7d264102ee25e989136b67b0587c025fd29a2573b25e4b9baac63c0ff0e9e40a4444b61ad50f8b892eb2f16dd31266056840aec0fb260686eb3b1714e4326 SHA512 e7d478367a3b79f61686a538827efe8afb807a587d2967189ae351927e3acb0d5b097d8707e0cb3997aa650f8f0787aa44038bb1d081e393bc7202b348249960
 DIST lftp-4.8.4.tar.xz 1633444 BLAKE2B cbd85b553268823e7633e414752876db083355d92e55728337bc7863fb3bd89729ac725be41a9bcca275cf1752ea5f8ad01fdc67c7593868084c9c32bb75332d SHA512 2528e2cbfe132068dc75036d6334372f79f8063d44e46c724a28ea1f5b40d8de0d1e36cde3124fbcc27e5ba8be04b893eb1a7546346253768346a80bc54c02d1
-EBUILD lftp-4.7.5.ebuild 2552 BLAKE2B 3d99cfd051ade3491264a80c2640685720425faa4d783293b23ed6baa8699e82cc12e6a8259ddcacde5d8308efecfe1bc37f267b42735589b04f8b6614fcf98d SHA512 cfcb38856ceb7c195c64467fba134b8b744c3b35a4f411e3928e99df72bec286e70e0f877948bd10075e379b9efd3dce93cd3a3f21d8e6e316d7ef75b49a11c7
-EBUILD lftp-4.8.4.ebuild 2565 BLAKE2B d9c5d9f103dfe8e073c07138885201194cb5b99cd6f7241a8a37567efb9c5d0688cf1fcbb41f792e6d49da86d83e45daf9baaafaa56a63c8fe825441df8aa9de SHA512 f7c456d44e4f35b321522abb6f5282a046820a660443deaa7b2cd5875121c6ae7ae8b0a9316673a39bb4f598fe13564859dc43ae2c5d8dee51be2ea8a0e0596c
-EBUILD lftp-9999.ebuild 2351 BLAKE2B 252c1c026a5bad4adc8b37fb16819c53090be97e18a8df4befcde504ddfc56bf7f62ca32800250729499248319799c43dc4616aa93ca7c48137a670fae9bb0b2 SHA512 714b570e69f9978fce0fb3726187110e4c1f9733a3cf6b4ed7a06d1b536a248c5c7300ad43c45558a458350bff1695ba365c6e7d7c31d6accdc7796c40a47030
+EBUILD lftp-4.7.5.ebuild 2551 BLAKE2B 090ebc91da6dbdeae35271ddd823c68a23fe61fb980a3b575454a652c13c5237a742c264e141b0ba07f08dc18f8dbbfea54053df9f21787a1b1bbdd11c05addb SHA512 bacc149a37e2e96c1f65472689ed8454a553ab714ce301934d21451d9b8452106f66dee3d6b1466b3b236df06b1c9800578555960dcd047a31c4c5a83fd2f30f
+EBUILD lftp-4.8.4.ebuild 2564 BLAKE2B c7c7f0082a43d4ae98a41a324b32e1ca283ef5424bd574eb9f29b2f667f1fe1b5ac362879a74ea91cc9e604d9e7d8b261975ad293cdccbed93bc78d0fcffb7a0 SHA512 89141dcecc69fec441b682d0ca980659784a64599a2b0c1338ddb279bb9c84e03042b7b282d474b0bb208b36d8e4618223abc55619d2dd6559b40f81b6a235a0
+EBUILD lftp-9999.ebuild 2350 BLAKE2B 895452ffb4638806c8cbaf58c4fad9e45d470eda21a5db1fa477565e2512bab2e6255d141fcc57edcbafcd5235e8ae0eedf8e642bbf22d050063487e74b87597 SHA512 602953e3e74bebd9e3eb1ce25b410142e2c59fba0c177909f4481e67f720a246bd393b6e8798b944177269e3bdd59922230f3e9406e6cbe6342da232450ee824
 MISC metadata.xml 465 BLAKE2B b2c378d349c81c2e99b76a1a5585d58a7aa1bb866e3336e37336c838a87f78425f04a0eeca9d49ee246e085b934a9da4d5b17adf72a4b224d03b76d37bdd84db SHA512 542f366f55d7c19bb3e17a57d060824db5933f2ea3b3aaa8dd3520dc757be53e1dcf4f91fa34f15abc478e9c6b68799df3ad14836e0579f02977843e8d330bfd
diff --git a/net-ftp/lftp/lftp-4.7.5.ebuild b/net-ftp/lftp/lftp-4.7.5.ebuild
index ed6f78f723f9..6dac748590dc 100644
--- a/net-ftp/lftp/lftp-4.7.5.ebuild
+++ b/net-ftp/lftp/lftp-4.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn )
+	idn? ( net-dns/libidn:= )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
diff --git a/net-ftp/lftp/lftp-4.8.4.ebuild b/net-ftp/lftp/lftp-4.8.4.ebuild
index 789fc72fda1f..2fe153fc40d9 100644
--- a/net-ftp/lftp/lftp-4.8.4.ebuild
+++ b/net-ftp/lftp/lftp-4.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2 )
+	idn? ( net-dns/libidn2:= )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index d8dca66a3ca7..4f73a82a139b 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
-	idn? ( net-dns/libidn2 )
+	idn? ( net-dns/libidn2:= )
 	socks5? (
 		>=net-proxy/dante-1.1.12
 		virtual/pam
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 0207be004b09..e76e6a75ce76 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 5409005870e3..89f82ba7ce5f 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,5 @@
 AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdaec81f45681f656df26f38b7f98d8f1055277c4f7296a26e3965d7f3e47825b45bb84d458230d88849 SHA512 3fe7fdceecf2a232df280c54754b4458963d3fc8ac767380972c45b6ccbb73c1d4ae113426d57de117fd27539c2161c2e3c92ed2d03113dabdeae86d4593a128
-DIST irssi-1.0.7.tar.xz 1034188 BLAKE2B 738ac8c09bb70a1a4f2fea880cf745d38145637ba7afb02dca13be9ee8df1dc5f39eaedd9245a0511446d9ca3cac0a2729d818fa50ce8c2af1825aedc2d52e76 SHA512 f5593ffdbb15c815e1445d15379245a3dba7935a82a6caca0ca2b720e03000df06e6515f5f5d78eaec3923aafccea7396baf12ac945ecddd02664c5f10611bc5
-DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f99246d9b6e950a36ae772e4e8c49e4f6be6b18b7cd05ec50397fef2b3c4d16dba41637773b149eff8f7755610df4 SHA512 b2fc0805d6213c31bc34c48237baf2e33ac509c0fa09c483fd39f1473e32eee227ff4532efc60fb495c2ec263c05290578bca7ad6d39149e0594f864da5986c0
-EBUILD irssi-1.0.7-r1.ebuild 1275 BLAKE2B 5e6d98b2ef47c8959b787de49e7156ebca6bb0d7b2248c7a1896ac8e1a25de4d59a82e01826b7b90abba5cb3c717816bd0e47d1db5e504e0025b42929f2a4724 SHA512 79ac0eff964286913c97785f893bdf9dd9a0f18542088f1da8e43fe59000af47b77d5e4dad48f9dba2ed8565084ecbb7f047a5bce13353597cde9b4d6c68edea
-EBUILD irssi-1.1.1-r2.ebuild 1411 BLAKE2B c763c6b804232977a302c9f0fc5434558037066428c7b35b51e832c5ab61d07a650f67e878cbd17648b30950368f3a0dc30fa4bcd567e7e21532f860d662bc28 SHA512 b5e13b22ab3740b039bfcb47366779d8df0f6a96c0a644a7f8bd04bec756db00be790e434e9fb09f7cc2771ba66ab059c685203a3bb1e2893b2108deca59fff7
+DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
+EBUILD irssi-1.1.2.ebuild 1411 BLAKE2B aee21f4d5e4f7b1dad271613e871400fa23015e9bf6d0ef3bdd69d89ca308d34b2eb20ee618fa4ec698dcc0ee37b3b7fda9ce0066dc0fe86b6969d6e2610d44a SHA512 d5d991a674356a75bb3f69b309811245dfeb2733bc71d9abdffe3a1e9db0c847de27e12453f8b02e96f12a9644557707094530128fccb3e593a58658e6944617
 EBUILD irssi-9999.ebuild 1227 BLAKE2B 05d2bdb2a2dfad06afb4951b4a489dbfc451fd97e40c6123c6b8bc8a4daa0f2a7fb772198da000da7a7db8fcc1deb59944df5742fdc773697815fd6deafbbcc3 SHA512 8bea8381bd09c5f4fc7bad261564eee950210a830f431bd3520e511f189d10fe2d4934fb4d0e0a7a5ed60049e53ffebf6ec1ba760970880988310e9dc3b5eb18
 MISC metadata.xml 631 BLAKE2B 1ed4dcb701f0884e365891d63aa8ae33d14bbc4b343703ea1ce446c3028ee115f4760fe42583c94e89f829f26dc0abf71192d216af4e6c241bc9a21ed1ab0cc6 SHA512 b3fbbd3085bf6e39d62373b9ac4eeaf423a019276d83319e2e72484763e3e1588c9060864cbb36c080847b6f46e299a17b61acfccea1dacdfdd0709f6c142543
diff --git a/net-irc/irssi/irssi-1.0.7-r1.ebuild b/net-irc/irssi/irssi-1.0.7-r1.ebuild
deleted file mode 100644
index d9f5671ef476..000000000000
--- a/net-irc/irssi/irssi-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit ltprune perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-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"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-CDEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-}
diff --git a/net-irc/irssi/irssi-1.1.1-r2.ebuild b/net-irc/irssi/irssi-1.1.1-r2.ebuild
deleted file mode 100644
index e14f79e14557..000000000000
--- a/net-irc/irssi/irssi-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit ltprune perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-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"
-IUSE="+perl selinux socks5 +proxy libressl"
-
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	!libressl? ( dev-libs/openssl:= )
-	libressl? ( dev-libs/libressl:= )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if has_version '>=dev-libs/libressl-2.7.3'; then
-	eapply "${FILESDIR}"/libressl.patch
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-perl-lib=vendor \
-		--enable-true-color \
-		$(use_with proxy) \
-		$(use_with perl) \
-		$(use_with socks5 socks)
-}
-
-src_install() {
-	default
-	use perl && perl_delete_localpod
-	prune_libtool_files --modules
-}
diff --git a/net-irc/irssi/irssi-1.1.2.ebuild b/net-irc/irssi/irssi-1.1.2.ebuild
new file mode 100644
index 000000000000..f2d403eeb5a9
--- /dev/null
+++ b/net-irc/irssi/irssi-1.1.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit ltprune perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+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"
+IUSE="+perl selinux socks5 +proxy libressl"
+
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	if has_version '>=dev-libs/libressl-2.7.3'; then
+	eapply "${FILESDIR}"/libressl.patch
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	default
+	use perl && perl_delete_localpod
+	prune_libtool_files --modules
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 18e16d3822a1..c8d34578c518 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index e360099b97cb..2f552a912f0c 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -10,5 +10,6 @@ EBUILD courier-authlib-0.65.0-r3.ebuild 5172 BLAKE2B 2bc31ffdfa5284c3d7054ef698b
 EBUILD courier-authlib-0.66.4.ebuild 4516 BLAKE2B f8e457f743d96173137ab7a935001ae1d1bb4b4ff9c59178c3ec64e3809bdf4d1b57e3668f168839189e29d0856ff22859f17966b6c6e1e5ea678dd6556a351c SHA512 2987ce9526412ee61cb31bc4cd32cebe242f4ad13b961dc9629f489f96cd3d36a9ba8a13761c4b4469341d29b72ff4105be742eede1972aa7a7dc3e6bf383d83
 EBUILD courier-authlib-0.67.0.ebuild 4565 BLAKE2B 421bdda6b5a0db98de2359ff6bca26da3675b16c833db575f98b8013d3fdb84e81d7b84f01f08e36f306213657e3db02dc08d9bf0e8762806aaa09a4309e95a7 SHA512 c1458bf707a9d03985351c0e25a648ced09a4545a5928a2a718efd4f15b9a0fceaf02e4634a56a7eb79604fea98f4531e093f73b96e6fe6a140ee4f1f38b2e8d
 EBUILD courier-authlib-0.68.0-r1.ebuild 4569 BLAKE2B 87a0fab1111584bdf4ae3c4e81b52d71074f1e1ecc7f5682ea83b35e20a941a86f033e0a50cbc0da4260627128b1357c55e5ab1c35b17a53241468a872c81deb SHA512 8e0a63aa39d46896e0c5ad90125867b552adcfaa8ea3d35175062abbb43bbff4c73da794f6cc2c5a547eeb4e1f5cc3ae2e1eba2aa81868c89f3daa9c11de6bb8
-EBUILD courier-authlib-0.69.0.ebuild 4575 BLAKE2B ed61dbdd177aaa42fb6961803957f8a2a59c859f3e4131bc409a662bb404e5de9db4c679b71493fb0990d90ddcb7aa4a6c2aa394371ecd709d00d3ad368885ce SHA512 03e032e22105691353a18ee4956199bc155eaf83ce1bd29f62c750a755b2d18872d420aa139c505debb21c9d6bec3f806a82afb8b5084dcc7a31307e970afead
+EBUILD courier-authlib-0.69.0-r1.ebuild 4533 BLAKE2B 310ea514141f522997b5a1070b1f94f6bea44704a02f96dcca3aff86df8e88437bafdb5c2f47332993cf9606ed175519adcc282a7855228f0c6b959328e7e0be SHA512 0ca906dae872b34cb0a9462d3882fac6a0c89fd807d3076819eb81876042344f00bf2a1730d946acd4acc22a6ac7027d26e3b1f8ed7200ed184e636e5e9fcce7
+EBUILD courier-authlib-0.69.0.ebuild 4575 BLAKE2B de7957af47985b84e9c08dc493d6ff069e2eda684d77f8113eab0cb7bde8f3a215bf6bd4663559fa3b67efbd6462ed945b326f26b8f37720bcacac08c9af40c9 SHA512 3b5054b13721bca8e302741f28ca9e2f6eb7a42489f2ca138cb61bbe878703c34e66bff3883bcfc06e43656a90b96c8233a95c47dcf17f0e591223a31d29a2f2
 MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
new file mode 100644
index 000000000000..f21eda86de49
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+		>=net-libs/courier-unicode-2.1
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( dev-db/mysql-connector-c )
+		pam? ( virtual/pam )
+		postgres? ( dev-db/postgresql:= )
+		sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--without-redhat \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
index fe23c78371bb..9aee2b60eda7 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-lib
 RESTRICT="!berkdb? ( test )"
 
 DEPEND="net-mail/mailbase
-		>=net-libs/courier-unicode-2.0
+		>=net-libs/courier-unicode-2.1
 		gdbm? ( sys-libs/gdbm )
 		!gdbm? ( sys-libs/db:= )
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a08382c4bac7..ec0aeff828be 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,7 @@
+AUX gnutls-3.5.19-idn2.patch 1569 BLAKE2B a6b309be79e09bd873f3ad305a4517c675f127bb54df6d9dd22854b8a8591a1551b3163bfb8596296b323a9a15008d5676ed132e1eaf36e59c6267c81f2552e9 SHA512 b39a091b55413b1be9042b898eaf37c57d6cc3485bcab25169b68b1c19f249b2489609afc5fe08f7103800687c01b1580124dd6433013ca9f89e5a5e47c4cd3e
 DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
 DIST gnutls-3.6.5.tar.xz 8192888 BLAKE2B 1d305d49c461657b921a51e6c3577e8aea76ba2a4ecbb0ba165ca1f452560b691f12733e3b3ef6d1206096a7393a6fdd05bedb5d5653c7e18e14c5c2f5993de2 SHA512 127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce
-EBUILD gnutls-3.5.19-r1.ebuild 4025 BLAKE2B e166a177a1530255660c59e775d715b03a0140729c9dcb20bfd17f91a7a7c5a8f1edab502be03e33980bd23c01cd1d9b667a5f1f468585e8db6ba646521e15c5 SHA512 ec3dfd1a35e14528fe9765360ab623bc6f2f93a2ff8e6d9421add6a100da2937344986ff909d7036e00caf8806e87923daf4ce381671e9c0cb79d0a85d6053be
-EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e
-EBUILD gnutls-3.6.5.ebuild 4044 BLAKE2B 2ea665c6b1b62648fc660b694c0cf244ec9c971a0d0a103c94b940bb712515df28bf4c9489d7280eea4bab9a0198b16f48b0f4dd149f3adaf71192cfe4e498aa SHA512 faee8caa028f4fe75fd7c453e2f1af351001b0f3fe9cd44744ea6c3d549737f7c65776d34e6c7387107ab889ae808fff054370ce7f20e3954fdb2640ee4c0ae7
+EBUILD gnutls-3.5.19-r1.ebuild 4076 BLAKE2B fc87e54e6220a9cd053aa99da22d0ea9510c2c08b09b6034d31a13e3629d091d454b23123b0b07bd8e2151f5b8748e2f611fb7a9db6a5e24753c8d8068a8208c SHA512 9631e193f752dcb8bcef414cea69672f09c3b1abc505fb27182c61808ad71f8a448555670fb12196b1781539fa5be05814aa8bdc5ede1d0981f31a0f30cda23c
+EBUILD gnutls-3.5.19.ebuild 4145 BLAKE2B 4da053f06d49a5e1e109cbb5691e51c7fe6c012a46bd68d7da329fbf5ce15080229013da2afe8d4f53ba91fb67fc511b64e71156dcb0282e03b09eae183d3811 SHA512 4856b74e9bcf1716c2202c94e075dbb2ac3f9077bd0d083dbd3a17f44d79a93e206de19b0f584b4bcc5f9436ab44cd6e88e2d828487edaa102fb2911905d3ff7
+EBUILD gnutls-3.6.5.ebuild 4098 BLAKE2B f0252c6227e83959a75651d588f7ebc0196f39e9dc46777df184591bd775c43829b368299cb3a359c6563e315e4760184689ba14efea77deb2182846d5ee453a SHA512 839195aae4cc28f7067d39ea158d9de17e432a68b960656b774a2fa260ca6117bd4b4d48940ce545673bcc2fe218e1202ad78b4de57639cfe69f88349cac5d95
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
new file mode 100644
index 000000000000..1f16302c81be
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-3.5.19-idn2.patch
@@ -0,0 +1,47 @@
+From b0dfccd2149086cf5d2db44c329664a56b126216 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 6 Jan 2019 20:02:50 +0200
+Subject: [PATCH] idn2: do not use deprecated idn2_to_unicode_8z8z in
+ idn2-2.1.0
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ lib/str-idna.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+https://gitlab.com/gnutls/gnutls/merge_requests/864
+
+diff --git a/lib/str-idna.c b/lib/str-idna.c
+index 3bf2db877..95ca9b769 100644
+--- a/lib/str-idna.c
++++ b/lib/str-idna.c
+@@ -145,7 +145,7 @@ int gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsig
+ 	return ret;
+ }
+ 
+-#ifdef HAVE_LIBIDN2
++#if defined(HAVE_LIBIDN2) && IDN2_VERSION_NUMBER < 0x02000000
+ int _idn2_punycode_decode(
+ 	size_t input_length,
+ 	const char input[],
+@@ -153,7 +153,7 @@ int _idn2_punycode_decode(
+ 	uint32_t output[],
+ 	unsigned char case_flags[]);
+ 
+-static int _idn2_to_unicode_8z8z(const char *src, char **dst)
++static int idn2_to_unicode_8z8z(const char *src, char **dst, int flags)
+ {
+ 	int rc, run;
+ 	size_t out_len = 0;
+@@ -253,7 +253,7 @@ int gnutls_idna_reverse_map(const char *input, unsigned ilen, gnutls_datum_t *ou
+ 
+ #ifdef HAVE_LIBIDN2
+ 	/* currently libidn2 just converts single labels, thus a wrapper function */
+-	rc = _idn2_to_unicode_8z8z((char*)istr.data, &u8);
++	rc = idn2_to_unicode_8z8z((char*)istr.data, &u8, 0);
+ 	if (rc != IDN2_OK) {
+ 		gnutls_assert();
+ 		_gnutls_debug_log("unable to convert ACE name '%s' to UTF-8 format: %s\n", istr.data, idn2_strerror(rc));
+-- 
+2.19.2
+
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
index 9fc06eac7ed6..5917ea116d35 100644
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,13 +23,13 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
+	tools? ( sys-devel/autogen:= )
 	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? (
 		seccomp? ( sys-libs/libseccomp )
@@ -54,6 +54,10 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-idn2.patch"
+)
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/gnutls/gnutls-3.5.19.ebuild b/net-libs/gnutls/gnutls-3.5.19.ebuild
index 39244f5c2a32..cb1358dae232 100644
--- a/net-libs/gnutls/gnutls-3.5.19.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	doc? ( dev-util/gtk-doc )
@@ -54,6 +54,10 @@ DOCS=(
 
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-idn2.patch"
+)
+
 pkg_setup() {
 	# bug#520818
 	export TZ=UTC
diff --git a/net-libs/gnutls/gnutls-3.6.5.ebuild b/net-libs/gnutls/gnutls-3.6.5.ebuild
index 7f3b673fd300..0e4f46b96b24 100644
--- a/net-libs/gnutls/gnutls-3.6.5.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools libtool multilib-minimal
+inherit libtool multilib-minimal
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -23,12 +23,12 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
 	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 	>=dev-libs/nettle-3.4.1:=[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	tools? ( sys-devel/autogen )
+	tools? ( sys-devel/autogen:= )
 	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? (
 		seccomp? ( sys-libs/libseccomp )
@@ -74,10 +74,10 @@ src_prepare() {
 	# Use sane .so versioning on FreeBSD.
 	elibtoolize
 
-	# bug#673574 - until upstream builds with guile.m4 of guile-2.2
-	# eautoreconf will run gtk-doc gen so let's avoid that
-	eaclocal
-	eautoconf
+	# detect also guile-2.2, bug#673574
+	# aclocal/autoreconf will require more dependencies
+	# that we want to have
+	sed -i 's/\(_guile_versions_to_search="\)\(.*\)\("\)/\1\2 2.2\3/' configure || die
 }
 
 multilib_src_configure() {
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 1df18491b08a..bc82b709a74c 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
+EBUILD libbitcoinconsensus-0.17.1.ebuild 2327 BLAKE2B de3360a8d2a84142d6dbcb932d2b3ab5d21e394321ea5ed8adfa41ae46d5101620e68ce820c286612505195f122cb03a2a8dbcc0fae223d9e132c7c853114f28 SHA512 1cf921d7e86cb03c6a458de418ed310ed74caa154fa97cc208bc2be8a304dce7358039ba9f44f8b47508cbe3936429322006870daa57ad702c4f3cffbf542b3a
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild
new file mode 100644
index 000000000000..179444243d2c
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.17.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots libressl"
+
+DEPEND="
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index cb6581adad6d..b230f9e1edb6 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,3 @@
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
-EBUILD miniupnpc-2.0.20180503.ebuild 1332 BLAKE2B 05167f65f6d6790d2bdc25d69b457f578767bac0c4b7aa578ab772f31cb5034c0bde7aec5e480a74d04b3e4de87b7d46cf2c4a5c7a31a8e9a5b1801dec91c5e3 SHA512 ce5dfc326f083c136ab99086262958f5b86b94c04bea773c3bebc64dee0850f83c895ccbc1f5ae322dc309bb6884508881dcc8906af83cc2a0c529cae29ee8f2
+EBUILD miniupnpc-2.0.20180503.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
index 62fc8c8aedd2..bfae17481afa 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180503.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index eca1c28765df..2de76306355e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -11,12 +11,12 @@ DIST node-v6.16.0.tar.xz 15854256 BLAKE2B 0c70ce154639cbae12e0dfd6e7d5705999badb
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
 DIST node-v8.15.0.tar.xz 18499412 BLAKE2B bba68517358cea14e9ba7c0c14b3f30caa00e358ff79d0602a1a71c9dd80334800ea2fd12086c5bee47cc23b9debe2cb0e36650f6be02e20615047a971297c54 SHA512 9a3d54ee9e22919ab425532ea64336b1dee0ae3ce4afd4eaacc109a2c2d34c98ea8188acd436c55a5dbba30fb4f95f8fcc9000ea60a81224d09b90d2f493cefd
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.15.0.ebuild 6443 BLAKE2B 47a930adf3463c28b93b0e9847d9c07fb0f056b0fe2181d092aee68144cb6e73653ebce07d2852ad2b541d6fd884dc50a9b54b6dd4c8b0d21b892ebe8631442a SHA512 c1293a1f8ebeebd38bec63d95b7e17f7f2859e6b8656a6ddbbba4d8248587f2e97fcc025f9a16d50ee48f706913348feb861bf149e8b0b0e579fdfbbb275f785
-EBUILD nodejs-11.6.0.ebuild 6529 BLAKE2B 3156959bc34d16039307ab3b09d6a375f2727c9e10683ea2a71b25cc369f3724400a51f93450c8f94cd7c2e3321a0ca49fb40cb91035d6433e9191d95bb1447a SHA512 abbe7ed3e9390050126268144e992673ee126261a105a8505b26d6f3f508d5c3d6cd6aafc6d5e9755f5d94af2835b95008cc169c26a902bf3312a3606a40e895
+EBUILD nodejs-10.15.0.ebuild 6444 BLAKE2B e3ec2234f80b4c65471bf56d5ae15ac657c3b6a89cb6b35cd9e0958210c7c196eab37b814951ce46b3e7ef854a4194f1ef64733c6cfe1299c6a028d50895aed5 SHA512 372baa09f94406d13cc0f0ab94b2454cdfce1121e243919b20f2aa97e2b1595cfed9f34c5c68369ce4aba5438d75f3c77ab1091af8bd19c80b0ee504844b8fc1
+EBUILD nodejs-11.6.0.ebuild 6532 BLAKE2B c656a13b096d7925e7649e6ab1a4884bb484dfd55475c7fc951a18e27614667e47a945da30adbf9a9c15bb0dbd986cecd9deb0aa5af15ff6553857348a087d8c SHA512 a7743833916e53c7f10856d6bb5825d50a34d8a2f2a2ba4172d34c275249a4c076472b1bd1d452ffab425955c173560dc3339f6ccf94103619ce84f3ea90c773
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
-EBUILD nodejs-6.16.0.ebuild 6201 BLAKE2B 07f4a284a6753cd939c30a3957bdd530cc7e9d3ff6337c9e5d580d0f4ddb61da847cd59212198544b08f89a046a9c26070ccc258f9c279e3e8415bc5872c797f SHA512 61f0403b725318c9e3a437453112f883294d73b594d433d527c2216fc2b4cf37d71b8df7a039746e6fbc4c90c70b5ac63fd8c1edf83b7b8147a115384094efec
+EBUILD nodejs-6.16.0.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
-EBUILD nodejs-8.15.0.ebuild 6463 BLAKE2B 8683dbf1cf7c105911d32e75e8ce696bc438cb2b743363151fbdf83a8629661c68f584ac0433b846d5b8ec61ee9ced7be8cc9ae6d7019c7b038bd4552ce52cfc SHA512 6977cfe2e27b63a458fac9df1a100bd1a0c2ee83b34d4f5d88e364c10b5759f49dbabfb2e984e2eb85f2e00c2bee7f8d18f3899af5ded8e7b1ac1970e6faf44e
-EBUILD nodejs-99999999.ebuild 6342 BLAKE2B a96e1f8bc847aaa0252318c1990d7e74fa141aac5f31c1f0ecc7c86c283a683b51338f1a6b76ca943fa508e9a5f3f0908932355e2f8e6aa7c9a96ead3827c9ed SHA512 ffc3e3017336e23760842d30faf36daecaba4aa0121e83db7185d827da030bf53da02bd4922bbe5aff5c90fad7be568cdf5ab0f739525c0d5e436f0ac650b7d3
+EBUILD nodejs-8.15.0.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
+EBUILD nodejs-99999999.ebuild 6342 BLAKE2B 113f302b886a321f5aa59a1ad480c284c559542bd435ee6fbea4e83a86525a0b1c0c09d96835cea806cca2ae5e63e158f44d312ff4605763682fa537b6d8188a SHA512 820923a87afedbebf874697187ee652d2fa0a0199b617d73d1b2b36e1cd321a22dc65648ccb85efab5f905cd4ebd03edb69c6da2fa4e32aa558977d793061c11
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-10.15.0.ebuild b/net-libs/nodejs/nodejs-10.15.0.ebuild
index f23fa66ae739..959fdfa0bf29 100644
--- a/net-libs/nodejs/nodejs-10.15.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.23.2:=
 	>=net-dns/c-ares-1.15.0
-	>net-libs/http-parser-2.8.1:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-62.1:= )
diff --git a/net-libs/nodejs/nodejs-11.6.0.ebuild b/net-libs/nodejs/nodejs-11.6.0.ebuild
index 57c3867f7238..69a0e9fdb543 100644
--- a/net-libs/nodejs/nodejs-11.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-11.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.24.1:=
 	>=net-dns/c-ares-1.15.0
-	>net-libs/http-parser-2.8.1:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.34.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-63.1:= )
@@ -189,7 +189,7 @@ src_install() {
 			\) \) -exec rm -rf "{}" \;
 	fi
 
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
 }
 
 src_test() {
diff --git a/net-libs/nodejs/nodejs-6.16.0.ebuild b/net-libs/nodejs/nodejs-6.16.0.ebuild
index 8e45d0fe798a..8db127221fd8 100644
--- a/net-libs/nodejs/nodejs-6.16.0.ebuild
+++ b/net-libs/nodejs/nodejs-6.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.16.1:=
-	>net-libs/http-parser-2.8.1:=
+	>=net-libs/http-parser-2.9.0:=
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-58.2:= )
 	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
diff --git a/net-libs/nodejs/nodejs-8.15.0.ebuild b/net-libs/nodejs/nodejs-8.15.0.ebuild
index 3820a4f179f2..059aa2d524ea 100644
--- a/net-libs/nodejs/nodejs-8.15.0.ebuild
+++ b/net-libs/nodejs/nodejs-8.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.23.2:=
 	>=net-dns/c-ares-1.10.1
-	>net-libs/http-parser-2.8.1:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.33.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-60.1:= )
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index e5f27818359a..23540898bdb1 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libuv-1.19.2:=
 	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/http-parser-2.9.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-61.1:= )
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index a597106c5b3e..210cac847e3c 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,4 +1,3 @@
 DIST signond-8.59.tar.gz 281298 BLAKE2B 29b97705b6e774f65b42a7ef9a253b08b1f4caf46141e3d761aabd9ef641dbe1301ef2fac0f46d8073e815bb97bc64bfbbf4b19d9c6644e2369f3abe538a50af SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb
 EBUILD signond-8.59-r1.ebuild 1577 BLAKE2B 2acb75311c77b68b8ff8926547df2721331c1727066390c1637fd52ed159d6848d167857952c5e05744a7147b447e54066e57cbf4ae0dd8cf0a2db27dd1c2af1 SHA512 c3bff5501a4168bffe329668bcf1441382077af38a713b22b88cbc7342a15a231e3bd0ec6e52fb307979009f10c33b090784a49b42b10676bd7bfde1c7027ff7
-EBUILD signond-8.59.ebuild 1554 BLAKE2B 95782649efb0ae8d4cac3da859fdecfdbc4e29efb7f87c0473cea0d38fdeaa47c4206da8674531b69dafe9175a30268fe8105d74e549f2d0f52055b53f7e3e1f SHA512 8c918b7252d1be52b9c11f27746e88ef21314dd8b1c8cf53edcaecb5bc64af03d827f6cc9a4827b4c71f66026a133952c7855db03b46d2c23e459e54bf386272
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/signond-8.59.ebuild b/net-libs/signond/signond-8.59.ebuild
deleted file mode 100644
index 30f6ab605caf..000000000000
--- a/net-libs/signond/signond-8.59.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 qmake-utils vcs-snapshot
-
-DESCRIPTION="Signon daemon for libaccounts-glib"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_8.59 -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc test"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	net-libs/libproxy
-"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<net-libs/libproxy-0.4.12[kde]
-"
-# <libproxy-0.4.12[kde] results in segfaults due to symbol collisions with qt4
-
-src_prepare() {
-	default
-
-	# remove unused dependency
-	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
-
-	# ensure qt5 version of binary is used
-	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
-
-	# install docs to correct location
-	sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" -i doc/doc.pri || die
-
-	# don't install example plugin
-	sed -e "/example/d" -i src/plugins/plugins.pro || die
-
-	# make tests optional
-	use test || sed -i -e '/^SUBDIRS/s/tests//' signon.pro || die "couldn't disable tests"
-
-	# make docs optional
-	use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" -i \
-		signon.pro -i lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
diff --git a/net-libs/stem/Manifest b/net-libs/stem/Manifest
index 380866413f56..68a176c7a54a 100644
--- a/net-libs/stem/Manifest
+++ b/net-libs/stem/Manifest
@@ -1,7 +1,9 @@
 DIST stem-1.5.4.tar.gz 1915722 BLAKE2B 37c278eab0d7c7c305d7fcb498ff39460921ff59ea16cbe97d985c742290b8ca938218cbc7d5e4d1106ffc9f6a20461a4692afd14565698abbdfbd8015cb6f18 SHA512 1ea74341a1013f1f98d3d5ed1d552e79277cf54a6337d1a8b66bda0baae022d70c4c0c9ce35c843222d183a716466d93e1df3ee55ae6cd16cf10c6cf415d3cf7
 DIST stem-1.6.0.tar.gz 2049999 BLAKE2B 10846dbd20f22b489fa885e8f100eb2ba4053aca46db140463882cbc1f5701893e6a4a28820100e05e3ed4fa5ff76135a3b20ec1af917a63f63b3abdf5361df6 SHA512 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c
 DIST stem-1.7.0.tar.gz 2196759 BLAKE2B 2f4bf8a65e5e89b01e6d1054a9d7fe01d4775dc31f1846c300190320361e15a312ce35867fd7d6af2d0cb315894aa5f69f7e8a47cf184e1d9018342028ba1484 SHA512 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5
+DIST stem-1.7.1.tar.gz 2196854 BLAKE2B 318b762390ad5f1b8a7ad49bd442841d4552cf3d6782c7c912ca8251a076baa6d01bd6f60ea2d79f96994f7c29775c09b815ee41177c638c7e4089e5f4b1b1e4 SHA512 a275f59bba650cb5bb151cf53fb1dd820334f9abbeae1a25e64502adc854c7f54c51bc3d6c1656b595d142fc0695ffad53aab3c57bc285421c1f4f10c9c3db4c
 EBUILD stem-1.5.4.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
 EBUILD stem-1.6.0.ebuild 1273 BLAKE2B cf930d4cefb1463372c83247f194e54c25ba24edc88d33a8274699246cd87398f869f33fd83c030ddd70f1aedeaa01697e5a32b608a4b2bfabccf869298ab673 SHA512 7aa70c4e3fc49b371e0333e9c6bb91216f6e1dc8991d6fb6feb58e4499dd51f7e8f49535c30688c4ba7096d15144326e962bc556abb675761760f3deb3c21b5e
 EBUILD stem-1.7.0.ebuild 1369 BLAKE2B 66637a43defc8025695cc1431ceb39a5ba3586f810d0d2d3cff6957f3c75a536de9308a2c00eae5bd1b35671c255e3731173181217b04ebaa241189296a4569d SHA512 6ee574e8276e7c446962604daf8896736461fb021c1eccd4c4db37ac85328d842e24929b0fdd5f4553f8f2ca8ffc12317fc94b18d4dc15dbeada6041dd5f91c8
+EBUILD stem-1.7.1.ebuild 1369 BLAKE2B 6b9e15874b40b503d5f5bc102ca885f6458798cb4f9a2fb556a311b4d0e2e641c84aec3b599f239a000086379bd96f38e6406b501b9760ddc90f72b236c8a6cf SHA512 0e736cf6eb14902c96fe24e65e6d15c79600e7b8942b6cd06995fc57885ee561becaed3e115e259af9556f2b460c0d6ac8d793935f2454a37288ae028c8db8d3
 MISC metadata.xml 329 BLAKE2B 78eb533a5eea08ade1c17f2a70d204af1452de6d09cab0e4e06582291469b2abfca6cf86dffcf339797285590d3cfca481f14078f9cd5aaf138ba88f95877bb8 SHA512 e0be0234c4994bfff08e1790f82b8728a33961b9896ff5483b19591e2f00fe4b4ad83d42b59e64c056b393c35ec9ae92737f181d9549655853605537ac017974
diff --git a/net-libs/stem/stem-1.7.1.ebuild b/net-libs/stem/stem-1.7.1.ebuild
new file mode 100644
index 000000000000..9a38c64d97dd
--- /dev/null
+++ b/net-libs/stem/stem-1.7.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Stem is a Python controller library for Tor"
+HOMEPAGE="https://stem.torproject.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}]
+	net-vpn/tor )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="net-vpn/tor"
+
+DOCS=( docs/{_static,_templates,api,tutorials,{change_log,api,contents,download,faq,index,tutorials}.rst} )
+
+python_prepare_all() {
+	# Disable failing test
+	sed -i -e "/test_expand_path/a \
+		\ \ \ \ return" test/integ/util/system.py || die
+	sed -i -e "/test_parsing_with_example/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_parsing_with_unknown_options/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_saving_manual/a \
+		\ \ \ \ return" test/unit/manual.py || die
+	sed -i -e "/test_sdist_matches_git/a \
+		\ \ \ \ return" test/integ/installation.py || die
+	sed -i -e "/test_connections_by_ss/a \
+		\ \ \ \ return" test/integ/util/connection.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	${PYTHON} run_tests.py --all --target RUN_ALL || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8b2239d7cbd1..a34ec5ef9a05 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
 DIST webkitgtk-2.22.4.tar.xz 16752132 BLAKE2B a60f1c6168ba1ef19c931030017a58a640f0ff4a8d5bf97b278fff50f86374d5e10e06d95837e90c5a653a4c226095321ae86fdd64e61d846821979343b7350b SHA512 a46107f7da8513b06bd1e5685c03ca7f1a48af66b817908b8e61f1b343d98e122af73ccdeb47657cf4378fe33107fdc119a9a51d87db07ad5316ab39ed0db55f
+DIST webkitgtk-2.22.5.tar.xz 16774560 BLAKE2B fb022febf72727d59a1ca9490c8de48ade5a07ff3688b6962481608b9e0d27319282c842eb214783021745c1beb893b8842036c62542874e011f2ab60d275f17 SHA512 fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc
 EBUILD webkit-gtk-2.22.2.ebuild 8125 BLAKE2B 0997d124840b3a57d57b685c98b87ff38f6999c632faeb81297713e48f0f5bde97a876b2ba68effab319111c979b474fed5e7c1204926005b6216770bcccca95 SHA512 b05263a65622920e6d16df475bc413314ea80d7afcf3c7beaba0ce7ff257fc364582729d915cdbb9cfbfd110a10d68efb61912e998115b6a96abd2cc6886e5b0
 EBUILD webkit-gtk-2.22.4.ebuild 8352 BLAKE2B 26bf2060a808a3ff02f427774a57eafa36482d3f1131b787f0c9b6cf96d24f5554edc80e20428fd822456f640352150f824e48f4b3a996f8977cc797a2c209fa SHA512 948e181817faa73c0e2677897d8868933fa53255701d77444588a90c45f4f5e35a2a7d89198ac0f452b3105126a1067b7d791d9235742f6ab61f29b010de19b4
+EBUILD webkit-gtk-2.22.5.ebuild 8479 BLAKE2B 52007fb04e051641b129984a772246071fba8aa6ffdc78c6b67417c4081ab2b22662f4d3397da3fe2da87fafab7f7b3e1672d35a1b2e002552760ab7a12dd707 SHA512 8567fc73e99b8d5a3b7947f9fe03d74f52dd6b4e630917029b409f6e80bd8f8a71cc9535f09d38ad05dc624d7e3f31993bfedbeaa569e399195859260a914ac0
 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
new file mode 100644
index 000000000000..09e09a0fa793
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.22.5.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"
+
+# webgl needs gstreamer, bug #560612
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl !opengl )
+	gstreamer? ( opengl? ( egl ) )
+	nsplugin? ( X )
+	webgl? ( gstreamer
+		|| ( gles2 opengl ) )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+RDEPEND="
+	>=x11-libs/cairo-1.10.2:=[X?]
+	>=media-libs/fontconfig-2.8.0:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=dev-libs/libgcrypt-1.6.0:0=
+	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=dev-libs/icu-3.8.1-r1:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.48:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.8.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	dev-libs/libtasn1:=
+	>=dev-libs/libgcrypt-1.7.0:0=
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	spell? ( >=app-text/enchant-0.22:= )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?]
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+
+	egl? ( media-libs/mesa[egl] )
+	gles2? ( media-libs/mesa[gles2] )
+	opengl? ( virtual/opengl )
+	webgl? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-lang/perl-5.10
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+
+	if ! use opengl && ! use gles2; then
+		ewarn
+		ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely."
+		ewarn "This is an unsupported configuration meant for very specific embedded"
+		ewarn "use cases, where there truly is no GL possible (and even that use case"
+		ewarn "is very unlikely to come by). If you have GL (even software-only), you"
+		ewarn "really really should be enabling OpenGL!"
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_WOFF2=ON
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e568427de951..3372e0dcd98e 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -25,5 +25,5 @@ EBUILD zeromq-4.2.2-r2.ebuild 1552 BLAKE2B d1191b9f59fa5aafd1a0520d5a342db4241c9
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
 EBUILD zeromq-4.2.3.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
 EBUILD zeromq-4.2.5.ebuild 1431 BLAKE2B d8caf2227ed865cee6f9749899d313db9facec71e7df8b325ff67a53e0102ff45c5e6ad9f9aed867ad9f4a0962ae42abb662f4eab1170bab0a7762c87d682656 SHA512 4d4b575aec6a2f4db8070b1600428142233e7d2a30f8485df18c0574fd7e19b407011f31bbede22889ae8e6cdb5d26af2f2b6cba25ed1bb6f7ac0fc4b4bf136b
-EBUILD zeromq-4.3.0.ebuild 1427 BLAKE2B 1a43fdcad27f45111af21365dd25f7b22369f48e2ddd9d0b7baf165196211a6563ec95df68b0df85a236093e3b8cfef93d3212e0703bd52499c8e2a162a8836c SHA512 fefbcbbddab04f1423f0f1efc7e51947ecea5cc3d89b0dfceae1914d3388d59e02ac2c8df71868dee67aef9962694b19008e683e24f0c5af0935f637f7012627
+EBUILD zeromq-4.3.0.ebuild 1426 BLAKE2B de8dfe1881fbaaa65164d25f7e769fb239723ea75474370d740be9e242812a7ecb5a89ba98f391e9cb932541fe57dcd0b14379269f4b2bb8de2fd224b93efe83 SHA512 820eedcb8e46aa6fb3f1ef60e544d476719e93626669a382800618da104c78c88acf8ac2d372a3a50f5a493a88472dbb07d4430251e569b2caf8af56af40b13f
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.0.ebuild b/net-libs/zeromq/zeromq-4.3.0.ebuild
index b2afa7f25c54..8eae7c543838 100644
--- a/net-libs/zeromq/zeromq-4.3.0.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9748060f19a2..ce235b9f012c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 67c399e5c71d..75f5f8956bdd 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -20,6 +20,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
-EBUILD courier-imap-4.17.3.ebuild 6792 BLAKE2B 8135460008a95e65488ecec7ac374f05296632f6020ae63b3e54bff18cf1672f5e97c8533cfc1562b61c45fcacf210bde89a0324dd5ba23c191067a7b3957528 SHA512 ff63c782dec41c20ef41d8fdae3b60669be6df9c932edd9efba96689750e955225cb1473e126a1202c89c5256b8873b031e1e556e746aa508392790a7bab63eb
-EBUILD courier-imap-4.18.2.ebuild 6863 BLAKE2B 73ac4204b5c4c2b4a0ba674a7d3b1bfbbc43ed1aba162618572573f9b5fd7eb060e82e9d2e7aaf275f282c32cad077b0d3dd519946ff4802eeaeebd79e61ff8d SHA512 903a4996d1e4043a59f535b7e77f443bdbe0565f04e51a7c877dbface1c6a5013afe1dcc86e43067015d4d1974da39a752373539942596165933f572d809d4e8
+EBUILD courier-imap-4.17.3.ebuild 6794 BLAKE2B 5192299cd016549438abe0ffb2b7d92d50a8e596e9a1d9d4d9a3485550973d8a76aa3f9fa3c5752811ebb93e8ea50cd81e8bd50f9b8833c6fc74880babaa418e SHA512 103e22a47b18ea7a22a832505e9f540d28af0e9e5dc92205ff58a443689f96449c6597a62dc8ec35e48f4823bc522ce46a53b6f257df2533e2e777cba0ef46c4
+EBUILD courier-imap-4.18.2.ebuild 6866 BLAKE2B a97da84f22269460677df1ee7fbb3d8e5dd758dba784bcaa629b6a07b62580ed29b77d52c27eb8a6ff6924317c45410b7b546a36ff6f31374e0940b1297aaac6 SHA512 c9961def6f8e6b603f82deb713521fb541b9840535dde17e15be9396ae63f965d46d7dbeb952abdc5ab7a8d5cf05ef4a19f3635ff59405e51f69ef718bda06eb
 MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index f756c4408199..ffbb08e8e095 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
index 79b4f380c0c6..93d001e33010 100644
--- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2ab609cc6a2b..e98b9fbe79a5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index eaa754792784..4213be046cd9 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -2,8 +2,12 @@ AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b9
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
 DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
+DIST bird-1.6.5.tar.gz 1114984 BLAKE2B 15b2a432e467a8ce81acc4d3d5cf7dea865cf7d3a8c893ab348916fbf60104a5606a6cbc2fcd647c102f3177f0d04d2f046860da244f26a7357f321285f1e295 SHA512 a86c340f4acd9d90b5babe8f19dbd753b2ad94db2c92181bf969244c1d7b20aa825a0311c13a1e19b019019b91af7827775970fd39e807ab32da690492ce356e
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
+DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
+EBUILD bird-1.6.5.ebuild 1282 BLAKE2B 08adb25747149de95a2b3c806db82a199044cfe2eff8887dd1394700ba7c35d25a7ad48eb5d5129220618daddf1dba526948efa56962e970da452c48f7374b9f SHA512 daeb190612f574a628d99e3d2a28187c686c87fbf454aca050719c77624cc2dd04513d084257ab6e3282e7dd5006016fdbc1261e89780b4700fc8c41f8fab07d
 EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
+EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.5.ebuild b/net-misc/bird/bird-1.6.5.ebuild
new file mode 100644
index 000000000000..f4ccc176494b
--- /dev/null
+++ b/net-misc/bird/bird-1.6.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	eapply_user
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
+	fi
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.3.ebuild b/net-misc/bird/bird-2.0.3.ebuild
new file mode 100644
index 000000000000..298936acd43d
--- /dev/null
+++ b/net-misc/bird/bird-2.0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 23f2e7e5ea98..518bc605bb5b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,8 +4,8 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.61.1.tar.bz2 2965173 BLAKE2B 16ef6962f64e18a4b67c3cccff78120084a2660207f512974f9827c53037a95b935a6020620f926eee85339fbc558be5585f2a4c001bd287c4d33795e6a6dab5 SHA512 484d33c0d32109539a95309cdb4404c03c0e7164fdbf7a4724a5b01aa20e2d48fbe6363c7cc53060d4d28050cfa6b43f9ed220ab65d4d389eb00efff5db1bfb5
 DIST curl-7.62.0.tar.bz2 3014762 BLAKE2B 0cc9ef5d19004dc5cc69444cac3b2fb4fd82ba470a831b761c147e45826fc26087f4e07da76ee0b6a070f6125a1423927607a257786387326f4c9f4e3953d5f7 SHA512 83ca5c2757745f763316eefdd4c3f0e8a211a7f0db6a708b67ae2133ad41fdf17dd2230f9283a4778c9c866126d407454a090291cd2bf274371d0a214c1c13f5
 DIST curl-7.63.0.tar.bz2 3001355 BLAKE2B 7925825f606d7eb474fb73aeec52353d3a3bf8827b34457493003ef2e3c1aed5350d849fdbd5624f148c6bb776aad318f1f49ec1ca57690f5dfb21b12fcbdc16 SHA512 2873ef57b15cf12e508626f4546f6e06450cb87b239be1d26d9b3a22f7533d76eebabb5fa00e7b8c5d7fc9854356997ce164afb069411d079b2b9f0bdb00db25
-EBUILD curl-7.61.1-r1.ebuild 7220 BLAKE2B b022dceee6068aa31e3fbf8b792b554e32647da47ed863b35c11470a494c0ae6f51a1a243eed73589113d19a4ea52e601a6142a7b55e31cc0e52e0d9b28de7db SHA512 fbd4cb210b96c45d73ad053dec8d2f59550568f079787c38c22df208395205cb4d56dfc1891f115f349e05a10a67416bfebe0bea5f3761cab6d534da1bfaca55
-EBUILD curl-7.61.1.ebuild 7190 BLAKE2B 526a2302f0c6fc7f7ea05320497d9a481c456b962680355094f63d37c59cbd79f014e2569e5e423e508406d287fdfcb18134eb40b256fb5c4a2bbe308e0ee204 SHA512 666d3c972e2f9cebc462bd27a1651465a8ce4105587e5d77a95c0564d377baacc09c024b8f12dec06698f0a2bb6d8b07a6a2e42cab328c18cf425968b6121fd6
-EBUILD curl-7.62.0.ebuild 7209 BLAKE2B a3d63692307eebc03e29cfac59332fb781eb8c406e3b635d06c1be985be0fa8c6fc59169cda9ec37e9d2dc55baf6dc7c26b2e98d3b6e808454abca15ad13d149 SHA512 81edc02ac0a7a6f374c352a3703b062f4e513ad865d16857ec9cd83a4a0297c2ce6e0829769cb113972017a5a99cb534055cb1a9c33b1c4cdcfc95d58b082a4c
-EBUILD curl-7.63.0-r1.ebuild 6972 BLAKE2B bd64ef5fcdcb86e40b6688710b74d91f5c4b10fd4cd7d0481d9c02b4e96eac03df3f31639d2568c885f8b2656fbbd5d5df8cb91ed569d4aa0d1ab559b832ea5c SHA512 c6c9bfc4a02b8381eac498d429cdc685e6ff0ad8ac4c694c06032f211fe2ee737931770bfd61a4b9626140c59662c541838526c4e58691e8f9f3b8001e0c182c
+EBUILD curl-7.61.1-r1.ebuild 7221 BLAKE2B f62d7c0eaac984bd8f98040eb6c3fe76de792cb19cc3fd5043db3b42c8a65dca81e112aa0117840bf2ecacfef29f87ad64fb3e1d78be11c99c3d435eec2f8916 SHA512 d40b1bb3884e3a4953d6ecd37a078411e252f3a84aae18aa9ed6dcb0ffb2ad5cdfecde841e0543a8ecd780b649ee3120c6047ecaa7468b7503922f72d17fedeb
+EBUILD curl-7.61.1.ebuild 7188 BLAKE2B 0c8aa08db582fe8d02a1edaf5227fc7b0fd9784be455cc55125f29d3f1008fae07642a531d91771d3866e5a84c18b1fb5cb7d862648586916234a20d781f2f43 SHA512 ba13389aee609f13643fd6472c16a8cd8f4b6f11aadebc376f98ad7af0a515452ac5d3d73051cfe0d974d67753f67404e8f77a410948824b0324eef1f6a8ae20
+EBUILD curl-7.62.0.ebuild 7210 BLAKE2B 59d3807676e597d4ccd39a261578bd8a33d2bc29c3cd30dca0d359928a8e073f7831191a9f63db9272b3ab993773db986438e55aab4b3a5078c1e61cfc56c03b SHA512 371f4932ff242ce5abd7be2f9cbae1d1a19e74b9822435d989489601d0b3082a6ea5fe954c822c4970cbfe10e7652437bd16bfb3333ef924770782bd79d5516c
+EBUILD curl-7.63.0-r1.ebuild 6847 BLAKE2B d52226c50765c986e0edfa883009390af00eae62019ad8bef0e7a17f6db400662a6dbdec4f2d550c0e87ede84f692d64edcf16d310cfa8e2d21dca488283ae3c SHA512 417e746879161b9a6034dbb889184809a7684cabb7c1fe2669b8c639e20fa8130d95e8204c954f43e171140b09876ec98b998a5f41dc7efdd3f7495189d4ce96
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.61.1-r1.ebuild b/net-misc/curl/curl-7.61.1-r1.ebuild
index d13d87e7796c..29e3e4618832 100644
--- a/net-misc/curl/curl-7.61.1-r1.ebuild
+++ b/net-misc/curl/curl-7.61.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/curl/curl-7.61.1.ebuild b/net-misc/curl/curl-7.61.1.ebuild
index 568697aa80e0..726cd4a808ba 100644
--- a/net-misc/curl/curl-7.61.1.ebuild
+++ b/net-misc/curl/curl-7.61.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/curl/curl-7.62.0.ebuild b/net-misc/curl/curl-7.62.0.ebuild
index 59ea16793b7f..25fd30f2d3c8 100644
--- a/net-misc/curl/curl-7.62.0.ebuild
+++ b/net-misc/curl/curl-7.62.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -47,7 +47,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/curl/curl-7.63.0-r1.ebuild b/net-misc/curl/curl-7.63.0-r1.ebuild
index 6370a878f7bf..525bbd549f48 100644
--- a/net-misc/curl/curl-7.63.0-r1.ebuild
+++ b/net-misc/curl/curl-7.63.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -43,7 +43,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
@@ -101,16 +101,11 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
 
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
 
 	eapply_user
 	eprefixify curl-config.in
 	eautoreconf
-
-	if [[ ${CHOST} == *-darwin17 ]] ; then
-		# https://bugs.gentoo.org/show_bug.cgi?id=637252
-		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
-			configure || die
-	fi
 }
 
 multilib_src_configure() {
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 594d83ba6eb7..c85b93c7149e 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -2,6 +2,6 @@ AUX dropbox-cli-completion 129 BLAKE2B 6e8c72ceb1ad993c90178c3aa99b7da861ed3ea4d
 DIST dropbox-cli-1.6.0.py.xz 17632 BLAKE2B 244e36ea2b1f3a7ad36884de227933f91ca94dd907fadc300cc599336b4a09efec54e9f4cd26aa922609755812cfcd0f506866d0a66e74700c1b90a8c4347683 SHA512 06fcbba67031c18fe1840f592d04039a7c78848d6e77ae8cca04881f5f72ada7fb368921e2ae3b92d161e49bf91eae0f41b559a210eacd0dc203c51134597857
 DIST dropbox-cli-1.py.xz 17580 BLAKE2B 9bb165f419df716acfb485f40e3b40238d06db1448cf12731499f8b891d1a2b3de57ae405807c9b61316bea65eca133c95a88a475db210173efb915707e2154d SHA512 d5510a66a5605e474059bb761cc2f33cd4d23481e85f040b049c36759a030f1e7072a9ad2cc7f72e59507767aa375ff3ea1c06d7bf702eb7ba7d698db2bfefe5
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
-EBUILD dropbox-cli-1.6.0-r1.ebuild 726 BLAKE2B 347b786c5cded9461e4dde1b737365caaaec6fde96136ad6bce0c2e888b7d348e411271800bdbcae050df1bfbf5854e54bc484747b985f7f3cd677dc2f6555b6 SHA512 f231633c6c3bb8592c0300d2994fdc2306ed02b012673af6768742ff2ba13aaeb6a11a58c9d22b8d9cce891c119fbd0c672fe845d3f231fc674935af2d1b0bc9
+EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
 EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
index f45f0bdbfc47..fe8d22897aae 100644
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6b7fc7c6c9fb..aaf17b76e666 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -6,18 +6,11 @@ AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d
 AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
 AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
-DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
-DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
-DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
+AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
-DIST Electrum-3.2.2.tar.gz 5617363 BLAKE2B aae6e12644c55542fb1e0ff702e751dc5ebcb3d1da6ef58c3509be248208c38b10f43bed555a1228f9e9f397350765d24544d89f56ffbfccda71ec39fe2256d3 SHA512 32c4a24c2d3e2e38b9d66f6102176533a991b1c1fd25173bcd3bdd2e78cf42fc5fd2f0d2ee0c6a8d99db1b17d47bd3e7f3cf1303964f0566f4eef4edb3c87f15
 DIST Electrum-3.2.3.tar.gz 8311398 BLAKE2B 389f2ce2982d40f69c1fe3bfcac3ffb70d4fa09265f1a0567ecbdad21b53ebfdd2473e8e56e024add8cd52d24f690467441ffd33509cb0ef20c4f30bfcbba2a7 SHA512 a1620d2a0f28ee8c61e0ddd985f9e2a219f2b9fe0316042fbc88533332fd95709a9f4e60a40494a9cc5c2fad08c6f318f38bcbe91bbb88d20811953d514682f7
-EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
-EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
-EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
-EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
+DIST Electrum-3.3.2.tar.gz 8934781 BLAKE2B 1edbde4d26056b13efe84b93eb39ce0db4a20baf29367216c2cb4ac0e5c8887ca6be42e70fcfb095d7a2e80a539646c1a87677af82eee62a34380bc13b57600c SHA512 da8eca13c54eb12938ce204905df535cdf1402874109bee636d4c5acb106530463d6d96a636e7418b7635073491df6aaf50ea172e53b2c75ae6844f9f94eefd1
 EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
-EBUILD electrum-3.2.2.ebuild 4393 BLAKE2B 26acc075fd21430cfd08cb940ffac4c1217c1ca23f035e53a0edb4cdfe704fd239e93fb9a564486b6dc5cb36a56151eb867f85468e509d491df2c2d0ec96c1ce SHA512 5152ee6d100af50f2eef4c47c844adb50be11a397e0f81e20dfac9111b7bfb43bbd50adc8d77dabf41ae33993668f236b12ef4777f9e4a9932d0925b8a167dfd
 EBUILD electrum-3.2.3.ebuild 4431 BLAKE2B 73632ec671f7a2b95b39bf068f727fbc5d2007a58531fc827d1375a569b7a92d4cd99f3ec0be7984436b7160ea951de618bd21384e0aed437ece99435c911e6c SHA512 dd37f22a0462612f3723597815150a8516c822b5e45e89382355815fcca2c5fa0be02227dca8a6532e330a3c088a28af819d44bba7eb422293512194ca29e587
-MISC metadata.xml 1310 BLAKE2B a513446594197d15f1ef462faf8730b0a5b593ff280b6221e6086f8caec173c6e75389c0dbb7b50e2ee2eba236350ab0503b5b9c4cd68beb570847b81847cc3a SHA512 4b07d535c78c4a039a426be75450f7a7718396e265f0fe19d22250be4f0090f6cad0d9ba383765a7cfc491d3c863c4bf0189c6f4de5ee08430080ddb41d1519f
+EBUILD electrum-3.3.2.ebuild 4547 BLAKE2B 0434e4c617a94fbcbb523aff284292c733939fcf0746c93732505e10d26ca7b5dcf30791f85b1b8a55e0c7fa0502c44ffcbc2c9e3317470d523ccb18cf3bd866 SHA512 5fdc51e424941a1f5aa9e63e6804df091997c50b8e6649227ebae940d527de41d92626519fa036ecc46d77db1af0aea9d9ba8528c55bdee12bab1c35475bb0fa
+MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
deleted file mode 100644
index 1f7968812019..000000000000
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-#PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		revealer \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.0.6.ebuild b/net-misc/electrum/electrum-3.0.6.ebuild
deleted file mode 100644
index dc974d4c43aa..000000000000
--- a/net-misc/electrum/electrum-3.0.6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		revealer \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.1.1.ebuild b/net-misc/electrum/electrum-3.1.1.ebuild
deleted file mode 100644
index ed1b46dc489d..000000000000
--- a/net-misc/electrum/electrum-3.1.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.1-pip-optional-pkgs.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild
deleted file mode 100644
index b10060186b9b..000000000000
--- a/net-misc/electrum/electrum-3.1.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.2.2.ebuild b/net-misc/electrum/electrum-3.2.2.ebuild
deleted file mode 100644
index d6633f147754..000000000000
--- a/net-misc/electrum/electrum-3.2.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.3-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.2.ebuild b/net-misc/electrum/electrum-3.3.2.ebuild
new file mode 100644
index 000000000000..e899d91abe8c
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "${PN}/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm ${PN}/gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex coldcard        '' coldcard             ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex safe_t          '' safe_t               ) \
+		$(usex sync            '' labels               ) \
+		$(usex revealer        '' revealer             ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r ${PN}/plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/files/3.3.2-desktop.patch b/net-misc/electrum/files/3.3.2-desktop.patch
new file mode 100644
index 000000000000..e932623be246
--- /dev/null
+++ b/net-misc/electrum/files/3.3.2-desktop.patch
@@ -0,0 +1,21 @@
+diff -Naur Electrum-3.3.2.orig/electrum.desktop Electrum-3.3.2/electrum.desktop
+--- Electrum-3.3.2.orig/electrum.desktop	2000-11-11 06:11:11.000000000 -0500
++++ Electrum-3.3.2/electrum.desktop	2019-01-08 20:47:55.628978706 -0500
+@@ -3,7 +3,7 @@
+ 
+ [Desktop Entry]
+ Comment=Lightweight Bitcoin Client
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"
++Exec=electrum %u
+ GenericName[en_US]=Bitcoin Wallet
+ GenericName=Bitcoin Wallet
+ Icon=electrum
+@@ -14,8 +14,3 @@
+ Terminal=false
+ Type=Application
+ MimeType=x-scheme-handler/bitcoin;
+-Actions=Testnet;
+-
+-[Desktop Action Testnet]
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"
+-Name=Testnet mode
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 41040e7157e4..b3234f5ca5c7 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -12,12 +12,14 @@
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="audio_modem">Enable plugin to support Audio Modem</flag>
+		<flag name="coldcard">Enable plugin to support Coldcard Hardware Wallet</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
 		<flag name="email">Enable plugin to support emailing invoices</flag>
 		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
 		<flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
+		<flag name="safe_t">Enable plugin to support Safe-T mini Wallet</flag>
 		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
 		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
 		<flag name="vkb">Enable plugin for virtual keyboard</flag>
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 2c4362bd4ee9..065aae7f975c 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,9 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
-DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-1.2.0-r1.ebuild 2550 BLAKE2B ee61c800fd3199a7ee85e6acd09b97ea4a2d0af54350df57ae757f042d0f985806db720edbbd24172e86117d93530f2d85b2564d0ed6857b526ab3b41e889074 SHA512 3e89539be06f7b0a735f8bbd7bd86d4241daebbd818ed6193a402466b85cfc80c498a7b9506c47222ad657182462717f1a914bc541e004000513c0559c55a97a
-EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
+EBUILD gerbera-9999.ebuild 2554 BLAKE2B 24fbd4b31248cebce80d7732b5b3e884adfe72f83986e0d0b44f573ae856bc50170d3b253db0fb67848495bf44f1f1de389c389dbd84546a713f4da55d75fba3 SHA512 8082eab99d34aeb588f4ece501de7f45e8acd34eac5af3380053c81a1c96b97d768bba05301563f69b29b8e7e9ef74d56bb163542a6e4e5d3475952e3e51e086
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
deleted file mode 100644
index efac2f23345f..000000000000
--- a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils linux-info systemd tmpfiles user
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/gerbera/gerbera"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
-
-DEPEND="
-	!!net-misc/mediatomb
-	<=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/expat
-	mysql? ( virtual/mysql )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
-	magic? ( sys-apps/file )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
index 80b003ed0721..c3f775019bbf 100644
--- a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="
 	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 50806deadb0c..ff9299acd184 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="
 	net-libs/libupnp:1.8[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
-	mysql? ( virtual/mysql )
+	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index 820c190ca416..d80bb12f2612 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -3,5 +3,5 @@ AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba979979
 DIST htpdate-1.0.7.tar.gz 16848 BLAKE2B 2e7350f186af09d8876c9caddf3d3bdd1b3d361169417e1c672eb04e499d07391ec93c56fad7e6d0f947a5bf60580a9f52ba564f213662a65dbbd67df875399e SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360
 DIST htpdate-1.2.0.tar.gz 13618 BLAKE2B a94f08738d08c0caacc876d2e25e1dba43bbe371b0a31f957a1d5ff522b0ae5bd7bf5abcde63802843b1c32799e4cc38bacda657a9efb3a56a1eaccdb4f8c35c SHA512 5447d54a54038cc3c33f7877410ae42022e01eb10a93bd79fe4937452a823c65c6bdb743213bc77a8506128d5b384e26812f1291a0ffa1aeafde0230c1b645d4
 EBUILD htpdate-1.0.7.ebuild 1104 BLAKE2B f8430b15362130cc425a75b6b296b274e8f26ae4bc30085bd9d4d5d7330fa16560e19809e65dbf55d346f96a7f70901b8165526a0842b0b3a9cc2d9bf21671ad SHA512 b94a56bd7230572bc2b52fcba820a7606abd26254b202ad2c7be1ccbe29bb7a4fcce4e211576e06fe08d04d7b88979e4116b823254d9dd406cff61dd9b21fed5
-EBUILD htpdate-1.2.0.ebuild 1008 BLAKE2B e8d1b72fa79229af5b9f2e9b9e08996e985ce68a34507dd65d4d8421e8f094b7cff5a7aae767e97c8529930aa578af9ddbc858d32a2b945deaedf6c77709a1e1 SHA512 0cd1b71a529c6255edf395d160ac4c229829597af5b9e140d18c187e36578704e60a215d2bf1eccab7601c99470a3d5a88a9a8f63073507a186cbd562b8449f1
+EBUILD htpdate-1.2.0.ebuild 1006 BLAKE2B ffd29371c97e36a023bbc436bc584bb00424cf1317e9fb2003e8d66f4ffaa971efba6e1244eb44807af776cdba3353a37232c774ac57b0c4e4e35e91ea996327 SHA512 d9a33a5e3ec3eb7f24e8853b3d9903f4206379ca94d49c80d7d74e5bf1628d5cd092545fd11e364d0a30d007cb8cc0ed18d06d5935a76ce2b455f9aa5aae0a7f
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/htpdate/htpdate-1.2.0.ebuild b/net-misc/htpdate/htpdate-1.2.0.ebuild
index e9f1b6de4ef7..4e36dc3cd673 100644
--- a/net-misc/htpdate/htpdate-1.2.0.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ~ppc64 s390 ~sh x86 ~amd64-linux ~x86-linux"
 
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 105004cc52b7..2256476e68bc 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -3,6 +3,7 @@ AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
 AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
+AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -11,8 +12,8 @@ AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c04
 DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
 DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
-EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd
-EBUILD lldpd-1.0.1-r1.ebuild 2420 BLAKE2B 8847c8718f419481e92fdd857196c71bd73014448855ea8fba5f1b425def8614852fe2891498655acfb5fbc9d0eccf487f520ecc2bf2f475334b06d6c2524b09 SHA512 246b57c0f0e9acf2224e3138d136202d05603e5aa170314d5395679140b4545451a1eaf62d57f9842b967bf1ab2bdcd1ae1892e02bb178d6669a0127591f3335
-EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440
-EBUILD lldpd-1.0.3.ebuild 2467 BLAKE2B d47946910d25c659032527332596cf73766fb09d314dfe5ea1ee69b87501948bbf7fbc0bd5104ff456f6428589b04940e7a55eebb85f9896eccc6b398cb9e337 SHA512 a2290ec9eec9260b120a6ec3e157d221062ddcdc802a87c127a4979b66d6c85e0ded0462416e3c0c6e362acb382efa05194020a5bbaa6d1324b6594bb39b9035
+EBUILD lldpd-0.9.3-r1.ebuild 2476 BLAKE2B ea99c4a7cf9b328e074c400ae1873340e10c2865b0ec7297f995563f5f0bb7656806d02caa490664b69e72effafa9af964820013a7c3b2a7bb83629680ff3b68 SHA512 aade0484be9dd930dbd7e7225e70796a93f3986b79a6a3a289f30de717e82845c890a6ce93c7986f7542e3f398ac583a95768d60ecf5e34091db7b70bd749fb0
+EBUILD lldpd-1.0.1-r1.ebuild 2439 BLAKE2B fc2b1c220d371f0e2d42efc6e7ed3f7ee5389cd4c2b96f7d5af6449a1bd8f1ccd7b42c01fd5a98587048df6694261ac0b5c157cae80010cb058bdf091227c829 SHA512 3a8fb50e15715e6b7cf53f6723b74b476ffe942adc39ee93612fa7eb7a4dd37c05b763c19afe128c9e17e4251cec9369e2c2c6f78249356f96d9caf0b4e9c788
+EBUILD lldpd-1.0.1.ebuild 2390 BLAKE2B b201067dde29c59460b13866be79e359bd933b24d9dfff80e59f69c0f586e8a6ba1daac4ef4dd4c86a3de398a05e96866f7fd3297771c07cc478830e2d1438fd SHA512 084fb2530ed91f354410515ddaeb790bdf8c6cc94d4db3e34c6ad9d6e094ecb18e7659a92ca46110975a1a6b39693c58eab72b89d0fdcb4b622aa687f1a054af
+EBUILD lldpd-1.0.3.ebuild 2542 BLAKE2B 047b22f95ba2b5b1708b963952d8e0a0f7d1de026fe07247761357006c19be93eabdbef1f666da9ce2ec4a32439834037918aa231fcf7bfda3838be147b98f4e SHA512 ddd5b65a8545d030284043eb782e0faa1a2ab0427891861d0f4323db595693225d0d7bf8f05f88f0bb8a30c846f63fb758775fe37c034ff844348a275064cd66
 MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
new file mode 100644
index 000000000000..17099a2f819b
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch
@@ -0,0 +1,30 @@
+commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4
+Author: Vincent Bernat <vincent@bernat.ch>
+Date:   Tue Jan 8 17:19:15 2019 -0500
+
+    build: fix compilation with `--enable-fdp --disable-cdp`
+    
+    Fix #315
+
+diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h
+index c3ffa10..f6b03d7 100644
+--- a/src/lldpd-structs.h
++++ b/src/lldpd-structs.h
+@@ -129,7 +129,7 @@ struct lldpd_dot3_power {
+ MARSHAL(lldpd_dot3_power);
+ #endif
+ 
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ struct cdpv2_power {
+ 	u_int16_t request_id;
+ 	u_int16_t management_id;
+@@ -273,7 +273,7 @@ struct lldpd_port {
+ 	struct lldpd_med_power	 p_med_power;
+ #endif
+ 
+-#ifdef ENABLE_CDP
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP)
+ 	struct cdpv2_power p_cdp_power;
+ #endif
+ 
diff --git a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
index 117ff3bf8973..4f8d9c61c91d 100644
--- a/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
+++ b/net-misc/lldpd/lldpd-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	jansson? ( dev-libs/jansson )
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
index 88ddeebee8dd..4f6e234cb95b 100644
--- a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
diff --git a/net-misc/lldpd/lldpd-1.0.1.ebuild b/net-misc/lldpd/lldpd-1.0.1.ebuild
index e555b6b4f7ea..31d70bcb6cd9 100644
--- a/net-misc/lldpd/lldpd-1.0.1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 09b8552f81f0..822e037de615 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
+	sys-libs/readline:0=
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2 )
 	seccomp? ( sys-libs/libseccomp )
@@ -35,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
 	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
 	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+	"${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.patch"
 )
 
 pkg_setup() {
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 05b258fb9b4a..b61e85d3f916 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,8 +2,8 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b
 DIST mosh-1.2.6.tar.gz 347185 BLAKE2B 4676ebc9736d83eaf842ac847fb7ce29d0ebbe9546df9755fc03d352ee69edd0d2135bf232c42c77c37e66a69049682611ccd10ceba999c6b4b419c66e288813 SHA512 fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403
 DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98bf1a0946ede03f8139dcc159c9a6cbbc019ef43c7b324990077df7ac7287866ea2daa813621ff3618ae1d77 SHA512 2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.2.6.ebuild 1403 BLAKE2B 5612c55dedf61f42344da91cf649817789394552b0af084f0e64f019d4edbfeeda659facb6f5ad8d20f8e90a891ac4eae2445957cf6f1badfe07e7742d93e740 SHA512 36761d027f665567bdeb6bbbcf97af741da641db5878c8db4dea7f73653f601dcee951f0500c503986226b44a8589f30c11c1d93244ef0b5076829ef80325747
-EBUILD mosh-1.3.0.ebuild 1407 BLAKE2B 58e5cc20a44ab98508c68d805cdc83b06a2181a9261d2a9f63dd86dd6d71f8774875da417f333d609c56c9b87175b387b82a67ac356a019abb41261c87d41bd6 SHA512 b3a06abd4c1c45a4280c43f6628f4c02e438fa0e30b998aafc3db48a81bb8fde973b2617f1995f260ecff3978486aaec508cf1974137e293a82e6c0882f2b238
-EBUILD mosh-1.3.2.ebuild 1411 BLAKE2B 3adc2058e58b4dac33be8929e41488786b3009cf7afe5653d42ea87ca5282ea32b5f5d3eabf5a44d295277fd2872f4587233036184d29826eec54bcb959b512a SHA512 86a4a88d0baa93d50da8c1787fb960a9e74ce3c9b1ea0656f98ca6d7935d152177354cf26fc798bebf23571d112be21d21594883ad8c963cf93b53d8a0ab32ef
-EBUILD mosh-9999.ebuild 1369 BLAKE2B e9aaec4ebb618d05c9ca0a609f821594de3359e6b82d336a5ca261e720cdd83ee7cb29b97ba8ad2fac5f68f89fc73e0ddb20afe5508c0db60458b5dcafc48748 SHA512 778cc0316c4f8f600132477f2a9cb7f0011dbc204d5d2692f1fe61ad40276142f9f105025cef3aeddc1a158eecb5798a7b9e291fe2279348f206ab09e2a2a9c3
+EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
+EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
+EBUILD mosh-1.3.2.ebuild 1495 BLAKE2B 8726361ddd15b620f13c3c011955ec28280c8c2ef03c3d9a7c67568d0736d3e003ca6579f0dc71103d0e19fc7f771d9a73de0d93f3293b3ef50e8ada5564b945 SHA512 3e3cd120664e9817970546b0238bb880d6d0de340b30df782b8232426b01bddf5de9fbdeb564604385f8f023f8133a499b5c3017ee58d1960cb7e7c6f2db3242
+EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.2.6.ebuild b/net-misc/mosh/mosh-1.2.6.ebuild
index 0258c62a187c..f51c7d11081c 100644
--- a/net-misc/mosh/mosh-1.2.6.ebuild
+++ b/net-misc/mosh/mosh-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
diff --git a/net-misc/mosh/mosh-1.3.0.ebuild b/net-misc/mosh/mosh-1.3.0.ebuild
index 6998cb6bbd20..61fd42fd6e5f 100644
--- a/net-misc/mosh/mosh-1.3.0.ebuild
+++ b/net-misc/mosh/mosh-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ REQUIRED_USE="
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 8e0a4705f404..eb607fe4305d 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
 	|| ( client server )
@@ -26,6 +26,12 @@ RDEPEND="
 		dev-lang/perl
 		dev-perl/IO-Tty
 	)
+	libressl? (
+		dev-libs/libressl:0=
+	)
+	!libressl? (
+		dev-libs/openssl:0=
+	)
 	utempter? (
 		sys-libs/libutempter
 	)"
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 96d00779f301..e01550c41834 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,14 @@ EGIT_REPO_URI="https://github.com/keithw/mosh.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
+IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
 	|| ( client server )
 	examples? ( client )"
 
 RDEPEND="
+	dev-libs/openssl:0=
 	dev-libs/protobuf:0=
 	sys-libs/ncurses:0=
 	virtual/ssh
@@ -26,6 +27,12 @@ RDEPEND="
 		dev-lang/perl
 		dev-perl/IO-Tty
 	)
+	libressl? (
+		dev-libs/libressl:0=
+	)
+	!libressl? (
+		dev-libs/openssl:0=
+	)
 	utempter? (
 		sys-libs/libutempter
 	)"
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 88b42af1bc83..8945f6e86808 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -17,10 +17,7 @@ AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b4933
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
 AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
-DIST ntp-4.2.8p11-manpages.tar.xz 25700 BLAKE2B 8efff006297925e4dfe57abfb8130d0dcb69e804744a597ad92b9969019b87c7b3e44f032187073d3c19092ca92445ce06b93f89f449430fd21cc540f11f5f3b SHA512 403bc238681abaadc838f5a6619851dcd0cfa5bf780e8aeaa94e8f77e776998d1f5142d65e3fa99c23e22e4cb7207d24b059fbbc6ddcf4414f0076a4b6ab4e81
-DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c71499872272cda221d7356676762a23ac1066ddfed7fb803083dbb9b26ca7376ea75277a63ee8de1c70409e81432 SHA512 05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236
 DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
 DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
-EBUILD ntp-4.2.8_p11.ebuild 4517 BLAKE2B 87ccf28c99af3848df8ca2bfc5825358d6c38d2045939b3d8a7c6509a83493ef1de004e4afdc466c453335b637c63895446c351cb2072193620e2af4883c2fbf SHA512 e8d5662377daa1c0ea1e9c1d746b05cf16944d8b3c3d9811307bca1cf6be923899390597019f9a5d203acfdec00d252860110ca0f434bffc43a25c42162696ff
-EBUILD ntp-4.2.8_p12.ebuild 4567 BLAKE2B ac23c755d6befea41196245866147781f3916ddb86b8ff750ef1e2701a1c6b29d026d0f04d791fa55267e36b79b487d37c9d042414ac4a881856e8bb405c8a3b SHA512 37c9f24be3beec669db4b519cec8d8fff19e177f75be859f2017008079e9f6ac07133153c3bac72f3dee5c0352e084d91b5aca2e94ceefe1f7f6ef624179a5b2
+EBUILD ntp-4.2.8_p12.ebuild 4564 BLAKE2B f084db146b958fc8c789b82459135d8fb9de1295bfd39c06c36b580c79bcaf3e8f8cfde8a89001a16fe542dcfe1a08a479413c63356d8480d8aeb2bb860f9465 SHA512 303114ca6511626059920736006fd5e5075787951f9ce61a47ab3b3d7181db904c6b2ab915fa2981e8d89c7a6276bcab129ba4a267fa00a3ef31c1c08038ea11
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p11.ebuild b/net-misc/ntp/ntp-4.2.8_p11.ebuild
deleted file mode 100644
index 7d4665cbe8aa..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p11.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-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 ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
index 2bc93a5a5cec..eb032edec7a0 100644
--- a/net-misc/ntp/ntp-4.2.8_p12.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 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 ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 5d392155eeef..c1a182bea8d4 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,8 +1,6 @@
-DIST rclone-1.42.tar.gz 52702474 BLAKE2B 35def37dfb44a9fccabf0f6c3d0106da58bd1468a0c73e8b0a911e9bad48c6da58d303726544c76464230714af68d1727336eb9a4858337b346630f5df147a08 SHA512 69fadc1bc661e6278e461a16b49fb473bf2e35ceb85704c2b92e252422d372fbbbbb9d188cf9cb58d55b6d6c8267c599ea0d8a79fb4edb4a7bc0bac61de3eae1
-DIST rclone-1.43.1.tar.gz 15965941 BLAKE2B 5bf0ac08ca75abfdf6bbcd8f5725b0ab3aa543c7dac043feaf301a6c0a23090c61086e3c16e674bbc2c29d7dff7fc19e7759c70e5990afb2ddd72e5610295cba SHA512 7da3b285a8ed401de95ec0b8bea21ca3db0313eb2012874b10fb65c4441311ba4b24b7dd3ea68a7bce17206ac065f091d2f6ef6a9662fe0111b9f00ff58e6c17
 DIST rclone-1.44.tar.gz 16362501 BLAKE2B 28b4e444b83f361ae641eb7b09e150d46eaac09dd777e247e38f3e708a18e8e58d6a1c40829aba1c44c6c37e733dced2eae069a9b6e725adf0785b7c9959e47b SHA512 1207316ed12646a4ec5f9795d5cca1de9d2fa333f60a8b6dd157462813e2e6ad9ebf85d3d20b9b881d11dcd9ac162b5a674a53ff2af15a452afcfc04f7b34f5b
-EBUILD rclone-1.42.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.43.1.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-1.44.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
-EBUILD rclone-9999.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55fea47a5f76773f1dcc3d3b629cca7964ffe41aa1e4dbd2fe36bd80545f336d2823a25ebb6b3effc768d4b46d2 SHA512 348dbd6a069f736219b7f925b6aa5234a4d70724ee5bfdb56067241063be36c44a091a37acb3285627803fa013329a6ef804aab4c0070ddaf322c5324b9e2a5a
+EBUILD rclone-1.44.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
+EBUILD rclone-1.45.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
+EBUILD rclone-9999.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.42.ebuild b/net-misc/rclone/rclone-1.42.ebuild
deleted file mode 100644
index 2c530609ee7b..000000000000
--- a/net-misc/rclone/rclone-1.42.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
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/ncw/${PN}"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.43.1.ebuild b/net-misc/rclone/rclone-1.43.1.ebuild
deleted file mode 100644
index 2c530609ee7b..000000000000
--- a/net-misc/rclone/rclone-1.43.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/ncw/${PN}"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.44.ebuild b/net-misc/rclone/rclone-1.44.ebuild
index 2c530609ee7b..e7c1175ae163 100644
--- a/net-misc/rclone/rclone-1.44.ebuild
+++ b/net-misc/rclone/rclone-1.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ EGO_PN="github.com/ncw/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/net-misc/rclone/rclone-1.45.ebuild b/net-misc/rclone/rclone-1.45.ebuild
new file mode 100644
index 000000000000..e1f64b65bde7
--- /dev/null
+++ b/net-misc/rclone/rclone-1.45.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild
index 2c530609ee7b..e1f64b65bde7 100644
--- a/net-misc/rclone/rclone-9999.ebuild
+++ b/net-misc/rclone/rclone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 7bf4a33fc89a..6185152a8113 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,8 +4,10 @@ AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab36
 AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
+DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e99dfb4d5dc91de931c9f1471d2e080063b1c3b2a2e1cc4418b9d2052e019e06b1573ba0921346d885b82eec37fc3d SHA512 ab93bf6c822cfae151158a427a5d1679beb0fa17f6a9df629283cbeead43b0003a23bc4b3a2ca89a616eca6d46cfc7e2080e03e36600605891a4b4743ba63d71
 EBUILD rdesktop-1.8.3-r2.ebuild 1896 BLAKE2B 5741137acba3af2842dfd5e6bdc95a53d230feadece2a7c5d71ed2042442a6702ff3d94bb1f98554fb2c0134488c8fecf456ca9d8171680c89cc0054ce2acba8 SHA512 2b5e2ed13d3a42dfd70173b7cbafde9d078c08a27ea13aec85951c7dddb302d61b61c08eecc72b7bc8a0ef13fa9fe1854069d6e1c106428adc2182314ca798ec
 EBUILD rdesktop-1.8.3-r3.ebuild 1725 BLAKE2B 0523fb8eb8962017673fe4dc7cfbd05457aa514c2166fbe5ec0beb1fe6902d5109a878f7371ce2157d2a0a85da2e6245d0ca9b80ef2c2de013dce2bca456c296 SHA512 519ff1eafb4ea9420c62a6ce864fdf5005aaa3f7dffa05dc5265d14837133430fc60a204390a7055a2b1277d0f90c2f84bc11ee46baaf0fd76f15c79fd5068ad
 EBUILD rdesktop-1.8.3.ebuild 1803 BLAKE2B 783d1cdb94a66f2c6339cc45fb4c201ed0ba2af0d06b91bf6d615b00b086d7f498fb082efbb34e48b6a110a1232d5c400fd8b984e7729685c7cf1410544ba7cd SHA512 c1bcdac48e93f0e30b57ebfdeb6338b20f980aca3630986e564f20483b38e9f31110a1efda74b94d8fb973b9299399ae7e75351dbda049b82f8e74002363f68a
+EBUILD rdesktop-1.8.4.ebuild 1709 BLAKE2B 09f9ae4b35a35d4a9882034e425c69f66fa30e30166cc26fb6d4ff1fba36512436c40ad4e52f181fae462257e9d575c973efa6b085d29d5e2684fafa55d5ac0d SHA512 c204cc5606d6c38eea53565a09ae57a6783d62aa3436b9049c470ef77053c15e5afbab8027fd8654c465f0878b4c98c5e99112f3f80e14a42475259d34d8c9f1
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.4.ebuild b/net-misc/rdesktop/rdesktop-1.8.4.ebuild
new file mode 100644
index 000000000000..f5be6057df98
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 9248c9fde428..70e6bf762dc4 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -3,5 +3,5 @@ DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
 EBUILD s3cmd-2.0.0.ebuild 585 BLAKE2B e5893a2407d2068cc8e7d7e1e1c9490eb485a7104a42ef3c671afc4575221bf58c90fc4a7b0453f04c269695c29ccd1e5c970dc1382733ff8573169c91388e76 SHA512 aa9bda77e77a242e4438f24d020a246d2fc104c3ec40b439cbf8375f45d8f2cd7faeced7f1994fed77b84a90389c07796069e4f04fa23e30f10a574a58e61267
-EBUILD s3cmd-2.0.2.ebuild 585 BLAKE2B f60832cd97239541f9fb0572e26ad33bc7025dd02a13e5d90ac9a75ce9f905c24745b0ee03e5d0bd0a9800b89e235c2c59e358c3c549afb9ea2e47717242cf94 SHA512 fab67e3b49e7a1b057d813bd2fe38da354ee8119842987dc9284a45f92c8c1efbc4d4213938ba4a3541611e4574ccf40ba4c7d9a94f4a820a05a0089a82955a9
+EBUILD s3cmd-2.0.2.ebuild 595 BLAKE2B 47b999ff34c111b119b5ae534a2494e5e31f1051015604ee2af6281daabc32648fa64dd7330d6be2a70fbda821721be98783e57a41431f115b3fa45b133f1b8c SHA512 cbd4561826b36740b82944deb94698da0ce1088491b2bbe9a317d743b30f446b83c977c3091236e77858651e6eba2a51a1971b5bd9ac27eef273c9f85d852f3e
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index c8ebf64df130..6d8a1feb42a4 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ia64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/sshrc/Manifest b/net-misc/sshrc/Manifest
index b36f977bfa09..86afc95e9567 100644
--- a/net-misc/sshrc/Manifest
+++ b/net-misc/sshrc/Manifest
@@ -1,5 +1,5 @@
 DIST sshrc-0.6.1.tar.gz 3701 BLAKE2B 36cdd0d4dcc80ea1884533f71e6090a6cb393dc1131a6d78fddc43c37e0597aee2da8b92789a59100ad6941d8c17e6ccbf796d73ec704df45aa768cfc6bf36a7 SHA512 69e0919bdef0ec6fb187814f1a0dd360b331dc4c0fc047f7767399944eccb949c172682331e6ebe940c275f0a2b6293a66a6018e12351f566638eed1ac362d64
 DIST sshrc-0.6.2.tar.gz 4410 BLAKE2B 982ae3f0a6d3727699cc3cd7ddc20304ad1330b165f7450047f7d3b236ba7f3b297223d88c6ce8e00d0db97d3193c4547d7a10d51e8feb3bb639b6276865a8e8 SHA512 79dd964c5ed825b38aa775d35df6adc0857817c418fa4ae1971378f062536035bd66e4faa0fb84f66504f09c7e6368355f8c57036bea8d269b4d9084af95ddc4
 EBUILD sshrc-0.6.1.ebuild 508 BLAKE2B 382be296afff6d8c5e4c50d39fc24363afa4d77de0c40e0860d7771b5897a761332f9d6c7e0e1bc0371e3acc5b7c558d3a2212d182d3e80255beac209a82b046 SHA512 76035a2894f49e02366e587ba66e4c0ede86fbffc41a908106eca9b4b2777d1f7786df4e210573d7956d6c7c97b79e14bfb58f4d9b4a3bff571c4d4440c16ce5
-EBUILD sshrc-0.6.2.ebuild 504 BLAKE2B b02e5be6ca53322cde4611e1c749a9bcdf1ee1d5569d56be339206f25f45a706170d1573ab1bfeb253cf1dad9af1335cf4cb0e4aae122235ad2d3f17772f9d62 SHA512 e4f1ce279b024b9b7091721f9e47859b7c96697930960b88ba0837311c84f566ee0e4e0cf94b182f297e476bfee5ae5010c787f59f13f2c6dd3c71d09e4fc2fa
+EBUILD sshrc-0.6.2.ebuild 503 BLAKE2B 678fe7cbac5f64e689bc21c83a79b757d38adf98eccbb8289d8c460012b99156d97eda76f4762d24248b37225b7dfd06c1e1f63fa79197a222d49d2aa87e2eef SHA512 aeed92acfc893a0e3fbd86fc616bb52f427c46d912cb58835bdbaa8b9f2e3ccac3b2ae133ea4fa9759ac6879e3d63e06b878a67c3a1a054df0a2c1e1588fa709
 MISC metadata.xml 686 BLAKE2B 1eb7107316b71bdec72f42a5eaa58aa7fbd9b568c1a887adbe7b031ed9b7b5a42bdfb43374a656118d49dc873d1437d49849faee59646d98593bb0efd87487e2 SHA512 00b1ff2c8d66e8beebb34f409782c43350c9fd6709df2e9300f010632324cba282fdf054d6ba32bd822aac0b2cba7364cb33069ba550a89ad09b9a7ad50f2658
diff --git a/net-misc/sshrc/sshrc-0.6.2.ebuild b/net-misc/sshrc/sshrc-0.6.2.ebuild
index f8fc30766e09..f88910912dc5 100644
--- a/net-misc/sshrc/sshrc-0.6.2.ebuild
+++ b/net-misc/sshrc/sshrc-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Russell91/sshrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="mosh"
 
 RDEPEND="
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 40afc9570562..5dc99873bebd 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,8 +1,3 @@
-AUX wget-1.19.5-fix-dot-prefixed-domain-matching.patch 1077 BLAKE2B 09a341db55d4c0e47007060ba743f11a509526c01cf9815ee4eb9d21c8ae821f122b3ae10047fbfa69e1da407baea799663661e9dbdba0d6a6ddcaf4eda4eef1 SHA512 971b13380dd0a8f60a8ae423ce98798105cbf5670b86445bec67a869ffaf891be7b48a0a6b02e3575459b64f586b2748be8077925f873dc2e1a4bc5467a95392
-DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
 DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
-DIST wget-1.20.tar.gz 4474641 BLAKE2B f9a1fdb1299dcee36467e6a78fc90fb8b17b71d14079b5ce6d60a19a27a2bd4c53fdbd3660cbd2d94a3523d4c5ea517e52f46e4af1be60db885fe79a376b3720 SHA512 2e50b9e83c22cb342d85981f89253d9c72bb1a48152c17c4c0b6315683890075f60ad2783e4fa8c2a6d15c53820d9ecb8d0c4b81cfcef4fcc66126ed1cb7ff54
-EBUILD wget-1.19.5-r1.ebuild 3231 BLAKE2B c3c1c75e7f9d2df4e40959c481c1266f78a216a7600788bbebc0d51b0c9203f773b469df6e2797d98b71c0c5a5cbf5146134312af7bcbaf2945c5ded3604f984 SHA512 694cedb34e2687c1e69212b96808251446618669ef947c410852435063a1daea0000d3a883edf86fa552ef7e0ee104ed250ee0ab125f1ded47f9112002959156
-EBUILD wget-1.20.1.ebuild 3199 BLAKE2B c7c585395a0398339f225f7b93ba0c68a651754191a5517824fe21779434d2ff1af1ae66d1a1a9036c145a3baf8108006bacd103a6f3be0eaeb1805809588186 SHA512 3ba598122d8bab203f362fc73bb53cdb9cb42401f9ee9615bcdc21b94a1bc98c744dd02d33d84e6964a1fd4f756a56b95394c16f2337a274172e92c294569cb7
-EBUILD wget-1.20.ebuild 3199 BLAKE2B c7c585395a0398339f225f7b93ba0c68a651754191a5517824fe21779434d2ff1af1ae66d1a1a9036c145a3baf8108006bacd103a6f3be0eaeb1805809588186 SHA512 3ba598122d8bab203f362fc73bb53cdb9cb42401f9ee9615bcdc21b94a1bc98c744dd02d33d84e6964a1fd4f756a56b95394c16f2337a274172e92c294569cb7
+EBUILD wget-1.20.1.ebuild 3188 BLAKE2B a341244ebf21c99c63082e3fa47fb7c146be73ebafaa8d8a2b5210da7c2dd339873456a9b3e5b4560d7459a6e72259b6e7663486412a365af9c9d81d8e47a704 SHA512 8fa5048e8dd8a42ca12c86aa7f09e3268a35d165c51fd7081a3ca85c3e127674a1f66983b9eb9375a06db74db7e45d73b8e2af5979e75ee7d6846339763b3ad5
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
deleted file mode 100644
index 129f0b675414..000000000000
--- a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Mon Sep 17 00:00:00 2001
-From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Date: Thu, 25 Oct 2018 17:39:52 -0300
-Subject: [PATCH] * src/host.c (sufmatch): Fix dot-prefixed domain matching
-
-Current sufmatch does not match when domain is dot-prefixed.
-The example of no_proxy in man (.mit.edu) does use a dot-prefixed
-domain.
-
-Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
-Copyright-paperwork-exempt: Yes
----
- src/host.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/host.c b/src/host.c
-index b42cd6e8..2bf848f3 100644
---- a/src/host.c
-+++ b/src/host.c
-@@ -1033,8 +1033,9 @@ sufmatch (const char **list, const char *what)
-       /* Domain or subdomain match
-        * k == -1: exact match
-        * k >= 0 && what[k] == '.': subdomain match
-+       * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match
-        */
--      if (j == -1 && (k == -1 || what[k] == '.'))
-+      if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.'))
-         return true;
-     }
- 
--- 
-2.18.1
-
diff --git a/net-misc/wget/wget-1.19.5-r1.ebuild b/net-misc/wget/wget-1.19.5-r1.ebuild
deleted file mode 100644
index 6db7c1194b03..000000000000
--- a/net-misc/wget/wget-1.19.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-PATCHES=( "${FILESDIR}"/${P}-fix-dot-prefixed-domain-matching.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] \
-	|| [[ ${CHOST} == *-solaris* ]] \
-	|| [[ ${CHOST} == *-uclibc* ]] \
-	|| [[ ${CHOST} == *-cygwin* ]] \
-	; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	local myeconfargs=(
-		--disable-assert
-		--disable-rpath
-		--without-included-libunistring
-		--without-libunistring-prefix
-		$(use_enable debug)
-		$(use_enable idn iri)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable pcre)
-		$(use_enable ssl digest)
-		$(use_enable ssl opie)
-		$(use_with idn libidn)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with uuid libuuid)
-		$(use_with zlib)
-	)
-	ac_cv_libunistring=no \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED%/}"/etc/wgetrc \
-		"${ED%/}"/usr/share/man/man1/wget.1 \
-		"${ED%/}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/wget/wget-1.20.1.ebuild b/net-misc/wget/wget-1.20.1.ebuild
index 912dcc731412..ae23b38c4306 100644
--- a/net-misc/wget/wget-1.20.1.ebuild
+++ b/net-misc/wget/wget-1.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,13 +13,13 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
 # Force a newer libidn2 to avoid libunistring deps. #612498
 LIB_DEPEND="
-	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
diff --git a/net-misc/wget/wget-1.20.ebuild b/net-misc/wget/wget-1.20.ebuild
deleted file mode 100644
index 912dcc731412..000000000000
--- a/net-misc/wget/wget-1.20.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre2[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] \
-	|| [[ ${CHOST} == *-solaris* ]] \
-	|| [[ ${CHOST} == *-uclibc* ]] \
-	|| [[ ${CHOST} == *-cygwin* ]] \
-	; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	local myeconfargs=(
-		--disable-assert
-		--disable-pcre
-		--disable-rpath
-		--without-included-libunistring
-		--without-libunistring-prefix
-		$(use_enable debug)
-		$(use_enable idn iri)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable pcre pcre2)
-		$(use_enable ssl digest)
-		$(use_enable ssl opie)
-		$(use_with idn libidn)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with uuid libuuid)
-		$(use_with zlib)
-	)
-	ac_cv_libunistring=no \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED%/}"/etc/wgetrc \
-		"${ED%/}"/usr/share/man/man1/wget.1 \
-		"${ED%/}"/usr/share/info/wget.info \
-		|| die
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index aad1127e787e..988f838ed244 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
-DIST youtube-dl-2018.12.17.tar.gz 3074432 BLAKE2B b6f4b3a7a2c2159093494230219914ee4a2f87194ebe741cc4687aefa76dfef09c282bcc6534030bb65cd87a641b05cc74bd74eecc0c78b57157970fbea98121 SHA512 88d98391d110d6542503590c4735c765137cde43bc3a1f1b33b197d323a1226ed550d559f67bd4aadab3c82de8a471fa71bf4e1440e5641e1c51ba5cb7059904
-EBUILD youtube-dl-2018.12.17.ebuild 3410 BLAKE2B 8a6e7ca605c8c39c98eba0b01f5c5c1cd3c03b08d963043125f57e1cd87a50cf16a685bbfe26374d5dab07248ca031ce9015fa300d3084896062fc50a8c3f938 SHA512 ca156bc1a202c3a5001f176356c61d8a0ae31c697ff930773adb46c4a04b5fba53766fb6b8584ded1a50c23b6f3d1db662f5af98dd78680f3880f6a6afb7e26c
+DIST youtube-dl-2019.01.02.tar.gz 3079437 BLAKE2B 6eb1610f5638fe64f4d1352ab763014550b99037dde08beb19b94a8d4877cd05f392ce840ec1bba28eee37a7b45b793afb4f68f6d5b234fe7d849501b7fb10f5 SHA512 745a1e9286c225ed0ad3517197304e39655d50ed33df44525579b7fe7038ff2be8fa0872adbc8c35cc738004b0d58c1f30f7af918c7251427da84002cc9ab944
+DIST youtube-dl-2019.01.10.tar.gz 3085961 BLAKE2B 938fe458a22f1c02c5e420ed43bc65247b7992e90d224891e2f5c8fb6410a0fba62dedd035a37b0e8c42a7dadc8082a26c97fb3f192a02df8795c9cfac6c6a42 SHA512 86c86688bf9120b56a0cda54ca4c8fef20f7afeea38a80b44d5aa77958b80ac4605b8de9666668297d0a9244693b17dcdfd85ddacc8990b179bd942c4d7158f2
+EBUILD youtube-dl-2019.01.02.ebuild 3410 BLAKE2B f16485a95281547c0ad2b0f32d1005e7a1500f630d5894dac2f2ab3961de53d92fd535cb7b253ae566a5779e757f5439bdf68d204c9c8a8da8e8c816eda3f72a SHA512 c3745e5375971e638f46dd20389523d648c853aeaa03a36d982814158fd2a0561749e8704998617ef2983905be0f4dbc5b78f06b6faa965e6299487bb55991e0
+EBUILD youtube-dl-2019.01.10.ebuild 3416 BLAKE2B a006e2ef1f88a0867fd931e1bde00c35e211f2c4efde7f5c68348c012ebc22346b46d200a24aa50f86b5e3fdb1e5c9253527c284a949b3c1920f3c8034d3fb94 SHA512 b5f01ad65383548f81ce29a6ed77ba3e450f585a19557c73ea7215df434dcfc8b6f972d057b6b767462a454f6ae7c2162d71fdda8a1d575b0f74952ad655b465
 EBUILD youtube-dl-99999999.ebuild 3304 BLAKE2B 62e4cfa266a5c117633a91e9fe83648f42bbbbd60e8764adca0002a03fb55b06caf224fb7997bcc9073847ca7d0055037749fd45f7521757a8e1bf9d4cc7215b SHA512 70686e618298486fc81621671f687cf11a0b56a05041be6016f4e2eed97ea215c21e869f90b5f071111f229f0d3ee49be3b3d395cd8e28900cc985d1d9d8fd31
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild
deleted file mode 100644
index 7bce052e27ce..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2018.12.17.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="+offensive test"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	if ! use offensive; then
-		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
-			youtube_dl/version.py || die
-		# these have single line import statements
-		local xxx=(
-			alphaporno anysex behindkink camwithher chaturbate eporner
-			eroprofile extremetube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
-			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
-			slutload spankbang spankwire sunporno thisav vporn watchindianporn
-			xbef xnxx xtube xvideos xxxymovies youjizz youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
-		)
-		# do single line imports
-		sed -i \
-			-e $( printf '/%s/d;' ${xxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		# do multiple line imports
-		sed -i \
-			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/extractors.py \
-			|| die
-
-		sed -i \
-			-e $( printf '/%s/d;' ${mxxx[@]} ) \
-			youtube_dl/extractor/generic.py \
-			|| die
-
-		rm \
-			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
-			test/test_age_restriction.py \
-			|| die
-	fi
-
-	eapply_user
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild
new file mode 100644
index 000000000000..c26955b40882
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.02.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild
new file mode 100644
index 000000000000..6ef55f59a57e
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.01.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+			pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+			slutload spankbang spankwire sunporno thisav vporn watchindianporn
+			xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 710de48e0b73..be686c442515 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index 573c02835a21..ec795588e0e1 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,11 +1,5 @@
 AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6
-DIST newsboat-2.10.2.tar.xz 334820 BLAKE2B 08f5ee71b86c33c8aef5d2dc510deccefae8161fa1a3453947e94c9aead550468bd43368022ad438d4eb6da5ac18a348f9123489f2275fd8aed91ce40a5e9a32 SHA512 b807e0539bf31a4536af4e933623ec4de974995dda2345178057601aff43081746941d93a26269b6e8b77aee34b50a7c9867f867bed1331fc9a2c381163636fc
-DIST newsboat-2.11.1.tar.xz 426056 BLAKE2B e13778dcd9fa4d821e4578ddb16193ede13cbb67d1a363deebede018ec9cc00f9ddfb2c86445ada2c3debe60af64923eaba2296ccbd1ffe8f31488d02b9cbc3b SHA512 265b83828eb3da6e61b14b6d16012baf3de147b777fa09a8cad0e76d4cf54677389bf89abf10f94a644def57f41694869a6ea07465e7cc97ec12df74d939bb5a
-DIST newsboat-2.12.tar.xz 442132 BLAKE2B 74fc543ee5f0de274f7a6adee6102b190ce9288ceee5824704ac5605f82fdb729fa351699052579c1fff160ef9ef7b97da4c35b30c6acf548b930d91e1088d7f SHA512 211024288c58ac467e1953f2cd6e7cf1cf7d36ae3d1051d8845692a016232a7662b4b6a816663bd0a2a911c89198fac56e674dbca20df45bcbd7f2cbccbce311
 DIST newsboat-2.13.tar.xz 460076 BLAKE2B e86fd3e3da8336527f3fd53e663f547a6066bfd1659bf83354a01139a9f6481afda893046faa1729cdfe03b19080032c70575cdcfd13b15aad40f2af808e2f6e SHA512 f7ce9717540e1c38809a44d531d28b26d5f9759479d311c127adec1ed6f3f6e8ad68799559ed31e9ecde7a988a683b0c9f58ff10e8dd4b2de60d75b7f8efe3da
-EBUILD newsboat-2.10.2.ebuild 1309 BLAKE2B 219a52879828ddf123aa53d0561b3750725f5448d2ec0920573feebe439551c603d7e91446573e514784518c36cffde6b55390a32930e6368cf689d9c4be83fb SHA512 fdf7433c86e00fdb382a672b72f16d6e8be494a9c8987b232dbb053a0edf28caee3ae0e8513414571f2a5bf5867a383d999d550f1d7003b2c05f7b6aa40499df
-EBUILD newsboat-2.11.1.ebuild 1471 BLAKE2B f25c1a44fbcfe18e15ee6a4e30ed9f20decd7288c72f36c7d16ad246402a45757477bf0ea41f2a638bfd1345c0aeaa6866818b051ef7442693899321772acca6 SHA512 4743303cb04d2525ce1a6fe6a3789fc4dbe847e61826fe7238d1a953ac4f41dda276ef54e20ccfe3ed81caf67a173f99754071606b0d83e5ec544861d9e7c59a
-EBUILD newsboat-2.12.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
-EBUILD newsboat-2.13.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
+EBUILD newsboat-2.13.ebuild 1252 BLAKE2B 20607997ab2079d9531b6214a21f556c0c78f4059d3276c08f87006eb19603e92a8daff0883b527f136959078a6172a7a77c2099616dfc481f60a4d062a17b00 SHA512 139266eed0947fbb7f479c9d973cf30a44b97c5ab3ee09d3909d494db016cc9045d064436d28bcc986d0a7d0dc15bb1df10014a4a9e38e4e6804733df3d84852
 EBUILD newsboat-9999.ebuild 1254 BLAKE2B dcd0564d36cb18bc47fa52f0fec9728144409f2be497694becaefb7df737cd897bae87d5e9b58c9f598e02deedb70ffba178006cfa2d79975470d18ea91e415b SHA512 122765dd015acae96494bd9224761df6824ffd23dd12d53923cf40ff5010ab8520fa054bf12888c36d1c452013ba052b2f8b577da9e9f23d45ee1f9d8713da16
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-news/newsboat/newsboat-2.10.2.ebuild b/net-news/newsboat/newsboat-2.10.2.ebuild
deleted file mode 100644
index 00303f47ab21..000000000000
--- a/net-news/newsboat/newsboat-2.10.2.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
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/newsboat/newsboat.git"
-else
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz"
-fi
-
-inherit toolchain-funcs
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.18.0
-	>=dev-libs/json-c-0.11:=
-	dev-libs/libxml2
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? (
-		dev-libs/boost
-		sys-devel/bc
-	)
-"
-
-# tests require network access
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -e 's:-ggdb::' -e 's:-Werror::' -i Makefile || die
-}
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake test
-	# Tests fail if in ${S} rather than in ${S}/test
-	cd "${S}"/test || die
-	./test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	dodoc CHANGELOG.md README.md TODO
-}
diff --git a/net-news/newsboat/newsboat-2.11.1.ebuild b/net-news/newsboat/newsboat-2.11.1.ebuild
deleted file mode 100644
index 33b53c619552..000000000000
--- a/net-news/newsboat/newsboat-2.11.1.ebuild
+++ /dev/null
@@ -1,73 +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 git-r3
-	EGIT_REPO_URI="https://github.com/newsboat/newsboat.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz"
-fi
-
-inherit toolchain-funcs
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.18.0
-	>=dev-libs/json-c-0.11:=
-	dev-libs/libxml2
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? ( >=dev-cpp/catch-2 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# use system catch
-	sed -i 's#"3rd-party/catch.hpp"#<catch/catch.hpp>#' test/*.cpp || die
-	rm 3rd-party/catch.hpp || die
-}
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	# update object build deps to use system catch
-	echo > mk/mk.deps || die
-	emake depslist
-
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	# tests require UTF-8 locale
-	emake test
-	# Tests fail if in ${S} rather than in ${S}/test
-	cd "${S}"/test || die
-	./test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	dodoc CHANGELOG.md README.md TODO
-}
diff --git a/net-news/newsboat/newsboat-2.12.ebuild b/net-news/newsboat/newsboat-2.12.ebuild
deleted file mode 100644
index ee6c86f08943..000000000000
--- a/net-news/newsboat/newsboat-2.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/newsboat/newsboat.git"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz"
-fi
-
-inherit toolchain-funcs
-
-DESCRIPTION="An RSS/Atom feed reader for text terminals"
-HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-db/sqlite-3.5:3
-	>=dev-libs/stfl-0.21
-	>=net-misc/curl-7.18.0
-	>=dev-libs/json-c-0.11:=
-	dev-libs/libxml2
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-flags.patch
-)
-
-src_configure() {
-	./config.sh || die
-}
-
-src_compile() {
-	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	# tests require UTF-8 locale
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
-	# Tests fail if in ${S} rather than in ${S}/test
-	cd "${S}"/test || die
-	./test || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
-	dodoc CHANGELOG.md README.md TODO
-}
diff --git a/net-news/newsboat/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
index ee6c86f08943..faeebc9cfb6e 100644
--- a/net-news/newsboat/newsboat-2.13.ebuild
+++ b/net-news/newsboat/newsboat-2.13.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/newsboat/newsboat.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz"
 fi
 
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index bf400cba550b..97247e445301 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index ae882756f117..9a9c3941112c 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,5 +1,3 @@
-DIST pan-0.142.tar.bz2 2302780 BLAKE2B 5360b24dc3939bd440ed72e0d7e95d005a8155c784e7fc003369750d13bf5971b5549b76ab9b558bc8d3ebe6f946b6986854e1224ee41e0feb3cdf8bc840f591 SHA512 285e140c2d24297bbe14d6bcd995fa0e736c21ae541348a726988d4d42cd92e563671eb607aefb54d12b2afdba311b9b55f88d5a7c61e782503ab894f85fd06a
 DIST pan-0.145.tar.bz2 2307162 BLAKE2B 09535013d8c2fb511b8c79ef185880b69a3f948d0e168b4fb8acc4d3d07d94fb756df171d003b12e1baef3201e2b8be22d583bb9ff551a5ae22f464feaa6f077 SHA512 3dc92d519158ddd480fc43250bf7a3ec67a877e58b0877c02b99f1dfd968bf18c9a20c3d8c4b6acab4132da89b6b91dd2992616ddf46c1c3f9aa0de8f8ee1949
-EBUILD pan-0.142.ebuild 1151 BLAKE2B dc9de811f13f44b4ef41841cf43f480460e336790d4f6be76c80cef1002452c6978f1e5b530fb3e15b86b12ac7ed2cc1bb66fc582350d54b2006abd8598bd055 SHA512 f05d5fe9b37c446470dea50e3f377479663e0c52ee81974a0235427a9cad65599e0ae83748336c5a84e5432d7a148d5d1b092af26d643e94d43661af5822549f
-EBUILD pan-0.145.ebuild 1320 BLAKE2B abce2cdc47365682a5c015123d748bc30ccf5c1b3f445ede635782ba641b35462ac2aafe38df2826cc21f9b7a47249f4c4def8d5dffd5391cfdcda353e30a825 SHA512 6b13fc1d318c1ad6abcd45e6b364b5ebdae195032df6a6902b31cd771357f49b19078faa2ba5d50c5fe666ea2e7b1ac6b638a381a47eb395d6afa7595fedcdb5
+EBUILD pan-0.145.ebuild 1319 BLAKE2B addbbae2051678584cb44e481547bb7b318866ebcf80503ab87aefca2323715a3d34472d5190e4a6729957a2f7812e806bf3d831452a8151dc70d15e3cf79de5 SHA512 a4a68df1bb947756280cc7e3138081da454312bfc5b45ed0f9cf897e0afbc39a73add34a9fc35597aa06d3ccbdcb6cdc0246c969756139676f88c99a71923bf9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-nntp/pan/pan-0.142.ebuild b/net-nntp/pan/pan-0.142.ebuild
deleted file mode 100644
index d20844915b6f..000000000000
--- a/net-nntp/pan/pan-0.142.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 gnome2
-
-DESCRIPTION="A newsreader for GNOME"
-HOMEPAGE="http://pan.rebelbase.com/"
-SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="dbus gnome-keyring libnotify spell ssl"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	dev-libs/gmime:2.6
-	>=sys-libs/zlib-1.2.0
-	>=x11-libs/gtk+-2.16:2
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 )
-	libnotify? ( >=x11-libs/libnotify-0.4.1:0= )
-	spell? (
-		>=app-text/enchant-1.6
-		>=app-text/gtkspell-2.0.7:2 )
-	ssl? ( >=net-libs/gnutls-3:0= )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Wait for webkitgtk4 support
-	# gtk3 support is still not ready (follow what Fedora does)
-	gnome2_src_configure \
-		--with-yelp-tools \
-		--without-gtk3 \
-		--without-webkit \
-		$(use_with dbus) \
-		$(use_enable gnome-keyring gkr) \
-		$(use_with spell gtkspell) \
-		$(use_enable libnotify) \
-		$(use_with ssl gnutls)
-}
diff --git a/net-nntp/pan/pan-0.145.ebuild b/net-nntp/pan/pan-0.145.ebuild
index fbb998ba87a6..33df6c304229 100644
--- a/net-nntp/pan/pan-0.145.ebuild
+++ b/net-nntp/pan/pan-0.145.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND="
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 347cb8bf924f..403181f6ec2d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 89f5624e80b4..6de25fbabc95 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD bitcoin-cli-0.16.3.ebuild 2401 BLAKE2B 1f372febaea711cab1ba45ae3b9e29a55138d34b01235f3c6e375b67621b98086bf5b1982c305c50e050164238723e7e4550f686e86fcd80e35d734109d81b8c SHA512 e836b2ff0c3127febca2574bc09bc7e7e98171eafed08af54a8f5f19c9c87410acdb0be2341b8142f76d90ed450bf3ced1bfe57ecf106a77c865c2e72ce018d0
+EBUILD bitcoin-cli-0.17.1.ebuild 2388 BLAKE2B 81e9cb0972e053c324fc0206bd2630cf5438c1b3a7dbbf86b26ee9f2c3baaa4fb57139ae120b8e55d40ae46079fb1dbab2a95be1c118121c2403b5fafb7bcb67 SHA512 7c676fdd6abf87bd7f4e30fad4bf275b107352c4df2b2f421da746c4c75e8f724d09025fc9b0a6c5e2835b9880ae57b21582a149ab901cf541a648a859e5fc06
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.17.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.17.1.ebuild
new file mode 100644
index 000000000000..e7296976041c
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.17.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>=dev-libs/univalue-1.0.4:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index edb776d93838..d049614e05cb 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,4 +1,9 @@
+AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab
+AUX org.bitcoin.bitcoin-qt.desktop 468 BLAKE2B e00d41612be14770d1f34b83f98a104aed197eb62707382a0189c5b9559f572336e8d236dcd290e1a4a43df041bfdef23209e1533401659228af8b004c9b3d76 SHA512 0cecb04d7813bcc0e5c9f1a5dfc32859708d3524548f6dcee33ba9fd600a7000f64b3d5f2dbdc1dcfce0a68fd82ea932b338da77ad495ebc03b097f462a75d88
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD bitcoin-qt-0.16.3.ebuild 4872 BLAKE2B 2cade1bc6b69928e1d05b74e11e29f3c8a79bec23cf8036724d0d535f91ffba04f47f9735a614c32baff08e16e6e863427e61e5e66de9b4752f33e7920ea2ccc SHA512 3409277590f09004dfcb08841eaab154f067d91cba3d265f1ffcfc59237827e25581b38fb296d5db0e7bd4e996b7e8556190227e5af879c786c8131cb043ba3c
-MISC metadata.xml 1297 BLAKE2B a5d393ca42a85506f75d526bf01d06dffca54e5e46b6bcefc9f70ea719945539dccc7425ae8938b48dc21a1e09f5d0228d52fd854805c850e67a544797910b7a SHA512 a2963bce834917c9c722b9f427f3030be3a45a1f7e460afcf989affc5a4beb7e0781d55606853d56c967ca474e3d5e43aee0b2a28fd844758b2131dbc2374d3a
+EBUILD bitcoin-qt-0.17.1.ebuild 5024 BLAKE2B 30a978cd1c4a7efa195e36cdc8a6694245fb026b92fa82cc46888bc3f62c3fa179273ec4b09c065141643f6d4f8cd50d25ce178c1a7bb863877212cbddbf5e53 SHA512 e5ecfdbc57c8cd6d175efda73c73167c9dd29e718191cc9dc66d65c9f2bb1fb6dec2efaee262249b5127d8a1a19bd45797c8417f358678401371bcc6c1676d95
+MISC metadata.xml 1390 BLAKE2B 2fc9611a5a3839183e28be1f49f3eebf3c01ba0097afbcbf2c587e53edbe9ec9973dc65b834d479e8870e9094cc3fb1cc3fda266818f7b6e209079f4c576b6c9 SHA512 a5d9727f4cc019d475f625d705c08f26958d5118d4433a9245e73ef4eb2ff7ffe840630de334c93df7107eecf3adf8c7782a85b7c35690c1c073ff489548ed70
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
new file mode 100644
index 000000000000..f13ca6f859b7
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2010-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
+
+RDEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	bip70? ( dev-libs/protobuf:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	dev-libs/libevent:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	qrcode? (
+		media-gfx/qrencode:=
+	)
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	knots? (
+		gnome-base/librsvg
+		media-gfx/imagemagick[png]
+	)
+"
+
+DOCS=( doc/bips.md doc/descriptors.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+	if use bitcoin_policy_rbf; then
+		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+		elog "relay transactions paying the highest fee, regardless of receive order."
+	else
+		elog "Replace By Fee policy is disabled: Your node will only accept the first"
+		elog "transaction seen consuming a conflicting input, regardless of fee"
+		elog "offered by later ones."
+	fi
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+	# Save the generic icon for later
+	cp src/qt/res/src/bitcoin.svg bitcoin128.svg || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	if use system-leveldb; then
+		rm -r src/leveldb src/secp256k1 || die
+	fi
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		$(use_enable bip70)
+		$(use_with dbus qtdbus)
+		$(use_with qrcode qrencode)
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-gui=qt5
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--disable-ccache
+		--disable-static
+		$(use_with system-leveldb)
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /usr/share/icons/hicolor/scalable/apps/
+	doins bitcoin128.svg
+	if use knots; then
+		newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
+	fi
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+	if ! use knots; then
+		sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${D}/usr/share/applications/org.bitcoin.bitcoin-qt.desktop" || die
+	fi
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+	if use kde; then
+		insinto /usr/share/kservices5
+		doins "${FILESDIR}/bitcoin-qt.protocol"
+		dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol"
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+
+	elog "To have ${PN} automatically use Tor when it's running, be sure your"
+	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+	elog "correctly, and add your user to the 'tor' user group."
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol b/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol
new file mode 100644
index 000000000000..014588d53679
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol
@@ -0,0 +1,11 @@
+[Protocol]
+exec=bitcoin-qt '%u'
+protocol=bitcoin
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
diff --git a/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop b/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop
new file mode 100644
index 000000000000..0b03d45c1cdd
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Bitcoin Knots
+Comment=Connect to the Bitcoin P2P Network
+Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
+Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
+Exec=bitcoin-qt %u
+Terminal=false
+Type=Application
+Icon=bitcoinknots
+MimeType=x-scheme-handler/bitcoin;
+Categories=Office;Finance;P2P;Network;Qt;
+StartupWMClass=Bitcoin-qt
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index f88446cdbbe8..0e5739a73259 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
+		<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 120378c9d0a7..f12b5625eae3 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -3,6 +3,9 @@ AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f7
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 EBUILD bitcoind-0.16.3.ebuild 4845 BLAKE2B 6e974ad55e23ad07c81f03c841768be8df2967d18aab6cac73264c7ed812604aa5372bd7b06d97e7a40415cbcd346ddcb4181ae1d7224cdf4bf1092f781da7f5 SHA512 213152b613a69dadafc4d93e8eeb295cf652eed8eb058dfe7b6aaf84fe4e81623d75e29272c610ee335de8f520516a31b3e3042e44ccf9034aaae07a7c4819e1
-MISC metadata.xml 1033 BLAKE2B e79ed83740379df868320d024cf761995aac60ad9fcb451b137910814ce5b7964c8231853819c2b2ed95890f75c8ef18aee455eedd79543d8c44b2199124f0d0 SHA512 4e530a735d38119cc26b8fa31c2d4a117555004e79fad00f105f581ae6ba20d00d59d54f155c6e3f8c2bbe36aae745ff6e79a66187dac1975ec399e329d9a919
+EBUILD bitcoind-0.17.1.ebuild 4938 BLAKE2B 0db4ddb4b3da24fb715053bafaed717fd880eaa939663ec4260f0a5093e26fff5006febb71994f1c7876ccf0f7db0f789a31008838337491f78bf0decc05a322 SHA512 118d5ad80efac90a06523e1983e9ff4e492681cc423c4a272435babc8fac66a7cd64c7a13724a53d88844542bfda1ab74e2a353585b57037033178a207451904
+MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
new file mode 100644
index 000000000000..71d8c912e3e6
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	dev-libs/libevent:=
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	system-leveldb? ( virtual/bitcoin-leveldb )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
+	zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/descriptors.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.17.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2018/12/25/release-${PV}/"
+	fi
+	if use bitcoin_policy_rbf; then
+		elog "Replace By Fee policy is enabled: Your node will preferentially mine and"
+		elog "relay transactions paying the highest fee, regardless of receive order."
+	else
+		elog "Replace By Fee policy is disabled: Your node will only accept the first"
+		elog "transaction seen consuming a conflicting input, regardless of fee"
+		elog "offered by later ones."
+	fi
+}
+
+pkg_setup() {
+	enewgroup bitcoin
+	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	if use system-leveldb; then
+		rm -r src/leveldb src/secp256k1 || die
+	fi
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-ccache
+		--disable-static
+		$(use_with system-leveldb)
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service"
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	elog "To have ${PN} automatically use Tor when it's running, be sure your"
+	elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup"
+	elog "correctly, and:"
+	elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group."
+	elog "- Running bitcoind directly: add that user to the 'tor' user group."
+}
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 91b80520930d..6283c9d733c0 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="asm">Enable assembly for optimization</flag>
 		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
+		<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index a7b685c88334..703971029f63 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,3 @@
-AUX ktorrent-5.1.0-cmake-3.11.patch 412 BLAKE2B 4ee01320022113b981ff1a314f8ed73895e0606615a5b91967bc04e72a328554f2345952f8bfd5bb09ff08991657b662f7db6d5a778316fd5ea5f4da1c8aeb1f SHA512 d3c3020407aabf8166ff08a1cce16a20693f273de5a1da5a2c6c21f5359a32799247153ca5d9e22fba45790ffd56b86e53465e2d3d9b0ce986fd896d5eedd63e
-AUX ktorrent-5.1.0-qt-5.11.patch 2249 BLAKE2B f6d27bc5ed7ccb55622412799df823e674b0e11d48a7fe91444e3f652a44fdffa17248e34446a54b197c1b177b333e85beeb73d0c0edcb62add96f7c65b3b98b SHA512 7482a3228794f36e368cf9ddadc9cb57f62cec0b87903a19a67572bc362fd8d63728400ac43626c5acc947b017c9e64886dc7c1ec949fed14a4fca401845b404
 AUX ktorrent-5.1.1-scanfolder-memcorruption.patch 2244 BLAKE2B 53efe0320124f954adff60144981d740e5cdf45ed4712fa43f112bb6133fb24b4303e6f969d9a73598525dea4f6706c22e57d2e5c7378c69e494dd924360a307 SHA512 8d3868a6f75e2f53fa11762378a676736df09e14e6fbde04f0dcfb45eb56e8b739d17b3ea96af4be21edb22edad610982865b33508847f07ac2eba744f62ae5e
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
 EBUILD ktorrent-5.1.1.ebuild 3083 BLAKE2B a0fbf718816b1bf154f01dad9ff914fd7e3c9e1e620be3a825f49d03c3af4600ac5e7413e6b743df3477275e227628bbf999144122da2c20ce96d0753d339649 SHA512 e699da98a02493847f71011008311a37555293e5878986489114b7a1f0999c1a6f1ab76c6874babd9d4ba2adae39b2be880b2eb1a4c3ce4689a91593145f3a09
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
deleted file mode 100644
index c0b9167636a8..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-cmake-3.11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://docs.freebsd.org/cgi/getmsg.cgi?fetch=4423635+0+/usr/local/www/mailindex/archive/2018/svn-ports-all/20180415.svn-ports-all
-
---- ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
-+++ ktorrent-5.1.0/ktorrent/dialogs/torrentcreatordlg.h
-@@ -23,6 +23,8 @@
- #define KT_TORRENTCREATORDLG_HH
- 
- #include <QDialog>
-+#include <QTimer>
-+
- #include "ui_torrentcreatordlg.h"
- #include <torrent/torrentcreator.h>
- 
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
deleted file mode 100644
index f0d69b82c893..000000000000
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 4befccc3d0ebbd9235e6f10d411f139802e3871a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 19:13:26 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: stikonas
-
-Differential Revision: https://phabricator.kde.org/D11456
----
- ktorrent/dialogs/fileselectdlg.cpp | 1 +
- ktorrent/groups/groupview.cpp      | 1 +
- plugins/search/searchprefpage.cpp  | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ktorrent/dialogs/fileselectdlg.cpp b/ktorrent/dialogs/fileselectdlg.cpp
-index 139b4752..ec7d8ede 100644
---- a/ktorrent/dialogs/fileselectdlg.cpp
-+++ b/ktorrent/dialogs/fileselectdlg.cpp
-@@ -20,6 +20,7 @@
- 
- #include "fileselectdlg.h"
- 
-+#include <QButtonGroup>
- #include <QMenu>
- #include <QPushButton>
- #include <QTextCodec>
-diff --git a/ktorrent/groups/groupview.cpp b/ktorrent/groups/groupview.cpp
-index 990ed0d3..76208144 100644
---- a/ktorrent/groups/groupview.cpp
-+++ b/ktorrent/groups/groupview.cpp
-@@ -23,6 +23,7 @@
- #include <QAction>
- #include <QDragEnterEvent>
- #include <QDropEvent>
-+#include <QHeaderView>
- #include <QInputDialog>
- #include <QMenu>
- #include <QTreeWidgetItemIterator>
-diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
-index 667e7a82..4be6cd5c 100644
---- a/plugins/search/searchprefpage.cpp
-+++ b/plugins/search/searchprefpage.cpp
-@@ -21,6 +21,7 @@
- 
- #include "searchprefpage.h"
- 
-+#include <QButtonGroup>
- #include <QCheckBox>
- #include <QFile>
- #include <QInputDialog>
--- 
-2.16.2
-From c66233cd9f5b87f9e265beae0a16839d3a5645a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 4 May 2018 00:33:44 +0200
-Subject: Fix build against Qt 5.11 (missing includes)
-
----
- plugins/syndication/syndicationactivity.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp
-index 61e8039..5736d52 100644
---- a/plugins/syndication/syndicationactivity.cpp
-+++ b/plugins/syndication/syndicationactivity.cpp
-@@ -21,6 +21,7 @@
- #include <QHBoxLayout>
- #include <QInputDialog>
- #include <QToolButton>
-+#include <QAction>
- 
- #include <KMainWindow>
- #include <KMessageBox>
--- 
-cgit v0.11.2
-
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 64b88991f0f8..c260101fcade 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,3 +1,3 @@
 DIST nicotine+-1.4.1.tar.gz 3824830 BLAKE2B def211a4d06b1cb6a409917579652b3a1c8c36ec5ecfe5e295b9fabeaaca02cd4999fd20935c8999d4cf989f3ecff0a0a2c7f52a40f8c2b03e05b6c9dc2feca9 SHA512 894dfb318b205b6be21face0308f183da15772f329158c6a9a8a816dfdf231ad89245188acad5538821b2a778c8a8a6201ce8548cc58550c4eb6c0763db9d66a
-EBUILD nicotine+-1.4.1.ebuild 922 BLAKE2B 3e8ea1376610df02253d6227401a608846f4b5ffe1b9c32e27ccf97c945a1bf8755bc11ebabc180252801e0ef26693b9b0452cbf93f8d17f92da07d164562c79 SHA512 3f6c34a919e632a18a051641879177e5998b2163863be0ea262640a982f48c301d350ad089f892d104e9ada4e3fd313d19f72551e58008644fd08ca20769bee2
+EBUILD nicotine+-1.4.1-r1.ebuild 746 BLAKE2B 48b5e06ac531ff0e3abebeea391e9c6fee9f6a2cbb164ca36c165a4b1905c6f141f407d2f56d0b570f717d29f0288a84d6e82c030c5064a235c2ed347e2049d2 SHA512 b72db2e76e4149e9a3b719c85c38bf7e7d2913da0067cc2d84374d633294575de363805cca072b43f1f3673af03abf9a8cd1a0fab5dbb9486001fc3714cb0f49
 MISC metadata.xml 231 BLAKE2B 075020fec1acfe12f7c59c2c431a1d12da79dff829cd5823023b04a6f3434cba021b3d61d0061f22a38146676cd0c5a20a1fd7e16cdbbd1646fa73f388a10532 SHA512 18d2bbf36b6b85b3abf046081837bb270202adbeb40a2befc5293661b272c87509d0339002f1848cb88d48f240663f118064ae7580a9aa13ddcb04bea857d2c5
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..97f31a510c6b
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nicotine-plus-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
+}
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1.ebuild
deleted file mode 100644
index a6d9d9d6de41..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.4.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=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nicotine-plus-${PV}"
-
-pkg_postinst() {
-	echo
-	elog "You may want to install these packages to add additional features"
-	elog "to Nicotine+:"
-	elog
-	elog "dev-python/geoip-python         Country lookup and flag display"
-	elog "media-libs/mutagen              Media metadata extraction"
-	elog "net-libs/miniupnpc              UPnP portmapping"
-	echo
-}
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 2e93bd336558..edf27961bf4f 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -7,7 +7,9 @@ AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690
 DIST syncthing-0.14.38.tar.gz 8246629 BLAKE2B 93c01750fedd57cc07bffa14fe65d98fc1cf48b43eaf965fc3ff9546a24acada411a89a19b47e2f5b5e7508e57646d0560559c35bb3c378b7c04e3db14b7ffaa SHA512 be5f7527d63e8db427705c34b26d783d9abd7cb5727d3dcf08ee62b1ace5454b7dfed4f030ec53e847a34f560cf349460f68c859a1008c5105aef65ef42c5cc5
 DIST syncthing-0.14.51.tar.gz 10970620 BLAKE2B ba41debaddf217069b47901d0c43f163ff0ae3ca4aadb8689401195cfc9f11a3ed641d2d96a590821adac62d12d0ff83df26a4a336ca09476d755b8230a63c87 SHA512 d670b1df341c8da95d38170e03b40deb19dfcdf0c0df9b4630c74b4fcc979bd9a863c0ca0510e28739bac14b1aad51ce40abe695765186acad78ea0d7eb3a20c
 DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb716be3d252fd677b82e20560f0a2e9eabf513ca7c7acdf4f1a3b4d3d8f6409692df7d2e92b86b1be1753bdd8913e06952 SHA512 cff48ea1d1286c8b1fe971b00423ad64ef10c9b0555f0cae6e008efc07a21698d54d402fe1a0ac3161c0b5180e5ca0099a0a302fd7e7c5da0f227bdb7e2853ce
+DIST syncthing-1.0.0.tar.gz 10601948 BLAKE2B f9b509b78850efb315e33afff49f8468e3ea97a4aac90752e07851604960e817dbdcdb9824f2a6174b1f066ac277a119eea5aff75f6247a43652b70a5ff4f9af SHA512 79adbce03524665d02c1ca772fdf5aca68d9e41ee4bc02bcb9ac6ed0d8dca2fe8582139f52a0fe895ad5eb15c372d686277077ff884b67de1d45419e19407603
 EBUILD syncthing-0.14.38.ebuild 3604 BLAKE2B 60ab7ee9417858f5732a894a19786e66aa875d68d2ae699dba844f0efd8c0db9addd91f88b21c3e54930fc55a14d3545ea65af1c2ed43b26fa1158bfe918f6a8 SHA512 7188b18639c97775e1aad68f8a8aa1e41e95e10855f491bee61aa5898599b34d7cc0c23ea7c585d2a30dcbf1e4f16a7b08b9a5f1fa55064b6e36bb7f35cb73be
 EBUILD syncthing-0.14.51.ebuild 3525 BLAKE2B 9a8bff37b22ba1fa7f90b457f3ddbae39252f188b52bb91d2ecafb8208be83af8e1ffc88e250180793e8126520c9e187602037374d0d76b02a5d9edab8be04dc SHA512 354fd1e41dc6ebd675d162f64ba3054f3ed1eca71343bec1f3ec23e80b1f575b3188d6e5bd574fd14e9a92ecbbbbc70c4c4deca791ad89a1122ccaa434c0ac3e
 EBUILD syncthing-0.14.52.ebuild 3520 BLAKE2B 06bbcffbe0d9d0c1769135c6564c0eee47e68ac1f23a81ea76d0a224598d473571e367e00d97349a501e7417e55a7fba000ae57534b88dfb4174e0e0e7c7e8b3 SHA512 581061000400abbe79abcc94cec13151624835c0622d77056cb9a5d25ca5d143c701b629cedfbb1b7e72602b890bdb32bb7e10623d02d9befe5826bd8eed34ea
+EBUILD syncthing-1.0.0.ebuild 2366 BLAKE2B 281fda4131f5bda2c5631ec2e9dd2a60a9631bd5ea4a6402f157380a08f336f0a577d3221847f693ede53e30e9f57081608f119677c0b668a4b0aaed888953b7 SHA512 539ae3e284be9d757e141f1aa760b2c1a5e34c49e13f0ff417fd4985855807fa2ffe1fbc4312ed8f74d312273a42a2cccdba4d3697f722edb4abf0724ebc7d87
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.0.0.ebuild b/net-p2p/syncthing/syncthing-1.0.0.ebuild
new file mode 100644
index 000000000000..d81107f9c516
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.0.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/${PN}/${PN}"
+
+inherit golang-vcs-snapshot systemd user eapi7-ver
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	if use tools ; then
+		# separate user for the relay server
+		enewgroup strelaysrv
+		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
+		# and his home folder
+		keepdir /var/lib/strelaysrv
+		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 858a504c9717..a3631c010732 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index b52a43b09f3b..569120936b18 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,12 +1,4 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
-DIST epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz 3632456 BLAKE2B d642c494b2a0cb5fa6921541a4d87e6f1110eb71a5e959758d8f29df0d675a5a2586d88cd48bb75cdda4684d67ec78e50da22d892ae4ef380bb960dcf3a7f1aa SHA512 310664c6521ac15418d3f0ac1330c842871e357eff9f83be52a5942c58354b3717bdca7d04b848ef2e7a9be6140dcbd0c485c3a9845833325689686f39d7f743
-DIST epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz 3740610 BLAKE2B 848e4f44e9f86ea568660771f8620d7343293f2efa5e5eb06800b2b833356a65dae53041b8a7a6d8921b0795c42564699e9120405401d3974a5b67862a14d42a SHA512 e78e1a0d9439fc8366d4ee9a001171a09077867f3b07feb5ac2f779ede19432ad232ab96413e6563f7d3c03154ba235cadfe61b354879245ded6d424d435fe24
-DIST epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz 3866776 BLAKE2B 18affa25a78aad2be94b45ee5d81c347397a3c5ae8dbace7c1f34bdd0cdad61e8dcd68f80fc09b20fb347593535bb039083c67a8ea6d34400c96a581d2f236a4 SHA512 b9711dc75c87832b24a6dc2225cd15ca4d68224ce2eaca55312f73e0dcebd3d31af0da1a81672fef003dda1001753d21bc06c92cb70a609effcdc928d8702a1e
 DIST epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz 4402012 BLAKE2B a200ebb94460ff5d6b8731d66ccaa8d7423d8f249871183d3e8e321e2fba84dfca3d72638901c7d81344de8713e765de59ff6e6d579599ec9c565b10bb9e4a0c SHA512 b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1
-DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 BLAKE2B c975d323707027aa36c61a6ec60c4985fee958b433941bf3246dfcd9d50c6fcc61768ee11bbf03fa22e11e295fb514898e898542e34be0876f3d6d84a2f53627 SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da
-EBUILD epson-inkjet-printer-escpr-1.6.10.ebuild 874 BLAKE2B 820e28779c7a403ac9a241c38864d3442f03daae85915a03611de33e0cd65cf6e1451ae3265d1903b9d6f80e174dd8c28c22feed60f52aa9ed7299ab9a1c9eb1 SHA512 a101e2511b97d94a144d0084fbaf56dc38dd8d368645f9aa13909ceb7921e4c080f9bbce3c8643f25a24f6028374cefa64738c55fc7623d4d116c74598a6df35
-EBUILD epson-inkjet-printer-escpr-1.6.15.ebuild 874 BLAKE2B 8a964847e13359295e2d1e1f06434a2f928b3d0bf6729bc370dae536b5938612ca8d6ec0aa9aa0bdd821dc00fcb3d232633778d4a91ce70f7f0eaaac7a23d68c SHA512 230518eaa845205c05c1224cb019481a733e0ebc542565bf44b39e640a8da5a04c87ef261f5758568c12cbddeba4a6326705d898e021dfcd3c3a5c71c3d43a01
-EBUILD epson-inkjet-printer-escpr-1.6.17.ebuild 874 BLAKE2B 9e678564ebfb2cd8d055e1ae3df5ba9b80c5026ac464bd357220e342c07feefa7e077efa55b99458adf3e537609ef04f2e37bff51a2fbd2823be4191d8fe8584 SHA512 b0ef22eda7b576f2e49db3586c2d05f9fc4632fee1d67778a5566d01fe704075de020ac876c6f33217c3467717798b683cbdd9728e5cf1a12ddc9a27a376175a
 EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 870 BLAKE2B 78f09f3ad1f605bbf0ec092241669e2f306c32546820234cf9c1fa624f96e52e8d4a796882bae295ba6eeded4442a692abb19562acd9d7a4225877a5cb5abd78 SHA512 a17cfb20e8c3a948d81ee619983e6963c028a606e5d85171c9aae7845b2642b958b68741f4bacb97ed74a47460bb1dd47cd44438e9e094a9820d4df02fcf2fdd
-EBUILD epson-inkjet-printer-escpr-1.6.5.ebuild 873 BLAKE2B c0589229396d882b9203abcebba3400456e4f79cc828be8231218a3d64984809472b8877f4f76c9556b133dad75cd263ed1482df7dbaaec2822d08917046a64d SHA512 451eb21acdcba8769b398b60ff9a49b5476d45a1c4d2d243f1ef8aed4c38311bb19ceaac256faad4a8a95dc9b2afdfbcd1a589d5e69fbbd750ea78da1c6673f5
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
deleted file mode 100644
index 9f8cb06fcff8..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa620593175010796eecfbfe73cb9a/epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild
deleted file mode 100644
index 58c39a98d244..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.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
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/06/25/43/f63808b4062f7f527e09e75a8f0dd9db46c573fe/epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.ebuild
deleted file mode 100644
index 55e411272651..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.17.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
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/06/66/09/4ac2bf69bb1ddf4a9ad525596615cbb40fe4dad5/epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
deleted file mode 100644
index c978234a9e1a..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/1.6.5-warnings.patch"
-)
-
-src_configure() {
-	econf --disable-shared
-
-	# Makefile calls ls to generate a file list which is included in Makefile.am
-	# Set the collation to C to avoid automake being called automatically
-	unset LC_ALL
-	export LC_COLLATE=C
-}
-
-src_install() {
-	emake -C ppd DESTDIR="${D}" install
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/net-print/epson-inkjet-printer-escpr/metadata.xml b/net-print/epson-inkjet-printer-escpr/metadata.xml
index 7a38bb900964..c6bc2d94015a 100644
--- a/net-print/epson-inkjet-printer-escpr/metadata.xml
+++ b/net-print/epson-inkjet-printer-escpr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 2203e6fa06e0..0fb52817243c 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,4 +1,6 @@
+AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2187 BLAKE2B c2ffaa6080752032849d34eba2d0d8db0195cbcd4ccd6fd1e04d73056cc9f90bb59b0940dd90e3d99b11fe371db1f3c24740070a94c370d4bb50db36c342346a SHA512 99e8c29f6d0e5390386395d36374cfeeac39914a49c4ec511a68e8b3e2a54cc2947010a1a45fc8984e3b4d9ee6aeba19ce9895bc8f30f88ec2f10591031dff47
 EBUILD splix-2.0.0_p20130826.ebuild 2222 BLAKE2B 5954d062804e255f70a3cb11e2cbd79c2cecc1ca85565bcaee31a4925fb13cae61369ea4d20f03748ddb206109287112afd2dbd3da211f1199d297568c9a388b SHA512 2e124078fdde449972d150db2416d177841ec4088b0749a0406ef661f9d56959ea93ec28dfa0903c98f35866a34e72af31f8a764675864c485995e6d85aee327
 MISC metadata.xml 448 BLAKE2B 90ff61ffb785842747851b72263a3be4dc4fe3327450458d670bf2e4f0eea69a1ad3fc65ced40b0cea04542cc72cedeb071796b677af69d9dee7f9408a60fcdd SHA512 0ff863e6a4c76cfd3d027903a438b455a647c840250cd5d317600ea7c1df2b941f9cc61b096dade6f64c7b7ad0b3a1e28e9d3fd5d8c930f15b642e9c2fecdb9d
diff --git a/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch b/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch
new file mode 100644
index 000000000000..e73e6ebbe9fc
--- /dev/null
+++ b/net-print/splix/files/splix-2.0.0_p20130826-algo0x11_le.patch
@@ -0,0 +1,33 @@
+--- splix-2.0.0_p20130826/src/algo0x11.cpp.orig	2018-12-19 20:55:03.216127909 +0100
++++ splix-2.0.0_p20130826/src/algo0x11.cpp	2018-12-19 20:58:21.986353903 +0100
+@@ -89,7 +89,8 @@
+ 
+     // Print the table
+     for (unsigned long i=0; i < TABLE_PTR_SIZE; i++, w += 2) {
+-        *(uint16_t *)(out + w) = (uint16_t)_ptrArray[i];
++        out[w + 0] = (uint8_t)_ptrArray[i];
++        out[w + 1] = (uint8_t)(_ptrArray[i] >> 8);
+         if (_ptrArray[i] > uncompSize)
+             uncompSize = _ptrArray[i];
+     }
+@@ -97,7 +98,10 @@
+     // Print the first uncompressed bytes
+     if (uncompSize > MAX_UNCOMPRESSED_BYTES)
+         uncompSize = MAX_UNCOMPRESSED_BYTES;
+-    *(uint32_t *)out = (uint32_t)uncompSize;
++    out[0] = (uint8_t)uncompSize;
++    out[1] = (uint8_t)(uncompSize >> 8);
++    out[2] = (uint8_t)(uncompSize >> 16);
++    out[3] = (uint8_t)(uncompSize >> 24);
+     for (r=0; r < uncompSize; r++, w++)
+         out[w] = data[r];
+ 
+@@ -234,7 +238,7 @@
+     // Register the result into a band plane
+     plane = new BandPlane();
+     plane->setData(output, outputSize);
+-    plane->setEndian(BandPlane::Dependant);
++    plane->setEndian(BandPlane::LittleEndian);
+     plane->setCompression(0x11);
+ 
+     return plane;
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
new file mode 100644
index 000000000000..f8278234dc38
--- /dev/null
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="http://splix.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+	>=net-print/cups-1.4.0
+	jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-algo0x11_le.patch )
+
+src_prepare() {
+	default
+
+	# Move to correct place
+	mv *.ppd ppd/
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die
+	# Correct link comand
+	sed -e "s/g++/$\{LINKER\}/" -i rules.mk \
+		|| die
+}
+
+src_compile() {
+	local options="MODE=optimized"
+	use jbig || options="${options} DISABLE_JBIG=1"
+	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
+		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	gzip "${ED}"/$(cups-config --datadir)/model/*/*.ppd || die
+
+	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
+	# Add symlinks for xerox and dell models (installed in samsung)
+	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/xerox
+	dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/dell
+}
+
+pkg_postinst() {
+	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
+	ewarn "for actually installed printers are updated if you upgraded"
+	ewarn "from a previous version of splix!"
+	ewarn "Otherwise you will be unable to print (your printer might"
+	ewarn "spit out blank pages etc.)."
+	ewarn "To do that, simply delete the corresponding PPD file in"
+	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
+	ewarn "corresponding printer in the CUPS webinterface (usually"
+	ewarn "reachable via http://localhost:631/) and choose the correct"
+	ewarn "printer make and model, for example:"
+	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9ff83ba35da1..044c94c33531 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4bfe4d5454f2..bcc315f2d322 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,10 +9,10 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.15.tar.gz 2076583 BLAKE2B 33ea8bfc42a63da08271d875032073d57ebaa22688cf19b3b83e4a1d00218a439b3275260d618557f879e364fc72917fa940a2d3cca44285da1e531440737c7c SHA512 425e1f3a9ab2c2d09934c5d783ad986bd61a638ba6466dd15c20c5b6e7fc3dfad7c398e10bbd336a856ccad29bab0f23e4b9c3d0f17a54b86c8b917e4b974bcb
+DIST haproxy-1.8.17.tar.gz 2077525 BLAKE2B b4419d541a82399995df448410a8756301ad561001bfe45cfa1c21f6f01bfadb51bb58aeda2e8e34f0580356c8ca136568fd8f2d86507a88e3cd84924b861d5c SHA512 0887d5d84c2cce9355fae032ba82e4b7b94c89d3053f209046a555101b5750c10b51feb38fd14245f806fb4f50ec1dcdf2b23b4f80578abd4a27693fc29b91b1
 DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
-DIST haproxy-1.9.0.tar.gz 2325893 BLAKE2B bd837f72863c7d428b1c2427a2826ff486af2aa3ffb453be4d93eb0bcc46805de9b3b79df90b6594a0eab4295a1a1380d5c25166632d6268c9e8e2be57b2d55f SHA512 e83c6ccb54f8ce5d45817ffb8fe0bf4ea959988acbc1e45da9d32870bae1eb25f7fd85cb6c0507c2adc5dc0c7aa42de204e711c442b56fbd2dc642788b41bfce
+DIST haproxy-1.9.1.tar.gz 2336844 BLAKE2B 8a01a9cc6994c9fa99e0d8ccbcf4a7b65efb964bbbcea2d706fa39efb44590f3bf1fc458e52a5946a7e4953548f7dbd3bbd1bf8ec2fa3fa5c48dda2e72a6b516 SHA512 f621fd80a0b923133b0e1fe92c0a286a2cde29c0f55c0ee82bb4bb6a0cda40213289d5bb7102376b0ad390e9e26f959644fbea596ace8b9bcb10292011b92bf5
 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
@@ -20,9 +20,9 @@ EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.15.ebuild 4886 BLAKE2B de3d4a728a6ebc7d0aa7861982921a6de7ee412efcf819df59f7f63872866a848c395af26b5bfbfa2b29ef3969e60306ccb6a0c2c93bcbd7cdce1df976ab2c31 SHA512 6a9fc1b8200c62be0d271e4ba5d293c07fb872d4832a2d7ff743ed7b2c21995adb2007295dcf3653cd75e5af724bf9f184ae32ae132c88f8e8dd18dfc273c3b8
+EBUILD haproxy-1.8.17.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
-EBUILD haproxy-1.9.0.ebuild 4999 BLAKE2B 31f594dcff77ab7c263f4abf8475da04fa02bffe98ba3e491efce6000e4e8d9689326cf3e189428b1854702e2084b415a1ac6ee9f420686cc520a20736550416 SHA512 e64a65817ebe35d9bf5f045de9c18eccd8852dd7673d4c554caa8f595803f404e7d007f860c6b8dea296e0c074d8e6dcf7b403edc68043d3a854975b78ba60ed
+EBUILD haproxy-1.9.1.ebuild 4999 BLAKE2B 068dd442f30c7b815164143fbc33a7bd390d0684a68b3096dde76b31e68cccf662a33589180a81006794e1e0a477dbb6ec9c62faa002ec56beda02bc0d3b062e SHA512 56bd202b4c16c9ddd2e2aa13eeb953e5a00b3975e5427ba7d02db2d78ab7f71857a13b3122cae77fc3b7c33cb58c12a48220b408ebca57622f47b7d497395aff
 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.8.15.ebuild b/net-proxy/haproxy/haproxy-1.8.15.ebuild
deleted file mode 100644
index 5e9022d20eb6..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.15.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.17.ebuild b/net-proxy/haproxy/haproxy-1.8.17.ebuild
new file mode 100644
index 000000000000..be9a23a9cd27
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.17.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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.9.0.ebuild b/net-proxy/haproxy/haproxy-1.9.0.ebuild
deleted file mode 100644
index 924a1c8d2855..000000000000
--- a/net-proxy/haproxy/haproxy-1.9.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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=(
-		V=1
-		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
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" 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.9.1.ebuild b/net-proxy/haproxy/haproxy-1.9.1.ebuild
new file mode 100644
index 000000000000..2212a12930ac
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.9.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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=(
+		V=1
+		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
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" 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 81b844cda64e..691c177c5a1d 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 3a8638d403a8..0d45e9e3a9ba 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,3 +1,5 @@
 DIST openfortivpn-1.7.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
+DIST openfortivpn-1.8.1.tar.gz 70521 BLAKE2B 5451ab9937e0f6ba1c2601f9ad8a44d5b9954b9798f4a4aa81675d561f5aa95890946a5623af9a57db6e20fe074e65b0578655ca538c20751e7e1363df01ab68 SHA512 0c2f26e744c266125bf35a643bc2510d782c9c7b4e3324cef53cc7e9a350df3c968c4d0d34256a64cf6b7d1cad2ffc95019a39586786238481dda20030e524a9
 EBUILD openfortivpn-1.7.1.ebuild 766 BLAKE2B 59675dd6afd568ef60fc345e96c401e462063bb570c4e5c094c4a2c5f4061e862e6b185763af143d34a79d817fbe61ff1783180a981611e9405875c19d8bbece SHA512 19abaec0e7981787d4f2995bfe905a0d24643d17cfdb651dec7d2dc4be2c80af6042876ef06d5196c953d3209c90bd8d9bea2650bfab650d2608609d211bd048
+EBUILD openfortivpn-1.8.1.ebuild 764 BLAKE2B 41d9b1a2d531317f54089e0cab337c50480b0698b55ecc81bf685084ff626bc79532415735d00a431e73c078b70746e14ddeb154fe69a750d7c0169bbb115537 SHA512 9ca560c229901eb4919265cabef86e7dfe106bd4ff7c7b9d4e2cb2fd79ff468d69e66c5c81abb142bc274bdfcbeea0d48b5583268b3395f289680b869df27896
 MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.8.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.8.1.ebuild
new file mode 100644
index 000000000000..a0280e748daa
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="A Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl"
+
+DEPEND="
+	net-dialup/ppp
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/net-vpn/peervpn/Manifest b/net-vpn/peervpn/Manifest
index 552e542da8b2..2a3933563445 100644
--- a/net-vpn/peervpn/Manifest
+++ b/net-vpn/peervpn/Manifest
@@ -3,5 +3,5 @@ AUX peervpn.initd 590 BLAKE2B 39a2ec06a71eb99de9a37cd42b05c63fd07af042b8b48652e0
 AUX peervpn.logrotated 87 BLAKE2B c6b72aed372a87d766a9ba0e69b48929fd2484743c5576f9d87333be3a241479794f83d201e366483dee30aee48a4e5a2ad9fb7e6864f84bb9e4b47556dfaf67 SHA512 474d2cd0c92786d5b7b45604a235a9102197e9e3520c812db86c1183bc0ab0963dbbb538ff684a44bc47184eb3e87d77e6b2ddab72c52fccca529cc16f56f515
 AUX peervpn.service 256 BLAKE2B 51abeea30d4ebe81a7b9acf1ae0e5e8b65ddcaedd4ae2c3f0e6ab3e4524d75d9848328bfed737f8b39effeedd68e7d7ed9f1376ac144ae27c4d77b0603fdd496 SHA512 d2d7336ed77324f30d3a4d83fe47b43bbafc3340525eac862bd7637e3a72a70dba1dc9ea21ed59e1606c8d1c03c3ee5ab9da73b49e71cf70e536369ae9ecf01c
 DIST peervpn-0.044.tar.gz 81948 BLAKE2B 7fcf4805846b304c8d26ab06a5f56fa7aa281eab05860f192e635ba12173954cd00502328239771b1882b0b74c8f24f796c51e86fd5d39765f51d2aa26953c6b SHA512 5dd8e056287a905f3aaddf93d6dad917047e6f7da30942f412ff7b2846afd26fb9f4e500cfcb76966b4045db2a37096f1aa43b87e777ff31c2e467aa0415cdba
-EBUILD peervpn-0.044-r4.ebuild 1558 BLAKE2B a849f1798af145411c013c109d22136aab817595e18debde9d033a5b840c815e37e3edccfe12f7e5d1eb873dcf5f03fed1c6793eb23bab522b1a86f2373cc426 SHA512 0e01fc7243e8e72bf0b5c5b302393f4f94df658ace1fdd3b30263a7d12ca2392264d8d4d89c3c8540a72cf71531156340e924ce65ee04c0a792d3fbf593854a8
+EBUILD peervpn-0.044-r4.ebuild 1619 BLAKE2B de958f6ac15ad86d1d2d6eb08279870cc9c4734eae7605b8798a1ed2d5c2c0193677992231665f8e642d37bac787aaf3259b85c935c3940e7cd6b5c99e72585d SHA512 d089006990668c5203c75e9caf4c6d2138b1f8bddb9049ceae19aa449dc25d9d66f9f55678b76930498f0ca0f5a989f568866b212f53850fd9d2b4f1b63e8f82
 MISC metadata.xml 306 BLAKE2B 23943cc835dbc20f40533bd627de75557c7995bb72195979385903e53834c0961fd4b3e0346aabf10020aa9df18a619e138a1504e9e1f1614fda1a840a0d0f1e SHA512 29286f5271bd2e6cb8aa39d626bc581cdfce7206e3a76e964418b460c20ab844e096a009db6c3ef1f3bc09f56622a2e388bce8aeeedd3be65d936e244915a7db
diff --git a/net-vpn/peervpn/peervpn-0.044-r4.ebuild b/net-vpn/peervpn/peervpn-0.044-r4.ebuild
index 27b19165e236..7d270551df87 100644
--- a/net-vpn/peervpn/peervpn-0.044-r4.ebuild
+++ b/net-vpn/peervpn/peervpn-0.044-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/peervpn/peervpn/archive/${EGIT_COMMIT}.tar.gz -> ${P
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/openssl:0="
+IUSE="libressl"
+RDEPEND="libressl? ( dev-libs/libressl:0= )
+	!libressl? ( <dev-libs/openssl-1.1:0= )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-${EGIT_COMMIT}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index f2fcf9d1e77d..e05f1e3fcf6a 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,4 +1,6 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
 DIST strongswan-5.7.1.tar.bz2 4967533 BLAKE2B e438d1b44a997eb0e012586b18604bd35ac6f53cce1c34ff89192a760bbd0d6a9aaa7b90b389ff1a5e7c6d2356ff5cc74b40daad1d6579fa5026f4878489bf66 SHA512 43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f698f5f5544b9ca563554a344638c953525b0e2d39bc6b71b19055c80e07fc
+DIST strongswan-5.7.2.tar.bz2 4997818 BLAKE2B e5a160ea8d31ae14c9731e414e42653ecb12f259fbe76ec7289f44afe5687f4123d89750a8f57c9ea006aec7f0be28e0f0c56d6c0a4bc96f0e1ba69c29da904f SHA512 e2169dbbc0c03737e34af90d7bc07e444408c5e2ac1f81764eeccbac8b142b984ce9ed512a89071075a930e0997632267f6912aa5b352eee2edbd551b5a64e7e
 EBUILD strongswan-5.7.1.ebuild 9426 BLAKE2B 48d770e14d7e08bd9baf7294fa3b8ffbdaff26347918a2b411dd2b958a71fdc20379d8659fee066d9d01a3680dbd040fa9421d9483a542b3c690792b12e70964 SHA512 412a269f27723601813d8145bbc2263bf627298197e8c50a76368e07530c04799c6149976c424ceddd6ccd48eee8b39ae845c8bec1100598c1a40b4bff9c478b
+EBUILD strongswan-5.7.2.ebuild 9453 BLAKE2B e8c8916604c542a697ba41169933c5b1c49d954915229ffb8b8cd1733b85b62e59af0d2085e86c8e541a580c1a6b42feb2a127a6e2ecf72de9fccc11f3857131 SHA512 966c38333a071bd7cf1d120095e3343c541faf46c27b3747fb41ece3ca9f6d5b03f60d7363a3e64c51a8533b6e7452793b8dfd5f1dac2da0a5a19050883c0ad3
 MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/strongswan-5.7.2.ebuild b/net-vpn/strongswan/strongswan-5.7.2.ebuild
new file mode 100644
index 000000000000..39fbb0f18efd
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.7.2.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="aesni blowfish ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+	gmp? ( >=dev-libs/gmp-4.1.5:= )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
+	mysql? ( dev-db/mysql-connector-c:= )
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	systemd? ( sys-apps/systemd )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-vpn/libreswan
+	selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+
+	if use non-root; then
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap eap-ttls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable eap eap-dynamic) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		$(use_enable systemd) \
+		$(use_with caps capabilities libcap) \
+		--with-piddir=/run \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO || die
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-vpn/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+		elog "but also a few to the IKEv2 daemon 'charon'."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+		elog
+		elog "pluto uses a helper script by default to insert/remove routing and"
+		elog "policy rules upon connection start/stop which requires superuser"
+		elog "privileges. charon in contrast does this internally and can do so"
+		elog "even with reduced (user) privileges."
+		elog
+		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+		elog "script to pluto or charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 7b51121327f6..91497f990a8e 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,7 +5,7 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
 AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 DIST tor-0.3.4.9.tar.gz 6695931 BLAKE2B ebfe0f49ae923e63b0bd8a7cafc453d7b0775cbfd167463b364490faf9bbf61decd28906d8f5bb08bfa9a5a10b371d9188a5019314c0de5ace15cc379347f88e SHA512 cc254a2cc2f21b4511e9cb215ba5f05fefc4dceffcf46a402efa2d3540872a4ed8e0095245df0802ea12c1367451bc16ca60c0aea6a77e2139580f3c5ba8c02f
-DIST tor-0.3.5.6-rc.tar.gz 6917906 BLAKE2B 55675cbeeff30c92c6c171ba945fa9a1b4ca2a083362dbeb76386b17569c952acefad2a3c474d05be114d22868bfc18ee425176e54aa28ce6e9245f0cc014d38 SHA512 3767a5fb3dd7a566facb36553367fc4ed99b82755613c0ae9229bb0de61cf09e0b794dc915cb82b38123c9ca52dd14d4a36bd49d9f1f3051aa36369ac45b730d
+DIST tor-0.3.5.7.tar.gz 6934521 BLAKE2B 3af9a1a14fa5ea7ce0a5be08db3e2cbe4188d569bda92c7a24a66f94d79869acfd1ba9e1c51bfb0ac3f6399d79b907888d1546ba7898af9563d65f5288c09577 SHA512 e3a7be620c228c3bc73ea9350a19abecb0ac6dae2b309d6233151ab2377c754110a9854d8d221f380f80cffa2f723d266bd09b3432ae33c319c0fe9a7e538bc9
 EBUILD tor-0.3.4.9.ebuild 2198 BLAKE2B 6c350a8532cee3ffb1be3cbd33d1d98fc39b75c79772f8cff00b9a9db1bcc40003f47ac5f429ee4e616075c7138b46be29227970abbcc0ad1be77c464dc14597 SHA512 9d5600ebc92dd36acd25beb0eac0c709557b3709897afeb738461a21a82ab5dd82ac46e78d6cc0a32f8954b800584db42b3bc23fc79df80ee702d2a4b654bf40
-EBUILD tor-0.3.5.6_rc.ebuild 2181 BLAKE2B e65939c84bf205ea13500ee921724db11064a4aade605a9a6fd71ff4294927bceac1d2148eb77821a678c369318f6ce03666ec5b503aabaf87108dc8fd01704b SHA512 4a1e55cc587658858d4156181336a3962904a1ee5f89e8e31dec37eacf6d9217f604c5221c05d756213c5e31fa34957c452bdce8993379558b21045a45e1d61c
+EBUILD tor-0.3.5.7.ebuild 2181 BLAKE2B 9b8b749f90bb158be68c7c761c34fca32cd940e2b6ddd50e7d19f2391b755f673ffe37eeb424341ed2eb2398686d86841edb95a7cfa30116a0a5e92f0869dac1 SHA512 7d48e5fe58616498433de8cfc9b32129f498ba46c325eb3d778acd8412cfdc86bbd6507b2e8928030a99dce636921a2edf0377d46b1c28b3441d1b9bddf64412
 MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.5.6_rc.ebuild b/net-vpn/tor/tor-0.3.5.6_rc.ebuild
deleted file mode 100644
index c6f1f5f1020a..000000000000
--- a/net-vpn/tor/tor-0.3.5.6_rc.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic readme.gentoo-r1 systemd user
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
-	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
-
-DEPEND="
-	app-text/asciidoc
-	dev-libs/libevent[ssl]
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	lzma? ( app-arch/xz-utils )
-	scrypt? ( app-crypt/libscrypt )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd )
-	zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
-	export ac_cv_lib_cap_cap_init=$(usex caps)
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-system-torrc \
-		--enable-asciidoc \
-		--disable-android \
-		--disable-libfuzzer \
-		--disable-module-dirauth \
-		--enable-pic \
-		--disable-rust \
-		--disable-restart-debugging \
-		--disable-zstd-advanced-apis  \
-		$(use_enable lzma) \
-		$(use_enable scrypt libscrypt) \
-		$(use_enable seccomp) \
-		$(use_enable systemd) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable test unittests) \
-		$(use_enable test coverage) \
-		$(use_enable zstd)
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r8 tor
-	systemd_dounit contrib/dist/tor.service
-
-	keepdir /var/lib/tor
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.5.7.ebuild b/net-vpn/tor/tor-0.3.5.7.ebuild
new file mode 100644
index 000000000000..2e27b784b6bc
--- /dev/null
+++ b/net-vpn/tor/tor-0.3.5.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic readme.gentoo-r1 systemd user
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test zstd"
+
+DEPEND="
+	app-text/asciidoc
+	dev-libs/libevent[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
+)
+
+DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_configure() {
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-system-torrc \
+		--enable-asciidoc \
+		--disable-android \
+		--disable-libfuzzer \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-rust \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r8 tor
+	systemd_dounit contrib/dist/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r1 torrc
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 307492e91363..1a48e5db26f1 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 4b56e8cb647a..2b45faaf0712 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,6 +9,6 @@ AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e59907
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.49-r1.ebuild 8102 BLAKE2B 92d5688a2b0c476e2ca5767faec68442f8624b482f407db1af683d812e51149e6d8c1fe943b54c31e83227b3819b0d89ea3866a67b27ef5dd3cde27c942609a1 SHA512 20eaed74b8c10cce8dbd116c6be91c2d32f239c7e9fb9a04098e1f16e5a43f85916b9d6567abed9804bca50879ca080d4e9c6abdf45eaa5fb354effe4ca16ea0
-EBUILD bluez-5.50-r1.ebuild 8020 BLAKE2B ccb6db9b2d08f33bb836dc61c1c931de97d3e3f81c1979e2bdc7cf7b5666ebf509d0be426105c974e9e13d74efa5558a91a3ac91e873c4849449b58dadf800a6 SHA512 13b316f7482094a6334e43bb15b9b513b14ff1e67f600d34cb63b57a08113e826118a6152f24132250e08da3be0f056e46913ecda77ff87b240d091fa91b425e
+EBUILD bluez-5.50-r1.ebuild 8018 BLAKE2B ce87ba452cc7c7cacd606a3f9330f356d530a6e776dadde432c5c58e5aa20109eacdc51b36b50b29fd17849c0742ee2c4a3fa72470dde4bbfc8b198500a3bb67 SHA512 9b3ca79b3d2761129ee8c2ee6099ec402e4923808415e9307ad3586c38648679d0f4a4db459d39738e05ac4d37ae58e054f9a6479432bffa9aa401e11ce8ace4
 EBUILD bluez-5.50.ebuild 8034 BLAKE2B 40c26daeb9815f19adbe23cf616d5e55f9df5808c8bb953e020c084f96102b8e0ffeb70d0a1ce455b3c138e94b0cea283150a55cdf6c214dc688e22715fc6484 SHA512 11cd1e2e38c6facf7f9c7a973225eec7b5f811b16713cd0a832cf12f151da4c37b9ae032dae21359c2060e14eedc8edfeac40d3bfd7ff14d4573bb479252d276
 MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50-r1.ebuild b/net-wireless/bluez/bluez-5.50-r1.ebuild
index b43d92b93713..176d40c87d0c 100644
--- a/net-wireless/bluez/bluez-5.50-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="alsa btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index d9c6cad8e4b6..ba2075822728 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,4 +1,5 @@
+AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
-EBUILD gqrx-2.11.5.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
+EBUILD gqrx-2.11.5-r1.ebuild 1459 BLAKE2B eb187a1ae71a56d79159e3aaf6b15ccc48d81e372b665db9eec4573fbce301cb184fbc3091715fcb9b74c9d285c93c994d4b448d268ad50a00f0e31ae9936c91 SHA512 889b96b65b854bd48949298bb2739b684b1f3db1db6c37e04653afbc1de1af5536967b002fc5145a23059ba19f9c2faa76b43eb980168f397664975d089e28c8
 EBUILD gqrx-9999.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
new file mode 100644
index 000000000000..76cc7e5dffae
--- /dev/null
+++ b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
@@ -0,0 +1,31 @@
+diff --git a/src/qtgui/ioconfig.cpp b/src/qtgui/ioconfig.cpp
+index e4fdd8f..ad072a1 100644
+--- a/src/qtgui/ioconfig.cpp
++++ b/src/qtgui/ioconfig.cpp
+@@ -384,8 +384,6 @@ void CIoConfig::updateInputSampleRates(int rate)
+     }
+     else if (ui->inDevEdit->text().contains("bladerf"))
+     {
+-        if (rate > 0)
+-            ui->inSrCombo->addItem(QString("%1").arg(rate));
+         ui->inSrCombo->addItem("160000");
+         ui->inSrCombo->addItem("250000");
+         ui->inSrCombo->addItem("500000");
+@@ -400,6 +398,17 @@ void CIoConfig::updateInputSampleRates(int rate)
+         ui->inSrCombo->addItem("30000000");
+         ui->inSrCombo->addItem("35000000");
+         ui->inSrCombo->addItem("40000000");
++        ui->inSrCombo->addItem("45000000");
++        ui->inSrCombo->addItem("50000000");
++        ui->inSrCombo->addItem("55000000");
++        ui->inSrCombo->addItem("60000000");
++        if (rate > 0)
++        {
++            ui->inSrCombo->insertItem(0, QString("%1").arg(rate));
++            ui->inSrCombo->setCurrentIndex(0);
++        }
++        else
++            ui->inSrCombo->setCurrentIndex(5); // select 5 MHz
+     }
+     else if (ui->inDevEdit->text().contains("sdr-iq"))
+     {
diff --git a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
new file mode 100644
index 000000000000..827cbf70e3de
--- /dev/null
+++ b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
+HOMEPAGE="http://gqrx.dk/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gr-audio portaudio pulseaudio"
+REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
+
+DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
+	>=net-wireless/gr-osmosdr-0.1.0:=
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	pulseaudio? ( media-sound/pulseaudio:= )
+	portaudio? ( media-libs/portaudio:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
+	fi
+	PATCHES=( "${FILESDIR}/gqrx-bladerf-samplerate.patch" )
+	cmake-utils_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	if use pulseaudio; then
+		LINUX_AUDIO_BACKEND=Pulseaudio
+	elif use portaudio; then
+		LINUX_AUDIO_BACKEND=Portaudio
+	elif use gr-audio; then
+		LINUX_AUDIO_BACKEND=Gr-audio
+	fi
+
+	local mycmakeargs=(
+		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/gqrx
+}
diff --git a/net-wireless/gqrx/gqrx-2.11.5.ebuild b/net-wireless/gqrx/gqrx-2.11.5.ebuild
deleted file mode 100644
index b9b3d7bb2cf0..000000000000
--- a/net-wireless/gqrx/gqrx-2.11.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="http://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
-	>=net-wireless/gr-osmosdr-0.1.0:=
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	pulseaudio? ( media-sound/pulseaudio:= )
-	portaudio? ( media-libs/portaudio:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use pulseaudio; then
-		LINUX_AUDIO_BACKEND=Pulseaudio
-	elif use portaudio; then
-		LINUX_AUDIO_BACKEND=Portaudio
-	elif use gr-audio; then
-		LINUX_AUDIO_BACKEND=Gr-audio
-	fi
-
-	local mycmakeargs=(
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
-	)
-	cmake-utils_src_configure
-}
-
-src_prepare() {
-	if use !pulseaudio; then
-		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
-	fi
-	cmake-utils_src_prepare
-	eapply_user
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/gqrx
-}
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index 3ae1eec3c096..8a90fef8c37b 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 902 BLAKE2B fa2417bfde40f6dada0c233b14aba231ffdc89b015fcc9bf3a2542feb39ace13491a5f250ccb701d68c45c51a0ece2836bc1a5fca755eed2ec254b276c0f163a SHA512 3995a239bf3020ed4038e72716482f8ae6c22f78bb08a4e711fc0019f07c3937d94510dfe3b6e566c90c86d2ecdd216f7086ae3c824a3c36fa075a2696fe186c
+EBUILD gr-air-modes-9999.ebuild 955 BLAKE2B 30e10b44fdda43260d3f0485145242f0965f49fa2dac26b76ee372e287e618680698b245700e93037154b96cac4639b83d9bf33b8e1d4c57e7b5f69ed86c33a4 SHA512 e9a225070a96f6da61748f98fc839e59fb0eeabd0a8e76313db7dfe5743fc77773b166fd90a0e49858ad617bb906b31472471f842f38e09100ac79082f939f2f
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index fe5fbccf4407..4c1532789714 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -1,38 +1,46 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 cmake-utils git-r3
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bistromath/gr-air-modes.git"
+	EGIT_BRANCH="master"
+else
+	KEYWORDS=""
+fi
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="This module implements a complete Mode S and ADS-B receiver for Gnuradio"
 HOMEPAGE="https://www.cgran.org/wiki/gr-air-modes"
 
-EGIT_REPO_URI="https://github.com/bistromath/gr-air-modes.git"
-EGIT_BRANCH="master"
-
-KEYWORDS=""
-
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="rtlsdr fgfs uhd"
-DEPEND=">=net-wireless/gnuradio-3.7.0:=
-	net-wireless/gr-osmosdr
+IUSE="fgfs rtlsdr uhd"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
 	dev-python/pyzmq[${PYTHON_USEDEP}]
-	fgfs? ( sci-libs/scipy
-		games-simulation/flightgear )
+	>=net-wireless/gnuradio-3.7.0:=
+	net-wireless/gr-osmosdr
+	fgfs? (
+		games-simulation/flightgear
+		sci-libs/scipy
+	)
 	rtlsdr? ( net-wireless/rtl-sdr )
 	uhd? ( >=net-wireless/uhd-3.4.0 )
-	${PYTHON_DEPS}"
+"
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_compile() {
 	cmake-utils_src_compile -j1
 }
 
 src_install() {
 	cmake-utils_src_install
-	python_fix_shebang "${ED}"usr/bin
+	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-wireless/gr-baz/Manifest b/net-wireless/gr-baz/Manifest
index f1aee5a0da60..ffec431dd7be 100644
--- a/net-wireless/gr-baz/Manifest
+++ b/net-wireless/gr-baz/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-baz-9999.ebuild 911 BLAKE2B ff50b3772c17e2ba9035c017484fbf5de30356698f4251e9cd0aba06e6b88a2613eb4c49f41cc1d944e2ec16ae20c421740dd43775e9ce5405f429eea0c4ce56 SHA512 230953a9f94a143f2f27a56fe0c95b82150f97e1ae250bb0377e57f3f2f58cf50d2d0409fb673c93278f60fe0d450b7e931a6b087b73e4ddbe819e3acafdd75e
+EBUILD gr-baz-9999.ebuild 968 BLAKE2B 80c60da9adf5d94f128a2073f7c0abebe7b434f763501b768df3aafa0b5f5d33e15e79bc5438082b40afc9a8f205cbbbd3dde3dda908ee3bc17b2553e01a21ac SHA512 0e1a893b9761203954c70e1621f57ef61ec2c03b66f7d9909b44f795e2395cd7d8667563c35c57763def795b7b157d6a9fbf8963d788a1dac8caa0279e877be7
 MISC metadata.xml 522 BLAKE2B 6f6257b56aebf6189db585f5bdb502d59950c416bf7f06b0f5f2a71520fb32360d4c427c7284e1d7b5f66a886d045304a47e89fbb28dd1676a2eb53d2ce0f166 SHA512 2d5ba9656be7bb652bd96331027dda5bd4d963e949ed1ef24dae55e8945ac9dfc3863fd2a223f47dadd5731475433cf2b1018d7390a47bdd8725a8907a173c64
diff --git a/net-wireless/gr-baz/gr-baz-9999.ebuild b/net-wireless/gr-baz/gr-baz-9999.ebuild
index 96b816847e01..e43cd434a9af 100644
--- a/net-wireless/gr-baz/gr-baz-9999.ebuild
+++ b/net-wireless/gr-baz/gr-baz-9999.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils git-r3 python-single-r1
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/balint256/gr-baz.git"
+else
+	KEYWORDS=""
+fi
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="Gnuradio baz"
-HOMEPAGE="http://wiki.spench.net/wiki/Gr-baz"
-EGIT_REPO_URI="https://github.com/balint256/gr-baz.git"
+HOMEPAGE="https://wiki.spench.net/wiki/Gr-baz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="armadillo doc rtlsdr uhd"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="dev-libs/boost[threads,${PYTHON_USEDEP}]
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[threads,${PYTHON_USEDEP}]
 	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
 	armadillo? ( sci-libs/armadillo )
 	rtlsdr? ( virtual/libusb:1 )
 	uhd? ( net-wireless/uhd[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
+"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-foo/Manifest b/net-wireless/gr-foo/Manifest
index a26ff8d21ebb..856fead7a44e 100644
--- a/net-wireless/gr-foo/Manifest
+++ b/net-wireless/gr-foo/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-foo-9999.ebuild 1146 BLAKE2B 593408677050e028dd29997633a20eb4b3abb45d3396e88665d1ae0c64613450d1b4cd5af2ed9d05d4d0a22dfef1112308f55ba3aaefb0d67f05f9fc30d3574d SHA512 09da2ac9283c450476bde6b9549dee6b6417318993082a372ba475c04f58037b598167580c9c223a18747db1554fb113b7ccac8cbec6065a1651afc5f2ab05f9
+EBUILD gr-foo-9999.ebuild 1169 BLAKE2B 9ee12e7c3c8721cc2f36a0a2f8cfdee5aa429cb9694c751e2080a97c11f510ac8dd1f479e7e790cd6397a7099d13ae4610b23d5dda029e98b00fc4a4d41c22c9 SHA512 e0fce7665744039b6cf25626ad148d91b1ab4e3e0c8eec368700048312eb0a57a75005446cb80a1b7fd4eeffcbd03cf1193fc3957d096008a8c6e7d70ca0f3fe
 MISC metadata.xml 317 BLAKE2B a600d3d673f37d66dbb32b1480bc115a246665dc69ef42a9e7ea144bc9145b23fd01eae793a313e7f6ccba4d072e80b97430f3dfa4937ed606716cd4519eee66 SHA512 4a8573f02b2807a76df349c29d61cf6d64631dac6fa13a86579b8df9ccba8abe379168e47eef796b02cf6b93765ae4826c25189c3f012105e8d949a939c966f1
diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild
index 79a25cbde951..b54cc9402c9a 100644
--- a/net-wireless/gr-foo/gr-foo-9999.ebuild
+++ b/net-wireless/gr-foo/gr-foo-9999.ebuild
@@ -1,45 +1,46 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
+EAPI=7
 
-DESCRIPTION="Some GNU Radio blocks that bastianbl uses"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bastibl/gr-foo.git"
+else
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
 fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Some GNU Radio blocks that bastianbl uses"
+HOMEPAGE="https://github.com/rftap/gr-rftap"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
 	net-wireless/uhd:=[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
+"
 DEPEND="${RDEPEND}
-	dev-lang/swig:0"
+	dev-lang/swig:0
+"
 #cppunit is listed in cmake, but only needed for tests and there are no tests
 #	dev-util/cppunit"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_prepare() {
+	cmake-utils_src_prepare
 	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index dc30ad6f009f..fb00a4479a40 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-paint-9999.ebuild 878 BLAKE2B 188bd0bc3092595b0504c2e8a2490ef80904618a3ddf4cc81a304e0ce91f96ab8b863c78720dd679abf27c241ecd34f0458a52a181cad5be35975f48446fee4c SHA512 88cf4700637072c7a7d403b8546e7cc4bafa73f5669fe39216347a16093409aad80ca754d2c22403430f70b587c3d28d20745882da1166f41757a2466b1bb522
+EBUILD gr-paint-9999.ebuild 874 BLAKE2B 440d2408d8e996fb0c26dfd4416e1770ea0cb148e6b969e9b4aedbd988dec9e1347013c9f4a8f7f84ec1d231f957cd8d7b857ded4ca157dc9e87e2b64d048368 SHA512 810adbbcf95402e41f269864b66b067a4ffaf5be74d9f34cfd329ed2487ccddd6187ea88bb85761006cf52359ba170be69a7056adc19a9cc79ab0a78541d0311
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index 730dd1b13717..e61888f8ab75 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit git-r3
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
+else
+	KEYWORDS=""
+fi
 inherit cmake-utils python-single-r1
 
-DESCRIPTION="paints monochrome images into the waterfall of a receiver"
+DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
 HOMEPAGE="https://github.com/drmpeg/gr-paint"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="${PYTHON_DEPS}
-		net-wireless/gnuradio:=[${PYTHON_USEDEP}]
-		dev-libs/boost:=[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/imagemagick"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	dev-util/cppunit
+DEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[${PYTHON_USEDEP}]
+	net-wireless/gnuradio:=[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick
+"
+BDEPEND="
 	dev-lang/swig
-	doc? ( app-doc/doxygen )"
+	dev-util/cppunit
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 
 src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable doc DOXYGEN)
+	local mycmakeargs=(
+		-DENABLE_DOXYGEN=$(usex doc)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	cmake-utils_src_configure
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index f5364d0378b1..dab672fbd635 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rds-9999.ebuild 1086 BLAKE2B 443adb1063b0fb018e63b07371249ef725d08253ee9e451f073202f17fecedf905d4052d18c93964db8a2d377d16db75ba6aeb8fbbd22b6d54c8985324a3cc75 SHA512 520131d597d81f24f5f3c29cedeafef1c7a6cb3aec61db8a9fa036c6a5272ace4b5a98c115dbaf0762a4b72b2f2a2a89e382da395deaecb00f426404c0fc5194
+EBUILD gr-rds-9999.ebuild 1121 BLAKE2B 1e99aa7d84a20395e619fa2bacf0a9b0ae5ec7631eb63c6961cc9faea51bc15e235dc11b4dc8fff287e4a69a97733d0652356f014395d357a4463622811f26c8 SHA512 0756b8aaf8a8a653fe4f676396c686315886784aa4551951f7699ef9fbcd9967a84fc7f7c44b98d708a3c167f38adcfa50f2e91a324ef931e791eea50fb0d82f
 MISC metadata.xml 317 BLAKE2B 38ab4417f4befdeb7d9912a3712a259653e223aac63528287493cde0094efbe7c985f1cd93e871a10fb1a99b8add72f20d6b31a93d06017171a85a276f4b9840 SHA512 a5cb2c2182d2c0a2afbb3ebc9ac175af13be57ea5ca28abd3cb59d25a562484f8dc01b08da9e0644929a6cbd63f2c850eb6169f574dbed838180e5a5e89ad510
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 39a3b5f3f6f7..7a3bffd7a3f4 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
+EAPI=7
 
-DESCRIPTION="gnuradio FM RDS Receiver"
-HOMEPAGE="https://github.com/bastibl/gr-rds"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bastibl/${PN}"
+else
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
 fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio FM RDS Receiver"
+HOMEPAGE="https://github.com/bastibl/gr-rds"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+"
 #cppunit is listed in cmake, but only needed for tests and there are no tests
 #	dev-util/cppunit"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_prepare() {
+	cmake-utils_src_prepare
 	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/gr-rftap/Manifest b/net-wireless/gr-rftap/Manifest
index b68daec06a9c..1f12dde1be18 100644
--- a/net-wireless/gr-rftap/Manifest
+++ b/net-wireless/gr-rftap/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rftap-9999.ebuild 1093 BLAKE2B 37780de862576fde035d7862a2d4a4f8ba2bf8b8af65d9c97935dc7577082241a5f79bd5a916b76cf09b84ae93f68339fee94ad468aa0a52d4f0cd78b8a4c389 SHA512 71427c74384056940724723ee14a6d150863b8438fd474e60f50779e91e354e4254e2bdf5593edf6ac79f9465b64b244a634d0c8b68b7a6d6a42b88151d4ac99
+EBUILD gr-rftap-9999.ebuild 1127 BLAKE2B 2437cd7205d3123a5ce64cb1ba1e57c401794853a7245f0ab0d195a2517e9d54584d05b48a7a222d903e924a60686324a435c9445ebacc8e8e2480c4656c89bd SHA512 e214ccef445f01b05cd1a821731940eb3d904a3703f36c00202e0a3b9d59ed6c23adbe75b90630c451d0af9eb7328e0517b523dab11a23a4495508966d6aa3b3
 MISC metadata.xml 317 BLAKE2B 4970c2c939374961593cf134bf3f1030d14fed37ebdc9c15369a1c94dc4786649920c349f9aa6ea76b7d56bd720ae560b4b7e900c046f573cc75c55d7429f658 SHA512 bd237119e49e0e715f528eea05fc9cb8fd758779209849c7a5e5ffd964c98b3912c63af8363192ba94db59d2b62a4dd28c9d1521d61b843b02fe3feb6ad9558a
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
index e0f9dc95c130..621dada2edb8 100644
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
+EAPI=7
 
-DESCRIPTION="RFtap Module for GNU Radio"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git"
+else
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
 fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="RFtap Module for GNU Radio"
+HOMEPAGE="https://github.com/rftap/gr-rftap"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+"
 #cppunit is listed in cmake, but only needed for tests and there are no tests
 #	dev-util/cppunit"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_prepare() {
+	cmake-utils_src_prepare
 	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index 9ca6eee3a6f6..98825612a619 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,6 +1,7 @@
+AUX hackrf_easy_flash 4028 BLAKE2B bfa259dfa26ecd44894406fe0af417ec69451777e73399e84772690a9b26de74f6a6c249146179917ceeeb53465a35c197e2253706f3161c6662b65871769e3f SHA512 c8432b8e29621c00e81b235990a2c6e5ffdd26085e83965ac408f2f6e94dbd5a4bdc3dfa6c1080c156c6d21a4b4e2e09a02e861f1d651bbd5b01986629a18b69
 DIST hackrf-2017.02.1.tar.xz 15409352 BLAKE2B 930c6d30cbcadd366f889add7cd8f9756edf7a6b82a478353ea94662e9d2e0b612ca5ec0473eb0083dcbec761f2d5385eea31608f50f81543449ffa4bc31d277 SHA512 7cd6ad9aa8fef8afed41c48a3358bff18c6b2a9a112b13daabda87726e0e3ca4cf1e0c0c6ff9689bdd49f854e2e5887a84ccd7975abef43a43b75ecf8a5236ce
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
 EBUILD hackrf-tools-2017.02.1.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
-EBUILD hackrf-tools-2018.01.1.ebuild 1789 BLAKE2B ceb59c1a24d3a825bed85a04d53d72b0814fe98dd2602a5a329d72c791923075bd5764747308aeebba212d42cfe1bcd2f188a85a9a4159c75e5d61d7e8896fb0 SHA512 a98f7a085966d5679f7a2eccac5689afe1d13169ccdb0e5155d7f19a901a3ee517e59036427ec65ad31bf4e79ddff53229b4574aa021d8b573f814fb0ee10270
+EBUILD hackrf-tools-2018.01.1-r1.ebuild 1915 BLAKE2B d96634f38cf22fd3e4f01c23ecd1f0125f0fdf8b6553daddf5175a3b3b94040a6ed9aaf00a1272aa952a50941250cad888bf8cfcd7ffd28ed9d0dda49c2195d5 SHA512 aa1881d149f17320b83e7795fafbe66ca2c0667c54a44ede32bcd4c79557301878295de622b0939ace599bf302e86c27b4f9336cd81f0285435215075865665e
 EBUILD hackrf-tools-9999.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-wireless/hackrf-tools/files/hackrf_easy_flash b/net-wireless/hackrf-tools/files/hackrf_easy_flash
new file mode 100755
index 000000000000..78d0c69b0cd5
--- /dev/null
+++ b/net-wireless/hackrf-tools/files/hackrf_easy_flash
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+DFU_MODE=0
+CPLD=0
+
+get_dfu() {
+  if [ -r "/usr/share/hackrf/hackrf_one_usb.dfu" ]; then
+    ram_firmware="/usr/share/hackrf/hackrf_one_usb.dfu"
+  else
+    printf "Unable to find hackrf_one_usb.dfu in the search path\n"
+    exit 1
+  fi
+  export ram_firmware
+}
+
+get_cpld() {
+  if [ -r "/usr/share/hackrf/hackrf_cpld_default.xsvf" ]; then
+    cpld="/usr/share/hackrf/hackrf_cpld_default.xsvf"
+  else
+    printf "Unable to find default.xsvf in the search path\n"
+    exit 1
+  fi
+  export cpld
+}
+
+usage() {
+  printf "hackrf_easy_flash list\n"
+  printf "hackrf_easy_flash upgrade\n"
+}
+
+if [ -z "${1}" ]; then
+  usage
+  exit 0
+fi
+
+list_firmware() {
+  if [ ${DFU_MODE} = 1 ]; then
+    if [ -z "${ram_firmware}" ]; then
+      get_dfu
+    fi
+    printf "Best DFU found: ${ram_firmware}\n"
+  fi
+  printf "Available firmware options:\n"
+  if [ -r "/usr/share/hackrf/hackrf_one_usb.bin" ]; then
+    printf "hackrf (default)\n"
+  fi
+  if [ -r "/usr/share/hackrf/portapack-h1-firmware.bin" ]; then
+    printf "portapack (--portapack)\n"
+  fi
+  if [ -r "/usr/share/hackrf/portapack-h1-havoc.bin" ]; then
+    printf "portapack-havoc (--havoc)\n"
+  fi
+}
+
+#parse args
+while [ -n "${1}" ]; do
+  case $1 in
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    list|--list)
+      list_firmware
+      exit 0
+      ;;
+    update|--update|upgrade|--upgrade|hackrf|--hackrf)
+      firmware="/usr/share/hackrf/hackrf_one_usb.bin"
+      TARGET=hackrf
+      shift
+      ;;
+    portapack|--portapack)
+      firmware="/usr/share/hackrf/portapack-h1-firmware.bin"
+      TARGET=portapack
+      shift
+      ;;
+    havoc|--havoc)
+      firmware="/usr/share/hackrf/portapack-h1-havoc.bin"
+      TARGET=havoc
+      shift
+      ;;
+    cpld|--cpld)
+      CPLD=1
+      get_cpld
+      shift
+      ;;
+    dfu|--dfu)
+      DFU_MODE=1
+      get_dfu
+      shift
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+if [ -z "${firmware}" ]; then
+    firmware="/usr/share/hackrf/hackrf_one_usb.bin"
+    TARGET="hackrf"
+fi
+
+if [ ! -r "${firmware}" ]; then
+  printf "Unable to find or read ${firmware}\n"
+  printf "Please ensure the requested firmware is installed and readable\n"
+  exit 1
+fi
+
+if [ "${CPLD}" = 1 ] && [ "${TARGET}" != "hackrf" ]; then
+  printf "To update the CPLD you must use the stock hackrf firmware or do this update manually\n"
+  printf "Try \"$(basename $0) --cpld && $(basename $0) ${TARGET}\"\n"
+  exit 1
+fi
+
+printf "This tool is provided by Gentoo, please report bugs on https://bugs.gentoo.org/\n\n"
+if [ ${DFU_MODE} = 1 ]; then
+  printf "Preparing to reset hackrf with DFU ${ram_firmware}\n"
+  printf "Then flashing with ${firmware}\n\n"
+  printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
+  printf "then plug the HackRF into a USB port on your computer.\n"
+  printf "After the HackRF is plugged in, you may release the DFU button.\n"
+  printf "Press any key to continue or ^c to abort\n"
+  read
+  if ! dfu-util --device 1fc9:000c --download "${ram_firmware}" --reset; then
+    printf "dfu-util reported failure, quitting\n"
+    exit 1
+  fi
+  sleep 2s
+else
+  if hackrf_info | grep -q 'No HackRF boards found.'; then
+    printf "No hackrf found, please ensure you are in hackrf mode or try --dfu\n"
+    exit 1
+  fi
+fi
+if hackrf_spiflash -w "${firmware}"; then
+  sleep 3s
+  hackrf_spiflash -R
+  sleep 3s
+else
+  printf "hackrf_spiflash reported failure, quitting\n"
+  exit 1
+fi
+if [ "${CPLD}" = 1 ]; then
+  #printf "To update the cpld, please reset your hackrf into it's new firmware before updating the cpld\n"
+  #printf "Please reset your hackrf by pressing the button furthest from the antenna or power cycling it.\n"
+  #printf "Press any key to continue or ^c to abort\n"
+  #read
+  if hackrf_cpldjtag -x "${cpld}"; then
+    sleep 3s
+    hackrf_spiflash -R
+  else
+    printf "hackrf_cpldjtag reported failure\n"
+    exit 1
+  fi
+fi
+if [ "${TARGET}" = "hackrf" ]; then
+  hackrf_info
+fi
+printf "If you saw no errors, you are up to date with the requested firmware\n"
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
new file mode 100644
index 000000000000..077393444eb7
--- /dev/null
+++ b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="tools for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
+	S="${WORKDIR}/hackrf/host/hackrf-tools"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
+	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="=net-libs/libhackrf-${PV}:=
+		sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	dosbin "${FILESDIR}/hackrf_easy_flash"
+	if [[ ${PV} != "9999" ]] ; then
+		insinto /usr/share/hackrf
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
+		ln -s hackrf_cpld_default-${PV}.xsvf "${ED}/usr/share/hackrf/hackrf_cpld_default.xsvf"
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
+	fi
+}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1.ebuild
deleted file mode 100644
index 8e2e2ed538cf..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1.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 cmake-utils
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="=net-libs/libhackrf-${PV}:=
-		sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-	fi
-}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 07fa339c5de3..763095c8e056 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,12 +1,15 @@
 AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
 AUX fix-setuptools2.patch 2239 BLAKE2B 9d5ace68d76f4d1de1688055d98cd28257c776705f8337efc3a919118f1fa27597495255dc4e247f4f7a18d33769d5c2a47f66f728b2d67fc1bb2dbc92bc7cdb SHA512 6bbcee8f546753ad45532b73586d67f5ca4e155a583a823d7d9fb0d9a5401048ccb0049bda0bfa03a8cfdca36d25026902ff4401deb51e1e477760fa3e7d16a0
 AUX fix-setuptools3.patch 2239 BLAKE2B 318461d6ea1e23118af2df5ef2b03bd3ca9b335f873c0c2104fdf3468e3527b6cb0e7e37ee0581df58ebbf9f2d8d0e9bb844d707487d72ccef563a7a7fbe54fc SHA512 1f88590e43addd679757bceedf3b75ed5f19960295e7139c0e67afb0884019f939fa6c22f03dce4176669d5631e6ee1539db47319dc7d476b2a4ec4c8ca6b8fa
+AUX fix-setuptools4.patch 3328 BLAKE2B 5af5c05b74b332455fccc891fd254317c57f0d126cbfa60aef1ac7cbadab28ecb48bd1b6e31510d117f29a0d4e2807beb4fea756147f1fe26d88bb4c8ce225f6 SHA512 f4c68953a9a1880d7294bedba3c645e40de48b5cf9159cb99287a2147de4bbee2a808ad29041acd8d2a0e6a488549c315ea678addce8fd6f37ade33d30615234
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
+DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a895fae0012ccb7a9cf03a700c96562a5ae62530b1138f509df5f0af91362a9658eae7916a9c643cef6e1630fe616d949017 SHA512 1384630ea0ba12c157928696aab502406c5e521765e420459ab049e3205e7d7bfb472c6a1a88c1268fd8235b24b615a03ce4b91f0974adc24f47d00709ef9d4b
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2018.08_beta1-r4.ebuild 3007 BLAKE2B 09460af93a5ee5d50b628f8dcf4a9ad466d30c4cb7e617bc60d5fa89a7d1c4fdb169e48c9a4ca1fa01ca92396cf99a86e1f1597b7dd1943e3a90078ce3ee84d8 SHA512 19131fd383d48f4e394b01e180fded41767b64b57ee63a0e046334c143fc63472ba0f4c71bcd21419a270a7f7fd558c5c2d700c9f91c71fd7fe099b48733fce7
-EBUILD kismet-9999.ebuild 2929 BLAKE2B 510f39a7c9fa66e78f67ff151bc6d6e91c757063fee4f8c16a2de89f111cf0fba1e6f48e7ce39e7d5495450770ba384b8347196bcf72d0cac0e83278009fc96d SHA512 d6c2df0d3d01d2e44074c785d25b5c4eaed3a511c6b5c7cf8dcb1c8fecbb46d457d0b756998a07b2882996d5b30a4628e16c5229a0bbdc70292d0864498c28e1
+EBUILD kismet-2019.01_beta2.ebuild 2921 BLAKE2B 11169d4d133617c1e5cbeb39b47c030c67a16ae3548d01dd68d00e5f7817a5304e282942efb104f29b0d8c511aad9ae2490c324f8dec9c4bd8f1c9f6da53216c SHA512 68da40db9264a6c65d44bfa3445b7fd1bcf05766aef78dd0e6a9a68c14a6405ad304c232aa9e2b6a5905008bf5223ce2beffe181ffdabecd68e4347bae2a04a9
+EBUILD kismet-9999.ebuild 2921 BLAKE2B 11169d4d133617c1e5cbeb39b47c030c67a16ae3548d01dd68d00e5f7817a5304e282942efb104f29b0d8c511aad9ae2490c324f8dec9c4bd8f1c9f6da53216c SHA512 68da40db9264a6c65d44bfa3445b7fd1bcf05766aef78dd0e6a9a68c14a6405ad304c232aa9e2b6a5905008bf5223ce2beffe181ffdabecd68e4347bae2a04a9
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/fix-setuptools4.patch b/net-wireless/kismet/files/fix-setuptools4.patch
new file mode 100644
index 000000000000..c2db673529ea
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools4.patch
@@ -0,0 +1,91 @@
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index cfbf99b0..c2e68453 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 
+ clean:
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index e33f7de5..e1be587d 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	# These are now part of the setup.py install
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
+index 8a4f7647..8239f434 100644
+--- a/capture_sdr_rtladsb/Makefile.in
++++ b/capture_sdr_rtladsb/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) aircraft_db.csv $(ETC)/kismet_aircraft_db.csv
+ 	# These are now part of the setup.py install
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
+index 1b780be1..3548adc5 100644
+--- a/capture_sdr_rtlamr/Makefile.in
++++ b/capture_sdr_rtlamr/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	# These are now part of the setup.py install
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
+index 036541a0..fc660dfe 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ protobuf:
+ 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON2) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-2019.01_beta2.ebuild b/net-wireless/kismet/kismet-2019.01_beta2.ebuild
new file mode 100644
index 000000000000..2e5fd9c3d052
--- /dev/null
+++ b/net-wireless/kismet/kismet-2019.01_beta2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib user python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	mousejack? ( dev-libs/libusb:= )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	sys-libs/ncurses:=
+	lm_sensors? ( sys-apps/lm_sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply "${FILESDIR}"/fix-setuptools4.patch
+	eapply_user
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcre) \
+		$(use_enable lm_sensors lmsensors) \
+		$(use_enable mousejack libusb) \
+		$(use_enable networkmanager libnm) \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins -r log_tools
+
+	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd kismet
+	newconfd "${FILESDIR}"/${PN}.confd kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9eecff37a2f8..2e5fd9c3d052 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,18 +7,15 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools eutils multilib user python-single-r1
 
-MY_P=${P/\./-}
-MY_P=${MY_P/_beta/-BETA}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-	SRC_URI=""
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	RESTRICT="strip"
 else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
 	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 fi
@@ -67,7 +64,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
-	eapply "${FILESDIR}"/fix-setuptools3.patch
+	eapply "${FILESDIR}"/fix-setuptools4.patch
 	eapply_user
 
 	if [ "${PV}" = "9999" ]; then
diff --git a/net-wireless/multimode/Manifest b/net-wireless/multimode/Manifest
index 148b291303b6..ea831966c212 100644
--- a/net-wireless/multimode/Manifest
+++ b/net-wireless/multimode/Manifest
@@ -1,6 +1,4 @@
 DIST multimode-1.4_p20140831.tar.xz 7648 BLAKE2B 1efec8c12e46b63f5501f1cf28f2e1f57d378c578656ecae771f0b98b873bbc1f119652a9f4607c9c0f3c5f3ca4f7109c48509f8339a1b22b8e3ef2af7214407 SHA512 891428e6c049cfd94787bd7580a59b3a9eb488dbf97cd21a1d82be04648e5423c3ce73983d38c5a3c280519ebea73c9572e9b0cdc7df453114e6aa220a58eaff
-DIST multimode-r1.00.tar.gz 13931 BLAKE2B cb6c147af3eb5cbded77446155b5322ba8df8cedc43b4891f730cb542e03df1acbe7905105d4c8c2acdc0ffafa797f0734194458b3617f3b7fe6713dbf33a0ca SHA512 9c224794139592622bc441a8d17265963eda56d691f45ebc0220ee3e3907e53b113dae0c8452330753fafd94964663d70bad2dce43cbe05a3abcd477112f3c98
-EBUILD multimode-1.00-r2.ebuild 1013 BLAKE2B 0090cec587c8de5db68619c1387a45f16329182dbefee64cbe25d5fa869dda6df93958046d6bb7aafff91be6320a51910e842007f49f78a32eb875722676dbdc SHA512 eebe21772e3df7fb7de2738a45c438fde15a1072fbfe7fb3f48f5c4a16d014555c5735a534f7c8624b98e5e1c71ee17ff9d457638e14bacb1bc0d40b6376dbb8
 EBUILD multimode-1.4_p20140831-r1.ebuild 1038 BLAKE2B 3e6e0f1e9214dbc579e3c7bcf15d4bf22f5b343ab2d3dd04a774a3bd4744122fa68b38de3dfdf524391ee3fd55a07b391e4e9aa7ef198d4818d2ec9cf4059be6 SHA512 423f747ab12262ec97f97480ea221cf9a0fd8753e65f45e8430ec8c9752b0d8cd9e77aaf13c816c9360b955a2f28fd456d9a64de0ca9ded0590ead45e82b554b
 EBUILD multimode-9999.ebuild 1036 BLAKE2B 3b8c895ee1bb0c65956c372bcc1d5576d6e62b7cc546fb5064a0de695178f23350404a1d55b7da4ca19c687d6fb54ebbd86e4d978ee66593a7fbffdbc8e49dfb SHA512 72376982be361641b8764da6c85f54253627c2319e18064d6fda6123c1a7ad38308b2b140897805799d4b7142d6827c2bb33b5798a43febf6f250532b3f17d20
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/multimode/multimode-1.00-r2.ebuild b/net-wireless/multimode/multimode-1.00-r2.ebuild
deleted file mode 100644
index aaa5a053442e..000000000000
--- a/net-wireless/multimode/multimode-1.00-r2.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
-HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
-	inherit subversion
-else
-	SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}"
-fi
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=net-wireless/gr-osmosdr-0.0.1
-	<net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
-	>=net-wireless/rtl-sdr-0.5.0"
-
-src_compile() {
-	PYTHONPATH="${S}":"${PYTHONPATH}" emake
-}
-
-src_install() {
-	newbin ${PN}.py ${PN}
-	insinto $(python_get_sitedir)
-	doins ${PN}_helper.py
-	insinto /usr/share/${PN}
-	doins ${PN}.grc
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-wireless/sdrplay/Manifest b/net-wireless/sdrplay/Manifest
index 761ad3a547dd..66d47e6ef465 100644
--- a/net-wireless/sdrplay/Manifest
+++ b/net-wireless/sdrplay/Manifest
@@ -1,3 +1,3 @@
 DIST SDRplay_RSP_API-Linux-2.13.1.run 326016 BLAKE2B 7eff1aa35190db1ead5b1d96994d24ae2301e3a765d6701756c6304a1719aa32125fedacf6a6859d89b89db5dd6956ec0e8c7e814dbd6242db5614a53e89efb3 SHA512 576be63e18084cf3e74bfb20592a44836f22fd9efe74ba9e27e5865a9ab755b26b3f2894cd8331ff876ab664d4e533d2bdbc629d552e75fcfbb3e9814dd140ce
-EBUILD sdrplay-2.13.1.ebuild 1196 BLAKE2B e13102454dde509398819dd1fd1513b6f68bdfbdb0813e937f059ba7dbbbd7737405a8457d662361ca4ff615ddd4cf86a8a466660fb3bfdf287ca64e2e5f188e SHA512 cf4e0b819c8d83efca8baf6481bafbb3183798cd41f56ea19cbcb3611adffa840dffcc44a6539c3f563edcdbb00862e17dd2dcb57c1fedcfb586c28913926602
+EBUILD sdrplay-2.13.1-r1.ebuild 1223 BLAKE2B 46877e4e7ef00eb8a65359c96122c61e5b2dd33d5f647bfa77e93318570e81c9f67520b7023555e5f365864d80ccf8a7be4e4e91f76d68ec66310a56898ccb10 SHA512 7d7280e9ef739e1956cba19e8f20d579b7ea3e972551ed04f2529b18e197f1aedd88c38cdc6a7a08403913cc3d9f6906c9de109aa8643f5fb87f376a06e2a280
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
new file mode 100644
index 000000000000..0154f873ac51
--- /dev/null
+++ b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit versionator unpacker udev multilib-minimal
+
+MY_PV_1=$(get_major_version)
+MY_PV_12=$(get_version_component_range 1-2)
+
+DESCRIPTION="SDRplay API/HW driver for all RSPs"
+HOMEPAGE="https://www.sdrplay.com"
+SRC_URI="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${PV}.run"
+
+LICENSE="SDRplay"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+	virtual/udev"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib64/libmirsdrapi-rsp.so.${MY_PV_12}
+usr/lib32/libmirsdrapi-rsp.so.${MY_PV_12}"
+
+multilib_src_install_all() {
+	insinto /usr/include/
+	doins mirsdrapi-rsp.h
+
+	udev_dorules 66-mirics.rules
+	udev_reload
+}
+
+multilib_src_install() {
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then
+		dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then
+		dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
+	fi
+
+	dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
+	dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so"
+}
diff --git a/net-wireless/sdrplay/sdrplay-2.13.1.ebuild b/net-wireless/sdrplay/sdrplay-2.13.1.ebuild
deleted file mode 100644
index 5528d10526f9..000000000000
--- a/net-wireless/sdrplay/sdrplay-2.13.1.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
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit versionator unpacker udev multilib-minimal
-
-MY_PV_1=$(get_major_version)
-MY_PV_12=$(get_version_component_range 1-2)
-
-DESCRIPTION="SDRplay API/HW driver for all RSPs"
-HOMEPAGE="https://www.sdrplay.com"
-SRC_URI="http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${PV}.run"
-
-LICENSE="SDRplay"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib64/libmirsdrapi-rsp.so.${MY_PV_12}
-usr/lib32/libmirsdrapi-rsp.so.${MY_PV_12}"
-
-multilib_src_install_all() {
-	insinto /usr/include/
-	doins mirsdrapi-rsp.h
-
-	udev_dorules 66-mirics.rules
-	udev_reload
-}
-
-multilib_src_install() {
-	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then
-		dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
-	fi
-
-	if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then
-		dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
-	fi
-
-	dosym libmirsdrapi-rsp.so.${MY_PV_12} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
-	dosym libmirsdrapi-rsp.so.${MY_PV_1} "${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so"
-}
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
index fe40c9daa432..d08d8f37fd5b 100644
--- a/net-wireless/soapybladerf/Manifest
+++ b/net-wireless/soapybladerf/Manifest
@@ -1,6 +1,8 @@
 DIST soapybladerf-0.3.5.tar.gz 27937 BLAKE2B eb94e0deb97a376b2e45f41100ce64ed4a0718c9b2623b4270e27c23faa0c035d6568b2a8129308851a75ebef8f9f7e9ad519af23896493ca4616d271e0a2438 SHA512 af22703c16d8b40d58e966ce9ce705652e2661bd46d2c0dc2a2c0315a66f4283172d17de4dc3d080cf011cdde9c002107653fe5a02de27df19b47098235f40a7
 DIST soapybladerf-0.3.5_p20180908.tar.gz 29426 BLAKE2B 0e6830e2c930178d995c104f22df6a6104a531ea53166c2c6b5e7c652ae6699a1a3c32b455af50f6c3990c868043d8d20edaac9acabc3a9340744ee6a66e6bb9 SHA512 fc0be84e8c1a51caf6e3a73b60cea998317924b041c578a507c4fc0bdab3f70115796a1fc932531466685dcefe47949283c4d4834092126b9b3e60ae237952cc
+DIST soapybladerf-0.4.0.tar.gz 29489 BLAKE2B 6a0cea3d9b7825e6e1bfa18ec8653df3ae28b4999f6e43437a64a1a10da867819f8e9f72cd03c183380b2a12a2ace29819b1944537cf15f808accc3444550c00 SHA512 69347847e25239c8686506cc7101dd9263b57fa3d3b5f518c915d9a9e0cb7e3a5627ee87ad7afb3022751aa212aa3698d8dbb16b6cddcc597292c7d2f5f806d4
 EBUILD soapybladerf-0.3.5-r2.ebuild 660 BLAKE2B 127473c9f16feb3163488f7bc59bdd0604562351e5b61f2596dc5678b095f6e6684e223ae8643117719b716940fb125422480e0eda7b3969f181f8e2614e23ac SHA512 e7906572e540d4cc0b7d7d808263f2426b37dbb9f0ea6bfd999e31a23d611f7a38c63047d6fa4d4589926448e754d200ef1263544fdefafbde5156660426ebb8
 EBUILD soapybladerf-0.3.5_p20180908-r1.ebuild 691 BLAKE2B 2dc96fc4b4a35a14ee53ad2b5b4f5e0e6a060400d49890d83b8a0166f410c6ed8abf22182c94ce16e307ab4fca7a1423b96ea35b1720a42f787867b18458ecbe SHA512 82f3d16ec126f69fab49061227b963f5919b2de45ac898d564d0d31d8e9f9d12eb3e483e6cbd83b23c69c308806c4f5d5ac3806d826897136787e740fe5975e5
-EBUILD soapybladerf-9999.ebuild 662 BLAKE2B 11e046e4bff90382e38d25c53789d5263d064f9a2f31193c1873fed96ee295e6dd06c914d8211aa8f16dd420b047b49f3a24d34846d1001a349205ee6bdc74b8 SHA512 31e54c3824cdc922315d2c30e3d4944de555937d0b3860776ba3fd273220e3fab73d08eb64ec5af2afd974f0782dfd9b0da946aaea23a7f547b805492df3234c
+EBUILD soapybladerf-0.4.0.ebuild 649 BLAKE2B 9d87bb4ef65237043ad67d5594f94aceadb0f9f637126b0afd18e377c67ccc03236603eb04929d5471bfc87323f622e33ca39c8b9ecaea4e2974cb53ff6c4fbe SHA512 a8f7c9ccac76eb6669f6dac307aa60107da46b72269dd2a00f090030992c3189d9bd9fe980dd5b42711c4b1dab979fb2ab649023a52302913b6c4044bdcda9a0
+EBUILD soapybladerf-9999.ebuild 649 BLAKE2B 9d87bb4ef65237043ad67d5594f94aceadb0f9f637126b0afd18e377c67ccc03236603eb04929d5471bfc87323f622e33ca39c8b9ecaea4e2974cb53ff6c4fbe SHA512 a8f7c9ccac76eb6669f6dac307aa60107da46b72269dd2a00f090030992c3189d9bd9fe980dd5b42711c4b1dab979fb2ab649023a52302913b6c4044bdcda9a0
 MISC metadata.xml 434 BLAKE2B da3841724dfb1d301e29abd0c97ff4db9cb851fe55b1fb1ac576d39edb2dbb800bfc5b0857132325103b0138c6809d38d4af49b7548214f83dda38b2ce0ce39d SHA512 a672da1167904fe55179376d6c769066ab66639369fae311ad3a6b9afcab931554f148920c4deedcfbb57cd4fd8cee940462082a7fa68408913731939f651439
diff --git a/net-wireless/soapybladerf/soapybladerf-0.4.0.ebuild b/net-wireless/soapybladerf/soapybladerf-0.4.0.ebuild
new file mode 100644
index 000000000000..1ca79c8ea07e
--- /dev/null
+++ b/net-wireless/soapybladerf/soapybladerf-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Blade RF "
+HOMEPAGE="https://github.com/pothosware/SoapyBladeRF"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyBladeRF-soapy-bladerf-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr:=
+		>=net-wireless/bladerf-2018.08:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapybladerf/soapybladerf-9999.ebuild b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
index d712d0943f84..1ca79c8ea07e 100644
--- a/net-wireless/soapybladerf/soapybladerf-9999.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapyBladeRF"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyBladeRF.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyBladeRF/archive/soapy-bladerf-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
index bad5ab0b5947..9f52635b0cc1 100644
--- a/net-wireless/soapyplutosdr/Manifest
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -1,4 +1,6 @@
 DIST soapyplutosdr-0.0_p20180825.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
+DIST soapyplutosdr-0.1.0.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
 EBUILD soapyplutosdr-0.0_p20180825-r1.ebuild 713 BLAKE2B 4d87dcef2f0e61075f5d8ce10fbac767aa5e30f9f8eb327c6b93ac5d462507326648c0fe2412a2ba460f7ca3a4e087e9fa96b84a0e52edc7c9a3c844ab46f17a SHA512 847eb690033af589a4624a643427d1d540c98f056feee104e1bbba3abe5d8ddce9e7c4ba78030cbba5f2c4908578a038d2db1f3dc2db949a694bccfbfdba422b
-EBUILD soapyplutosdr-9999.ebuild 713 BLAKE2B 4d87dcef2f0e61075f5d8ce10fbac767aa5e30f9f8eb327c6b93ac5d462507326648c0fe2412a2ba460f7ca3a4e087e9fa96b84a0e52edc7c9a3c844ab46f17a SHA512 847eb690033af589a4624a643427d1d540c98f056feee104e1bbba3abe5d8ddce9e7c4ba78030cbba5f2c4908578a038d2db1f3dc2db949a694bccfbfdba422b
+EBUILD soapyplutosdr-0.1.0.ebuild 700 BLAKE2B 791904806e881642a8ea163e8771fa0d6f5ec44278264ee013ae77f74e055016b5fd428985e2dd453e3383505153a67b826dc2507c8888f1dc10bbd6fca59687 SHA512 a41a26326068dee86fcf959b740ede42b5862776b4bd3e69ae46745a69d59a46d320400118ae63ef70f1bb1294c0da0e54f4578804b45cace027f7bd9a27fab9
+EBUILD soapyplutosdr-9999.ebuild 700 BLAKE2B 791904806e881642a8ea163e8771fa0d6f5ec44278264ee013ae77f74e055016b5fd428985e2dd453e3383505153a67b826dc2507c8888f1dc10bbd6fca59687 SHA512 a41a26326068dee86fcf959b740ede42b5862776b4bd3e69ae46745a69d59a46d320400118ae63ef70f1bb1294c0da0e54f4578804b45cace027f7bd9a27fab9
 MISC metadata.xml 435 BLAKE2B 2a0b2a0043234cf560ee6b76935c546da77ae108e3fd4e8187dcac974d1ffed8e50e86f94fb943e4396c0bc338ae1a92b899da38f7a88d3bc0c6437bf95282af SHA512 c66683ba419f5dd3d7ea63d07478366ae751ecd38250ba07fe157375d937bc0f42ae6324716dd7068c33e1d405f98207b676c6dfee3b1b1870bfb6f73b9e8a7d
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.1.0.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.1.0.ebuild
new file mode 100644
index 000000000000..494237c9dd27
--- /dev/null
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
+HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
+	SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr:=
+		net-libs/libiio:=
+		net-libs/libad9361-iio:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
index 0ebf43c8590a..494237c9dd27 100644
--- a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
index c09f9e773497..d93b087ee827 100644
--- a/net-wireless/soapyrtlsdr/Manifest
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -1,4 +1,6 @@
 DIST soapyrtlsdr-0.2.5.tar.gz 14101 BLAKE2B 3fc48e5cece291220a64ec1fd06492a94497e3e639c4fbdcb4c88d4b0431676bbf7a8d531123acc91d937380abe6a96a1b9df4cd7150203e31e17ba859da7113 SHA512 2e6343833d0ef48b11c6be6ea85c87276d58ab810b6b47fa2735b909beb6a758856ef2cbef3a0d478c27dd1fea829a049dd91252ae9807415f8ea66f15054a64
+DIST soapyrtlsdr-0.3.0.tar.gz 14386 BLAKE2B f1f54bbf0a18cf02924844933108d38fe5280b8a856ffc9c3f12f56fc1ace5fa2abcabbfa86263f77d31fcd28f0a32cc4b4a350fca539a4860c6e0deebc492d5 SHA512 ccc0b3a5174bb1b57a79ecd0395ccaa5c3fada8ea7dce08d35a07992e84fef2cb45d92744fb0064857df36ad8120f495c3841b0fdca1870b9ed2328fb639ac21
 EBUILD soapyrtlsdr-0.2.5-r1.ebuild 641 BLAKE2B 0500aa30519312a6b95b4ec20cbd2066f456b2f95f81ee74554364588a9ae159fdafbc807176495dac3b5cef2a181b28c3325cb8ef39c756bc3cdd23011976ae SHA512 ebf01b8602e0eff83fe4d515923df6c13ff885352a31f3b0d0dc4ef8ba11c9c3e2148cbbce80cecf70fa4bdc64991150077c5dcb7cf14b17defcfab9641690f0
-EBUILD soapyrtlsdr-9999.ebuild 641 BLAKE2B 0500aa30519312a6b95b4ec20cbd2066f456b2f95f81ee74554364588a9ae159fdafbc807176495dac3b5cef2a181b28c3325cb8ef39c756bc3cdd23011976ae SHA512 ebf01b8602e0eff83fe4d515923df6c13ff885352a31f3b0d0dc4ef8ba11c9c3e2148cbbce80cecf70fa4bdc64991150077c5dcb7cf14b17defcfab9641690f0
+EBUILD soapyrtlsdr-0.3.0.ebuild 628 BLAKE2B 78f33ddd40836b4759f34444e136f984dd918e2e6915ab203c8603969eb697a7db112f2102dcacd40c5d5e3c4374bd922524471712ec5371f56c75159b17fd2e SHA512 2914f28a417c4389b342ddb035f206f9a72f4a24f233d167d6bf4d6e7041d4d869d4b927d8743d6f72726f983a9d58820bd1019e4c71558dcde709b5403d9607
+EBUILD soapyrtlsdr-9999.ebuild 628 BLAKE2B 78f33ddd40836b4759f34444e136f984dd918e2e6915ab203c8603969eb697a7db112f2102dcacd40c5d5e3c4374bd922524471712ec5371f56c75159b17fd2e SHA512 2914f28a417c4389b342ddb035f206f9a72f4a24f233d167d6bf4d6e7041d4d869d4b927d8743d6f72726f983a9d58820bd1019e4c71558dcde709b5403d9607
 MISC metadata.xml 433 BLAKE2B 17192d2957af1deaddf7baec5c5ff77eb4ea40bbd80b7a91e5a36f91a4b53f6f6b142dc76ade70c016f8934905642c49851857bcb7823e5e3adee5e24cfccece SHA512 6b6295bd49522a9c1eb4747c4039a77201ec2dabb03250dae21b93605a1df695970d33ebe12108bd2effa7fc07ba6ab695de949e02099f89b7e334531145fe41
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.0.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.0.ebuild
new file mode 100644
index 000000000000..7fc9a0e095c9
--- /dev/null
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="SoapySDR RTL-SDR Support Module"
+HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapyRTLSDR-soapy-rtlsdr-"${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr:=
+		net-wireless/rtl-sdr"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
index 1ae13f826167..7fc9a0e095c9 100644
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapyRTLSDR"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyRTLSDR.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyRTLSDR/archive/soapy-rtlsdr-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-wireless/soapysdrplay/Manifest b/net-wireless/soapysdrplay/Manifest
index f5995a20e823..e2517a3931ab 100644
--- a/net-wireless/soapysdrplay/Manifest
+++ b/net-wireless/soapysdrplay/Manifest
@@ -1,4 +1,6 @@
 DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789 SHA512 28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
-EBUILD soapysdrplay-0.1.0.ebuild 702 BLAKE2B 34b4faee3609e75c1f12315a2a879bd9e6b71f889ba9278492abd76d36dd27d296658108c5bd941f67d6869edef72c0fa5363489975389038b397d1b9a63c05f SHA512 622061029d0773c9bb0a7df6dd5bd280a27cdb30387aca1404311bb80d19097b7fdd0b5a82a2fe6268314fc41038d98ee29c11b29dee592e7cc039ed1b63ca7c
-EBUILD soapysdrplay-9999.ebuild 702 BLAKE2B 34b4faee3609e75c1f12315a2a879bd9e6b71f889ba9278492abd76d36dd27d296658108c5bd941f67d6869edef72c0fa5363489975389038b397d1b9a63c05f SHA512 622061029d0773c9bb0a7df6dd5bd280a27cdb30387aca1404311bb80d19097b7fdd0b5a82a2fe6268314fc41038d98ee29c11b29dee592e7cc039ed1b63ca7c
+DIST soapysdrplay-0.2.0.tar.gz 13570 BLAKE2B c77342b091a3510986e4388911dc2e45d7bc0e54dfef7ebe1fe774d564193bc773509d46238c0a3ea87458ab0c7ea2447a877f083a72a26f2ca5e592386b1ba1 SHA512 7ed6e34ee42416b4d2eec76b66cdc0e9b40835ab3299a2b3a906492cf342bbdef7c92dd3e9e63b12fdceb897ca4fb2bb574b23d4aee121cc32fbfcddbb7b060a
+EBUILD soapysdrplay-0.1.0.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
+EBUILD soapysdrplay-0.2.0.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
+EBUILD soapysdrplay-9999.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
 MISC metadata.xml 337 BLAKE2B 6dc787bbdb327227a07da5497daaf4ae0e00855ce4f6114fd911b7ca063d3464a3c68d5cb74c1ff223ecba129af0e1a1fb9cd7b546f19315e03e9c4e4710d0da SHA512 f4eda418b6bd4dba31d1429cc0837ee53946132c9d4e95063a671c5a98e20f25dd0505f1bc63ee90849676d2bef1a6fb9cb87824b3c696bc1d952d50f74777e6
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
index cd6b8ca15cb8..935b6c269996 100644
--- a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
+++ b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
 	EGIT_CLONE_TYPE="shallow"
-	KEYWORDS=""
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
new file mode 100644
index 000000000000..935b6c269996
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	net-wireless/sdrplay"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
index cd6b8ca15cb8..935b6c269996 100644
--- a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
+++ b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
 	EGIT_CLONE_TYPE="shallow"
-	KEYWORDS=""
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
index a1b9632c570d..8074ab3e4f19 100644
--- a/net-wireless/soapyuhd/Manifest
+++ b/net-wireless/soapyuhd/Manifest
@@ -1,4 +1,4 @@
 DIST soapyuhd-0.3.4.tar.gz 32111 BLAKE2B 77e976f0d5ba671fb7ff2f9822b62ab6de9b6992dc57e7824fbf7972fa52e864a33673c3620094871117a33008cf86e834d7401b2ddd060a96662d2caa48d6e4 SHA512 2eda4d0ed65d86e915ad24c5221c41716ad838ea444d92ade5eb19959bc6992132dc208ceafe994cd14e4c4a429a21341c7c5d67d354999b85e96f388cb3aa4e
-EBUILD soapyuhd-0.3.4-r1.ebuild 657 BLAKE2B 1da8f4801c2af090973d0b7b29d62f1f7270ce25c55c4e11fc3231b761964ab168b53e336b43c8e4107e268062ee8cf0344e3e025a565a52c4a24e17d2d67412 SHA512 91ebfe4f4789d1e868e9b22ffed57f0c54be3404aee873c7ad4d5bc879bd04ab99721ae3cd935e0a49c132fa647fefdc2428e31285ea66573ed95d19bc65ee5c
-EBUILD soapyuhd-9999.ebuild 657 BLAKE2B 1da8f4801c2af090973d0b7b29d62f1f7270ce25c55c4e11fc3231b761964ab168b53e336b43c8e4107e268062ee8cf0344e3e025a565a52c4a24e17d2d67412 SHA512 91ebfe4f4789d1e868e9b22ffed57f0c54be3404aee873c7ad4d5bc879bd04ab99721ae3cd935e0a49c132fa647fefdc2428e31285ea66573ed95d19bc65ee5c
+EBUILD soapyuhd-0.3.4-r1.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
+EBUILD soapyuhd-9999.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
 MISC metadata.xml 430 BLAKE2B 583986bcf088a9cfcda635a68fef35c98ad5d5504be93f03b1034936930b38a81f3a952f1a33409a71406b3178cccb98afac8c3dafef670cbda3383830d1c22d SHA512 31ca3b4aff913064ad156b644b1598cc3412d818cf0b67607b222770852e98fc1e4d5e164d053088bd53bdffe9f394a279a1525dabfa3f22db972bc5099101f6
diff --git a/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild b/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
index 664cf2685543..16bc1bdb9fba 100644
--- a/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapyUHD"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-wireless/soapyuhd/soapyuhd-9999.ebuild b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
index 664cf2685543..16bc1bdb9fba 100644
--- a/net-wireless/soapyuhd/soapyuhd-9999.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/pothosware/SoapyUHD"
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/pothosware/SoapyUHD.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 63b97292c7bc..2342e6634392 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,14 +1,18 @@
 AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
+AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
 DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
 DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
 DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
 DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
+DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
 DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
 DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
+DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
 EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
 EBUILD uhd-3.11.0.0.ebuild 3902 BLAKE2B 34d21ac5fca3a00b255bb0dbae36d5930416013d79a7544d0c365c0f3cdd6df5a9418cc5a4196968e15b469312522545ce6c360103bfd76191aa6595a777e5fe SHA512 1ee713c893dbf749851df9a4e628504b7a3bd907b3a9f06de3444656e101d63ab6f85a0b201658da3afce3a03389dba027fde92b09076976289694cb091ab498
 EBUILD uhd-3.12.0.0.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
 EBUILD uhd-3.13.0.1.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
+EBUILD uhd-3.13.1.0.ebuild 3532 BLAKE2B db3b8f22560bb2897c4ef4445addbfa5b715f3be9ba14c21a61d5eb4bd7f8eeb597eeaa9ca86b6acf14cdf752626c66e4727df61f157f2cd1478a6a7456945d1 SHA512 c59999e1df4420385d242ffe8a3b326d39688b1a160d31c3eff479aea43a9f9ec5f8f0deea762a7955af045b1d7169e18edee3c6778d7e3d8a2b40b8121a3c68
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch
new file mode 100644
index 000000000000..de165e9deebf
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch
@@ -0,0 +1,45 @@
+diff --git host/CMakeLists.txt host/CMakeLists.txt
+index 2337396e7..3a77776a0 100644
+--- host/CMakeLists.txt
++++ host/CMakeLists.txt
+@@ -531,6 +531,9 @@ endforeach(Boost_Comp)
+ if(ENABLE_USB)
+     list(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
+ endif(ENABLE_USB)
++
++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
++
+ # UHDConfig.cmake also needs UHD_RFNOC_FOUND
+ if(ENABLE_RFNOC)
+     set(UHD_RFNOC_FOUND "TRUE")
+diff --git host/examples/CMakeLists.txt host/examples/CMakeLists.txt
+index b384d978c..402aded94 100644
+--- host/examples/CMakeLists.txt
++++ host/examples/CMakeLists.txt
+@@ -58,11 +58,11 @@ find_package(Curses)
+ if(CURSES_FOUND)
+     include_directories(${CURSES_INCLUDE_DIR})
+     add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp)
+-    target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
++    target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
+     UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ 
+     add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp)
+-    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
++    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
+     UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ endif(CURSES_FOUND)
+ 
+diff --git host/utils/latency/CMakeLists.txt host/utils/latency/CMakeLists.txt
+index 05bacd77a..d3b1449a6 100644
+--- host/utils/latency/CMakeLists.txt
++++ host/utils/latency/CMakeLists.txt
+@@ -25,7 +25,7 @@ if(CURSES_FOUND)
+         get_filename_component(name ${source} NAME_WE)
+         add_executable(${name} ${source} ${latency_lib_path})
+     	LIBUHD_APPEND_SOURCES(${name})
+-        target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})
++        target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES})
+     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
+     endforeach(source)
+ 
diff --git a/net-wireless/uhd/uhd-3.13.1.0.ebuild b/net-wireless/uhd/uhd-3.13.1.0.ebuild
new file mode 100644
index 000000000000..3d955335e62c
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.13.1.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-python/mako
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	gnome2_environment_reset #534582
+
+	#this may not be needed in 3.4.3 and above, please verify
+	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_LIBERIO=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_GPSD=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_N230="$(usex n230)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 25e30ece498b..7174eca1ee3a 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,12 +2,14 @@ AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
+DIST unifi-5.10.5.zip 77373497 BLAKE2B 0716c2ce948a909959d52325d97f9fdbf867492e54bfc12f286659f825f3d5719d334612d71af4bad8d9f1ff076d418df54af8cea18019adbc32cb1972eb5ae6 SHA512 9c8da7fc8b1068a60e5702d377d9cfaa6ea8d90014c3b4e3478bfc0b6a3a1614853befa9cca08c78ebffcdaf4dad119b251c69c52eb8df44acdbe225a28b54ed
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
 DIST unifi-5.8.29.zip 80125147 BLAKE2B d7fcfd8ea5c29c79803f4ee715136a82fb69b3e69802a9a9c4b92e9d4c52d5a72eaeaa3b10405a4eb10df35f1a926c4fb51dcd0c30816d3e58efd15f48b2ea51 SHA512 8c69f406c632661fe713251304910016bed25c2bbabb3aef355626cf6ea6475ba9348d0bec4d2e0f64824190db4deff669ab748cb17cc289112ac07421b56128
 DIST unifi-5.8.30.zip 80120131 BLAKE2B c7e53ff047cd3fc6b0b551d8388a739adf86d0518a86c76aa1688534e2a708bdf9d38d30848ad6a41b03aea12de8f038cd5eb8e9186ecfa3c2a1b782464b7e21 SHA512 0d4a714ba875e17ce359b28e2a0a967366125971f021eb95f598c7e4860c03016afadcef0a4bb6e64f30b99afb790b65aaa166ccc31bb31f268412c1a1f1bffd
 DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
 DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a
+EBUILD unifi-5.10.5.ebuild 1839 BLAKE2B 8cc8bc30720ecb67fee3d43abf8f31e02ad59491201d87cc9fd487f836353576007b851eca4e98150ffcaf939b7b8ce959367fbf4b9409c17010a5a222010369 SHA512 82d8a0ea4012506510f95c27e288883c757bd30035ab21a0aa819ce5aa9d8102589e23495e2e1e050a712a9cc844007a5f6fa0beb9f8bfa7030773ace02c15b1
 EBUILD unifi-5.6.39-r1.ebuild 1721 BLAKE2B b3d2d6df884e5fdc1f09c191dda26eeb71cc05b4f2d51c3556d2b6bee834639f616d542a994f95a6c58bce8b9ae8374ace94d448751fed7fb5058dbdf8a6d67d SHA512 c7b7e8d2196319abacf2094ace35e5fdcb56feb9f22939b28839cc0bab8c40e6f7fe9e16cf2c8ae4992e64e9578f7bff7fcfe0011558c93625e73173b6cc992c
 EBUILD unifi-5.6.40.ebuild 1732 BLAKE2B 083dba38eb9f1007a2c596704d71b1e3064b1029e9c761c4603e32da466d8718d7a6f1cb4ce7a229916c1d89efd253539147acfbcfa43ca7cdbbeb2549ac2d73 SHA512 974837d60c8f133c8c266c0c7f51fdc7ce08f9ac51cb1f70126ba952e314927878a8200ac437a938296640cfd905e9e19266ba30fd6b3af8a62272738d6c92cb
 EBUILD unifi-5.8.29.ebuild 1839 BLAKE2B 970076efaa9aafedb1e93431fcb82c66ae001c3ff715ffbbe7544d0ed57d774ae92756fa905df8cd38cdc9d6d21114b6a664acd8ce93e60884b00a6da6ee078e SHA512 1c2b10eee5d1d11f6dac0642d72c3ad3c82b5b9fe843d5893e372930a70378365f3060eb42e9e62f037b0127346380250d7be2f61b3aa066b14c9956d24ca8b8
diff --git a/net-wireless/unifi/unifi-5.10.5.ebuild b/net-wireless/unifi/unifi-5.10.5.ebuild
new file mode 100644
index 000000000000..291cdbe3baf3
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.10.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used, when it's an unstable, beta or release candidate
+RC_SUFFIX="-6ba4d1bfe5"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS=""
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.9"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 804210edd080..56e68dee6e7f 100644
--- a/perl-core/Manifest.gz
+++ b/perl-core/Manifest.gz
diff --git a/perl-core/Unicode-Collate/Manifest b/perl-core/Unicode-Collate/Manifest
index 88cc3b26d798..2756ef258964 100644
--- a/perl-core/Unicode-Collate/Manifest
+++ b/perl-core/Unicode-Collate/Manifest
@@ -5,5 +5,5 @@ DIST Unicode-Collate-1.25.tar.gz 894836 BLAKE2B e8c16c4e0a126abdaef6a0130371b1e1
 EBUILD Unicode-Collate-1.140.0.ebuild 636 BLAKE2B 38f75de175d10664435dab0afeff21cf49059fb37000fe9f52a17f5fdfdd3041b7971a9908be06185cb0400dd99e1e4030c12656992b234d4cd499c954359e63 SHA512 277c69878082fbef4cf43af75ffd46eb87b6e962dd6d5e4f12c21c9993771c75ff655c725cc5b6fcc7ff1d66f37107d8ec684daf4fd9b2d09ec502671710ebdc
 EBUILD Unicode-Collate-1.190.0.ebuild 608 BLAKE2B 8a079d667cbb2862c32d6491b963def8177656709b0cbfee0b18349323ba8a25db45c65979b095be80ce42ed005eb3eefdb7d9ba7e2f0aaf5a960c6cd6b25156 SHA512 76c79b93f6e4e0e2d12f81bee5cb3a3e7fd4c417cac4863c0ab81e18029ace6facf106d5718550f4eb222d7d75b3ca43dbd1964691a18b2ddcec2d9ece318895
 EBUILD Unicode-Collate-1.210.0.ebuild 608 BLAKE2B 3ed7c687759f8f56658602ed46df83521ffd3ef21f7065cf680ed3f9972eca86b5df377c55b2a695d3c9133125c1ea28bb91a9608e27fb038069e671ee58c253 SHA512 b5db2503eac1f9a4067162c9ffe9c225f571e79f71bc0028a480c2ae0480b5d730f5add8a24296763eb528c27ea0b111b7a705378fef0bf2af0b7f9b21bdcd65
-EBUILD Unicode-Collate-1.250.0.ebuild 628 BLAKE2B 9b5f5d591c0c8b244e8ff3c3e594a7a725241bf0df05d48dec350d5162d3b8ab78ea702c23adbb9caaf726866e328b2db78544f6fffd6f3aee177a62dbc12eb1 SHA512 507d7697726a4cd4bd6fb97348a0e87219418f7eb88e53547b03262bef270ec23fd036ba57c170f8fbc968f66c63f656e61ee3e0c01e3aa06ab87f52cc4f019d
+EBUILD Unicode-Collate-1.250.0.ebuild 627 BLAKE2B 0f53f28f4c5081352ea9ee614185f28aa9452cddddb90508c1e4561f3c4fc52e1661fbfa58b801954b1541f9187f2ec872318ee3c2e3c54c81406ff41f051637 SHA512 51568150aff20405f6adea46bb322a99312fa4b8c01396827bc66b9a12170ede136e2a234462e65d9e8e4378610b24018df774b1fe97ad66418cd846aa6e41ae
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild b/perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild
index 82557eab0889..e416ade7022c 100644
--- a/perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild
+++ b/perl-core/Unicode-Collate/Unicode-Collate-1.250.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Unicode Collate Algorithm"
 
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 068543b41548..62aed19e0e11 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 04e76200a650..72082ef2ada5 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Corentin Pazdera <nado@troglodyte.be> (28 Dec 2018)
+# Requires virtual/pypy which isn't keyworded for ARM.
+www-servers/uwsgi pypy
+
 # Davide Pesavento <pesa@gentoo.org> (27 Dec 2018)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 814305d3b526..e3797aaa766b 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,11 @@
 -neon
 -armvfp
 
+# Mart Raudsepp <leio@gentoo.org> (07 Jan 2019)
+# Does not work on arm64 until dev-lang/luajit-2.1
+# https://github.com/LuaJIT/LuaJIT/issues/26
+luajit
+
 # Michał Górny <mgorny@gentoo.org> (16 Jul 2018)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -38,10 +43,6 @@ python_single_target_python3_7
 # No OpenCL provider is available on arm64.
 opencl
 
-# Michał Górny <mgorny@gentoo.org> (03 Feb 2018)
-# dev-lang/luajit not tested here.
-luajit
-
 # Brian Evans <grknight@gentoo.org> (02 Mar 2018)
 # dev-db/qdbm is net yet keyworded
 qdbm
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 3a7f4199e21c..a5c0df6c66a9 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -28,11 +28,6 @@ dev-lang/erlang hipe
 # Mask USE=games to avoid unkeyworded games-util/qstat.
 net-analyzer/monitoring-plugins game
 
-# Mart Raudsepp <leio@gentoo.org> (30 Mar 2018)
-# Mask USE=mp3 for media-plugins/gst-plugins-meta:1.0 since
-# media-plugins/gst-plugins-mpg123 is not keyworded (bug #635466)
-media-plugins/gst-plugins-meta:1.0 mp3
-
 # Sergei Trofimovich <slyfox@gentoo.org> (20 Dec 2017)
 # Mask USE=rados for net-analyzer/rrdtool since sys-cluster/ceph is not
 # keyworded (bug #597174)
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b957a95fa4fc..e82e9643d137 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -64,11 +64,11 @@ GRUB_PLATFORMS=""
 # By default enable all extensions with no dependencies
 LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
 
-# Tomáš Chvátal <scarabeus@gentoo.org> (15 May 2011)
 # Andreas K. Hüttel <dilfridge@gentoo.org> (19 Aug 2011, 25 Mar 2012)
 # Johannes Huber <johu@gentoo.org> (15 Apr 2018)
-# By default build all calligra features.
-CALLIGRA_FEATURES="karbon plan sheets stage words"
+# Andreas Sturmlechner <asturm@gentoo.org> (01 Jan 2019)
+# By default build all calligra features (except unmaintained: stage).
+CALLIGRA_FEATURES="karbon plan sheets words"
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
 # Small default list of enabled plugins for collectd
@@ -99,7 +99,7 @@ NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb p
 # Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build target(s)
 # Updated to include ruby24 on 12 Nov 2018
-RUBY_TARGETS="ruby23 ruby24"
+RUBY_TARGETS="ruby24"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 82ac3f93ec4f..203f9d99c71b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires >=portage-2.1.1
@@ -7,6 +7,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Depend on the EOL PHP 7.0
+dev-libs/Ice php
+www-servers/nginx-unit php7-0
+
 # Michał Górny <mgorny@gentoo.org> (01 Dec 2018)
 # Moved from use.mask to specific packages.
 # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 48dfc33ec062..c2d1aaa5bcb8 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -16,12 +16,6 @@ app-admin/sudo sssd
 # app-misc/ddcutil is not yet stable.
 kde-plasma/powerdevil brightness-control
 
-# Andreas Sturmlechner <asturm@gentoo.org> (11 Sep 2018)
-# Sometimes crashes Plasma with Appstream versions pre-0.12.
-# Newer versions of dev-libs/appstream are not stable yet. See also:
-# https://mail.kde.org/pipermail/kde-distro-packagers/2018-September/000347.html
-kde-plasma/plasma-desktop appstream
-
 # Michał Górny <mgorny@gentoo.org> (07 Jun 2018)
 # sys-libs/netbsd-csu not stable yet.
 sys-devel/clang-runtime crt
@@ -38,10 +32,6 @@ media-video/vlc aom srt
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (22 Apr 2018)
-# Huge patchset in 6.0, early crash reports with fix in ~arch KF5/Plasma-5
-=app-office/libreoffice-6.0* kde
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Mar 2018)
 # sci-geosciences/grass is not stable
 sci-geosciences/qgis grass
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 50595c64203a..b814ac9064a9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.0 target as EOL
+php_targets_php7-0
+
 # Matt Turner <mattst88@gentoo.org> (11 Nov 2018)
 # d3d9 only works on amd64/x86.
 d3d9
@@ -12,10 +16,6 @@ d3d9
 # Mask PostgreSQL 12 while in (pre-)alpha.
 postgres_targets_postgres12
 
-# Brian Evans <grknight@gentoo.org> (10 Aug 2018)
-# Mask PHP 7.3 target while in beta
-php_targets_php7-3
-
 # Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
 # For ancient hardware. Tired of maintaining. Masked for removal in 30 days.
 # Bug #606132.
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 2ec6d823cff8..2f3562ed47e0 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.3 target while unstable
+php_targets_php7-3
+
 # Zac Medico <zmedico@gentoo.org> (01 Sep 2016)
 # Needs virtual/pypy* stable
 python_targets_pypy
diff --git a/profiles/default/linux/hppa/13.0/deprecated b/profiles/default/linux/hppa/13.0/deprecated
new file mode 100644
index 000000000000..791ed7f5d9fc
--- /dev/null
+++ b/profiles/default/linux/hppa/13.0/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0
diff --git a/profiles/default/linux/hppa/13.0/desktop/deprecated b/profiles/default/linux/hppa/13.0/desktop/deprecated
new file mode 100644
index 000000000000..42b2c8452a08
--- /dev/null
+++ b/profiles/default/linux/hppa/13.0/desktop/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0/desktop
diff --git a/profiles/default/linux/hppa/13.0/developer/deprecated b/profiles/default/linux/hppa/13.0/developer/deprecated
new file mode 100644
index 000000000000..0ed4eb67a64c
--- /dev/null
+++ b/profiles/default/linux/hppa/13.0/developer/deprecated
@@ -0,0 +1 @@
+default/linux/hppa/17.0/developer
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated
new file mode 100644
index 000000000000..ba568c179e38
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/multilib/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated
new file mode 100644
index 000000000000..b6ad0afeb646
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/multilib/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
new file mode 100644
index 000000000000..55af573368b1
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/multilib/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n32/deprecated b/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
new file mode 100644
index 000000000000..997a4945fc4f
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n32
diff --git a/profiles/default/linux/mips/13.0/mipsel/n64/deprecated b/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
new file mode 100644
index 000000000000..2742db424254
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/n64
diff --git a/profiles/default/linux/mips/13.0/mipsel/o32/deprecated b/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
new file mode 100644
index 000000000000..0b4da443b64e
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/mipsel/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/mipsel/o32
diff --git a/profiles/default/linux/mips/13.0/multilib/n32/deprecated b/profiles/default/linux/mips/13.0/multilib/n32/deprecated
new file mode 100644
index 000000000000..ca9e0e35c430
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/multilib/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n32
diff --git a/profiles/default/linux/mips/13.0/multilib/n64/deprecated b/profiles/default/linux/mips/13.0/multilib/n64/deprecated
new file mode 100644
index 000000000000..0e3d02e8bad7
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/multilib/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/n64
diff --git a/profiles/default/linux/mips/13.0/multilib/o32/deprecated b/profiles/default/linux/mips/13.0/multilib/o32/deprecated
new file mode 100644
index 000000000000..d71e4e59c9ff
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/multilib/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/multilib/o32
diff --git a/profiles/default/linux/mips/13.0/n32/deprecated b/profiles/default/linux/mips/13.0/n32/deprecated
new file mode 100644
index 000000000000..3f9f288b09a9
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/n32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n32
diff --git a/profiles/default/linux/mips/13.0/n64/deprecated b/profiles/default/linux/mips/13.0/n64/deprecated
new file mode 100644
index 000000000000..22fdb33af1a3
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/n64/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/n64
diff --git a/profiles/default/linux/mips/13.0/o32/deprecated b/profiles/default/linux/mips/13.0/o32/deprecated
new file mode 100644
index 000000000000..98ce3606a057
--- /dev/null
+++ b/profiles/default/linux/mips/13.0/o32/deprecated
@@ -0,0 +1 @@
+default/linux/mips/17.0/o32
diff --git a/profiles/desc/calligra_features.desc b/profiles/desc/calligra_features.desc
index 5f6dc2261dbe..2915e518a3b8 100644
--- a/profiles/desc/calligra_features.desc
+++ b/profiles/desc/calligra_features.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of CALLIGRA_FEATURES USE_EXPAND flags.
@@ -7,4 +7,5 @@
 karbon - CALLIGRA_FEATURES option to build vector image editor
 plan - CALLIGRA_FEATURES option to build project planning component
 sheets - CALLIGRA_FEATURES option to build spreadsheet processor
+stage - CALLIGRA_FEATURES option to build presentation processor
 words - CALLIGRA_FEATURES option to build word processor
diff --git a/profiles/package.mask b/profiles/package.mask
index 9f11c1d648ef..050d317fe9f9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,34 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (11 Jan 2019)
+# Mask PHP 7.0 for removal; EOL and known security issues
+# Removal in 30 days
+dev-lang/php:7.0
+virtual/httpd-php:7.0
+
+# Mikle Kolyada <zlogene@gentoo.org> (10 Jan 2019)
+# Masked due to QA violation (bug #672054)
+sci-electronics/librepcb
+
+# Craig Andrews <candrews@gentoo.org> (1 Jan 2019)
+# Requires dev-libs/openssl-1.1.1, Bug 674148
+dev-libs/gost-engine
+
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
+# Superseded by www-client/falkon. Masked for removal in 30 days.
+www-client/qupzilla
+
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
+# Package outdated for years, build errors, unable to trade with.
+# Bugs 544800, 592946, 610736. Masked for removal in 30 days.
+app-office/QtBitcoinTrader
+
+# Andreas Sturmlechner <asturm@gentoo.org> (31 Dec 2018)
+# Dead upstream since 2014-02-09, does not build.
+# Bugs 463928, 476890, 623172, 662270. Masked for removal in 30 days.
+net-misc/hotot
+
 # Alon Bar-Lev <alonbl@gentoo.org> (30 Dec 2018)
 # Upstream is dead.
 # Package does not support openssl-1.1, significant change to package.
@@ -44,12 +72,6 @@ app-crypt/openssl-tpm-engine
 # experimental features and accept a more unstable release.
 >=www-client/chromium-73
 
-# Andreas Sturmlechner <asturm@gentoo.org> (25 Dec 2018)
-# API breakage, tracker bug #673720
-=media-gfx/exiv2-0.27*
-# Pre-release, adding masked for exiv2-0.27 compatibility
-=media-gfx/digikam-6.0.0_beta3
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (25 Dec 2018)
 # Included in dev-tex/texlive-publishers-2017; there is no
 # need for a separate package anymore. Removal in 30 days.
@@ -77,12 +99,6 @@ dev-tex/revtex
 <x11-base/xorg-server-1.20.3
 <x11-base/xorg-drivers-1.20
 
-# Mikle Kolyada <zlogene@gentoo.org> (12 Dec 2018)
-# grub:0 is dead and not being developed by upstream.
-# Two open bugs (427340, 591574).
-# Removal in 30 days.
-sys-boot/grub-static
-
 # Hans de Graaff <graaff@gentoo.org> (12 Dec 2018)
 # Old ruby23 only slots without any reverse dependencies.
 # Use the newer slots instead. Removal in 30 days.
@@ -221,8 +237,7 @@ net-analyzer/mate-netspeed
 # Matthias Maier <tamiko@gentoo.org> (1 Sep 2018)
 # Mask 0.7.0 and  1.0.1 for the time being until a compatible LLVM version
 # made it into the tree, bug #665192
-~dev-lang/julia-0.7.0
-~dev-lang/julia-1.0.1
+~dev-lang/julia-1.0.3
 
 # Bernard Cafarelli <voyageur@gentoo.org> (13 Aug 2018)
 # Beta release with new features, masked for testing
@@ -235,61 +250,6 @@ net-analyzer/mate-netspeed
 ~app-portage/gemato-14.0m
 ~app-portage/gemato-9999m
 
-# Kent Fredric <kentnl@gentoo.org> (10 Jul 2018)
-# Perl 5.28 Staging block
-=dev-lang/perl-5.28.0
-=virtual/perl-Attribute-Handlers-1.10.0
-=virtual/perl-B-Debug-1.260.0
-=virtual/perl-CPAN-2.200.0
-=virtual/perl-Carp-1.500.0
-=virtual/perl-Compress-Raw-Zlib-2.76.0
-=virtual/perl-Data-Dumper-2.170.0
-=virtual/perl-Devel-PPPort-3.400.0
-=virtual/perl-Digest-SHA-6.10.0
-=virtual/perl-Encode-2.970.0
-=virtual/perl-Exporter-5.730.0
-=virtual/perl-ExtUtils-CBuilder-0.280.230
-=virtual/perl-ExtUtils-Constant-0.250.0
-=virtual/perl-ExtUtils-Install-2.140.0
-=virtual/perl-ExtUtils-MakeMaker-7.340.0
-=virtual/perl-ExtUtils-ParseXS-3.390.0
-=virtual/perl-File-Path-2.150.0
-=virtual/perl-File-Spec-3.740.0
-=virtual/perl-Filter-Simple-0.950.0
-=virtual/perl-Getopt-Long-2.500.0
-=virtual/perl-I18N-LangTags-0.430.0
-=virtual/perl-IO-Socket-IP-0.390.0
-=virtual/perl-IO-1.390.0
-=virtual/perl-IPC-Cmd-1.0.0
-=virtual/perl-JSON-PP-2.970.10
-=virtual/perl-Locale-Maketext-1.290.0
-=virtual/perl-Math-BigInt-FastCalc-0.500.600
-=virtual/perl-Math-BigInt-1.999.811
-=virtual/perl-Math-BigRat-0.261.300
-=virtual/perl-Net-Ping-2.620.0
-=virtual/perl-Scalar-List-Utils-1.500.0
-=virtual/perl-Socket-2.27.0
-=virtual/perl-Storable-3.80.0
-=virtual/perl-Test-Harness-3.420.0
-=virtual/perl-Test-Simple-1.302.133
-=virtual/perl-Test-1.310.0
-=virtual/perl-Time-HiRes-1.975.900
-=virtual/perl-Time-Piece-1.320.400
-=virtual/perl-Unicode-Normalize-1.260.0
-=virtual/perl-XSLoader-0.300.0
-=virtual/perl-bignum-0.490.0
-=virtual/perl-if-0.60.800
-=virtual/perl-libnet-3.110.0
-=virtual/perl-podlators-4.100.0
-=virtual/perl-threads-shared-1.580.0
-=virtual/perl-threads-2.220.0
-=virtual/perl-version-0.992.300
-
-# Brian Evans <grknight@gentoo.org> (14 Jun 2018)
-# Mask new php pre-releases for initial testing
-dev-lang/php:7.3
-virtual/httpd-php:7.3
-
 # Kent Fredric <kentnl@gentoo.org> (27 May 2018)
 # Subject to Man-in-the-middle security bypass vulnerability.
 # Retained in tree only for users who need older versions
diff --git a/profiles/prefix/linux/package.mask b/profiles/prefix/linux/package.mask
index 17532723914b..b13eb34a5206 100644
--- a/profiles/prefix/linux/package.mask
+++ b/profiles/prefix/linux/package.mask
@@ -1,2 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
+# Michael Haubenwallner <haubi@gentoo.org> (08 Jan 2019)
+# Prefix Guest does use host libc and host kernel's headers,
+# hence packages should depend on virtual/os-headers instead.
+sys-kernel/linux-headers
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 2f769b4105d8..021d9c78a1c0 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -31,8 +31,5 @@ media-libs/mesa egl wayland
 # Required by kde-apps/kdenlive
 media-libs/mlt ffmpeg frei0r kdenlive melt
 
-# Required by kde-plasma/plasma-pa
-media-sound/pulseaudio gnome
-
 # Required by kde-frameworks/kactivities
 sys-libs/zlib minizip
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c83efe5cf181..353a82e77973 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -524,6 +524,9 @@ app-emulation/libguestfs:fuse - Enable image mount support via fuse
 app-emulation/libguestfs:inspect-icons - Use media-gfx/icoutils for acces icon file in image and inspect it
 app-emulation/libguestfs:libvirt - Use app-emulation/libvirt to manipulate VMs
 app-emulation/libguestfs:systemtap - Use dev-util/systemtap to inspect VM via "probes" way
+app-emulation/libpod:apparmor - Enable AppArmor support.
+app-emulation/libpod:btrfs - Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.
+app-emulation/libpod:ostree - Enables dependencies for handling of OSTree images.
 app-emulation/libspectrum:gcrypt - Use dev-libs/libgcrypt for low-level crypto of some features, including logfiles.
 app-emulation/libvirt:apparmor - Enable AppArmor support
 app-emulation/libvirt:firewalld - DBus interface to iptables/ebtables allowing for better runtime management of your firewall.
@@ -917,7 +920,6 @@ app-misc/blink1:server - Build and install REST API server (currently hard-coded
 app-misc/blink1:tool - Build and install command-line tool blink1-tool
 app-misc/byobu:screen - Use app-misc/screen as the default backend
 app-misc/ca-certificates:cacert - Include root certificates from CAcert (http://www.cacert.org/) and Software in the Public Interest (http://www.spi-inc.org/)
-app-misc/ca-certificates:insecure_certs - Install certificates which are known to be untrustworthy.
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
 app-misc/carbon-c-relay:oniguruma - use dev-libs/oniguruma as regex implementation
 app-misc/carbon-c-relay:pcre2 - use dev-libs/libpcre2 as regex implementation
@@ -1116,6 +1118,10 @@ app-office/calligra:okular - Enable bindings for kde-apps/okular
 app-office/calligra:phonon - Build stage/eventplugins and videoshape plugin using media-libs/phonon
 app-office/calligra:pim - Enable support for KDE PIM resources integration
 app-office/calligra:spacenav - Enable support for the 3Dconnexion spacenav input device via dev-libs/libspnav
+app-office/calligraplan:activities - Enable kactivities support
+app-office/calligraplan:holidays - Enable kde-frameworks/kholidays integration
+app-office/calligraplan:kwallet - Enable access to encrypted OpenDocument files with kde-frameworks/kwallet storage
+app-office/calligraplan:pim - Enable support for KDE PIM resources integration
 app-office/glabels:barcode - Enable barcode support through external libraries.
 app-office/gnucash:aqbanking - Connect to some internet banks via AqBanking
 app-office/gnucash:chipcard - Enable support for chipcard reading and processing.
@@ -1955,6 +1961,7 @@ dev-java/openjdk:gentoo-vm - Allow this JDK to be recognised by Gentoo (package
 dev-java/openjdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
 dev-java/openjdk:jbootstrap - Build OpenJDK twice, the second time using the result of the first
 dev-java/openjdk:source - Install JVM sources
+dev-java/openjdk:systemtap - Enable SystemTAP/DTrace tracing
 dev-java/openjdk:webstart - Provide javaws command through symlink to icedtea-web
 dev-java/openjdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/openjdk-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
@@ -2524,6 +2531,7 @@ dev-libs/poco:util - Several utility classes (like logger, timer, config file pa
 dev-libs/poco:zip - Add support for the zip & gz archive formats
 dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver
 dev-libs/serdisplib:tools - Build optional tools.
+dev-libs/softhsm:gost - Enable gost algorithm
 dev-libs/softhsm:migration-tool - Build db migration tool
 dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
@@ -3197,7 +3205,6 @@ dev-util/perf:unwind - Use sys-libs/libunwind for frame unwinding support.
 dev-util/pkgconf:pkg-config - Install as a replacement for dev-util/pkgconfig
 dev-util/pkgconfig:internal-glib - Use internal copy of dev-libs/glib
 dev-util/pkgconfig-openbsd:pkg-config - Install as a replacement for dev-util/pkgconfig
-dev-util/radare2:system-capstone - Use dev-libs/capstone instead of bundled copy.
 dev-util/scanmem:gui - Enable the GameConqueror GUI
 dev-util/schroot:btrfs - Enable support for chroots using btrfs snapshots.
 dev-util/schroot:dchroot - Enables the building of a wrapper named "dchroot", replacing sys-apps/dchroot.
@@ -3819,6 +3826,7 @@ kde-plasma/kdeplasma-addons:webengine - Enable dictionary and web browser applet
 kde-plasma/kinfocenter:gles2 - Show OpenGL ES information in kinfocenter
 kde-plasma/kinfocenter:pci - Show advanced PCI information
 kde-plasma/kmenuedit:hotkeys - Enable support for hotkey editing
+kde-plasma/kscreenlocker:consolekit - Support for killing the screenlocker when sys-auth/consolekit is the session tracker
 kde-plasma/kwin:gles2 - Use OpenGL ES 2 instead of full GL
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
 kde-plasma/libksysguard:webkit - Enable display of detailed memory information using dev-qt/qtwebkit.
@@ -5777,6 +5785,7 @@ net-firewall/iptables:netlink - Build against libnfnetlink which enables the nfn
 net-firewall/iptables:nftables - Support nftables kernel interface
 net-firewall/iptables:pcap - Build against net-libs/libpcap which enables the nfbpf_compile util
 net-firewall/nftables:json - Enable JSON support via dev-libs/jansson
+net-firewall/nftables:modern_kernel - Install init scripts for 3.18 or higher kernels with atomic rule updates
 net-firewall/nufw:nfconntrack - Use netfilter_conntrack
 net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE
 net-firewall/nufw:pam_nuauth - Add support for pam nufw from PAM
@@ -5819,11 +5828,16 @@ net-fs/nfs-utils:nfsidmap - Enable support for newer nfsidmap helper
 net-fs/nfs-utils:nfsv4 - Enable support for NFSv4
 net-fs/nfs-utils:nfsv41 - Enable support for NFSv4.1
 net-fs/nfs-utils:uuid - Support UUID lookups in rpc.mountd
+net-fs/openafs:api - Build API documentation using app-doc/doxygen. May take a *long* time to build.
 net-fs/openafs:bitmap-later - Enable fast startup of file server by not reading bitmap till needed.
 net-fs/openafs:fuse - Build fuse client.
+net-fs/openafs:kauth - Install the DEPRECATED kauth server, PAM modules, and utilities
 net-fs/openafs:modules - Build libafs kernel module. Disable only if you know what you're doing: without this module OpenAFS client will not work.
+net-fs/openafs:namei - Enable namei fileserver instead of inode fileserver. You should disable this option only if compatibility with inode format AFS storage is required.
 net-fs/openafs:pthreaded-ubik - Enable installation of pthreaded ubik applications.
 net-fs/openafs:supergroups - Enable support for nested pts groups.
+net-fs/openafs:tsm - Enable use of the Tivoli TSM API libraries from app-backup/tsm for butc support. AMD64 only.
+net-fs/openafs:ubik-read-while-write - Enable vlserver read from db cache during write locks (EXPERIMENTAL)
 net-fs/s3fs:gnutls - Enable net-libs/gnutls crypto backend
 net-fs/s3fs:nettle - Use dev-libs/nettle network functions with GnuTLS.
 net-fs/s3fs:nss - Enable dev-libs/nss crypto backend
@@ -6533,12 +6547,14 @@ net-misc/electron-cash:sync - Enable plugin to sync wallet metadata across multi
 net-misc/electron-cash:vkb - Enable plugin for virtual keyboard
 net-misc/electrum:audio_modem - Enable plugin to support Audio Modem
 net-misc/electrum:cli - Enables the CLI interface
+net-misc/electrum:coldcard - Enable plugin to support Coldcard Hardware Wallet
 net-misc/electrum:cosign - Enable plugin to support multisig wallets between multiple Electrum clients
 net-misc/electrum:digitalbitbox - Enable plugin to support Digital Bitbox hardware wallet
 net-misc/electrum:email - Enable plugin to support emailing invoices
 net-misc/electrum:greenaddress_it - Enable plugin to verify GreenAddress.it instant transactions
 net-misc/electrum:qrcode - Enable QR code scanning with media-gfx/zbar
 net-misc/electrum:revealer - Enable revealer plugin for extra security. https://revealer.cc/
+net-misc/electrum:safe_t - Enable plugin to support Safe-T mini Wallet
 net-misc/electrum:sync - Enable plugin to sync wallet metadata across multiple Electrum clients
 net-misc/electrum:trustedcoin_com - Enable plugin to use two-factor service by TrustedCoin.com
 net-misc/electrum:vkb - Enable plugin for virtual keyboard
@@ -6877,12 +6893,14 @@ net-p2p/bitcoin-qt:bitcoin_policy_rbf - Replace By Fee policy: Your node will pr
 net-p2p/bitcoin-qt:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
 net-p2p/bitcoin-qt:libevent - Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration
 net-p2p/bitcoin-qt:qrcode - Enable generation of QR Codes for receiving payments
+net-p2p/bitcoin-qt:system-leveldb - Use the system-wide dev-libs/leveldb instead of bundled
 net-p2p/bitcoin-qt:upnp - Enable Universal Plug and Play
 net-p2p/bitcoin-qt:wallet - Enable wallet support
 net-p2p/bitcoin-qt:zeromq - Report blocks and transactions via zeromq
 net-p2p/bitcoind:asm - Enable assembly for optimization
 net-p2p/bitcoind:bitcoin_policy_rbf - Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order
 net-p2p/bitcoind:knots - Build enhanced Bitcoin Knots version, rather than Bitcoin Core
+net-p2p/bitcoind:system-leveldb - Use the system-wide dev-libs/leveldb instead of bundled
 net-p2p/bitcoind:upnp - Enable Universal Plug and Play
 net-p2p/bitcoind:wallet - Enable wallet support
 net-p2p/bitcoind:zeromq - Report blocks and transactions via zeromq
@@ -7299,13 +7317,11 @@ sci-chemistry/cns:aria - Support patch for sci-chemistry/aria
 sci-chemistry/eden:double-precision - More precise calculations at the expense of speed
 sci-chemistry/ghemical:openbabel - Use sci-chemistry/openbabel for file conversions
 sci-chemistry/ghemical:seamonkey - Add support for the Seamonkey web-browser
-sci-chemistry/gromacs:boost - Enable external boost library
 sci-chemistry/gromacs:cuda - Enable cuda non-bonded kernels
 sci-chemistry/gromacs:double-precision - More precise calculations at the expense of speed
 sci-chemistry/gromacs:gmxapi - Add support for gmxapi library
 sci-chemistry/gromacs:hwloc - Enable HWLoc lib support
 sci-chemistry/gromacs:lmfit - Use external sci-libs/lmfit
-sci-chemistry/gromacs:make-symlinks - Create symbolic links for pre-5.0 binary names
 sci-chemistry/gromacs:mkl - Use sci-libs/mkl for fft, blas, lapack routines
 sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
 sci-chemistry/gromacs:opencl - Enable opencl non-bonded kernels
@@ -7343,6 +7359,8 @@ sci-electronics/kicad:ngspice - Enable circuit simulation
 sci-electronics/kicad:occ - Enable viewing 3D rendering of designs via opencascade
 sci-electronics/kicad:oce - Enable viewing 3D rendering of designs via OCE
 sci-electronics/kicad:python - Enable python scripting support
+sci-electronics/kicad-packages3d:occ - Use sci-libs/opencascade for data exchange
+sci-electronics/kicad-packages3d:oce - Use sci-libs/oce for data exchange
 sci-electronics/ngspice:shared - Build ngspice as a shared library
 sci-electronics/pcb:gcode - gcode file export
 sci-electronics/pcb:gif - GIF graphics export
@@ -8417,6 +8435,7 @@ sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz
 sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/zstd
 sys-fs/squashfuse:lz4 - Enable support for lz4 compression
+sys-fs/squashfuse:zstd - Enable support for zstd compression
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
 sys-fs/udisks:cryptsetup - Enable sys-fs/cryptsetup support
 sys-fs/udisks:elogind - Use sys-auth/elogind for session tracking
@@ -8635,6 +8654,7 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
 www-apps/gitit:network-uri - Get Network.URI from the network-uri package.
 www-apps/gitit:plugins - enables optional plugin runtime loader
 www-apps/hugo:sass - Enable SASS/SCSS support
+www-apps/icingaweb2:apache2-server - Adds support for the apache2-server
 www-apps/icingaweb2:fpm - Adds FPM support to php
 www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
@@ -8724,9 +8744,6 @@ www-client/firefox:system-jpeg - Use the system-wide media-libs/libjpeg-turbo in
 www-client/firefox:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 www-client/firefox:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 www-client/firefox:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
-www-client/google-chrome:plugins - Add system plugins path to launcher
-www-client/google-chrome-beta:plugins - Add system plugins path to launcher
-www-client/google-chrome-unstable:plugins - Add system plugins path to launcher
 www-client/jd:migemo - Enable migemo support for Japanese
 www-client/jd:oniguruma - Use dev-libs/oniguruma for regular expression
 www-client/links:libevent - Enable dev-libs/libevent support
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 6827cb469018..1eda1f070dba 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 9d7401b89455..94241da69f9c 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -5,8 +5,8 @@ AUX celestia-1.6.1-gcc47.patch 846 BLAKE2B 26a88bdf055014c2d2419fdde5e8e6667e9c1
 AUX celestia-1.6.1-libpng15.patch 391 BLAKE2B 6114b4b82a92dd572c3b13ecae23118fb25b1a0a3903b15a4675cae56b0233834d391ec47b4ed23473a6ddb82b07c9103f9459e00587b1aafebf256c02f44137 SHA512 d9d79a31d5ace5938fb419511f730d1a4c56d1d4cb3bac043ec52d63a2172e4c3788dcc272b36247c09571b8f851984fcf99f523184c2c61b6fb6a4178996f7f
 AUX celestia-1.6.1-libpng16.patch 570 BLAKE2B 52710f0e34f8ca6364c2938f3b6839581a25b5e5637382f6995b96cb88b08330a2f46a8e150303d0bb902e6fdeb4755c4cb62499eb3f2435413a0052e6dfe5f7 SHA512 e9721364ec43eb5a1a73ee02553e81e340d56fdca94c8f7ec2825082487422772070f486bf23d2fb11e5e9bc09405e95ae9c73ff136ea7ad3c5c6a7f508e29a1
 AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba2f5882fbce6205b0180d42c34899b88fd19df92b1b96eed45d3ca3931c289e3f8ea96a71fb3a8de0d68266136e4587 SHA512 31ef6c716486ddada988c2ac34e553cd5f928735454e3b74f4a2b0fa15a9b6594c87e40bf1345acc52cdc20d27bb35714fc633c9952a403146cb09966babe26b
-AUX celestia-1.6.99-cfg.patch 759 BLAKE2B dddef7d207eaf975d68886d9c0a4aa74c055a08468b1d00dda45b35b5777b481888c0a8c140ad5a7ebf10a96081a273513cb7c351de779a5a2a854d4a6f4fb4d SHA512 17eb15ec550179465d653b055d8af13b9575853f83226faa718ae9288a2aed42979d9d943e06ff8a71a34a6e994c7418b4bba2d608a96ad3517d26070f36bec3
+AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832
 DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
 EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6
-EBUILD celestia-9999.ebuild 2479 BLAKE2B 7b6a3f8d756c56c59f07c90f1f61ed148537aafd8eb5c987789829b585aa861c8f1fdf79c216f27bc44c7f51112c4b54962a598f68af44a99d5e1f65d81c3cd9 SHA512 7e2a0c18b169125a60001fd0303d3d67911bd2779f9d47c40e72297b157e21d1f25ac07b6a6a48edf94567520441d5ed879a055ea0045c82783fa7056f6f3f99
+EBUILD celestia-9999.ebuild 2546 BLAKE2B c72d8d78533a4e03e0eb4ea7ddfac8ce1a49690c44d1bb8595cc74223d744626c44cc3d5455f128f2948bad46c978c30888320b860dbe8a1a36c33a0c7754c17 SHA512 4645ff704d2450c879ea0207e9f62e16ab5335a8be724218ab6fdf05e4297827443cb73112b5e2402fb41e2e34d8e566ee48173c586a1e2ed183f2fef4a24dbe
 MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild
index 4e61192de39e..b3f1f95bcbf7 100644
--- a/sci-astronomy/celestia/celestia-9999.ebuild
+++ b/sci-astronomy/celestia/celestia-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools flag-o-matic xdg-utils
+inherit cmake-utils desktop flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="OpenGL 3D space simulator"
 HOMEPAGE="https://celestia.space"
@@ -18,23 +18,40 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gtk nls pch theora threads"
+IUSE="glut gtk nls +qt5 theora"
+
+REQUIRED_USE="|| ( glut gtk qt5 )"
 
 RDEPEND="
+	>=dev-lang/lua-5.1:*
+	dev-libs/libfmt
+	media-libs/glew:0
+	virtual/glu
 	virtual/opengl
 	virtual/jpeg:0
 	media-libs/libpng:0=
-	>=dev-lang/lua-5.1:*
+	glut? ( media-libs/freeglut )
 	gtk? (
 		x11-libs/gtk+:2
 		>=x11-libs/gtkglext-1.0
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
 	)
-	!gtk? ( media-libs/freeglut )
-	cairo? ( x11-libs/cairo )
-	theora? ( media-libs/libtheora )"
+"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-cpp/eigen
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	# make better desktop files
@@ -43,31 +60,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.99-cfg.patch
 )
 
-pkg_setup() {
-	# Check for one for the following use flags to be set.
-	if use gtk; then
-		einfo "USE=\"gtk\" detected."
-		CELESTIA_GUI="gtk"
-	else
-		ewarn "If you want to use the full gui, set USE=\"gtk\""
-		ewarn "Defaulting to glut support (no GUI)."
-		CELESTIA_GUI="glut"
-	fi
-}
-
 src_prepare() {
 	default
 
-	# remove flags to let the user decide
-	local cf
-	for cf in -O2 -ffast-math \
-		-fexpensive-optimizations \
-		-fomit-frame-pointer; do
-		sed -i \
-			-e "s/${cf}//g" \
-			configure.ac admin/* || die "sed failed"
-	done
-	eautoreconf
 	filter-flags "-funroll-loops -frerun-loop-opt"
 
 	### This version of Celestia has a bug in the font rendering and
@@ -77,35 +72,48 @@ src_prepare() {
 }
 
 src_configure() {
-	# force lua in 1.6.1. seems to be inevitable
-	local myeconfargs=(
-		--disable-rpath
-		--with-${CELESTIA_GUI}
-		--with-lua
-		$(use_enable cairo)
-		$(use_enable threads threading)
-		$(use_enable nls)
-		$(use_enable pch)
-		$(use_enable theora)
+	# force lua. Seems still to be inevitable
+	local mycmakeargs=(
+		#-DENABLE_CELX="$(usex lua)"
+		-DENABLE_CELX=ON
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_GLUT="$(usex glut)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WIN=OFF
+		-DENABLE_THEORA="$(usex theora)"
 	)
-	econf "${myeconfargs[@]}"
+	cmake-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	cmake-utils_src_install
+
 	local size
 	for size in 16 22 32 48 ; do
-		newicon "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
+		newicon -s ${size} "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png
 	done
 
-	[[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop
+	use glut && domenu ${PN}.desktop
+	local ui
+	for ui in gtk qt5 ; do
+		if use ${ui} ; then
+			sed \
+				-e "/^Name/s@\$@ (${ui} interface)@" \
+				-e "/^Exec/s@${PN}@${PN}-${ui/qt5/qt}@" \
+				${PN}.desktop > "${T}"/${PN}-${ui}.desktop || die
+			domenu "${T}"/${PN}-${ui}.desktop
+		fi
+	done
 	dodoc AUTHORS README TRANSLATORS *.txt
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch b/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch
index 53b0e5ad265e..943d81b416b1 100644
--- a/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch
+++ b/sci-astronomy/celestia/files/celestia-1.6.99-cfg.patch
@@ -1,6 +1,6 @@
-From af91ecccb4fe46181d22d4195cb4cca1c734ae63 Mon Sep 17 00:00:00 2001
+From 82023197fabf148e164c538ce0839e3add31068d Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 4 Apr 2018 15:28:32 +0200
+Date: Wed, 2 Jan 2019 14:25:37 +0100
 Subject: [PATCH] celestia.cfg: Add ~/.celestia as extras directory.
 
 ---
@@ -8,18 +8,18 @@ Subject: [PATCH] celestia.cfg: Add ~/.celestia as extras directory.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/celestia.cfg b/celestia.cfg
-index 1a69b422..635b0084 100644
+index ea9e4f58..00edf250 100644
 --- a/celestia.cfg
 +++ b/celestia.cfg
-@@ -176,7 +176,7 @@ StarTextures
+@@ -197,7 +197,7 @@ StarTextures
  # or
  #   ExtrasDirectories  [ "D:\\celestia-extras" ]
  #------------------------------------------------------------------------
--  ExtrasDirectories  [ "data" "extras" ]
-+  ExtrasDirectories  [ "data" "extras" "~/.celestia" ]
+-  ExtrasDirectories  [ "extras-standard" "extras" ]
++  ExtrasDirectories  [ "extras-standard" "extras" "~/.celestia" ]
  
  
  #------------------------------------------------------------------------
 -- 
-2.17.0
+2.20.1
 
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index fb7beaa9c844..43c2babb9d9a 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,4 +1,4 @@
-AUX stellarium-0.18.2.patch 6217 BLAKE2B 5e4df179b4364f1bf56d2c9f719d07783d25ee95242ca33fe6ea2843fecd74a63aeff3675913bc3dde7cc0f75603a3a256dd7b08c54800c5ff8fd57af7f8976c SHA512 1107d8960c337606bc9526100ef963c252a616f77566253dbac4c96706a4a0c0830dcd9496759fb46f7aa27cc667364cd820567cde3eccc2a00eeb5eecffe6e0
+AUX stellarium-0.18.2-as-needed.patch 6217 BLAKE2B 5e4df179b4364f1bf56d2c9f719d07783d25ee95242ca33fe6ea2843fecd74a63aeff3675913bc3dde7cc0f75603a3a256dd7b08c54800c5ff8fd57af7f8976c SHA512 1107d8960c337606bc9526100ef963c252a616f77566253dbac4c96706a4a0c0830dcd9496759fb46f7aa27cc667364cd820567cde3eccc2a00eeb5eecffe6e0
 DIST stars_4_1v0_1.cat 17040932 BLAKE2B 6715c129b27bb82b4b9b432bd56ed56dcbb1fbe9b9b608154656431119e75ab27e3c8afa66bce0fed1b2f7d080df49e770ddf63241f253e9f6f139be8238349d SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
@@ -8,5 +8,5 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
 DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912
 EBUILD stellarium-0.16.0-r1.ebuild 2678 BLAKE2B 4ad1b128b5d332059796e02782935c7fbb4c355339264eb5679e86a2d10e734f76bb203c6b18401e7ef96f7b851b862a9a7d6501e86a76a45aa831dcd856d01f SHA512 db6a1df905b969aa878ed6bd5274e7496696805df7200366f70621929aa83239d5d20082d89eab83af02cd99b843d695ab8dbcbe3e750da54f3d2bbc3b68cabf
-EBUILD stellarium-0.18.2.ebuild 2365 BLAKE2B 2a358d252f3f84dd13caa7e60804b333568f11c84b08e2660c0852071ef5f0418d40631b1155313a4380a0cff5d2d468248b317b80577297d2cfad4a353ae0e4 SHA512 761d81af3128dce8f6b8497124e80d42a9ab6c78b9a1f0ce5a1a07b2873662b5367b04dfc2dcf3cf041d2e84ddadf0de3f64448439c262544174fa1267a636b7
+EBUILD stellarium-0.18.2.ebuild 2375 BLAKE2B f974927509125a102d88d0ccd3f8727892b036ea557ea4d2b8ec05474c116f8e096999b6e3c18732613bd8634149bb745693e8eef028fbe0472e0aa7fc216ce2 SHA512 36c2609a7cfaa05062920e1b2c2d487541c4a1efed8470b04bab14d1c7fcc6166ba8d98c349963e3b71ba7ea2396d63d193e5f0ba70d7a7865a1c64867bec3f3
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
index 71fc8ccf2d70..71fc8ccf2d70 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.18.2.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
index 5b88d75bd45d..42b839f37191 100644
--- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,10 +25,10 @@ IUSE="debug gps media nls stars test"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
 	dev-qt/qtserialport:5
 	dev-qt/qtwidgets:5
 	media-fonts/dejavu
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -53,8 +53,8 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
 		-DENABLE_TESTING="$(usex test)"
 	)
 	cmake-utils_src_configure
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index feb6155bab04..a385cff1f710 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index d83109851ca0..1b33c2abb01e 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,6 +1,6 @@
-AUX apbs-1.4.1-manip.patch 1522 BLAKE2B 4a30aadc2d80fef5d813ea29f20073b6c4d1cefe24578624faca4fef19418bca64768653b5c3ba7ff935f79885432480b46f7a5fef407d8951be76386e5a62c2 SHA512 b2517b86b688091a9ae6a78132e8cd5a451eff6150211459dae6919bf2ee61edcf2cf1b95d8b2922050a3a7a3aaaa9ce8e2be6766116a1e66d413339b291326b
+AUX apbs-1.4.1-manip.patch 1462 BLAKE2B f4559008a1fc4dc367bc770ed29b7fa9ae9489ab57cfc8dd6e5cff358e27e2ac71b1e786bf9a4e3d96dfb4eea3596305beb5078746324769b582abf8a702a1c5 SHA512 70679623621fb56eeffc79166aa6fd35b5fa2fec828f6800a27b795a4e94c9eee673a7ba5f872c3266c9e78af8935d684fb5c4679b57da6a969189ce45e31468
 AUX apbs-1.4.1-multilib.patch 3301 BLAKE2B 4268a21ec878d780c7a1efe433bf2c82ef2e72f49a6071b6df695bf672ee999be9c29fed06e949b80cc230333d8deca1094c946662ec657d31e3b6f86e873969 SHA512 cdd72fd23a57ee8413f72bf674ae246543b1c9f326727ff07c3b8848d59f98ab7d2daf28677460cb4726f919832079c1d280bcdc86a8bef5c0875583c789b7c0
-AUX apbs-1.4.1-python.patch 4109 BLAKE2B 25193eb227ab9d34f3f636b6264bdbaecdbe48747220582b39798c5c6631bdc7731645f66096dbf659c9eea7f31c8e20c0944796f8f89d995a4cd2712be91a3b SHA512 369c0fa08187ba80d8ce72542fc2942f28426beed39619dd6a90a9ef8dfecb47ea6dc7aa20994629a69d63b55d72d1f837c442744bf5499a942bf312f6723092
+AUX apbs-1.4.1-python.patch 3979 BLAKE2B b21633655df329f5d445c4e53140367b0a8a6cfbfafccba8943206ed9bae46839bae532e3efd19d75e89bc70a1fa59d05f3ed977b1a59f949649d3e89b887a96 SHA512 a38ca3bbf692f42268d192aff61949ece95d9b043ac10b4eec33e383773beec1c60425a12e84843a602e828528f6cf0ed6b8c90e99aeea679c5abc8c093c68ae
 DIST apbs-1.4.1.zip 37999283 BLAKE2B 2301deb7ab4eb2f20098cf63df180bb53189e42a89cd5559357cdcf08e84d27a44eafe8557bb460574802d24d29741ad4606dc3bd7f32911d0d0f2c7453d6470 SHA512 3a127af3940054e5a43b3c0c620507f4f9baa69049e5a0933d8e8825458ad2faba840392752de49fe68d91e2054fb1394cf87bb5bb1c0b48305368e2f404cf6a
-EBUILD apbs-1.4.1-r2.ebuild 3140 BLAKE2B b31ecbf8ddb9e8824917cb7c79ba5239957e1723c56a60b9b20aa6d818a0140ce0e4ace7691ac9663d0e38f99b5d851b529b1355b965d071d7e6b65566763bf9 SHA512 e97100de2ed58f60b414cead8aea44d53178f2b28ca016c9fa4a783993b3be0c66a53eb541e4679f58bc3054e18ab8866bef1a31b817cf62031b65ad3044e1a5
+EBUILD apbs-1.4.1-r2.ebuild 3038 BLAKE2B 52199b0b53f146f7ed915b0cf65e48de40b39e5df10fde56ab89fb43324e3d98e66ba9d09a85d4cc209427d0cd0fc24f7472bc55393703b4c8aa2a13c3d23cdd SHA512 d5b3e8008db4f59618dc08d7e5289929a4852856aea51e2b08e6151d8530f6dab882a0b7229b079afd4ef336023b0f0a0ff19accce91f980fe2a6aea71a6399c
 MISC metadata.xml 1048 BLAKE2B 53a61bd7e05e53b294f0cbd1a21b86f391429ad5f23a545e7cbb27625b152589247a08db06c5d7f6658425de032be970fae0230ad1ac14ac4f6de42663d6c97c SHA512 7d68049cb9b044676430fe879890cc4cd869b99f85696f579d9cbf3b156081301792fd7f03205a9b9d429d71c9a35b4815f4236573f68d3ef6b4718e6e1f0bb3
diff --git a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
index 108e43bf904b..b3c4f192894b 100644
--- a/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
+++ b/sci-chemistry/apbs/apbs-1.4.1-r2.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=true
-
-inherit cmake-utils distutils-r1 flag-o-matic multilib toolchain-funcs
-
-GITHUB_REV="74fcb8676de69ed04ddab8976a8b05a6caaf4d65"
+COMMIT="74fcb8676de69ed04ddab8976a8b05a6caaf4d65"
+inherit cmake-utils distutils-r1 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Evaluation of electrostatic properties of nanoscale biomolecular systems"
 HOMEPAGE="https://www.poissonboltzmann.org/apbs/"
 #SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
-SRC_URI="https://github.com/Electrostatics/apbs-pdb2pqr/archive/${GITHUB_REV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/Electrostatics/apbs-pdb2pqr/archive/${COMMIT}.zip -> ${P}.zip"
 
 SLOT="0"
 LICENSE="BSD"
@@ -44,7 +42,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-S="${WORKDIR}"/${PN}-pdb2pqr-${GITHUB_REV}/${PN}
+S="${WORKDIR}"/${PN}-pdb2pqr-${COMMIT}/${PN}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
@@ -71,24 +69,24 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
-		-DTOOLS_PATH="${ED}"/usr
+		-DTOOLS_PATH="${ED%/}"/usr
 		-DSYS_LIBPATHS="${EPREFIX}"/usr/$(get_libdir)
 		-DLIBRARY_INSTALL_PATH=$(get_libdir)
 		-DFETK_PATH="${EPREFIX}"/usr/
 		-DBUILD_SHARED_LIBS=ON
 		-DENABLE_QUIT=OFF
-		$(cmake-utils_use_build doc DOC)
-		$(cmake-utils_use_build tools TOOLS)
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_TOOLS=$(usex tools)
 		-DENABLE_BEM=OFF
 # ENABLE_BEM: Boundary element method using TABIPB
-		$(cmake-utils_use_enable debug DEBUG)
-		$(cmake-utils_use_enable debug VERBOSE_DEBUG)
-		$(cmake-utils_use_enable fast FAST)
-		$(cmake-utils_use_enable fetk FETK)
-		$(cmake-utils_use_enable mpi MPI)
-		$(cmake-utils_use_enable python PYTHON)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_VERBOSE_DEBUG=$(usex debug)
+		-DENABLE_FAST=$(usex fast)
+		-DENABLE_FETK=$(usex fetk)
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_PYTHON=$(usex python)
 # ENABLE_TINKER: Enable TINKER support
-		$(cmake-utils_use_enable iapbs iAPBS)
+		-DENABLE_iAPBS=$(usex iapbs)
 # MAX_MEMORY: Set the maximum memory (in MB) to be used for a job
 	)
 	cmake-utils_src_configure
diff --git a/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch b/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch
index 378223397594..090a27d8a5a6 100644
--- a/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch
+++ b/sci-chemistry/apbs/files/apbs-1.4.1-manip.patch
@@ -3,10 +3,10 @@
  apbs/tools/mesh/CMakeLists.txt  | 4 ++--
  4 files changed, 5 insertions(+), 9 deletions(-)
 
-diff --git a/apbs/CMakeLists.txt b/apbs/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 8917fc4..5152008 100644
---- a/apbs/CMakeLists.txt
-+++ b/apbs/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -293,7 +293,7 @@ option(ENABLE_FETK "Enable the finite element solver" OFF)
  
  if(ENABLE_FETK)
@@ -16,10 +16,10 @@ index 8917fc4..5152008 100644
  
      list(APPEND APBS_LIBS "-lstdc++")
      list(APPEND APBS_LIBS "-L${FETK_PATH}/lib")
-diff --git a/apbs/tools/manip/CMakeLists.txt b/apbs/tools/manip/CMakeLists.txt
+diff --git a/tools/manip/CMakeLists.txt b/tools/manip/CMakeLists.txt
 index 937dac7..5768cc5 100644
---- a/apbs/tools/manip/CMakeLists.txt
-+++ b/apbs/tools/manip/CMakeLists.txt
+--- a/tools/manip/CMakeLists.txt
++++ b/tools/manip/CMakeLists.txt
 @@ -4,9 +4,9 @@ set(LIBS "")
  list(APPEND LIBS "apbs_generic")
  list(APPEND LIBS "apbs_mg")
@@ -32,10 +32,10 @@ index 937dac7..5768cc5 100644
  
  message(STATUS "libraries: ${LIBS}")
  
-diff --git a/apbs/tools/mesh/CMakeLists.txt b/apbs/tools/mesh/CMakeLists.txt
+diff --git a/tools/mesh/CMakeLists.txt b/tools/mesh/CMakeLists.txt
 index 1406377..6e6dfb9 100644
---- a/apbs/tools/mesh/CMakeLists.txt
-+++ b/apbs/tools/mesh/CMakeLists.txt
+--- a/tools/mesh/CMakeLists.txt
++++ b/tools/mesh/CMakeLists.txt
 @@ -4,9 +4,9 @@ set(LIBS "")
  list(APPEND LIBS "apbs_generic")
  list(APPEND LIBS "apbs_mg")
diff --git a/sci-chemistry/apbs/files/apbs-1.4.1-python.patch b/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
index db9f86ba120a..5ad6613615f2 100644
--- a/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
+++ b/sci-chemistry/apbs/files/apbs-1.4.1-python.patch
@@ -7,10 +7,10 @@
  apbs/tools/python/setup.py           | 16 ++++++++++++++++
  7 files changed, 26 insertions(+), 8 deletions(-)
 
-diff --git a/apbs/contrib/iapbs/src/apbs_driver.c b/apbs/contrib/iapbs/src/apbs_driver.c
+diff --git a/contrib/iapbs/src/apbs_driver.c b/contrib/iapbs/src/apbs_driver.c
 index c9e443b..e1ad67f 100644
---- a/apbs/contrib/iapbs/src/apbs_driver.c
-+++ b/apbs/contrib/iapbs/src/apbs_driver.c
+--- a/contrib/iapbs/src/apbs_driver.c
++++ b/contrib/iapbs/src/apbs_driver.c
 @@ -595,7 +595,7 @@ int apbsdrv_(
  		printPBEPARM(pbeparm);
  
@@ -38,10 +38,10 @@ index c9e443b..e1ad67f 100644
  		    }
  		    bytesTotal = Vmem_bytesTotal();
  		    highWater = Vmem_highWaterTotal();
-diff --git a/apbs/src/CMakeLists.txt b/apbs/src/CMakeLists.txt
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 44d20fa..2577343 100644
---- a/apbs/src/CMakeLists.txt
-+++ b/apbs/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -68,6 +68,7 @@ configure_file(
  
  if(ENABLE_iAPBS)
@@ -50,10 +50,10 @@ index 44d20fa..2577343 100644
      INSTALL(TARGETS apbs_routines DESTINATION ${LIBRARY_INSTALL_PATH})
      INSTALL(FILES apbscfg.h DESTINATION ${HEADER_INSTALL_PATH})
  endif()
-diff --git a/apbs/tools/CMakeLists.txt b/apbs/tools/CMakeLists.txt
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
 index 1982a3c..4acbe68 100644
---- a/apbs/tools/CMakeLists.txt
-+++ b/apbs/tools/CMakeLists.txt
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
 @@ -4,5 +4,5 @@ add_subdirectory(mesh)
  add_subdirectory(manip)
  
@@ -61,17 +61,17 @@ index 1982a3c..4acbe68 100644
 -    add_subdirectory(manip)
 +    add_subdirectory(python)
  endif(ENABLE_PYTHON)
-diff --git a/apbs/tools/python/CMakeLists.txt b/apbs/tools/python/CMakeLists.txt
+diff --git a/tools/python/CMakeLists.txt b/tools/python/CMakeLists.txt
 new file mode 100644
 index 0000000..8b13789
 --- /dev/null
-+++ b/apbs/tools/python/CMakeLists.txt
++++ b/tools/python/CMakeLists.txt
 @@ -0,0 +1 @@
 +
-diff --git a/apbs/tools/python/apbslib.c b/apbs/tools/python/apbslib.c
+diff --git a/tools/python/apbslib.c b/tools/python/apbslib.c
 index fef5cc8..feaaa2c 100644
---- a/apbs/tools/python/apbslib.c
-+++ b/apbs/tools/python/apbslib.c
+--- a/tools/python/apbslib.c
++++ b/tools/python/apbslib.c
 @@ -2504,8 +2504,8 @@ static swig_module_info swig_module = {swig_types, 24, 0, 0, 0, 0};
  #include "maloc/maloc.h"
  #include "apbscfg.h" 
@@ -83,10 +83,10 @@ index fef5cc8..feaaa2c 100644
  
  
  #include <limits.h>
-diff --git a/apbs/tools/python/apbslib.i b/apbs/tools/python/apbslib.i
+diff --git a/tools/python/apbslib.i b/tools/python/apbslib.i
 index 17fe521..44d05ea 100644
---- a/apbs/tools/python/apbslib.i
-+++ b/apbs/tools/python/apbslib.i
+--- a/tools/python/apbslib.i
++++ b/tools/python/apbslib.i
 @@ -15,8 +15,8 @@ Header files:
  #include "maloc/maloc.h"
  #include "apbscfg.h" 
@@ -98,11 +98,11 @@ index 17fe521..44d05ea 100644
  %} 
  
  /* 
-diff --git a/apbs/tools/python/setup.py b/apbs/tools/python/setup.py
+diff --git a/tools/python/setup.py b/tools/python/setup.py
 new file mode 100644
 index 0000000..4a20198
 --- /dev/null
-+++ b/apbs/tools/python/setup.py
++++ b/tools/python/setup.py
 @@ -0,0 +1,16 @@
 +from distutils.core import setup, Extension
 +setup(name='apbs',
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 8583c5f536e6..713bea7304a7 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,18 +1,11 @@
-DIST gromacs-2016.2.tar.gz 27339623 BLAKE2B c3548f4abdc4c1b09a79a3da99d7ca8060daca7307e4c5b81bd97d54adfb9621fbccf1ea7fd96c3676d6b44c20f9f4cd2168ce131799792512fad3b8b1ac0522 SHA512 f5e74bb8c126823c90d205ac0f0835e61fdd13a4550bc15aa9c972ee9b187f6451cdc90877c17276d2f889d61abb5eaa5ea1b54f7cbf3da67074146c749c1aa6
 DIST gromacs-2016.5.tar.gz 27369491 BLAKE2B 4a8bf1ae3e298ac2e26ec476130720dc3ef00db5d999e3a45fdbfd7fbfe7e94fbc86be6ff0f2f23552769c8bc851ce49c73f6fc1ab13f372523279b93e7794d7 SHA512 9cb8ff88871aa5df0967c60ba303c03296c6fa3c215cd01b26259df7753f0014f04222078ab4b84a66a1f709997837134d5c0f74da19b78322e410010c9d9e10
 DIST gromacs-2018.3.tar.gz 29915626 BLAKE2B 6e6eeafecdd923a25b4a2a78a8e89f793639b57ffbd63f19d133d8474302f9a381041f138a509dadb42b36e25fe508729e860efb6b0c75cdbf01d924b0a8fd83 SHA512 3c4d6eb3942d7b54d01c94c6f6f5ae706e0f5d4f9901ea11a56fde4df97b1a9112007f2cb13feea0f19f30c89f57ae80ff53a8f5203b8cdff103aa903cd0dc8f
 DIST gromacs-2018.4.tar.gz 29918276 BLAKE2B daf3f91e47bab61befee4ecd91e4885835fc5ded408462c239c824567e64b5710fb252456c6be2bf0e4ce1a2119747fca9d8fb0532286bb93d6ccdd289fe57ab SHA512 8ef0b90b2c266bb706c8fdba12e763de9c21aad197c1c71f48c06378644a734a3694172804db6c916a4974a9832b128512f2445d0b72783811e64edd22d27955
-DIST gromacs-2019-rc1.tar.gz 33426863 BLAKE2B 8de7eeee128389652922dafe2a6f73fadfeb463a9a1ffea898ac34cfe056500113a12c795aa9ba1304d6e4a737dcfa7bd537bab2f1d49c0951f8b68714c13458 SHA512 ade6e9df653f1212540ca969d0b70b046fe30de866ca899ecb463d2c96e6dd70ac8a5ff08df801728332357abefee2d73cd3e77cae4b2b586a827c69e0257654
-DIST gromacs-5.0.4.tar.gz 26342095 BLAKE2B 27a2483e23533ad627114c0005fa0d49a311b359c31aed6378bdd768c9dda03c3b19f11d961f0bd3b82a1711737d4b7dce13cad5fc56d058dd0110fe21421ee3 SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee
-DIST gromacs-5.1.3.tar.gz 27095702 BLAKE2B b7fd8fa10e8c4f4368ac551338c59374dc35f85c9fdae5d64eec62929b8f04ea724a084959b3618cd8a151bf3e0a0c84c8f75de953722effca82a4928941ce73 SHA512 9ab26e1b2268f8d567b89b2d99d0b75b937b28edceaec56d17ca3243c76faa31255ffc0c45d762c7c693fe500b00e36ad43b80572d1d7f92dc87f9d2d98c0ba6
-DIST regressiontests-2016.2.tar.gz 67095329 BLAKE2B fec8a663845ad67374c8a230d1590fa9e5079460198f41cee3b788aaa1c72e8ec9dcda48bc68a594f15003d11bf6617d46cc1a09c16b7a333587b43904a16ba6 SHA512 e0aceb56d1f38a7e6ab9fdaac5063fd20c5b3a162ffb6eddd0e6dc7dff9b724bfe31363493a9437e9f9d5421a534b375960fcb31e903a4901a0fa94ed8511294
+DIST gromacs-2019.tar.gz 33428725 BLAKE2B 307838a5ee1a85554d6f2ef8cd9c9dd2f3d9cacd32c534545c23483b5f3a1c7d027bfbdf224b90661cd8cd3fb85c0c99c66cbd619698245a0cb45ebd512dec5d SHA512 54b11530e8ff671461e3ae9418d991fe242957943c944798cddf6efe740eee670a562cd5201dbba68b045f4bafd3afa2dc8de27e0643c7def4e05eaf0ccb5769
 DIST regressiontests-2016.5.tar.gz 67641413 BLAKE2B 4fcd30c198f3acbbabf1104c040d9a686de49536a97dbeb14732bfa0ed3cf37aa61b1b0f45393668985b993d1f1862a8985e416af819cf9793f5964f3e4f43cc SHA512 31764fd99cc4185d61de5d4443ee482c27b13533451a24aa0e4899997ce275a63685424eafacae38b1a3ffd4ce0d5ebe02a90348953b04c104f91376f0edfdff
 DIST regressiontests-2018.3.tar.gz 67857855 BLAKE2B acd7a05ae79d1b4eb47d0c68a3fec9ee19f028a5019f39c37a033f48cf6da2a468375180ad6ceca9ac4f685a8bead38550663a47d6427b51f84c32a5c810e5f0 SHA512 57980d49efe6dcc3b3d14b5913a30c68fc1de5b679ef986fec1a149c76f67139b0299c3ee2825451461294fab5f345c7ad4f42e90f8991b81aafe9c369f3ff0b
 DIST regressiontests-2018.4.tar.gz 67860326 BLAKE2B 0160f701a8fa14ba4f175f4fca9894104bc5cc6aa5f02ac57200fd5a8f74a29b595df609e704cb70fcd9a03529bcf758fb4547e35557a45c0546d819c2681983 SHA512 baaac0c918684216ada5254a7c3a1f5b3ea00b1a63d6085d569095139b2a0c9de4ed330d4694f7eaedab729ed5dcea547390781b3d2f7c2ffdf02e0541a90efe
-DIST regressiontests-2019-rc1.tar.gz 67606596 BLAKE2B e614b21fdf73e205c6ad870e19998f9fdb52cb0c54f878a0ab924772f8a710b7ac3d68faf8b77a043f03f3302f829de61e729e69d04abb38de761022dcb7aa7c SHA512 7521bc03a410d2532ee8681a0a3544f3a33f1aaff83513765ed1a28a756f24812955a44c0d8ae88988e23c347c4df455dd4bd3db7b9bb6d3d7d0bf0cc57bbebb
-DIST regressiontests-5.0.4.tar.gz 65193251 BLAKE2B c5e5f23adcc2639fe652bc252533307c7fda44453d506603242968bd8588c7394028b2c3c7a9252f807a050d40e8f78735e904dfe517d3db8ae962051f4826c1 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65
-DIST regressiontests-5.1.3.tar.gz 66994083 BLAKE2B 7009f65ad0138664ac84e57f8bc7cce5d18a59f99943e56b6642583120bfce279e005ac0bacd2db8904ea477a48e2b938c64de46a65fa5d08fce6009d53583c3 SHA512 486e86eb3b75bae822abe82dac4e1098aa13723bd04214021f835a2f0b847303f015a9ececc33aa5ae63d31a2eeae07e512f22464b6c0e26d1286b0781578022
-EBUILD gromacs-2016.2.ebuild 7971 BLAKE2B 889ded117d36d17c224bdf65ddc8a2e5fcbdb5cdbf58b5774e308fc45e42a7b3734aae1f87d1d95fb3751c18342025a86317e2bf05a82ffa7f9dfaeb47533e5b SHA512 a2ad66f58d79b03e0832ae0daf9b6cbcdceae2873d25318ee7fb9235a41acc1403708206682848c35d2c347ad2ccb72f75c38df38e8899ba07033040b296eb81
+DIST regressiontests-2019.tar.gz 67597618 BLAKE2B fb950d8518cf1e28db5ebb99bdda8d269c5e43dd49a117bdaae9f00857abc7c096766fb90ff1d2d95a12a875ba2e243b707bfc81a45d07fc8b340a154cf2ad0f SHA512 081e56d052c0a0d021a8a1566f802911e261e1f2b5b2141350fe2372bcad0844042f26121167ed31a31490bd4e042068690c4905fcbc80b539686a074621fc5e
 EBUILD gromacs-2016.5.ebuild 7971 BLAKE2B 889ded117d36d17c224bdf65ddc8a2e5fcbdb5cdbf58b5774e308fc45e42a7b3734aae1f87d1d95fb3751c18342025a86317e2bf05a82ffa7f9dfaeb47533e5b SHA512 a2ad66f58d79b03e0832ae0daf9b6cbcdceae2873d25318ee7fb9235a41acc1403708206682848c35d2c347ad2ccb72f75c38df38e8899ba07033040b296eb81
 EBUILD gromacs-2016.9999.ebuild 7974 BLAKE2B 5568ed9513fd44da7382370e418ffe456db73076c0000101c96bba4e704e6eece7ef6131379ddbe95c42e9fa4b082346db2ee4f6bb15a25d8c6afd9209db2e5c SHA512 911a5f71d9dde20d11a13cff416db12d6722cf9fb9609895a3d3bd2381c36a875f80f1617f6960deae2ceaa951f60a14738dfe5065f41560cfeecf7ad26b7c70
 EBUILD gromacs-2018.3-r1.ebuild 7825 BLAKE2B 359b7f832c98d897e9ccaa1ecbe39f7b8e7077bbdc2f32b1b722c2a221ebf4c187ed691a14dcb5c044a3d243d319963e50297bcb347c6433e4ddeafb0ba1c1fd SHA512 730eef3897293939c0b00a236b3f8d0964354fba7cf89170e2b028510f7c0aee8a0925f4c0b7d765d5631bedd90e8a3010e190f08dd8ed71505710b79d9061d5
@@ -20,11 +13,6 @@ EBUILD gromacs-2018.3.ebuild 7822 BLAKE2B af732727b7050314a4d4d38f5d4b753f96f26b
 EBUILD gromacs-2018.4.ebuild 7825 BLAKE2B 359b7f832c98d897e9ccaa1ecbe39f7b8e7077bbdc2f32b1b722c2a221ebf4c187ed691a14dcb5c044a3d243d319963e50297bcb347c6433e4ddeafb0ba1c1fd SHA512 730eef3897293939c0b00a236b3f8d0964354fba7cf89170e2b028510f7c0aee8a0925f4c0b7d765d5631bedd90e8a3010e190f08dd8ed71505710b79d9061d5
 EBUILD gromacs-2018.9999.ebuild 7825 BLAKE2B 359b7f832c98d897e9ccaa1ecbe39f7b8e7077bbdc2f32b1b722c2a221ebf4c187ed691a14dcb5c044a3d243d319963e50297bcb347c6433e4ddeafb0ba1c1fd SHA512 730eef3897293939c0b00a236b3f8d0964354fba7cf89170e2b028510f7c0aee8a0925f4c0b7d765d5631bedd90e8a3010e190f08dd8ed71505710b79d9061d5
 EBUILD gromacs-2019.9999.ebuild 9112 BLAKE2B 0b972db0fe7e4c4730e9b480ea981b01a9930d128cef5fd589ad06b3f245d845721f74d0ac7b9e08dbed8f85985d3a0a84f361b02221318daf809ef37df9413f SHA512 363db0dfce3fa8459e6f8a07f6c5e5061d143deebc78fdb852557b101cee3fc342cc3c342a878153ced8edb8d8c567b9ab91bb275d3190034dcef6255003c9d7
-EBUILD gromacs-2019_rc1.ebuild 9112 BLAKE2B 0b972db0fe7e4c4730e9b480ea981b01a9930d128cef5fd589ad06b3f245d845721f74d0ac7b9e08dbed8f85985d3a0a84f361b02221318daf809ef37df9413f SHA512 363db0dfce3fa8459e6f8a07f6c5e5061d143deebc78fdb852557b101cee3fc342cc3c342a878153ced8edb8d8c567b9ab91bb275d3190034dcef6255003c9d7
-EBUILD gromacs-4.6.9999.ebuild 8094 BLAKE2B b5d89654043667e88e275270bc3d79fa5b6168cb76450cecc6e143a19d606ddfadeb7cb2d97a3a623e5069159151017afa0ced6080264ecd09de9afb4652457e SHA512 0701afb0d0ccb977aad8cf69209299db91babdcbc3d8b1abc2f727637956e2d86cbb7c36f38be35f793a8abd684f51bc68ab8f107006f02e0975a2b05f317c58
-EBUILD gromacs-5.0.4.ebuild 8413 BLAKE2B 3e78b8d41d4499293ec54c3442d6412e9c1c6fd33f5830d2a4dbf7a369f896f0be2f9407eb3c2a444a29677e261cdf14589e8a80c8b64f5beeaa24800a4e1cce SHA512 b5ed004538c3fdfc4a265ccdc0771f5cd49e21d84d0af916e7dfeb6e32a083c2fe2d93d83c14bc1e657abfafe7204e7a2f337bb639b727eafc71c6525abe9626
-EBUILD gromacs-5.0.9999.ebuild 8423 BLAKE2B c3b636e32170f00ce77260e7d58bc2a36a6fcc1e2220045a51f151fff9cf3aac617a755fbfd647b262bf6cd44ef4201ac8716b942f71a868679eef6498e29229 SHA512 7cee51a8d1809f2c111acfda77525dd02b853735c0af31d5439c80943dddc2d8a50b5c00999c1808c2eb8daa6f158003048e6348d683b5c9d93fd3c383c73423
-EBUILD gromacs-5.1.3.ebuild 7746 BLAKE2B b97b9d8dd5f6111383e140b51df01136d443f11005d342df4ab35e4008fb6e02b90db7871acf30396ecb0e69ff9b4a1b2bb744a0d0c88e9ecc962a07dbb37b7d SHA512 6c1c868ae4c2c04313b16fa5db0786e65dafa4f6131423f1cbfb505b95165ea1e85fa9cdbfb2fb2d5ef63b04bc89fe27873293b67d123c34527a250bff6c0f3f
-EBUILD gromacs-5.1.9999.ebuild 7746 BLAKE2B b97b9d8dd5f6111383e140b51df01136d443f11005d342df4ab35e4008fb6e02b90db7871acf30396ecb0e69ff9b4a1b2bb744a0d0c88e9ecc962a07dbb37b7d SHA512 6c1c868ae4c2c04313b16fa5db0786e65dafa4f6131423f1cbfb505b95165ea1e85fa9cdbfb2fb2d5ef63b04bc89fe27873293b67d123c34527a250bff6c0f3f
+EBUILD gromacs-2019.ebuild 9112 BLAKE2B 0b972db0fe7e4c4730e9b480ea981b01a9930d128cef5fd589ad06b3f245d845721f74d0ac7b9e08dbed8f85985d3a0a84f361b02221318daf809ef37df9413f SHA512 363db0dfce3fa8459e6f8a07f6c5e5061d143deebc78fdb852557b101cee3fc342cc3c342a878153ced8edb8d8c567b9ab91bb275d3190034dcef6255003c9d7
 EBUILD gromacs-9999.ebuild 8092 BLAKE2B 42eef753c8cc34bfef79a710311a0eab2b445cfc2a88a552a729692a89d3c73348c9fbe210feaa299adc232be2f2b7548a262c3a16f43df31a0797e7007ac40a SHA512 d51775e52a42f01b95d829b6efc083de3a919778384fbf986b47c56459cd25a9b620fc8ae3a6237330989a763d8f0b7f9a7c4cc9878a725bb9a08d5c2fcaa234
-MISC metadata.xml 1264 BLAKE2B b6314076f02de8a49a6837f1c2ad298cc14c25107658cdad9b2eda09a1d9f06a9353d2a5844f0c5bc6d9ce68db5897c565a8c0d264ba7e64b6c3af8d32a55807 SHA512 d941d17586df7301802862db0f1134f65f6b6fadf0242b8f7353822f6b32c1e955bf7c94b2b6a977346725d4139f0d8d12f19ca3952fdb61c1dc562aad570458
+MISC metadata.xml 1123 BLAKE2B 5e945fdf580821b62aaf40c5b4b3252b366284f2df16f02e7c3cf913e5ad498a6a8548bc2e4275d8b80373f88d9879ab59d401e619595014262dcebfe8660f9f SHA512 bac0c94aee957487d8af8a1e06323cb286c8773cef2070d91aff9fdad63eb1bd55f2678dd58dca21b33d8d3e7110d2526e280abd538e3653aee638f6de72090d
diff --git a/sci-chemistry/gromacs/gromacs-2016.2.ebuild b/sci-chemistry/gromacs/gromacs-2016.2.ebuild
deleted file mode 100644
index 15acf0b2cf75..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( <sys-apps/hwloc-2 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2019_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2019.ebuild
index c090fc6b03ef..c090fc6b03ef 100644
--- a/sci-chemistry/gromacs/gromacs-2019_rc1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.ebuild
diff --git a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild b/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
deleted file mode 100644
index 3fba885a4926..000000000000
--- a/sci-chemistry/gromacs/gromacs-4.6.9999.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-TEST_PV="4.6.6"
-MANUAL_PV="4.6.6"
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	EGIT_BRANCH="release-4-6"
-	inherit git-r3
-	LIVE_DEPEND="doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-		sys-apps/coreutils
-	)"
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz
-		doc? ( ftp://ftp.gromacs.org/pub/manual/manual-${MANUAL_PV}.pdf -> ${PN}-manual-${MANUAL_PV}.pdf )
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${TEST_PV}.tar.gz )"
-	LIVE_DEPEND=""
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda doc -double-precision +fftw gsl lapack mkl mpi +offensive openmp +single-precision test +threads zsh-completion ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	gsl? ( sci-libs/gsl )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	${LIVE_DEPEND}
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-HTML_DOCS=( "${ED}"/usr/share/gromacs/html/ )
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use doc; then
-			EGIT_REPO_URI="git://git.gromacs.org/manual.git" \
-			EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/manual"\
-				git-r3_src_unpack
-		fi
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="release-4-6" EGIT_COMMIT="release-4-6" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_GSL=$(usex gsl)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_ACCELERATION="$acce"
-		-DGMXLIB="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_PREFIX_LIBMD=ON
-		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
-		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads) "${cuda[@]}" -DGMX_OPENMM=OFF
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}" -DGMX_LIBS_SUFFIX="${suffix}" )
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=( ${mycmakeargs_pre[@]} ${p} -DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda} -DGMX_OPENMM=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}" -DGMX_LIBS_SUFFIX="_mpi${suffix}" )
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile mdrun
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		#manual can only be build after gromacs was installed once in image
-		if use doc && [[ $PV = *9999*  && ! -d ${WORKDIR}/manual_build ]]; then
-			mycmakeargs=( -DGMXBIN="${ED}"/usr/bin -DGMXSRC="${WORKDIR}/${P}" )
-			BUILD_DIR="${WORKDIR}"/manual_build \
-				CMAKE_USE_DIR="${WORKDIR}/manual" cmake-utils_src_configure
-			[[ ${CHOST} = *-darwin* ]] && \
-				export DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}${DYLD_LIBRARY_PATH:+:}${ED}/usr/$(get_libdir)"
-			BUILD_DIR="${WORKDIR}"/manual_build cmake-utils_src_make
-			[[ ${CHOST} = *-darwin* ]] && DYLD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-			newdoc "${WORKDIR}"/manual_build/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			DESTDIR="${D}" cmake-utils_src_make install-mdrun
-	done
-
-	use doc && [[ $PV != *9999* ]] && dodoc "${DISTDIR}/${PN}-manual-${MANUAL_PV}.pdf"
-	newbashcomp "${ED}"/usr/bin/completion.bash ${PN}
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins "${ED}"/usr/bin/completion.zsh _${PN}
-	fi
-	rm -f "${ED}"usr/bin/completion.*
-	rm -rf "${ED}"usr/share/gromacs/html
-	rm -f "${ED}"usr/bin/g_options*
-	rm -f "${ED}"usr/bin/GMXRC*
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	if use offensive; then
-		einfo
-		einfo  $(g_luck)
-		einfo  "For more Gromacs cool quotes (gcq) add g_luck to your .bashrc"
-	fi
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild b/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
deleted file mode 100644
index ac00ea29ca72..000000000000
--- a/sci-chemistry/gromacs/gromacs-5.0.4.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo toolchain-funcs
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	EGIT_BRANCH="release-5-0"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
-	KEYWORDS="~alpha amd64 arm ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	boost? ( >=dev-libs/boost-1.55 )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="master" EGIT_COMMIT="master" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		$(cmake-utils_use X GMX_X11)
-		$(cmake-utils_use blas GMX_EXTERNAL_BLAS)
-		$(cmake-utils_use lapack GMX_EXTERNAL_LAPACK)
-		$(cmake-utils_use openmp GMX_OPENMP)
-		$(cmake-utils_use offensive GMX_COOL_QUOTES)
-		$(cmake-utils_use boost GMX_EXTERNAL_BOOST)
-		$(cmake-utils_use tng GMX_USE_TNG)
-		$(cmake-utils_use doc GMX_BUILD_MANUAL)
-		$(cmake-utils_use make-symlinks GMX_SYMLINK_OLD_BINARY_NAMES)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
-		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			$(cmake-utils_use threads GMX_THREAD_MPI)
-			"${cuda[@]}"
-			-DGMX_OPENMM=OFF
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# generate bash completion, not 100% necessary for
-		# rel ebuilds as bundled
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile completion
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		#release ebuild does this automatically
-		if [[ $PV = *9999* ]]; then
-			cp "${WORKDIR}/${P}_${x}"/src/programs/completion/gmx-completion.bash "${ED}/usr/bin" || die
-			echo "complete -o nospace -F _gmx_compl gmx" > "${ED}/usr/bin/gmx-completion-gmx.bash" || die
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	#concatenate all gmx-completion*, starting with gmx-completion.bash (fct defs)
-	#little hacckery as some gmx-completion* newlines ,so cat won't work
-	for x in "${ED}"usr/bin/gmx-completion{,?*}.bash ; do
-		echo $(<${x})
-	done > "${T}"/gmx-bashcomp || die
-	newbashcomp "${T}"/gmx-bashcomp gmx
-	bashcomp_alias gmx mdrun
-	rm "${ED}"usr/bin/gmx-completion{,?*}.bash || die
-	if use double-precision && use single-precision; then
-		bashcomp_alias gmx gmx_d
-		bashcomp_alias gmx mdrun_d
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
deleted file mode 100644
index bb4000f2520d..000000000000
--- a/sci-chemistry/gromacs/gromacs-5.0.9999.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	EGIT_BRANCH="release-5-0"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas boost cuda +doc -double-precision +fftw lapack +make-symlinks mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	boost? ( >=dev-libs/boost-1.55 )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="master" EGIT_COMMIT="master" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_EXTERNAL_BOOST=$(usex boost)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_SYMLINK_OLD_BINARY_NAMES=$(usex make-symlinks)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
-		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			-DGMX_OPENMM=OFF
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# generate bash completion, not 100% necessary for
-		# rel ebuilds as bundled
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile completion
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		#release ebuild does this automatically
-		if [[ $PV = *9999* ]]; then
-			cp "${WORKDIR}/${P}_${x}"/src/programs/completion/gmx-completion.bash "${ED}/usr/bin" || die
-			echo "complete -o nospace -F _gmx_compl gmx" > "${ED}/usr/bin/gmx-completion-gmx.bash" || die
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	#concatenate all gmx-completion*, starting with gmx-completion.bash (fct defs)
-	#little hacckery as some gmx-completion* newlines ,so cat won't work
-	for x in "${ED}"usr/bin/gmx-completion{,?*}.bash ; do
-		echo $(<${x})
-	done > "${T}"/gmx-bashcomp || die
-	newbashcomp "${T}"/gmx-bashcomp gmx
-	bashcomp_alias gmx mdrun
-	rm "${ED}"usr/bin/gmx-completion{,?*}.bash || die
-	if use double-precision && use single-precision; then
-		bashcomp_alias gmx gmx_d
-		bashcomp_alias gmx mdrun_d
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-5.1.3.ebuild b/sci-chemistry/gromacs/gromacs-5.1.3.ebuild
deleted file mode 100644
index 0b84b86b413a..000000000000
--- a/sci-chemistry/gromacs/gromacs-5.1.3.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:1}-${PV:2:1}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas boost cuda +doc -double-precision +fftw lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	boost? ( >=dev-libs/boost-1.55 )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_EXTERNAL_BOOST=$(usex boost)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
-		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			-DGMX_OPENMM=OFF
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild b/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
deleted file mode 100644
index 0b84b86b413a..000000000000
--- a/sci-chemistry/gromacs/gromacs-5.1.9999.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		http://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:1}-${PV:2:1}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas boost cuda +doc -double-precision +fftw lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	boost? ( >=dev-libs/boost-1.55 )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_EXTERNAL_BOOST=$(usex boost)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DGMX_X86_AVX_GCC_MASKLOAD_BUG=OFF
-		-DGMX_USE_GCC44_BUG_WORKAROUND=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			-DGMX_OPENMM=OFF
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index fca9b4acc974..7c756657ae42 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -11,17 +11,15 @@
 	</maintainer>
 	<use>
 		<flag name="cuda">Enable cuda non-bonded kernels</flag>
-		<flag name="opencl">Enable opencl non-bonded kernels</flag>
 		<flag name="double-precision">More precise calculations at the expense of speed</flag>
-		<flag name="single-precision">Single precision version of gromacs (default)</flag>
-		<flag name="boost">Enable external boost library</flag>
+		<flag name="gmxapi">Add support for gmxapi library</flag>
 		<flag name="hwloc">Enable HWLoc lib support</flag>
-		<flag name="tng">Enable new trajectory format - tng</flag>
-		<flag name="make-symlinks">Create symbolic links for pre-5.0 binary names</flag>
 		<flag name="lmfit">Use external <pkg>sci-libs/lmfit</pkg></flag>
-		<flag name="gmxapi">Add support for gmxapi library</flag>
+		<flag name="opencl">Enable opencl non-bonded kernels</flag>
+		<flag name="single-precision">Single precision version of gromacs (default)</flag>
+		<flag name="tng">Enable new trajectory format - tng</flag>
 		<!-- acceleration optimization flags -->
-		<flag name="offensive">Enable gromacs partly offensive quotes</flag>
 		<flag name="mkl">Use <pkg>sci-libs/mkl</pkg> for fft, blas, lapack routines</flag>
+		<flag name="offensive">Enable gromacs partly offensive quotes</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 84d0823636d8..2a08e6f529a4 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 849f9278ee50..5ebb85ea85c8 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,3 +1,5 @@
 DIST kicad-footprints-5.0.0.tar.gz 4978410 BLAKE2B 4b736b9530bcb093ef916c5dff3ee17662c801478c14859b2256575c2d5244e714c0b61f2c4d59f33cbfc23b4f35f590546e0b3bc374d730ebf519a80d8904d1 SHA512 b96706cf021749630b544a437cb0fb278cf4369cb8acb89eb962bd674b3fc77dbca719dd540844d3478082ee0f82e7d65fce15a3658a9c6cbe8df3c691bbfbfe
+DIST kicad-footprints-5.0.1.tar.gz 5074166 BLAKE2B eb8a532c83af37d241c0eb73b7ac0a6bdd75e87f5d06ebdb9a109160cae131240f4f5516c9bd38785c51e068ffcc29cdec075565bc4bc14af3924f814a68aa54 SHA512 16057e7a768097a7e97ae8a25d0c35891d04621e5d5b7437e80f893f48365e562b69c38a8076c1dab0455801359e766fcd1f7d31fec2cc78c9e7cda2d6f210ae
 EBUILD kicad-footprints-5.0.0.ebuild 459 BLAKE2B ddd2afac158a61b8266051740603e4b792f7e58431b23d28fc3401c08ee11003d88986e257cdefad701971d60ee547f4e85b7530f77f62eeba67e0ecf523a033 SHA512 89ea467a27c5073e84a6e61d6422097728fbe0b4518226799ac093232f4903850ad368a6617ce5f6ea42a621092c4bafa6a3fb5a2a0b2efe02eca3334b67db6c
+EBUILD kicad-footprints-5.0.1.ebuild 456 BLAKE2B b49fd1584b037aa4cf93ddc7b86ae699914c1c5838c4cdfeb3a09c11e346e0de0a8f37a01ec01cc975d959c84da0a7c1e311294b6927ff47385062e8987e639f SHA512 c16d4558d3e37f60382c05c18aba6fefc431a2c884d4c1a93685f394c5ab42cc423770d518d65ab62007d10ad6d64047ee7a517c953388c0d9b19e75a11e4429
 MISC metadata.xml 735 BLAKE2B 4799a945980798d07f6cd74cfe47f3e054ed5c149887247a92c191414f06c4d3a5740542624bee3e96a4482a6bcce9ef52294426075cb16ce8d85cf027d8d6bd SHA512 07adadb06d293a535f7b3ee1601120c6caa36a3d119f330f0ad9e9df39ea9c30e582d4fd97abb44d23a6ce2e73c3e3dbb86bfeab46c2bc3a8f547d1abca4dea2
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild
new file mode 100644
index 000000000000..c34bd2d47161
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-5.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://kicad.github.io/footprints/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-i18n/Manifest b/sci-electronics/kicad-i18n/Manifest
index 741950936e0c..dff2aec4d8c2 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST kicad-i18n-5.0.0.tar.gz 4053403 BLAKE2B 12ebcc2a178440374280dfed6988583aa27ebb22574eccd2da9104e20d751865a473f05df9f9c523faadaaf7541948247cc57403a5287ffcfe7ec8cdc6f29555 SHA512 efc0729e1da151f490e2568d756b44b3153a65ca658076ac7346736d1703eb73828687f8ce944bdf23c251ac29bde705e403c25bd32097e2a6768e65a4600616
+DIST kicad-i18n-5.0.1.tar.gz 4062609 BLAKE2B a3113758cc1e813fca97abd9c4e5ca367f974900b6ca7072c55eef9d9eff6274bacdad37b81a98f650c05be8fbdff306dc59db1cdd1a22b4d0776c9a89454303 SHA512 5254f6f945fa63e56bc3e9440cf506da3a4ccd76a58fd7e052a04ff60ecaa0daf6ad0599376a5175a4628d40cb1e317973e470a1593714186adb393c20761e24
 EBUILD kicad-i18n-5.0.0.ebuild 474 BLAKE2B 695283308c5a7b10c077b99e8a089c9d589fef8f7f7f890449ba20e87dd4b9dfcf7ca9faeb237e28e673ad4933d3089bedb907ac444d3da4cd8413ab2234042d SHA512 120dfc0416bb39c3cbba29541ad1a831245dbeed02af39a2cc0aed1ae537db8e5e7d7761d8cb96363ec931dd7ec19049ec96de2b9101bdd547bb82f86acb4434
+EBUILD kicad-i18n-5.0.1.ebuild 471 BLAKE2B 4ead8d717ce3a8c3b4f9451b806812647787507a4ccaa8d925aa2f81539c21468cf4a63b37c3cb017f9d938f17f036f11cd25e41309f41ccad22d3ea2f01222b SHA512 93715c5579ae737a6418597f87e1fb57cc75bbc9085faf84dfde5302f8d01b599602ac403145faa6b29feb73f9f2ab0934669b9a6e9c16f401530ef0a9e58a63
 MISC metadata.xml 517 BLAKE2B be3a0d4a291df26add1c632add8b650486c95fea074acb030ce910b8ef64cd53add36bf16ac26c4e7781ee9a7942b2cca1ffa09b5869d9f0bfb4cac905c8652a SHA512 6f1579666c041f9192717440d617e2fbd55f58184ab82d6c724efa2a1c81f5fd7986f9ca934fe88cb459eed3d1b800c5c38889afef48ca81d79e0bec220441ba
diff --git a/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild b/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild
new file mode 100644
index 000000000000..cdd652ca69a6
--- /dev/null
+++ b/sci-electronics/kicad-i18n/kicad-i18n-5.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools GUI translations."
+HOMEPAGE="https://github.com/KiCad/kicad-i18n"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index a57d003f51c6..901a1bc4e682 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,2 +1,3 @@
 EBUILD kicad-meta-5.0.0.ebuild 594 BLAKE2B 7941b0cb359a494245a93d147d21399380b9d397d27f6c5f692144b4b8932d0108e87fdda70298e26d0aa9a3a8585b1a733fccf67d390043ac15a0a7048cd5b4 SHA512 7aaa796c58f9fca1c1a2d5a667eae3e4e73e9ffe14b21f2012c9f8a120cc543c23c962e6dd60dd6e8d9949a7af5329bb6bb809e6147be98ae997891fc8b36712
+EBUILD kicad-meta-5.0.1.ebuild 591 BLAKE2B 0ecd15509f5670c65f14efee4bb8a070359fc1cacff48d0bcd97bc77fbfdcd159c68b43052c502e5afa4a598e811e5274fcb42069f9f7ae670f7feb9e5e0927d SHA512 c9b92be8e65e935fa2b29d62a0a8e740fd8bc1b3e7ea87345a63b57f37877843a709494e2fcfffb68f223ea8f8655dd9a0fdb13985bc7b5021ece24dc01d907c
 MISC metadata.xml 491 BLAKE2B 5c5a29d7b8ae502e8aa7c637c56e988fb9afd219c2f258ee6140bb8036456b5c5bae4c6ec0512926afa20b6f6f4fa4b8c22fc3c73fd3626ab37206904ee98ebe SHA512 72fe2f2b679d5f20ab2e8932fe46e61227bc7cc6f9fe4c329a6f842f0d4ea0ea607c66042ca411904f8d54df8af741605e4f77a917f45fda759107c46456e8d7
diff --git a/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild
new file mode 100644
index 000000000000..d98d94130d20
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-5.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc nls"
+
+RDEPEND="
+	>=sci-electronics/kicad-5.0.1
+	>=sci-electronics/kicad-symbols-5.0.1
+	>=sci-electronics/kicad-footprints-5.0.1
+	>=sci-electronics/kicad-packages3d-5.0.1
+	>=sci-electronics/kicad-templates-5.0.1
+	doc? (
+		>=app-doc/kicad-doc-5.0.1
+	)
+	nls? (
+		>=sci-electronics/kicad-i18n-5.0.1
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 51d569043a39..79d65019a515 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,3 +1,5 @@
 DIST kicad-packages3d-5.0.0.tar.gz 767675132 BLAKE2B d7c43ddf96dcce768ca9fa9d73a8bff3ab325983cbc75dc1fd55e93deecf4014a482b2359f63786dc0b84601780532a71f8b8e70132b3f924f30ebc3aea92900 SHA512 02145a2745242746903c50f3616b836fd02a02411970c8600248b29f267c5abf13527c51a311c581164298498813a55d22663d25eaa0fa337a3188e6412f685b
+DIST kicad-packages3d-5.0.1.tar.gz 791951390 BLAKE2B 31c10869d53c7fe262bc90c721d0e99b1381e5faaf157597f5c58b00f328ab654260cc306466fbdb3ed6c48e71d21b48e74365d62aca009a2d3b77c0c3feb988 SHA512 8f188c5b97904eca0e564ccbdf29c0b6cf99fb60290f3c11a22d4c38c91edb3aee20412be867eee84007e39d54f808cff713f6252536045d92e891ed735ed334
 EBUILD kicad-packages3d-5.0.0.ebuild 517 BLAKE2B a8be63fd6d57e90221fb8359cee7845ceb420bb4bfe9c619907c8b63a4c91c3c298a4944decaef0a18edfc813e5715f7200d27cf204a6bd2be886124c20fd6db SHA512 cf98d9542253072bed49de760517aa94c0c1d489ba9b68250ac67b86881ce860e40406b0f747daf35a7c6f6f580c3065d2c128875474bc76d6cac4314264abc0
-MISC metadata.xml 764 BLAKE2B aa65f015babdcd664b183d1c9dbfdc25b4da63d5928ec3edb298b18a5d25366119050add7da42318de1bb12527e39874d962609a8407b8f94e565ff0d7082cb8 SHA512 b993c9c7967675b1dab1d09da5aabc15af2a8c7b9846844b7cc6c24cbf854eb824e440da1d95e3f989d2b899671e2c0a8f696156a0643f0196ecbf4e2a3df346
+EBUILD kicad-packages3d-5.0.1.ebuild 559 BLAKE2B b98b37dff0374a0836cb62800c004de6cfe6118244ca39e17984f506208b8c33a12b754da7ea6836024b4f3633f920fbea6fd1927d60fa192b8442c786a6ba3c SHA512 d92316f8ec0a47262b2cfd41f4e559451a0c8fbb135559642c69a35362d0a445d8b27c80a9fd90052b981528b8bbec8a681f849675534f319b58978e3466a221
+MISC metadata.xml 945 BLAKE2B 31ec093af697452fee944b3d8fab75e50604f5a243e265bbe355410e976bb420094fe2801e737195d3746bb6c3044a6f6730b7b673cd7c24ac264fab47f29024 SHA512 436f8220e032f2b08d7ec5217aa13e501547022bf61155728ccc3230684768de63d2a9fba823e2c166bda612648649f296abb6ae8a0cf362e0589af350f95146
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild
new file mode 100644
index 000000000000..eebce77a2264
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-5.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://kicad.github.io/packages3d/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="occ +oce"
+
+REQUIRED_USE="|| ( occ oce )"
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.0.0[occ=,oce=]"
+
+CHECKREQS_DISK_BUILD="9G"
+S="${WORKDIR}/${P/3d/3D}"
diff --git a/sci-electronics/kicad-packages3d/metadata.xml b/sci-electronics/kicad-packages3d/metadata.xml
index 9f7fcf12e870..99147067b616 100644
--- a/sci-electronics/kicad-packages3d/metadata.xml
+++ b/sci-electronics/kicad-packages3d/metadata.xml
@@ -15,6 +15,14 @@
 		libs. Each directory directory contains multiple 3D model files, with
 		the following supported file formats: WRL, STEP.
 	</longdescription>
+	<use>
+		<flag name="occ">
+			Use <pkg>sci-libs/opencascade</pkg> for data exchange
+		</flag>
+		<flag name="oce">
+			Use <pkg>sci-libs/oce</pkg> for data exchange
+		</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">kicad/kicad-packages3d</remote-id>
 	</upstream>
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 6a57479ffa51..bd300fd5faba 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,3 +1,5 @@
 DIST kicad-symbols-5.0.0.tar.gz 2690042 BLAKE2B d3d32459335112aa44fce010a88fe859b8413051b4df8d656dbd8cff11c6536808b95bd5c25c1a699a9bfec22f320b418456e9dc024f9db38fa1da2aeade8bd3 SHA512 547029afdda5438108fcc9de7ca1cb6eb86524e8eaad5e32cd6cec58642dd3a98ff6b06ed55b347733306098ddc763e8204e2e638ef1d27cb9f7eb15a9710eb7
+DIST kicad-symbols-5.0.1.tar.gz 2715790 BLAKE2B 5b87d64967c181161309d17f21feda14e6b44814ca9ec77ff9408d8a1d55805eaafea40bdb8ab4964c3fd66832ffef45e6c8c857816036586e5b8f4a33e34c4e SHA512 f0c3ee981cd96a57eed50b1e5a6d7956e0f73edaf86f1afb3a56b93d31161fe0a567d60f02339b3a2e9b9377b7176e9097484035512a40c4ca3a98341dc0056c
 EBUILD kicad-symbols-5.0.0.ebuild 453 BLAKE2B 332b5a400d85565f34d44683f82745ef80a1001956119b59b295a9d3ef9d02f0576e6dcf6125a786d3cca7499c8d396e713bd123b7e709fa488b35a8bff58782 SHA512 5d8501ba8f88e9399b2b7bc88dc8835df7f930f56f62aa1e78f527b4ab9549d6cee77a766c648cf75d4e9d6f9d4fa0e490f9f8709cd2c4d6a12d9d6e806008fd
+EBUILD kicad-symbols-5.0.1.ebuild 450 BLAKE2B c0fda1a73122892636ada55e4c7d63cc667f71f02516bc7847dd10e42de2a5799b7d750ca03c0781113e725db0403a7eb8a35f60d9a8df7daba4b6e8f96f7c41 SHA512 930424dac84702ff3cac707dbd3768b4bc66c991310f6be275ca658c5768e4bcac66d18eaa32e5e4643efec4e2d752bfac0f265c2a239ecb1e92eec3e246f1f0
 MISC metadata.xml 693 BLAKE2B a3b93ce0fcc955588ebcf3e3104c1b7af572e714ba255cacca945d130623e5fb1fb621169b728f9fb24e4d90b4776913220cd8b068f3e176b5dc7be9d6b9cd25 SHA512 e0f2002922b08d0ca4abfd39779def493aeb0870701a255b606da86ce9adbdf39f78ac9b80a885e9fc9186f59e7f77caf8cc4273bc64003715338e30833fd174
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild
new file mode 100644
index 000000000000..fcd882fdde86
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-5.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://kicad.github.io/symbols/"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index b9a055f52b4e..b78a29053104 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,3 +1,5 @@
 DIST kicad-templates-5.0.0.tar.gz 1621228 BLAKE2B e63d97290bb99a78ad0a273772e19d14cf22c36d45d8445cb5dd0b906651e4b3981faac0cb12523e60d1ea3de3dbce71b07166114ee5862e6df090200fb7cac8 SHA512 5e59ac778258a8313df8c3c0fe900acc8b64362f205738494397f51a1eea481a5e8b25d9cc59b370c233be5e47a488de44fed073522198f0634a87ab5f2d7d56
+DIST kicad-templates-5.0.1.tar.gz 1621185 BLAKE2B c21020ba11ff01863e5c8681247f8e17c03d06532f7eb6df94de8c6cd64f51142d54a762f83168b6c4f0b9c96764cb53d220eb6fd237c517fa07bfe51105543f SHA512 ccd995cc39bd578a95b1b3fdbe53a7bb8dd6638aa5717cd9a930371b0a48e66f1783ba3abce9438c7c29ab3b2b0a9075acc0b9c42eeb73480abf170a6f784668
 EBUILD kicad-templates-5.0.0.ebuild 462 BLAKE2B 384ad10b44f385257a1c070f79765cbc24cec53cc76d5342b81f35b22d99ebb6820815cc822fea54fd99d09ee6162be3bf77ecf453b7dca2c6bc631165fa061b SHA512 2baf2897f7fd4a1fff85ac8acef7c943316b0af68159176b4b5538ad563c28bab19c8d7b5f128b032c7f18023f7e4237a00296d6c10c458f358688c0150441f4
+EBUILD kicad-templates-5.0.1.ebuild 459 BLAKE2B d79ddb7dd35b96c1739f4e785c90c35654a982f5f4ef62d2e7e1334e9aa17597b87da0661934680e5b32ee20d99e67165cd0d92c8991a0e620f718fd2db1d1d0 SHA512 8de9ec54219987cd1bd69641c171fb5da3ae76f98bd7aeceb004bba444dd6e6d766597d61b85c46058a67f7748c5262f3fd3d9acc06e44d215c1866ab46ee625
 MISC metadata.xml 523 BLAKE2B 69cc5f4bec43a5acd17e3f762c7648e9af9c70a06516b233d78cd5446a0638115caff7559d43b13abd2929c0d7424335c00ad5cc72a1123fcdc6590fd1da8c23 SHA512 c8f588b7a40f7a1f703566b3585c9fa8051ceaae27db76912fc9f228aa27f0dfe9dcc90b728e11d94e27b6b3ed2ae55f0b0f98d2094ade00befdfd742f485d59
diff --git a/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild b/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild
new file mode 100644
index 000000000000..b18feefcca85
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-5.0.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-5.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 78dce085171a..fbd21c244eaa 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -2,11 +2,14 @@ AUX kicad-5.0.0-curl.patch 568 BLAKE2B 6a6d4d382f014fa57a5af8af27e6090f4c9e7b8c9
 AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee
 AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc
 AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
+AUX kicad-help-path.patch 4683 BLAKE2B 6b3e3d3567e0f554346ad2eb30b3af9e7ab07e77da2675513dd040e85011f6e711701c0cf3909399f4fe2298d7d59e71727583240d3e06701c18b4c2f59090ef SHA512 570fb711ffb18c7201e7a75791d1cc370493975d19e125de1ff6a78107b5fb70868975efd7d2a8ec921190484f7f91f723cca52337ec2e36f860b73dcedc3e7b
 DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
 DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
 DIST kicad-5.0.0.tar.xz 14284708 BLAKE2B 9f4414c4476aca8f2da1d7171b53f56d5ea216f11fc025695a228f93ec05e2f271cbab8429ed39445602a3a0707a31d44cce83eae0ad651167c471f52f3867cd SHA512 79d4d34e8eaa5b6e4c7baac39a76f86af89adbaf3f9181b8cd846ed3a8db1b4c6dd7a36efefda3394d33ef828917909ad3bd8bb22435af9c6f671efbff125b42
+DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
 EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
 EBUILD kicad-5.0.0-r1.ebuild 3505 BLAKE2B a330ec2d0080728dab3690408e7c17150884f10b62d70fff07dc07d37f4127e52b700ead2ec56161f865a5512400c422e110a474161d1f7e672d5eac3866e8f6 SHA512 85b0ab06e6d0b74885b0bf84ec19adbc20a838b3f1051f787172fbdb6c2a7ddd36e586db678eb93c9e5a1088e2b290d7c192e411e743e8922b1741e7de442144
+EBUILD kicad-5.0.1.ebuild 3471 BLAKE2B ac851512fe9132cd39e8e923e87f60043f715cec8036bc4b2405e3f2856c689d75fa7b150b4c13b9d2a7f494a87c12ce03270d2065c611b41fa3740d86aebc46 SHA512 c9b1a4869a5c100110482f03cc61450e7046e6be09c8e739eee858e3ff2fce34dad19ab687324d0c749890f1c4506b7268522e8abdcd41e886a9d411ec2e9110
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/files/kicad-help-path.patch b/sci-electronics/kicad/files/kicad-help-path.patch
new file mode 100644
index 000000000000..0fb43c3550ce
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-help-path.patch
@@ -0,0 +1,117 @@
+diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt
+--- kicad-5.0.1-orig/CMakeLists.txt	2018-10-08 14:14:38.000000000 -0700
++++ kicad-5.0.1/CMakeLists.txt	2018-12-25 00:04:50.423849671 -0800
+@@ -418,6 +418,10 @@
+ set( KIFACE_PREFIX  "_" )
+ #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
+ 
++# KICAD_HELP is the location of the help files accessed from the UI
++# (usually provided via kicad-doc package)
++set ( KICAD_HELP share/doc/kicad
++    CACHE PATH "Alternative location of KiCad help files.")
+ 
+ #================================================
+ # Locations for install targets.
+diff -Naur kicad-5.0.1-orig/CMakeModules/config.h.cmake kicad-5.0.1/CMakeModules/config.h.cmake
+--- kicad-5.0.1-orig/CMakeModules/config.h.cmake	2018-10-08 14:14:38.000000000 -0700
++++ kicad-5.0.1/CMakeModules/config.h.cmake	2018-12-25 00:04:39.215828924 -0800
+@@ -59,6 +59,10 @@
+ /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
+ #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
+ 
++/// KiCad help files path can be different on some systems allow adding alternative,
++/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
++#define KICAD_HELP                       "@KICAD_HELP@"
++
+ /// The wxPython version found during configuration.
+ #if defined( KICAD_SCRIPTING_WXPYTHON )
+ #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
+diff -Naur kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp kicad-5.0.1/common/searchhelpfilefullpath.cpp
+--- kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp	2018-10-08 14:14:38.000000000 -0700
++++ kicad-5.0.1/common/searchhelpfilefullpath.cpp	2018-12-25 00:04:05.576771741 -0800
+@@ -25,7 +25,7 @@
+ 
+ #include <pgm_base.h>
+ #include <common.h>
+-#include <config.h>     // to define DEFAULT_INSTALL_PATH
++#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
+ #include <macros.h>
+ 
+ 
+@@ -68,6 +68,10 @@
+     wxArrayString   subdirs;
+     wxArrayString   altsubdirs;
+     SEARCH_STACK    ss = aSStack;
++#if ! defined(__WXMAC__) // && defined(__linux__)
++    SEARCH_STACK    altss;
++    wxArrayString   moresubdirs;
++#endif
+ 
+     // It might already be in aSStack, but why depend on other code
+     // far away when it's so easy to add it again (to our copy) as the first place to look.
+@@ -75,6 +79,7 @@
+     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
+     // build configuration:
+     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
++    altss.AddPaths( wxT( KICAD_HELP ), 0 );
+ 
+ #if defined(__WXMAC__)
+     ss.AddPaths( GetOSXKicadMachineDataDir() );
+@@ -103,16 +108,17 @@
+ 
+     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
+     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
+-    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
+     // Below we account for an international subdirectory.
+     subdirs.Add( wxT( "share" ) );
+     subdirs.Add( wxT( "doc" ) );
+     subdirs.Add( wxT( "kicad" ) );
+     subdirs.Add( wxT( "help" ) );
+ 
++    // For custom help path installations via ${KICAD_HELP}
++    moresubdirs.Add( wxT( "help" ) );
++
+     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
+     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
+-    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
+     // Below we account for an international subdirectory.
+     altsubdirs.Add( wxT( "doc" ) );
+     altsubdirs.Add( wxT( "help" ) );
+@@ -158,6 +164,9 @@
+     {
+         subdirs.Add( locale_name_dirs[ii] );
+         altsubdirs.Add( locale_name_dirs[ii] );
++#if ! defined(__WXMAC__) // && defined(__linux__)
++        moresubdirs.Add( locale_name_dirs[ii] );
++#endif
+ 
+         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
+ 
+@@ -187,8 +196,27 @@
+         if( !fn.IsEmpty() )
+             break;
+ 
++#if ! defined(__WXMAC__) // && defined(__linux__)
++        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
++
++        if( !fn.IsEmpty() )
++        {
++            // Prepend URI protocol since we will open in a browser
++            fn = wxT( "file://" ) + fn;
++            break;
++        }
++
++        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
++
++        if( !fn.IsEmpty() )
++            break;
++#endif
++
+         subdirs.RemoveAt( subdirs.GetCount() - 1 );
+         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
++#if ! defined(__WXMAC__) // && defined(__linux__)
++        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
++#endif
+     }
+ 
+     return fn;
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
new file mode 100644
index 000000000000..598f92dad725
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
+	python? (
+		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	>=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}]
+	github? ( net-misc/curl:=[ssl] )
+	media-libs/glew:0=
+	<=media-libs/glm-0.9.9.2
+	media-libs/freeglut
+	media-libs/mesa
+	ngspice? (
+		sci-electronics/ngspice[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}-5.0.0-curl.patch"
+	"${FILESDIR}"/"${PN}-help-path.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="/usr/share/doc/${P}"
+		-DKICAD_HELP="/usr/share/doc/${PN}-doc-${PV}"
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_USE_OCE="$(usex oce)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	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/Manifest.gz b/sci-geosciences/Manifest.gz
index 4b6691a0be58..53f4de94142d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 5804e99badb9..619075954746 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,3 +1,6 @@
+AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
-EBUILD geocode-glib-3.24.0.ebuild 1126 BLAKE2B a32f466ba0e92ce4f07cb8c4c3de71f45cf9d309e16aecdb3b976cca8644de0feff9d50ec69a5c30104e4b64cdf8ece6a97430d7cc7cb4a328db121ac55c3e63 SHA512 92bc4d7b61f6eb6c38268fa6ac2852a2aeb126bab0953e3280b6750cd9a4c74d024f8205d30bce000ca990ae0cf979773cd726834880f167eb76cda28e2b863e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838
+EBUILD geocode-glib-3.24.0.ebuild 1102 BLAKE2B 57374e9c55d69bf88a15daba5a16288141d601fb63db5aef322bc6ae0e9293a36cccd32a45fa4e8b582e904239d091dd85159a52d3c0d71f405faf9a20eb092d SHA512 1f22d917ed56b2cc8e0707586131fb0c5c94a7322d444b06a3a31a06e445b0bd35eab970b747538b889066700600a03e4acd909f723f2682d888d6bd8d715b31
+EBUILD geocode-glib-3.26.0.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
+MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
diff --git a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
new file mode 100644
index 000000000000..9358e4896526
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
@@ -0,0 +1,38 @@
+--- a/geocode-glib/tests/meson.build	2019-01-11 14:10:47.797376871 +0200
++++ b/geocode-glib/tests/meson.build	2019-01-11 14:13:09.409159050 +0200
+@@ -3,7 +3,7 @@
+ e = executable('geo-uri',
+                'geo-uri.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Geo URI', e)
+ 
+@@ -12,7 +12,7 @@
+                'geocode-nominatim-test.c',
+                'geocode-glib.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ env = ['G_TEST_SRCDIR=' + meson.current_source_dir()]
+ test('API test', e, env: env)
+@@ -20,10 +20,11 @@
+ e = executable('mock-backend',
+                'mock-backend.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Test mock backend', e)
+ 
++if false
+ install_data('locale_format.json',
+              'locale_name.json',
+              'nominatim-area.json',
+@@ -39,3 +40,4 @@
+              'search_lat_long.json',
+              'xep.json',
+              install_dir: install_dir)
++endif
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
index 792fefb398a0..73ffc54fc348 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2
 
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+DESCRIPTION="GLib helper library for geocoding services"
 HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection test"
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
new file mode 100644
index 000000000000..018bb7e4086a
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.99.2[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/disable-installed-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+	meson_src_configure
+}
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index 39980802b1da..f4c3acdf586c 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -5,4 +5,8 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<longdescription lang="en">
+	geocode-glib is a helper library for geocoding and reverse-geocoding
+	services offered by OpenStreetMap and Nominatim.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index a5f2f1a2ab9e..680ca17f9442 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,7 +1,5 @@
-DIST gpxsee-5.14.tar.gz 3155455 BLAKE2B 6180efa345532c99a655b80b6052e6646d4b8bcf5b7feda1eec6f0c73ca63a21cf6ab7efd29e297d35e2cd5ab8cd73204864f1db0e9417107b59bc29f8982d3e SHA512 0fa666b999bb6990a3e78087053f9647c023a21b2bbec870fffc4fe1df3982e06beb294231340c4a0a006d06a1c136f94a09724ffa76758c1246d79f3077b075
-DIST gpxsee-5.17.tar.gz 3831253 BLAKE2B 297dc940a373a302e93b647b386813d1d0d96ac3d01937f84d8bb79239be492b358351b498743981c046a86349b5036d4448288e7cb113eae42383b1f3ed64ed SHA512 260af8d80df5d4239a4ad6c32154871f663c167f6dc697a4cbc7127d29e8752c401720697ba463647852d4179cd484e871645385baad277f3512e74159a2016e
 DIST gpxsee-6.3.tar.gz 3861093 BLAKE2B bd6cd81b1f2c4fdd3b4b6c0bae72be1a48ad0f0d22203f653e325228974eaf0043eca41efd42e085bd5811a8d2a9cd2f51fe04c03d9e9d064e01cfc24d7a12e4 SHA512 7a4f23444517a0481490f8f1a0520634e63e0416dd5fd5bdb01942df138839595dffd4bced21e264552915c38e5653e927244ea5ca185ff3f93df56fad3e9c73
-EBUILD gpxsee-5.14.ebuild 1528 BLAKE2B 3a497c29783eddebffec8cf3d9a6220680ba6763462f9b508b26c4cd6750af21982768eeac0086e03befd819fcdd159981457cc75c4d946ac2ab8b43c23e78a2 SHA512 e7eb13dd2c1577283f9e7fd75594436dff2cd35c0f5d9a2d987e2f02638d0fbd3346ab6808e85b50a202e630fa3de2852cdbeb3546ab73a07ce389392de576fe
-EBUILD gpxsee-5.17.ebuild 1528 BLAKE2B 3a497c29783eddebffec8cf3d9a6220680ba6763462f9b508b26c4cd6750af21982768eeac0086e03befd819fcdd159981457cc75c4d946ac2ab8b43c23e78a2 SHA512 e7eb13dd2c1577283f9e7fd75594436dff2cd35c0f5d9a2d987e2f02638d0fbd3346ab6808e85b50a202e630fa3de2852cdbeb3546ab73a07ce389392de576fe
+DIST gpxsee-7.1.tar.gz 3868798 BLAKE2B 08bc30d77508429bec94bbdb255b76b79c21bd2e251b216743f49fa45f59ded5a02e730c4766fd9f15e2357d74a66750e3e7515a9d8bdd21a1f97dee77cbec02 SHA512 bb7dc14a3cf7ca87a4335383d6c4c380fcf1a0009161ec988b1b5cf964cf757bbe05ae2e51d726edcb97966918afe4d872172087988321222a65e3c27c276a5d
 EBUILD gpxsee-6.3.ebuild 1537 BLAKE2B 5868cebe01d8b5095eb92c5fbf43b87961b2b08a3d9afb1fed7d7f0e7dda58bb68aa1a7953f52f5d569c4722cfeaa7350f30391ba6b6738a92f6284782444660 SHA512 f25ad58786a05cbdf28e99aff7054281d0fcc199cae3e090a4db11ac42f4f5a802e9247a309396e25db884f58ce5e654ec5c590d80fd8d9429c444c6c5bab0b1
+EBUILD gpxsee-7.1.ebuild 1540 BLAKE2B 0ba94919b68048f8ffe4c898eb37053a648cbef4445c3eab1bb5c381b320e9e6d0c9c7ddec2e81f658ec262beecb892a20f46efc460e900b048aaa1dcda2ab47 SHA512 63c95ed59603f3b34c55d80a0ffcca9040d075b8952b388b6ad490c350d33956558dfafd97c66e4fd8735a63c2befddadb5f78266f2e2d022053345ba4c867d1
 MISC metadata.xml 606 BLAKE2B cd468e458982d936273ab8f5935689a09a07277dc98994466e0689c600f53d78773144c84a2bba96aee3945685a0e8c7d56a796c277c80db84002c30a00e9cb4 SHA512 002ff03250b14bb15a7345221a95aa37d75a88f3caff84f0510a13cc07738173ec54a555b532d1bba561cdcfaf2235fc40b5379eacfdb84e5a4e59a3c2026dfd
diff --git a/sci-geosciences/gpxsee/gpxsee-5.14.ebuild b/sci-geosciences/gpxsee/gpxsee-5.14.ebuild
deleted file mode 100644
index 50bccd2c2d46..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-5.14.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
-
-PLOCALES="cs de fi fr pl 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="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${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() {
-	local lang
-	newbin ${MY_PN} ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	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/gpxsee-5.17.ebuild b/sci-geosciences/gpxsee/gpxsee-5.17.ebuild
deleted file mode 100644
index 50bccd2c2d46..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-5.17.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
-
-PLOCALES="cs de fi fr pl 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="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${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() {
-	local lang
-	newbin ${MY_PN} ${PN}
-	dodoc README.md
-	insinto /usr/share/${PN}
-	doins -r pkg/maps pkg/csv
-
-	insinto /usr/share/${PN}/translations
-	for lang in lang/*.qm; do
-		[ -f "${lang}" ] && doins "${lang}"
-	done
-
-	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/gpxsee-7.1.ebuild b/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
new file mode 100644
index 000000000000..f12eaf15a651
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-7.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en fi fr nb pl ru sv tr"
+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="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${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() {
+	local lang
+	newbin ${MY_PN} ${PN}
+	dodoc README.md
+	insinto /usr/share/${PN}
+	doins -r pkg/maps pkg/csv
+
+	insinto /usr/share/${PN}/translations
+	for lang in lang/*.qm; do
+		[ -f "${lang}" ] && doins "${lang}"
+	done
+
+	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/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 26a3cf2d5d46..8128edbcd07b 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -4,7 +4,6 @@ AUX merkaartor-0.18.3-webengine1.patch 6601 BLAKE2B efcb88f07abc23ff5221f42beb43
 AUX merkaartor-0.18.3-webengine2.patch 1647 BLAKE2B eb11ac314da643a6db425b8c0f520e315218420be2a438995a9f9deaaebf48c9f5e1bb65fa59bb20aab0c269f8730e299aedbaa40152eba44ae2b7a8c0139885 SHA512 faf8a4b22da050a88278672a77029c87a2b30658efc424a4c046a8fcecd491f763278076aad32cb88d8bd254d3f5837e272f178ca97c88a55831199aff0a138a
 AUX merkaartor-0.18.3-webengine3.patch 4895 BLAKE2B 38a9a6a87774094a8a6b1104dc2f5a4156bb908799ae6388b6d90ad41d9ef1a288368e7854dcdeddcd1db6a316c3488c90d7760c8757787be605a5e3de0c9afc SHA512 8b7478f5d3342f288f368b22ccfae113c0358d81ddce31eb211671202ac97ac314d73e0762ab66f0f708edfbeef3dfd5a4a6a2da7a37bf8f93b2151cfa56def2
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
-EBUILD merkaartor-0.18.3-r3.ebuild 2257 BLAKE2B 54f02ae8d223a955d5e51f5675a25f0309e33cfa7e4118514ee2641b25c99eb60391a1e180c8e9f8cb9c0a9a191809c7f75cfcf804b85831cacb78844dc22d5f SHA512 b7dc364577288741999f114a5d8a1b39d57727b9ef062e27ad479fda9cf1e9393197ed785a3ad14f3117ba0708a8875cea714b1c64bff282d44e8695860313a7
 EBUILD merkaartor-0.18.3-r4.ebuild 2396 BLAKE2B 67cee765fa25b9ac7bf20ca89e10f51152ace48710eec72399c8b2d28b9521b4878655318caf90345c2d549af0346a73c70d1b81c6acc3f6ee3d8074bf5f102d SHA512 3a10b813895d1e5526e2bd718c4d17185ac5205c5e0d20f5952681776f409990aff108e2645a704595561858d562f3fb0c9db9adde0776e3b81f535a1217a926
 EBUILD merkaartor-9999.ebuild 2293 BLAKE2B 3dc5a0124e7a40bdcc2adf52e55ab2dc5368057e7d7e4fbd8990ef67e5d986f2497f7dde191e882cf2a26542dfa5bf8c6d213a1b6a79f095e56184dbc49856b4 SHA512 1366d4dd45c937b73c2125e549bf7fb0a4e97d38c3a76bc737966440735dbe451cecec9db5958ee9455abff00409deda507207f3b39cf8b00b7abc2ca5a31b9e
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
deleted file mode 100644
index 19e627bdad45..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	>=sci-libs/gdal-1.6.0
-	>=sci-libs/proj-4.6
-	sys-libs/zlib
-	exif? ( media-gfx/exiv2:= )
-	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
-	libproxy? ( net-libs/libproxy )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
-DOCS=( AUTHORS CHANGELOG )
-
-src_prepare() {
-	default
-
-	my_rm_loc() {
-		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
-		rm "translations/${PN}_${1}.ts" || die
-	}
-
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
-		$(qt5_get_bindir)/lrelease src/src.pro || die
-	fi
-
-	# build system expects to be building from git
-	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
-}
-
-src_configure() {
-	# TRANSDIR_SYSTEM is for bug #385671
-	eqmake5 \
-		PREFIX="${ED%/}/usr" \
-		LIBDIR="${ED%/}/usr/$(get_libdir)" \
-		PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
-		SHARE_DIR_PATH="/usr/share/${PN}" \
-		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
-		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
-		SYSTEM_QTSA=1 \
-		RELEASE=1 \
-		NODEBUG="$(usex debug '0' '1')" \
-		GEOIMAGE="$(usex exif '1' '0')" \
-		GPSDLIB="$(usex gps '1' '0')" \
-		LIBPROXY="$(usex libproxy '1' '0')" \
-		ZBAR=0 \
-		Merkaartor.pro
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index f373246d955b..4db60b497bbd 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,8 +1,8 @@
 AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d
 DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e
 DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
-DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133
+DIST qmapshack-1.12.1.tar.gz 12033026 BLAKE2B e898507bad42a141f02cf8fd0338cdf9f39344b249318be29d1e6eb500a9e810496c6a790745cf50aec0025b5547be8382ef0c9eab2d780cbf63f9d29eb064a9 SHA512 c9b6ad0c7372cc4d992cee07d20ee0ad5779014ce6336644e13be705ec0bbed22d5f83e27473c2813c5bf13e49558686546c50fd597eb9ef2692c64933f94713
 EBUILD qmapshack-1.11.1-r1.ebuild 937 BLAKE2B e85730518ec6b863e90db2b77a24f2a4def775338a7683e80f7040e61806e3f2d6e0bc823afd1acdeb25641743261ea2a0cf2470795de1a20d2edcaefb3c5998 SHA512 148bab65d8f829d89e84f1df532701085d378fc9bda4f51fc68c8b05c9c48874e9acbc7ae721044db7a56b907ca9fe417094281c5460f571e7ebddad6cfcc57b
 EBUILD qmapshack-1.12.0.ebuild 922 BLAKE2B fc3b1c8317a13af3a85c85225df00470cc0ea4a2a0968cd843f827e23d0c4dd2f1c078df3c4dc3664b10e0f3e2165d1f92c1447175e2e53d60e78da68016948e SHA512 a146801935f9816c3e3abb09f88468cfd5e2d89881f6130325f17fa58d55705cbb6dfadd93340a531e4efe5b6eae7751bca741f1a20c153f45786385212fc623
-EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092
+EBUILD qmapshack-1.12.1.ebuild 922 BLAKE2B 0648b29870c6882bb3e3e2e3f3b85e4e39788e517e93d16e52fe7a50822d7f57f4e07cd7146fc4f3960622cbb789848e603a12ddc4d16fab2a08c1f335befd38 SHA512 fdc7e4dd5c41f28a8b7186096435b817c03c2b5440733820981e2e167d2e13d9dbd034dce59dd8f4b1c85bbdb6f857641d5326e179771872bc4be2924a091f8b
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild
new file mode 100644
index 000000000000..d7cc3ab65fff
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/designer:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-libs/quazip
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj
+	sci-libs/alglib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+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/qmapshack/qmapshack-1.6.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
deleted file mode 100644
index b75a39d2f4d4..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="GPS mapping utility"
-HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
-SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtwebkit:5
-	dev-qt/qtscript:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
-	dev-qt/qttest:5
-	dev-qt/qtnetwork:5[ssl]
-	>=sci-geosciences/routino-3.1.1
-	sci-libs/gdal
-	sci-libs/proj"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 27a1a147000d..113626ce8efb 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 9abab49a38c7..344608836207 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,4 +1,4 @@
 AUX cholmod-1.7.4-parmetis32.patch 702 BLAKE2B 241d68fa25ac2ab3f9a425702559736fb15657eda82c5ba0a413174c146c09e0be167746f866a64189d027892d180445adcf92f55fc913c9bff0085f87051c94 SHA512 a1694a7f42f10c7619e23817e93f76df35bc208200918b74a6dd68bb4662d57ce2f3665be424ad4b5c8a4ea9c3957676c48716aa0e47d9fb19337dc43e759ecc
 DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
-EBUILD cholmod-2.1.2.ebuild 1775 BLAKE2B 6540adeeb55b8f0503041f5f21c93c7e0fc0b33dc36984112c44cba4308f4181f5429ae62e1c275da39272f90024f640939976e7e37010350f1e051bdbfe3914 SHA512 1f088d390bb3fa40f99308b0fa3a24d10b2de86abc0dc00ae77ca5807e9e2c7b793ecc6c2e526f5b99d0b508fea845fd63cb07a62d3eaa46d0ebbc7e07b6dc1b
+EBUILD cholmod-2.1.2.ebuild 1781 BLAKE2B 4fefd52e696a325edcf03866f18f459568ec0c2e41593cbd49485f20303206acb97a35c67eb2ede6cb893f9a41c4b0a15be2c0639e18815654611052566bc35a SHA512 d0ce97878df14b01fa42b3c01b1976509918a4fb52403101ea4db3843d0e670619147d88d5b14b604ab1e66213eef10cad459d6f8e7b03e3b1e06006ea5d65cb
 MISC metadata.xml 603 BLAKE2B ce6355915a22fd4bb81f619a1b946f83b971b43caf86929441452938c1bee5971c5f95d0349d13d740efcf51883015334db167d2fab49c8954ac6af1d5ca3348 SHA512 da9db58edeab0b40813e47567cbaa4e54ae8aa9f4cdc89cd87f1e35bb65991c305bc955e6aba744d322c6375de0e8ba1253415814175cf1f4bc2a01de2e11d22
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index a0460f5c4b64..2f32156ec941 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ RDEPEND="
 	metis? (
 		>=sci-libs/camd-2.3
 		>=sci-libs/ccolamd-2.8
-		|| ( sci-libs/metis sci-libs/parmetis ) )"
+		|| ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/sci-libs/oce/Manifest b/sci-libs/oce/Manifest
index a752ebf3f6ce..fe29e968db28 100644
--- a/sci-libs/oce/Manifest
+++ b/sci-libs/oce/Manifest
@@ -1,3 +1,4 @@
+AUX oce-0.18.3-test-fix.patch 1273 BLAKE2B 40c3fec8e3d5b703c39a2eee32d663e6dc7c6a1bad6a9885608679cb86f8047d6a50e1f625beac50dca045393f0d0290b5ca9d56a7498ba869a4af5028eb1fa0 SHA512 822bee12ee259801a3a242d3877fa3c6dd07043f65857d635a4790cdfd936be4016d1441e4dd3b8e7ff1cd1d187d1ab8fc7634e39376e91d06d8666d38632689
 DIST OCE-0.18.3.tar.gz 24633768 BLAKE2B c1923fb6310ea30318251fedac371655a575bf4dfcc4c38e7c748d316416e08c33a3f27bd5db7f5b437265cf2f518651d69a6920f9f487dc7e0065a6406c653f SHA512 6fdeb6ca4ce25361379872ccc465799d4a43407974c4f626b32df695e582b9e553cce17af6a6a7ff46ebed9b813d910ad23eb308a5356dabb9b9bbd4f42a8636
-EBUILD oce-0.18.3.ebuild 1763 BLAKE2B 13ffa2330159736666b46f07fb2592fc03a26d07d9f7bde82b28a735f552dde34cf84aba642b04dddd69862c2c25a1d1bec0b273953cdc8f2e346e75b301ab84 SHA512 934ce2c83353e8879b8b104fef7fb6c0aad2f688ac86279921b2c605edaf3c94aab1f0552fa157018ccd79e547dae6158a6cf6edf5d5a9768ec62d39303fbcf5
+EBUILD oce-0.18.3-r1.ebuild 1809 BLAKE2B d2c1de828d9b1845077f114fe78af3061bcb3d30d15217144c21c6b7f2cadade1b0b3370f8802602ef6397c39956c58f7a0a933e237955afbb197fe2486b3369 SHA512 9537e2bf8ff0234ddbb87c9e4ac42021545167e544f10f947b8f24cdf90bbb319247f213d75ffdf36419e5a8df111d302d44f57586442184f1b124e3d2d23dfe
 MISC metadata.xml 900 BLAKE2B aec66b3c98aaaadf1727f4522a79ad01e8d195ac62799a5112a2d61ca9d916635ff110f99840f97ebad81a1324780d15218757c1b982536ae9e14945699e6b5b SHA512 86a44a573579df2416b949b62fe931172681f36bf7af9f90f7224e3fc433cb7091c3ef757581337aa87d80962a4800fa03e005e5360233f570f7d926553735ba
diff --git a/sci-libs/oce/files/oce-0.18.3-test-fix.patch b/sci-libs/oce/files/oce-0.18.3-test-fix.patch
new file mode 100644
index 000000000000..bec55d9d36b4
--- /dev/null
+++ b/sci-libs/oce/files/oce-0.18.3-test-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/test/OCAFExport_test/CMakeLists.txt b/test/OCAFExport_test/CMakeLists.txt
+index f81798a3a4..8d9f6ad86c 100644
+--- a/test/OCAFExport_test/CMakeLists.txt
++++ b/test/OCAFExport_test/CMakeLists.txt
+@@ -5,6 +5,6 @@ if (OCE_OCAF AND NOT OCE_DISABLE_X11)
+ 	file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/StdResource" BuildPluginDir)
+ 	# Semi-colon is a delimiter in SET_TESTS_PROPERTIES and have to be escaped
+ 	string(REPLACE ";" "\\;" BuildPluginDir "${BuildPluginDir}")
+-	set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
+-	set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir}")
++	set_tests_properties(OCAFExportTestSuite.testExportAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
++	set_tests_properties(OCAFExportTestSuite.testExportNonAscii PROPERTIES ENVIRONMENT "CSF_PluginDefaults=${BuildPluginDir};CSF_StandardDefaults=${BuildPluginDir};LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+ endif ()
diff --git a/sci-libs/oce/oce-0.18.3-r1.ebuild b/sci-libs/oce/oce-0.18.3-r1.ebuild
new file mode 100644
index 000000000000..0835a64d2bf5
--- /dev/null
+++ b/sci-libs/oce/oce-0.18.3-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils check-reqs multilib java-pkg-opt-2
+
+DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="https://github.com/tpaviot/oce"
+SRC_URI="https://github.com/tpaviot/oce/archive/OCE-$PV.tar.gz"
+
+LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples freeimage gl2ps +openmp tbb vtk"
+REQUIRED_USE="?? ( openmp tbb )"
+
+MY_P="oce-OCE-${PV}"
+S="${WORKDIR}/${MY_P}"
+DEPEND="
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/ftgl
+	media-libs/freetype
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu
+	freeimage? ( media-libs/freeimage )
+	gl2ps? ( x11-libs/gl2ps )
+	tbb? ( dev-cpp/tbb )
+	vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
+RDEPEND="${DEPEND}"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+PATCHES=( "${FILESDIR}"/"${P}-test-fix.patch" )
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# From BUILD.Unix.md
+	local mycmakeargs=(
+		-DOCE_INSTALL_PREFIX="/usr"
+		-DOCE_ENABLE_DEB_FLAG=off
+		-DOCE_COPY_HEADERS_BUILD=yes
+		-DOCE_DRAW=yes
+		-DOCE_WITH_FREEIMAGE=$(usex freeimage)
+		-DOCE_WITH_GL2PS=$(usex gl2ps)
+		-DOCE_WITH_VTK=$(usex vtk)
+	)
+	# Mutual exclusion of tbb and openmp flags is guaranteed by REQUIRED_USE.
+	use tbb && mycmakeargs+=(
+		-DOCE_MULTITHREAD_LIBRARY="TBB"
+	)
+	use openmp && mycmakeargs+=(
+		-DOCE_MULTITHREAD_LIBRARY="OPENMP"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# If user asked for samples let's copy them to the docs folder
+	if use examples ; then
+		dodoc -r samples
+	fi
+}
diff --git a/sci-libs/oce/oce-0.18.3.ebuild b/sci-libs/oce/oce-0.18.3.ebuild
deleted file mode 100644
index 69c85c7057f2..000000000000
--- a/sci-libs/oce/oce-0.18.3.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 cmake-utils eutils check-reqs multilib java-pkg-opt-2
-
-DESCRIPTION="Development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
-HOMEPAGE="https://github.com/tpaviot/oce"
-SRC_URI="https://github.com/tpaviot/oce/archive/OCE-$PV.tar.gz"
-
-LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples freeimage gl2ps +openmp tbb vtk"
-REQUIRED_USE="?? ( openmp tbb )"
-
-MY_P="oce-OCE-${PV}"
-S="${WORKDIR}/${MY_P}"
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/tix
-	media-libs/ftgl
-	media-libs/freetype
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu
-	freeimage? ( media-libs/freeimage )
-	gl2ps? ( x11-libs/gl2ps )
-	tbb? ( dev-cpp/tbb )
-	vtk? ( =sci-libs/vtk-8.1*[boost,imaging,qt5,python,rendering,views,xdmf2] )"
-RDEPEND="${DEPEND}"
-
-CHECKREQS_MEMORY="256M"
-CHECKREQS_DISK_BUILD="3584M"
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# From BUILD.Unix.md
-	local mycmakeargs=(
-		-DOCE_INSTALL_PREFIX="/usr"
-		-DOCE_ENABLE_DEB_FLAG=off
-		-DOCE_COPY_HEADERS_BUILD=yes
-		-DOCE_DRAW=yes
-		-DOCE_WITH_FREEIMAGE=$(usex freeimage)
-		-DOCE_WITH_GL2PS=$(usex gl2ps)
-		-DOCE_WITH_VTK=$(usex vtk)
-	)
-	# Mutual exclusion of tbb and openmp flags is guaranteed by REQUIRED_USE.
-	use tbb && mycmakeargs+=(
-		-DOCE_MULTITHREAD_LIBRARY="TBB"
-	)
-	use openmp && mycmakeargs+=(
-		-DOCE_MULTITHREAD_LIBRARY="OPENMP"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# If user asked for samples let's copy them to the docs folder
-	if use examples ; then
-		dodoc -r samples
-	fi
-}
diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest
index 6a53363f76a6..ba9de7da7493 100644
--- a/sci-libs/parmetis/Manifest
+++ b/sci-libs/parmetis/Manifest
@@ -3,5 +3,5 @@ DIST ParMetis-3.2.0.tar.gz 5291841 BLAKE2B f18b5144f2814a83c3a0b945b1bdbad812cce
 DIST metis-5.1.0.tar.gz 4984968 BLAKE2B c5f8ff552fce7e7cc02740e6197c9deb5e05e8bc2e2e56cad0cba85705eec6990b511182930c8758fd16a18015f54c8a4827038039bc3c58ee41df468ea175bc SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25
 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132
 EBUILD parmetis-3.2.0.ebuild 867 BLAKE2B 98b33fe947e2c2b596d698d6923c18c7a22c144261d1a1ac2132af047be7366a18932e4e40d2e2a513000e0b895127623be456eaaa4b40da8ef56d7e00643c8d SHA512 d7d4ba4be5f372187796ac6c6d9c80a342b54bb7a01034d84676eca9cff2e88f4cda9c4b6170560faa342038b94616a9444690fa13472372cca48c964feaa0ef
-EBUILD parmetis-4.0.3.ebuild 4025 BLAKE2B 5dc751ed37a54d10310642c30bcc6048b150bf965f5458b453ea2a622fe4c1994c69b625ee5540aec4b10d077c78595950eb812953da8e3ae7ada2c7aaba05f4 SHA512 9e613b42f111a8313528a0a293889f6c1a43e30261ce3ca1a53609831f00ba1677e8d66fcc97c487916e13ad9235589f68a458d2110dc5122c7136a526aaff61
+EBUILD parmetis-4.0.3.ebuild 4083 BLAKE2B a26a6988ac29f6e6107626141a377cb732cafb3b17aa6ac8840f8ae1cf604b6009f89f495c3833f7e7ef3cdb3cbb00645b7860463ced3b46d38f5dd5a4c86633 SHA512 902ca8d5d974ebded7aacaaf5d9d099eb42078b4c3e601a4b250c5fa5689caea6a213bab75abdb0b691c6d42026123f81e9046575fef4e877ccbb99ca71f3e80
 MISC metadata.xml 851 BLAKE2B 8c8fc30f50378b05ae59ca1f829da71f2a5cf66dfab03f645ceed4379bc8edc176fb9e5d1f1f83bbb695519a9e14bfd7855e040f56070a344791eb70eed12721 SHA512 6309c02babe871cd0bdaf509caab79dd8b81face5f6f5a39a1473284dbae6859223ae4f65d61fcf08370bac29dfd0e174cb722fbeeaeb5c80d53b749c265c73a
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 71ee81fcbc9d..bb48b4e600fe 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils cmake-utils toolchain-funcs
+EAPI=6
 
 # Check metis version bundled in parmetis tar ball
 # by diff of metis and parmetis tar ball
 METISPV=5.1.0
 METISP=metis-${METISPV}
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Parallel (MPI) unstructured graph partitioning library"
 HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
@@ -36,6 +35,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	# libdir love
 	sed -i \
 		-e '/DESTINATION/s/lib/lib${LIB_SUFFIX}/g' \
@@ -47,7 +48,9 @@ src_prepare() {
 	sed -i \
 		-e '/programs/d' \
 		CMakeLists.txt metis/CMakeLists.txt || die
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+	if use static-libs; then
+		mkdir "${WORKDIR}/${PN}_static" || die
+	fi
 
 	if use mpi; then
 		export CC=mpicc CXX=mpicxx
@@ -56,14 +59,15 @@ src_prepare() {
 			-e '/add_subdirectory(include/d' \
 			-e '/add_subdirectory(libparmetis/d' \
 			CMakeLists.txt || die
-
 	fi
 
-	use int64 && \
-		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use int64; then
+		sed -i -e '/IDXTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 
-	use double-precision && \
-		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h
+	if use double-precision; then
+		sed -i -e '/REALTYPEWIDTH/s/32/64/' metis/include/metis.h || die
+	fi
 }
 
 src_configure() {
@@ -73,16 +77,17 @@ src_configure() {
 			-DMETIS_PATH="${S}/metis"
 			-DGKRAND=ON
 			-DMETIS_INSTALL=ON
-			$(cmake-utils_use openmp OPENMP)
-			$(cmake-utils_use pcre PCRE)
+			-DOPENMP=$(usex openmp)
+			-DPCRE=$(usex pcre)
 			$@
 		)
 		cmake-utils_src_configure
 	}
 	parmetis_configure -DSHARED=ON
-	use static-libs && \
-		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake && \
+	if use static-libs; then
+		sed -i -e '/fPIC/d' metis/GKlib/GKlibSystem.cmake || die
 		BUILD_DIR="${WORKDIR}/${PN}_static" parmetis_configure
+	fi
 }
 
 src_compile() {
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 89daef2190af..0b6d823ef2b4 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 04b3e07b3b7e..cd650b49a799 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -1,8 +1,11 @@
 AUX fix-version.patch 499 BLAKE2B e4522d29cb5eed0eaad14ba37d9575268721457d607a7e10be571c56fcb016ec58c303df5b0b5f3430acee986d381241c39a8b1bde4eb136867552620b21d0ea SHA512 9ea8b52377cf11e6dc34860d3231dee364a8018d860a25ca25901fc00e948adb11ba767106df67e5769e6328fcb703638a14178666f53f9518c0e07b15d36767
 AUX fix-version2.patch 560 BLAKE2B 1a922dbb933781cceaf89898f8cac7e36caafb5217cf0b0f9c2dbae56d0bdc2ff66df21133a21e09f2c56b78cccda7679aa94c2d33c83623ed0c027accf5bf7f SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8
 AUX msieve-1.51-reduce-printf.patch 1598 BLAKE2B 3cce6aab49b9c66fb4f0feede9a56a70ad62f63fdaad76116948133dd1a915d17c0b6887adc936692de1a91e917954a0478ea30d5db0449e3ad43b5d35835da8 SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6
+AUX msieve-1.53-fix-version.patch 1138 BLAKE2B 110bdba41cc622eb6edbebef641df4f5cbd9c184e87c8ee2824c7a29aa10f4615c98d4e1ef754fea960756d6afc1bf58e66c9f9d561fa3c699b462b216a9aabe SHA512 3133cd9d424328802060578fef60b7e0657b044927ac6a4e677c356f79224ec3d066764ab3ce6a06e5fc203bd8a000cbde47705277dcb6cc5f6a9004200d299d
 AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b1385ab89a4c83586a4b774f9bd65f1fa007df32b5c57c80af6c58425742f8611c80746a361fe6d6ec5eb8aeb SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98
+DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
 DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4
 EBUILD msieve-1.51.ebuild 1517 BLAKE2B 3fdc54265bb1046de71e125c9548d20450cc8f63dc3e376537b33135b3a471c1b47fadd0a1709a7ab65f82eeb7e36fb140599a71583722c28c7a8876d772306b SHA512 a24368225d685a913b0231d4ca8342a3a4e551c7ee37f16fbe21ce2b957ed4fde235df48244f0723d7d37b5b4fab204b27174666dafcd595baf759c70c33d56f
+EBUILD msieve-1.53.ebuild 1539 BLAKE2B f4cb1472f9c0cab4d2d3c61b6faebefa4da58c1b2ce3e641d818d716a468b1e237943c7d8dee52d864e60b345c8633a263a798fa1dec3a90e348523a71fc66cd SHA512 02d02e2b91d52ca74129f33b4c9eec4310d79d1822473400b8bd6a0f7d6ae706bc79be207a0891285942f2899be010a0605780b4607caca6d9adb533c4c957b0
 EBUILD msieve-9999.ebuild 1390 BLAKE2B ff2d1e3a22f2e1b44c8f5c0c5644ba87d7f013a679a64c3ee720147465082473f74d3174c072c45d9686c15eba1928e17c916ae94900616b011faaec875937c7 SHA512 07c5ef126bd37d859d2ed826ff87ce3c7b82bb02f11a23165fddcea791e025ed671231e919b13b8a137ec0fac06270105927c30698c2ef6d56f0666dfe2a386d
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
new file mode 100644
index 000000000000..eb9a8d7ac2d0
--- /dev/null
+++ b/sci-mathematics/msieve/files/msieve-1.53-fix-version.patch
@@ -0,0 +1,33 @@
+diff --git a/common/driver.c b/common/driver.c
+index ffecfa9..3e1da78 100644
+--- a/common/driver.c
++++ b/common/driver.c
+@@ -189,10 +189,9 @@ void msieve_run(msieve_obj *obj) {
+ 
+ 	logprintf(obj, "\n");
+ 	logprintf(obj, "\n");
+-	logprintf(obj, "Msieve v. %d.%02d (SVN %s)\n", 
++	logprintf(obj, "Msieve v. %d.%02d\n",
+ 				MSIEVE_MAJOR_VERSION, 
+-				MSIEVE_MINOR_VERSION,
+-				MSIEVE_SVN_VERSION);
++				MSIEVE_MINOR_VERSION);
+ 	start_time = time(NULL);
+ 	if (obj->flags & MSIEVE_FLAG_LOG_TO_STDOUT) {
+ 		printf("%s", ctime(&start_time));
+diff --git a/demo.c b/demo.c
+index a882732..ec3e869 100644
+--- a/demo.c
++++ b/demo.c
+@@ -81,9 +81,8 @@ void get_random_seeds(uint32 *seed1, uint32 *seed2) {
+ /*--------------------------------------------------------------------*/
+ void print_usage(char *progname) {
+ 
+-	printf("\nMsieve v. %d.%02d (SVN %s)\n", MSIEVE_MAJOR_VERSION, 
+-					MSIEVE_MINOR_VERSION,
+-					MSIEVE_SVN_VERSION);
++	printf("\nMsieve v. %d.%02d\n", MSIEVE_MAJOR_VERSION,
++					MSIEVE_MINOR_VERSION);
+ 
+ 	printf("\nusage: %s [options] [one_number]\n", progname);
+ 	printf("\nnumbers starting with '0' are treated as octal,\n"
diff --git a/sci-mathematics/msieve/msieve-1.53.ebuild b/sci-mathematics/msieve/msieve-1.53.ebuild
new file mode 100644
index 000000000000..534207e16fb4
--- /dev/null
+++ b/sci-mathematics/msieve/msieve-1.53.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
+HOMEPAGE="https://sourceforge.net/projects/msieve/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/Msieve%20v${PV}/${PN}${PV/./}_src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="zlib +ecm mpi"
+
+# some linking troubles with gwnum
+DEPEND="
+	ecm? ( sci-mathematics/gmp-ecm[-gwnum] )
+	mpi? ( virtual/mpi )
+	zlib? ( sys-libs/zlib:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# TODO: Integrate ggnfs properly
+	eapply \
+		"${FILESDIR}"/${PN}-1.51-reduce-printf.patch \
+		"${FILESDIR}"/${PN}-1.53-fix-version.patch
+
+	sed -i -e 's/-march=k8//' Makefile 		|| die
+	sed -i -e 's/CC =/#CC =/' Makefile 		|| die
+	sed -i -e 's/CFLAGS =/CFLAGS +=/' Makefile 	|| die
+	sed -i -e 's/LIBS += -lecm/LIBS += -lecm -lgomp/' Makefile || die
+}
+
+src_compile() {
+	use ecm && export "ECM=1"
+	use mpi && export "MPI=1"
+	use zlib && export "ZLIB=1"
+	emake \
+		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		OPT_FLAGS="${CFLAGS}" \
+		all
+}
+
+src_install() {
+	mkdir -p "${ED%/}/usr/include/msieve"
+	mkdir -p "${ED%/}/usr/lib/"
+	mkdir -p "${ED%/}/usr/share/doc/${P}/"
+	cp include/* "${ED%/}/usr/include/msieve" || die "Failed to install"
+	cp libmsieve.a "${ED%/}/usr/lib/" || die "Failed to install"
+	dobin msieve || die "Failed to install"
+	cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install"
+}
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 78b9103d67cc..6299777fa527 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -4,5 +4,5 @@ DIST pspp-0.10.2.tar.gz 7316470 BLAKE2B 9bbccfc8151d83613f5c4f49f285959c6b9e74bd
 DIST pspp-1.2.0.tar.gz 7213194 BLAKE2B f468c6e025f996c9f806fb03e94a4497f02b774c509457cc6295bbefe37abc7e2ecf10d2876c8cff9a979d7a4264c7c185e1cec5fd1d5f2f00f1c6eae4da775e SHA512 49eed2b55f10584abba18ff7d2020fd08691bbc1a3c2f332e6d283e32aa84e0abdae6092d17db9c1a539c63d85ecdfcc2dad40c94a06904b8893a1976e5e48d3
 EBUILD pspp-0.10.1.ebuild 1661 BLAKE2B 62421db5cd1428a92bc6b5cb287fd83c1dd7f45bf89b8e802ea00feb951d77fcf466dc7136d2b9e24c40d247ab14de8476e9b1e9e8dad3a0b653198ebe6e6d27 SHA512 3d973985731036f3d9c4858cd5aa58cd1159c64a2f5f4f6f7ec48f00034c4340a9cbfe203a90228529d2a4677004b5da69c488a1a2683224e5450d3ed276dd29
 EBUILD pspp-0.10.2.ebuild 1663 BLAKE2B e3c38277b867d5a942021fc6341e4b99955ffbf11f9374e295580bdabca64330c6a3fe3da4c86ef80d678c7c3f066f6670e27d771d0810147832707043171357 SHA512 0279462e9e548d042a50f92adf568aaccc8286c90146cc904a1ee2b962b320f229cf24d96fd23fb86fb2898781e7548586815266f16c94a868106db654f90b35
-EBUILD pspp-1.2.0.ebuild 1692 BLAKE2B d239fc728f345c66c800869ed66e2baf4610474a601c5b3d40b1e32721ac5b903bbea5f0637acb2a9c283776035eabb439e2229e07132131a96974bf91588379 SHA512 feb98a4be0ab341c433982d38a77e3c9bda8ff2f74b14f58c7d07e030af2d6fbb9cc496c3f4e217ba7b54883d5f5a487964b7be8754ef96165428f3623dbdfbb
+EBUILD pspp-1.2.0.ebuild 1691 BLAKE2B 0435d616905d4f9f729a684c09e69aa7521311952b5a197d31259fa49eadc3ff4121938694493bcf48d1dc6b5db47d8a6d421813d16a67d30fbad13480a8c3f6 SHA512 a8e84ce27f2c137b3a5d76e91dee43b48ddeb54f00197e6d8a4092954248392a3aa5108c4ce1e54f0f6acf9811b916d2627d204984a474e9ee34ec455329c87e
 MISC metadata.xml 711 BLAKE2B a8a82a6226fd60e70e8f0c4af6fd1e84545e46d0743f3b13d29c54461bf62ca2b890c718482fee2aa26ca4eb86300b3a11b01e659584942b9bb57ea70ee42882 SHA512 51b64f0c307003cfea98971696f7b26f4770171768a4b90c44f6233696749fe4cce0bf09b0392ad079abff8235fb3680668534cb407df75e6626aab6167ffd34
diff --git a/sci-mathematics/pspp/pspp-1.2.0.ebuild b/sci-mathematics/pspp/pspp-1.2.0.ebuild
index 85f03f048b0b..629f6d05da47 100644
--- a/sci-mathematics/pspp/pspp-1.2.0.ebuild
+++ b/sci-mathematics/pspp/pspp-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
 
 RDEPEND="
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 96a21389b901..3fd020444670 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -4,5 +4,6 @@ DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51b
 DIST z3-4.8.3.tar.gz 4119116 BLAKE2B 02535832a28ba09bb5b5c9354c77941bdce29fe977fa88d59e2e757fd6242b7d9ffcb0bbc0f9462ac7fd58bc29020be848b27311cf3f51cd60e84f66713a05e1 SHA512 34a2dca0083ed469fdaf5ac062dda26248633245607ddd9ef90629c5f76ae30f87bfa4191c04ba9be7a617bf182a1bd00b59fd2274699e12ece69b86088c8044
 EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
 EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
+EBUILD z3-4.8.3-r1.ebuild 2616 BLAKE2B 6415055ad140af1bea27f2b22cc017d14e31325903664988e7c3d20395c27e470b2d55e2666e295229bd5a788a0281fc904aca66cc590604b4693a1138f70b2f SHA512 2a0c235ba0998234f2bb83100018c4e5199670e0f50132fb3e6e94e7428336a08b1e6af26f26680f41d8d89ad37bcd836224d99b0f111ef3bb7db4023486ba6f
 EBUILD z3-4.8.3.ebuild 2553 BLAKE2B 2da1ac99c690c15575fc93f71f4283ca3cd47adabad11131e96c8b8d56df9b91dda34f3a5691bc768eca49ba592c2781c204d25abfea60bbe032fabf43d06693 SHA512 9a108c53195e7a550e163f310a159496730d3b17a2ca582e321a12077f4d24bdc3b97d8b2e0d9ec7ceb82fdc957f6c44bf66d0c51208e1227a4bd51f2793f753
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.3-r1.ebuild b/sci-mathematics/z3/z3-4.8.3-r1.ebuild
new file mode 100644
index 000000000000..6c92ed32341e
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.8.3-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit cmake-multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="http://z3.codeplex.com/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+
+SLOT="0/4.8"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gmp isabelle java openmp python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.8 )"
+
+S=${WORKDIR}/${PN}-${P}
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	python_setup
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp && ! tc-has-openmp; then
+			ewarn "Please use an openmp compatible compiler"
+			ewarn "like >gcc-4.2 with USE=openmp"
+			die "Openmp support missing in compiler"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DUSE_LIB_GMP=$(usex gmp)
+		-DUSE_OPENMP=$(usex openmp)
+		-DENABLE_EXAMPLE_TARGETS=OFF
+		-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DBUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DBUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cmake-utils_src_make test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md RELEASE_NOTES
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT%/}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT%/}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT%/}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT%/}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT%/}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ede95a0aefea..1005f500382d 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 9d6e3c5cbf46..ca3aa22896cc 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,15 +1,5 @@
-DIST clhep-2.1.4.1.tgz 1866250 BLAKE2B 51339ecf0448c97abfeb4e9e95ae3b0c10d370672df5a0342b6a4c08b40268dab1396351f61756d20a53ee62a6e92e8556624a01fd543ef830bbfff2a383e424 SHA512 ff5eb76ddf740635c17f01c62679ae7c22c152f96684315f059744ab67e420e51ba9c1ae0ac745b2890d1ddb6a678999b61d44c36e358c1d95c6b57362f3fae0
-DIST clhep-2.1.4.2.tgz 1838675 BLAKE2B 974f5ab440bf56d318a8fbb3665adc9a8f5e406ac4fd8394b2ceabb346856bdcbc17a30ba2d94c61e88732586e9f26707fc3c8e495bbe2c94cbf9c8c0f05ded7 SHA512 8caa6fdbf1d7dbfe217cc5aef384e21b99ae386a76771f17b3dc583c0c55e21164ad3778005798f1a4d151b79782b96a3495d88f1cf7bd46da4c6550ebd69f7c
-DIST clhep-2.2.0.1.tgz 1844675 BLAKE2B af2e379035df136a9ecdcf6b22d2d5120e8c89e6dcfc44ddfa26bdfecf2eb45e83a972b4dd38e4fdf55aeb9df90fb7ab97ecb1f294c5c0e87955477bdd8e5601 SHA512 930577d18f1c4a9dc94b259589653ebecf7b85ec78da7e1dc7b49d282dbae210bcf257831254f875840a3fd6bf5fc4ad7c4e46825e31674c55c746ef7c2939f2
 DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a
-DIST clhep-2.3.1.0.tgz 1538945 BLAKE2B 9aa76fb35c99bbd76d5cdbf5d58b5f64a4a24516b1b9dd5dff7fdf0c60f1c9a4d23e86bce3f4dc0ef849d65753702b0e9043caa8e07f3235ab25c79c7ad83fa5 SHA512 786ad6289ab064c3c428ba2a8f534fcadd09f1f00a9c725dc987ea46c55d1f4ec7beab25221c978992dd195b02a65388a35aa6d7f471b6742c9ff6cdb7a8b7a4
-DIST clhep-2.3.3.1.tgz 1565701 BLAKE2B e5153da7a79d0c6e6f4f98cfadd836ee7b36196dcc0daae45bc38c43c24b10cf65aeb71dd0313c7195cd0734d645e8ddcbeed53b82b16d7ae35ecffab2383b4e SHA512 b13e336f9c4dd741291768a4c59075e88467ad54dc41a07eeb519712055e1a26c2369bffb6aeeeac4199066ce1bc863e9d90647094dd2fced7069d82a4cd1317
 DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008
-EBUILD clhep-2.1.4.1.ebuild 1367 BLAKE2B c6bcb52e1b2b7fe8f9a69ea33a29ec841a7629b507a4563facb294a0fc73cd4e5171b8417f46100c642bf753d698d298b1a2555fbaf93598dcaf4834641b6ea7 SHA512 4e14e1d851d8dbd5155b4a527497b875f0779e42e6aaa74e825ec0fcac74d7851e856685b11ceb81b35e7604546928839608e30a8ddb7a93ba2fb9686c1b477c
-EBUILD clhep-2.1.4.2.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.2.0.1.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.2.0.5.ebuild 1374 BLAKE2B 09920510732f5ca752c01672c11ed7e7d3f261dfd2c5ed82f824e3c4bccb1faed4e0ee8f1b376a7a97e5dd0ce037103445bdec7775a212628b99bf06dacd6f8e SHA512 a11977b880aed6a7a678f5e3f8f661a2687a05ac611f2dccbcacccd56c9f5e27456b46e6af512627a3a849507c70b8df3d13188c589443052fe1b38275d608ef
-EBUILD clhep-2.3.1.0.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.3.3.1.ebuild 1274 BLAKE2B e3e82e240abda4f14520c3713d25e73a4d291d18daa6ef35c0827d567b345d6f11c1f54e7885f3d3ffe8a49c7b10ebecf57786f8bd7671b6a1d7ca62045f0c74 SHA512 26954289283caf6666d84f4fb48f1ab1514f42d9c694657485c1d84e69524cfeeb7fb89b11a4ce4d9fb946f05493746172c3e69836f40accd60f242fee46e248
-EBUILD clhep-2.4.0.4.ebuild 1153 BLAKE2B 2f25784e72e25a96be71df937588d4e085331d66fe97c94bb38ed6b3166e7051f2662a2e15e7118530fbb14209eca68cfe7d8e836f85021087264284eab59e63 SHA512 437d3f6c1380c29a9eb2b84b10534454d9a5686be0734ed0e710646c6d9d1741e427ff58b9aebe3b4908b52abcb64987a585206b22d0b4437d8218363ae8aa16
+EBUILD clhep-2.2.0.5.ebuild 1329 BLAKE2B 44ff5e92f552290ffb31f352274d86186d841ea529b127ea6ad2ea598177cba37ce31f6177a3b3c7c17e507fb98c35c6df85c768fcd8739fcd486531e948fdb3 SHA512 09fa9b6135205ee61b162b00bf8552fc1b515b2e49bb7ec63862f438d8077a6607b8541d66a7ee2e5f269a8fb301782ad6f7fffa4ba2a2c81526e55c742264b5
+EBUILD clhep-2.4.0.4.ebuild 1110 BLAKE2B d79ec57e7b1a44d7e038cdea4bcbdc7da55ed1a6a748b49b835ed249c04ca178d07db19fef8fbd19f37690d094f5264d63f0ac1a31bbdbf99c3be851ecb61dd4 SHA512 8f60847cbf23ea0138e0199d380fb6ac175e079f35bb8d652f98297f182fc4d6dcbe8bc38e59f35b64a4332780649ed7e58a06232af7c68a7f5f41a752038429
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.1.4.1.ebuild b/sci-physics/clhep/clhep-2.1.4.1.ebuild
deleted file mode 100644
index 39ae660ca9b0..000000000000
--- a/sci-physics/clhep/clhep-2.1.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.1.4.2.ebuild b/sci-physics/clhep/clhep-2.1.4.2.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.1.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.2.0.1.ebuild b/sci-physics/clhep/clhep-2.2.0.1.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.2.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index 35c47db6a89d..7c5de315a5ab 100644
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.5.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
 KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
+
+BDEPEND="doc? ( virtual/latex-base )"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
@@ -42,8 +41,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
+		-DCLHEP_BUILD_DOCS=$(usex doc)
 	)
 	DESTDIR="${ED}" cmake-utils_src_configure
 	use doc && MAKEOPTS+=" -j1"
@@ -51,5 +49,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
 }
diff --git a/sci-physics/clhep/clhep-2.3.1.0.ebuild b/sci-physics/clhep/clhep-2.3.1.0.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.3.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.3.3.1.ebuild b/sci-physics/clhep/clhep-2.3.3.1.ebuild
deleted file mode 100644
index e284870ec6ae..000000000000
--- a/sci-physics/clhep/clhep-2.3.3.1.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
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-	# gentoo doc directory
-	if use doc; then
-		grep -rl 'share/doc/CLHEP' |
-		xargs sed -i \
-			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
-			{.,*}/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	append-cxxflags $(test-flags-CXX -std=c++11)
-	local mycmakeargs=(
-		$(cmake-utils_use test ENABLE_TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
index 08425f145ab5..5f32e859e2c6 100644
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.0.4.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://cern.ch/clhep"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
 KEYWORDS="amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
+
+BDEPEND="doc? ( app-doc/doxygen[latex] )"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
@@ -41,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
diff --git a/sci-physics/sassena/Manifest b/sci-physics/sassena/Manifest
index f75350bceb26..a6f3fb2d0ee0 100644
--- a/sci-physics/sassena/Manifest
+++ b/sci-physics/sassena/Manifest
@@ -2,5 +2,5 @@ AUX sassena-1.4.2_cmake-remove-missing.patch 1044 BLAKE2B e294515e5167c2bb87b3a1
 AUX sassena-1.4.2_link_boost_thread.patch 4581 BLAKE2B 24fd46217eaf6c3a1b0ef70dd06d759489eca2822f71d8c541a4715b14108f99f1d06572d732b4f6232825acc96162fecdcfbd4f4ff3298c50f87964bdcc13f0 SHA512 12e5d62d972eb9e0e89587db66f335496ba921009435a40ca61824165726244cf394634b88cd9ebbde08217d00ea4fd5a182aa7854be2ec481edf970a7442a37
 AUX sassena-1.4.2_uint32_t.patch 491 BLAKE2B a057fa62c85fb7ef2ba6f142c12fdf8fba74efdc75b4870ff2c7ee4475b942a224001c954aa6273608ef7264fe8203167fc0558f9a18c3427e7b26bcd1ae46f6 SHA512 1cf7bf57cbb4c967c63b32b063e71ef62f40640858464b4db4d392fe967be25010fa9e22f5cbca2e82e7cc185ccf07819919087ed72b79bace8ce152bace1b2e
 DIST sassena-1.4.2.tar.gz 783708 BLAKE2B eef37655c50831f50bfd7f9d66b98d30820661682c78d9fc0f24bf4cc924dfff3a2ce3d116a8fe1161522907825a1bbaaef5d61bf8edb20094bc37606cf87c88 SHA512 07dbd44494a50de29b6f3b3542d862328726d132bda097352ac2f6ad24479b93b2d77c5ea2ef812b2956d0ac950ad69b93da0996f14ff1ce9f0e310b27728942
-EBUILD sassena-1.4.2.ebuild 712 BLAKE2B 3e07a9329477b748be1c72801442c24b2149f094ca93a15a0e898ed9832116a1891ba952959b9e46e202af3ff5b4c363317c4f78e93c07b6cc89be025e5a0b49 SHA512 4cf60609ea5239b8a9db57b5b80da87d4b7614700cec6a9b38d6091ed05602be58189ff9a589b1530bf0cd387cff5a43ff03982459dbb4cedc1695accdf04892
+EBUILD sassena-1.4.2.ebuild 715 BLAKE2B 0a6531db60f7998d1e6537527b04b41ce766238b3607fea9332524d22e2bbd45a298fc1fc076e18dcc7ab1e6aa4a081ad2ed9d7b31d55243d58a49abea3106f9 SHA512 9e70d3f6e9143ccf9dde23f3693b367d82d07f2372b54e8b7cdacc78603201215389f551a2b83a7377b430e7d1cd2e361995c2f9ef3297dede198ec6d83437bc
 MISC metadata.xml 328 BLAKE2B 7e270a4dd50c9624077be5c6b901aad041914299bca8c79e1f295a86533b401140924d2beea933ef6632661c2359f099deb78cb57c733d101b8ebeb23474538c SHA512 32e9e1d75cdaf8d4019c85ae952194ed9f60991068ffc10015b552ec3ea673e8e9ff35bde421059f5e0ee098a109af61b97de16bd16408e8b94b402e605163f6
diff --git a/sci-physics/sassena/sassena-1.4.2.ebuild b/sci-physics/sassena/sassena-1.4.2.ebuild
index 4546a6090317..8931b9bc422c 100644
--- a/sci-physics/sassena/sassena-1.4.2.ebuild
+++ b/sci-physics/sassena/sassena-1.4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
 DESCRIPTION="Software for Calculating Scattering Diagrams on Massively Parallel Computers"
-HOMEPAGE="http://www.sassena.org"
+HOMEPAGE="https://github.com/benlabs/sassena"
 SRC_URI="https://github.com/benlabs/sassena/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -15,13 +15,14 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
-		dev-libs/boost[mpi]
-		sci-libs/hdf5[mpi]
-		dev-libs/libxml2
-		sci-libs/fftw:3.0
-		virtual/mpi
-		virtual/blas
-		virtual/lapack"
+	dev-libs/boost[mpi]
+	dev-libs/libxml2
+	sci-libs/fftw:3.0
+	sci-libs/hdf5[mpi]
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/skel.ebuild b/skel.ebuild
index 0114d8c26ac4..c39ac798ea0c 100644
--- a/skel.ebuild
+++ b/skel.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTE: The comments in this file are for instruction and documentation.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f8b7e10ad50f..179f50ac6e84 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
new file mode 100644
index 000000000000..038460586fa9
--- /dev/null
+++ b/sys-apps/bat/Manifest
@@ -0,0 +1,125 @@
+DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST assert_cmd-0.10.1.crate 19055 BLAKE2B 04a8c7bf900657ba7f2e0720763f2fb6bf9e2d126a724a3fc0d0ee4fd4fc212ae011b0e070d6e0a3f8d694d9aa6a26cb7f4cbcd3cb9440566e7ddca8af0c2c79 SHA512 14f7f8fca03a2087909a31b6ac86299031a09220414795b45078017fe93dda13acbc55ef1f43ed322dd6c8a8c6f7868f45a703861c74c20e1bc91481e1344c31
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
+DIST bat-0.9.0.tar.gz 756977 BLAKE2B 217f87d171c678f06234ce753ac26a37fc00d2273d1f1d776d566ed3ea42eaa0627d1b3eb680ef5bc34725210a1c97715e6926d60375e122f2c63948b332488f SHA512 757b6fc8fa23e4781258bdeec0d17d748b91e001778f32cf3048e4716f12a855992583a5e95d9a36d491f6f206a5c8b4f68bd055b24d650b356bd001423182e1
+DIST bincode-1.0.1.crate 14071 BLAKE2B 99edd46decd97925e2af882411c9cc986311e936a0e8c05ffb29e49b44460cb6fe6cf17e75301743cdf02d5b30bba7ea1efaf70dd1d3b770061c7fb6db4dd459 SHA512 1294b89089b457ce2bc4d9471ae677d6d06e64eaa01948e9db4ab49fc23638ba79e7aa1d6ca3a0df5fb61bd90cadc811df724053a321ca99d16b8ce650abbd59
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
+DIST byteorder-1.2.7.crate 19640 BLAKE2B e5225871a7b55be755a28878f330f165092d576e4e4447816d4908998d4c6103eccd7f1d962c06709823331143ec8279c5cb1ebc9ed49f7bc30b20586568cdfa SHA512 166bf831dac44332fb05679add5ed8c54d692a582cdb8584486dee8295080a625d12eebe40de6f3b82ef98a1f4c65503da9c84d570b14d58dd5e31a3cc6b7391
+DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clicolors-control-0.2.0.crate 3029 BLAKE2B d5893456935176aecf6a6de41e881a0bfb8762cabef4650d87f8ac81d06bfcf768f5d0c0c619420620a1f947b1f0fb7777ce64cf1be5269dccbf9ef7e1cc5d65 SHA512 846a9641a364ee11416f5d930e1384b22abc17c99c758c22ca583bc65b921aa2ca1f21b2ddea93360372c1bdad1403b19e356b4a19847ca9f4ed506c6db4021a
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST console-0.6.2.crate 12487 BLAKE2B 1b12b0c1699a1bbd320668d9f709f4591f5d4485504ac74d532dafbc244de70fd51116b89da62af4684f24f87a55e23088329d64db1f4f4278aa9f6bf8cae7b7 SHA512 07e101f2f0717c20c05a4b51470e5dfa02df68c41593b10ed912fbd32034f3a43acee144fbfe4989d858917d13b4587a4f19de99f7b63c7253717c7afb7d060b
+DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
+DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
+DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST directories-1.0.2.crate 16020 BLAKE2B 76fe417487118cad8dc8a6a64b07f62d83550b00fa230f06902d9252dfe74134bcf722d33967d65131cd1e036bd1b4b117b8f56a3f96a073e24509ee0add5410 SHA512 6b1ed06a66e43115c5446ad19d6960ae6ed7956982b23727422ed49e285ba0b86ec9721a83a7949772faf7d1db28abb499f0983c53e70da529a54ef7fadb26f5
+DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
+DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
+DIST encoding-index-korean-1.20141219.5.crate 103230 BLAKE2B f3acdd4375ddda1f6b3c070566f1a52dbbbe2384bc6be79150e4e55b88740858791d66f95040ad9f637bf13e381b9f316b14bb5617a8949bab4040b91d0d18bd SHA512 0e79eb9b01fe0354532dc7a8ca55e6332add19827905340560ef9b0e4725becda68ffedd5d18b9ac9d0c4a1b64fb337a9a31de5891b9e6469478fc974e5f9884
+DIST encoding-index-simpchinese-1.20141219.5.crate 130962 BLAKE2B 3c1e498c170edaf2a954439e50b3ccc31560806063a11610c4563975810a65c64e547168674ef778beb1d1d603cd508145f3153a03748d5e8c7e79690af6e3bd SHA512 caffc2a9b77545c2cc22bfcb38c886fba21e765ef49a3cfcfff88ebd76064432638bb432cd57a7ecd23bf2ea074c400c1f043a0589e5aa28024ed3ae0f59be75
+DIST encoding-index-singlebyte-1.20141219.5.crate 14950 BLAKE2B 89faf849452f0fe78b82616614f43bffaf658dd81063ae5d130ad6eb64d38e0ee8a26ab078f8c992f0c7f3e1db768e73920482f5e3bd56b0d7370c72fc93755f SHA512 648a5b9dcbdd40184b6026f6d0593df3b75c5eed554c19a199810c99aba857fccbab2acbf5b047ff42a75a6a3f6e8211a07e70e6fa4048f07144f9132af7d17a
+DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bdec20dfeda482fad4235ca3ded489a002c27d0c26cbb9f37ea81f93f7e46ee4750dfcd7385dfc8bc55669a0a21b3acdba2a1fe91b855edd2decb SHA512 3b23213433947af7c56e9ea3e4eaf937b8083ce7e9e481b1351925a6da647be6a037b505116bab08ce73727bec75550bccb877ead6cb7fb0473bb3bd3d40833d
+DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
+DIST error-chain-0.12.0.crate 27056 BLAKE2B a6d699ae63838d3b0d40a63977642fc464558fd45a46c2da9c7a57889450f7ce183c43dddfbe325c8cf6db2775c1a41f547bfd3802cda5b46d4a09f6e0a91aa5 SHA512 7e9fd94de9f0f8e61039766953d85b3cc5f87be2b8c37016295031ea3234dbcbccd111f521ddaaf97dab7f8ff8c30828b8949958014ef1e13a02544b6143b9e4
+DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
+DIST flate2-1.0.4.crate 65683 BLAKE2B cf6d62caa99076db9a5d56f361ec40564fc71cda07da3fc5572dfadae57f912f63b1873dc77782b2c80652b3cb63bbbf3ca67fe1980b50cac4de2ca40198d25d SHA512 267bcd04a31d6409b318c3b1fa493806ca25b1528f6c64beb25c71cb3ce9d2839bac2753213995ac9c9f62a290d12cca5d5bffe23d4805f7d93de620a0ab6343
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
+DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
+DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST libgit2-sys-0.7.10.crate 1176435 BLAKE2B dfde1976d958493b9157d3611c875405bc23c2630787dad1653c6c82169dee1953b9704491316a34f81156d7d22b8915b2e0a3ef0431277060c6bf3ba79e8c28 SHA512 d8900f8ffd0588593942a21625cb5b12f75f63531612c57a32440db632d783167b570c288a1e94f0fe0fe818ec6d1afcbcda94d5dee3cae5603e43e1be4913e1
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST linked-hash-map-0.5.1.crate 16559 BLAKE2B 00d022d591ef704699ab2aea55db98dbc2e74f45e7d1bbf68698be1529add9494241b7add2515a8b637b05002795d7770b37a5884fe4ec91517f47fa5f098472 SHA512 584644be35f931e0d0c1b085700f90891895e50680b6b8c2afeddb2c6425280af3e997798aeb56db653f8c8a7b6322d31a4fede7703b6e54ea1c4154b9e4bc53
+DIST lock_api-0.1.4.crate 16959 BLAKE2B ad6378b3a80fcb51ace0340cd894ce67226729832fedd60e691e0b8ed27e0880588c3092b941190993f4208f04fba323e127444994f2fe8361b1cfa86368b415 SHA512 2311d7505bcc9f49610597c7f75097d775606aa8bb1fa57adbdcfd57fc09cd2812da3efe4717dd98b9ed6c857890ff15e8f06515e0c8992a476c9e45566eeb39
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
+DIST miniz-sys-0.1.11.crate 78188 BLAKE2B ad37f662e5f7d5eb49a49d197fbb0abb1516a9c044ae3db12d93bbf41e70cc7bc55f78f354aa3f77626005ef9c6186db4008f32e198422daf5c97fc0d8302722 SHA512 58f8c9cf01f8a5819f53fce02246172acacf89becd05c8eea32a06fb4b3911ad3b595fbffdaad5d0ca4af4dbc4e2d41c83e2fe82bc12c33b035360e83d17e901
+DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
+DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
+DIST onig-4.2.1.crate 33267 BLAKE2B 9ce1acef007fe0fb103fbb6328da0d715f73899579ff41ff5236e76af845a57d1ea852386636d3c379a1bcb3b2afba44a46ebfde5c07ea12edc0fa051d2ab0b6 SHA512 0abffff5c809663266873f7618440937cffa3142be1b356a2c8e3676b05f0b7c243e0c9754d62cc3c63da39c6ea6992f817199e6146952d737cc0b429b16fc91
+DIST onig_sys-69.0.0.crate 543900 BLAKE2B a363764f87b251213e3db5b1d2c422ebef93cad1eb15ab3029952da0803349731d9ac359886b6f4a9b3c54d44acb35bf28cfbfb920e2cc8721241cb50e9139c8 SHA512 cac9e82326aba9c1a40b31f9f22de5380c11fe5662cff5396cf8647982cba274163cc00fe9d367d7b10e4b52ca68efec1de74f1cd4a0595d06f5184de9fc782e
+DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603bd5f7a4fe2fe86f71c9733360a769eeaae4bbf830fe125da463a909ad0a690e99a30ffcf766165cf63dc3c43202 SHA512 260f3d77f23b092c5ca96dff6746d378caa1bac965745a71ca18eed30a12c6869af62259daafc91c8666baf95e04619ad0d8fe06b47d5e517688b35f0c59005a
+DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
+DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST plist-0.3.0.crate 20541 BLAKE2B f3245214a6816c72797d16cab22709eb7e10bf6f1147ef0db5f4cfed9fc85fd073997a963c594beee313b348cb4c5274d5bb57e82620a5d2913a8a32fdc38aaf SHA512 8171689f24ad9c8579722d3a6269a80c955f11bb5fbae25050e07f518da339d91091b91cb0c6c41a6980402513f466d4e1e0e56abf6b9d09e68e95dbfc2175e6
+DIST predicates-1.0.0.crate 24632 BLAKE2B a26954a010d35205ad492a165d4840843df599ce1dda983d013985338880ebc8da293555784bfc3bcd3b43c816f1db2704e5f0a7b8351fd567ff31e4250024de SHA512 fa52195cc629a73234aa703e522733e3f93fe9c0e0d416198b8c36a7401dcc006c89b361e7b8395f7ad96e0f7aafa2d9247cc918b022ad35debccf4e33b16d69
+DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
+DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
+DIST proc-macro2-0.4.21.crate 30813 BLAKE2B acf36197ae0bbd69e4b85c360831f9056dffa343165f665621c3e3b1aa29edd5d20d2b046a1dc8a401e758402d80096875c96915b15cb218a019169eab439df9 SHA512 9e0603d634d0748047dbc0e4c44dce54cba1026ed76945b09ed72224c015465cc8541d4045185f8b8cf6ff316daec50bc5a3ad7ddf5015aa971135497e5261ed
+DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
+DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
+DIST regex-syntax-0.6.3.crate 240173 BLAKE2B 03e33c25c9e7fb90cba231e0ab655bc35135c0f0602de9f977f967de7a9a40a2aba9a48a30f49eb98dedae4277a03b17a64dbd59f0b14023ba9df764d0c9e721 SHA512 95e8556d13337ec25a9baff923528c0d1af10ac3e88cfbb6f5bcc40fb90f962cb473c88a8e3a7007ab9fa36cb063cc2348e79368296baedcc6053bfdf6bc7b6c
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
+DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
+DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
+DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
+DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
+DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
+DIST shell-words-0.1.0.crate 9750 BLAKE2B c7a613ba7d66d991f994ce339e86706d9b273d878a7b9f5f3611c2175e6749a6bc4038523ff63d395582bc4f41c5913c28ebe0420ce62f4aa30752ce51ad8ff5 SHA512 5a62a625866b04bbc3df8f89dc2bead16ab83691caafd140a8e4df4f7f2dd3e5d61218b447b15f3253173067ec070fdae004f2869aef9ea03c1a1ead5b180731
+DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.15.19.crate 145264 BLAKE2B 55671420dcb1d2885b71be2502d097c0a974acc0ad3a722c6de5777a977f1c7e64ab4aa92d313848ade41e3a4e21b4f5db306d4da005cd47ed74694dfca9d465 SHA512 e122c601a4a69641ee15bf4d055662736b367d868738fe51334503e24dda17f7ee0273df6abddd3c0f2d2fcd1fee4a9e56092a7e53c9c17c45bb4161c0b76ea1
+DIST syntect-3.0.2.crate 722541 BLAKE2B 99bfe1d72f6ea573424c86843f2ba407fb7e6f545e144c64e8c4b64e6c0109af0553d9037820da24b2dafa1ae7cb09874a4dfdef7f779ba32411825db796c22f SHA512 3f8ad590a78f4f850560841980c7090de563c774ea128a35277b0a5b9ad922b6eff5f3bfedb07a1252d24e6e3cba08c8e5aa22cdf2a84107aad4cd3a135c75f6
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
+DIST ucd-util-0.1.2.crate 24992 BLAKE2B 91d59ce88f2ddadcb3f4192ebedddd18bb5b6d9b5f7765a87be04c9e09b7b30c25ad349d41f5b1da9719c0382b8134cab3a7134f496925090ed536f06318b521 SHA512 01b68115b4abfd157e24e187bc633e0d64880a025f88d8b7a33518b79fd29563ef3322c6bdb1527553acfc5dd53d9f18ab127ed498a0cd6e311f08ca19a6cbc0
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST walkdir-2.2.6.crate 23072 BLAKE2B 3c53c608cd782b3006ece87d3c99bca80239f1ae9d3b52a925f5e221e8ed55d3669f89a998f549fbb56fcc9e3672c7dc223740f2a918da5f147ddc364c79f41b SHA512 ce828a025356b5e3be1c2b065c8de1d73be787f8718f79ab078afb53eb86a536eafeede6827e6f70e4a3545acea3f6a96cdcc857f1de70bdc2a6fc10dad52945
+DIST wild-2.0.1.crate 6946 BLAKE2B 00aef7e2de0ed4c055cfdfcd3b1bd03ff53fac394ab76ab9173ed1e13992673252a35ec03a36ff0ce115d1f17e54a9af829301bb9df24ea2cc7cbd084861ee01 SHA512 001f83176ab74b1ebff70fa63bcb93d66aee8eb7519d917af3ba894a208b2346da38ff278b26b11affde90755530ea707918c9476e3b0c72951d23bcb1677ec9
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST xml-rs-0.7.0.crate 50980 BLAKE2B 3d0427660327002248823c8b565f83214035d5b58273ff6adbb38b764c1d03d84418769e70bb15bc5dbd986eadbd8d1776dfba175dfb24f04d5e66e5f6209a03 SHA512 8763f37faa24bf5a460f068f16458d5e3f8f5cc8a698202e7db792d61edf580afdd80d6b02d168fa021d28049a48e5a583e346e9608872704e9beb6b3f345bf7
+DIST yaml-rust-0.4.2.crate 45338 BLAKE2B 2e4f0b488ecbe227dbe83588ebac80686df5b9cff7133a9dc0de0e26f08a39c280a85eaed00e147dcd4e3ea9c3a4e8a7903380150db635a4c481957c8cad9689 SHA512 b1b9e1f9e683a1ec194231e7871418019c6d29ae0424b4b2a423c62a1a4d2ef14f8f3f396513747da91f1f20851ffe3ad69d14db6a75b6e892dc778762cdd423
+EBUILD bat-0.9.0.ebuild 2707 BLAKE2B 218fd34292adb12f17b16b2672c2d2ceb4003b4adcac4ac90bdec42c319aabb637e113506b0d3bfa40e05bf28c8caf743dbe43d0c75d14b3742b7e8bead6561b SHA512 5c74454fe36a49a9cfb500414bd77a3a5d315e36914d57681991d14b601949c307cd9700b5e73b13515b2fbbfc81416ad33f0f19c3a7569ced034fb92c71d2ce
+MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
diff --git a/sys-apps/bat/bat-0.9.0.ebuild b/sys-apps/bat/bat-0.9.0.ebuild
new file mode 100644
index 000000000000..009a846cc112
--- /dev/null
+++ b/sys-apps/bat/bat-0.9.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_colours-1.0.1
+ansi_term-0.11.0
+assert_cmd-0.10.1
+atty-0.2.11
+base64-0.9.3
+bincode-1.0.1
+bitflags-1.0.4
+build_const-0.2.1
+byteorder-1.2.7
+cc-1.0.25
+cfg-if-0.1.6
+clap-2.32.0
+clicolors-control-0.2.0
+cloudabi-0.0.3
+console-0.6.2
+content_inspector-0.2.4
+crc-1.8.1
+difference-2.0.0
+directories-1.0.2
+encoding-0.2.33
+encoding-index-japanese-1.20141219.5
+encoding-index-korean-1.20141219.5
+encoding-index-simpchinese-1.20141219.5
+encoding-index-singlebyte-1.20141219.5
+encoding-index-tradchinese-1.20141219.5
+encoding_index_tests-0.1.4
+error-chain-0.12.0
+escargot-0.3.1
+flate2-1.0.4
+fnv-1.0.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+git2-0.7.5
+glob-0.2.11
+humantime-1.1.1
+idna-0.1.5
+itoa-0.4.3
+kernel32-sys-0.2.2
+lazy_static-0.2.11
+lazy_static-1.2.0
+lazycell-1.2.0
+libc-0.2.43
+libgit2-sys-0.7.10
+libz-sys-1.0.25
+linked-hash-map-0.5.1
+lock_api-0.1.4
+log-0.4.6
+matches-0.1.8
+memchr-2.1.1
+miniz-sys-0.1.11
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+onig-4.2.1
+onig_sys-69.0.0
+owning_ref-0.3.3
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+pkg-config-0.3.14
+plist-0.3.0
+predicates-1.0.0
+predicates-core-1.0.0
+predicates-tree-1.0.0
+proc-macro2-0.4.21
+quick-error-1.2.2
+quote-0.6.10
+rand-0.4.3
+rand-0.5.5
+rand_core-0.2.2
+rand_core-0.3.0
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+remove_dir_all-0.5.1
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.3.0
+same-file-1.0.4
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+shell-words-0.1.0
+smallvec-0.6.5
+stable_deref_trait-1.1.1
+strsim-0.7.0
+syn-0.15.19
+syntect-3.0.2
+tempdir-0.3.7
+term_size-0.3.1
+termion-1.5.1
+termios-0.3.1
+textwrap-0.10.0
+thread_local-0.3.6
+treeline-0.1.0
+ucd-util-0.1.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.2
+utf8-ranges-1.0.2
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+walkdir-2.2.6
+wild-2.0.1
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.7.0
+yaml-rust-0.4.2
+"
+
+inherit cargo
+
+DESCRIPTION="A cat(1) clone with wings"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+BDEPEND=">=virtual/rust-1.29.0"
+
+QA_FLAGS_IGNORED="/usr/bin/bat"
+
+src_install() {
+	cargo_src_install --path ./
+	einstalldocs
+}
diff --git a/sys-apps/bat/metadata.xml b/sys-apps/bat/metadata.xml
new file mode 100644
index 000000000000..c48ee37fa4f0
--- /dev/null
+++ b/sys-apps/bat/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		A cat(1) clone with wings
+
+		bat tries to achieve the following goals:
+
+			- Provide beautiful, advanced syntax highlighting
+			- Integrate with Git to show file modifications
+			- Be a drop-in replacement for (POSIX) cat
+			- Offer a user-friendly command-line interface
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/sharkdp/bat/issues</bugs-to>
+		<remote-id type="github">sharkdp/bat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index a2549ec38686..ab33b8072c5e 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,6 @@
 AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba
-DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.5.ebuild 1235 BLAKE2B 6e589b0b76bdab58c8b191ec57d1a2bf18910fe9b6d40a88b28c7c5d08f0d4da33f07cc88e0a762972633746081c3bc3b524c7927ef274643c7369d7d34956db SHA512 4acf859ee8bb1c1500ed6be9bbdc05ac66bfc7d710dd4100ce6e417e358101cb81d266922028abf6e4ce5c5f9b7a1e301e241d66e5c2f0cb5dca7cf5b58a5b64
+DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 EBUILD diffutils-3.6-r1.ebuild 1238 BLAKE2B 346154ef13cb04dc0007980ba09be2414b8cae8b03d8a3bbb14c7b1313caa2fcd48e4f313cc3671485f3c78045c9d5e023e32a36d6caafeff97c0c879c6fd769 SHA512 ea936a476f43c18e1149bfbb7eb025d8d99b8de1487ade5a81473b1bf4f9b4f9903254bcd1d2fea173e9400def7d712d3ee2c9eb9c3dd06ed58e46738f159092
+EBUILD diffutils-3.7.ebuild 1248 BLAKE2B b744e35fc9b7b46776a8c3c380b8ac7d263bd9850a33623ff61c83da20b6050c5eb5fd116209238c24b9742c1c9b5b8d4e7d2f0e9cd662b3d19f23374eb1a635 SHA512 1660e3e8fc3bca6d2d44d1db218e192b7068ba52fa16f59e82cb4248bffc8f009f368f032dd169f0030120f8e8cda52559b9aa61280e862f5543458d1b7e175a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
deleted file mode 100644
index e8af1814a4b0..000000000000
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-	mirror://gnu-alpha/diffutils/${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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix_macros.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	# Disable automagic dependency over libsigsegv; see bug #312351.
-	export ac_cv_libsigsegv=no
-
-	local myeconfargs=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# explicitly allow parallel testing
-	emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
new file mode 100644
index 000000000000..4a57d7cd4205
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+	mirror://gnu-alpha/diffutils/${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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+DEPEND="app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# explicitly allow parallel testing
+	emake check
+}
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index d189e243ab89..0327dba91261 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,7 @@
 DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
-DIST ed-1.14.1a.tar.gz 91662 BLAKE2B 654eddf7328418507a3a9536da0daacd85c2ef3ea3b1a58b742fad3fc48cfc9a07f8232ecbf5e8e0da42ccf191b1da7e050b0779879e2dbe8b98a329e0f0d45c SHA512 423a30729c16355d80ed84e408034f63fe0d700d12441f82b476af1919c08e7fd4be18736c30cdecbdec5d851f9a08999242aecfe687beed17b779a7485963c9
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
+DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 EBUILD ed-1.13.ebuild 910 BLAKE2B bddb91d370a5cc478d584f002cbfedc1a87ab36a341994e7a9f3a554d3d6c6439de89b50d0489dfba4637c4aba52ce55d0797470581d9c6dff07d0cedc13e2c8 SHA512 0871616d130d1ccade2ca980e01f096fc3191bfad6a506bdfcc9a4506b039852ce4f4b86c564fb8efad726f7b77930830d8358ebf607d53541e149e9474456bc
-EBUILD ed-1.14.1a.ebuild 921 BLAKE2B 249e5469c4cd8ffe6d8b10aa3efd46b4159e6632124d720bba0437ea0866e6f799342eb0a2a9ee538b4037581df0783fd054ff9e3b2aa661a7b9db9239e3ef51 SHA512 e9aa3bff70c0af368e3139168ffd8c4098b61b3f1a601d2bc387e013fedcee4747277072bcc70890244f569e0054ea54a4addfc3919f79fe001e8d1cc19642ea
-EBUILD ed-1.14.2.ebuild 933 BLAKE2B 19f9fcc693ad3b1e29d2dff7a1fa270d41e3418cc2ee9aee2be3b63f17b67e49baa3568d8b1726b982e99756a905cdb4eff979abe73b2730cc4dd6d720fdc9fc SHA512 257ac23dbe5557474be40169d01ac71d5b244d5e1177fd33c742392873683884e2b0814807d11883f6d45b18b1f15af4452f99acd900faeaba9b3bc89e4e79ea
+EBUILD ed-1.14.2.ebuild 923 BLAKE2B 41c6316b1d3b1c9712b273c1747488eff8895d8f886f0724d04714fcd730d67e7495a3931c74eee04e9cec0ed4374b59dc9c9451ff11c103d77fa916abd7cb32 SHA512 2235580f4da91e1b283bf5d9d013911bb09a14a02d92c89c93a689b1c24b598799e48dc5782456ae8c0d7ca6df2ae40d8bca109c7176fc01a25f9cd9a8483ad5
+EBUILD ed-1.15.ebuild 940 BLAKE2B 37341d4509e86c36756185ad5a699f1288bd1362e9407a992164ceba3eb503ad0e2440ca3077c81d6ad8e6f59b0d2612a8652d2122b7cb4f8a93808ab2815abb SHA512 2e87bda21820a963209df0391dcb77d43f7ecc455b3250c36101b2bd6aa3d331a4cae5337a9354ac08b418936d9193b2942d01a8b160703f8e91a90c5733654d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.14.1a.ebuild b/sys-apps/ed/ed-1.14.1a.ebuild
deleted file mode 100644
index 3513310e6364..000000000000
--- a/sys-apps/ed/ed-1.14.1a.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="https://www.gnu.org/software/ed/"
-#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
-# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
-SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-src_configure() {
-	# Upstream configure script is moronic.
-	econf \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin"
-}
diff --git a/sys-apps/ed/ed-1.14.2.ebuild b/sys-apps/ed/ed-1.14.2.ebuild
index e4ecd98a48aa..a0e545705c99 100644
--- a/sys-apps/ed/ed-1.14.2.ebuild
+++ b/sys-apps/ed/ed-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.15.ebuild b/sys-apps/ed/ed-1.15.ebuild
new file mode 100644
index 000000000000..8e52edda9b8a
--- /dev/null
+++ b/sys-apps/ed/ed-1.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="https://www.gnu.org/software/ed/"
+#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
+# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+src_configure() {
+	# Upstream configure script is moronic.
+	econf \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin"
+}
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index af6495490779..c923a6172f2f 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -60,5 +60,6 @@ DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST zoneinfo_compiled-0.4.5.crate 7260 BLAKE2B fe461bb585de1a606e8fe800b4df763a988be643a1499e6d4ec182cdd43ea0721ebbea30ed70da4b79fedb2376d2328c4a2bfff993a13046427f85465ad73225 SHA512 1b4248c68d12e2edab047e6067876e5d662b9dc5cf9bab33188082cee0b7aff6162d6288dcad4b08da85baeccbb0f8df81e426448aeda7027544518e3e7850dc
+EBUILD exa-0.8.0-r1.ebuild 1865 BLAKE2B e71a68b4dce9bdbb327f7a29ef46386d31192a8b98a3c8b8c715942d8cf38498d3e5f3f095a50b833bf685b2624ff4fdd8e62cab0a345290454f72afb42b22d0 SHA512 0109b05b0b8a5b732adff479d6ae530351d7980c6525c39bcf3538183b30b1a3ab49da2f2d8b0905ff96f517e2d9cf9545399143c756a05374d83b2785e39883
 EBUILD exa-0.8.0.ebuild 1665 BLAKE2B 604b8c8024ac748888eb0947115bda6d6b2be513f36c6439ff8f8411009a0d44636135c4b8c6badb68a911c5b0043c76be5c3c272ff010def6b1c7b9d7739b4f SHA512 404230a766830808e7196dab9dbb51b2cf743175606afa03cd9824c8510d3044a8461edc97f8468cc473ce8f2c78906524a3b418312a4951593db0ba60263bf7
 MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/exa-0.8.0-r1.ebuild b/sys-apps/exa/exa-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..db54b293100c
--- /dev/null
+++ b/sys-apps/exa/exa-0.8.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.5.3
+ansi_term-0.8.0
+bitflags-0.7.0
+bitflags-0.9.1
+byteorder-0.4.2
+cmake-0.1.25
+conv-0.3.3
+custom_derive-0.1.7
+datetime-0.4.5
+env_logger-0.3.5
+exa-0.8.0
+gcc-0.3.53
+getopts-0.2.14
+git2-0.6.8
+glob-0.2.11
+idna-0.1.4
+iso8601-0.1.1
+kernel32-sys-0.2.2
+lazy_static-0.2.8
+libc-0.2.30
+libgit2-sys-0.6.14
+libz-sys-1.0.16
+locale-0.2.2
+log-0.3.8
+magenta-0.1.1
+magenta-sys-0.1.1
+matches-0.1.6
+memchr-0.1.11
+natord-1.0.9
+nom-1.2.4
+num-0.1.40
+num-bigint-0.1.40
+num-complex-0.1.40
+num-integer-0.1.35
+num-iter-0.1.34
+num-rational-0.1.39
+num-traits-0.1.40
+num_cpus-1.6.2
+number_prefix-0.2.7
+pad-0.1.4
+percent-encoding-1.0.0
+pkg-config-0.3.9
+rand-0.3.16
+redox_syscall-0.1.31
+regex-0.1.80
+regex-syntax-0.3.9
+rustc-serialize-0.3.24
+scoped_threadpool-0.1.7
+term_grid-0.1.6
+term_size-0.3.0
+thread-id-2.0.0
+thread_local-0.2.7
+unicode-bidi-0.3.4
+unicode-normalization-0.1.5
+unicode-width-0.1.4
+url-1.5.1
+users-0.5.3
+utf8-ranges-0.1.3
+vcpkg-0.2.2
+winapi-0.2.8
+winapi-build-0.1.1
+zoneinfo_compiled-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A modern replacement for 'ls' written in Rust"
+HOMEPAGE="https://the.exa.website/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+git"
+
+DEPEND="
+	git? (
+		dev-libs/libgit2:=
+		net-libs/http-parser:=
+	)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="/usr/bin/exa"
+
+src_compile() {
+	cargo_src_compile $(usex git "" --no-default-features)
+}
+
+src_install() {
+	cargo_src_install $(usex git "" --no-default-features)
+
+	newbashcomp contrib/completions.bash exa
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/completions.zsh _exa
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins contrib/completions.fish exa.fish
+
+	doman contrib/man/*
+}
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 1394afbfa2b4..b1468b68b55a 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -49,5 +49,5 @@ DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fd-7.2.0.ebuild 1841 BLAKE2B 10e0fb93e7d07fb73eb62ad5132eaf04f8a6009fc6e48702aa89cea912616fb64d33badd1959299bf5d4eae54a146163de5d78f072ca2d85c17233b651dd39ad SHA512 dbfc10fe4abe43dc34b668d1d259d2ea184aa1335e6282ebc3bf18b1aabc27f9838c330f35224fd50b4ee7c64b7f2878526c88cb2a4eb3784e9922e40bba3706
+EBUILD fd-7.2.0.ebuild 1741 BLAKE2B 95d1d56bfe93bbdd2d15f4721d52335c9f9e7aa597d1bf2a0da4ebae8722674cd0d52b291fb2ac8dd375651dd5c4a72921e017b85c35fc3b3711518ca022fc59 SHA512 64287a765ba9c93f4ffcf9ba1fd40fa8b99e9a589e6c621561a14b53e685d16d2b6cc276b16245a43561722c1c8e618e18aae5f2f23150f548e179ad0f6fc015
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-7.2.0.ebuild b/sys-apps/fd/fd-7.2.0.ebuild
index 7ce934fcd359..a425dae0a6fe 100644
--- a/sys-apps/fd/fd-7.2.0.ebuild
+++ b/sys-apps/fd/fd-7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -89,7 +89,3 @@ src_install() {
 	dodoc README.md
 	doman doc/*.1
 }
-
-src_test() {
-	cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "tests failed"
-}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ce0defa37243..d07a6cd23720 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,6 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
-DIST fwupd-1.1.4.tar.gz 1729782 BLAKE2B af8a1046d6ab9098ee7b09bc1c9677b2256909fdb6cef3e1632e920f962246b94ae7b8c8c4cb5c90088845d836c27cb98c7b8c05bad8f6a213029c220856e602 SHA512 7c14efd044f575c600ee4734c6721b8990603296a8ef2ec7643691e1b47598c12afd31e0c25a0dae69719e2c375fc1f18a6073f20b3c1b91400a046de52e8a28
-DIST fwupd-1.2.0.tar.gz 1746711 BLAKE2B 7611f0d501f897392cba0f6ca877265c634d723b9804e640b7824b35773c16117e574dd7eb336c626de6dcd7360112acac2aa5da828c28aff7954b0935bec60d SHA512 88e543cb06522b4af2d62addea77ab0d2a119409e0c36c5034bc4c035c73fdfd8565723a3993f04510491645174064d0bb9b2937553ced8528f29257d9a902e9
-DIST fwupd-1.2.1.tar.gz 1754253 BLAKE2B 96938766758db32b00437e29c1b93870411687f7535102703faf4a09189dc4e90fd232794812d964895c12b0f63c86d0023ff1abcf9848059f04c12812158db9 SHA512 ce86c7b5e5c1a45a561f6fc195c3db861e29f9cd435df9e41a41ade94e2f9891508b0e32906df09fe074d383b5d7b6ac824201949f67e2c86c6c905eae550d78
-EBUILD fwupd-1.1.4.ebuild 3227 BLAKE2B 8f83bfc9b1a16fee38110175ea53419d99e373e1b333c51cc87f76babca9ac7a8c596c8c0d06ddf959797feca60cb9ece2231c53f37b3f7a5a1a8f7b0f485998 SHA512 a7e505ffe6b6e5a1d45c323fafb198446b9d2994b53755318893d19fe757bd8be40ac7f521affba7a83c3e2958bf070ae86dc30b1f9be6dce3cde05138912517
-EBUILD fwupd-1.2.0.ebuild 3181 BLAKE2B da56c804e52ffa95ab1a470241df62793ed5abd118e1c7b918e4823876c6124195521bcff623839ba365372ed819ed9eb9e3b014628e540c0648dd96b1421793 SHA512 35818f63f15c92997d4bd060eca6eb4c25e2e8e1cab567843536059712530ff85cedfc7d61cce6f36e3f7163513e84cd6001c18434a83707963bbbc48c91cef4
-EBUILD fwupd-1.2.1.ebuild 3082 BLAKE2B 470e13c0620a2e33a3efc29853078938a7685e3c5a09e9d9ec964db884a7241d45aac5a535531f1fbd54f895aa99ed220759893ed98ac6fe7285957284438034 SHA512 f00ec6d29dcb9998bfbc1540dc45113d34da8517a06693b48ec3aa7d4a500493aace3504b7d904cbc50eb9927e4f48173c6f187e215f871bedfcc3ec87ce1e6c
+DIST fwupd-1.2.2.tar.gz 1768003 BLAKE2B 83d91761b7dc71296def8a88eb356df687906278ad6e351dffce246a1473de4a141e84e959dd4a785a36a846fc6884d4c83f512e8ea96d7f1b8f9c5dd438d784 SHA512 34221c905a75f4b6d9ee66bc08a2ceb0d65debb71771b8e0eeed26593dff4f29a4080b7c3164535e862f91f370bb519ae2761dc1f62c6b6de3c6c51ef5f0af65
+DIST fwupd-1.2.3.tar.gz 1768734 BLAKE2B 898f0cf3d86295840ad3f5a3736d9b0aedb61f678ca10d93bbbd9240513ae09a2d8941e3d6844024a20652eec487c7237dea5e6813d8d7c969d2998a970d23c1 SHA512 fc4fbb3778f9ed82eec4f05905d611f34344fccd78d199348b9f8ca83fedc48d1503fc77eb0b85026d77f5f83de5f609d97d0a0c008f3280b0a97e942000ba59
+EBUILD fwupd-1.2.2-r1.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
+EBUILD fwupd-1.2.3.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
 MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.1.4.ebuild b/sys-apps/fwupd/fwupd-1.1.4.ebuild
deleted file mode 100644
index e8497bb3e4e2..000000000000
--- a/sys-apps/fwupd/fwupd-1.1.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson python-single-r1 vala 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 nvme pkcs7 redfish systemd test thunderbolt uefi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	dell? ( uefi )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.7.4:=[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[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? (
-		dev-libs/json-glib
-		sys-libs/efivar
-	)
-	systemd? ( >=sys-apps/systemd-211 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	nvme? (	>=sys-kernel/linux-headers-4.4 )
-	test? ( net-libs/gnutls[tools] )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.43.0
-	>=dev-util/ninja-1.7.2
-	virtual/pkgconfig
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_nvme="$(usex nvme true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
-}
-
-pkg_postinst() {
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.0.ebuild b/sys-apps/fwupd/fwupd-1.2.0.ebuild
deleted file mode 100644
index d4554549eb08..000000000000
--- a/sys-apps/fwupd/fwupd-1.2.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson python-single-r1 vala 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 nvme pkcs7 redfish systemd test thunderbolt uefi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	dell? ( uefi )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/gcab
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.3
-	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[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? (
-		sys-libs/efivar
-	)
-	systemd? ( >=sys-apps/systemd-211 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	nvme? (	>=sys-kernel/linux-headers-4.4 )
-	test? ( net-libs/gnutls[tools] )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.46.0
-	>=dev-util/ninja-1.7.2
-	virtual/pkgconfig
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_nvme="$(usex nvme true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
-}
-
-pkg_postinst() {
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.1.ebuild b/sys-apps/fwupd/fwupd-1.2.1.ebuild
deleted file mode 100644
index 7f9b147acd16..000000000000
--- a/sys-apps/fwupd/fwupd-1.2.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson python-single-r1 vala 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 nvme pkcs7 redfish systemd test thunderbolt uefi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	dell? ( uefi )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/gcab
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.5
-	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[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? (
-		sys-libs/efivar
-	)
-	systemd? ( >=sys-apps/systemd-211 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="
-	${RDEPEND}
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	nvme? (	>=sys-kernel/linux-headers-4.4 )
-	test? ( net-libs/gnutls[tools] )
-"
-
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_nvme="$(usex nvme true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
-}
-
-pkg_postinst() {
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..72cc697499b1
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit meson python-single-r1 vala 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 nvme pkcs7 redfish systemd test thunderbolt uefi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/gcab
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection]
+	>=dev-libs/libxmlb-0.1.5
+	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[introspection]
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	nvme? ( sys-libs/efivar )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	$(vala_depend)
+	x11-libs/pango[introspection]
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	nvme? (	>=sys-kernel/linux-headers-4.4 )
+	test? ( net-libs/gnutls[tools] )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
+src_prepare() {
+	default
+	sed -e "s/'--create'/'--absolute-name', '--create'/" \
+		-i data/tests/builder/meson.build || die
+	sed -e "/'-Werror',/d" \
+		-i plugins/uefi/efi/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_nvme="$(usex nvme true false)"
+		-Dplugin_redfish="$(usex redfish true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	doinitd "${FILESDIR}"/${PN}
+
+	if ! use systemd ; then
+		# Don't timeout when fwupd is running (#673140)
+		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+			-i "${ED}"/etc/${PN}/daemon.conf || die
+	fi
+}
+
+pkg_postinst() {
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/fwupd/fwupd-1.2.3.ebuild b/sys-apps/fwupd/fwupd-1.2.3.ebuild
new file mode 100644
index 000000000000..72cc697499b1
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.2.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit meson python-single-r1 vala 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 nvme pkcs7 redfish systemd test thunderbolt uefi"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	dell? ( uefi )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-arch/gcab
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection]
+	>=dev-libs/libxmlb-0.1.5
+	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[introspection]
+	>=sys-auth/polkit-0.103
+	virtual/libelf:0=
+	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	nvme? ( sys-libs/efivar )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? (
+		sys-libs/efivar
+	)
+	systemd? ( >=sys-apps/systemd-211 )
+	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	$(vala_depend)
+	x11-libs/pango[introspection]
+	doc? ( dev-util/gtk-doc )
+	man? ( app-text/docbook-sgml-utils )
+	nvme? (	>=sys-kernel/linux-headers-4.4 )
+	test? ( net-libs/gnutls[tools] )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+# required for fwupd daemon to run.
+# NOT a build time dependency. The build system does not check for dbus.
+PDEPEND="sys-apps/dbus"
+
+src_prepare() {
+	default
+	sed -e "s/'--create'/'--absolute-name', '--create'/" \
+		-i data/tests/builder/meson.build || die
+	sed -e "/'-Werror',/d" \
+		-i plugins/uefi/efi/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	xdg_environment_reset
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dconsolekit="$(usex systemd false true)"
+		-Dgpg="$(usex gpg true false)"
+		-Dgtkdoc="$(usex doc true false)"
+		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
+		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_nvme="$(usex nvme true false)"
+		-Dplugin_redfish="$(usex redfish true false)"
+		-Dplugin_synaptics="$(usex dell true false)"
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
+		-Dplugin_uefi="$(usex uefi true false)"
+		-Dsystemd="$(usex systemd true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	doinitd "${FILESDIR}"/${PN}
+
+	if ! use systemd ; then
+		# Don't timeout when fwupd is running (#673140)
+		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+			-i "${ED}"/etc/${PN}/daemon.conf || die
+	fi
+}
+
+pkg_postinst() {
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index b127a8e0cb6d..89dcf617a9c9 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2817 BLAKE2B a9ac31d7ac1418500e11d848e69dc01c8c3dcf29a2166f1b92f5d0f8acff38e864930f0b5a5da8b9f67a61919fabd4d949ae6634d47cee5cc2b2751370c9db14 SHA512 29effbac577cfc35102ed96ed52e1a43d4d02f0dbd94bd149131b4197afb5d48bede1484d290f6d2f78635b0017b66ffade729900997a3a3421bd9834e96f47a
 EBUILD groff-1.22.3.ebuild 2528 BLAKE2B 316bbf572fdf95b1be2eae306604f85706422966b052b7f2a1efecf24a453e94171936a941783c91f42c485e3292a8f4f793cb2fae09fe5f78311c1fe249c4c6 SHA512 2b269a1ca0f454b001bdbaa9939784d4863c84847900e38f7aa233570508731b0ad2cc2e8d7489eb9d8efcc318270ce191315b7753de08ab70dbce1d37179fd0
-EBUILD groff-1.22.4.ebuild 2743 BLAKE2B 7dfa6ad777d63e4f87e95ab7482ba55a5ca2c452901635142076f9464091c8aa363dd623851d411a5a9779f5375575f666453207de6a314b771fdbae4663b448 SHA512 93dbe17802f6dc44891618f6b71ae8747cabe1f340fa338f7469f25ad85a8899a4747db21ac15b1b58116d460b731c74a91494d48aacf14e20bbbe0951ae4e38
+EBUILD groff-1.22.4.ebuild 2760 BLAKE2B bdd135ec4436184df9593b102432de88748a3ad021a0f60649f2bdfbca9b569fd6084ac6bf04269799587b0bc887ac572089fdd403df8d6756eb61fcd56ecc23 SHA512 1d86f9e4804fa0a50deed2794384ba7544a043dae43310c8623064021e941c24ef88c762e73af7ce3f51855e72e2d00f96bf9d84e1f0c89f0b50b7bd040687bc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 67b0f18455e9..8ec07c8c1ad7 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,8 @@ RDEPEND="
 		x11-libs/libICE
 	)"
 DEPEND="${RDEPEND}
-	dev-lang/perl"
+	dev-lang/perl
+	sys-apps/texinfo"
 
 DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README TODO )
 
@@ -42,9 +43,9 @@ src_prepare() {
 	default
 
 	# honor Gentoo's docdir
-	sed -i -e '/^docdir=/s/^/#/' \
-		Makefile.am \
-		|| die "failed to modify Makefile.am"
+	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \
+		Makefile.in \
+		|| die "failed to modify Makefile.in"
 
 	# Make sure we can cross-compile this puppy
 	if tc-is-cross-compiler ; then
@@ -73,7 +74,6 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults
-		--docdir="${EPREFIX%/}"/usr/share/doc/${PF}
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index d869064ed4ac..7157214b3d2e 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -5,11 +5,15 @@ AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e1671
 AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3
 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5
+AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660
+AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
+DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 12f2034aebd08983d8349dfa07935bfbeb04126b2af45c1a88c00e7a40ff865fb00e498955aa2f0e6a0e1c55e702d281f653b1cf9817e8bdeebc21b8e79b1fbe SHA512 e46431a3827de15fe0d0bd4837a66f378c3e4bc067ca29ae5292faa2bcda10b3bfc79e1eedc31ab4f38db8d245750bc9de9733202e87a2a974bef2cff60640dd
 EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B bedd85f0cfac4e0db1e210067f287bd4be04e89d6623373ed61097ce91e59636f00ef68a1a39335dc43335e5ca6d3e5ab94091084ae6fc703b7fa939305ca15f SHA512 a71917519ea3a8cff82a3eb5f50cb71723bd3749d2dfa7d7e7a5fa4db27325a14880d9b108ef4bbe450553c65f4711f73f94208acc19b12263cd97ebd9bafa18
+EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B a4267caef40fefa2ef46a8103c0ca558a51f4f298ed25630614752035c3d2cdadef160904c77f46a978c3d85f2fbf1714d5cd0b9d9c6fb52b8d04cf68f52f664 SHA512 68768fd94cc1571b51e3e87dfa8f0fe009ca354ccca5a5e9b2faa0db5e6f827be637f5cc5594d7c08136e9ff2e8b664bedd2296c02bcad143150e7ebe3c765e5
 EBUILD iproute2-9999.ebuild 4310 BLAKE2B 0569ce4999daa8315da5fa8692ad3bef4623133ea91c8520950b14c0dabeb63f922fbdda33ddad194b44ea205554a61afe225a28f9e5711bb501f3add3fd2f7d SHA512 d70a72670a882f7b1ecc13018e993282a0d532d3d8a8e024d8ab655746daf00d7316ab71ec9caad15c1d9195ba25aea722adb1b73a0753f77fefe48516f03e71
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
new file mode 100644
index 000000000000..94df85017dfe
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
@@ -0,0 +1,208 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libelf, libmnl & libcap based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
+Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
+Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
+
+--- iproute2-4.20.0/bridge/Makefile
++++ iproute2-4.20.0/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- iproute2-4.20.0/config.include
++++ iproute2-4.20.0/config.include
+@@ -0,0 +1,26 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++ifeq ($(HAVE_CAP),y)
++	CFLAGS += $(HAVE_CAP_CFLAGS)
++	LDLIBS += $(HAVE_CAP_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+--- iproute2-4.20.0/configure
++++ iproute2-4.20.0/configure
+@@ -188,7 +188,7 @@
+     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -231,8 +231,8 @@
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -245,8 +245,8 @@
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -258,8 +258,8 @@
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -316,8 +316,8 @@
+ 		echo "HAVE_CAP:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
++		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
++		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -397,7 +397,3 @@
+ 
+ echo -n "libcap support: "
+ check_cap
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
+--- iproute2-4.20.0/devlink/Makefile
++++ iproute2-4.20.0/devlink/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-4.20.0/genl/Makefile
++++ iproute2-4.20.0/genl/Makefile
+@@ -2,6 +2,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+--- iproute2-4.20.0/ip/Makefile
++++ iproute2-4.20.0/ip/Makefile
+@@ -15,6 +15,7 @@
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+--- iproute2-4.20.0/lib/Makefile
++++ iproute2-4.20.0/lib/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+--- iproute2-4.20.0/misc/Makefile
++++ iproute2-4.20.0/misc/Makefile
+@@ -5,6 +5,7 @@
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+--- iproute2-4.20.0/netem/Makefile
++++ iproute2-4.20.0/netem/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+--- iproute2-4.20.0/rdma/Makefile
++++ iproute2-4.20.0/rdma/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-4.20.0/tc/Makefile
++++ iproute2-4.20.0/tc/Makefile
+@@ -4,6 +4,7 @@
+        emp_ematch.yacc.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+--- iproute2-4.20.0/tipc/Makefile
++++ iproute2-4.20.0/tipc/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
new file mode 100644
index 000000000000..31733e99f72c
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
@@ -0,0 +1,38 @@
+--- iproute2-4.20.0/ip/ipmonitor.c
++++ iproute2-4.20.0/ip/ipmonitor.c
+@@ -118,7 +118,6 @@
+ 
+ 	case RTM_NEWPREFIX:
+ 		print_headers(fp, "[PREFIX]", ctrl);
+-		print_prefix(n, arg);
+ 		return 0;
+ 
+ 	case RTM_NEWRULE:
+--- iproute2-4.20.0/ip/iptunnel.c
++++ iproute2-4.20.0/ip/iptunnel.c
+@@ -549,13 +549,6 @@
+ 		break;
+ 	case AF_INET:
+ 		break;
+-	/*
+-	 * This is silly enough but we have no easy way to make it
+-	 * protocol-independent because of unarranged structure between
+-	 * IPv4 and IPv6.
+-	 */
+-	case AF_INET6:
+-		return do_ip6tunnel(argc, argv);
+ 	default:
+ 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
+ 		exit(-1);
+--- iproute2-4.20.0/ip/Makefile
++++ iproute2-4.20.0/ip/Makefile
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-2.0
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+-    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
++    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
+     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
+     iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \
+     iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \
diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
new file mode 100644
index 000000000000..aa41574d98b7
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.20.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	dev-libs/libbsd
+	!minimal? ( net-libs/libmnl )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	virtual/pkgconfig
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
new file mode 100644
index 000000000000..486b2bf1e256
--- /dev/null
+++ b/sys-apps/lsd/Manifest
@@ -0,0 +1,36 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
+DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caeefe4c4847c1864c51fa2538769c9c8cea2c45176910f594f7e208c8bca8d1479ceac27c41fe393a02187572d508836bb6 SHA512 47ca23567abf41975007025bdbb2b30ae9a59d8381069408716ff9d2c60f77bcd8c9aadd5cb672902d73cb85b3123b7818c20c8823a27f3a99cecd50cae47cd3
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
+DIST lsd-0.11.1.tar.gz 29838 BLAKE2B bfbbc82847f68218c37ce45eb92d59ca41fb62bc02161415deb981666ce7e2f14e615ad91a89f7d7a22dff9c3c3e744614893c54c5e9276dd3571cfd87c04c8b SHA512 751098ff9296559b75d2c849194418c368c722a22021015d5adbb6c0a4b56dabff4a7597b821cb57ca928ffb635015f08e20e052f8926016f48788a6dbf20fd2
+DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
+DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
+DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST redox_syscall-0.1.43.crate 15212 BLAKE2B cd2e3bbd3cad2568bb61d71931f84b9c09ce694500508ef1fd78c841424bcc40515645062c3fa47cf0d6d99082cff3800a789c0bd0acab87ef5bfebe4e9f25e6 SHA512 c506b1b9067d1c40419a3b4bbd5b2b9bf2e92fba775d51f46bc80d322412a9a8d6d2f4e384071f27ba0e8e58e8ddc2ba4a0ee99567ba2e82e63472924fa46354
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
+DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
+DIST terminal_size-0.1.8.crate 7289 BLAKE2B 17a620858a1a3f32f105fa61cd3f57166e1fae57c422a1ed9b59ff61d3c8f7916c1f7e3d7e3728b8f3cad481b1529d8bddd5ea98ca425e37c14cb469dec08858 SHA512 2392e2d3c34e6dc83c43e804ceb9990af82066879a2d74b21e4ab88bf9a8698f34c8734f3e8e3febdda44c0633819809259fb34bd48d138d22ad6c4b448f396c
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST users-0.8.1.crate 18406 BLAKE2B 9e6c36e04a64fc5e1e33a4a5714bd360d10c254cd4140c008e00cbdca7b1699e0f66aaabf8dfb8d9c9142ceed4c39af357d6d754c07fe2aa38364128fd6fbe97 SHA512 04de8d9943d9b929ddf060e08f7a019662a0ce9fb7423a8c09c81d52462bf86988f99c29f51d19ff2c72f53cc9d2179f3a57a68e544611427a1c016cf8a474b0
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD lsd-0.11.1-r1.ebuild 1144 BLAKE2B 42122bdbfb44f03b9b375f6ca9e528211bf291dc14c2ba72b346a0fd53a10388082e3f0587625a3d4c2022fb978ef5209bae7e83dc8cb62bc09a3106698a32e4 SHA512 b93745a3bd245aa12f8bf2126385a9183f1c5bb16d817a74f155a7208bb7e6adcd37d069707ae28397b372e1aa92889c51b3032ed4e9afe7cb98a33ebab3168f
+MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.11.1-r1.ebuild b/sys-apps/lsd/lsd-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..ae0713c96a74
--- /dev/null
+++ b/sys-apps/lsd/lsd-0.11.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.4
+chrono-0.4.6
+chrono-humanize-0.0.11
+clap-2.32.0
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+kernel32-sys-0.2.2
+libc-0.2.44
+num-integer-0.1.39
+num-traits-0.2.6
+rand-0.4.3
+redox_syscall-0.1.43
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+strsim-0.7.0
+tempdir-0.3.7
+term_grid-0.1.7
+term_size-0.3.1
+terminal_size-0.1.8
+termion-1.5.1
+textwrap-0.10.0
+time-0.1.40
+unicode-width-0.1.5
+users-0.8.1
+vec_map-0.8.1
+version_check-0.1.5
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
+HOMEPAGE="https://github.com/Peltoche/lsd"
+SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=">=virtual/rust-1.30.1"
+
+QA_FLAGS_IGNORED="/usr/bin/lsd"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/sys-apps/lsd/metadata.xml b/sys-apps/lsd/metadata.xml
new file mode 100644
index 000000000000..8238443079e5
--- /dev/null
+++ b/sys-apps/lsd/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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		A modern ls with a lot of pretty colors and awesome icons.
+		This project is heavily inspired by the super colorls project but with some little differences.
+		For example it is written in rust and not in ruby which makes it really faster
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/Peltoche/lsd/issues</bugs-to>
+		<changelog>https://github.com/Peltoche/lsd/blob/master/CHANGELOG.md</changelog>
+		<remote-id type="github">Peltoche/lsd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index f213b9c46b1f..0c437515d5b4 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,4 +1,5 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
+EBUILD makedev-3.23.1-r1.ebuild 1358 BLAKE2B e23de672cb4d04cc4da5e85137e74324ee6718f1c3bbc3fa2c5ce797abbd500a4cbe6796e68428ed8ec9fe3afd59515452e9d24affcc8d10e4a0dc8d07b08fb3 SHA512 ff0b1ad304fff6c1216f8a9a8d0a782806cb5f3a4f1494799bb59bc3cc7379ce338da659813bb006b899abaffc268e023caf36e702f88bf1efd846380099e00a
 EBUILD makedev-3.23.1.ebuild 1377 BLAKE2B 636977e8eb82b2ef3ebad9a4c8e6c39f82e77caed2b7af2906fb5609f709dc5cf522e2318ce310d0a4624b313e9381f7ad5c0f5fb628adefd8e9b5a2b3291ae7 SHA512 6dd5eb8d3d1bcbe7d459bcebd0eb69e9dbdbb69c6d42e4231bfd0f46261b5f3fd99e9084217c56011a8036f477429accf6e355e21ef0e1613d8e4358ac921b60
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
new file mode 100644
index 000000000000..a41940e005c6
--- /dev/null
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_PN="MAKEDEV"
+MY_VER=${PV%.*}
+MY_REL=${PV#${MY_VER}.}
+MY_P="${MY_PN}-${MY_VER}"
+DESCRIPTION="program used for creating device files in /dev"
+HOMEPAGE="https://people.redhat.com/nalin/MAKEDEV/"
+SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="build selinux"
+
+RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch #339674
+)
+
+src_compile() {
+	use selinux && export SELINUX=1
+	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	# set devdir to makedevdir so we dont have to worry about /dev
+	emake install DESTDIR="${D}" makedevdir=/sbin devdir=/sbin
+	dodoc *.txt
+	keepdir /dev
+}
+
+pkg_postinst() {
+	if use build ; then
+		# set up a base set of nodes to make recovery easier #368597
+		"${ROOT}"/sbin/MAKEDEV -c "${ROOT}"/etc/makedev.d \
+			-d "${ROOT}"/dev console hda input ptmx std sd tty
+		# trim useless nodes
+		rm -f "${ROOT}"/dev/fd[0-9]* # floppy
+		rm -f "${ROOT}"/dev/sd[a-d][a-z]* "${ROOT}"/dev/sd[e-z]* # excess sata/scsi
+		rm -f "${ROOT}"/dev/tty[a-zA-Z]* # excess tty
+	fi
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index c4b5dad52731..f189849e903c 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,10 +1,11 @@
 AUX man-db-2.8.4-berkdb_build_fix.patch 661 BLAKE2B 2f8950d05ef4c467089ebef3d73b9df1d1a6f1f235ce01e87830b14644d9317da0b255702d7c40507c67d65710cb13a1cb85210739f55b4b7e7ee282acceedae SHA512 c99f61ef08be2e88feb90376dfe3c4f1b028c6916c46aea92d145de304ca380d381a334bb1c0bc5828ea38c24532960cf0d449c18cd6db59a47ca3bdc3fac43b
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
+AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
 DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66
+DIST man-db-2.8.5.tar.xz 1787244 BLAKE2B b908a6fb0187d42f8d1f842063e0afdf1e052244ea727f0aaaf4d658bb8954a216c0555df5511b27246fd12c2a388c44dcfccf243449d25d6e741c5c3466d3be SHA512 8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69
 EBUILD man-db-2.7.6.1-r2.ebuild 3162 BLAKE2B 5aefa5d09e68cc46d639cd09d55d8347046b9fab1b148d40e11a996cfbf94fcc43b8fc386941b3a157a2ac13dda2c6b4f8eafea75433af10560d86ee6f1270c7 SHA512 b42c3a488d2424c24a12f5eaeda2c15efeb18cf9b3c55230238e686712d78f127f9c9e2668dc0da84569cac1d532e19088cc78936d94146a981b776f82934fe9
-EBUILD man-db-2.8.3.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
 EBUILD man-db-2.8.4.ebuild 3433 BLAKE2B 3768e283d9d5f4d3f5527923cd0d3863433682a6d80e0b255324d4636419f0bf76b9b139a82f27f4c766696eac69ae915e3c891b3ae4d61142fb7bc44e2b11e7 SHA512 40848f7193559a635d8a340ca54db9739a8ffe43b6a3edbe602c17ec9d132843c3a7cbf82fca4e6bc96f832314e0fd2b7294644cfa430c76e4aae0c0620b022e
-EBUILD man-db-9999.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
+EBUILD man-db-2.8.5.ebuild 3445 BLAKE2B 330717193448fa99450f980c4ddce711d59a18dce8c06e98f01687e83eb0925024b31180f66af134e04fe4ba113cefdc89a9924f7c03b0bf0e15ce3ed452e2dd SHA512 63f9b781f4c0364a10434182d060d310ea76f8d628a0fde7f104a1853ead041bda9668ea4dda8f12091dcfa7ec4043d5b2ed671c20953f1015ab5b0c8e51d33c
+EBUILD man-db-9999.ebuild 3445 BLAKE2B 330717193448fa99450f980c4ddce711d59a18dce8c06e98f01687e83eb0925024b31180f66af134e04fe4ba113cefdc89a9924f7c03b0bf0e15ce3ed452e2dd SHA512 63f9b781f4c0364a10434182d060d310ea76f8d628a0fde7f104a1853ead041bda9668ea4dda8f12091dcfa7ec4043d5b2ed671c20953f1015ab5b0c8e51d33c
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db.cron-r1 b/sys-apps/man-db/files/man-db.cron-r1
new file mode 100644
index 000000000000..7f7932360cb8
--- /dev/null
+++ b/sys-apps/man-db/files/man-db.cron-r1
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Use same perms/settings as the ebuild.
+cachedir="/var/cache/man"
+if [ ! -d "${cachedir}" ]; then
+	mkdir -p "${cachedir}"
+	chown man:man "${cachedir}"
+	chmod 0755 "${cachedir}"
+fi
+
+exec su man -s /bin/sh -c 'nice mandb --quiet' 2>/dev/null
diff --git a/sys-apps/man-db/man-db-2.8.3.ebuild b/sys-apps/man-db/man-db-2.8.3.ebuild
deleted file mode 100644
index 670cbc0de539..000000000000
--- a/sys-apps/man-db/man-db-2.8.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune user versionator
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib"
-
-CDEPEND="
-	!sys-apps/man
-	>=dev-libs/libpipeline-1.5.0
-	sys-apps/groff
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
-	seccomp? ( sys-libs/libseccomp )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-PDEPEND="manpager? ( app-text/manpager )"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-setuid
-		--enable-cache-owner=man
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
-		$(use_enable nls)
-		$(use_enable static-libs static)
-		$(use_with seccomp libseccomp)
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-	)
-	econf "${myeconfargs[@]}"
-
-	# Disable color output from groff so that the manpager can add it. #184604
-	sed -i \
-		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
-		src/man_db.conf || die
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
-}
-
-pkg_preinst() {
-	local cachedir="${EROOT}var/cache/man"
-	# If the system was already exploited, and the attacker is hiding in the
-	# cachedir of the old man-db, let's wipe them out.
-	# see bug  #602588 comment 18
-	local _replacing_version=
-	local _setgid_vuln=0
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then
-			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
-		else
-			_setgid_vuln=1
-			debug-print "Applying cleanup for security bug #602588"
-		fi
-	done
-	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
-
-	# Fall back to recreating the cachedir
-	if [[ ! -d ${cachedir} ]] ; then
-		mkdir -p "${cachedir}" || die
-		chown man:man "${cachedir}" || die
-	fi
-
-	# Update the whatis cache
-	if [[ -f ${cachedir}/whatis ]] ; then
-		einfo "Cleaning ${cachedir} from sys-apps/man"
-		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		mandb --quiet --create
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.8.5.ebuild b/sys-apps/man-db/man-db-2.8.5.ebuild
new file mode 100644
index 000000000000..fc34d010327e
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.8.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user eapi7-ver systemd
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
+
+CDEPEND="
+	!sys-apps/man
+	>=dev-libs/libpipeline-1.5.0
+	sys-apps/groff
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+pkg_setup() {
+	# Create user now as Makefile in src_install does setuid/chown
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+src_configure() {
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	local myeconfargs=(
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
+		--enable-cache-owner=man
+		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_with seccomp libseccomp)
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+	)
+	econf "${myeconfargs[@]}"
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	find "${ED}" -name "*.la" -delete || die
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+}
+
+pkg_preinst() {
+	local cachedir="${EROOT}var/cache/man"
+	# If the system was already exploited, and the attacker is hiding in the
+	# cachedir of the old man-db, let's wipe them out.
+	# see bug  #602588 comment 18
+	local _replacing_version=
+	local _setgid_vuln=0
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		if version_is_at_least '2.7.6.1-r2' "${_replacing_version}"; then
+			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
+		else
+			_setgid_vuln=1
+			debug-print "Applying cleanup for security bug #602588"
+		fi
+	done
+	[[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}"
+
+	# Fall back to recreating the cachedir
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir -p "${cachedir}" || die
+		chown man:man "${cachedir}" || die
+	fi
+
+	# Update the whatis cache
+	if [[ -f ${cachedir}/whatis ]] ; then
+		einfo "Cleaning ${cachedir} from sys-apps/man"
+		find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+}
+
+pkg_postinst() {
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
+	fi
+}
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 670cbc0de539..fc34d010327e 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit ltprune user versionator
+inherit user eapi7-ver systemd
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib"
+IUSE="berkdb +gdbm +manpager nls +seccomp selinux static-libs zlib"
 
 CDEPEND="
 	!sys-apps/man
@@ -57,9 +57,9 @@ pkg_setup() {
 src_configure() {
 	export ac_cv_lib_z_gzopen=$(usex zlib)
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-setuid
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--disable-setuid #662438
 		--enable-cache-owner=man
 		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
 		$(use_enable nls)
@@ -78,10 +78,10 @@ src_configure() {
 src_install() {
 	default
 	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 
 	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
+	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
 }
 
 pkg_preinst() {
@@ -115,8 +115,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+	if [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
 		einfo "Rebuilding man-db from scratch with new database format!"
-		mandb --quiet --create
+		su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null
 	fi
 }
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 5d622b40975d..75a972d4d148 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,5 +1,5 @@
 DIST moreutils-0.61.tar.gz 93234 BLAKE2B cfa3c24d68ca0f9ef220ef97e0ac50a77e557cc399ef898d15a56d4e205ba180f494ca7a89a566e4dea28eebf08590fbd94b75f7850f941a8a22eba147f8e61d SHA512 6164680c8bfec02f7a84274b1d4342a1d6c296e14843496dcc9f9ac71b3e3b1663dea72e2251a546a646775afa70589483e8d5da71b388b1022476bb3dd91b56
 DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba81eebdf7cde2232f8aea7177f4c79dbce84ff20cf20f924af279c6e02683dfd082ad35237cc0109cddfe30e14 SHA512 100d8129572c1b9ef1381150b69cbcd1762700e66c0ffa0ea849989352bc1bad77b67c5dbc00c159ca6c02905585dbfa3c8a5d88e910da9daaf27b5dba9f2367
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
-EBUILD moreutils-0.62.ebuild 1504 BLAKE2B 87b156ba026a3d9213bd993ea3426094d66008c90f4c8a1609e6d43e5e65ee34f7c72ae91483a023edfe88f8dc139e2b28013bc2b34ff1c73611640e07cd99f4 SHA512 9653beffb5939ccc07242d8dbb57f004b92975d207bb3538a13d089d954cb0a6f5465f7a90f45e7fc03cb848e996cc9d5e694ca8e50e8aefb783ab6ac47290ab
+EBUILD moreutils-0.62.ebuild 1511 BLAKE2B a978a0b7539b353d9f5f8e015a884a92b91c79a296f74cb757599ebabc651e225c37a85c985f36f76f50f5d1a9713c1377a8c16566ef7b3f215e68b5530418ad SHA512 984edea18c99ca61c8e621c6f1e55a54fe9ed247d16dbe63cc16056a807f78c419b0ead508b70117e2b150ca058577d857f7dd8aeaaac00acb4bcb9086038660
 MISC metadata.xml 313 BLAKE2B 66183e9cd23dd84df66abc1f3e229607f3a234f6a07a29cb2246c130cf214fe5ab1275c6f96b5804e27ebc8b867236c49261369756cfaf9dc563dae60f387be5 SHA512 75fcc8c041bbe324b5c1bcd0b006b7cfc17b5b2ae4bf0ef711b9ef4d3233917d4a189320ef06f3165e23f33ac7e6e58d1545cb4c2082eb22a052d09817cecc6f
diff --git a/sys-apps/moreutils/moreutils-0.62.ebuild b/sys-apps/moreutils/moreutils-0.62.ebuild
index 2e245cd08c2e..ed18577e7f62 100644
--- a/sys-apps/moreutils/moreutils-0.62.ebuild
+++ b/sys-apps/moreutils/moreutils-0.62.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index c9401e1b6bff..558d63d78e99 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -6,7 +6,9 @@ AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe78
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
+DIST nix-2.2.1.tar.xz 818648 BLAKE2B 2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e SHA512 42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 EBUILD nix-2.0.4.ebuild 3288 BLAKE2B 7c2fc988eb075af7977e0a2252357779382856c288e6e9aedfe00a414726c7fc933dd4393fa9851b6b2c1fc1d5f57b20f4fdeec99debc50401f6651ae6b9dfd1 SHA512 729b481d24a1af5d9465820d4531ee807a37a9a7cfef8551de5e4f1464a2f50d803915c2eae332e2be8a05954b48838c72216631747ca2f5385df2c18aef1a48
 EBUILD nix-2.1.3.ebuild 3359 BLAKE2B f91cae5d9562ea976222b7f893d4beba3f2f99967dac16381270afe69ecda3df6ffbf1896fe487999c80648477ac22431dc3af9cd3b7fcf09778bc92f9f1c0fa SHA512 f6c9c8a0b1fd25e5484f6c13e9c564868b432c84961e600ae9b3cdb5646c2e4286b8cd6b5dff43f63c58646583d70c6445ce61530f143f4654903bb8e1380971
+EBUILD nix-2.2.1.ebuild 3381 BLAKE2B 18d3b3f7e41c392eadc6822d1d41e39e77633bc976808b8558959c4574558eb7bb76a30c4f20db4b1f89a414dc1f7af364f9e0588492d6ab43323870c7a55d98 SHA512 ec965c3cccf7e9886ead9fa44eaa54f743d1726abc073825e823c95a883a9182eb26c05af4021ac2a0a9c75e6b78af369f605b803849795ceb4236314c784645
 MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94
diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1.ebuild
new file mode 100644
index 000000000000..7168bdd8d9a3
--- /dev/null
+++ b/sys-apps/nix/nix-2.2.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc s3 sodium"
+
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-db/sqlite
+	dev-libs/editline:0=
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66:0=[context]
+	net-misc/curl
+	sys-libs/libseccomp
+	sys-libs/zlib
+	gc? ( dev-libs/boehm-gc[cxx] )
+	doc? ( dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	s3? ( dev-libs/aws-sdk-cpp )
+	sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.6
+	>=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+	[systemd] # systemctl enable nix-daemon
+	[openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+	\$ nix-channel --update
+[as a user] install nix packages:
+	\$ nix-env -i mc
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+	but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+	nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+	enewgroup nixbld
+	for i in {1..10}; do
+		# we list 'nixbld' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+	done
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+
+	if ! use s3; then
+		# Disable automagic depend: bug #670256
+		export ac_cv_header_aws_s3_S3Client_h=no
+	fi
+	econf \
+		--localstatedir="${EPREFIX}"/nix/var \
+		$(use_enable gc) \
+		"${args[@]}"
+}
+
+src_compile() {
+	local make_vars=(
+		OPTIMIZE=0 # disable hardcoded -O3
+		V=1 # verbose build
+	)
+	emake "${make_vars[@]}"
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	# here we use an eager variant of something that
+	# is lazily done by nix-daemon and root nix-env
+
+	# TODO: will need a tweak for prefix
+	keepdir             /nix/store
+	fowners root:nixbld /nix/store
+	fperms 1775         /nix/store
+
+	keepdir             /nix/var/nix/channel-cache
+	fperms 0777         /nix/var/nix/channel-cache
+
+	keepdir             /nix/var/nix/profiles/per-user
+	fperms 1777         /nix/var/nix/profiles/per-user
+
+	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+	keepdir             /nix/var/nix/gcroots/per-user
+	fperms 1777         /nix/var/nix/gcroots/per-user
+
+	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+	if ! use etc_profile; then
+		rm "${ED}"/etc/profile.d/nix.sh || die
+		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if ! use etc_profile; then
+		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7aedf7d9a05a..4b38db765371 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -6,7 +6,7 @@ DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80a
 DIST openrc-0.40.3.tar.gz 244510 BLAKE2B ed40506693c642358d46fc5fce9b3fbe6e2b699b3e3ed5bbf47ed349e5f7a5c7c1df07a7621622681af33fd68b197d48bfe4aa32e68a8231380de9a01055ced8 SHA512 65dbc5900a22c37af4aab545c52bb7679b4534755bdff0b0e8cba442a3c5fefa0b987caea74cd572dbb791e060116ecc298fd787b9d7efc8eab009b8b44ca3e4
 EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68ed18f499ee305f9e5908703f5b36228932e2b7384301021af330ac2ae5455f5b07cbcd6d5da475c042386b31fd9e SHA512 99ddc25723791ca82cd80c55790da6738b796d9fdd61c804821e3e26e4c8be5d9eeac56a9c689977008ce01f56b49319f0b5f65a5d7a08b318c9f38040553928
 EBUILD openrc-0.38.3-r1.ebuild 9774 BLAKE2B c4b2016a46b278dc7339a19b233d8b449aed6130a4d0f006964d3fc1b37f3ee6aba7b55f716bf38e2cc5fdf37e89929aedc5508708b80f878d2b1c7a9d8fd4da SHA512 f8f2e22af63449fc0220c51fefbe84d43c311e13874158740a09af2aa26c0656f90589e565e98fdf7496e7f68fa089312c76ec8fec14678a614a282a84a89010
-EBUILD openrc-0.38.3.ebuild 9836 BLAKE2B 2538028c1766036d79089965a9402c3fa7a65178aa42d68caa22ae2e1c8962bddb21663867d5f0a245fe274227bf9d9dde925ef385fec9060c5f8bd5e0804585 SHA512 0145fab466fcc7f0d5ec48bae7b7a42b5967215e04c3896a5b4f47735994af966ad99ef19de9b5c8ce33037d851a6edc195ea5466ae2e2a8ec3243c6d292fda2
+EBUILD openrc-0.38.3.ebuild 9835 BLAKE2B 6af429b27930becc7b9b10f73c1641d4a7c7e305aad5d1c5ddfc3c585ce1ab7792bee80b260d46d550289cf2f4758235ae138d73dbf8310a6f71d31cc5b6ef96 SHA512 b3061e6608834a13c30668ab354e4438eb66cc5679fdd6354b7fb037f1820807112ad3d912656cba7273f14160b595a0feedf15bfb16b63bfb7f742bec38668f
 EBUILD openrc-0.40.2.ebuild 9961 BLAKE2B 8d4939143cd8b69ad26101bf1435e2f9113fead51240357e1a7878c50f7aa671f447b419da416dcad1cd501e7504cdec0e117349ca4f7b46b8a1be400791e8ab SHA512 9d665e6a921d4c899e225419a8dbd36aed4d8cea32bc51d6dbff30eec24677ff441351fc0bb98c47c947b396bcd0eaa245b64b47ce82606070d5a829753a8a68
 EBUILD openrc-0.40.3.ebuild 9835 BLAKE2B ee2c443b679b36e0c84fb093a08312972b06c032388087013321a09666dc4c02626ad69105d752323b03e88814639ea8a5a28081eddc6f1da738c7d0855176f1 SHA512 00029676e14e23895f460fecc01b7582ef22498b1b8ba2c3154146d17ec8478015b4a58889ae6de392c1bd1c96e1eb632526ff97e2ea9ece3d6a7e48d0340136
 EBUILD openrc-9999.ebuild 5730 BLAKE2B b515df86409ea8aa860e92579798703e766b4fc24593a7353204ba2b4aa32438a79b9594b598afb3d6dce96c6620f97d0442688b80a023405d1266c3241d9058 SHA512 dcf2ac3a9c4bc5c1c3e028b8e23eec72a817b008af3183906dc51035596524ad53668a094c90661c8cd3bd87fd735a2023ecd48fcf1f87d28f818fa4c4932bd4
diff --git a/sys-apps/openrc/openrc-0.38.3.ebuild b/sys-apps/openrc/openrc-0.38.3.ebuild
index bbca849aa190..36b27b7c1239 100644
--- a/sys-apps/openrc/openrc-0.38.3.ebuild
+++ b/sys-apps/openrc/openrc-0.38.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index dc846cd37873..d861777c69fa 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.9.4.tar.gz 593025 BLAKE2B f7df069a4e2f9c790eb79c7fab74cba447eb5b411f2f2f113269e962154efb06787568be0ed2020a2912d7715cde2b1b0343049233c849735fb8b26da79a8c18 SHA512 c38fb5e4860e9b0442acfa60c431464b69791ffb2e6fe2429ae832c3ca66a54f4d263c031e6f72ae39080dd72b1058d93a5707009c1f9d9d02247b24f6001043
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
-EBUILD pkgcore-0.9.4.ebuild 1431 BLAKE2B 2d851e84a63106f9add0c0748cf2b39a4481698285b050a98ce0419e1c819b6116323936c273014f99f1916543b87cd23bdb18a2fad2ded1f6924787c1a3179f SHA512 fe0cd648df1713c8c442e880677515c9768b26afd19505168f69eb810866fe37cc970c04a6b64240646022c3bebeb09be861ecb5277569203d001f1cc8136da9
 EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5
-EBUILD pkgcore-9999.ebuild 1378 BLAKE2B c09691826d38885886db6d58bf5bd27b1e88eaddd2aca495c389ad3a29eebefbd991a297bb932d3532468e36fc81d7be124d72f2ca8586a17b11da95a350ff87 SHA512 20e37e0e2c79b181f7f2f591468df50bf52c96041048af142ef27ae15d76c20e5448c829d104066fc54ef595261ac76fc97667e3334be5518fc8ea715fd38132
+EBUILD pkgcore-9999.ebuild 1498 BLAKE2B 339396606f12de41e0f85965c9ecc73cef2b723b63888dd972e109feabaee5307b35eef503efc9a4de63c6d2d8aab4fb91fb526dff4577b6af1ebbdaa5b3e53a SHA512 402a372ad4cfe4d9eb7d06c074fe200dbd61bb138e1749212d49d02848ee475e0fb1c6711a238a0c5647457c4bb4611110b4d94ef5909f6ab274533d4e93bbc3
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.9.4.ebuild b/sys-apps/pkgcore/pkgcore-0.9.4.ebuild
deleted file mode 100644
index 9d7becddcc56..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.9.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-IUSE="doc test"
-
-if [[ ${PV} == *9999 ]] ; then
-	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
-	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
-RDEPEND=">=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	${SPHINX}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man $(usex doc "build_docs" "")
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install install_man \
-		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 28296ac77537..34a210caba47 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -21,25 +21,24 @@ LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 IUSE="doc test"
 
-if [[ ${PV} == *9999 ]] ; then
-	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
-	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND+=" >=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
-	${SPHINX}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
 python_compile_all() {
-	esetup.py build_man $(usex doc "build_docs" "")
+	local esetup_args=( $(usex doc "--enable-html-docs" "") )
+	# only build man pages for live ebuilds if doc USE flag is enabled
+	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
+	esetup.py build "${esetup_args[@]}"
 }
 
 python_test() {
@@ -47,8 +46,9 @@ python_test() {
 }
 
 python_install_all() {
-	distutils-r1_python_install install_man \
-		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
 	distutils-r1_python_install_all
 }
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0c5a10929cc8..fce686022ece 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,15 +5,15 @@ DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b05
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
 DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
-DIST portage-2.3.52.tar.bz2 1014660 BLAKE2B 22fab75c4c9a12752bbdea960c9d4f583c3add4896ed94eea5e5e9ea03fd9838545f9c0075f279d81ac9ae0cfeca09fe44d18eac89f29c95d2be99a822da8446 SHA512 cd9fc6dc6f4d52886c41dd48694f290f30462111709a61a9814d5ae02519a0dd31d8fc5305c767e2a3b78d7b7d0cc8ab4c1d4273e95baec7b6d405bd9fb3f548
-DIST portage-2.3.53.tar.bz2 1015067 BLAKE2B 28083d6a17a1dec4a978f54b71931b870b28036a2e3a2b2d87d542b9129677d956ff7da34b0d9e4e8e82414606aef60a288768363d09fda998d567cddc0634a4 SHA512 b0cfa5c5fe4b5cb78144137b88cd4d1d84cdbb6c976e39ed4b7cdca106806831b3526797e295666de0be5db368c553c68e49f9ec0d6cc3796e5cf7761eb6bf43
+DIST portage-2.3.54.tar.bz2 1015477 BLAKE2B e9adfe59d09b4c7f7509364ada1bfb22d3e6d466d24ae47f6ec9eb9edf2147dad091815b323970b7a6cbf6c42c51a111252bb047862f6863b437d3b6e400ac0b SHA512 8e12e904915232321669789d21f88e9750488d0cd49ec31de6378d3d372a1a463325351a0c4fed2c80cfecf0f43112e9a03e90b84dcc1dba9bb6813c37e22c72
+DIST portage-2.3.55.tar.bz2 1015755 BLAKE2B c6144d732a6eca9006512b8b647287b2dc72b453c67a9d46f0489736d5dbfe644f5527c29d6d0d3d2af077a181e6645624a310dd39ddc8bdb3629ef1b68b2cbe SHA512 6937f9ca266291fef82ecd9ca25e78dd7bf25dfa65392013f905d59d850d6ea3c3cc00e991db0058ffb5ce27d7de3ece4dc01143cf19143cacf04404341df6a4
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
 EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
 EBUILD portage-2.3.51-r1.ebuild 8934 BLAKE2B 4929d861ef8569848abb8eb79f3326cb23d8ff66eef7895fc1e0cbeb69f0310f97b0b3094610f1d97919c09ecca077273671b5879b3bbbce807ccc7b52b643d4 SHA512 cb55dbc52d5b7af35083e60c83a7085458686ff03f03d8d1f5d03e42c4437bf8c14de026cd11ede70389d0c039320c08fcf901175b40413e09c01a0cd46c43f9
-EBUILD portage-2.3.52-r1.ebuild 8937 BLAKE2B 2927738fccc3a4f5e4d0582ae40326e56611dac77a06cb8044bd8d39c6753bf81d80e999292f0230d9bf7500bdf18123336eca2bf7fda55a695ed38eee3b0cc5 SHA512 ca41b60eb9446323dc6b8688f3134aebb4d1f939c4990b070d2cd7411749153ed3d4d5f31903ed229d1147fca2ab21bc1ba91c630811837398efa436dd1ab942
-EBUILD portage-2.3.53-r1.ebuild 8915 BLAKE2B a67f6528ee2bd6a83998aa66a035f7bdd3f7ac5eb622ac347d7cccc8c71308e23de4ac78bdd735de8a2f0aba0520e6b7ece7d082a0fc7d231d3b0c8d08a35ee1 SHA512 2bdd943e7f2882fab515ccf4dfa227565e4ea2a26a391f21249dbe9d0f4f6d2add926bd8b5ffecd534498a5a1265ae54b43357c13f61b16f53987b08ed7b8a20
+EBUILD portage-2.3.54-r1.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
+EBUILD portage-2.3.55.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
-EBUILD portage-9999.ebuild 8647 BLAKE2B e8bea5ba0ecaea0c2623e7d46cacc298003c241dc2a80fc68049a0bb63eefa5473b7194712add7dd8469f34c54a857449a29f141c7e70ca4ef84693a2c7d3873 SHA512 7085308a11d9c0d3b9614c3aaed40e9a1e459cb031bac7f20769149b645b86ed8ca000c7b3a3b9d9616d02ad6c369525253155289b2238fb2d494cb175f91ebd
+EBUILD portage-9999.ebuild 8686 BLAKE2B 828f8099e038313c4bbf4a17361f1ef42d71c288f8973f59ae18adad176473ff32e869749d48793a5e6e0ae7e139b8560ad06b508718a73d68081520e57ee3ca SHA512 17a3682b8e897219bb29b6ecbc39d2ce53bf7c949ad0ae6faf36f948730bbc25818f59e23622802f09b078f61bb85814dd3ec1c588fef99bd87d057bab129fc9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.52-r1.ebuild b/sys-apps/portage/portage-2.3.52-r1.ebuild
deleted file mode 100644
index aaf1fd8969f3..000000000000
--- a/sys-apps/portage/portage-2.3.52-r1.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	epatch "${DISTDIR}/portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.53-r1.ebuild b/sys-apps/portage/portage-2.3.53-r1.ebuild
deleted file mode 100644
index 749f0d8ed97c..000000000000
--- a/sys-apps/portage/portage-2.3.53-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Bug 673900 - FEATURES that require unshare may fail
-	# ungracefully if unshare support is somehow broken.
-	sed -e 's: ipc-sandbox::' \
-		-e 's:network-sandbox ::' \
-		-e 's: pid-sandbox::' \
-		-i cnf/make.globals || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.54-r1.ebuild b/sys-apps/portage/portage-2.3.54-r1.ebuild
new file mode 100644
index 000000000000..4bf3a6b2dedf
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.54-r1.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 epatch linux-info systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/portage/portage-2.3.55.ebuild b/sys-apps/portage/portage-2.3.55.ebuild
new file mode 100644
index 000000000000..4bf3a6b2dedf
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.55.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 epatch linux-info systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i lib/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index a483b5524449..42273cc4fdd3 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,7 @@ RDEPEND="
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 5fab615fcbc8..32ecd4387c49 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -84,5 +84,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD ripgrep-0.10.0-r1.ebuild 2941 BLAKE2B bc5e83e58efdadd420492f75bbc1e28605522a56ba6cb063d3f4c9662ca0ed637c9b8387af8a67ba9956e0462a37cb006ac02a8dd9b14c4fa28b855b7bf84141 SHA512 dc0f82b95e98969f6b909b8395baddfa9c94d32b45b35f82e103652e677f11921170d4a8f23fa3bb64fccb9b87733a72951cabb2db286c2de18598639e8a42f7
+EBUILD ripgrep-0.10.0-r1.ebuild 2686 BLAKE2B 7cff043b4373e613590c097862603c36144a70de30aa96d79eb98c2917cd3da875b999461bf03b4ba403a43fa8e19d2406ec6c99ada2e364d0eedff3b4c69e09 SHA512 b5d2f7284248626d2eab0f9124db37d20127ad7b045fa9fd20b8ac7606e88bae136e3cd8fff3e5470261dbc909f3cf6309d94ed1bf33f2d92519a32910ce3da3
 MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
diff --git a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
index f5c384a3c895..f7eda9ddd13b 100644
--- a/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -116,25 +116,16 @@ src_test() {
 }
 
 src_compile() {
-	export CARGO_HOME="${ECARGO_HOME}"
-	cargo build -j $(makeopts_jobs) \
-		$(usex debug "" --release) \
-		$(usex pcre "--features pcre2" "") \
-		|| die "cargo build failed"
+	cargo_src_compile $(usex pcre "--features pcre2" "")
 }
 
 src_install() {
-	cargo install -j $(makeopts_jobs) --root="${D}/usr" \
-		$(usex debug --debug "") \
-		$(usex pcre "--features pcre2" "") \
-		|| die "cargo install failed"
-
-	rm -f "${D}/usr/.crates.toml" || die
+	cargo_src_install $(usex pcre "--features pcre2" "")
 
 	# hack to find/install generated files
 	# stamp file can be present in multiple dirs if we build additional features
 	# so grab fist match only
-	local BUILD_DIR=$(dirname $(find target/release -name ripgrep-stamp -print -quit))
+	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
 
 	if use man ; then
 	    doman "${BUILD_DIR}"/rg.1
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 13d40ace407b..4dc0c5eea309 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,7 +2,9 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d11797699418aebf3014e11f3ec2b69a1c4b4e22ce96c28b1df022617cab6787cfe61f84b37ed61e966ac425eae1c7eb SHA512 b84584cffc54678646798bc58d8b60cdc10a0a58c9f1a49276dcac205a06dd7a2e664d2a9c40c78b48eae8ac36e3ac498ba35674f10e6e06c3c2bab777e05ced
+DIST sandbox-2.15.tar.xz 426948 BLAKE2B e40bb728192ef3793a9129bc88a63878516b0977a19effd5b02ded644ec6fe1627fab34786b22024957d96725fc5c53f488f7b09119be7b7ca91692dcee985dc SHA512 7249b594864267311ce8e2c04275df49c6d8e8e811dde5780f7f676cb43928728b9abed77beb8f5ee32061efcdb03753cce44d5bf1827bd519d6be8fa54912e6
 EBUILD sandbox-2.12.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
 EBUILD sandbox-2.13.ebuild 1915 BLAKE2B c3ff81ed2f60d90782e2309b4627ffc4d60012f65b719edd0e682ca420511a65cbb309c9af77313a8e205c80142deff0a1aa461c43803fb4807ae1109d49d157 SHA512 73296f3050de852ede31fbde96cca0ea5a2cef5b841b2056fa7d4a9479e35c30d99e26c9003f736ef22f5cc0641c050c8fd7d66f83f0830f329cbd328bbcf94f
 EBUILD sandbox-2.14.ebuild 1928 BLAKE2B 3590f0ddd9b321c2b26793193f43a547094786ae36d7f45f1702518a0d0b7bfd414e94cbfcfb12026850e1007a32f1d6e6ec23b7e4999da7609c260b69729a47 SHA512 23d24e60bd14fbabe382d9f9b20b2fb7d7c4e963ba367a8b2df3c9fe2c8bc3a21581fbacc775675457073c4935319a50ac14879d07918eb0a9f7306d0c2be970
+EBUILD sandbox-2.15.ebuild 1925 BLAKE2B 896c0829ec7c6fdacc8129c41ae1d8b7c5327e2d66f164f9e47e5aca495e1c0db6b871e53a6096d7e0196e111efa5bc66002db179f52f249f604c422dda874b5 SHA512 7cf36c917c3a27399b5ad0e1095f95f11d93f0949471fca155cf7644ed36e35d9d39cb79834633bcda69de925d34155af1b3e7554c0a4135ca7a11772e074232
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.15.ebuild b/sys-apps/sandbox/sandbox-2.15.ebuild
new file mode 100644
index 000000000000..d6d88dc09585
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.15.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib-minimal multiprocessing pax-utils
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	local myconf=()
+	host-is-pax && myconf+=( --disable-pch ) #301299 #425524 #572092
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${ED}"/var/log/sandbox
+	chmod 0770 "${ED}"/var/log/sandbox
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+			if [[ -n ${old} ]] ; then
+				elog "Removing old sandbox libraries for you:"
+				find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			chmod 0755 "${EROOT}"/etc/sandbox.d #265376
+		fi
+	done
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0511a453b0c9..233f6a4664de 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,10 +6,14 @@ AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e336403200580
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-239-patches-1.tar.gz 20639 BLAKE2B 9b03367becdef20d16056cdbbeaaefd9f10bf6c56528ad1a738684ab08d99a464411c23aea32d47307b0399f092107069d09ad42fb07217f8eca520cc4010b84 SHA512 757c7fc8f60ccf99d2803128a8c4d8b924093b150384569c5ffb3bc39f06728e99b18e2f77ff0f1c16bbd45bc75cbb0f385dac0135443d70c7dcd9cc1e84a490
+DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
-DIST systemd-240-patches-0.tar.gz 2925 BLAKE2B 167ddaddfbe0726b9a64a95ec601495599d7aff052cbad96b80ac16ddfed72f320ba3c5c602e2f79b0cd9aea1d58ea256249a080e0999787a2c183e0bcc0869d SHA512 6b948d17f3a037ef1a291f5df766dc095c4498d5742374e08daa9b534b9b979a07876e41bb7db2ce257ff12b3b97fe1927a11d0f1a79c57f96300a5a8413d2eb
+DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313
+DIST systemd-240-patches-2.tar.gz 28099 BLAKE2B 2e497ed729e2482ef3cc0d010504314f2982a9af19341d6f4efa06b24b3c01f9f69996d43e5b484c641777d00a8a0ba4508bcf6a0296a63d4fc57440f2d3708c SHA512 1be0432d918a4866056ffc65de6e8b412784e5018490c0349a98bba801536d2689c5b2ce41ddd5adbb945aac71bfd0168f94c1daf0788661cd83b159a8c975b8
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
 EBUILD systemd-239-r2.ebuild 13285 BLAKE2B 441348e52b56c2124c16377fbe11b639c80b4469e87a0b59d9ef02ee19594eb3652d7868e27a1ab94e76c0f5a66305642bc4e579eb1777ebfa731f6049400280 SHA512 1bd64fd100439fdf1e7beb5dfb55c24aa03cffa7cacf453f65e0f8c450ec5c911e7cc8115d82b6d0df48f7b8cff570563c261f097fde559d703fc24c09fbe9a4
-EBUILD systemd-240-r1.ebuild 13371 BLAKE2B ce40e1464a837bd04ad82ab93cdd3ce502e4b4bddee4305a2e6f476adbd4c56695f0813e8497e1c06752ab8a800a56e2dcf0abe7ed3d8ee0e35468bbb5aaea0b SHA512 8e60376770a5d6caaab0397cedf7e841a1a131fc7a2182cd54a8793aac619de8b3df71cc398aad1bae453a37eaa885b36f43f3cddcdee1724877ff7164cd0112
+EBUILD systemd-239-r3.ebuild 13291 BLAKE2B ff420b4143a3de3ab1a9303a4a473fbab76df0a55fbc96378b3662f7cbbdca692707e98784435e14dba1926ee7849375f300457c98bbd3c9ea339e93e780d4be SHA512 cde56777a71bf3fc9cb36928d006986fed98a4d0f31d6c8c81f52441db7e60c863d66b9d0ced6a1fbc8b2a4d7c13cfc0f7f22d6c51fb4830febd2f8095a331f1
+EBUILD systemd-240-r2.ebuild 13371 BLAKE2B abf95e472a48e5ea797d71fb8ee881476b5ae90a93fea800c05fa0b870668bdc833f2efd1fc910c3822ad85d5c6a29fbb8073e63518d5212c616977976321193 SHA512 5a1fccc2bfcce635bc4a9c726720366e9616cf0e4c685dcff77da598938b13e399118620d21ba590d4803b5956ae271bc9c397daff2340283483728247f21dd6
+EBUILD systemd-240-r3.ebuild 13371 BLAKE2B 1a331b96eb22fc07804cfabb39f47c5ec359ddc512f4c178338e3db8782f1ff808875a5790e04ee6f543a4bbe8db3ab64464535a2367ce8167be3e95e0fc5a14 SHA512 115410f96590b90726fdb52dcaac7b5200300c81bcce486e73b01a2b0d0d73885d6928196d39eb3f06d60049508ee9a6ec727b36daba39d9f9c04de0504806a4
 EBUILD systemd-9999.ebuild 13310 BLAKE2B c295b6142d4174d8869fa2f0297beceb266fe0a1185f81455e57ed13dc88c49725c06a534f28e83f2e796c40083bd65d42fd7545e952d168da26aa817f3b89c2 SHA512 56d61973e251ef23e83cf769f2716f0511d9627624267a91ab702af1e1610759f1f7aa286ed86f41b328a15857ac99b764739a65e6d4afe807fe580c09d7cf7c
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/systemd-239-r3.ebuild b/sys-apps/systemd/systemd-239-r3.ebuild
new file mode 100644
index 000000000000..4f86846776a1
--- /dev/null
+++ b/sys-apps/systemd/systemd-239-r3.ebuild
@@ -0,0 +1,448 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}/${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}"/239-debug-extra.patch
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED%/}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-240-r1.ebuild b/sys-apps/systemd/systemd-240-r1.ebuild
deleted file mode 100644
index 3a30b4ebf875..000000000000
--- a/sys-apps/systemd/systemd-240-r1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}/${P}.tar.gz
-		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup render
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-240-r2.ebuild b/sys-apps/systemd/systemd-240-r2.ebuild
new file mode 100644
index 000000000000..6fa2f40e16bc
--- /dev/null
+++ b/sys-apps/systemd/systemd-240-r2.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}/${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-240-r3.ebuild b/sys-apps/systemd/systemd-240-r3.ebuild
new file mode 100644
index 000000000000..2dda532141b7
--- /dev/null
+++ b/sys-apps/systemd/systemd-240-r3.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}/${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index 04d51e7ec34c..6820e9cdb449 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -1,5 +1,5 @@
 AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
 AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.3.ebuild 975 BLAKE2B a9cfa6e4fef55f39ca1ffc67857f1fc0acf8ff41c001881a86fa347e91306f5ef533a9352fc4de08a4b494c926c77d9f4b52012a648b5f82894c66b3994920c4 SHA512 483a2d78bfbcfee64f43668af9c1072c90cc8d072b5fdb404dd3429aaff7425c0a4d249aa8412ff394184b24b4ce9a8188b28a30c8938f965d08b9b6e68bcd7d
-MISC metadata.xml 274 BLAKE2B d51bf5510ddf8970e76b90692ad94c469cb31da3aa6b9c76b3de4a6d3643290443ad601307f63b809b7d386c7293ada0be699570b4035f80f74bfbcce58f45b4 SHA512 22599f724e804e72e8db6fcab11ee7495bb5cd3c3a6e25a6424c33bc0ba343859cb88664ecfccb9805c3f35128342aba446f1145edfee5b0a39a92f20a48ad81
+EBUILD timer_entropyd-0.3.ebuild 977 BLAKE2B e83c7c713ff80acc198e864cfcceb41d81cac8b6dc08eefaa923a78c34025dd71e39d7a7d032d134431ea1cc38ae952bc539864fd996151d427dc35025d2efa1 SHA512 a83aa2cfb589c04f2903844a9c4bd2f5fe735e23bd4f8d9db8797c8f698f521b9d634f1007a1f59c88aa39cb6db933e3ce0cafeccb9c0dd63cd1d840264e799e
+MISC metadata.xml 359 BLAKE2B 1e5b2d1f60ba4e6380b3411f9ef4b0bbd0dcdf4a078bd4624a6359aec49304691b3c03d2c214f5661f75af82d02460ead441e117fac1dedfa8890977ec2411b1 SHA512 7f1472a20512fa60f4d81005efc7ef659176109e7b19c17db63ee4dead3e4c5a03c8e8b1ad1bca2124cf94776e6a41fccfbc4c15e42b6ad42591a9210602624e
diff --git a/sys-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
index 1173ca1a509c..748ac538a47e 100644
--- a/sys-apps/timer_entropyd/metadata.xml
+++ b/sys-apps/timer_entropyd/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="debug">Enable printf debugging and logging to the syslog at DEBUG level</flag>
 	</use>
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index 9a5835c0363b..1509f4f394e7 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE="debug selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index d9f1bdc9474a..7e5070dcfa46 100644
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -1,6 +1,7 @@
-AUX usermode-utilities-20070815-headers.patch 551 BLAKE2B 05c10158ae6ada8b0cf91b5825463bedbc0686c753c3898d68de1b0f8d712c2777dec6ad8677205989dd9cef7e47f2b9b23bba1ab96ae6b7714c650988ba2d49 SHA512 b22bf1d77b209996c24b400b3c27d37cef1fe8deddb07391394f5307fa5f0c41e36f78e5c09c6a40bc6618e7801220bdb139ef413fb712d68d73e54ed201a101
+AUX usermode-utilities-20070815-headers.patch 491 BLAKE2B 0c4e274101ada3c084cd6573247259c54d58c92e680a2a7a14f914e935e90bc6563631ec8d3ef3a7b417ce44dddbbe20a269f1beaa6896e3d53608fb07b13c24 SHA512 962d7df2497374ec418861522fc7b6be25b295bed11fbf86bdf149e7e6730e2a1f34475eef9b8216ad2576eabe7f56e230a912b3ca415da3e1e5adc3ebce769b
 AUX usermode-utilities-20070815-humfsify-owner.patch 460 BLAKE2B 5135621f69d9f923021059606c9faf1089ad7ee3273224a40ad570e233664dd781c633f7af61e41cacd2bdda298e23a79e04ec71a38875c95f9649a886d0b93e SHA512 f048d1fde80a5fae33a67c99aad5927f64343a1bec15cdab94bb5c8798b96192fccedda66a9aa8f14fb90de803cba031ddec4d9bc6eec236b8245aaa7b74115f
 AUX usermode-utilities-20070815-rollup.patch 4619 BLAKE2B d8701507d464fa10ebb99663dbf32c1d57040059bf7f43fcbcef82637d98d51ca55cd4fb28c7d7feb79c9b1597f4aa7ac01e7494e1db5549f75445ef9ba7854b SHA512 9cfc5a2fa98b7aff45c732629812ab691d3a56e5526f70d9ddb93dd666b9bf743296914f63043a94611e045915ed8046c87507a451deebc3d889d0827dc76439
 DIST uml_utilities_20070815.tar.bz2 50159 BLAKE2B d11e7bc92892f2f5bc655bf580d66b1364d2c1f8e97e85ff39a6aeb85ed979c33c1d7c084b0a5e442df5622f7fa657677a322748e44c7ecf67f14d6b39a7536c SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a
 EBUILD usermode-utilities-20070815-r3.ebuild 1269 BLAKE2B 916b02adfab8a141c1b6cf402df5d5356f207dafa2087b14e95595a8d1fad7e91681ce1b6290c97c70c04e9b9f0280bebbd20097568d6b28fe3260a7541d1924 SHA512 21db6e3680315826e40397c9f9703de051ccd6db856afd48093ce5fa7a31d730e32030bcd9385c641830f9a07497cc638f4f1dd131333c9af926cdd726c9330f
+EBUILD usermode-utilities-20070815-r4.ebuild 1275 BLAKE2B dc9df93b62c5bdfec21afe7b204aa09d89e064bb126f930e43868aafca27779dc676a574df40d550f209614e8ac4ae744565871a3a179b750b332d508d59ffa9 SHA512 e24b1df034c6ca6e38be371949107a45d01391c5906ae86aae9011336b4a524393aea6dfd6c84b5d8dd66f8c6c7d25848fdf36c8f7e975a6ed19deeda30f0d54
 MISC metadata.xml 340 BLAKE2B 8e392fbd4b9aea114ed7bd1d7cd15ced02e48b2cffced6a23700ceea02f645e7fef352e54f3a3a324536e2686de3324973a648858202e6cc310e633b1e155e42 SHA512 cd72a8e80c3b9410363e3e9d3ddb194f858138598e3fd0375b38ab43d4ce82d29309aba07b71c3d2756e871168fbf1c8bb3f3ba87c00d0b27f1f3add2627734d
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
index 13fd556ec98d..00531a1db2bf 100644
--- a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
@@ -2,8 +2,8 @@ https://bugs.gentoo.org/580816
 
 include headers needed by targets
 
---- b/tools-20070815/uml_net/ethertap.c
-+++ a/tools-20070815/uml_net/ethertap.c
+--- b/uml_net/ethertap.c
++++ a/uml_net/ethertap.c
 @@ -13,6 +13,7 @@
  #include <sys/stat.h>
  #include <sys/ioctl.h>
@@ -15,8 +15,8 @@ include headers needed by targets
 
 for major/minor macros
 
---- b/tools-20070815/uml_net/host.c
-+++ a/tools-20070815/uml_net/host.c
+--- b/uml_net/host.c
++++ a/uml_net/host.c
 @@ -10,6 +10,7 @@
  #include <ctype.h>
  #include <sys/wait.h>
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
new file mode 100644
index 000000000000..04ceb9e3621c
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="fuse"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0= )
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+src_prepare() {
+	default
+
+	# Merge previous patches with fix for bug #331099
+	eapply "${FILESDIR}"/${P}-rollup.patch
+	# Fix owner of humfsify; bug #364531
+	eapply "${FILESDIR}"/${P}-humfsify-owner.patch
+	eapply "${FILESDIR}"/${P}-headers.patch #580816
+
+	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+	if ! use fuse; then
+		einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+		sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 55309fe4c4cb..d8766a4260da 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -5,8 +5,10 @@ AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
+DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
-EBUILD util-linux-2.33-r1.ebuild 8374 BLAKE2B 9fab1930d659d8d316850ba22dad6605527e131deeaa7b67e2d26c80cacdd87672fe8262d59bd702bb25500b4d39fb47a998a2115b6149efaa74bbbad0cf4d83 SHA512 62bc58d124d9ec59cc61ee7c927c4421a57db66a21defe8ecf1584ce9360a177895d5f03b3419ce656fcfa2fd4088159b3c605cd0b08f07649c63d93b4486636
+EBUILD util-linux-2.33-r1.ebuild 8371 BLAKE2B f2c5a6efd1930bd4e0290e84e6390751a6c427f2bfe963fc1b41ae98a54c6f303f136e730f533804ce7b9deda77a3dd01ef25d054b7f78c5b86fb2629a6fc263 SHA512 a2602b02471ae9cbad0e545e4df17d4911e0a8a89314d405be7a6d376f2c58f3dbac5373e5558657f3979f5c302e23569f2878d8fb2113f44b151214c5d38529
+EBUILD util-linux-2.33.1.ebuild 8240 BLAKE2B 5809b713cac06b5b13c9269851327dfef2122789f26059e2ee6980c7cfb9153a2647107264d804a7959fc0b5b10bdab5711e97027a821bf2c7939103d734ac4b SHA512 d17d2959f137216ee08b55e8aab293b4c97be8cd228732b0fb8b70ed0fe9fe11b72594e5f5c9232a22889c950cabe36a562605921426ac96905c9918fe67bfa5
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
index e67aad6d454c..930f1b8dc20f 100644
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and others
+# Copyright 1999-2019 Gentoo Authors and others
 # Copyright 2018 Sony Interactive Entertainment Inc.
 # Distributed under the terms of the GNU General Public License v2
 
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://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-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild
new file mode 100644
index 000000000000..a671878bc149
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2019 Gentoo Authors and others
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://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-fbsd ~amd64-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/ https://github.com/karelzak/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 userland_GNU"
+
+# 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?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	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"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	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
+}
+
+python_configure() {
+	local myeconfargs=(
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+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=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(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 nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(use_with ncurses tinfo)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	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 userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+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 7dc013a0d7dd..9816acc9e29a 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
index b69b1745e309..47f019690950 100644
--- a/sys-auth/authenticator/Manifest
+++ b/sys-auth/authenticator/Manifest
@@ -1,5 +1,9 @@
+AUX authenticator-0.2.4-disable-failing-tests.patch 423 BLAKE2B 02ca693fec700649cc0103f3de458c04e711b42eb4c0207a3c8dfcb747c565bf0afe1e673e8cb689ee568a9c5440d706514c5ea758e8a596687e5b7df336c206 SHA512 6406f5cb916f49abf909dabdd7df2b0096b1b4b300c2e0b8c1097155c1c52e6b54ce9e7ef526829e8e07e00ca8c52a6b30944c65bce37893c91ffab9cb6cae19
+AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709f75b2d3cadddbb558938d8ef08d09b6d20f9008f513a44940f3b5847da784c52d382ab058ab91be084e98c1ba63ef450b41aa743a330b920e54cdec327a SHA512 0da21566e5913e99f78c6a7608a7b4a2da568c494dc7515d3d05993ddb8b611b607ef166d57be4ec949ca377848f474614d155068d2550ad6e7220ca46b5264a
 AUX disable-failing-tests.patch 784 BLAKE2B 67367ef35234046a2fdedd8d82c0c2037ecbe8005e9972d05c9654645225f42d23a4fbe0b819daa6fdf219d4852284fc068d24227a89bd4afc4c15e4792c2d8d SHA512 226bce7609fedf6cf9a3459d5945f0ca31004df595fd6717781dce142bd53f5c552821031b3de516964a97abc91efaadf902b943aa0a149ed3603ae26aa0355e
 DIST authenticator-0.2.1.tar.gz 147693 BLAKE2B b9f3a7fd5b3b7867120b9ed17b90cea4c07a271dc4d75a845ad539e15453a606d48e8637d44d12cecf9b91e5fb351d081c1add48c1a4a955444f39addd51b075 SHA512 aebf3ce147d5ccd404de6af52e130e9a85a3d5d86140d73026dac00219853652e7aa1e67db5838f9ac4d147021cd07b3ebfb86a1ab4b413ec3b98360097d1d6e
+DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2
 EBUILD authenticator-0.2.1.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb
-EBUILD authenticator-9999.ebuild 1133 BLAKE2B 3dd8465ce850e81a2994472b4d73530a5e3982dde4899a776902bf30b733bea0d8036e441ecc11a19ce3cac2cbfb9d95746c165397ca84695aba50461c946ff0 SHA512 affef8c5c3dfa2890373cdc5cc9a3c9639db9e7a5e70487469c6b809ab64eb775516450cfd6e759e8aa24fe7e98bf4f06d41b24e580b8b2ea61ec5b8e0a50ceb
-MISC metadata.xml 615 BLAKE2B 6e7f20b374a19cf14cfaa2df3ffcc4f98df79bcdb2c2bd128482dbb9a44d118295b8ac76dd668c4675aa900ac24fc0d38115967ff73cbaa4b4771e62ca0434ac SHA512 9e6e905369b669cf8e2d337db0ea84f600bd874ca24d3624fd3a37a08ac5d132ca0f9b12bb1c80105fdc46a8a15bc85d4af2bd0681b128109de92536d83bd2e7
+EBUILD authenticator-0.2.4.ebuild 1601 BLAKE2B ed10f51da09d362100ba24c3e763d85ccad4b822ab42715d8b2511283723aaee8a24f027f1010dabc7ff7058e117cfb1f87248187417b5f29f1ad2f9894d75c6 SHA512 983334596bfe7bd96667f3c5cd6fac68fae3aca25d7f1b8e1ea1f43359848f1a60d78d84259651052299eb7572c2391e18cba34fc49a2224df349445e37a369f
+EBUILD authenticator-9999.ebuild 1482 BLAKE2B 4c8ac81940894d8631c7ad879507093d97ba79c91f39b8653fea95b4b7438b4ea354f1348a0b190353b07144d2d8f35c019ca58f152e22ab95a6b7a8cbf498ca SHA512 8d790a3fe41b4341fadd5bd2b2314fd9a23cb5e9476fc8b3bc212aba79a744b163ea5b0c3c79f972936775e0f7e0de4f95dd63b6281f1123bf26b691c53bf094
+MISC metadata.xml 544 BLAKE2B fe9f1a1bba9cdf6c48644f526d9b2309773735143467192a007fe8e63e97480aff2bcbf04d442ab9bb61792386b6610a6fe874a52db5dd6dea9f51d0c174ee4b SHA512 112fb3e1bd3a559a4f6f29ae800365a77a5298aa572f089b7d52553851ba85603387c1b09d8a86ce039080520ed6fe473f953c345b6fe553d3ec415a3e6bbfb7
diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4.ebuild
new file mode 100644
index 000000000000..f3d4d2cdf2b4
--- /dev/null
+++ b/sys-auth/authenticator/authenticator-0.2.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RDEPEND="
+	${PYTHON_DEPS}
+	app-crypt/libsecret
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
+	dev-python/pyzbar[${PYTHON_USEDEP}]
+	media-libs/gd
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	test? ( x11-apps/xhost )"
+PATCHES=(
+	"${FILESDIR}/${P}-disable-failing-tests.patch"
+	"${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
+
+	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
index f11556202d24..5d876f945946 100644
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ b/sys-auth/authenticator/authenticator-9999.ebuild
@@ -1,44 +1,60 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
-inherit gnome2-utils meson python-r1 virtualx xdg-utils
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://github.com/bilelmoussaoui/Authenticator"
+HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
-	SRC_URI="https://github.com/bilelmoussaoui/Authenticator/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Authenticator-${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-
-DEPEND="
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RDEPEND="
+	${PYTHON_DEPS}
 	app-crypt/libsecret
 	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyotp[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
 	dev-python/pyzbar[${PYTHON_USEDEP}]
-	media-gfx/gnome-screenshot
+	media-libs/gd
 	x11-libs/gtk+:3
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( x11-apps/xhost )"
+
+src_prepare() {
+	default
 
-PATCHES=( "${FILESDIR}/disable-failing-tests.patch" )
+	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
+
+	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
+}
 
 pkg_preinst() {
 	gnome2_icon_savelist
 	gnome2_schemas_savelist
 }
 
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 	gnome2_schemas_update
@@ -48,8 +64,3 @@ pkg_postrm() {
 	gnome2_icon_cache_update
 	gnome2_schemas_update
 }
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
new file mode 100644
index 000000000000..38b4b95464ad
--- /dev/null
+++ b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
@@ -0,0 +1,16 @@
+diff --git a/data/meson.build b/data/meson.build
+index b646c11..884c5d0 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -50,10 +50,3 @@ endif
+ 
+ appstreamcli = find_program('appstream-util', required:false)
+ 
+-if appstreamcli.found()
+-  test (
+-    'Validate appdata file',
+-    appstreamcli,
+-    args: ['validate-relax', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
+-  )
+-endif
+
diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
new file mode 100644
index 000000000000..ffbde3cf2f09
--- /dev/null
+++ b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
@@ -0,0 +1,23 @@
+diff --git a/meson.build b/meson.build
+index ed9c48e..6b20bf0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,16 +35,7 @@ SERVICES_DIR = join_paths(get_option('datadir'), 'dbus-1', 'services')
+ SEARCH_PROVIDER_DIR = join_paths(get_option('datadir'), 'gnome-shell', 'search-providers')
+ LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
+ 
+-subproject('libgd',
+-  default_options: [
+-    'with-introspection=true',
+-    'with-notification=true',
+-    'static=false',
+-    'pkgdatadir=' + DATA_DIR,
+-    'pkglibdir=' + LIB_DIR
+-  ]
+-)
+-
++libgd_dep = dependency('gdlib', required : true)
+ 
+ 
+ # Configuration params
+
diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
index 3950af1a3351..e1df662ac76a 100644
--- a/sys-auth/authenticator/metadata.xml
+++ b/sys-auth/authenticator/metadata.xml
@@ -10,10 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">bilelmoussaoui/Authenticator</remote-id>
 		<maintainer>
 			<name>Bilal Elmoussaoui</name>
 		</maintainer>
-		<bugs-to>https://github.com/bilelmoussaoui/Authenticator/issues</bugs-to>
+		<bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest
index 539883459345..687ca765bfe1 100644
--- a/sys-auth/fprintd/Manifest
+++ b/sys-auth/fprintd/Manifest
@@ -1,7 +1,7 @@
 DIST fprintd-0.5.0.tar.bz2 66981 BLAKE2B 02ae16bbeaab55559a44ef43999941fd2076ef610adc92184601963ab3edc4bae41abfce0540d4ac0e0717b8542f0b0684af2616684856b0e71f3e58b1834d6a SHA512 d77adb92e6913c8822e2c866ed632f5d1429c93e8e7c4c7d51d23385f6afb0c6048ff72c9cb885d7581e8d1e461f708af06ca6e6f98e177c98834289a76341de
-DIST fprintd-0.5.1.tar.bz2 67286 BLAKE2B fa6e1aa55021d44bff14cc48029eefda2ed18a3935aed1393e9de7b13ac3f5818883faa3d09ce055badb2fd2a977facafbd7eb7226413a6fad3677ea86c68eb8 SHA512 3c57f4723157b0ea628ded83ec1034818059811d984f21a2ad9262ec03343adcb50ff8f7982fd0b35564bfd9c5bd55ebcee2416353d5f0b5817b376faa43d05d
 DIST fprintd-0.6.0.tar.bz2 67589 BLAKE2B e1828d183ee2b34c6637ab148ec3d8c562c06b370a5102bcdd72481e19ce1c12d03bf374404e5f508dd755ea12a3aaa3509431a4584f44b667285d00a5872406 SHA512 65e0af9e46b2f4e836c54cd1df2deba33d12228c4997fc5bb44b03ccd38c01fc01a48451faba821a8490ff7715721d8697e1e97a93bab5041b4938b5247c39ba
+DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252
 EBUILD fprintd-0.5.0.ebuild 1509 BLAKE2B 3ecb04540bd0b11bbf0733e6d40859e4bc926d627a540183c5d5f346c38df2ae8bc59e15efe53d133c9a5a4ea83be5fa0a63c6b45e12ef51827649d3da29e93f SHA512 06380a416b30de228675312d39bdca884476dde70777e01ba14bb316f9652b40997bf00a4bb2e14d46fbd11427e1f09e32eae5b39c10dae025e4cb9cc27b656f
-EBUILD fprintd-0.5.1.ebuild 1517 BLAKE2B 08976963d70a7ad0a6a68ce2f227333226865d7f0477f1603ab1a8cd5b8768839a9be07497b9feae9d9e8b73464cb2b5b6200ff913a761c07039e063ca1a2cf8 SHA512 dfd586a5195cef1f958524194aa44bb6710584dd220800bdba32656d7dc263046b9b38a73f648b32e455d4daa9c03a0f7d9278d26419e4213e15d883c069dc27
 EBUILD fprintd-0.6.0.ebuild 1517 BLAKE2B b2da7cefc22cd6a78cf2a2541451614887b91cfb1b6df6b01a0ccb0443f0aed518219609de09d0c243506718fabd6a535945788961b68f239ac0a2d14a4f73f6 SHA512 278a8e6c01a32ffe906b3ee4a89ee579f2ee3b2ab914358bc434fab8f35883e0cd9310b9618add7d58f5b6719e82def1e9edf15e287d88a2c1a81cbf389b299c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD fprintd-0.8.1.ebuild 1529 BLAKE2B 386238b2381ee3686b0441f5eb07aef1ed77b01f7f7ed43a763718792a76391e3d384a46f463ee57205347defe4512b6b05afdba02f157276aaeede602fb1983 SHA512 878930e6a2310e015952006517de2928fb04a63098915787e914a1a8ff100f1e20c99eced0785e6288142f04bb6686d3e59d8eea686e452890a3a6909d2520f0
+MISC metadata.xml 344 BLAKE2B 9a02f1005090b51c476c6705fe5627cf66dfdc3c4168e917b47651510b0596a6582bb2e4bc09bdd943c202a49a9e3d9bf58a03badeb1bd45f017b6bfef236fe9 SHA512 93369d8bd0b3f7c65b2f6a49f9e35b438879ffdd5c4b4906a4f3e09b0ce74dad1bb6f204c58be724edb88cb4e6a0380e28f516bd1c3bdcd904b8b9e8955dbd8d
diff --git a/sys-auth/fprintd/fprintd-0.5.1.ebuild b/sys-auth/fprintd/fprintd-0.5.1.ebuild
deleted file mode 100644
index 1834d4f332b4..000000000000
--- a/sys-auth/fprintd/fprintd-0.5.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools pam systemd versionator
-
-DESCRIPTION="D-Bus service to access fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
-MY_PV="V_$(replace_all_version_separators _)"
-SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc pam static-libs"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	sys-auth/libfprint
-	sys-auth/polkit
-	pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	doc? ( dev-libs/libxml2 dev-libs/libxslt )"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-silent-rules \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_enable doc gtk-doc-html) \
-		$(systemd_with_unitdir)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install \
-		pammoddir=$(getpam_mod_dir)
-
-	keepdir /var/lib/fprint
-
-	find "${D}" -name "*.la" -delete || die
-
-	dodoc AUTHORS NEWS README{,.transifex} TODO
-	newdoc pam/README README.pam_fprintd
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins doc/{fprintd-docs,version}.xml
-		insinto /usr/share/doc/${PF}/html/dbus
-		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
-	fi
-}
-
-pkg_postinst() {
-	elog "Please take a look at README.pam_fprintd for integration docs."
-}
diff --git a/sys-auth/fprintd/fprintd-0.8.1.ebuild b/sys-auth/fprintd/fprintd-0.8.1.ebuild
new file mode 100644
index 000000000000..99784d1ab4e2
--- /dev/null
+++ b/sys-auth/fprintd/fprintd-0.8.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam systemd
+
+DESCRIPTION="D-Bus service to access fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/fprintd/"
+MY_PV="V_$(ver_rs 0- _)"
+SRC_URI="https://cgit.freedesktop.org/libfprint/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc pam static-libs"
+
+RDEPEND="
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	sys-auth/libfprint
+	sys-auth/polkit
+	pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	doc? ( dev-libs/libxml2 dev-libs/libxslt )
+"
+
+S=${WORKDIR}/${MY_PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-silent-rules \
+		$(use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_enable doc gtk-doc-html) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		pammoddir=$(getpam_mod_dir)
+
+	keepdir /var/lib/fprint
+
+	find "${D}" -name "*.la" -delete || die
+
+	dodoc AUTHORS NEWS README{,.transifex} TODO
+	newdoc pam/README README.pam_fprintd
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins doc/{fprintd-docs,version}.xml
+		insinto /usr/share/doc/${PF}/html/dbus
+		doins doc/dbus/net.reactivated.Fprint.{Device,Manager}.ref.xml
+	fi
+}
+
+pkg_postinst() {
+	elog "Please take a look at README.pam_fprintd for integration docs."
+}
diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml
index 6f49eba8f496..19586c3df843 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+<upstream>
+	<bugs-to>https://gitlab.freedesktop.org/libfprint/fprintd/issues</bugs-to>
+</upstream>
 </pkgmetadata>
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 0bbe66b2b825..88cd89bdadd2 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -4,6 +4,6 @@ AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6be
 DIST munge-0.5.10.tar.bz2 424285 BLAKE2B 07c6423ba799400e9a99e3f33a7dee61ed35b8caa8b290f7da5ffc1e7fbdc37ad985d10101b9a18ccae4ca4274c44999549f9754b0e782cda98976b5f15e3f30 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
 EBUILD munge-0.5.10-r2.ebuild 1279 BLAKE2B f10801f9e56cee24915bde79848d1716ddfeb38e19bed65a5711beb10582a606c90d0b80d25ad9b442c71dda98093229c1684eeba4338f160139ce4129304015 SHA512 6dfbdc292b7f2d7fe5b888bc5186ce099a6c55a3e5300788ba43f3d638a995a654a6e25917200a8166f4f737bbf9bca4a0ec08930e9f06a2f2122082fe7625b6
-EBUILD munge-0.5.13-r1.ebuild 1409 BLAKE2B 21a5653844d0373cd19f35f5ad89f243024758e2274e93ccbce751b021ff3e164d63ebeada9d20d151e3286493bf17317a9bd4b774bc27485d25603c4c239756 SHA512 cad8b218d7d6679f7f76739f9a33642f467e5a6a2370364a22818b462203d18f8bfd15011272b22d1c325b950c913fa0b53944f7cdb71e735d4f0e55c6cd4e2c
-EBUILD munge-0.5.13.ebuild 1412 BLAKE2B 5addc03e48062bb73eec8b25b0d35c612e9500d57ae6cda0301942c29fd43243c52001def1ff2cab749dcd08a551d01d92d146b17112b823a4f02f980009397f SHA512 9787c7291ad91f8c9d7f29283d2f54ddb125fbc4f3ac72d09277fc9da80f5a9d5c4728a37b092e01c94969c5553bc7e57be4484f51d98cea8347c6fb81a4752a
+EBUILD munge-0.5.13-r1.ebuild 1410 BLAKE2B f4d592ea6080411a6c701f26bfe6ef11d6f2bb1a73b4afca3338213688d7c378f39a318eec061f2c1290f6cfdf23690e0e82b2e37e93cd2c23de315b73002c02 SHA512 8ab9f092a3c603784cb163c40ea5e9250ebe6eb384ca407c0f2936f8c0bfcd0824c5d53750493c2d969d2c3c8cac2a660c5e4724ddfa0043ac6a723b3e2cfb9d
+EBUILD munge-0.5.13.ebuild 1410 BLAKE2B f4d592ea6080411a6c701f26bfe6ef11d6f2bb1a73b4afca3338213688d7c378f39a318eec061f2c1290f6cfdf23690e0e82b2e37e93cd2c23de315b73002c02 SHA512 8ab9f092a3c603784cb163c40ea5e9250ebe6eb384ca407c0f2936f8c0bfcd0824c5d53750493c2d969d2c3c8cac2a660c5e4724ddfa0043ac6a723b3e2cfb9d
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/munge-0.5.13-r1.ebuild b/sys-auth/munge/munge-0.5.13-r1.ebuild
index b84cd36bf18c..0c9183212423 100644
--- a/sys-auth/munge/munge-0.5.13-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0 )"
+	!gcrypt? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/sys-auth/munge/munge-0.5.13.ebuild b/sys-auth/munge/munge-0.5.13.ebuild
index fff766b94b0c..0c9183212423 100644
--- a/sys-auth/munge/munge-0.5.13.ebuild
+++ b/sys-auth/munge/munge-0.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0 )"
+	!gcrypt? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/sys-auth/pam-script/Manifest b/sys-auth/pam-script/Manifest
index 5138316bdad3..a56531df21c6 100644
--- a/sys-auth/pam-script/Manifest
+++ b/sys-auth/pam-script/Manifest
@@ -1,7 +1,5 @@
-DIST pam-script-1.1.6.tar.gz 326758 BLAKE2B 04d499d984fa217eafce41468ef71291caee0aca77627237abb2b99d8728aed5dbfab570cfb5f07ddcb2f80021bb4175e611d953cb9daa53a0fc22c5663d11e9 SHA512 4c0f03e4ee3ad062c0a6c71982c283e944cd595d3af656f149ea89b583568373f72478130a614cd851f12a1440976abcd51c8932c5fd4753858d13d91888728a
-DIST pam-script-1.1.7.tar.gz 328385 BLAKE2B 7099d4a489a8f53c9cd811ef4cc354040d55e814b3b5b01d4fde59c64352a4e98cf834ddac2a078a6bdafdba6855572bf8b8f0ab294d730601e3637c8fdaa8c5 SHA512 c0e1df7d3b91cb5be4166fd4680556d5ee4f74df0de299f3629c91081b89ab58390d7b5d0dde5acf3509b30a62553d08e4b2fdf154bce064937f45e2ec08db35
 DIST pam-script-1.1.8.tar.gz 36442 BLAKE2B 29ea87d694deb5483d34dd60fd4192d8d2050f6c5291fe5d2e7fa90408e7d8ce07b5b987a58142e43893d352d13d002604958b70565827d720e0ee89c6d8eb48 SHA512 c4b99c69a759b6422189707c52439a6afe59e32fca6238acf00116ed104b625920fb36b3e1f0aaf5edc77325b1f7b10d52ac2530d85cec53d941ae906e077543
-EBUILD pam-script-1.1.6.ebuild 826 BLAKE2B 5e8b5c913f57bd56eaae069ac8cf82f32bcbc9dc939b2bd2989a111d28332e4acc7d47d514bad4bfea2ff1bf03e75e73725fcb8df862428baccd2ce67c07f3c1 SHA512 73c0a9bb484e8888d9b8b83d85efb750ecd39a99f0dd4d2e57c359c4ed8e848ca57f04987507cfb33fe0df30714b64968c6dd7c93dbd01235b884e10a355df50
-EBUILD pam-script-1.1.7.ebuild 838 BLAKE2B ad60afbecdc0c9a4a5beb05cf5cd3e935da2ca5d46b0998aab7b5cd43826c6e29d3d13457d7eabdbca10df4db49b1b09cee695ca76699c5baa3c79c60341a5cb SHA512 a9fcff1a03ba2da8a64d859d74d27cd135d5d21ab50531ca31e5581ef5d2e68bc35d5edd36f4bf5c35c84704c1c0f299781168bd4b2d23fb1b44be9c188db532
+DIST pam-script-1.1.9.tar.gz 34890 BLAKE2B 0cb1c978cf335039185d34ea9d9a6a5363d73c86e05b24735d3a13d88c2eb03734831ee1fe80a87ca9d89c5b793cdc498b7fb2890a2e09209adfdd43784c2fd8 SHA512 319dff52923f7f895ff123bd6258bc83668b41da1172961e1747cb12fbdd260c6907b73f9881f5c3a50d4e2c4074b66747d7d6bbe1e0d7ab0411251705b59537
 EBUILD pam-script-1.1.8.ebuild 920 BLAKE2B 39f83cc6605db309a147353493310f5b92da37ade23465f5bf9f0838c5129c51eb9665eb169e9ce44ceb35cc49b65ef0eb60f26dd4c688e44bab9981b7a8d9d6 SHA512 ea2908eb29c923ee1519cde4a706d0266080f017f910ca2db798a127058a8c8f14e594de87a80b1af7242baa46a62f42f2870a23360cde0c95c5913f5aceec5a
+EBUILD pam-script-1.1.9.ebuild 917 BLAKE2B f205242f2e70e3f7d15fb709a861749db93cb713d7ff6d30a1ee8b4c50737254ebc52dc79e1086cc901b203280061e0bfcbe38d30177e9d1cda5b4a67c0a9ba9 SHA512 4a4262caaeb486f3a7215c4eee46394880d3fea5755e728c6b17f3b352e335cdfdb62e5a28035563e98248adf95cac821210354354e422890e920df74844a155
 MISC metadata.xml 392 BLAKE2B f9ea8d72222397eb83f2243411996075053e2cbf549bc13ddcd6c38463f3b34eb08ad3efff120c443542ac272da5966d1ca83bf1827a0eeb3b234a1e1ddd4c9f SHA512 bf9673c615b2658b2bbed7b240a5c0aa28a3ce5db82f6d34e505bfc2a0aa25979a3278c2bda498adc456196f6243def7255b462677136ebdf3b1be7af0a9f8d9
diff --git a/sys-auth/pam-script/pam-script-1.1.6.ebuild b/sys-auth/pam-script/pam-script-1.1.6.ebuild
deleted file mode 100644
index e018fa38f2b8..000000000000
--- a/sys-auth/pam-script/pam-script-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="PAM module for running scripts during authorization, password change and session"
-HOMEPAGE="https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="virtual/pam"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--libdir=/$(get_libdir)/security \
-		--sysconfdir=/etc/security/${PN}
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc etc/README.examples
-		exeinto /usr/share/doc/${PF}/examples
-		doexe etc/{logscript,tally}
-		docompress -x /usr/share/doc/${PF}/examples/{logscript,tally}
-	fi
-}
diff --git a/sys-auth/pam-script/pam-script-1.1.7.ebuild b/sys-auth/pam-script/pam-script-1.1.7.ebuild
deleted file mode 100644
index ccff348e33cd..000000000000
--- a/sys-auth/pam-script/pam-script-1.1.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="PAM module for running scripts during authorization, password change and session"
-HOMEPAGE="https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="virtual/pam"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		--libdir=/$(get_libdir)/security \
-		--sysconfdir=/etc/security/${PN}
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc etc/README.examples
-		exeinto /usr/share/doc/${PF}/examples
-		doexe etc/{logscript,tally}
-		docompress -x /usr/share/doc/${PF}/examples/{logscript,tally}
-	fi
-}
diff --git a/sys-auth/pam-script/pam-script-1.1.9.ebuild b/sys-auth/pam-script/pam-script-1.1.9.ebuild
new file mode 100644
index 000000000000..143addcfc1a5
--- /dev/null
+++ b/sys-auth/pam-script/pam-script-1.1.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="PAM module for running scripts during authorization, password change and session"
+HOMEPAGE="https://github.com/jeroennijhof/pam_script/"
+SRC_URI="https://github.com/jeroennijhof/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="virtual/pam"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--libdir=/$(get_libdir)/security \
+		--sysconfdir=/etc/security/${PN}
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc etc/README.examples
+		exeinto /usr/share/doc/${PF}/examples
+		doexe etc/{logscript,tally}
+		docompress -x /usr/share/doc/${PF}/examples/{logscript,tally}
+	fi
+}
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 55670de1a1a6..6f0cb90c055c 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -5,5 +5,5 @@ DIST polkit-0.113.tar.gz 1448865 BLAKE2B 93cb6abf03d0de193e9f64b953bee40faf3bd07
 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc
 EBUILD polkit-0.113-r4.ebuild 3471 BLAKE2B 521e37d8ac00c3dfaed2f31e5aaedfec1e11b3ffd629e362b310c91b134642538fbea7fe2f9280ca21cd5bf1136b3142781e589660b08d1f1d2a8102a01e2bea SHA512 86ec712423c855648a56e998f8c77d37f24d3e9efe0898c8acc4a9e5ac09eb1cc5135f997c5a8dfa06bde4153f734d1bdbf44425eb004be4fb74df258a443a63
 EBUILD polkit-0.115-r1.ebuild 3470 BLAKE2B e3b4028f4fdf524834395990f2bb3e2688ca6c75744bc60d19d443d7c0789beef23ba7a634129bbe1cdd8ae7db1a030977a901fb7a1ca376fc773d36cff9560e SHA512 7114d38dc204eb8c4036837b388fa05294400963beaec71dbf178663bada70ba90d50714a792d596f190aa85c40930f65091dce97a1a34a627b3ca4fff31d331
-EBUILD polkit-0.115-r2.ebuild 3517 BLAKE2B 68beb13b09e33d5b17f8000ad1dd89bc38438e1763b0dccf057d3e6c637b6591f27daeaa1701066b7d0b9757bd5a287e4042d86e3f16b30cfd56438e19d94dcf SHA512 bbfb1e2cb5ec601674d2560958619676dc3c56b34534edf38315b70399b4b24257e0a05f358645cd095f916240fc2ed2dca2f75f90215ac62cc0771be4d85189
+EBUILD polkit-0.115-r2.ebuild 3515 BLAKE2B 95e8043c2f59207b44e057633131e95e0b15b616b56e4b48dd06cf9c6ab44bb609f2051cb26d8eb5eb063c90fa39ec9c6f708e068df9bd556bd126bba6609bc6 SHA512 df963a1d01bdc04edcf5c5e6897f7d4e8344a4c8d811713d1aed1c4599e150a308d8a34890736a9a0c6b0569e82af578bc919c20d3c6b3cd457f704de592df3b
 MISC metadata.xml 493 BLAKE2B bbf2a4e83d0882480d0f2ba8b18ef439b234bd82538546d04753d63fa828f6b111afb78846c1a03f4aa93f89e6fd0a6a828c7908574a740c9c6880252a84e98d SHA512 9c7b199d1a3b1193beb4d01e52d5e90d81821aa6df6785482da7ee37c0ca777c12095f160bc997c77d0089429c2e338cf75d0a46836416736178cd661ffa80f5
diff --git a/sys-auth/polkit/polkit-0.115-r2.ebuild b/sys-auth/polkit/polkit-0.115-r2.ebuild
index 8a4d862c9f42..00fa4f69c875 100644
--- a/sys-auth/polkit/polkit-0.115-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86"
 IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index edbf20d8ae3b..459e7b0d3d44 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,7 +1,7 @@
 DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
 DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
 DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
-EBUILD ssh-ldap-pubkey-1.3.0-r1.ebuild 1711 BLAKE2B b325fc66e5ccfef660ae855a9ab18bb94871ba97a342cba8e2af0304537fdec139715af80baf2ac329f626890f75e0e044f3dd8ac03189dd75c2fd5e8e158cf6 SHA512 e19ccf30f9102fd210cf372a2230ce5f573535efadf75cb1214fe17fef632476a56af450b9ebb155f2db36371735faa28eef2c2bcc38d7fd6ada147912a5de81
-EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2209 BLAKE2B d5eddff6e473e6f5de77110107699029f9a9025b27c88ebe88ce1fd07ca4f4f019b8c1d78fa71168e6befe1601d2aacc4f0fb2cb85a62d52b773214d9f3d36a9 SHA512 a4f164e1da2f79aab69d475ecf8ce525281d7029b295e3266b181d805fdb5354243e5f962e9cfc36aad5553692fe28ff8a54d0bd241da1a4b79a1ddb6bfc9576
+EBUILD ssh-ldap-pubkey-1.3.0-r1.ebuild 1717 BLAKE2B 998f90455bbdf1cffc485c701e09ee76797b31e65be00ee4f36500f99fb6e15d19189f0253dbf9e9b40a816bce5b801a918a5dc134e7f662efccb25cde91b7b5 SHA512 ab27e5b927e387e7e0860e970cd257f6f56e004dd0404d50e0ff6a421744cc068d485f3ff1827697fac3d65cea1e5fe1a8b800914d43c0e70f9498f2ed444fa3
+EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2215 BLAKE2B e5b6ba635ad57be03ef396113c703087f431351fe78c96073ec1273dcf345813b2d48709b0d5912146a064f97dc68baa00ff14bd6b480c2fd5beb4793a52d49e SHA512 35782f337ac3ef9bc920a0c50c892d7cad0cca3625c0c1af597d8091e338f89da0edccebe57676155effff9c68091318310008d6c2e34b7f6102d6352e02ad75
 EBUILD ssh-ldap-pubkey-1.3.0.ebuild 1592 BLAKE2B 0f9e074a466098a493740e3476e05425b223db18e47c6407429243952f2e794fc465cfd2dbb08a0b39861207bbc5c99c7c91b000c7839ce2eaba59b1be22729d SHA512 d9652275517dec7a8df0bd19401c128c7440112e01ff45f58f1afe953a4f60b245fd1d51f604e872024c9cad3c6c9b380ec5d06c3c28a2351f298453c8500d63
 MISC metadata.xml 523 BLAKE2B 0a9308f1acc865d1150c5d1f7275ab7d213965be821936aadc1e92b6a0ca0f3ba90a8e4b28a1683b182fe1d540991ff032407e641ce0ea4b4f8511a880e74d99 SHA512 f9db947dfb435f981350a30cd8d6d9163b9b5067f610eae87f17c85d6a123a2dd620aa06d1a290ed148321d68c37877662885b07b5af15fce3f13d0afbba67dc
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
index 5460e0995c46..7d5b3c2c40f4 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
index 2e4b4ba04411..9e7a281a5fcd 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~x86"
 fi
 PATCHES=( )
 PATCH_COMMITS=(
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 43de783b68bc..06d8a00c752f 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 6c856cf537b5..706cdac68a94 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -1,4 +1,5 @@
 AUX partimage-0.6.9-minor-typo.patch 313 BLAKE2B c0d04a86e0d4c27ce8a1b097525c029c258ef37968058a888f2fbfc55da2035134b058c8b1118a0f86a3c3b5cd63116d5435371b43f9ba4b0f3e70ec830d18e8 SHA512 7bf9de9b08afce5c3b2bfa8943561df0605066866f7ba748872c9f81e1be4033e6f88c8033af1e1b7e2adb64263e8177ba9bcad1ac2e613b27e9c219fbff6828
+AUX partimage-0.6.9-openssl-1.1-compatibility.patch 1445 BLAKE2B 086fa11a2dc3326b86cdfd43abda921fbf7a03c95adf7cba28675ed5c8334582feedd0e1adbe16e7750333fcf730d67fd02f3a9a49a8f4d08881964eff51dadb SHA512 96c398a3d536ed6dc54ef8d6012f1ecefe78fd8a27b74966ba8d6095e593cbcd33213dc485c6dc13ee45a517928de2bce639b5679e91ed2aea2adb1f5b3efba6
 AUX partimage-0.6.9-zlib-1.2.5.2.patch 975 BLAKE2B 0e7e1de1ef590f74b46d94aaaa6eaf2eb62f06c3f33432d0201c820ec4e218d746ee8964e8cdfa1fc31bf31da1fb18fdfe3cb798cbb3111c17194dadbf4d6707 SHA512 8f5310a65e77822f816bedca9281be7627246f111960fc4092c2e3d44fa1bfcea786c130899970ce35da8be536491ae46b0ac1825d85ab6ccb6b1332f2f1b4e2
 AUX partimaged.conf 307 BLAKE2B f1d0bc946a517f4896b55c749c0f244731d413119dfc15c22f5e0834ca87cdb37b278f8907bb18dade3a1ab48cbea3a4d7ef5b836af32260cbf1653627855a2f SHA512 1be320a8dceb3076e6aa2d8b1a8a4d01a380ad1209133997fd0d87cf1d0974fc4877c3c8b41c07fbb99249c8a00132f2c5fa7ffadf26f4e41cc2abfcd6b62116
 AUX partimaged.init 644 BLAKE2B 92bfc28cb2a093bc9a0d94bb5730ff6f402f28ed48f281f0fa392950de02b498fe7d31ab8a0d96f20ced8fd41b5b912319a0d8fceb9321529237c1d48a85f046 SHA512 1e85bcd3012897cb093e87667a4c937b390967317ceaa547484d4f56c760a746faeb4290996155505978eefb4bd1e84e4b11fcc31a59f1e322c83351227c96d5
@@ -7,5 +8,6 @@ AUX partimaged.pam 266 BLAKE2B d46ffadffba0635c4fce9612e4bdd187aa5e17b823d747d8b
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
+EBUILD partimage-0.6.9-r1.ebuild 3554 BLAKE2B 59d0adcffc6fac18b30edaaab7b480f423eb12f700bbda72a6da49762fa13552cdac50468b03f79e1e29f79c619f2b54deb1d406c178342c4c454693a6cfa8be SHA512 88d63c8144ae2832a3b4fe1377218c2ca2211d3facbc915a6467faea887a7e0f1acea163224d17b26d722d5da787b04122c28e3e0481d191ceafee9674ed2100
 EBUILD partimage-0.6.9.ebuild 3445 BLAKE2B f90a263110eba0d69d7d21a643ba6eee353d49624ceeddd50b605ad7cee19a6fbcdfb2fc67ee3e41ce67685243f215df93221157e7e53d953cd6ea1a5a813e1b SHA512 c48ec114f05b868bf525234aa7ef9011efa4e61343123e56a8012cadf548968ad805bbe8658c4e02fa36201bbe3ce462e1ab550c4b5eb09cd071b7c2112c5563
 MISC metadata.xml 427 BLAKE2B 33870f2fc393bed75dcdbda1bb16d6cc947cfa4f7321e7f219338cab014be901eca6d3e2dc11c0ecd50be28922f0f1a746a8756c3d860d8f10549098c3479cad SHA512 e5e5377e9f6cf6337b93ea8609424ce4b9514b0b0d9628ef22999537af616f24e4882a915cf6249f8d0e721b5e25e0a50f5e046b8ac9991c130b4f5892298e67
diff --git a/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch b/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
new file mode 100644
index 000000000000..af4d9c153df2
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-openssl-1.1-compatibility.patch
@@ -0,0 +1,41 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -240,7 +240,7 @@ if test "$SSL" = "yes"; then
+   AC_CHECKING([ for SSL Library and Header files ... ])
+   AC_SEARCH_HEADERS(rsa.h crypto.h x509.h pem.h ssl.h err.h,
+     $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include,
+-    [  AC_CHECK_LIB(crypto, CRYPTO_lock, [LIBS="$LIBS -lcrypto"],
++    [  AC_CHECK_LIB(crypto, X509_new, [LIBS="$LIBS -lcrypto"],
+         AC_MSG_ERROR([ Required for SSL Crypto Library not found. ])
+       )
+        AC_CHECK_LIB(ssl, SSL_CTX_new,
+--- a/src/client/netclient.cpp
++++ b/src/client/netclient.cpp
+@@ -43,7 +43,11 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
+     {
+       showDebug(3, "initializing client ssl\n");
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv2_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++      meth = TLSv1_client_method();
++#else
++      meth = TLS_client_method();
++#endif
+       SSL_load_error_strings();
+       ctx = SSL_CTX_new(meth);
+       if (!ctx)
+--- a/src/server/netserver.cpp
++++ b/src/server/netserver.cpp
+@@ -39,7 +39,11 @@ CNetServer::CNetServer(unsigned short int port):CNet()
+     {
+       SSL_load_error_strings();
+       SSLeay_add_ssl_algorithms();
+-      meth = SSLv23_server_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++      meth = TLSv1_server_method();
++#else
++      meth = TLS_server_method();
++#endif
+       ctx = SSL_CTX_new(meth);
+       if (!ctx)
+         {
diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild
new file mode 100644
index 000000000000..5828263d3810
--- /dev/null
+++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam user
+
+DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
+HOMEPAGE="http://www.partimage.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls nologin pam ssl static"
+
+LIBS_DEPEND="app-arch/bzip2
+	>=dev-libs/newt-0.52
+	>=sys-libs/slang-2
+	sys-libs/zlib:=
+	ssl? ( dev-libs/openssl:0= )"
+PAM_DEPEND="!static? ( pam? ( virtual/pam ) )"
+RDEPEND="${PAM_DEPEND}
+	!static? ( ${LIBS_DEPEND} )"
+DEPEND="${PAM_DEPEND}
+	${LIBS_DEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup partimag 91
+	enewuser partimag 91 -1 /var/lib/partimage partimag
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+	eapply "${FILESDIR}"/${P}-minor-typo.patch #580290
+	eapply "${FILESDIR}"/${P}-openssl-1.1-compatibility.patch
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	# XXX: Do we still need these?
+	filter-flags -fno-exceptions
+	use ppc && append-flags -fsigned-char
+
+	local myconf
+
+	use nologin && myconf="${myconf} --disable-login"
+
+	if use pam && ! use static; then
+		myconf="${myconf} --enable-pam"
+	fi
+
+	econf \
+		--docdir="${EPREFIX%/}"/usr/share/doc/${PF} \
+		--sysconfdir="${EPREFIX%/}"/etc \
+		$(use_enable nls) \
+		$(use_enable ssl) \
+		--disable-pam \
+		$(use_enable static all-static) \
+		--with-log-dir="${EPREFIX%/}"/var/log/partimage \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/partimage
+	keepdir /var/log/partimage
+
+	newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+	newconfd "${FILESDIR}"/partimaged.conf partimaged
+
+	if use ssl; then
+		insinto /etc/partimaged
+		doins "${FILESDIR}"/servercert.cnf
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
+	fi
+}
+
+confdir=${EROOT%/}/etc/partimaged
+privkey=${confdir}/partimaged.key
+cnf=${confdir}/servercert.cnf
+csr=${confdir}/partimaged.csr
+cert=${confdir}/partimaged.cert
+
+pkg_config() {
+	if use ssl; then
+		ewarn "Please customize /etc/partimaged/servercert.cnf before you continue!"
+		ewarn "Press Ctrl-C to break now for it, or press enter to continue."
+		read
+		if [ ! -f ${privkey} ]; then
+			einfo "Generating unencrypted private key: ${privkey}"
+			openssl genrsa -out ${privkey} 1024 || die
+		else
+			einfo "Private key already exists: ${privkey}"
+		fi
+		if [ ! -f ${csr} ]; then
+			einfo "Generating certificate request: ${csr}"
+			openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
+		else
+			einfo "Certificate request already exists: ${csr}"
+		fi
+		if [ ! -f ${cert} ]; then
+			einfo "Generating self-signed certificate: ${cert}"
+			openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
+		else
+			einfo "Self-signed certifcate already exists: ${cert}"
+		fi
+		einfo "Setting permissions"
+		partimagesslperms || die
+		einfo "Done"
+	else
+		einfo "SSL is disabled, not building certificates"
+	fi
+}
+
+partimagesslperms() {
+	local ret=0
+	chmod 600 ${privkey} 2>/dev/null
+	ret=$((${ret}+$?))
+	chown partimag:0 ${privkey} 2>/dev/null
+	ret=$((${ret}+$?))
+	chmod 644 ${cert} ${csr} 2>/dev/null
+	ret=$((${ret}+$?))
+	chown root:0 ${cert} ${csr} 2>/dev/null
+	ret=$((${ret}+$?))
+	return $ret
+}
+
+pkg_postinst() {
+	if use ssl; then
+		einfo "To create the required SSL certificates, please do:"
+		einfo "emerge  --config =${PF}"
+		partimagesslperms
+		return 0
+	fi
+	chown partimag:0 "${EROOT%/}"/etc/partimaged/partimagedusers || die
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 6e1f8e713098..5897e46257e1 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 21676893a8fd..f11f32b08f49 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -3,5 +3,5 @@ DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7
 DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
 EBUILD efibootmgr-14.ebuild 600 BLAKE2B 6c7abd14248f9050e338d83a7f507e27d61c1c55e16777312c23e2e52d33bcfc1e67d5b4efcb97d936e7fb654125088f77188eda8cf153613ba20bfd5e1f52cf SHA512 bf5c805869ca09f72486abf901697298c7dbbd9966dbc8ff559c5486dd2e8631ce107ad36603b0a3c88c29537a891246f98eeaf5352c7c65ee29d93ef204cf85
 EBUILD efibootmgr-15.ebuild 624 BLAKE2B 4d9c2ff8566d909f20f23da76e500a405f5d30f2fc5c397ce89e93b0eb577b8a58c4f0258661ad68aacd9c6306a269588a17df2ed47e9dcbf97cae90396c301c SHA512 7258da126a9462f91506ec3295d2ffb062f78c8dd23875e947145d30dff8c879d98f881637061bc819f4902d4ad5794f214e716664e13f71142aba9c7945f79e
-EBUILD efibootmgr-16.ebuild 689 BLAKE2B 669b906526bcceeec6f2618445ae28b4e268754041ae0212775a3016e69fe733866f6b31913c7a27d7dc9aebd1c0bb6e2a334a93fb89fb339a842c48ccd19d12 SHA512 4a4414eebb77b7551161c70c4662b3da37cc8c1b44a170d739b3f61c0cee72929469b58c80bb829ddfe7977ee14e6c30a2117c4e1164cfd5ebcfb592c79d2e4c
+EBUILD efibootmgr-16.ebuild 688 BLAKE2B fc1e09125bc8ac38207ea18c62a751f9d90dba8aa8339960dc3513c550dd02e14643112d38c3c6fb41ecfc0cc2cc48b498c577bce409814218b1068d61de29a4 SHA512 9723e5df48764d86a0371827087356724c0400de470efae6cc3dbd7fd81d9c6c796a7af126a329a68dcafac121b6d11c1fd95600d542c20962778917886f7c05
 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index 6c909738c7f9..83a3903ac373 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 x86"
 IUSE=""
 
 RDEPEND="sys-apps/pciutils
diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest
deleted file mode 100644
index 3d28fab93d6e..000000000000
--- a/sys-boot/grub-static/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST grub-static-0.97-r10.tar.bz2 888963 BLAKE2B 1891685b312c129efb47fd78ffd2a433655225b8dcb8a60592faabbc5300ce6d56efea70272cf9a1e8cfaa70224d1a3a313d1c2e2296bfd43593a4a12aec541e SHA512 2a18405c9f7b0712dac2246213f723c1a2be6734bff133b7906e7c18e4370faf924f35d3b834d74761cf50b3ab59e969fbff010e13292618187c65a72aa45a87
-DIST grub-static-0.97-r12.tar.bz2 1171586 BLAKE2B 066cde81f4b1849467d83ec982745dc8449e38895edc0eee979d6ea782a802c2a2c6b2a4f03eb976c03ce3f6e3213d3605e9bb6c99f8479e59fafb1716cbd0c9 SHA512 0a4c0b3b556db366df70c7c51a1a26f614f949be4002d7f9a053b7261b80c2c49410e8fd04c7e3717ea560e7cbc6a692d859d07bdfe2099a78a33bce78ac5395
-DIST grub-static-0.97-r9.tar.bz2 937621 BLAKE2B a61fa8b41de4208cf30222fa742bb84a5f60bb924f5cf57f12ae9a382b1bf9e7feff740029ca3a08939d070275b4bb5389981c9a26f6decd18d4c7120f8d0f52 SHA512 a8b1f7cd416f2c41c88ba5c34889e7afe9615bf985e69b2d1d3ec2a20b7ceb13e53e8b3df91a5077bfa1a217f3274362033d72f9bafe3ad22be378f26728035c
-EBUILD grub-static-0.97-r10.ebuild 5402 BLAKE2B 981e8f761083e4725de45b10d16db2b8e11b54eaaa0e4793b2e7633832c5d758f5abcbe47d846f3b3fc85eefb6d2946f354bc584358bb55034b39b7e00a8b1b0 SHA512 6523ea58548adfab70c50f136b179ce3cc03669fa78b6efac28208f8b68eb43bb5bfa2039b57f7516fc068ebc267e219df2567f1ac7750f713ff878bd15eb3bf
-EBUILD grub-static-0.97-r12.ebuild 5402 BLAKE2B 6e3fa13bd6349cd5d468a799c748fe5f64dcb2a743c10bae241b8148bde4b1ff3c2a56d920b8e9ead3de1ccd4014dce2514861b2e87ccfbba30e51ec5d317d31 SHA512 5d7be3447bf3eb2c0fade5fe31616a6ba8df5c52ecfb2a0782bb5a569ece553f98e1fbaa9caa6580160ffad4d9db135dfa491136727c43c0dbb96e3b292a4a1c
-EBUILD grub-static-0.97-r9.ebuild 5297 BLAKE2B 692292ba38851671d6a7315a5deaca1f99b371cb254fd958271fa6ad490e450c0924de2b59be8a4096b1a545335923677a945d2aef34436b2b191083e07b573b SHA512 f44b2305b5d5691c0de0ae4acf75def1d1d5c52bfd2db9b44dfc268d7bb5f667d63c96fb8bea722fffeada7c8e623ee2505aefb43528ff9e225c306752f4ee8b
-MISC metadata.xml 242 BLAKE2B a110ca18fd86f3fcfe9a5c10ecd97d2c9727c04919ddf21976ceffcdf65dd1069c81e4ad554301b847665892de1313320836a327ca1f36381cb0f9e21219e9e8 SHA512 0891a67242a0cd36cac143b427affa9241ec8f8173b79423632349d542f9bc6e2097ffbb8e96b560c41e13b5b43ddf0f822962da98b5d2e58068d7855acb4965
diff --git a/sys-boot/grub-static/grub-static-0.97-r10.ebuild b/sys-boot/grub-static/grub-static-0.97-r10.ebuild
deleted file mode 100644
index 0eb33ec53e23..000000000000
--- a/sys-boot/grub-static/grub-static-0.97-r10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit eutils mount-boot toolchain-funcs linux-info
-
-PATCHVER="1.9" # Not used, just for tracking with main grub
-
-DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-# These are already stripped since we use a binpkg.
-QA_PRESTRIPPED="/sbin/grub /bin/mbchk"
-
-pkg_setup() {
-	local arch="$(tc-arch)"
-	case ${arch} in
-		amd64)
-			CONFIG_CHECK='~IA32_EMULATION'
-			WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!"
-			check_extra_config
-			;;
-	esac
-}
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-	if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-		run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!"
-	fi
-}
-
-run_test_grub() {
-	local grub="$1"
-	local version="$(${grub} \
-		--read-only --no-pager --no-floppy --no-curses \
-		--no-config-file --batch --version)"
-	local error="grub test-run failed"
-	use amd64 && error="${error} Is IA32_EMULATION set?"
-	[ "${version/${PV}}" != "${version}" ] || die "${error}"
-	return 0
-}
-
-#
-# Below this point, everything is also used in grub-static!
-# Please keep in sync!
-#
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-		run_test_grub /sbin/grub
-	fi
-
-	mkdir -p "${dir}"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die "${dir} does not exist!"
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ ! -e ${dir}/grub.conf ]] ; then
-		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
-		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
-		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
-		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
-	fi
-
-	# Per bug 218599, we support grub.conf.install for users that want to run a
-	# specific set of Grub setup commands rather than the default ones.
-	grub_config=${dir}/grub.conf.install
-	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
-	if [[ -e ${grub_config} ]] ; then
-		local tmp="${TMPDIR}/${P}-setup_boot_dir-$$"
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${grub_config}" >"${tmp}"
-		# Do NOT fail here, only warn.
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			>/dev/null <"${tmp}"
-		rc=$?
-		[[ $rc -ne 0 ]] && ewarn "Grub failed to run!"
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		# This may fail, don't worry about it.
-		grub-set-default --root-directory="${boot_dir}" default
-		:
-	fi
-	einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-
-	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
-		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
-		elog "the following instructions for your /boot!"
-		elog "Neglecting to do so may cause your system to fail to boot!"
-		elog
-	else
-		setup_boot_dir "${ROOT}"/boot
-		# Trailing output because if this is run from pkg_postinst, it gets mixed into
-		# the other output.
-		einfo ""
-	fi
-	elog "To interactively install grub files to another device such as a USB"
-	elog "stick, just run the following and specify the directory as prompted:"
-	elog "   emerge --config =${PF}"
-	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
-	elog "grub where to install in a non-interactive way."
-
-}
-
-pkg_config() {
-	local dir
-	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
-		einfo "Enter the directory where you want to setup grub:"
-		read dir
-	else
-		dir="${GRUB_ALT_INSTALLDIR}"
-	fi
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub-static/grub-static-0.97-r12.ebuild b/sys-boot/grub-static/grub-static-0.97-r12.ebuild
deleted file mode 100644
index b824c17fb821..000000000000
--- a/sys-boot/grub-static/grub-static-0.97-r12.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit eutils mount-boot toolchain-funcs linux-info
-
-PATCHVER="1.14" # Not used, just for tracking with main grub
-
-DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86"
-IUSE=""
-
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	case $(tc-arch) in
-	amd64)
-		CONFIG_CHECK='~IA32_EMULATION'
-		WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!"
-		check_extra_config
-		;;
-	esac
-}
-
-src_install() {
-	cp -a * "${D}"/
-	# Make sure the docs get compressed
-	dodoc usr/share/doc/${PF}/*
-
-	if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-		run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!"
-	fi
-}
-
-run_test_grub() {
-	local grub="$1"
-	local version="$(${grub} \
-		--read-only --no-pager --no-floppy --no-curses \
-		--no-config-file --batch --version)"
-	local error="grub test-run failed"
-	use amd64 && error="${error} Is IA32_EMULATION set?"
-	[ "${version/${PV}}" != "${version}" ] || die "${error}"
-	return 0
-}
-
-#
-# Below this point, everything is also used in grub-static!
-# Please keep in sync!
-#
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then
-		run_test_grub /sbin/grub
-	fi
-
-	mkdir -p "${dir}"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ ! -e ${dir}/grub.conf ]] ; then
-		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
-		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
-		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
-		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
-	fi
-
-	# Per bug 218599, we support grub.conf.install for users that want to run a
-	# specific set of Grub setup commands rather than the default ones.
-	grub_config=${dir}/grub.conf.install
-	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
-	if [[ -e ${grub_config} ]] ; then
-		local tmp="${TMPDIR}/${P}-setup_boot_dir-$$"
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${grub_config}" >"${tmp}"
-		# Do NOT fail here, only warn.
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			>/dev/null <"${tmp}"
-		rc=$?
-		[[ $rc -ne 0 ]] && ewarn "Grub failed to run!"
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		# This may fail, don't worry about it.
-		grub-set-default --root-directory="${boot_dir}" default
-	fi
-	einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
-	mount-boot_mount_boot_partition
-
-	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
-		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
-		elog "the following instructions for your /boot!"
-		elog "Neglecting to do so may cause your system to fail to boot!"
-		elog
-	else
-		setup_boot_dir "${ROOT}"/boot
-		# Trailing output because if this is run from pkg_postinst, it gets mixed into
-		# the other output.
-		einfo ""
-	fi
-	elog "To interactively install grub files to another device such as a USB"
-	elog "stick, just run the following and specify the directory as prompted:"
-	elog "   emerge --config =${PF}"
-	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
-	elog "grub where to install in a non-interactive way."
-
-	# needs to be after we call setup_boot_dir
-	mount-boot_pkg_postinst
-}
-
-pkg_config() {
-	local dir
-	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
-		einfo "Enter the directory where you want to setup grub:"
-		read dir
-	else
-		dir="${GRUB_ALT_INSTALLDIR}"
-	fi
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub-static/grub-static-0.97-r9.ebuild b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
deleted file mode 100644
index 47441893ef6b..000000000000
--- a/sys-boot/grub-static/grub-static-0.97-r9.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit eutils mount-boot toolchain-funcs linux-info
-
-PATCHVER="1.9" # Not used, just for tracking with main grub
-
-DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
-
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-DEPEND="!<sys-boot/grub-2"
-RDEPEND="${DEPEND}"
-
-# These are already stripped since we use a binpkg.
-QA_PRESTRIPPED="/sbin/grub /bin/mbchk"
-
-pkg_setup() {
-	local arch="$(tc-arch)"
-	case ${arch} in
-		amd64)
-			CONFIG_CHECK='~IA32_EMULATION'
-			WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!"
-			check_extra_config
-			;;
-	esac
-}
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/
-	run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!"
-}
-
-run_test_grub() {
-	local grub="$1"
-	local version="$(${grub} \
-		--read-only --no-pager --no-floppy --no-curses \
-		--no-config-file --batch --version)"
-	local error="grub test-run failed"
-	use amd64 && error="${error} Is IA32_EMULATION set?"
-	[ "${version/${PV}}" != "${version}" ] || die "${error}"
-	return 0
-}
-
-#
-# Below this point, everything is also used in grub-static!
-# Please keep in sync!
-#
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	run_test_grub /sbin/grub
-
-	mkdir -p "${dir}"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die "${dir} does not exist!"
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ewarn "This means you must use either grub-install or perform"
-		ewarn "root/setup manually! For more help, see the handbook:"
-		ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
-	for x in \
-		"${ROOT}"/lib*/grub/*/* \
-		"${ROOT}"/usr/lib*/grub/*/* \
-		"${ROOT}"/usr/share/grub/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ ! -e ${dir}/grub.conf ]] ; then
-		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
-		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
-		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
-		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
-	fi
-
-	# Per bug 218599, we support grub.conf.install for users that want to run a
-	# specific set of Grub setup commands rather than the default ones.
-	grub_config=${dir}/grub.conf.install
-	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
-	if [[ -e ${grub_config} ]] ; then
-		local tmp="${TMPDIR}/${P}-setup_boot_dir-$$"
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${grub_config}" >"${tmp}"
-		# Do NOT fail here, only warn.
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			>/dev/null <"${tmp}"
-		rc=$?
-		[[ $rc -ne 0 ]] && ewarn "Grub failed to run!"
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		# This may fail, don't worry about it.
-		grub-set-default --root-directory="${boot_dir}" default
-		:
-	fi
-	einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
-	mount-boot_pkg_postinst
-
-	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
-		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
-		elog "the following instructions for your /boot!"
-		elog "Neglecting to do so may cause your system to fail to boot!"
-		elog
-	else
-		setup_boot_dir "${ROOT}"/boot
-		# Trailing output because if this is run from pkg_postinst, it gets mixed into
-		# the other output.
-		einfo ""
-	fi
-	elog "To interactively install grub files to another device such as a USB"
-	elog "stick, just run the following and specify the directory as prompted:"
-	elog "   emerge --config =${PF}"
-	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
-	elog "grub where to install in a non-interactive way."
-
-}
-
-pkg_config() {
-	local dir
-	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
-		einfo "Enter the directory where you want to setup grub:"
-		read dir
-	else
-		dir="${GRUB_ALT_INSTALLDIR}"
-	fi
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub-static/metadata.xml b/sys-boot/grub-static/metadata.xml
deleted file mode 100644
index 0c723031cff1..000000000000
--- a/sys-boot/grub-static/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>amd64@gentoo.org</email>
-	<name>AMD64 Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index c0b533a646d8..b0008742b3da 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,11 +1,5 @@
-AUX vboot-utils-42_p20150219-cgpt-static.patch 1092 BLAKE2B 48d6631e3d6d9072dad8513964b6192d066d5a593cd7bad8c26339d5136002b9870522e1bc2bf8e3a52f0da05bc72ed0f2b06bd635bbb2f2380092223edcc104 SHA512 bb01fbb11d015bc8e817e14e4326908d5338a9a3bb657004c8539b561e0be21c7f3ee9d2b43d8fcadc302ee9991effb65778d22b2a8ade92faa5234041288d4f
-AUX vboot-utils-42_p20150219-sysmacros.patch 1228 BLAKE2B 546f8b34e3e35a580a230002c462fae324851460100e619171a1ce2364a680e719e7666c4118fc1e69d50cf563cfb999b55167fe49fa2a1267d0d7d54128997f SHA512 50bb342dbe6266562d979e453f8744ad43cc859e35a2a9b6e5a420b0e395012d88bd631bc6c02b023cd58c80e0371932d8d7539a541d5adfc79b769659411fbc
-DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 BLAKE2B b05013b54a4a6a7c9bbdcaeca5b01c7cc75ff9d58e9594a47da914d49dfc0dc4b8d4a31c9f1af5b2414e911ac310f7200731ee78c8941dc3d5fceb97bc34e9bc SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f
-DIST vboot-utils-42_p20150219.tar.xz 18578108 BLAKE2B b5780f35a66ebed39b4c26b75820ac1574691d85c8bd222a3602c79aa92c1058448996bdefc501a3772b116fbf888e93139f8cce10465780d2956de877cc0377 SHA512 bf1b5579f80bfd3804d74f5fed5ca0f85ff3d66cc4efd1c5e744ab0de50309c7e5168fe9a751579e9fcc0cb7dda72fc98497b2e13437b357b0ad9bb063edd33a
-DIST vboot-utils-51_p20160427.tar.xz 18377808 BLAKE2B 7938c9fb69a0da7d4d8b62f1f9b5f911658d6a3673b198f603e20b5e2ed29d989fc92f74eb7553f0fec230fc062bb85785f6ac01ef537944ce144d87690551c2 SHA512 5b9af2815b8939ae21f4e430744902ccd811627d668eaba709354901eb70553e57050b9068b07fecdfec5bb2ece0c11f1cf0f1a01c0e5f886d1913e1478fe3d7
 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048
-EBUILD vboot-utils-1.0_p20130222.ebuild 1527 BLAKE2B 8acc26629ac7096c4f500a1f7a065bb83d4d7919606179911d15e954eabbf63db78217d1f5e391a63b8b48858862af5bfb28930881725c2bd7812bb2f7da1417 SHA512 0617df165249896f758a7f623edf0cc80e7ed470510097a5f60b3eab46dbfa7210d4500b80bebc2d38ac4b48b1ef60fef2bbcfed113ca2526c8fa640f2853433
-EBUILD vboot-utils-42_p20150219.ebuild 2021 BLAKE2B f6c4bfe442aca86ab7358ff9efb77a808f3508efef015a7dbaead08bb26c7810da32eada15a909dfd7969ecc9d42c277a4e7bf8cefcd7f89119291d5d4f30cb8 SHA512 ebae142d837a43b011e8979597b42564ef22e990a1e84dc40f49b0263edfa5be49b770c551bd0bc167447bebb6edd2fc55c14289628aac9e8c51e9c7e9288568
-EBUILD vboot-utils-51_p20160427.ebuild 1950 BLAKE2B a37c82c9e868c2cd3e78df0bd26ecee6b55a8f397e0090303d0fc38ae632e1a030c5f0414259d010de79beb7e7a4d8083fe9281b82c09834c86ae4b483c0da33 SHA512 4bf2d1bbcebe4d9396d606c58a5adcb0593b0189e049a6429ddf6966c3419a0f4349e7b3abd76ec58496c13d5f5a09dab79acf1278aa1a88eb408bdffc22cf4f
-EBUILD vboot-utils-59_p20170413.ebuild 1959 BLAKE2B 8a61ceba02fcd0dca40dda695a70e994fd5c2b8b0ac660191a3baf6f72cd6eaae82f8598e1c6c489a2a655ff05d23f1153000bfe1baf775a2da222f5e01a7734 SHA512 111a065659df702beb8982fc65d1e8cf962156fed5e317b659d7480fa5751c9ea8fed7af9e7b81c549a3c1deb72691da570faadd59494d2cebd4521eb7976ea3
+DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe
+EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e
+EBUILD vboot-utils-72_p20181229.ebuild 2627 BLAKE2B d60fa4e962e8fe03d17c082e5ea8f35da186eaf6a3bd2065ad561cf190330009cc39f028886c1aee5c68650e8328f3755f8c679687e8207443a90ad36e549f7f SHA512 b66494a0ab22bc9999d0eaea7736884a7948c76f38a18db58853888145e17165810dd86a8756759e97b5f12bdb43bf8962422f1bc3384040b86fdce4b0c31948
 MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914
diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
deleted file mode 100644
index 3f53fc7be769..000000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9d437e9122019568df7fa2d602f911e6a873d78b Mon Sep 17 00:00:00 2001
-From: Anatol Pomazau <anatol@google.com>
-Date: Thu, 19 Feb 2015 05:11:51 -0800
-Subject: [PATCH] Remove duplicated linker flag
-
-We already set '-static' to LDFLAGS above no need to do it again here.
-
-TEST=build with 'make' and 'make STATIC=1'. Check that 'STATIC=1' adds '-static' linker flag.
-BUG=None
-
-Change-Id: I83e23984753094af203432eb4570930085788398
-Reviewed-on: https://chromium-review.googlesource.com/251151
-Reviewed-by: Mike Frysinger <vapier@chromium.org>
-Reviewed-by: Hung-Te Lin <hungte@chromium.org>
-Reviewed-by: Anatol Pomazau <anatol@google.com>
-Commit-Queue: Anatol Pomazau <anatol@google.com>
-Tested-by: Anatol Pomazau <anatol@google.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dfa971c..c0c5f50 100644
---- a/Makefile
-+++ b/Makefile
-@@ -960,7 +960,6 @@ ${CGPT_WRAPPER}: ${CGPT_WRAPPER_OBJS} ${UTILLIB}
- .PHONY: cgpt
- cgpt: ${CGPT} ${CGPT_WRAPPER}
- 
--${CGPT}: LDFLAGS += -static
- ${CGPT}: LDLIBS += -luuid
- 
- ${CGPT}: ${CGPT_OBJS} ${UTILLIB}
--- 
-2.3.1
-
diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
deleted file mode 100644
index 508f54076766..000000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://chromium-review.googlesource.com/339680
-https://bugs.gentoo.org/580554
-
-From 7fff56afefd4e63dce2366636c084d4c1f1f95d4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Tue, 19 Apr 2016 13:58:49 -0400
-Subject: [PATCH] include sys/sysmacros.h for major()
-
-The major() func is defined in the sys/sysmacros.h header, so include it
-explicitly for the prototype.  Upstream C libs are moving away from having
-sys/types.h include it all the time implicitly.
-
-BUG=None
-TEST=precq passes
-BRANCH=None
-
-Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71
----
-
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index dcfaab9..1716cdd 100644
---- a/cgpt/cgpt_wrapper.c
-+++ b/cgpt/cgpt_wrapper.c
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
-index 4fe990c..abf37ae 100644
---- a/futility/dump_kernel_config_lib.c
-+++ b/futility/dump_kernel_config_lib.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
diff --git a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild b/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
deleted file mode 100644
index 8a5b61a8c149..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils rpm toolchain-funcs
-
-KEYWORDS="~amd64 ~arm ~x86"
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git"
-EGIT_COMMIT="e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e"
-MY_VERSION="${PV##*_p}git${EGIT_COMMIT:0:7}"
-MY_PV="${PN}-${MY_VERSION}"
-SRC_URI="http://kojipkgs.fedoraproject.org/packages/${PN}/${MY_VERSION}/3.fc19/src/${MY_PV}-3.fc19.src.rpm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/xz-utils:=
-	dev-libs/libyaml:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux:="
-
-DEPEND="app-crypt/trousers
-	${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	rpm_unpack ${A}
-	unpack ./${MY_PV}.tar.xz
-	mv ./${MY_PV}/* ./ || die
-}
-
-src_prepare() {
-	epatch *.patch
-	sed -e 's:-Werror ::g' -e 's:-nostdinc ::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	mkdir "${S}"/build-main || die
-	tc-export CC AR CXX PKG_CONFIG
-	emake \
-		-j1 \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=$(tc-arch) \
-		all
-	unset CC AR CXX PKG_CONFIG
-}
-
-src_test() {
-	# ARCH and HOST_ARCH must be identical in order
-	# to avoid calling qemu.
-	local arch=$(tc-arch)
-	[[ ${arch} == amd64 ]] && arch=x86_64
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		runtests
-}
-
-src_install() {
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		DESTDIR="${ED}/usr/bin" \
-		install
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-	dodoc README
-}
diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
deleted file mode 100644
index 5b70868f8f2b..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.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 eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="f44ebbe36b2c1603437edc57b534244e89bfcd9c"
-
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
-# Can't use gitiles directly until b/19710536 is fixed.
-#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cgpt-static.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580554
-	sed -i \
-		-e 's: -Werror : :g' \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || die
-}
-
-_emake() {
-	local arch=$(tc-arch)
-	emake \
-		V=1 \
-		QEMU_ARCH= \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		LIBDIR="$(get_libdir)" \
-		DEBUG_FLAGS= \
-		MINIMAL=$(usev minimal) \
-		STATIC=$(usev static) \
-		"$@"
-}
-
-src_compile() {
-	tc-export CC AR CXX PKG_CONFIG
-	_emake TEST_BINS= all
-}
-
-src_test() {
-	_emake runtests
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-
-	insinto /usr/include/vboot
-	doins host/include/* \
-		firmware/include/gpt.h \
-		firmware/include/tlcl.h \
-		firmware/include/tss_constants.h
-
-	dolib.a build/libvboot_host.a
-
-	dodoc README
-}
diff --git a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild b/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild
deleted file mode 100644
index 67c54ce41195..000000000000
--- a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="48b1a50b086e39332d2e1e51a73434e39c40b329"
-
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
-# Can't use gitiles directly until b/19710536 is fixed.
-#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	sed -i \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || die
-}
-
-_emake() {
-	local arch=$(tc-arch)
-	emake \
-		V=1 \
-		QEMU_ARCH= \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		LIBDIR="$(get_libdir)" \
-		DEBUG_FLAGS= \
-		WERROR= \
-		MINIMAL=$(usev minimal) \
-		STATIC=$(usev static) \
-		$(usex elibc_musl HAVE_MUSL=1 "") \
-		"$@"
-}
-
-src_compile() {
-	tc-export CC AR CXX PKG_CONFIG
-	_emake TEST_BINS= all
-}
-
-src_test() {
-	_emake runtests
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-
-	insinto /usr/include/vboot
-	doins host/include/* \
-		firmware/include/gpt.h \
-		firmware/include/tlcl.h \
-		firmware/include/tss_constants.h
-
-	dolib.a build/libvboot_host.a
-
-	dodoc README
-}
diff --git a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
index 15f315769e8d..12b8ef351c9f 100644
--- a/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE="libressl minimal static"
 
 LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	!libressl? ( <dev-libs/openssl-1.1:0=[static-libs(+)] )
 	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	sys-apps/util-linux:=[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
new file mode 100644
index 000000000000..273d3ec48ff2
--- /dev/null
+++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+# This is the latest commit in the latest branch.
+GIT_SHA1="a32c930e8c46424a3bba3c296fd78b3e60f50aeb"
+
+DESCRIPTION="Chrome OS verified boot tools"
+HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
+# Can't use gitiles directly until b/19710536 is fixed.
+#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="libressl minimal static"
+
+LIB_DEPEND="
+	dev-libs/libyaml:=[static-libs(+)]
+	app-arch/xz-utils:=[static-libs(+)]"
+LIB_DEPEND_MINIMAL="
+	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	sys-apps/util-linux:=[static-libs(+)]
+	dev-libs/libzip:=[static-libs(+)]"
+RDEPEND="!static? (
+		${LIB_DEPEND_MINIMAL//\[static-libs(+)]}
+		!minimal? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	)"
+DEPEND="${RDEPEND}
+	static? (
+		${LIB_DEPEND_MINIMAL}
+		!minimal? ( ${LIB_DEPEND} )
+	)
+	app-crypt/trousers"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
+		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
+		-e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \
+		-e '/cgpt -D 358400/d' \
+		Makefile || die
+	sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \
+		-i tests/common.sh || die
+	sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \
+		-i tests/futility/expect_output/* || die
+	if use libressl; then
+		sed -e '/OPENSSL_VERSION_NUMBER/d' \
+			-i host/include/openssl_compat.h || die #674522
+	fi
+}
+
+_emake() {
+	local arch=$(tc-arch)
+	emake \
+		V=1 \
+		QEMU_ARCH= \
+		ARCH=${arch} \
+		HOST_ARCH=${arch} \
+		LIBDIR="$(get_libdir)" \
+		DEBUG_FLAGS= \
+		WERROR= \
+		MINIMAL=$(usev minimal) \
+		STATIC=$(usev static) \
+		$(usex elibc_musl HAVE_MUSL=1 "") \
+		"$@"
+}
+
+src_compile() {
+	tc-export CC AR CXX PKG_CONFIG
+	_emake TEST_BINS= all
+}
+
+src_test() {
+	_emake runtests
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+
+	insinto /usr/share/vboot/devkeys
+	doins tests/devkeys/*
+
+	insinto /usr/include/vboot
+	doins host/include/* \
+		firmware/include/gpt.h \
+		firmware/include/tlcl.h \
+		firmware/include/tss_constants.h
+
+	dolib.a build/libvboot_host.a
+
+	dodoc README
+}
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index ddfa3f5664a0..84402cd0dfea 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,5 @@
 DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
+DIST woeusb-3.2.12.tar.gz 386189 BLAKE2B 53629a185d0b8ff55cb2e60eaa6cb8f9e106d3f5b24f57cf8f777dbf5b9a1e43ed423e53e4710acf9ac5ce3171da7dbfcd40b5b3f297b0db240e7c0f9a687fc0 SHA512 9a4e20003970a3313b080bde9a534fb1724382555281aa510092a3698622dae46f22483ff8968903b5685e00ebfb454718de6db7f3c61c4a2e122c961bfc270f
 EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671
+EBUILD woeusb-3.2.12.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.2.12.ebuild b/sys-boot/woeusb/woeusb-3.2.12.ebuild
new file mode 100644
index 000000000000..81c09abcf2ef
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-3.2.12.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets
+
+DESCRIPTION="Creates windows installer on usb media from an iso image"
+HOMEPAGE="https://github.com/slacka/WoeUSB"
+SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	sys-apps/util-linux
+	sys-block/parted
+	sys-fs/dosfstools
+	sys-fs/ntfs3g
+	sys-boot/grub:2[grub_platforms_pc]
+	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/WoeUSB-${PV}"
+
+src_prepare() {
+	default
+	find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
+	if ! use minimal; then
+		setup-wxwidgets
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	! use minimal && default
+}
+
+src_compile() {
+	! use minimal && default
+}
+
+src_test() {
+	! use minimal && default
+}
+
+src_install() {
+	if use minimal; then
+		dosbin src/woeusb
+		einstalldocs
+	else
+		default
+	fi
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 363bbe5619b1..57f4cbb568e3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 3737b903bf28..616ab0aaba5f 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -31,6 +31,7 @@ AUX ceph.confd-r3 1315 BLAKE2B bf5c573be6bcfd2c7f077087c36f8e918f027ad81b18ec496
 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9
 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c
 AUX ceph.initd-r10 2771 BLAKE2B a10cc830065d2a836253925af908a405ea41c518a43d5cc3abbb909f0d87ada0500f5ca5354b34dce7ef76be28a4ad5e74b5cbc3ad7a620054d67b0719dd6bd6 SHA512 7d39caf261c4f354eb03ad1802749a103fea22699b6599a29726a520a56a2600b0eaf6f4284ecfb5979302493af5d7501e6399240478bdbdb1976ae99146f6ad
+AUX ceph.initd-r11 3070 BLAKE2B b8e875705720c323377dcedb2fddd76d199eb6430761a75d0da3b26a5a25295e33382ccc88843a894d81a7b07d76ec38faa9a292e67ec6102985d8002ecb3337 SHA512 e3b310a7f99b9226a80bbb9e0b4ed43b3bbe5b69e72f5c0dec5d2f9a7d5f5fc274b1f8e847183d92f27dd283511db8cf5428803bbc833708ce25a38a9da59a63
 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0
 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c
 AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8
@@ -52,6 +53,7 @@ DIST ceph-13.2.1-frontend-node-modules.tar.xz 44352460 BLAKE2B 0a0099e60f0b36d48
 DIST ceph-13.2.1.tar.gz 90786830 BLAKE2B e0884a039ff0e8a1705d8f31f4dcf4cd8ab8989d7c2fa703417038ff9a6cf7b0fbca09abceb901970fbb2dd9a1dc87c2500fec38a2bfca86a9a6dcaab15be991 SHA512 411218ea6037bdf9425a741720ea89876e893e64fbfa518c9584ba581f805fde2c82b13ed47313279665e5d20f36223fc8d5c27055b580c72b22c2004e4da81b
 DIST ceph-13.2.2-frontend-node-modules.tar.xz 45100632 BLAKE2B c3929a6c5e6ec3da5ff60967ae40b99377b2186f31e64af571d9be14889d90bc48b570489aea300ead8e99afc0e62db4438cf343686757a39d84889e772c7fa9 SHA512 93eabc2010c0977c2980c739e131d231a809e375c42120e81effc6cecdeaf0e50b4f8c88286993ef60f1ffaede94f637475104e09fd7af58a289350bd670bf2f
 DIST ceph-13.2.2.tar.gz 90840817 BLAKE2B db5933f358a1ae6888030bca7522e20545a2e107055dca44b371e295537c854568682fa558d3f90193e0dfe618947918ce21816b5e20795fff8a14bc837216bb SHA512 37c4845ae52550428c7f1e0d77d9d671ea1d6f5cad5bce0713dce97b54f3abe7346daa2cbd44b76638fb74fe7bdc4797033a4bf808253cfc8bec0fa495ec7e03
+DIST ceph-13.2.4.tar.gz 90910119 BLAKE2B eb395f435552d91789869bd92fee2a8b2fef155205f13b118bd01be4ff78a8e1dde682425a24311822bb819ec8cf41a9d45245ffa3cb7a921d3269f6658bf920 SHA512 5055979067234ad7fd2774007d524ef4643d968bf7ce42fc8c3f8e469fd84cbd7afc163cd6ddda53584bd5677fdea2fecf8194a378d49724504f639b9f688ff7
 EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638
 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f
 EBUILD ceph-12.2.10.ebuild 8037 BLAKE2B 2c6d6f203aa2705b95559667a8a9174d44b7262a5c7bf4abaf3405c29b320d06a47ec83f12caa1d17c46fcd0b3b8e774713ff8fec44f2d09317869ab200b5e4c SHA512 65ff0201abef681ba8888c8093f33ac4f7a3d000ad089e1b6c1a96da5464c96d6001e784d39904b96fb9152686694105320ac15c4c96401e17ba7906470d927e
@@ -60,4 +62,5 @@ EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7
 EBUILD ceph-12.2.9-r1.ebuild 8026 BLAKE2B 99ae7bab9bc17382c9226f966101cb6a6315403494c83e8973d12b1bd669517a103c52a003f8dfbe487a6558b138200a34eafe6ccf96080915b0344ab78074a4 SHA512 cc49eec85c6010d7cda157fa8adfe92db10946474fa36a4e75452c2f66004f2a3c65c75ccfb885e50f0009bd38ccbf23755b95223f4ada974000986e920bf79b
 EBUILD ceph-13.2.1-r1.ebuild 9212 BLAKE2B dc1bad7c2e864edcd301097937894aa58abbadbcee9b2cd6d33b10c2366ac5bc9000460465910bf72b8c30a60b74a6be8ccc7591c1b9ddbc912182dd4dc4179f SHA512 365777bb2ebff564a503a6816e257c95ef0e3414f274b9613acb561d5744738b43aebb8488e09da5d230ee59e02003dc560f6216531dbb04c6c6a172475f011d
 EBUILD ceph-13.2.2-r3.ebuild 9936 BLAKE2B 6229c6c6bb2d188159c4988f50a3803f9c1f98a363fca8d1e1d2994f3a25e8b8e07fe21789381a597047b7e6b69c3951d7d10a4d0a0fd1d7b8808d018b44aaea SHA512 c7898b7a57a243a79d0150dafbcb8cb0bcafadc1c8960c8117b046c43092bce8970bad8572e2b9ea286c7a18cac652a0bd2e784efeb80f290034470eff40d0e9
+EBUILD ceph-13.2.4.ebuild 8535 BLAKE2B 8b6971d021c445bcf6f832e183f8b7b07cae1f27a257e7f00d49c94beb713af0a42b2682a0cfd0c337d3c59d35ad405b809d44267e821fb5cd147092f56d8e80 SHA512 37ad5ebc22663730a445c543d99028f107225d396d15e8781f9993734388d3aaf324453f90357b46817c431d3ba17ce073ff056d285b6abe0946423f055e5985
 MISC metadata.xml 1730 BLAKE2B 0cf24323ef1e88d95e448ecaa2df8a4b2a1ac9baf3f433931cd588bdb34b2f268a280a0756402787c73e4ac33dceb60042bafee1d3124dc6e98ba33abc541c73 SHA512 e54693fd32f6ecc16ca244067ce1ebf63ea5939926be2466a9d88a5373b25651bb5c25984ee6dbeecf0099be0988f002ed824b874c5a308fd4fbe35b87dcb53a
diff --git a/sys-cluster/ceph/ceph-13.2.4.ebuild b/sys-cluster/ceph/ceph-13.2.4.ebuild
new file mode 100644
index 000000000000..52ab54eb408b
--- /dev/null
+++ b/sys-cluster/ceph/ceph-13.2.4.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
+		systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap lttng +mgr"
+IUSE+=" +radosgw +ssl static-libs +system-boost systemd +tcmalloc test"
+IUSE+=" xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	ssl? ( dev-libs/openssl:=[static-libs?] )
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	mgr? (
+		<net-libs/nodejs-9.0
+		>net-libs/nodejs-8.10
+	)
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		dev-libs/openssl:=[static-libs?]
+		net-misc/curl:=[curl_ssl_openssl,static-libs?]
+	)
+	system-boost? (
+		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2
+	!<sys-apps/openrc-0.26.3
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python3*') )
+	?? ( jemalloc tcmalloc )
+	"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	rm -r "${BUILD_DIR}/lib/cython_modules" || die
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph.initd-r11 b/sys-cluster/ceph/files/ceph.initd-r11
new file mode 100644
index 000000000000..23827e1a562c
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r11
@@ -0,0 +1,115 @@
+#!/sbin/openrc-run
+
+# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
+_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
+if [ -r "${_CONFD_FILE}" ]; then
+	. "${_CONFD_FILE}" || exit 1
+fi
+
+: "${ceph_conf:=/etc/ceph/ceph.conf}"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: "${rundir:=/run/ceph}"
+: "${user:=ceph}"
+: "${group:=ceph}"
+: "${rc_ulimit:=-n 1048576 -u 1048576}"
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+extra_commands="reload"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: "${supervisor:=supervise-daemon}"
+: "${stdout:=/var/log/ceph/ceph}"
+: "${stderr:=/var/log/ceph/ceph}"
+: "${respawn_delay:=10}"
+: "${respawn_max:=5}"
+: "${respawn_period:=1800}"
+
+: "${osd_respawn_delay:=15}"
+: "{osd_respawn_max:=10}"
+
+: "{radosgw_respawn_max:=5}"
+: "${radosgw_respawn_period:=30}"
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	local log_dir
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	if [ -n "${bluestore_osd_fsid}" ]; then
+		einfo "Mounting Bluestore"
+		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
+	fi
+
+	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
+		command_args="${command_args} --name client.${daemon_id}"
+	fi
+
+	local arg_name arg_val repl_arg_name
+	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]; then
+				log_file="${log_file}${log_postfix}"
+
+				log_dir="$(dirname "${log_file}")"
+				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
+			fi
+
+			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
+			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 9936c40777aa..cb22309b7397 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -2,17 +2,14 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
 DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77 SHA512 10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
 DIST cinder-12.0.4.tar.gz 5349921 BLAKE2B 168beb53879656956a97a4e787aba200b119e80e3b787fa94534c7ca8a68fb641df47069e19759ef022103a3f306402711ec315bc61d6387b427c6f5672919fc SHA512 0a139c25458020a869ab9395f42cd31b83cbfb65640a41ef0039aef48a92fd641a0084c5fd8fbdc35b6c8b6e9250e1d0a845816b92a882358acf4e2793be536c
-DIST cinder-13.0.1.tar.gz 5457335 BLAKE2B 5f8db00c5dc4e8e05c40d77f06561be352d42091e996cb2e87cbf590361ee1537903876ebf353d5dcf277decdceae82b6066a62e0b8ff4e2f58370ce3661de8a SHA512 9dd64ed77a2c6bb4ddcd6dfa38510e5f37a7bde5ee8f967c9dad884a30e655bb75becd76d91ac4973f5a20b9a2e3ce064262dc1760da5629fcd04499a26ed220
 DIST cinder-13.0.2.tar.gz 5463591 BLAKE2B d146e43bdd97bd15aeaf7c582c8cbe37080a7a1e8b5090c2727fb2dfbfc953121c0bb4c2adfce5f09d3e43e02093335dcce655dcc64abfa98d58b08327257950 SHA512 04ea9c0dafcc98858b587bf94e5afa20cfbfdd1aebd615ac62cfc7821a8dc6106b695071d68dc369bff014e877fc188216f3b05a9a08ea94a1b99712eca25c92
-DIST cinder.conf.sample-13.0.1 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-13.0.2 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
 EBUILD cinder-11.1.1.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.4.ebuild 8042 BLAKE2B 16b2d4ec01110d1dd9a7f176963182b2d9aaa76866cec22030aa263c96a1929a106bc08c48928ccf27301266abac1dbeb21080be0964cdaaf75784933cb87a05 SHA512 e7f2182ecb303de8e92a5e8a30d4bd5ab842b3592e32088fb6df9b5f071331b9ac9eb884490d02af6f742b57197b6a0768096f05b0298c02c34f25436aa7b8dc
-EBUILD cinder-13.0.1.ebuild 7809 BLAKE2B 6cccea4fe5e344a68ccf332d00ceabf0b0b9239c2195529906c594eda1237028185325a4d8ebab9ccaf6f7ca09cf493c76fb49155805b63d49677f1f735c4e72 SHA512 d76b40f51177aa545ff001c78f41add0fd8df45869a60df9eaf7b6a58d3f77b54d2cba9d5c53ac8e4f3e7e0b6260556f1bfe93d92e3af05b63479aba3d2f23bb
-EBUILD cinder-13.0.2.ebuild 7811 BLAKE2B c82bc03380bed951753d9ab270404f15c4e7b465d298932c36e0c2477ff7a3d8a87201c11c0083831bb815fc265d33331f799e313fad7eba6e1162dc2c2d9e03 SHA512 55450aa65a0e451832f17c3bbbe04cbc1016e7830783916ad9a30dcac6e2462442ba50a10701d7599ef17ae819935858f89cdc429ad80c911f4a1bdc82ac3630
+EBUILD cinder-13.0.2.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
 EBUILD cinder-2017.2.9999.ebuild 7774 BLAKE2B f1c7f6f21eed9724ca1ba3a4461be1c1c8c7d17b6bd6e0d7eaa2f3f9ad56cf6c96946266eaafca58624a5501d5560307a776cb8c4209f18525589738aa388b16 SHA512 0d985ee9d439aaaad712d065ed66c3b603688f516172d50f004c4a4793554755fc7bcf2c787bd85ecc7076ea2b489f971567efa042a718764b64c23edaa21ddf
 EBUILD cinder-2018.1.9999.ebuild 8047 BLAKE2B 9d4be05868caddcf9d8bc1d7355c1c9efba7860f5d3adc01fac2be8376ea7c6dbda724de54c5cd5bc505c01dd36962c24d0e53eb8e6dfb749bacfa7676c0c2f1 SHA512 4ccc67e7c2a7603b48268f548662e0b974e688383f546b4b35346cd248705221536f25408936cac050c1b366ffa4a06b7d9254a9480c4e6c656440743247bed1
 EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
diff --git a/sys-cluster/cinder/cinder-13.0.1.ebuild b/sys-cluster/cinder/cinder-13.0.1.ebuild
deleted file mode 100644
index bee3c5d75f1f..000000000000
--- a/sys-cluster/cinder/cinder-13.0.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/rocky"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-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/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.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/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-13.0.2.ebuild b/sys-cluster/cinder/cinder-13.0.2.ebuild
index 995a9db17c09..a8e41663d73e 100644
--- a/sys-cluster/cinder/cinder-13.0.2.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index e99ed525951b..d5f7da2eef28 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,14 +1,10 @@
 AUX keepalived-2.0.10-snmp-crash-fix.patch 3843 BLAKE2B 246ac57c0f25df09357a8dd6f1f504dfbaa3b690fa68b353643bb1ce1d4811178b00e6c6ef2b1fa886c8e2a343379e9ebc077b49b8c921744afef24aa9e667f9 SHA512 26b4c222966b793bb8029b8d125203ecdfd6381928812ffb1ff99a056bbdff8b85ab2b350a263459e24bc282f4af05f6dd02fea78a7162197450604694a39fac
-AUX keepalived.confd 171 BLAKE2B ad9baf96333182a2acdb10a4be7220de1dc0827c4932af07ae8aae17d72233c3cb9bac637acc4c918503da664c8612a8815f4e2eec0aa18d10715fb2e8e3a71f SHA512 468d176d22f1ce308871829f24624b33e6ba3b234a413395599a67a865f3cf815cc24a10c244dffd1421a0acf5352fe51027a2d3b282cd3822dfeadc8a1d4df0
 AUX keepalived.confd-r1 63 BLAKE2B 8925b12c9936aaccf828132720a0cb74fddc4a4c8642aaa2ad08099e17e5db0170070966a4465de7bfc06317f812194d9a7928da2559ea41a994c5f8e832b9c7 SHA512 8aed0ece9d67956006c5056543bbb31c354b73b7b555f6cce039f9507da24e40e2ad15ac057dd2e39244de5319f5b9a19659e8ee5c2c7116e202f18c88e6ed74
-AUX keepalived.init 792 BLAKE2B a3e98861fbb9a193b4d63aabde8a44a041603b7983a02af7815c4db0062691dc2ea905c704d7d123588355a8cfbde124e2a5732d621eb5c664169a83ec81f6ed SHA512 240201b81bcca7b213bd3ec45fc286f0305d72a6952a3baf485d717df413df3a2da0f4b018eaa050b0b12cda78767f5c4ae60ec75e5802cfe57cb29951e86ba0
 AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384700a7bc4e1a381f106a4734f19e3f740ad00a83c065f45ac620d8224fd125f76ed0a96ec285d3abf393 SHA512 5a5057f50c29c6e2c9f2451acf1e2aa2cdd9218a5882d3eea1a148a4ae8b259b5937387b95feab919b242a65d706e48c5afa3ed280215092295b8e8d44d1f543
 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7
 AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a
-DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1ddde14b2e8fb72fdccd543ff4583426aa2bb214e00e3964518e726377b049560ed35daf38f4cafcd4e7c43a13b78d SHA512 bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac
-DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a76027a50868ade8ac31bc4dea22573a51489939bb29bc20c0eb912f78b1e57fbc6ac18e4b8e38d6493d271e135f8332f SHA512 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5
 DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff8a049a9fb1e31f61d7afe2406b2dde2258d450913577ef8ee18d0171f57e4ad01727d9e0f489cfe25b35826770181 SHA512 e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db
-EBUILD keepalived-1.4.3.ebuild 1588 BLAKE2B 883a6e48223274e117fe82c86e02a3a7358ce4d8f8aeec823701d72f795680526248475caa163c44696007cd07183fe84490ff519805069d559b7f74292df668 SHA512 360c4e72a3e88903f99e8a2ed91df6b914254e42236cb974162bc67f0f392ecc50444d17bd1a6233d2fa8ec0fa981891dbd8eb4cb789d495a82912ae32cdd0ce
-EBUILD keepalived-1.4.5.ebuild 1595 BLAKE2B d58bf0c8d4ca830f54a427886abc61fe3190460c9d70df3f4d5801aaedb6792bef21dc7bb96986490366558693014475a4b4fc021fbd9234e0770796be74c1d3 SHA512 19d32a2f32bb3b554ee727b6561e3514ba4e4d3e1a386d629e09b1d943260a50de8a866a50f20a2bfe3e70cecdccefc01c3160ac19377d2aac40e4169856e764
+DIST keepalived-2.0.11.tar.gz 961182 BLAKE2B 226bac3a544434a36b01ebdb43b166b3833fca3ec12014ba9a76e90f12663a5550271dff87155c74ba5eb908dd48fc9dd2cac810705e96ae3bd30df67a26e708 SHA512 ead982aeacdf329109089dfc58a42915ff44b0c4897006000c74642fa3747b2cac1a472faa438ce517f47b80d193d466875ab7130d2206400c8b2ad52f17c6d4
 EBUILD keepalived-2.0.10-r1.ebuild 1795 BLAKE2B a49c8683b3ab56e6443df8d81c0656f00d1fd1ef846ab53fa75410200dbb910535368fd4ce82154d246ce5be701bc0866ce9bf52c5754c3cc0c772d8b7c47003 SHA512 c3d213f9b6a390cc0ce6b4daea61b5436322d70d6ae2ded53910177cf7bd8b914c7fca87a8691ee1e5d81549a1ae7f1239c321afe0fb56f921eb84bc52ffb486
+EBUILD keepalived-2.0.11.ebuild 1748 BLAKE2B eee8b1e5ee726cb119d19d4db1b703aea78bf27eb5fc3bc38d7b49253c7ca809fa13019e2fcc4fa08bd9943e20e5e83a705beb35fed1d1a6f020590239728d3d SHA512 173bbc36860b1e39290ed16d89376ece5e9c404ea9a48d4c65ca2223e49b05ca893ae04fd8f6813e09f7f36f0260669ac7f5f4ba881e065efc4ab1f4ca24fc1b
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/files/keepalived.confd b/sys-cluster/keepalived/files/keepalived.confd
deleted file mode 100644
index 5f56cb23b031..000000000000
--- a/sys-cluster/keepalived/files/keepalived.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Keepalived options
-# Increase logging:
-#KEEPALIVED_OPTS="-D"
diff --git a/sys-cluster/keepalived/files/keepalived.init b/sys-cluster/keepalived/files/keepalived.init
deleted file mode 100644
index c290c9dbc518..000000000000
--- a/sys-cluster/keepalived/files/keepalived.init
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use logger
-	# The interfaces do not actually need to exist to start, it handles them gracefully.
-	use net
-}
-
-command="/usr/sbin/keepalived"
-command_args="${KEEPALIVED_OPTS}"
-pidfile="/var/run/keepalived.pid"
-
-extra_commands="checkconfig reload"
-
-checkconfig() {
-	# keepalived has a config check command, but it does not work while the daemon is running!
-	if [ ! -e /etc/keepalived/keepalived.conf ] ; then
-		eerror "You need an /etc/keepalived/keepalived.conf file to run keepalived"
-		return 1
-	fi
-}
-
-start_pre() {
-	checkconfig || return 1
-}
-
-reload() {
-	ebegin "Reloading keepalived.conf"
-	start-stop-daemon --pidfile $pidfile --signal HUP
-	eend $?
-}
diff --git a/sys-cluster/keepalived/keepalived-1.4.3.ebuild b/sys-cluster/keepalived/keepalived-1.4.3.ebuild
deleted file mode 100644
index bf0732de58bc..000000000000
--- a/sys-cluster/keepalived/keepalived-1.4.3.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 autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-1.4.5.ebuild b/sys-cluster/keepalived/keepalived-1.4.5.ebuild
deleted file mode 100644
index 9ec3a8f5d741..000000000000
--- a/sys-cluster/keepalived/keepalived-1.4.5.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 autotools
-
-DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
-HOMEPAGE="http://www.keepalived.org/"
-SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="dbus debug ipv6 -json snmp"
-
-RDEPEND="dev-libs/libnl:=
-	dev-libs/openssl:=
-	dev-libs/popt
-	net-libs/libnfnetlink
-	sys-apps/iproute2
-	dbus? ( sys-apps/dbus )
-	json? ( dev-libs/json-c:= )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.4"
-
-DOCS=(
-	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
-	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	STRIP=/bin/true \
-	econf \
-		--with-kernel-dir=/usr \
-		--enable-sha1 \
-		--enable-vrrp \
-		$(use_enable dbus) \
-		$(use_enable dbus dbus-create-instance) \
-		$(use_enable debug) \
-		$(use_enable json) \
-		$(use_enable snmp)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/keepalived.init keepalived
-	newconfd "${FILESDIR}"/keepalived.confd keepalived
-
-	use snmp && dodoc doc/KEEPALIVED-MIB.txt
-
-	docinto genhash
-	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
-	# This was badly named by upstream, it's more HOWTO than anything else.
-	newdoc INSTALL INSTALL+HOWTO
-
-	# Security risk to bundle SSL certs
-	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
-	# Clean up sysvinit files
-	rm -rv "${ED}"/etc/sysconfig || die
-}
diff --git a/sys-cluster/keepalived/keepalived-2.0.11.ebuild b/sys-cluster/keepalived/keepalived-2.0.11.ebuild
new file mode 100644
index 000000000000..79fe86eb5c2b
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="dbus debug ipv6 -json snmp"
+
+RDEPEND="dev-libs/libnl:=
+	dev-libs/openssl:=
+	dev-libs/popt
+	net-libs/libnfnetlink
+	sys-apps/iproute2
+	dbus? ( sys-apps/dbus )
+	json? ( dev-libs/json-c:= )
+	snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+	README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+	doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	STRIP=/bin/true \
+	econf \
+		--with-init=custom \
+		--with-kernel-dir=/usr \
+		--enable-sha1 \
+		--enable-vrrp \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-create-instance) \
+		$(use_enable debug) \
+		$(use_enable json) \
+		$(use_enable snmp)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+	newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+	use snmp && dodoc doc/KEEPALIVED-MIB.txt
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+	# Clean up sysvinit files
+	rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index bdb29d73b806..28005c5e1dd6 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -2,11 +2,19 @@ AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-apiserver-1.10.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
+EBUILD kube-apiserver-1.10.12.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.11.5.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
+EBUILD kube-apiserver-1.11.6.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
 EBUILD kube-apiserver-1.12.3.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
+EBUILD kube-apiserver-1.12.4.ebuild 1205 BLAKE2B 22fe7038d07b4117cbb0d41983ab2236a2d762c527e245cbb23c0a2552cf258a25c8879ee7f0b8ec1091b63d435de3fc8b413171d9d0ce079ee7d01b31caede7 SHA512 893cde4c3c495038eb19d62f5e51e849d5f2586f6b0a6738c6066c951874386a990bde2c4917a0620037af99883ab3fd6d996f6de3e87962c719b915a2b22137
+EBUILD kube-apiserver-1.13.1.ebuild 1225 BLAKE2B 4cbeca88c998d0b110d39db217d62026a7b86f8228ee07306108a8a4fe1ba24c7bae71e16672d55ba9875ba7c78d0a5f1b5720a8e8417ef9fe1a68e7c9df5d38 SHA512 1bf6cae63276cd9c8c45c13d7a8153d77e3ade28d794e0e5dfd313666d1ad855b0b8842ff00533537c6a153361a2cf627878bb10f1389368cd9a0304246adbc2
 EBUILD kube-apiserver-1.9.11.ebuild 1205 BLAKE2B 99915c582f694b4c7fd81cb123c65343f782936095e4b1a3a19c2a07d78a3ed62f8fa62b616358df07a6d3c85b246525376f28990bb9ee1597f01727ceeea277 SHA512 2327cffe4fa9c552edfaa4724f8c10e0850909e691c90a08cf1440b6d518cdc62ead618e692bbbc016879c270721ffdf71231f0b3d3eeb9cbf69a09866761c45
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.10.12.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.10.12.ebuild
new file mode 100644
index 000000000000..386be89ec764
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.10.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.11.6.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.11.6.ebuild
new file mode 100644
index 000000000000..386be89ec764
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.11.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.12.4.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.12.4.ebuild
new file mode 100644
index 000000000000..386be89ec764
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.13.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.13.1.ebuild
new file mode 100644
index 000000000000..26362b266881
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} 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/Manifest b/sys-cluster/kube-controller-manager/Manifest
index a12702902af2..0ee6889ee9a8 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -2,11 +2,19 @@ AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2c
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-controller-manager-1.10.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
+EBUILD kube-controller-manager-1.10.12.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
 EBUILD kube-controller-manager-1.11.5.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
+EBUILD kube-controller-manager-1.11.6.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
 EBUILD kube-controller-manager-1.12.3.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
+EBUILD kube-controller-manager-1.12.4.ebuild 1213 BLAKE2B 6b6fa87bd507baac038712357a693ff423e19ba7bfbd15e4ad6a7f9a6fd0205a6ec7f0f62bd67627cf969985aee17cb92df24eff042a3d1158b401a89b262005 SHA512 b36227fed5d1e407ae148bbb14f21acf6226c49dfc381d3258a8be9c70fdda1a213018a436aca89b721cd082f3b500780705d33c701bfe1a33f2dfe67ac1a7d3
+EBUILD kube-controller-manager-1.13.1.ebuild 1233 BLAKE2B 64c7d8543d7a77630b52299210c032f46ac996ea4807f9a83cca79897b3b5029ca0ab74d0644bcf685ef8ef7c92fac7b479968a6d36194599651364e421df6ac SHA512 a8687dff5900fa745804450376b4b0ed178d41fe3503164900731744a354bf51bb7e7b107e34fd5520d910608fe97f8dc2286b17ce2b8f69b00d88bf6ca397db
 EBUILD kube-controller-manager-1.9.11.ebuild 1213 BLAKE2B 5f7e5092f8489d609514ce0d88dab1fe3e4ccac0542dbf62320043e5bb9a15ef71d0c137f2926d7b13e119b475cfb384ddf36e57539a468cf08c194f503c24ab SHA512 df087bbb7af6c7b48a80aab811678b306e026e25ef0203e68e549e6d6f2d1b9ea2676a9c545dd658310faf52ff267202c6de3621d0679a81823426ed6c804a39
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.12.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.12.ebuild
new file mode 100644
index 000000000000..7c35c4fb9213
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.10.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.11.6.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.6.ebuild
new file mode 100644
index 000000000000..7c35c4fb9213
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.11.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.12.4.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.4.ebuild
new file mode 100644
index 000000000000..7c35c4fb9213
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.13.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.1.ebuild
new file mode 100644
index 000000000000..f7d005c3d17a
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} 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-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 9c814c166989..cb6a08d85762 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -2,11 +2,19 @@ AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-proxy-1.10.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
+EBUILD kube-proxy-1.10.12.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
 EBUILD kube-proxy-1.11.5.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
+EBUILD kube-proxy-1.11.6.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
 EBUILD kube-proxy-1.12.3.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
+EBUILD kube-proxy-1.12.4.ebuild 1117 BLAKE2B d52df182032ff67ae4c2e52180a3ec368a0b957076133f7d5225cab3286c4535a608dc03bb926cc892e8acac461a2c2b5abf66dbaab4dfb3124a1a807117aada SHA512 6665f98db3f1879ef801f087656fa5fb3ab8129fa4df7743ee0c23e433db8bbfd702ceedf17433f91ff9755d52fa109bb022ebd18f5a5ba300ae4eb37a6cb277
+EBUILD kube-proxy-1.13.1.ebuild 1137 BLAKE2B 52d86c985e37cd01c32721f21b892ed79e08971436372eddf7ab16e2498ef55bd4caec7f85e1969210fd2fdc1131c365958e3ccdf6671a679c1756bd13d3d8c9 SHA512 afd924929ad466945cad79764bd8d593fa719c850d77b9429f363709c858e932e8db7b8320deb47406ff7110bf96f0a899761c07305beeaf7abc372986df1f83
 EBUILD kube-proxy-1.9.11.ebuild 1117 BLAKE2B 399c883d474fb02f41f1784b4d4370c913f09ffc44438336eced438bdecb2579a8985e584299f6a435c9ed23e3ac8932056125439036fccb34b4a7a6a39d60a5 SHA512 cfb9378b244419075ab4d1a614a0c8b9bc838f032733b5acf80dcc036d76200a3c2894c9e24bb1070101389a7812d1af896e30b51d348eef57b5a25bb3318387
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.10.12.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.10.12.ebuild
new file mode 100644
index 000000000000..9c91e87318db
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.10.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.11.6.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.11.6.ebuild
new file mode 100644
index 000000000000..9c91e87318db
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.11.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.12.4.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild
new file mode 100644
index 000000000000..9c91e87318db
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.12.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.13.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.13.1.ebuild
new file mode 100644
index 000000000000..25f9544b2a65
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.13.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} 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-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index d855d0ff0c2c..f662526fa2f0 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -2,11 +2,19 @@ AUX kube-scheduler.confd 133 BLAKE2B 6b88dfc011173f183a88a16d078cbb5d96d46c26912
 AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559fd9fb9efcd0db8b3c155fdba2ce8a59461cd15ed3b4294cc5b335093e12d2b8411e400927e1307b37bc6d8 SHA512 151ea6f5cc36de9b83f0e5365579e33eea8002f9a03f5f61d195a349236e6baf192f701d3fb591b769aa90e8e1e620d525b20c95a1e8cda58d062971d8f587a3
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kube-scheduler-1.10.11.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
+EBUILD kube-scheduler-1.10.12.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
 EBUILD kube-scheduler-1.11.5.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
+EBUILD kube-scheduler-1.11.6.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
 EBUILD kube-scheduler-1.12.3.ebuild 1204 BLAKE2B 0c0d6fda619356d4e8227a6e145081818d083f39a11af96f601f5ddcc0ac8e0b539b90987419834e93c6f55d52aaf9471835f7fa9c87743a3ebab64bef79bacc SHA512 537c3ce70bc02d7ed1b29029e343d9246d5b2c4c493dc55fdbddf7ed4e376970d7da799202b09d2d1d9c3700c0daa2a5762649475c516aa57ec8767cc4efcd09
+EBUILD kube-scheduler-1.12.4.ebuild 1204 BLAKE2B 31644b91c9eb0f6e9ca3eae3700092486a8cc760f973e7f2e14be1c48d5bf26ae83a2750fc3ed344419e6c94fb831045d579c9827e874352ca8ecf2d5022a23b SHA512 b948b730fd717ee73a9b8c922b65e8c7d200dbfea29be0420f5f7d15c08416db91708b68057522227ded88b76ba26aeee483cb058dbbc68286a6cbc734d21e2d
+EBUILD kube-scheduler-1.13.1.ebuild 1224 BLAKE2B a293e45658d31ce7adce5daa465921283e4023a6890b3f921260418aca307b03012d0edf354fea699b36468cd605e36b0b5b4e0f2441fbb82b33df32dd890799 SHA512 626b0d94496aeee539ee4bbcb9068a9e8831e2267213666a501d480e0c1eb16a60e7f68a665f06fe68e07643f154361bbb3803c94913c86f7885d916f2a1a95f
 EBUILD kube-scheduler-1.9.11.ebuild 1220 BLAKE2B 032c4eb322e2c7f7d9a898472b0b68a5907f963119b53098bed3bb3336af5098546a273c4c4493e20d3881bd94db22f36a8956832241be7845f16c565cdd7d8e SHA512 c1f9ab8c156c9ce96ab8e4fd31b811739d9859f17b502e32922e904805d791b85fb6529b7e305791ce8329b34a189a0c4a941e11961960cf01aa8b6abb4537f7
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.10.12.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.10.12.ebuild
new file mode 100644
index 000000000000..ec32edd4fa82
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.10.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+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 "/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-scheduler/kube-scheduler-1.11.6.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.11.6.ebuild
new file mode 100644
index 000000000000..ec32edd4fa82
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.11.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+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 "/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-scheduler/kube-scheduler-1.12.4.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.12.4.ebuild
new file mode 100644
index 000000000000..ec32edd4fa82
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.12.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+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 "/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-scheduler/kube-scheduler-1.13.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.13.1.ebuild
new file mode 100644
index 000000000000..3bdd045abba7
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.13.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} 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/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 70826ab116e3..d02a779ae86f 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,13 +1,19 @@
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
-DIST kubernetes-1.13.0.tar.gz 28687604 BLAKE2B 9ea15d385a99a53a658f5e5d29e2fb84034a5abde9dca090294091e0b54aa695fabaccdce91595547303cc29e86c872f4bab8dca2d8a69992d056fd24c1865e8 SHA512 df5357c339eaa2299c08fcc9de24eb5ad90cd960af9cca356f404d500344d74ef1d682115d75d5ff8496cd7c24c84ece9452189d5a31b3f9e745721b9b98fbe2
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
 DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
+DIST kubernetes-1.13.2.tar.gz 28771642 BLAKE2B 4a5c5a8e0c05faab3fb6a26854e7c8643b893c2a1f5d5b56aacea869d86426dffe358222034b826d66dfd19855bee71cad7356ff483c27218019e4adda499ce7 SHA512 2f24119fc21d7bdbb60174b46da94ce3f2f6a3c638e9d96323c93c20039aeb06f9c9a3a48c43bb36b71eff25cf72967e780e3339b35ad7ad7a7a7c35662c96bd
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubectl-1.10.11.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.10.12.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.11.5.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.11.6.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.12.3.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
-EBUILD kubectl-1.13.0.ebuild 1218 BLAKE2B 2a7acaf7bd113c2439512a3150bdc025afb0afe088cfe1d3bc1972361c3ff5d1bf325583adb81018f9b3e4c40f925dc2067e70682c5481a0b70a04d022996b4d SHA512 036b7de703d6650fea7d2047582883f0cfef2eeb2af7031d9a02ab545339d2cf8ee0649f28d3217a45bbdd9a26ea47881368f492530ade1515e92bd963ff358e
+EBUILD kubectl-1.12.4.ebuild 1218 BLAKE2B 07e3137d8a56d669cfa1fb05dedc4526b2376fdda9cdfc4c4d8a67f740687404cec372691f4e55a34d2fd1ddc8487ea0207f1699658910d010d22d19f9a0bc13 SHA512 747a24d27b67332c1c427825368a0e4f1feb3194fc9a7c6107d3463a049c998ff756b325eab950dab45b8b4a8236b0e202ea8bd302915d4f1feacc3335aa3b55
 EBUILD kubectl-1.13.1.ebuild 1238 BLAKE2B 3ad462c2d023292f9a96a4b091f8143ee57105d1b921205e5bf82f6cd18fbf57c3c2d0a9b86637a16190969f0837fc88c23c29d8d82c159f648a9d8ccaf87730 SHA512 73730998885fe748c361d6991c0eb9703363ebdbf2db778ab7ff9333e1a9579973b7dcf0ebcb4d02fea764625f5b8e80aa8aabc38d21a8230d28b3742bc23156
+EBUILD kubectl-1.13.2.ebuild 1255 BLAKE2B 780babfc4390b252a5e0a462c7c7f742db71e8334dad63d716d673c78084c6059a022400f55694a6dd24460dd0168d5a77a468ec27de67819d4f63247a20f1de SHA512 0b1becd62a82972e38eb1dba03eb2c6ce412a6bff2fa857b01ffe2cbd10f4ac7be01a558befadd2ae57968376482ebfa805102522edb6f1e15b7cf348e936c0b
 EBUILD kubectl-1.9.11.ebuild 1217 BLAKE2B bc8d5c0dea2db716297e051807bce2ab809dcf59d02a145221c502965993873b82d1df96dcdbed218a488b70e3241323e138817e9fcecd4e10f2d549f4c4073c SHA512 65e0bb08dec59b7f8c211766ff5aff25b0bb12819072834e2d86e768ba175b45b125b04dd0a316f47169e1ae2c9199e44d66408efeff067c8c2cbba248bb534b
 MISC metadata.xml 331 BLAKE2B 5af758a2aff067b1d7e94cb6d87a27fb96825c56490b5a4c7d9554cbb5057cf10b0dfb7d069f3edf8f7bcdce88b0f6b4286c4622c3cdcf5e5b283c75760f6a1d SHA512 d44cef89f9f902c706b0f9c0c4106bfd6ca094d64c273d0a13da53aec7ba2b238cd6ff489f13765e895ee4a6f2bb4638436839c7c60cce2ece3013fdc27232a4
diff --git a/sys-cluster/kubectl/kubectl-1.10.12.ebuild b/sys-cluster/kubectl/kubectl-1.10.12.ebuild
new file mode 100644
index 000000000000..716e34ce9279
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.10.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.11.6.ebuild b/sys-cluster/kubectl/kubectl-1.11.6.ebuild
new file mode 100644
index 000000000000..716e34ce9279
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.11.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.12.4.ebuild b/sys-cluster/kubectl/kubectl-1.12.4.ebuild
new file mode 100644
index 000000000000..716e34ce9279
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.12.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.13.0.ebuild b/sys-cluster/kubectl/kubectl-1.13.0.ebuild
deleted file mode 100644
index f12e63e59957..000000000000
--- a/sys-cluster/kubectl/kubectl-1.13.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 "/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.13.2.ebuild b/sys-cluster/kubectl/kubectl-1.13.2.ebuild
new file mode 100644
index 000000000000..93cda65f0ea1
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.13.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-lang/go-1.11
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" 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/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index cc1dc6559a93..dd0d419c5a98 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -2,11 +2,19 @@ AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a
 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 DIST kubernetes-1.10.11.tar.gz 25085442 BLAKE2B 1cd758c8f042f9ccd797e67690f31038595a1162e8d50aed849e35dcc522aff3af2ce074f3c27f8dfce536ffb290af5d6bf0f684089eb76567f1bfb33f2764c6 SHA512 db7feafe398436123e66c90a271f714a645da5f170241d01371bfe613e87e2c177610f32325f85e02b63df9e847b19fd6000bff0b35d2635e8f03b31a40b9d11
+DIST kubernetes-1.10.12.tar.gz 25091359 BLAKE2B 8bc053ba737bdbe0cf65a2061f6ed9c959b85af19bf64b7c8c08738ac443b84486ebf229d6eec245b2414dc459987c855ae0d295d35e02c62ec83f8f789966d9 SHA512 74f476617d64e1ae0b520a2a8424c27e76dc5a7829b3565e132da9df6d7b0d6ad20592c4330d8cb5be714d4e40098dfb4d267a278a46df3baee762fd5d797e41
 DIST kubernetes-1.11.5.tar.gz 24813001 BLAKE2B 71c631b53246b9364ca29f5c2aebbf4303e7dbe103dc1d779c5e4f0aa26ee6caf5aab8023a8beb9a9fb513567283fcef4e584218c8cf30d1083f42344139cbfd SHA512 60a28bb32a469517974d1ba6d950d7f1550fea47d951a993edea0036d1b5baf35719edc73c2022291b70532c22241518f8324d70a86083c65fe38863ed04ac1c
+DIST kubernetes-1.11.6.tar.gz 24827575 BLAKE2B 095adccef1b5618f7e5d3a46cbf835f10513a667f663a673e2dedad5820ce59a4fde2208550447677a6693c11d4820db3f12c2e265153a1e33aaca71eadf6798 SHA512 cffe96ae56a6a9e3549090afd84e9e43955ce00f8089a71771c5171ce33b23ef164a67d3f3506326f95c1a602b53ec9d631b7160f6b8a51658c41b6eb048c670
 DIST kubernetes-1.12.3.tar.gz 28042821 BLAKE2B 79c2020608e4e94532b2d525c2c68dfbf9e7660f9047a215675e24f08eb00d145155ea09d9b05f92732c964d47c65138ea9170f6e8fd13ff9d63208a78b60f7d SHA512 6c4ef50240626f97246ed71229463e3649f42674d64bca3a8171728f67807cd0509da9156f53d0e7a8d4967e081cff0f03e0e1469ce5c81313eff67201d49b72
+DIST kubernetes-1.12.4.tar.gz 28064009 BLAKE2B 96cb269796628cde2665cb17bd6918d51a8d2cdebdaf75c65e352beebf7da4bee5da311ddf93931250471e46dd30dbd238727716542c688f364b1f14578d9146 SHA512 f7135a2dd7dac19512db13c0e72264b32c07f4a2f9fbc3573e31fa346415c99738446bd48463c3dd9bee3a716e040dd0c9e681c970603507649eefceca5926d7
+DIST kubernetes-1.13.1.tar.gz 28715812 BLAKE2B f51d456264348cc89aa00b6bbda2c90acfc881ff9d9ff80af77a405c3cf302626e8be96c3bec1f7f3f4df3250e48d02778c1918320484acb7827e8f411ab4bda SHA512 95a5558c9ae2b1e8207d76157f4f52d17236c6aa315ca4c7cac0f18fbe59b061156c05a5d886321b589a6cb675c142754e48f9e0ca7e966116749a32120e92c7
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
 EBUILD kubelet-1.10.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
+EBUILD kubelet-1.10.12.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.11.5.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
+EBUILD kubelet-1.11.6.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
 EBUILD kubelet-1.12.3.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
+EBUILD kubelet-1.12.4.ebuild 1214 BLAKE2B a2b8a51455ab201eb5e3b39cefaaa9a120633340a240a0aa94b1c044d7bf83e3babc2b00f1f75f080d1cdaaa87736588f39890edb677e1dd2c59397d2eee0436 SHA512 772ba0ab7060ab606070ab6bba7ff512e2eaf15acbcc634fc40fc7a0834f750be757c9d7a24b1e59e5c52d60f828ae458f51b533da479cfcab65f0a6145adfbd
+EBUILD kubelet-1.13.1.ebuild 1234 BLAKE2B 4018bb7dded556007c17c0af6f89c29d0032ee2f25309de7146dcb77cfce4ba84b9aabf79e6f54ad39826546db7ff1b1bb7822e32938a867c12d9ff203f0f5c2 SHA512 23ba4e0ec56f97d3aa2ea211f02503df8a82e1a09fcfcaf6cd1976953867bd20d50185d50b9a936d6c311e1a5e84c21abde91c25d3220607d6e1129c1f050afb
 EBUILD kubelet-1.9.11.ebuild 1214 BLAKE2B f3c48603723146398aa863671ace8f8ce2c88b2c0ee34ac27abac8472e9d2db8615a8e29e4a5d6112f78a71fc0234f05f54737f96e3e02792fc9048b984e4417 SHA512 0510752405f29359032aa9a640a5e321bd40a90d3538bb1e327f36552350f0ecb708a5f0cccc3bad17fb1700de76be4c991202e8f207336d4df84767c9fd02cc
 MISC metadata.xml 331 BLAKE2B 0b26ad99c73f232971b31913e935ae852ff738c4a931d0cae848ab454aa44bab3b24f467ae527313af2d8f598bd1d5fd9a89027954df5146f1be0affb8893cce SHA512 257e9afcaaf393a21fc701f3df370e4a772f680829e4afbd29543b3b465b7ba1cf2a590e9b49c5a01acec4953c15a7037d57d74bc619fa70db33d9574cff2f68
diff --git a/sys-cluster/kubelet/kubelet-1.10.12.ebuild b/sys-cluster/kubelet/kubelet-1.10.12.ebuild
new file mode 100644
index 000000000000..33670d2ae36b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.10.12.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.11.6.ebuild b/sys-cluster/kubelet/kubelet-1.11.6.ebuild
new file mode 100644
index 000000000000..33670d2ae36b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.11.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.12.4.ebuild b/sys-cluster/kubelet/kubelet-1.12.4.ebuild
new file mode 100644
index 000000000000..33670d2ae36b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.12.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 "/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.13.1.ebuild b/sys-cluster/kubelet/kubelet-1.13.1.ebuild
new file mode 100644
index 000000000000..e3a65e93f14b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.13.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	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-devel/Manifest.gz b/sys-devel/Manifest.gz
index 82df4eef58f4..6db5085d3459 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index cca5cd5fee6c..e5a2fb8b8a23 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,7 +1,5 @@
-DIST autoconf-archive-2017.03.21.tar.xz 633132 BLAKE2B d2dd681a3b8c30fe50ae70e8c938e6c235e2747475abc7bba62dc1836f9ca49733935ec5372d2497d6dcef43dbf306a5b53604cb300e24915d43c9fbb5a62b05 SHA512 826233fcdd0cb5a1fe18bd52477e3a8afcaf8719ea376b3be0864df6b481f0fef8fd8083485b1565a14c13ad64dbc0ae93149a62e16da9a4d24db8063120cc3a
-DIST autoconf-archive-2017.09.28.tar.xz 645388 BLAKE2B b7b62d30ddde199d0f1a61bb78c50f932ff4e66a57bc318f8dc096f506ab81c3308d389690fdf495c4b9cf405b0139126aea8f4cb3219ed8e94c9c0d707ad065 SHA512 2aa271fdd67fa3caf20e07eb8332d88f7008eefe1df447980d42cb2104313d99947b94ffdb0f6f4b4c8156cfc73d9e0b6c27a5f133c6b73787ef641d9951be90
 DIST autoconf-archive-2018.03.13.tar.xz 649496 BLAKE2B a69c381d734aa41337b8af783196f13e7aa49d936289df237c56a9be7662cd2b766ac42fa10f4cd46feac3998a12c49745d994c5df95b5dd449646dae300a8f8 SHA512 301832a02b1913dd46cc34f6479264b37032d78457b2df526f0aafc752996972ca9c74fdae68fbe0f490268019c45329d564f263cbaff30203bbb4b4a8d5ad5f
-EBUILD autoconf-archive-2017.03.21.ebuild 687 BLAKE2B 9bbda3ebd22e06f9ccac2bb9cd09c36ae37cadea5caa31095109d79978e6c1574148bfe091e9677e54d89520e80d357917869032441cf6ef9996a53affe12a2f SHA512 e7d95e98a548a02d48e784bc7ee2bc65b3fffdf49dbe0ce671cb0c6218a97fa61262ff0b38817d2dea34a63eb9d9303102e76503359a5aea4e2cca0ee3ffed31
-EBUILD autoconf-archive-2017.09.28.ebuild 698 BLAKE2B d10ceb151160380628dac564271da9586d01a3a44eefa8d9bd05cb6742f25233eb5fb80a1403a3fdf5f61cf38978cdf4cfcc3742426aafcd3b4c5c9c54bbb799 SHA512 9f7e4e77c305f4cffe360a75e05a9ab585e84d9b873049fb721bd5896dcff70fb3576f5c87f18ec2179f10f3f0f0f058586c9d83569b24cbf40680bf04df2cf4
+DIST autoconf-archive-2019.01.06.tar.xz 651320 BLAKE2B a311b8e6bdd45337194451a696e2435ce758e7c9b1d12639b5837f23c8ea051eb63152952fb944b14fc1db1baa1f1a3e3516fa931fa411b0f7aa08a2040ddcff SHA512 14bf8d0bf8be4a4dc078677de1977e496d4d9cf095bc897c174e331311b722cd3a34054e74c2146fff4b5c84269463e6a6fc61907d77d1c51bb221c8fb124fcb
 EBUILD autoconf-archive-2018.03.13.ebuild 725 BLAKE2B a0b61eace8f6ceb2780ed644aaf087521dcd9cb65449523242691906e6ee2cb2408e9d728a557d6c93db238152432f86c0e888c161ae9d216c813bb8b6b9795c SHA512 847e2eb96fb424f5ca363f1621e29b9545c9a413ae2bfa98de829a0f26c37654d869d5d4463494afa863cdf98ec7e20422371f467f7b3ee95d676fbbd8b6892e
+EBUILD autoconf-archive-2019.01.06.ebuild 673 BLAKE2B 0e3895dc2b8141d7c20b72925ee8cde27834c7dee2f9233e5f2eac6212e5e07e2a79f3860684485f035ca0d1a59ac89a19c54d8ba763a5b24c5e7af43b75c602 SHA512 ce43f4254e99628a9f3a57b605c756d2aa08e2763d8d63d6bbf4abaa0a8f3e522e7ec2cee9202846cbffc25b46bb2fc89aab29ec341a9a5e46ed6edcf1a41d09
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
deleted file mode 100644
index 3d7b45ab32b8..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="GNU Autoconf Macro Archive"
-HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
-SRC_URI="mirror://gnu/${PN}/${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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# File collisions. #540246
-RDEPEND="!=gnome-base/gnome-common-3.14.0
-	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
-DEPEND=""
-
-src_install() {
-	default
-	rm -r "${ED}/usr/share/${PN}" || die
-}
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
deleted file mode 100644
index f07985ef6361..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.09.28.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="GNU Autoconf Macro Archive"
-HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
-SRC_URI="mirror://gnu/${PN}/${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# File collisions. #540246
-RDEPEND="!=gnome-base/gnome-common-3.14.0
-	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
-DEPEND=""
-
-src_install() {
-	default
-	rm -r "${ED}/usr/share/${PN}" || die
-}
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
new file mode 100644
index 000000000000..6969fb01803c
--- /dev/null
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="GNU Autoconf Macro Archive"
+HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
+SRC_URI="mirror://gnu/${PN}/${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# File collisions. #540246
+RDEPEND="!=gnome-base/gnome-common-3.14.0
+	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
+DEPEND=""
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c774e0e49df0..6c116b834a8c 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -7,6 +7,7 @@ AUX 5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch 2846 BLAKE2B a5d
 AUX 5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch 1376 BLAKE2B baa36d2b05118859ffc5af12e9b5a8ed0dac3c262736ef2bab5f89049267dca5a94e134b078c06f09cafcc678fb8adefcf84f940806b594777a1f05a1e216a80 SHA512 f4e31053c03429528fc193a4550784b21d60fa0487700c1f416952c5d92b71988ca481b53c00f95f0c8c39f5f30e9ddd5cc6bee5334294fd3e4df24b8a450e69
 AUX 6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc
 AUX 6.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
+AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
@@ -31,7 +32,7 @@ EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da652
 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ef0c63cfe38db99be4b9236d04eba4107092869e6c4dcc64e5a4cddf2d7931652607fce6292a8158ea9ff545ffb0296bca3670fd386e132c05239384190bbde9 SHA512 77045fdf3606b88c4f7f3021399c34b61876e80be7fa84ccb3a464e8caa19fcdbc896eb4f2d08d4f9f39dd7bdb03b9557135a710a00b92714ac2b29d6ba8e2d5
 EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db268307373cfe5130c09c2f07753c5eaa92220ab4f117ae1396ae5ff7cb13fb42765bcc44f7e0aa3decd1c7ce1c93dd2 SHA512 3dc65b62475430748da620f6dcd83943b5de88a28d666b321f107439a8cec88694285c6cf2cd90e0cca78b8f75d3c7af98ca70099500dfd1a59685aadb4fc630
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
-EBUILD clang-7.0.1.ebuild 10131 BLAKE2B 62278d00c31e3945066fcca9215bcc9cf9d699a5015add6306470ef78944449453721f31e12477d9ce78baa4e6f8357483ff7de31022b25a971267e4cf1ff7d6 SHA512 b2ea37b1b873be7e44fc9536afe32685fe5c6bbecfb363c31150b1ba3a04306fe61de13f5d6ca644b5c66f469b775e272443b2acdaf61f5e9cfe0fc1f1481b16
+EBUILD clang-7.0.1.ebuild 10292 BLAKE2B 09856bbb082206962b40968f0553d40005a9b47000c2f612d2052bbca72e8c0e6e1bd5f3605deae0779167263e054e3f3c403a4bf5317cc48855dcc85664218f SHA512 f6239ddbad9a90e2006ab6358594ea035782a5f44fd5ffb76714c3ec85fd1f3711b1d9242f1e51a494a403b60eb03d8cade16bc2bf2e81af614d4942cc2a3583
 EBUILD clang-7.0.9999.ebuild 9427 BLAKE2B 60c2334a185dec4b05de6eb73eccd498bd707703dd80c429f6ffdfd74b2fb9ee82b916df14ff7433857cab5d5381b9e9527ab53560c4362a57f187fefc7e6e71 SHA512 dcdef2d19e4c10302607595349a2ad5b5e58fdcabb16a798713cf2e8f2dda0cd2d778b7f8b1769b8326bb75043daafeb2bcf48c722614c11dfcadc1b0861e49f
-EBUILD clang-9999.ebuild 9495 BLAKE2B 29efb16398715df4d7355f4baf6ea70d81e4c2785a4ea8cf8188130e495e9f1fe43fec81e507b1015bad36fdd957971d67b19fd8beaa942587094c897f09c267 SHA512 2df7920e0732a0d08564a61ac4a647cd54177117596d50dbda2c555b0925a16d87d67f00402f54d4ae15fd26ae877b17b14d6f203411ae56f2174ae8a3928953
+EBUILD clang-9999.ebuild 9507 BLAKE2B d80b2dea59f1e942e67fcf9ca322ee85be631b59e79adcb2cfd40577875248188cfc173607efac57febc0b1463083e991dda65244bd6663655ddf19564db6c70 SHA512 682d2c98a82d7b3be48820737ed46e363e53d9f4c74cb2f53e4cac4a546872af269dc1d40b601c05b42fd9ed886003f8ff2f1af1045e4edc7a97d660ad15d5f9
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-7.0.1.ebuild b/sys-devel/clang/clang-7.0.1.ebuild
index 628a17f3f484..e48ada0998b5 100644
--- a/sys-devel/clang/clang-7.0.1.ebuild
+++ b/sys-devel/clang/clang-7.0.1.ebuild
@@ -71,6 +71,10 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
 PATCHES=(
 	# add Prefix include paths for Darwin
 	"${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
+
+	# fix detecting atomics library in clangd
+	# https://bugs.gentoo.org/667016
+	"${FILESDIR}"/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
 )
 
 # Multilib notes:
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 9e95b51eaf98..bf5ab043a347 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
 	static-analyzer? (
 		dev-lang/perl:*
-		z3? ( >=sci-mathematics/z3-4.7.1:0= )
+		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
 	)
 	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	${PYTHON_DEPS}"
@@ -137,7 +137,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
+		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
diff --git a/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch b/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
new file mode 100644
index 000000000000..151c2b5e8e8a
--- /dev/null
+++ b/sys-devel/clang/files/7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch
@@ -0,0 +1,38 @@
+From 74aa5bb20b3d8e1ed2b590053fdd665e9dde8462 Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 3 Jan 2019 16:43:27 +0000
+Subject: [PATCH] [clangd] Fix detecting atomics in stand-alone builds
+
+Include CheckAtomic CMake module from LLVM in order to detect support
+for atomics when building stand-alone.  Otherwise,
+the HAVE_CXX_ATOMICS64_WITHOUT_LIB variable is undefined and clangd
+wrongly attempts to link -latomic on systems not using the library.
+
+Original bug report: https://bugs.gentoo.org/667016
+
+Differential Revision: https://reviews.llvm.org/D56061
+
+git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@350329 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ clangd/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/clangd/CMakeLists.txt b/clangd/CMakeLists.txt
+index 39467bd5..251ee7fc 100644
+--- a/tools/extra/clangd/CMakeLists.txt
++++ b/tools/extra/clangd/CMakeLists.txt
+@@ -2,6 +2,11 @@ set(LLVM_LINK_COMPONENTS
+   Support
+   )
+ 
++if(CLANG_BUILT_STANDALONE)
++  # needed to get HAVE_CXX_ATOMICS64_WITHOUT_LIB defined
++  include(CheckAtomic)
++endif()
++
+ set(CLANGD_ATOMIC_LIB "")
+ if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+   list(APPEND CLANGD_ATOMIC_LIB "atomic")
+-- 
+2.20.1
+
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index cab4e60c61af..bc27427c9a35 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -6,6 +6,6 @@ DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f
 EBUILD gcc-config-1.8-r1.ebuild 1161 BLAKE2B db1db6716e17f201f125a9a758056cc14ce95eb90acb26805304525222022982ad2e67a47e879ea627a662063da899a07ed274dc2b22af8043ef0d36a11436c2 SHA512 57bab539041f364492082412524b643aaabb8fe1c40ec553429950a33b7578048a2b1395c1f586a9157c26eb87e528c53eba44de583f9232135a5a9cb4c47d69
 EBUILD gcc-config-1.9.0-r1.ebuild 1112 BLAKE2B 287025d72d30838127ee77f7d072e2bc8847c766c665544a41d23dd8e3a36beb24eb108052735b95dc881fc837ad184d4be15a84f81eaf9bce6fb1d7fbeb4489 SHA512 a7deecbd421587d539e89029abecba739a72e45174df8bcab09ae8afc966694a78ee8fea62b6a162446ff5d31a593caf0af73a88fb1e6f41270e6cc46e82f48a
 EBUILD gcc-config-1.9.1.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
-EBUILD gcc-config-2.0.ebuild 1203 BLAKE2B 7c0953c929423ad9b59b7214034899700e28abb55f559fd6f873aa4670a49137af88cefa22357a1c4d9023531f9b5a0dce82fe2fa304c2720b678b2e0b84844c SHA512 8e3f9e82ac962013fcbcee8fb321f42f709dde46c07e1a4734582fe9ca2f29346fd562189c3c90dcdc7d3581646a6792d72df515aafcc5d9bd3dee9ba0dab40a
+EBUILD gcc-config-2.0.ebuild 1202 BLAKE2B 67972119247fcbfa65a03622ef6b92fe1f1f3f2cef8ab67cbf879aee3502971a37edaf7603855594d15000d9323bbbb5a0fc63aac303cd4ce7e69c620cfb5aa9 SHA512 f13d074cff84d5f4086a70b6b1a4dabe44d197800655a3b8daafed98073dc45752817c914a45fe5c9da6cd4f1a508d283e3a16ed8bec618efc18b3a4dba0c08d
 EBUILD gcc-config-9999.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.0.ebuild b/sys-devel/gcc-config/gcc-config-2.0.ebuild
index 46440d36bc6e..027b650ca725 100644
--- a/sys-devel/gcc-config/gcc-config-2.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gdb-apple/Manifest b/sys-devel/gdb-apple/Manifest
index 6da77e1abea1..f34b2379a413 100644
--- a/sys-devel/gdb-apple/Manifest
+++ b/sys-devel/gdb-apple/Manifest
@@ -1,20 +1,8 @@
-AUX gdb-apple-1461-darwin8.patch 3024 BLAKE2B f1a7b99fb8b0fef12261684b2791b8aa5851eb652ba386c6c21ebb745d0af4e7e221c3c3a1142b10801a5f0eeff63a8792c34017b3cbbf5622e51fb1741b5412 SHA512 a527366d60f80c9b771a2d130e12c27ec3c75c24119f49f417bc5a63a4d62a7725402d8616a464c8b359fea31396d28d454fa96797f7ef0accc58434a0ea73d9
-AUX gdb-apple-1461-dyld-info.patch 477 BLAKE2B 6bc4ef849402de1f3d1613a9a78dfb8bf00d349f89975f04af5a2d7f966a75891e7fb86ca909d9b0f4ada0e501c7dcbbc3119a29e66602c2ecad629032daf143 SHA512 6e54160f4fff7d36b1ef3740dea112d9cf84d75e52ab42c61caa9e2668d87921ba33c3e43123befa89e04d4e104b986c095a022d81a34d2c87006606a64d2bc4
 AUX gdb-apple-1518-darwin8-9.patch 2260 BLAKE2B 29c00d40a6f34f2f602b0ecfaa4079b7e70cbc2a30d1bf93c6c93cb03168bb93a1af749b8631b05950863fa8d46b0060f9270f4980bab937aac50c8c738afb3c SHA512 7c079c480b3ed1e9d6cfed78ea87358988a4c72a0e89f4cd76e12b235e9451ab6ea77679ad0953f224e6c30ba0d078c5ce4e1a25f6bbd1134214dd721b0420b6
 AUX gdb-apple-1518-darwin8.patch 3022 BLAKE2B e2c60e539fd81af137ac915a1c957ad62482686f196e941fcf9946f10682e35ecfe9438e04b6f0f9618b6fcb9c06ae363b97c2cf45cf1a13befad399b74df6c0 SHA512 efa100767336d0eba752d03d5d6ea6a77c80e40160208cd157abc444064c779f9d671e5a621cbeae8f7b2ae134e838e49a2726d1d9efcbd8421070a6b789679d
 AUX gdb-apple-1705-darwin8-10.patch 286 BLAKE2B f7f038e870aafe73ee79251bee1441e9186db898e211556212a53c1a0ec935059d1e16766d4bddffda980777c972bb661b09b6bb8973e6f3cc6b00008b37e3f3 SHA512 baf049e3a1e580faeb5b5481bbdda5cfd96abb22ec7dd2528986c4fa78113933565a9a1711f4dcf8bed9edd27190aa9f5f04d7df141b0eb1aa65b18b57915061
-AUX gdb-apple-768-darwin-arch.patch 571 BLAKE2B e77d26f86390b51758da726887b8cb376443a0bcf98225f5f8ee2de3b8e829f8b65380c67b83fb003b84822f12f0bbecddc4753fb6e3af3fc6672223bdc07443 SHA512 5d5345c0b9aab9610bfeb3adf98f92f2d132e198ce69278b8a7e35e59d9b45955b5eabd0cf2e6dd085a034369826804d833ec841726729a1272b06a8d7b8592b
 AUX gdb-apple-768-texinfo.patch 487 BLAKE2B b429247205cb241c1b876d3477310b201ab9191d582daf2f40bae92f782680df3d60fbaf335ef5a91db7bab0fffd87ff8783813f1efca690ae255157f9f98464 SHA512 fb40c8c713e0cdd34df82b368fbae5b9cc4180a6519f303750d72181dcac31436f947fc01c6949bbfc8bf8a7be4459cb2083e821433c1c4e9a587e2171933b92
-AUX gdb-apple-962-darwin64.patch 580 BLAKE2B e215baa922cce04b243546559d0136174b6148a3944eacb3099d1d2c30f187f808c5b102b12a5b7208209c8621b724b9288d57fa208f2b7143ebbe556732ef7d SHA512 2b940cfef9caeac9aa863ab53349de083026258458321108d54e4605d1030f496701e666a720e530d530ede0db7b59694f3fbc4ab28a6122ca1e28c03bbae8a2
-AUX gdb-apple-962-darwin8.patch 402 BLAKE2B da41ed1b548eee0ea0c46d98ded18810dff31b9d6dde7836ea487820def7d29a491b800489b09a5aa8e9a1a300d950908939c42a6bb492078d23bd5af11228ae SHA512 e6c8a48eef811c061e9ec48b4a99f653b6dcfd02d4c4cd7b0135e170eca8240183da563fe62de600156b065f5a74d64fbed84f9c3763324d6697168486750237
-AUX gdb-apple-962-demangle.patch 708 BLAKE2B a3e59d622b0e3892fe2dcfccf5657440a6dc73fb5af9889b152ae9cd8871a934b8062590983e24035bc263da88b3fc6d3e975755ff515f3615792d3c5effed4c SHA512 623db08a7c378f2644faf22a41cf57341f9bbecd7ad319e32651a8f4eff2935bb9914443143a749dabf255a1f99dea133daa487dc3192bacc1fc8f7eb088dec4
 AUX gdb-apple-no-global-gdbinit.patch 714 BLAKE2B 188d5f51bec24e54357b451e26e607b53e5009ded5232fb21c513c97e5833636d041d73d0d4411b7b49810a88ec432d3fa4ef83f765a9e5fedbc047478c43160 SHA512 e692621595562f002a8f2d170cf3aed087f09ddb0578e2a8bf4bdac77119ee7c4a921f9d4a10273a3c0b7cbe95299d936c93971b5ff1a73fd528f8d1984f7a4c
-DIST gdb-1461.2.tar.gz 17951571 BLAKE2B 53871df6574c73b37ce0a7ee353eca1fa81a6be4b6389ee41a9a140d091579df98f5fe44e0dfb9a14a0309cc3510c566a5af73af231a9070f55308434ea6373a SHA512 2d8b11ed575e26176a8f93eb7d2fbc052313114ffce10f0da6888ff9e7c30067d4db6d89c9443187bf7167823dfd631a7f56fe718160b5653791080df9b8163d
 DIST gdb-1752.tar.gz 17922994 BLAKE2B 9b27bca2b6a9f10e01d130d595270300a4e7f0040790c5b60337d41086e1238dc12d785cc88c484df630f742ddfe783f7baefc2132b47e41bb74a5d0b7ebbf1e SHA512 863a861a9a7708b8a763ea93599f6b519277f23fff35700d04e81a7747cc49421d0f051790deb92c440ced30ee15ba719b75066d5a614341e0f0b765d7a81094
-DIST gdb-768.tar.gz 17727326 BLAKE2B 9c233204d276c673f4f653888f947ecc73cb9e09c0cd9dd3879a0e47f2b50942a38513826c005cb3bd04019fbac5f7c01860f98304884ba8d3c81b63cffc89ac SHA512 40395d2e8ca30bb7aa0bbb0b270cbb9c18decc5a8fb37a764d43770e234b6281528d6feb301bcd97033c624c196851283fdbfc131f0336772a1e6e4b0168ae47
-DIST gdb-966.tar.gz 17769429 BLAKE2B c27a8fb6884eabf56855817fbcca2e0566df834d541bee1cf87954bdafd82d6eac673d46026ca8101ea5b2ac3ad1da14bcc9d9bf5a20fade099fdd7df54d6936 SHA512 daaf6f0329e311d46d82734df87fd501f70281edb511a8eb9123b6288a6a97f84725acc0f1c5e67dee3dc3e00cfa31bf7fc20594fbf3827a0ea35414f5ef7434
-EBUILD gdb-apple-1461.ebuild 1752 BLAKE2B b30ff64ae73f655f8694c775c5ec97c1333b6e5adb5dcddc616d5677b1aef2cbcc63b4fb85ee726348a90e557d7ed1266581261252585ffa7967987418b4432e SHA512 14abd93c0f62ca59b438737c17c0ad780dbfd3cbaab45a462f3ef421c9ebcec36a7568e2a17ed46a0fbefb4b98e42f0273868bc3e9b38c1f6fb9ce7a9cd772b8
-EBUILD gdb-apple-1752.ebuild 2119 BLAKE2B 0aa1606612bf991bc3d1fbdaefa3413fab413c3f03f24daaa8f1e7e1a08b88fa3f900d8474563350a924e3aa1a39edc64cfa0d15258186a354403810af6115a1 SHA512 c500687a44ca3296bd04c15e37ee060eeb8f9885f111a6d50230b1846252734d2e40e430d8a57c6a4c91a34f04f50a814a6fe2c524e4e649fe64ce511b7a1f4e
-EBUILD gdb-apple-768-r1.ebuild 1085 BLAKE2B 289bf19991c5e139409b4c89aa216cf57abe9848cb9afaec56969687d657a75d9a6841bb2865d3447958e1a1fc90b97d6d673fd21bbfc3b7a2a1eb5a343b05f4 SHA512 fb94c73b167e1aec67db74e210112df142d3f70500c4d2e3672a662d498ae6b321fa93e4fa087ce95a4e9085e57d9970d47856d6108184aa574af4e9fa95bb5c
-EBUILD gdb-apple-966.ebuild 1687 BLAKE2B 006394faba157c56404ac8fd0fb694228109e13b111ce94b8545dd918df969e827ecbcb3a9f5c0c58c5b25b6d1495643e0179a0b4b0e2d4b234b25e46e5fb477 SHA512 c222b6ea16b2cbcb9009182a66083fb7de5994ab529e5467e5c2031b37b6540d5607c017084b3ed8072341ae082c642575af10f63ec26487ab97e9d13953584b
+EBUILD gdb-apple-1752.ebuild 2716 BLAKE2B 2891ed93ac84cdfe1ee77ee0056e6252c4d656af5c5ebdef16af2f138d9b56fc13cd06ee1eeb1ee8a76efff47c4d666ba2771b5987ccff486db3d2821c48b6b6 SHA512 17ce69586a7e38e2dda5f6a9825a3d5a11fd72ba6cce5fa0ca06865d5b160a7e131f88c54e8604421bd9a43215a7a4a85d1ad1d1f80c4a3500b23de6bef1aa7f
 MISC metadata.xml 247 BLAKE2B 5589fe7154425e3eb144170de1f3a024df3fd2b642731f4565abc21498d16dc424613cae78f8b30f0d4341bd9ed1712fdb3beec8d0436192d3d8612c7db9b7c4 SHA512 ae91bc559b2380b04af0bacbaf419deb042e9a9235c596c1afdbbb3933e59ba4f895c6e7ebf8fa4884702d5b39febedfdcce109ab912d6ef4f51b3696bc82c18
diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
deleted file mode 100644
index c89c82a0d18c..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- a/gdb/macosx/macosx-nat-inferior.c
-+++ b/gdb/macosx/macosx-nat-inferior.c
-@@ -60,13 +60,17 @@
- #include <sys/sysctl.h>
- #include <sys/proc.h>
- #include <mach/mach_error.h>
-+#if defined(TARGET_ARM)
- #include <spawn.h>
-+#endif
- 
- #include <semaphore.h>
- 
- #include <dlfcn.h>
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-inferior.h"
---- a/gdb/macosx/macosx-nat-info.c
-+++ b/gdb/macosx/macosx-nat-info.c
-@@ -45,6 +45,22 @@
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-debug.h"
- 
-+#ifdef __ppc__
-+#ifndef __darwin_ppc_thread_state
-+#define __darwin_ppc_thread_state ppc_thread_state
-+#define __r0       r0
-+#define __srr0     srr0
-+#define __srr1     srr1
-+#define __cr       cr
-+#define __xer      xer
-+#define __lr       lr
-+#define __ctr      ctr
-+#endif
-+#ifndef __darwin_ppc_exception_state
-+#define __darwin_ppc_exception_state ppc_exception_state
-+#endif
-+#endif
-+
- extern macosx_inferior_status *macosx_status;
- 
- #define CHECK_ARGS(what, args) \
---- a/gdb/macosx/macosx-nat-infthread.c
-+++ b/gdb/macosx/macosx-nat-infthread.c
-@@ -36,8 +36,10 @@
- #include <sys/dir.h>
- #include <inttypes.h>
- 
-+#if 0
- #include <libproc.h>
- #include <sys/proc_info.h>
-+#endif
- 
- #include "macosx-nat-inferior.h"
- #include "macosx-nat-inferior-util.h"
---- a/gdb/macosx/macosx-tdep.c
-+++ b/gdb/macosx/macosx-tdep.c
-@@ -63,7 +63,6 @@
- #include "gdbcore.h"
- 
- #include <dirent.h>
--#include <libgen.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
---- a/gdb/remote.c
-+++ b/gdb/remote.c
-@@ -62,7 +62,6 @@
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-dyld-process.h"
- #endif
--#include <execinfo.h>
- 
- /* Prototypes for local functions.  */
- static void cleanup_sigint_signal_handler (void *dummy);
-@@ -474,11 +473,13 @@
- static void
- remote_backtrace_self (const char *message)
- {
-+#if 0
-   void *bt_buffer[100];
-   int count = backtrace (bt_buffer, 100);
-   if (message && message[0])
-     fprintf_filtered (gdb_stderr, "%s", message);
-   backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-+#endif
- }
- 
- static void
---- a/gdb/symfile.c
-+++ b/gdb/symfile.c
-@@ -67,7 +67,6 @@
- #include <ctype.h>
- #include <time.h>
- #include <sys/time.h>
--#include <libgen.h>
- 
- #include <sys/mman.h>
- 
---- a/gdb/utils.c
-+++ b/gdb/utils.c
-@@ -27,7 +27,6 @@
- #include "gdb_string.h"
- #include "event-top.h"
- #include "exceptions.h"
--#include <execinfo.h>
- 
- #ifdef TUI
- #include "tui/tui.h"		/* For tui_get_command_dimension.   */
-@@ -874,6 +873,7 @@
-   target_terminal_ours ();
-   begin_line ();
- 
-+#if 0
-   /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
-      to get useful bug reports.  */
-   {
-@@ -882,6 +882,7 @@
-     fprintf (stderr, "gdb stack crawl at point of internal error:\n");
-     backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
-   }
-+#endif
- 
-   /* Create a string containing the full error/warning message.  Need
-      to call query with this full string, as otherwize the reason
diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch
deleted file mode 100644
index fb9ca9c74115..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-1461-dyld-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-If dyld-info is not available, don't try to compile unreachable code
-using it either.
-
---- a/gdb/macosx/macosx-nat-dyld.c
-+++ b/gdb/macosx/macosx-nat-dyld.c
-@@ -731,7 +731,7 @@
- {
- #if !defined (TASK_DYLD_INFO) || !defined (NM_NEXTSTEP)
-   return 0;
--#endif
-+#else
- 
-   if (target_is_remote () || value == NULL)
-     return 0;
-@@ -791,6 +791,7 @@
-     }
- #endif /* NM_NEXTSTEP */
-   return 0;
-+#endif
- }
- 
- /* Searches the target address space for dyld itself, returning it in
diff --git a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch b/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch
deleted file mode 100644
index 5442ba8ba636..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-768-darwin-arch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* configure checks for /usr/bin/arch to determine whether "arch" is ok
-  to use, so don't rely on the path at runtime, since GNU arch doesn't
-  understand -arch at all (and only returns the current arch name)
-
---- src/gdb/fork-child.c
-+++ src/gdb/fork-child.c
-@@ -243,7 +243,7 @@
- 	  arch_string = "x86_64";
- #endif
- 	if (arch_string != NULL)
--	  sprintf (shell_command, "%s exec arch -arch %s ", shell_command, arch_string);
-+	  sprintf (shell_command, "%s exec /usr/bin/arch -arch %s ", shell_command, arch_string);
- 	else
- 	  strcat (shell_command, "exec ");
-       }
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
deleted file mode 100644
index 4417cee76e4d..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin64.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* todo: extend for powerpc64 also
-
---- src/bfd/config.bfd.orig	2009-06-23 11:05:43 +0200
-+++ src/bfd/config.bfd	2009-06-23 11:05:47 +0200
-@@ -500,6 +500,12 @@
-     targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
-     targ_underscore=yes
-     ;;
-+  x86_64-*-darwin*)
-+    targ_defvec=mach_o_le_vec
-+    targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
-+    targ_archs="bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
-+    targ_underscore=yes
-+    ;;
-  i[3-7]86-sequent-bsd*)
-     targ_defvec=i386dynix_vec
-     targ_underscore=yes
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch
deleted file mode 100644
index 05a088b93fb3..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-darwin8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* 10.4 doesn't have posix spawn, but fortunately it's only used on ARM
-  (iPhone), so we can still compile it
-
---- src/gdb/macosx/macosx-nat-inferior.c
-+++ src/gdb/macosx/macosx-nat-inferior.c
-@@ -58,7 +58,9 @@
- #include <sys/sysctl.h>
- #include <sys/proc.h>
- #include <mach/mach_error.h>
-+#ifdef TARGET_ARM
- #include <spawn.h>
-+#endif
- 
- #include "macosx-nat-dyld.h"
- #include "macosx-nat-inferior.h"
diff --git a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch b/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
deleted file mode 100644
index a302ce56ec91..000000000000
--- a/sys-devel/gdb-apple/files/gdb-apple-962-demangle.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-in 32-bits mode this goes /just/ right, in 64-bits mode Portage aborts
-because objc_demangle is implicitly turned into a pointer
-
---- src/gdb/maint.c.orig	2009-06-23 11:12:15 +0200
-+++ src/gdb/maint.c	2009-06-23 11:19:58 +0200
-@@ -31,6 +31,7 @@
- #include "symtab.h"
- #include "gdbtypes.h"
- #include "demangle.h"
-+#include "objc-lang.h"
- #include "gdbcore.h"
- #include "expression.h"		/* For language.h */
- #include "language.h"
-@@ -167,7 +168,7 @@
-       switch (current_language->la_language)
-         {
-         case language_objc:
--          demangled = objc_demangle (args);
-+          demangled = objc_demangle (args, 0);
-           break;
-         case language_objcplus:
-         case language_cplus:
diff --git a/sys-devel/gdb-apple/gdb-apple-1461.ebuild b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
deleted file mode 100644
index 7127e61d2445..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-1461.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-APPLE_PV=${PV}.2
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2.2"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${APPLE_PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-no-global-gdbinit.patch
-	"${FILESDIR}"/${PN}-768-texinfo.patch
-	"${FILESDIR}"/${P}-dyld-info.patch
-)
-
-src_prepare() {
-	default
-	[[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${P}-darwin8.patch
-
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		--disable-debug-symbols-framework \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -R "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
-		ewarn "Due to increased security measures in 10.5 and up, gdb is"
-		ewarn "not able to get a mach task port when installed by Prefix"
-		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
-		ewarn "have to perform the following steps:"
-		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
index f374628fb7d5..6f9458c8f084 100644
--- a/sys-devel/gdb-apple/gdb-apple-1752.ebuild
+++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 APPLE_PV=${PV}
 DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 4.3"
@@ -17,10 +17,12 @@ KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2
+RDEPEND=">=sys-libs/ncurses-5.2-r2:0=
+	sys-libs/readline:0=
 	=dev-db/sqlite-3*"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	|| ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )"
 
 S=${WORKDIR}/gdb-${APPLE_PV}/src
 
@@ -34,9 +36,22 @@ PATCHES=(
 src_prepare() {
 	default
 	[[ ${CHOST} == *-darwin8 ]] && eapply "${FILESDIR}"/${PN}-1518-darwin8.patch
+
+	# use host readline
+	sed -i -e '/host_libs/s/readline//' configure.in configure || die
+	sed -i \
+		-e '/^\(READLINE\|readline\)_/s/=.*$/=/' \
+		-e '/^READLINE /s/=.*$/= -lreadline/' \
+		gdb/Makefile.in || die
 }
 
 src_configure() {
+	if tc-is-gcc ; then
+		# force gcc-apple, FSF gcc doesn't grok this code
+		export CC=${CTARGET:-${CHOST}}-gcc-4.2.1
+		export CXX=${CTARGET:-${CHOST}}-g++-4.2.1
+	fi
+
 	replace-flags -O? -O2
 	econf \
 		--disable-werror \
@@ -47,11 +62,15 @@ src_configure() {
 
 src_compile() {
 	# unable to work around parallel make issue
-	emake -j2 || die
+	# ignore texinfo issues (version mismatch, to hard to fix or
+	# disable)
+	emake -j2 MAKEINFOFLAGS="--force" || die
 }
 
 src_install() {
-	emake -j2 DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
+	emake -j2 \
+		DESTDIR="${D}" libdir=/nukeme includedir=/nukeme \
+		MAKEINFOFLAGS="--force" install || die
 	rm -R "${D}"/nukeme || die
 	rm -Rf "${ED}"/usr/${CHOST} || die
 	mv "${ED}"/usr/bin/gdb "${ED}"/
diff --git a/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild b/sys-devel/gdb-apple/gdb-apple-768-r1.ebuild
deleted file mode 100644
index e9f84fc168a6..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-768-r1.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
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, 10.5"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-texinfo.patch
-	"${FILESDIR}"/${P}-darwin-arch.patch
-)
-
-src_prepare() {
-	default
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -r "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
diff --git a/sys-devel/gdb-apple/gdb-apple-966.ebuild b/sys-devel/gdb-apple/gdb-apple-966.ebuild
deleted file mode 100644
index 7ffb29ce62ac..000000000000
--- a/sys-devel/gdb-apple/gdb-apple-966.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.1.3"
-HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${PV}.tar.gz"
-
-LICENSE="APSL-2 GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2
-	=dev-db/sqlite-3*"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/gdb-${PV}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-768-texinfo.patch
-	"${FILESDIR}"/${PN}-768-darwin-arch.patch
-	"${FILESDIR}"/${PN}-962-darwin8.patch
-	"${FILESDIR}"/${PN}-962-darwin64.patch
-	"${FILESDIR}"/${PN}-962-demangle.patch
-)
-
-src_prepare() {
-	default
-	# for FSF gcc / gcc-apple:42
-	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
-}
-
-src_configure() {
-	replace-flags -O? -O2
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
-	rm -R "${D}"/nukeme || die
-	rm -Rf "${ED}"/usr/${CHOST} || die
-	mv "${ED}"/usr/bin/gdb "${ED}"/
-	rm -f "${ED}"/usr/bin/*
-	mv "${ED}"/gdb "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
-		elog "Due to increased security measures in 10.5 and up, gdb is"
-		elog "not able to get a mach task port when installed by Prefix"
-		elog "Portage, unprivileged.  To make gdb fully functional you'll"
-		elog "have to perform the following steps:"
-		elog "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
-		elog "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
-	fi
-}
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index b88d4b524620..d0d036480cbb 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -1,8 +1,4 @@
 AUX make-4.2.1-glob-v2.patch 1073 BLAKE2B bcced0694ed0206394d750452cec2c0ee8356fd8b779b9ee4d6fbf0d3dd736a0465b0f12a1629508669efb7c4ffe1d17f1aeb9b925d86e9e75a5b90119ddd5c9 SHA512 2f19578979cc5af622d6571e4d9c97e5567acd4036076e9c426a8d4505b6da191cf9b6edb1cecc0aff14efce52d3062c21d10a36d569743acdfc660007f928f4
-DIST remake-3.82+dbg0.9.tar.bz2 1152677 BLAKE2B bb4c61b2bad39be1e50c919c2c4b2f069df31a6b6d6e51863257a20ecace2395a16349f8dcafcb4c5bf020d423d91d7d9c9a3098ff2f6d2891a5d3bdbf54b126 SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf
-DIST remake-4.1+dbg1.1.tar.bz2 1254246 BLAKE2B be1b18329b36d6c34aaa3270ae2c69b042d467d19bc99ac13562df387a3f0cd0bf19c7e39aebfa983614355c2d0921620609894850e1eb66f24ed08aea36ead3 SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421
 DIST remake-4.2.1+dbg-1.4.tar.bz2 1508613 BLAKE2B f83bf8b1154d87d3c729b51797011511c6d9a249dffd212a551602a2af1c874d50d631d0f0e3f00d1b4484db758b7d167c416b0be185ad2a16897a077d04e9f4 SHA512 ffb7d641e0bc99794c17f634fe0aa5bf909c1e1c8eb14873dd27f2950d913db393c3532c34f417307eba351e8732c366131a23e661f5fec9529edc5d778da0d1
-EBUILD remake-3.82.0.9.ebuild 620 BLAKE2B b81d8e2b9c9e3bab02b116f21ad5484d7b2e49711a9ef5f9d71660aebc1e02c515e0ac82639fe51f752042a0fac4d7e6d995b36ad0ca090418e3b3be58733153 SHA512 78bfb6261ec1bf419ad9740154aa7caba439ad973adaca5a0c7cc7e68a5ba696195f097e3171f186e44f899a7e297d21c7fb8fb2b5828b98a4e7e5327edfb496
-EBUILD remake-4.1.1.1.ebuild 834 BLAKE2B d04bb04d37c434dc64790c4b744bd46b71857c547d44ddf735ba03d211381cb7ac408c2cf84d9c1cec3db7b855c7d4d58526390fd269fd9658f3e5251c3ee1cb SHA512 703662b02b790965479822a6017a0b64407641bb9bb3c8dc50d5aa3853a2a5da80b2c86d4849095383a519c6613b51b4ec0054deeb88c43878a1c17b38cb757f
-EBUILD remake-4.2.1.1.4-r1.ebuild 929 BLAKE2B 97e93ae9b76486eca715c5e8a6697619506aeffd1424c65fd18f405dbe1134afbbe9481097e833ee698140d22465aef9c4edc0da49bf24f1a65e60882c56acbd SHA512 0b981068e05d4119be97184471e4e89827233808a2e924ce3fce1ab02e55f71bbd3e7e787e48aff6d42211df8854b2b78d950852a05a656702878db44d3230a8
+EBUILD remake-4.2.1.1.4-r1.ebuild 926 BLAKE2B 7c60c017b473982373f252f49e50bac2fb124af42383f833e14292e1816060f62d2105f29cba669123a264005c8c0097ccdf47bf9d379cd142bd2e92cdc14de6 SHA512 81fad3dcfc5e6a98d930fd36e81b5f17a4c144d88475e0cd9d135baad7a7b297e2ad224b653b0d6c71a7cc218477fb7d3e20a15a445edbfc36ca9cf6f258fb53
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-3.82.0.9.ebuild b/sys-devel/remake/remake-3.82.0.9.ebuild
deleted file mode 100644
index d675aaf24fed..000000000000
--- a/sys-devel/remake/remake-3.82.0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_P="${PN}-${PV:0:4}+dbg${PV:5}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="readline"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	default
-	# fix collide with the real make's info pages
-	rm -f "${D}"/usr/share/info/make.*
-}
diff --git a/sys-devel/remake/remake-4.1.1.1.ebuild b/sys-devel/remake/remake-4.1.1.1.ebuild
deleted file mode 100644
index bf782cdf5407..000000000000
--- a/sys-devel/remake/remake-4.1.1.1.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"
-
-MY_P="${PN}-${PV:0:3}+dbg${PV:4}"
-
-DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
-HOMEPAGE="http://bashdb.sourceforge.net/remake/"
-SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="guile readline"
-
-RDEPEND="readline? ( sys-libs/readline:0= )
-	guile? ( >=dev-scheme/guile-1.8:= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	use readline || export vl_cv_lib_readline=no
-	econf $(use_with guile)
-}
-
-src_install() {
-	default
-	# delete files GNU make owns and remake doesn't care about.
-	rm -r "${ED}"/usr/include || die
-}
diff --git a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
index ad57875a4a96..41c678407557 100644
--- a/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
+++ b/sys-devel/remake/remake-4.2.1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
 LICENSE="GPL-1"
 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="guile readline"
 
 RDEPEND="readline? ( sys-libs/readline:0= )
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 19e11a9e0fa2..26abefacf3a8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 7634d98c5bc9..5d0b152e6a6e 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,6 +1,4 @@
-DIST android-file-transfer-linux-3.5.tar.gz 779997 BLAKE2B af8f1025ae09f2e5a99116a1feb2449d2dcdf64887cd46e712c88f7911aea891ea5ff1705220b68ef9f6ab349a8c1d1955a843a47dcb53383a64a28f8830c7a8 SHA512 2a87a0a2c17b1f51cdce445291ccb99ee15ab24531e2cf41b1648702c66916d55ec8cdc1bd344bdbda5e4a1132daf0cc623862028f2d781812c24f8cf89a1367
 DIST android-file-transfer-linux-3.6.tar.gz 779459 BLAKE2B f71e7f3313a60cf12179908ed539e6b728e64c0b4e3b6b39dafd9926b27b96b54d31abac9da704111b2ab42867b1c58aac51ff547553cd5ad96dd8c00a5f670a SHA512 bcbc2f8bd39d093677b1c2dcb3d981293a8e79487884fcbe3450864dad9beff381fe966a2a42faf0af75a96753e4f139c95de7ed9175d7cb350055a35f7be4bc
-EBUILD android-file-transfer-linux-3.5.ebuild 1249 BLAKE2B 291048a184b70cffb2dd671b162404b3a11cf1e64d1b0ea4fb8ee7ac43295fd79d33113f3ec100ed1518c2898553e608c5051ac0874a317656fb163d98f97469 SHA512 8fe4e868db2e65d2415b67ef861f1d22c1fdbffcd68dc76ec7718ce8a447c4690351801dedad647e416240138d04f360672b984c460bb8017f651ce4b348f6cb
 EBUILD android-file-transfer-linux-3.6.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
 EBUILD android-file-transfer-linux-9999.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
 MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.ebuild
deleted file mode 100644
index 753c4b81006b..000000000000
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.5.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
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Android File Transfer for Linux"
-HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
-
-if [[ "${PV}" = *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
-else
-	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="fuse qt5"
-
-RDEPEND="
-	sys-apps/file
-	sys-libs/readline:0=
-	fuse? ( sys-fs/fuse:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FUSE="$(usex fuse)"
-		-DBUILD_QT_UI="$(usex qt5)"
-		-DBUILD_SHARED_LIB="ON"
-		# Upstream recommends to keep this off as libusb is broken
-		-DUSB_BACKEND_LIBUSB="OFF"
-	)
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DDESIRED_QT_VERSION=5
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() { gnome2_icon_savelist ; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index 5a09a8049e04..e80bae1c0aa3 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,13 +1,5 @@
-DIST aufs-headers-3.19_p20150323.tar.xz 3136 BLAKE2B 84c90f1068ceb070bc6ccda22dd423d32f09bb594196c767e65b4131f04565ce6f56861b1b536e5b4158e799cf531347aeb60801e6fddf0f651e3e93e0e6e573 SHA512 a137003b8b09ac3b929914dba27a13a9c2d803733ab7e073388b2a34f329f0b1ffcbe9646787738565ef28d3be77ca4a9bc520d759db4ca799cb2aa3643ee06f
-DIST aufs-headers-3.19_p20150420.tar.xz 3140 BLAKE2B fa41cffdea53264416a53dc6573f302c332df48b87c1a2c05e1cc85b07415685997f3226bb24af55df2ceb867a22396e75b65d1bb2371b674cb27ef82595d516 SHA512 257acbdd2439d7250e1903dbd7098d5a71749110caec6f6eecbc2e93b07859b5a751138a8000204ab735e3082ad15fdf249b132a7bac0ad6fbb0994213ab601d
-DIST aufs-headers-4.0_p20150420.tar.xz 3140 BLAKE2B 9afbbdfa276fdd361481ee3588ef73e267fede346da7ddbb80ab521c25ee5f8aafbbf67e195d1bcf141daf91a308630dc9ab4fe82d5f7dd2f7629ea31ba32655 SHA512 fe1d42c66721cf78125070f29fc40dc3f88d84f8a59a35333a427f1d6e0353207ad595a8bd3e12591fcb73a54b76db122d2f2519c7db4dee0557f38dfdc0fe03
-DIST aufs-headers-4.0_p20151116.tar.xz 3136 BLAKE2B c5c08b5d160a717853da63f2cc4d0d3248fa250d6913aae44c14136915005df1882d4bedf41606bb5629922f6bd027d8165a62fd1dbebd59f0d9cdfbd7b4ee3a SHA512 58205696948354f8d31230e6b709a136c720de2125bd00fe5929aaa1a70456bccf9c05cbca34412e0092cfd623aedefc8876ece3a7f6b02741a7b1e608aa0f65
-DIST aufs-headers-4.1_p20161010.tar.xz 3140 BLAKE2B bff9b39380a29d5a2f6c385dc69b882549190a63870c78643cc160919dbda8079bf8785ae22fde6c522591cb1343367b645712c6ec44f2ac760d0f3dfd653a6d SHA512 d47fe0666c4a1d6d9a78cbd94f790d46fee08bf88a17035ab59b7bb488dc1d8239c612bde06c580edd6227d82993ddbe84a5d576f3daae4d83dd51800fe26b03
+DIST aufs-headers-4.14_p20180709.tar.xz 3352 BLAKE2B 31b1573de9305518ef7935d7166d720f055c4b70de48943910d9041f976f483759af1998e6aa1dccff89fad0ff391686c4e18c867e700fcd4bb1211cc0004cc6 SHA512 e2c4e90c555edc072ebcb348de50e5ec9ba6e2785758d10f14e43c8a03980dfadd58bc9cd37c811648bfabda37e6ed7d0bf36d7099edd26f40672b0ca0f2f226
 DIST aufs-headers-4.1_p20170130.tar.xz 3136 BLAKE2B cda05eed3429c84dae70a5c88600e4369d4997cca5d0b8f21c82dcb3449b0b88ac27b3e3216034272a6f2ff53aa455b3eb9dc23fc7cc77473aa53943340df9c7 SHA512 d8099a59784739b76eac74de7113754981b6d2d4155eaf42f9d36ea4b6c84f6f49cd96ce0b9e19b2507674cd9b91667fe8520f1cfb7ff0e1d5c58596e784c6d0
-EBUILD aufs-headers-3.19_p20150323.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-3.19_p20150420.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-4.0_p20150420.ebuild 638 BLAKE2B 6d14dee13042cffcfee580bdfe077f7071e5f03ba8f42f30a161e080c682070ef7835ab0f4c6d69fbc552cbc84992b89b35fbdc971a337a5cf3053c93b3c1bd8 SHA512 71dc711b426ef279932705fe164492e43af91d5daebeebf21c151ec0ed6304cb0c7935f5c80d7cc75a9f426507d5c10517680197b539593318718a542c019579
-EBUILD aufs-headers-4.0_p20151116.ebuild 640 BLAKE2B 05d7c28b8ac9548b181b4f07731ad1bb77601046b1fea1ef7e8835d1d340737258cdda0c8a6844f270a6a51f323cc5e698996dd7ad712da148eee10c51494183 SHA512 451a6309d90b0eeddb0b98dd84e64bf3af22d1755bf38934884c6d82c4cd896475e7fdd0cdfcf24fbf423fc8af54377cf231a3548ba9bf7d11bf605dbba5315e
-EBUILD aufs-headers-4.1_p20161010.ebuild 640 BLAKE2B f16df748643dbf84d0025d4815bb2a500400dbad86533d443f3a2808ff4ae3250a8c3648995e5e65da214928eee5e8c69d527b191d111bd4877a120f057252f6 SHA512 30b4c711f2ff535150dacc60442c66073ce28ddd38f0ca39275e7fd682284c06936e85230e2934ba32d2663bd3a91e699d925e9bee11c3727a63864c49cfb92a
-EBUILD aufs-headers-4.1_p20170130.ebuild 640 BLAKE2B 61d84e7adebf8cd88445fae3f5093c8608bea2b37b92d38f3c331e7a952cd79af742f0f3d6f19ece71769e4e5507673dd80bc6de953e5fbd0ff645f964794ea0 SHA512 cd147fad8c2c1b38c6ee40c528d64cef282dbd2898250548bf94b4c930c4e55ddcc13a88a8dce76aec13c9013d661d3bc5778dd28f037b6c9387b79a9aa2255f
+EBUILD aufs-headers-4.14_p20180709.ebuild 616 BLAKE2B a8db7ed67120d808ce9a17e813c9aa1c3bc644746a7f1ca2d3f0b56add1e3e5e3479e75ce49dd0d735536fe7ea5292063abdb09c57c9805929b7de16f41bd43c SHA512 811e1645d18bbfb22ea70136441c121f79a8b491625538fb81e4c096be24bee3f4dd4f426a4eb361123f17e62226d6bcb725ab3bae08590c7e5b17e22433325b
+EBUILD aufs-headers-4.1_p20170130.ebuild 637 BLAKE2B 4b7e239c911ef0a8b0641d1f3643f9e7860d492e142245d014b6767b14f11bcc0f8ffb3f1bd98651d68cc73314ef5d268fcb84e86d45977dc4f36f70271c4f74 SHA512 fa44465b5d9c5c4964268289fbb0b378b64f0d340ba4037b34d702e97344f9ea5cdf600319ddd44af6c4f6ef8e598dd3744f8acb5c7ff222ed1a279b6212b3cb
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild b/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild
deleted file mode 100644
index 96d6c06c1dae..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-3.19_p20150323.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild b/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild
deleted file mode 100644
index 96d6c06c1dae..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-3.19_p20150420.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild b/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild
deleted file mode 100644
index 69ae941dbdc8..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.0_p20150420.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild b/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild
deleted file mode 100644
index 96d6c06c1dae..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.0_p20151116.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild b/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
new file mode 100644
index 000000000000..1a3ae3719eb1
--- /dev/null
+++ b/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="User space headers for aufs3"
+HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs4-linux.git
+# Check aufs release Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -delete
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doheader -r include/*
+}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild b/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild
deleted file mode 100644
index 237b5d1a9e20..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.1_p20161010.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild b/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
index be408d85c1cd..9cdf2fc061a1 100644
--- a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
+++ b/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 5c3565708f60..d088e32cb4ea 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,14 +1,5 @@
-AUX aufs-util-4.0_p20150420-version.patch 369 BLAKE2B c0c919484169a9c869f4eb3a923f8d63ba10c041062edd301350ff0cc958ffcfa66ab5030eb1b2fa998e9788986b6490e75c3680ec0c41784e7ec589db126e30 SHA512 0ef48129bee4a72372f82e3c3c73379f0f4e55849b3ce2c4ebd930d688bc3878c64582765b5e1dff868d460e5069b9263b3ac998e6cd00fce2b3cdbeef79ffe2
-DIST aufs-util-3.19_p20150323.tar.xz 97980 BLAKE2B ac826545100936b670640e0a277fb1355329c869f887bffeca400d774fb627c0ce44126e2dcf85b65976302fbcb7b356c8bb734814c44f6259d62437da2ad633 SHA512 49f138538ea8997ddb6bedf368815f16a5d42a49b5f72c1548cd9c3718bb00831224e80e9b4dd8c984a6fb40b11223e317757020076d432117541f7d361b892b
-DIST aufs-util-3.19_p20150420.tar.xz 97980 BLAKE2B ade3ed060ab0fa0c37aebcfd52dfe7df3e7aa6b4936277952d128b096fc1c36699e0b7129873afcbeedaea019f12ac461812177bff82362a1a7ee6d261178b9f SHA512 fe329e9efdbd7b585664b81c2bcd2d63ce5344d013eb2d76c6247e042c1cbe44a4a3ab6e8317734c06c24c1eeffe438d8f91a8e57d95b34e238b21a8b9389e8a
-DIST aufs-util-4.0_p20150420.tar.xz 97924 BLAKE2B e5daaf71e4f107f63b481dc5b8ba949a230b4b412cfac6744eb991589947743d2eaa2dc22c04684042292d472578471be3e71322a3cac15070616b36319dfd29 SHA512 9a988dcd3640e4797c731ab921161bccbd125fc23475e39681b3a398a238715cb85ac8fe8dfc64053af7478c8c33fe28b7e8cc3a2f97eb31e3c4049305043085
-DIST aufs-util-4.0_p20151116.tar.xz 98116 BLAKE2B fb1216879439d6972892f45e1401708172c94376e57eeb2eabb43512ea4e664c6d71af42c55a0ecff7d43a6c6a5d35b01f2de40dada5cf9f0070858b3826aed9 SHA512 35da6ccff82d7c74f1f9d680ddf17fc438811565b010ead274febac79b4352ee461d66e48b36123f0091d75a5d1c15ea078038a849ded11a20fd6859015abadc
-DIST aufs-util-4.1_p20161010.tar.xz 100124 BLAKE2B 21055f22fae04097f0ee67375a1f779a912f503c9ce343890e05338f09603c2a188109c5bdd8dee522385fe154e31528528ea76f6b644f4a03246364c231521b SHA512 2b9eacdafe7f81d84c4d0404e62988222365c00f4fe17abc9038ee6330695445fc49b3b5e5d531afbbbcf690d695297379ca15dedeb3729983d145a751714379
+DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
 DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
-EBUILD aufs-util-3.19_p20150323.ebuild 1005 BLAKE2B 8f23cf9fd80fb8669b7b3d5eb547a317136bbb4743f07f8c8eded0f1168c341abb8a81badabc52fb8d9ffc67bfc782d1da926b2e183d6eb2c476f58a9b5f4125 SHA512 0116b36a54f8d97229f5c31a88811a631e2e20c2b281b49cffe295f1008b51da3c7015599548c30c9dbf37e73360a0b16a091717eb85d4c87a129fe4c7939f24
-EBUILD aufs-util-3.19_p20150420.ebuild 1005 BLAKE2B 8f23cf9fd80fb8669b7b3d5eb547a317136bbb4743f07f8c8eded0f1168c341abb8a81badabc52fb8d9ffc67bfc782d1da926b2e183d6eb2c476f58a9b5f4125 SHA512 0116b36a54f8d97229f5c31a88811a631e2e20c2b281b49cffe295f1008b51da3c7015599548c30c9dbf37e73360a0b16a091717eb85d4c87a129fe4c7939f24
-EBUILD aufs-util-4.0_p20150420.ebuild 1050 BLAKE2B db50068a42da74d616e1c8ab528fabc9370f192ad1272152b5a49adabb26c3a3df4ce2eeab7eef0b7e20c7410a0866697c00b0b0524dd7c948402bde983a9d27 SHA512 d31189a425dd920d039920aa482274eb00af24f44a50ff549d36aba06c6d5a87a90b60bda3f2fb3057cb32afee30fbe2870004010f62312a8f8f788eefc078a6
-EBUILD aufs-util-4.0_p20151116.ebuild 1011 BLAKE2B e8920ffa7d42abb2caabf413140ad08ede1d9047891857032aed58ba809450fb3dbb6d51753680c81ea138aef4deef44611c30b2dc7318c0b9f08aa8e33e6a3d SHA512 e9aae683088ed63823f1c0586456ac7f1b3bd3bbf837ff2e8abb71a1e33acf005a0e1ff7c500b364820cb172444980822692250b582a838b76e6ea74e3fb6474
-EBUILD aufs-util-4.1_p20161010.ebuild 1020 BLAKE2B b1f55b9e3d92c440352a6604ec597cd2dab94fc22479f1590282e495ee9063a6ed7f68b34b3f6f786a4f05c965274002ff84721387b8bb015749cb6293e00f99 SHA512 10fa15fac1bf6d226030a9511ff93ec95f3b7edf2c7f38cac44b148326857c162d8bedbb9dbeea1fba88e9e93ed0f9d022db05104b1e9a8500f5c309c9df9fe1
+EBUILD aufs-util-4.14_p20180709.ebuild 1037 BLAKE2B 81e6529bf6bcdaf2a835e3320f0fe9a066eefe27621686029a8554be9f0597b4d2c2d2fd61dfae34bdd5dddc43ed29707f9fe7dda729bebeecb98928a5be0653 SHA512 e4570de61254349baaa8472987e51548e86631a5443e370869061637017292855e2ae56657f2b04f9d672469f8376717b0eabc09300d155df742288eaf6e9473
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild b/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild
deleted file mode 100644
index 00e8f53be185..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.19_p20150323.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.14 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild
deleted file mode 100644
index 00e8f53be185..000000000000
--- a/sys-fs/aufs-util/aufs-util-3.19_p20150420.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs3.14 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
deleted file mode 100644
index 5d9dae2940a9..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.0_p20150420.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-version.patch
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild b/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
deleted file mode 100644
index ef0ac24fc292..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.0_p20151116.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
new file mode 100644
index 000000000000..d68a80251fa5
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic linux-info multilib toolchain-funcs
+
+DESCRIPTION="Utilities are always necessary for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.14 -o ${P}.tar
+# xz -ve9 *.tar
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!sys-fs/aufs2
+	!<sys-fs/aufs3-3_p20130318"
+DEPEND="${RDEPEND}
+	~sys-fs/aufs-headers-${PV}"
+
+src_prepare() {
+	sed \
+		-e "/LDFLAGS += -static -s/d" \
+		-e "/CFLAGS/s:-O::g" \
+		-i Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e "s:m 644 -s:m 644:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-i libau/Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e '/LDLIBS/s:-lrt::g' \
+		-e '/LDLIBS/s:$: -lrt:g' \
+		-i fhsm/Makefile || die
+
+	tc-export CC AR
+	export HOSTCC=$(tc-getCC)
+	export STRIP=true
+	default
+}
diff --git a/sys-fs/aufs-util/aufs-util-4.1_p20161010.ebuild b/sys-fs/aufs-util/aufs-util-4.1_p20161010.ebuild
deleted file mode 100644
index 6ccd17ef6704..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.1_p20161010.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-	default
-}
diff --git a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch b/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
deleted file mode 100644
index b861bb2bb0b7..000000000000
--- a/sys-fs/aufs-util/files/aufs-util-4.0_p20150420-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- ver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ver.c b/ver.c
-index 200b119..38abdd5 100644
---- a/ver.c
-+++ b/ver.c
-@@ -25,7 +25,7 @@
- int main(int argc, char *argv[])
- {
- 	regex_t preg;
--	const char *pat = "^4\\.[0-9][0-9]";
-+	const char *pat = "^4\\.[0-9][0-9]?";
- 
- 	if (regcomp(&preg, pat, REG_EXTENDED | REG_NOSUB))
- 		AuFin("regcomp");
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 5101b63cf44f..b717db856822 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -8,7 +8,7 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
-EBUILD cryptsetup-2.0.5-r1.ebuild 4147 BLAKE2B 945b8e95155e0eb30c010d72857884d57f1d6cdbbd9b71b7ffa800e85a731ef7f3d1d9ac752d45e187a0db18ebedecf3275f6b5361bd831477ddf5bbf5bedbd8 SHA512 01e57a21c5e8114ffca4a4ca620568662479784a4f5d29e34e6d730a41e047612f4e0b96bf8b7950a06f48360a22dbfef78cf81f1c8c96170291bc9551048a8b
-EBUILD cryptsetup-2.0.5.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
-EBUILD cryptsetup-2.0.6.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
+EBUILD cryptsetup-2.0.5-r1.ebuild 4153 BLAKE2B cbca146d7e3fa93ca5e7848a6e6f6e81b6db999059be22ab4e23b96267f13d106a7ac4d34f771cfc566ec0d0968aabcb36a2985d799f9f5a3eff11c2975e6342 SHA512 dbb00e9b80e479eea14dc97a4ec44963eb1d8e251e0f17616197c30c2c55c2c4d7c62c446bcc4d0574e3968ed0a696cf8d8b04c88bbf367c55567b9cec4db713
+EBUILD cryptsetup-2.0.5.ebuild 4153 BLAKE2B fef3bc471620ccf1b2721fe48708a83a2df51ab1ffcc1b4671303152c9c0ef352e5f7d773bab43e389e6fb75ec7df42b34b2182951fab7e720804122af0fe3cc SHA512 83db793b38c609812008ecbb8edb1163ba7f32635606be2dfdec34a5ba8292ddbaf8fbafa7624d66c757f35566a2ef6b9f6b9ea56ab797779a54aa7cdd8026e4
+EBUILD cryptsetup-2.0.6.ebuild 4153 BLAKE2B fef3bc471620ccf1b2721fe48708a83a2df51ab1ffcc1b4671303152c9c0ef352e5f7d773bab43e389e6fb75ec7df42b34b2182951fab7e720804122af0fe3cc SHA512 83db793b38c609812008ecbb8edb1163ba7f32635606be2dfdec34a5ba8292ddbaf8fbafa7624d66c757f35566a2ef6b9f6b9ea56ab797779a54aa7cdd8026e4
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
index da5c949c138f..29d4e9c8fee8 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
index 29d5fcff6450..95b79852b4de 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
index 29d5fcff6450..95b79852b4de 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest
index eb426ed89c4d..26142f7dc3c3 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,5 +1,3 @@
-DIST dfc-3.0.5.tar.gz 43310 BLAKE2B 4698c5f5caf249695598b01dab471c978e9a5b83b2c1610af466588bbac182ea7f51a7017d6be0b0f753f1abf41b7aa054e67049ff74344271c2dc5c01a8ef02 SHA512 f828ede8aee0a496518d1ee9583ba71495cdd01ee0d22833e3b46aeb5f5f870ce7de629923d129a7bf795b458feec10f9a16882134dae34dd2ace7ea9eebb134
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
-EBUILD dfc-3.0.5-r1.ebuild 836 BLAKE2B e1fee8e45a8dfc7ab923a79bcaaf2483f1ad4dc0331a107952392c0c6add71bdb6c6494ac04d8315140687d46bcc38bf35a2f5a8f36d57a2d4ec8045d945c343 SHA512 d86e384267c8e9c34b45302199064dd694404815c5bd71cd4b7dae1a45fe8e92a7a4a1dcf823508b2a51b51c70660b37e49e48ade0758791b66558da8f0b81bf
 EBUILD dfc-3.1.1.ebuild 813 BLAKE2B c60976a10d96459ca833a2d954256da7fc0e551b9860568aa9ea72b0dc2082dd44f1ede810c513d557c9a8e388b49ecbfddc378396732e87d3b9b28aec4b1241 SHA512 20f5d489b6da24db6b03399cf7d619fbda0902b2f55bed63d5f80d8bc3dad59c8d51172bbdd0e3946a3822daa597ad2fa10e3b6b16e00d37ba32cf7dfa76fc81
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/sys-fs/dfc/dfc-3.0.5-r1.ebuild b/sys-fs/dfc/dfc-3.0.5-r1.ebuild
deleted file mode 100644
index 83460b87e300..000000000000
--- a/sys-fs/dfc/dfc-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A simple CLI tool that display file system usage, with colors"
-HOMEPAGE="http://projects.gw-computing.net/projects/dfc"
-SRC_URI="http://projects.gw-computing.net/attachments/download/467/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="nls"
-
-DEPEND="nls? (
-	virtual/libintl
-	sys-devel/gettext
-)"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_configure() {
-	mycmakeargs=(
-		# avoid installing xdg config in /usr
-		-DXDG_CONFIG_DIR="${EPREFIX}"/etc/xdg
-		# use the standard Gentoo doc path
-		-DDFC_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		# disable automagic dependency
-		$(cmake-utils_use nls NLS_ENABLED)
-		-DLFS_ENABLED=ON
-		-DGRIM=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index a021735267e6..6405ad42fe0c 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,3 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.1.ebuild 993 BLAKE2B 8737bd209b6caf6586a430f84a39a060478a8dfcf079121745a16e0a6901829813e6efd55a0e14a1cc48bec986839fb05dab37d844660dcae2bb16bb3d137348 SHA512 7067f3e6ac9d39dcdbf394abdd2a49f97377d2b17e7e60ef37e34edd0bc2b082bf105119ea0fd566bf2146e0f2900e670ba402864dc05517238d6e8b25c38ff9
+EBUILD dosfstools-4.1.ebuild 992 BLAKE2B bbeb67afa4c6d27d993eebb450593b82944a8f645fee30ac06ca61376e0e960bc32c90b9e1c985e2fcf2f62a4c1e5fe99822ef422e0c2e95e23da2a28bb1903d SHA512 c22940dceabba552670420ad0768dbde8bc416178dfdf5f975bbd3827f77deafe45f58443d1067421e068444fe899eebd6bc8bf1fd6748160593e169569d5734
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index a245d461ea34..255edccac57d 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 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="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d6a69cd280c3..7145f8062baf 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,13 +3,10 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
-DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
+DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
-EBUILD fuse-2.9.8-r1.ebuild 1886 BLAKE2B 09439bdee18c81239dd9f4a5c5d78f23e96d1f76780b5c9cb94a08e00f93287a8a689f936823cce2d53b7a18c7335f26763a73944c37c8c748f4d05a93ab99e6 SHA512 6a34428fa159d41398aea868695c5900c92a765db9df74a99757d167a6052af04124881a8f43a999cf31bf87ea59cda412d52c753229eada10945b01ef45b1d2
 EBUILD fuse-2.9.8.ebuild 1944 BLAKE2B 829ce122f4fff4be530130dc06bc33cbd67fc9e800b9691e4789b7942bc5dabf408e341e4041507946fafb79a441dbe76886753e8442452ccd40987f9305c26f SHA512 7c9f2c90a21662ed4d8e16d11468107a80a8b8a71a9d4a890bbf9d440cd76f881c7a7c77676dedd7d0dddf05eb3251d6e9448393a7d2412a5cbf6850b918fac1
-EBUILD fuse-3.2.6.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
-EBUILD fuse-3.3.0-r1.ebuild 1662 BLAKE2B d304faa93635f4c2edb4a787b994daede961bd77615290ab0d8648adb8d0548fdae6aa9a1eca177c6ef5b62a6a71329f9798b0992bfb15b2cb887963f685dc43 SHA512 104936339eb8b45aeb738d2e06f6811ea049dfca1fcc804e57ac267ac48162bdfba44419122fb221bebe38194cfb6f6b576f2884b016681be00d17d2f827b252
+EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0
 EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.8-r1.ebuild b/sys-fs/fuse/fuse-2.9.8-r1.ebuild
deleted file mode 100644
index 0e17eaa9a114..000000000000
--- a/sys-fs/fuse/fuse-2.9.8-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool linux-info udev toolchain-funcs
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is lt 2 6 9 ; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
-	# sandbox violation with mtab writability wrt #438250
-	# don't sed configure.in without eautoreconf because of maintainer mode
-	sed -i 's:umount --fake:true --fake:' configure || die
-	elibtoolize
-
-	default
-}
-
-src_configure() {
-	econf \
-		INIT_D_PATH="${EPREFIX}/etc/init.d" \
-		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
-		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
-		$(use_enable static-libs static) \
-		--disable-example
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc example/*
-	fi
-
-	if use kernel_FreeBSD ; then
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# installed via fuse-common
-	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-
-	# handled by the device manager
-	rm -r "${D%/}"/dev || die
-}
diff --git a/sys-fs/fuse/fuse-2.9.9.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
new file mode 100644
index 000000000000..e36b63cd9381
--- /dev/null
+++ b/sys-fs/fuse/fuse-2.9.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool linux-info udev toolchain-funcs
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples kernel_linux kernel_FreeBSD static-libs"
+
+PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if kernel_is lt 2 6 9 ; then
+			die "Your kernel is too old."
+		fi
+		CONFIG_CHECK="~FUSE_FS"
+		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
+	# sandbox violation with mtab writability wrt #438250
+	# don't sed configure.in without eautoreconf because of maintainer mode
+	sed -i 's:umount --fake:true --fake:' configure || die
+	elibtoolize
+
+	default
+}
+
+src_configure() {
+	econf \
+		INIT_D_PATH="${EPREFIX}/etc/init.d" \
+		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
+		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
+		$(use_enable static-libs static) \
+		--disable-example
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc example/*
+	fi
+
+	if use kernel_FreeBSD ; then
+		insinto /usr/include/fuse
+		doins include/fuse_kernel.h
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# handled by the device manager
+	rm -r "${ED}"/dev || die
+}
diff --git a/sys-fs/fuse/fuse-3.2.6.ebuild b/sys-fs/fuse/fuse-3.2.6.ebuild
deleted file mode 100644
index 4012fc673b62..000000000000
--- a/sys-fs/fuse/fuse-3.2.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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 meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND="sys-fs/fuse-common"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# installed via fuse-common
-	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
-
-	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
-
-	# manually install man pages
-	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/fusermount3.1
-}
diff --git a/sys-fs/fuse/fuse-3.3.0-r1.ebuild b/sys-fs/fuse/fuse-3.3.0-r1.ebuild
deleted file mode 100644
index 3b4821add777..000000000000
--- a/sys-fs/fuse/fuse-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit meson multilib-minimal flag-o-matic udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-
-DEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-
-	# passthough_ll is broken on systems with 32-bit pointers
-	cat /dev/null > example/meson.build || die
-}
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# installed via fuse-common
-	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
-
-	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
-
-	# manually install man pages to respect compression
-	rm -r "${ED%/}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index ef46e6b275ea..41cba3872970 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,5 +1,5 @@
 DIST inotify-tools-3.14.tar.gz 358772 BLAKE2B 99a0b82942d227e3c237edd6ca07bea68a7bbc07fd97bc5d44cb3c07e5e3bfee9513255fe675667872b027f93edd1137c30b61da7c0ef3986994aa812ca74d15 SHA512 6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 EBUILD inotify-tools-3.14.ebuild 793 BLAKE2B aa7e944757801932fdacee27abd3026f6eef864048183dc6b6727a33de40c14b1bdf39464f77f41cde7bc0189d08b589f535f0616f6be6ef7eaa67ddafdec62e SHA512 316279c93f1277e74547a4e728847353e11068bcc0fd2fc26b988d9b9c2c0029ac1c7d5e14a0c64eb526312c7e70c1364c2763835402863838987533a39b7044
-EBUILD inotify-tools-3.20.1.ebuild 829 BLAKE2B 913274935f081ad2393c078720058991e42c6db77bbb4e16754b47c8ef454cbfaaa518180e84a1fd289f9d19ff2dc7ec82dbbaa3aa37b3ca72d1a6e62ff47544 SHA512 fe357e872331a2906c5cc2b4afb3758affd4428e918a72733372bba6c2a1c4a66f6002aeec1e8ab971f497b7cdbff9e2623165c27ca8e47c605c68b8360be271
+EBUILD inotify-tools-3.20.1.ebuild 822 BLAKE2B 15d40a486e322ab7fcf0e65bfb23cfb2f5d5ed3526b58694fcecf8dad7102195df5ff716ae00e0eca841ba9dbafe1e11d946b7440a3575f9b59312f7fdcface3 SHA512 03e2e8564a2db047c27feafe28522595be99d129610f0b3f87732ec354de83fb45ba90ff8ef250d7b4d7205173ad4a84766a16142b4e725f3cb300dfaffd9857
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index e2c706306876..8ee06ae1f7b9 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest
index 462807da1cd0..757ff1482e3a 100644
--- a/sys-fs/lessfs/Manifest
+++ b/sys-fs/lessfs/Manifest
@@ -1,5 +1,6 @@
 DIST lessfs-1.5.13.tar.gz 506221 BLAKE2B 30d960b97120c7e819af2357358050720d01c226f6855334ec7511d854f82a683112682389353b20d80b5bda82d0ab89464830036da3e1aadc3ea64285ed93b0 SHA512 7143b7e1df8e059184d003be6519cac323fa035a6d9005b4e007504328d58624232ff9a494ecf11d445977f9138e7c41492d7fd30721065e5293927f85585604
 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1
 EBUILD lessfs-1.5.13.ebuild 1218 BLAKE2B 518b144a352a20fb2501f69f21e591514876c37628fc6aac3615e205a190e5bdbaa00c5d2f758bba9c5ded2be75547ff1536d330f455f2a3ae3b0b02347f36f3 SHA512 ef9ff6d16f0397fded5f6eeb21039e760485f73f61579f7a1345228ae6a94ebdad1c4a98a92d008585ceb16cab54999bfd8b40eb06476c9049542dfc4e1e7d52
+EBUILD lessfs-1.7.0-r1.ebuild 1307 BLAKE2B 83e477101187681d4d1c597c663bd0d6dc1f1dceac5391700e34f4ead1806b658c4024e3f41bc6accbe855e6283a4241ed0935a521c66b395f5d9758787d1619 SHA512 2bcb82fbddb2c4585b364bcb61694ac8ad4aee5555d08ce0e7fbdb352d3bf0a9f2bf11c6bc1afcd3c21e3993619b9cb6ed5e524cb6012a282877268f839dba6d
 EBUILD lessfs-1.7.0.ebuild 1281 BLAKE2B 6080ac5f1c1a57321306a292728bd297b4687754274c7d10adf25298405937d3cf7bcbdf2ccb4d595e4141d0b7483de5b9982e814d716d4cfc0dd417ca5c55b7 SHA512 e930c0ebb872b82702a495dd62fb3782dc64b10afce925f34311d80e00ebecfde203da2f171102ad39035849da1043ac69c0480c2c43461b7803c18e340c1100
 MISC metadata.xml 1422 BLAKE2B faa04d5dc2bb7b18102a3bd2a4386590050599cbfd1124b632d78cae75692f0395f9675b9226c2c7a45de81359737b43f488ddffc67ec04aec829f256cd0fd92 SHA512 d841f92f53749f39637801b2f4f5129083f07df540cc13c5c2e2bdd1c7e16aefa66e120ca9b0b78e38d85a9186a7c208dfb44a3600f1ba7d76e70d6e7bfb95d9
diff --git a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..f0b3e0a95f0a
--- /dev/null
+++ b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high performance inline data deduplicating filesystem"
+HOMEPAGE="https://sourceforge.net/projects/lessfs/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb crypt debug filelog memtrace lzo snappy"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:* )
+	crypt? ( dev-libs/openssl:0= )
+	lzo? ( dev-libs/lzo )
+	snappy? ( app-arch/snappy )
+	>=dev-db/tokyocabinet-1.4.42
+	app-crypt/mhash
+	>=sys-fs/fuse-2.8.0:0=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOC_CONTENTS="Default configuration file: /etc/${PN}.cfg.
+	If your host is a client consult the following configuration
+	file: /usr/share/doc/${PF}/${PN}.cfg-slave.*"
+
+src_configure() {
+	econf \
+		$(use_enable debug) $(use_enable debug lckdebug) \
+		$(use_enable filelog) $(use_with crypt crypto) \
+		$(use_with lzo) $(use_enable memtrace) \
+		$(use_with berkdb berkeleydb) \
+		$(use_with snappy)
+}
+
+src_install () {
+	default
+	insinto /etc
+	newins examples/lessfs.cfg-master ${PN}.cfg
+	dodoc examples/lessfs.* etc/lessfs.*
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-fs/lufis/Manifest b/sys-fs/lufis/Manifest
index 8182b0355b5d..4e69e5b409e0 100644
--- a/sys-fs/lufis/Manifest
+++ b/sys-fs/lufis/Manifest
@@ -1,4 +1,5 @@
 AUX lufis-allow-uid-and-gid-addon.patch 1090 BLAKE2B 49bd9cbec1b101174b0aab1a11723104a858ff68652f960e14ab1b05e24a70fac014e8fbf6bf8c611671783579bafa93a4cd983c2fc43b34556de0af9466d534 SHA512 7e5680560b624e033530dea158684d92c134bd8b73ab0d9030eb2c73416785c546915aeb8e13dd815730dca65925659394b86c0a8ad1b94acac04e8e787762e4
 DIST lufis-0.3.tar.gz 18158 BLAKE2B cad5154f244232262ae3fef7f792bea58b18019e29df8c0763cf39a6d61bd84abc030bcb3e20eb47a557a8edcde8f7ff1ea6c9873da885bea5184845f15e54bd SHA512 86f0c77e748ab7ba3f92ed9563011e8262b435a8878bf3629c8fa4a8e1bec058249a288e2aafd395f524748b419a599c6533900348b4e23239f47930a874e14e
+EBUILD lufis-0.3-r1.ebuild 635 BLAKE2B c18d3a14093862628908d35c605f66754ac2ce1d51a70ada29abf3bdc09bb254f511c28e5cb3939c1286d6baf75f08859634abee3c588c5584642f22bf864c03 SHA512 096b4132956092042f269eeb833e4d6d907d78e1fd29755f78581ca0b9c340dc491a1bb038449fff54cd3eaf4bf3d6306b40344b09e1328f911193c530438003
 EBUILD lufis-0.3.ebuild 622 BLAKE2B c06f03c41e5f1b10b023c6ee6eb2a0db6ab8f378c3d4c4e5c8555209428d0678d0a1ddae79b501d04972f74e7e1a7fc4ff94a8360f978b3daad3adbbd93bf6c2 SHA512 b951e7334dffb752df47920e1482dbd57590ad02df59f9e9278395f33f8e20c82edd22330b5251d68f013c60719289321ad6e5aa17707067dda813db2dcd032a
 MISC metadata.xml 246 BLAKE2B fd5580dee18582c2dcb849e4f5f46b7f430a240ddf6b50d7ecd3b096a72f55cf7e16206474766dd4688fb3d43c31fc85523a897f15e613e8ed013f91950241dc SHA512 41ea0697fbdeac910a35652ecb4de0a35d7a531956c7c0ace6364c9cef6e1348ecd427a1c5b9301b779d2f189ffbdcd04c7c9f59fb429ef73b75af9d140a92af
diff --git a/sys-fs/lufis/lufis-0.3-r1.ebuild b/sys-fs/lufis/lufis-0.3-r1.ebuild
new file mode 100644
index 000000000000..5f2f2645949e
--- /dev/null
+++ b/sys-fs/lufis/lufis-0.3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Wrapper to use lufs modules with fuse kernel support"
+HOMEPAGE="http://fuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	!<sys-fs/lufs-0.9.7-r3
+	>=sys-fs/fuse-1.3:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/lufis-allow-uid-and-gid-addon.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin lufis
+	einstalldocs
+
+	insinto /usr/include/lufs/
+	doins fs.h proto.h
+}
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 6ce9dd588d37..10e507e5715e 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -8,9 +8,7 @@ AUX mtpfs-1.1-wking-patches/0004-Use-storageid-to-access-storageArea.patch 1889
 AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of-the-.patch 1264 BLAKE2B c2974cb2c369c26ed5e46f0dbaa917c92d2e843ee202819c80530ba040718a548b28194b44eb7490608a874fa22184984c716ccf2bfe8ff971302d9fdf9d08d9 SHA512 547c4d1d48832cf9f4735ec194350cf45786dd259788f498edd02d6801718376ca47b96a83ed72b5f660b70638a37edae1778aa99d763d6d969659c519f9c2b3
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
-DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99eaf0ca4f5b249f87ca982cc7c83faa0bbfc87b4ffb351c10573ce4778de1f9911842707279c4fb08b157d33 SHA512 af3bd067410f51bf76619a5d98a23c2a5755d2f5e2764221af145a463ab1b819332b00e358887488f2e26e29c91dcabceedf5f8637d97a9b2ba06b91281a6a4d
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.0.ebuild 986 BLAKE2B 4fc769add8ee8c1c12cc8cec6c69ae9c00fc543fdbf63095296ded1a4a0127fe204f711522ca58c2c95a480f71cba184a27571b0006df085f485cc18fa575f1a SHA512 9069b27f5d76131502438c1bbc9d329efa5c295a4a36403e14119c887eeb5d0e5523cbfa15ed3d63b4f2af8651d15aa7cd5e435c42d765f3c80b62f2109f6c4d
-EBUILD mtpfs-1.1-r3.ebuild 1269 BLAKE2B c3da55f5770aa13f8cfec7f5e00c61c4a057fdc6de780ff066e4972579d7fe3368e64f8231c8c677444cdb863a1560c04fa7e7ebd685788969c04433eefafd48 SHA512 c12f11172555e927eb4335bebfe05105c6346db378a8e838fc4186947f9bf8dec66e07126401219cfdefc68d9683a108f0ca450cd4d0bb31c35d20099c159f79
 EBUILD mtpfs-1.1-r4.ebuild 1242 BLAKE2B ba8f15fb0b62c6ab0b4a5063d7263782ae00b3bce04baac5c091fa642eb774fd0e78203737b381fd5523b0d7bdbcd8cba0e41c5904bcb8a35d041cbd237dba90 SHA512 94c5de07d7d90de0ebac9ebb5f2f0a72b442fe8d47215c27a9bb4b815c6236e2f2f1103717e17e2021b725645cdbaca869f1847ed63f0118c8fd960be590a804
+EBUILD mtpfs-1.1-r5.ebuild 1250 BLAKE2B d927c05104108a374f687669e9e61b8b0945652ba3d3b4ae0c46bcdfdcaf2906ebef70d0bc93ad7e64d7b6ec8036b89b2146e5f948034a26c0743d06b6ab7636 SHA512 1c036b9c225b403bb0c4abda72e68e20fbbba03d0880f7738b14b17e57cad73d50323a5856e184c5f6aedb3ab7d20a652fdbb9c45a37bc3e9b9c4610ce8f2bdd
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
deleted file mode 100644
index 0968c88c8653..000000000000
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/"
-SRC_URI="https://www.adebenham.com/debian/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-libs/glib:2
-	media-libs/libid3tag
-	media-libs/libmad
-	media-libs/libmtp
-	sys-fs/fuse"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	sed -e "/#include <string.h>/ a\
-		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
deleted file mode 100644
index 5fb9a655bf96..000000000000
--- a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/"
-SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug mad"
-
-RDEPEND="dev-libs/glib:2
-	>=media-libs/libmtp-1.1.2
-	sys-fs/fuse
-	mad? (
-		media-libs/libid3tag
-		media-libs/libmad
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	sed -e "/#include <string.h>/ a\
-		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-
-	epatch "${FILESDIR}"/${P}-fix-mutex-crash.patch
-	epatch "${FILESDIR}"/${P}-unitialized-variable.patch
-	epatch "${FILESDIR}"/${P}-wking-patches/*.patch
-	epatch "${FILESDIR}"/${P}-g_printf.patch
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_enable mad)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
new file mode 100644
index 000000000000..8cc52ebc9b74
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A FUSE filesystem providing access to MTP devices"
+HOMEPAGE="https://www.adebenham.com/mtpfs/"
+SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mad"
+
+RDEPEND="dev-libs/glib:2
+	>=media-libs/libmtp-1.1.2
+	<sys-fs/fuse-3:0=
+	mad? (
+		media-libs/libid3tag
+		media-libs/libmad
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=(AUTHORS NEWS README)
+
+PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
+	"${FILESDIR}"/${P}-unitialized-variable.patch
+	"${FILESDIR}"/${P}-wking-patches/
+	"${FILESDIR}"/${P}-g_printf.patch )
+
+src_prepare() {
+	default
+	sed -e "/#include <string.h>/ a\
+		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable mad)
+}
+
+pkg_postinst() {
+	einfo "To mount your MTP device, issue:"
+	einfo "    /usr/bin/mtpfs <mountpoint>"
+	echo
+	einfo "To unmount your MTP device, issue:"
+	einfo "    /usr/bin/fusermount -u <mountpoint>"
+
+	if use debug; then
+		echo
+		einfo "You have enabled debugging output."
+		einfo "Please make sure you run mtpfs with the -d flag."
+	fi
+}
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 86fe6a1503e4..cb73d189f3b4 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,3 +1,5 @@
 DIST squashfuse-0.1.100.tar.gz 393548 BLAKE2B 642f0b00023f1914e6f4efd0e03c77d61c549eed0bff8f3128f415ece7c52d3f917e8856a1dccc3d1be06147ad0b80bdde79397c4f307bc316adb2224260b402 SHA512 e6a56354e71991ccbcbd2f9e6967f1f5a1056edbee286e6a6d6c35f777ed6e6494243633d070da700cf43a8bf7b56269087a0db1d4b2d45ed49f4830caad7927
+DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0
 EBUILD squashfuse-0.1.100.ebuild 924 BLAKE2B 99357eef0d573291d34becd2b9cc92050ba78975f537966175fd2dcfd997e91192af9ced64e6938a4b3e3da59fc091f19d6f1944cef2f8f327aabe76beb92ea3 SHA512 7f0f52f26553938d77e829f6220d5b3b6b47ae5e9716e1547e56f70a409935b88cacb289d11b67ef852bd7ad115a35edd2cdbae2c597c0a3e073d6e5fd3e1896
-MISC metadata.xml 588 BLAKE2B 89e02c1b93c1a834c81fc6ffd3e6f859e8a37651b3d3f2b68995eb3ceb035b4c49ff66b160e35829dee4416f4bfb16dcea6fedaf21e6b305f5674e8e52ecd1d3 SHA512 359590ef302a574ac485f43cf78d3e618ce2562983fc21941961dc7624919ae8c88ae53be3ec19ed6e36f777d3665b133b2972c94d9b9b7829fdaeecc0b3710a
+EBUILD squashfuse-0.1.103.ebuild 1168 BLAKE2B e03ee8f22545f0fcf123803857c6f0912d304c801ba16f0bbaaf20fecc1863a66d4889c3634781a808a0d335226143add282403bf048879108da2c94c45cc028 SHA512 ec825ccd56dd1479562154cb3452f9a132a1bd1b8cef4924c23bc4bde154f49353753907c55bb50d359615e18f3106316d547ad8abb70f98bcebecdf55420652
+MISC metadata.xml 651 BLAKE2B d8db9c1df606853d465c231478f66829333019c41064e928d7922ba54058739c4d8130a43f23b7d2eb6c0e18c239ee0ceaee51cde0012ebbae977a6f4cdf6784 SHA512 18d13b243667404511e34d85b6b6530313dbc02d28e409f243486b050282556f398dabbe04dcbde8dcb43c15182d693e89ab168a4e9525f0a0b6f5f9ed3da23c
diff --git a/sys-fs/squashfuse/metadata.xml b/sys-fs/squashfuse/metadata.xml
index 4b36f192fd0d..c8a507a9926c 100644
--- a/sys-fs/squashfuse/metadata.xml
+++ b/sys-fs/squashfuse/metadata.xml
@@ -13,5 +13,6 @@
 	</maintainer>
 	<use>
 		<flag name="lz4">Enable support for lz4 compression</flag>
+		<flag name="zstd">Enable support for zstd compression</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/squashfuse/squashfuse-0.1.103.ebuild b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild
new file mode 100644
index 000000000000..f4654076461b
--- /dev/null
+++ b/sys-fs/squashfuse/squashfuse-0.1.103.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="FUSE filesystem to mount squashfs archives"
+HOMEPAGE="https://github.com/vasi/squashfuse"
+SRC_URI="https://github.com/vasi/squashfuse/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="lz4 lzma lzo static-libs +zlib zstd"
+REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
+
+COMMON_DEPEND="
+	>=sys-fs/fuse-2.8.6:0=
+	lzma? ( >=app-arch/xz-utils-5.0.4:= )
+	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
+	lzo? ( >=dev-libs/lzo-2.06:= )
+	lz4? ( >=app-arch/lz4-0_p106:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	filter-flags -flto* -fwhole-program -fno-common
+
+	local econfargs=(
+		$(use_enable static-libs static)
+		$(use lz4 || echo --without-lz4)
+		$(use lzma || echo  --without-xz)
+		$(use lzo || echo --without-lzo)
+		$(use zlib || echo --without-zlib)
+		$(use zstd || echo --without-zstd)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b2babfa1a057..8f49206e2d04 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,11 +6,11 @@ AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b23
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
-DIST systemd-240-patches-0.tar.gz 2925 BLAKE2B 167ddaddfbe0726b9a64a95ec601495599d7aff052cbad96b80ac16ddfed72f320ba3c5c602e2f79b0cd9aea1d58ea256249a080e0999787a2c183e0bcc0869d SHA512 6b948d17f3a037ef1a291f5df766dc095c4498d5742374e08daa9b534b9b979a07876e41bb7db2ce257ff12b3b97fe1927a11d0f1a79c57f96300a5a8413d2eb
+DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
 EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93
-EBUILD udev-239.ebuild 9770 BLAKE2B 7c58f0fefb4a7dd307021b2ead41c904ea71d5ed4726501cf70a41344314a3386ef77c61b4872dd4d56db403b929e8f45cf5c11091ec90584994d761e5f971cf SHA512 6822cdb23d07180f62f5b11968ef4a7f994efa423471ead978d4a64606bebd94685df63e1c26b6c865960cd7da2575d505893c94e824e753507fb6c11fffab7e
-EBUILD udev-240-r1.ebuild 9664 BLAKE2B a934f7c0ffb8c21414655bf86d2c98a9387a767abdca09fb813580e2347bd2db890d51ba887a41ed6b84df28dbba37131559c06a1de6b2fd62ef1cf2e6b7d695 SHA512 44e79d8941eecea8cf3ff1f1c2b4ae742f87a23cfc3906ebeca99ccd40e7e965076f41b451b3a2126df5d6e91dab2ed49742d9f93511332a2446d3f70203bd5d
+EBUILD udev-239.ebuild 9767 BLAKE2B eee0abc970f13436f924e43cb1c44e41b3b5313b0b92adb4d68defaea90d56c47957a77803eb0d374d30c29b860c243d5d68a9ee0f1442530e1e96b5d57a8cc3 SHA512 acd07fcc1a3e5a376c21c59563ff4f89f92be701a4ec1e7ca79ce98241e5185b0fd802115f0fa8a2573c01235be7f6a3ede67b02b7d107327459a8246dafa696
+EBUILD udev-240-r2.ebuild 9664 BLAKE2B 2816f914917b91221545e7bb77ba18a5158873d581c973e812e943472884ac4794a71a3a21ab4ce95d7bbd16d525cf3c9472ed41500fc88322f3418685b99be2 SHA512 618b7b0cd646409b9ea73576c60685e94f0769330745dc2db0a1edc9281d45405adaef645c00187570a0c5d8ef283c7585689f782d80817b6296fe84dae7f51c
 EBUILD udev-9999.ebuild 9564 BLAKE2B e372c292973ac0b83f1fef60199d7ab31ef80cb0208f3ef34c52b3357fc684d9afd3fdf5e1cc69a3296ef65781a90e55f4e9fbba579d55cef7be2db8058288a0 SHA512 9e02e243bdd6bf01349bc21619cd4033be65c9c2bb22449cee83cfb0966c930df1a6f5dcc74a610e27006f81eb0483a976cd6d1e9cdb21174cc02e3beb3f2436
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
index 18da534c0daf..93974b6486ba 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	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"
+	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)"
diff --git a/sys-fs/udev/udev-240-r1.ebuild b/sys-fs/udev/udev-240-r1.ebuild
deleted file mode 100644
index 3cf58bff5dee..000000000000
--- a/sys-fs/udev/udev-240-r1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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
-
-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
-		https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-0.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"
-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
-
-	eapply "${WORKDIR}/patches"
-
-	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/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,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-240-r2.ebuild b/sys-fs/udev/udev-240-r2.ebuild
new file mode 100644
index 000000000000..05b9ea36bd9b
--- /dev/null
+++ b/sys-fs/udev/udev-240-r2.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+
+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
+		https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-1.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"
+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
+
+	eapply "${WORKDIR}/patches"
+
+	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/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,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/udftools/Manifest b/sys-fs/udftools/Manifest
index 6913a56afda1..92f10c566ad8 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,9 +1,6 @@
-AUX pktcdvd.init 1360 BLAKE2B 16d01b722b98340a8a858c4f5e80881d41b010b9c6af6e4fdd489e1d000129b2d2793f6be6cfd4673851c26919bb310a6a8cf9f495360d0f24624bd5784f0116 SHA512 22522ff6bf19b08ef928ff87e0e3ffdf476f08c0c8b318770e522ad5187f323b94b26a3153bb56488618e8adff66b5585401e63ddae34068c4b2de472b1f5755
 AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
-DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
-EBUILD udftools-1.1-r1.ebuild 655 BLAKE2B e3b1da90e431f8fde13bd0c87cb4dc7300ddccfb8b0e4f5720931116a6881fbbda1a754b39a6a39f75ce923f42c59275997b315380d4200959a7c265200e017f SHA512 c2a4bfdc4345fdc5ffb2d6518a0ab102283ffefb6c32d7d9947ca635b63bc50fa23f8365cdd7c2bc0d94512f8f370f99ebea0f757f0cfe8062a81e1934385b88
-EBUILD udftools-2.0-r2.ebuild 583 BLAKE2B d941efdc325a8fd42121cd1bf0fd3b76f874d61cc193bdf1c288a9a8f6e2dba4182953da897b5dd280fc78125adf311a276a70531cfae5caf439b4dcd915c7d2 SHA512 c36fb61b17ed862af721d4d52c35dfc73a32675435e5af41589f652c113b238e4a68dea924a1c03bbfd44e0e820a5a6551bdef3ff6638dce8aebbd43d4a5a990
+EBUILD udftools-2.0-r2.ebuild 580 BLAKE2B daa7d7fbca6685da0cc0d0690a9e8f3739ce44e27d463e97a532c7e7d6af73ec8f6799f734e0a374ad8e6cec6bee5fe4c2da5566c537c270ccdaf4484614c558 SHA512 1c86fdf192726f58a3b61514c1f8f88de7d15e2f7736e97c949b8c47d18a5f6a04471ee5b94c10e5e340b5283372ab386de793370425b8b60c1988b073b37f42
 EBUILD udftools-2.1.ebuild 555 BLAKE2B ba79acd831ea5ce3be33f46b877c62ce91f529fcfe937fb00a7f8445929b2a9241ec12a478184caeb1e55d137367bd6886e2664b8ab35f7f4987ccfe90a6bb17 SHA512 3152fc94416e6be5076f031a1ef61f41c3d1c7e4b02041eb506722b01cc64c4cd84be73009405ba4ff9d9c1acc3604a525ecda363242e1c6c616120150e23fca
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/pktcdvd.init b/sys-fs/udftools/files/pktcdvd.init
deleted file mode 100644
index 97bd34368240..000000000000
--- a/sys-fs/udftools/files/pktcdvd.init
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-command="/usr/sbin/pktsetup"
-devdir="/dev/pktcdvd"
-
-depend() {
-	need localmount modules
-}
-
-checkconfig() {
-	if ! [ -e "${devdir}/control" ] ; then
-		eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
-		eerror "Please ensure that your kernel includes packet writing support,"
-		eerror "and if modular, ensure that the module is loaded."
-		return 1
-	fi
-}
-
-get_rw_devices() {
-	local sys_file="/proc/sys/dev/cdrom/info"
-	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' ${sys_file})
-	count=0
-	for i in ${devices_raw} ; do
-		eval "devices_$count=\"\$i\""
-		count=$(( $count + 1 ))
-	done
-	devs=""
-
-	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' ${sys_file})
-
-	count=0
-	for i in ${cdrw_caps} ; do
-		[ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
-		count=$(( ${count} + 1 ))
-	done
-
-	echo ${devs}
-}
-
-start() {
-	checkconfig || return 1
-
-	for i in $(get_rw_devices)
-	do
-		devnode="/dev/${i}"
-		[ -e "${devnode}" ] || continue
-
-		${command} "${i}" "${devnode}" > /dev/null
-		[ -e "${devdir}/${i}" ] || continue
-		chmod 660 "${devdir}/${i}"
-		chgrp cdrw "${devdir}/${i}"
-	done
-}
-
-stop() {
-	checkconfig || return 1
-	
-	for i in $(get_rw_devices)
-	do
-		${command} -d "${i}" > /dev/null
-	done
-}
diff --git a/sys-fs/udftools/udftools-1.1-r1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
deleted file mode 100644
index fd50ff49d801..000000000000
--- a/sys-fs/udftools/udftools-1.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
-HOMEPAGE="https://github.com/pali/udftools/ https://sourceforge.net/projects/linux-udf/"
-SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/pktcdvd.init pktcdvd
-	dosym mkudffs.8 /usr/share/man/man8/mkfs.udf.8
-}
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.0-r2.ebuild
index e9f92a56d2be..ac92ff6d84fd 100644
--- a/sys-fs/udftools/udftools-2.0-r2.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 31c650ebfe5a..61324aee453d 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,3 +1,4 @@
+AUX zfs-kmod-0.7.12-kernel-4.20-compat.patch 1213 BLAKE2B 037d0979fe16d3693f3ae60176f737bfaa9e4df2fcd36d785469f0aa548f50a5014b0806bc83070e07c82ef8353ff4093776b4b624bb78a7f56e14182c671309 SHA512 48d7e08951f6f91831636b89d6031394641eb0a021ce5c944b5e7f69aae71d1b48ee81dc9ac3cd7c95b037afc2a83cd243b17fb98bb7308234e38f557fcadc35
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
@@ -6,6 +7,7 @@ DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499
 DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
 EBUILD zfs-kmod-0.6.5.11.ebuild 4065 BLAKE2B 15ba31f70e1c0c884752bc56893b576791028b78e61ad0b2be83ac8f609385568a9b311ddd04698d430186f3b44f4641774d2102f758c2b4f2934bcbeb11560d SHA512 dbab278cb0311e3c3737a5805d5cf8ecdba75508353ae8f25985b345dca62e895353d5deb43417c5159bb0ef4f64fe5f6e1e0476cc5deed92fb5f1ef3eef05ee
 EBUILD zfs-kmod-0.7.11.ebuild 4052 BLAKE2B f9ec807898302d8a699849c54b2b5db8c994c47a781c0fb9216b10929ca78df5705f4fa2a646dc4b3012641b3a70f814c6a38b0f33b943f23f9f3e2a6044438b SHA512 dd064db96ee9cd02fa87ced7553aced371d39e40e268b933679dd081da11d64c9abc13fc6a2e7cf5fa7c165faa4ccabefeeeea3bf96a4dd203cb3f6398aaf39d
+EBUILD zfs-kmod-0.7.12-r1.ebuild 4130 BLAKE2B 4881bbcc95739423581845787a08ec4ea4928133e18e40c91d7e775aedf64742d413caebac4063b7ff75e75e439293e2d0accbbc06b3f095ef3165fb63bb50ec SHA512 7da379848280164cbde951978bd43c6fc4734b174fafc7f0336fdf938017532fd3bedd416fefa5369187eab530b78888dfcb5b983302476bf47f5e5df8982cba
 EBUILD zfs-kmod-0.7.12.ebuild 4073 BLAKE2B 47d6fba29a8937a2fd529798f247b497a32612dda1cb8d8654b6b86f70570bb491fc6da48486e55fa08b8ed94dd2ba3586f458d99161a5872af90f84d81e515e SHA512 1dce4eadb5c374581b399006fba146b3b53a0a960a1b5bb1dcfa4b27156b35376f22ddcfbd3c9a89347e33f47d87eff4250a7eb985f63785fcbb264e6654ecbc
 EBUILD zfs-kmod-0.7.8.ebuild 4051 BLAKE2B 209b79790d9f60bcf6c6275f7786b48fc336075d7409b34909a3df3f2860c1d755472eb885ea7b5907321eeafcfbf89959f5a14071af08fd01a7982f535ed0d1 SHA512 c99b33de8ff155db0472dbcc7174753efa9b2ad24d9676c0515ae8fe8415d9829d1aa37c73f6065d349bad9faaeeeefc5b32bb2098845444a15fda2702adab17
 EBUILD zfs-kmod-0.7.9-r1.ebuild 4258 BLAKE2B e6860043ae564501a2c5aa64f11096d00416e78d703753057d923de15ea4e3e031f246ddc69d43700dc89b694dad92261baf93e717bbc80b800bcd75a825590f SHA512 b3f1aaeb53c717b0b5a1ae8e43a04bf13c53258ad2d54b6011ffd1b8118e2d8da61f4e097737800e281c657c615188cbd973fb7caca42c44b24ee60a955e96f2
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
new file mode 100644
index 000000000000..75ed3c579920
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
@@ -0,0 +1,31 @@
+From 4f981f6ab614a908f912f7dc147b248f96b498a2 Mon Sep 17 00:00:00 2001
+From: satmandu <satadru@umich.edu>
+Date: Wed, 26 Dec 2018 12:36:28 -0500
+Subject: [PATCH] Additional fixes for current_kernel_time in 4.20 on 0.7.x
+
+While https://github.com/zfsonlinux/spl/commit/cd1b28e0cfa923db988611df28958f7b84b53530 fixed the 4.20 current_kernel_time issues in spl as per https://github.com/zfsonlinux/zfs/pull/8074 in .07.x, current_kernel_time is still being used inside zpios-ctl.h in 0.7.x.
+
+I believe this may fix this issue in 0.7.x to allow it to compile successfully for kernel 4.2.0.
+---
+ include/zpios-ctl.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
+index f17f1153260..068c9eaf173 100644
+--- a/include/zpios-ctl.h
++++ b/include/zpios-ctl.h
+@@ -181,9 +181,12 @@ zpios_timespec_t
+ zpios_timespec_now(void)
+ {
+ 	zpios_timespec_t zts_now;
+-	struct timespec ts_now;
++	#if defined(HAVE_INODE_TIMESPEC64_TIMES)
++		inode_timespec_t ts_now = current_kernel_time64();
++	#else
++		inode_timespec_t ts_now = current_kernel_time();
++	#endif
+ 
+-	ts_now = current_kernel_time();
+ 	zts_now.ts_sec  = ts_now.tv_sec;
+ 	zts_now.ts_nsec = ts_now.tv_nsec;
+ 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild
new file mode 100644
index 000000000000..ad9bf31d87c5
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+	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"
+fi
+
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://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 )
+
+PATCHES=( "${FILESDIR}/${P}-kernel-4.20-compat.patch" )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		IOSCHED_NOOP
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		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 20 || die "Linux 4.20 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-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c6b1454f4600..ee6235eb69a0 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5ae0c4974286..87b9f2f4da10 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -16,24 +16,18 @@ DIST genpatches-4.14-97.extras.tar.xz 17472 BLAKE2B 39f82957640999cd498a0d401cd4
 DIST genpatches-4.14-98.base.tar.xz 2318560 BLAKE2B 5817ca60c366cafb2eb787a6c96d72592d01957d47c68339271300f5553b44ce777b2bb633cab018a12b1264e230a961fefb74a1e717732d1cb3872129edfd58 SHA512 caa8e6e85af50009d3b278179c127a42db9d3cd77bf043b7d2cc79ee5d96330b919672ea4a0f6d1e7081be08876ff303c9e0583d9707861d6665349b6135cc31
 DIST genpatches-4.14-98.experimental.tar.xz 5216 BLAKE2B 5a8e51ac605688deeb7d119315cad7489409803c3fc9175fa33e1e8382aebc53c4763dd354449d975e26993fb8e9a180f9605182e8d5133d7f83f14d1e3781a1 SHA512 c74aaf00ad6557d6d9dda219b2ed464154e24776aea2c337f675f1c1b1242453db3f2ebdbd975f80371f0715782336940f770ff4e9ed0043c2244d4ee08c68ec
 DIST genpatches-4.14-98.extras.tar.xz 17480 BLAKE2B eb44b4d5b8b63ddae6874ff6353a6578b5a8866f83bdcb2c22d217423a2a4996ca67fafa3770cae465f8f1c301fefb1941c38f1d532c271b42536e6b994f93a9 SHA512 0df6b8ad1d3c739780ed02d95ecb413bbd4708833ffcd749b19a999a7084f8cb5d35af5fb01bc6de80da84d4b5808b994c8276e1152664acc7843492cb8f45e7
-DIST genpatches-4.19-10.base.tar.xz 350996 BLAKE2B bf1dccbfad400faaf631c2c07fd95423fb8b568f7b597b01cf6614d219bf764551aa67e214c4dc0ac9ceeb7951e1a751a026cabe08ad8a097c6ceb36dd11def3 SHA512 f3123df60570cf46b844fea5cf175eeb8f7f3d068d180ad2c8db818c7534bc48d055ce7faa4fa6fe5ef368831f55b3c35b4bc7b25278ec9796cdf34963f64440
-DIST genpatches-4.19-10.experimental.tar.xz 5220 BLAKE2B 7ec9624b200a32e8d2d95f8a71b174d34a1e1f4e249146a9535f02d65723b862d6d4acac0875498219a734da25bd57b6ea08847089c4362964f73f2ed29bf2e0 SHA512 a842396de5ebe2782b0a1a78ba61b3547a10e6e73cc46b799b245a67a7b716e931e43a777dba65a20274960173e582ddc070225f635ac9507fb4bb740d93719d
-DIST genpatches-4.19-10.extras.tar.xz 17476 BLAKE2B b721af1edf01fe8978adba133bd126b2daa2c212b4658d0faf62b99e76ef994deed5a9bcc3c2a417ad689b7f685f9e373a5e8b548851e9680f50031731a1b58f SHA512 4f43cae26c95b14fc3ccbb0a469455c207ca37d86b7ce920396ee0f24d602727a99407d138bd89cabae49003991c7ee7e9b768b07c01ebb19d3ed0363c4bb413
-DIST genpatches-4.19-11.base.tar.xz 384460 BLAKE2B 74fe44dde9f3ff623efa5276981b30d6c2815103e30329a02e785a3157b6f82c624c6ed174ae3d40bd9f55a83f3e3e3f6f7a27dfe87fce63c7037e283d12cd7b SHA512 ee02e0d836c1025c5f46e556c5362e4e92312b4bed411d8b77dcd3cdaf3c982d7cec960415934fce9551e4d01ad4fb5c16f49c26a356e253dd29f874883a7c87
-DIST genpatches-4.19-11.experimental.tar.xz 5220 BLAKE2B 0feceff6d3d363a36b05dc38ef3d4d058c3a8ba467a0b4bf399fb4198ddae116974adbfc5275870d1b1399204f2bae55e17ea37d019efdf85b28d414cb9a88bd SHA512 dc35e231b44c6d32587c9a47cb6a2d252add62610d43d4e4ca25e6be74331793e046ec464ddcbcb2389b1dff623ed0061f76dd18e1c95f15b59726090fa3d5e9
-DIST genpatches-4.19-11.extras.tar.xz 17472 BLAKE2B 09b2621f0a361687b80b5c33407ba3cfc541c575f8c3443701a022f98e4191e04a796f3258227e292fa2ed2e0a160992072c21beb031cd09392cc399ca8cde6e SHA512 28a9d2637250a4f5f1005251098973339612e0bc1173b047bf437c755ad050c1f2b8dc349b9f186c7f3065d3ed6c30df1a0859a2646b4597397767a4d2e38918
-DIST genpatches-4.19-13.base.tar.xz 412288 BLAKE2B a6d49ed20d930f950600a8e592b23be50d2c88d2ee4856f5d9e6ca43308244434c1cdcc4411de61f4810b98901657efd54b102fffbf9baca54bd288b93941a6a SHA512 6fd34295b8d3a6d19e2ad1fbd0eb1e2b28c9c6151cfc0c303146d9ed62124d8a8ac7ef94c4e45bf01c2a3dbafd15e43bf59c6818d72972bbd5450dccdeaa14c7
-DIST genpatches-4.19-13.experimental.tar.xz 5216 BLAKE2B 5811a7b35fe9447bad8eedf438f00c862a6b7a91656812bba208a7f52ba6ed5f337d7ff57e9c22cba7b3bff24b2ef7b91aec224c4ef78d3be121a7b9a1af8782 SHA512 6904d266d84fbd058c0718beff3c8f8292bd3e7b9c4e73835d7fff78c1ce0cbad8e3ac0067b270d86d21447b77213364a4c14e00707ce00b07f8ef4d643720dd
-DIST genpatches-4.19-13.extras.tar.xz 17468 BLAKE2B 677905876091db045248e91ff82f7a3f370b1f01a42c8340fa0502824d86e838026ff551426b2ea75034b1a793385041e97a0c0ff82d6b9eda918c3c3d7b40a0 SHA512 d5282f68f5318a568df2cd6018c356500bbb68d034bfcd2d3befaa0167b9fbb606b1895a60b292bcf276d186fad84c22a9c55aad76a4586d1f5b33d065b7da33
-DIST genpatches-4.19-14.base.tar.xz 427136 BLAKE2B 0f78be376a046788ad6b840677b180fd1bfb8c1a4ec18c2c2b72dd3f6fb4de7adf4f46211db457e27cfeea148c4262e0369b05a61126ff236cf9bf4f88025a73 SHA512 afec4ff7da60d674e924579668f1dd02af8215f3269340f8a12b3280bc6c48f8bdd7a7a2028674070319738f37fc91103644ba654ab86d3989dba01e9f5ac9c7
-DIST genpatches-4.19-14.experimental.tar.xz 5220 BLAKE2B 9fa46b7e40284fd44b7ba8dad99f12b1fc425656d1c5c2ef77bccf24396906657b0233d1a4693c6238294b1384959f9f2ba470dc8096bb9e3c249d5a5ee8bdb4 SHA512 e40d839a7efb9d986a47020eb821e7c54eebe5b8a7636459353c9e60e784616011f77789576b1be7d4ec1595f3f642481e55041cc66dff1e514db72a47f94b42
-DIST genpatches-4.19-14.extras.tar.xz 17492 BLAKE2B d5316cf3d2224df40f77a74ca48268fbc7e5af9bb5b101b42dc374f3d0ae2debfa2389751847c7d47dec29b9f6b077383be5f3dd2a7c138fa1b6ba10d91ff388 SHA512 b6d7b16f764dd6d46f23009d8dcc6f2f83de22081cf42e83948dca817f4eef4302d89899dca234ebcc8c255a45a4c877f776b5e8bd2aedbe9dc39c5e25d4af5c
-DIST genpatches-4.19-9.base.tar.xz 316176 BLAKE2B 384d9f9a340faf4d13c14d6212e0395cc205eed94b2174a5163ca2294ff54c74ec829f54fd083b6c28b701e074a79d443f3ebbcd5c15caecbf7bb6418f5e9fc3 SHA512 f22133a24443f8f91ef4a4b8d27e49a135b8ea8cdd4b7e6bf262f0e1b233d3e46bb20d2e1f379c0f2563d8c2d8626066f9efcbf42ab8e1f621f17c4b5b1ae63e
-DIST genpatches-4.19-9.experimental.tar.xz 5220 BLAKE2B a252358ee591bb4094aa0361c48d36471ec93c5fc15fc2a4c8802a4417de6a6106c800b3c45e853aea8c483a6e2411fd147bbcbd6d97e3f3a0ea8370ec922449 SHA512 fdcb864a31a6501aefd53bb5b8a5753e9004fa02a0c210e1bb6b1f74c9764ff79b8b40208802d54cfa3fbf6f7428bc337d4eb9244f1d54ae66cfaa1ef2ad7501
-DIST genpatches-4.19-9.extras.tar.xz 17480 BLAKE2B 82b74d204cdceed50f5c9f241630a4fa545aa15eb7fcd59e962d8677a5b7e80f8bef19d0ec1d70bcb940a5c72936391a5e0bc1f0f605b7c46dee648a5902a25c SHA512 24a6dfcede8d2f819734afb6e7ed9e36dea73dd694f091ae36cfdff20212009ebcdcd7ff06d4d416972b86b8aa98779c5fe44d2628b45aaa224fa4ddae139bcb
+DIST genpatches-4.14-99.base.tar.xz 2339912 BLAKE2B fef08c3bcedd1a4fb7feea65cebeada32a0f6756b88898652d238712f6a61ed45ffb65a83ce3a7e2103798c38d5f16ff77df70672d135da1b19495faebde0b83 SHA512 86fc99b59300192482c15d8cb6f88bb4c5c112fdfefaede24635ca4a6187b64990762cfd6e0535f369f3606f0aafb6ab7fb7a0c4737e030bd999b775c76b76ea
+DIST genpatches-4.14-99.experimental.tar.xz 5220 BLAKE2B 84c50ee6934d72fe15a14cd70d830be02618549f7409f6a183df5877e7d46c7c48341aac8ce33b569af2794b2156fbd30ead809821b85a7e292f978e44050a97 SHA512 a30c8f74974192722b6e4a72cb631dc981656832f3c277c1e064c2514baa093d65ec2aa672aa0f7dd4bdc12f40c1f47ba5b1c85775157048bc97d13277e961b0
+DIST genpatches-4.14-99.extras.tar.xz 17496 BLAKE2B 82b439fc112312a1030657388442a8250aade75575ae79d9242ee90bd4f951a0628042f1026ad4847f402cbb8f9c14852b701b1d13102c1585ef9c2e75fb1f94 SHA512 656b4b76502dea80a0be12eef058e8da910995c5cd8fc4cab6c97c8a84040bb13acfec3d33f243996dbbc2ea163161b3761a8c7a01187eb5941b8a16f6add902
+DIST genpatches-4.19-15.base.tar.xz 475080 BLAKE2B 845a6cea19fa89ad3b587db669d03fb63c2b371d5c9e3d0c9934d1875e9319623a28904f80566b14184d46afe9106a3a09054bc2c4711d7bb9929bc53e6d767a SHA512 878b3ccb90035f4ab5a95800a7daeb5c2445487553a15d593637b559e092d9258db8854e8af9fc1671e17ddfbf60b8b27261dfc53f58a03284ca50a247e8b700
+DIST genpatches-4.19-15.experimental.tar.xz 5220 BLAKE2B b2d50f5484d238b862f6772c130f115855136bdc90c506c6d26089a5779773d03f3a492ef3e31373c8c48695e2de847c58d759679907956131036b4cae482785 SHA512 14b8b15c21db032c61886e3917f7ffdd3aed03fb217e86e1d8e0b64bd2d9f5dd1d8e5fa5f97b188ef2757baf15c9cf1691bdd1e1bf13f1c1d7dde873853527f5
+DIST genpatches-4.19-15.extras.tar.xz 17492 BLAKE2B 409dac7b1c041b708f791fe1531208f2b67b8e676da0ff85b435688790d66333f30c621f918d52202f776bfda2f3394d5375b096f466b36533c9c10204003b81 SHA512 1688fb1c53012ecadf496b2e778398658f26492c8ed69660feac989df631202c9c3c9c306502174ad14db5f19e4724460a47f33c21af3267a4a7e9fbe846ee5b
 DIST genpatches-4.20-1.base.tar.xz 4008 BLAKE2B 3d4e9420d01fce23b89d54487abb0dee4082be5df9ae6b1ebdf9b491bcdc73262c08d26e119527d3da1169c24d52236b47fd7b8089eae9bdc0f888e60225a6f3 SHA512 a8d75d79bfdff5a31478a147117e0e2630b42dd50ea3a07a8c7b52de4a768cc191a38a36c323a7ca2288eb64d48b74d862a7f827346944a252762ee9b3f566a8
 DIST genpatches-4.20-1.experimental.tar.xz 5220 BLAKE2B 20417cb43be021ac767c0df7afa1bb4dd421fc08c49e0a5e53b91c431d3b95f0cd100bff92d0f827becf096431661bea2b1648c2465c9e336fa0519e6f3b8eee SHA512 ef91e66de331c25336cdf2f61fd5c78746264ef1e7af04a92d961237563652e7022376e63b3fed7219210f11ca64429f3893b026947f411a6c2642e630f6fda3
 DIST genpatches-4.20-1.extras.tar.xz 3268 BLAKE2B 48dbd360602ab2c7b8f5ac41fcdcdda93477c82d59ac426945aabf1b52868817e77140c289c3f2920b5b39d2d38ed49fcba5d3474203ae5a8a206114af9a8216 SHA512 158cfb239a003e0c8faf57a3919549629850f14ee9f61cccc4a0268d13b228ce4099cc7ba1fbb057eb05c1a9b3cc6315e95f53e23978a81a63f461713d2a76d2
+DIST genpatches-4.20-2.base.tar.xz 57640 BLAKE2B 712df7096f456ae43cd64cbf3ed5d397219485be1d6872fe16cc8bd9bd142cfb4aefa0d0186b6efccfe6f41aa780b2515e47cea1cd717865fc07a81072e69428 SHA512 22512178b63b674f5db66ade1a34de6e00ac02feb8532340def404865b8f1dd075e751c4fa8ac3ce84bc754e5c80778472430183f8dba53c7fe2e47ff630cebf
+DIST genpatches-4.20-2.experimental.tar.xz 5216 BLAKE2B fafb98bf0403056b3dd9b431d104910f0d1f47cf992a05b0fe5d6df51d90db17cb3ea64df92cdb1c1ded15ea1d90daec437135efb22af50b1dd0ddd7ceeb5149 SHA512 23e93a9e5e13c4297a223144c7288b6d8f2487b1d6b68e1cf4167d4ee22ba10b549f21e5f56ff7f5e3a2d7f1f78339c5b6e8a221d579aab9e2d391f9300b9a14
+DIST genpatches-4.20-2.extras.tar.xz 3280 BLAKE2B 812db74905945a9ea8c14c3d1434802e5de6ee24fce423489bed4a3f6007868900760d43607b735d7a9b129498d1c31f590095e69c36cdf464cc8540ca05638e SHA512 8806c6c138cf72d4049e688dadc9d5069219c9834f66169a2073079291e44ffda7c86f4b250632d86e7252d959876b6a31a45c1f2c4bbf996137efd0b69611ee
 DIST genpatches-4.4-165.base.tar.xz 2476424 BLAKE2B 930a62c7b5f697e1baf2b999b45123778f2818a33558343592cf7273b2b376c8824700b2c20b71efcaa0991717b8ce654a222d2dcde8ca3bf1b3417e406117c6 SHA512 b29767c1ac47e9b3c7f3eb7cc833939db964901c6dfd36792ec4998dbb97ae6a21a8a7ebbbfd6eff74ba28463eb868385324c1069130ad0cfa55b33323673993
 DIST genpatches-4.4-165.experimental.tar.xz 87776 BLAKE2B 65271ec6c063df652a7ad1317c37c8eaac9a4a93ceabbb56bf8c8de43a49b6ccdf6f22608acc061568cee72208fb62ae98d9b363666c7e664b389c482bc17527 SHA512 af7d9389495ace3aa2fb93d1d77e7f5204df46547f0c84ae820352fd0381acaecd1f4a41ba5a4507c2a30ce5b6928b14eb88ec120a87247b0cc742fecbd40f64
 DIST genpatches-4.4-165.extras.tar.xz 16452 BLAKE2B 59cd1eabbc61cdf547f21894e137033dfb7ad71b1bd2f1f47c04de74602abf548e504de5a95d557c805d72edf70455fe0c3a34d3918a91b177aaa3cea17b9194 SHA512 42464d2bfb847e869a2d6cbcca3c86a52840039ab975dddd9244c60d58fce671703c89e880cb49e1fd19eca9e9ab9367a44fdbd30b78bd68a7ae5cd2b1f23dba
@@ -70,6 +64,9 @@ DIST genpatches-4.9-150.extras.tar.xz 17352 BLAKE2B b067099e63c5ede056668fd9ecee
 DIST genpatches-4.9-151.base.tar.xz 2753600 BLAKE2B 298508be7ead546d0f275ee96caee7dab18e6098bc24761681a02737349c987ca124c5b1d144a67dba4617e818f102954fec4e42a949161a3d4c192ce56d28fe SHA512 eab84ed5b2900605c59fafa1d1e25ba3fa344ec40fb63495d894e8ceeb69e846ba56e4e64e9c45c5082a124f1f89ff3e1ed28af263e4899757f9e34f6f86e4a6
 DIST genpatches-4.9-151.experimental.tar.xz 106404 BLAKE2B 026abe15773577e996d2b26bca4ad275e553a5f5626228a60ddbd4dabce07ee1eb8e9defb9d0b984494a885f66e19f22b1ecf4d4aeae83cc6d50e11fe234b240 SHA512 8c7fb60a1635c0231041adca62df94315c0d214615f81526846816a574cf41080875a206ce197c90bc419af580ea7d60604ca768189e21f98b1787f8d157ac43
 DIST genpatches-4.9-151.extras.tar.xz 17352 BLAKE2B 030f1ee8d7daaad74cf54417316c4cea16ef901431dbdf92c0ddc4e7aa196dadfb4fa4fb2526ae4cc625735469a4d415795d2ebb655038376e6f529f5a9c6231 SHA512 3043a263a51669b333c28cd7bdc261bf792d2c8bc93a50df9b90dac8c0bf1da16e27da1480315c34a81e4e60ecbf24d7948db0b9da6bd3fdd986620404a2d7d0
+DIST genpatches-4.9-152.base.tar.xz 2764536 BLAKE2B 4e2a2a78dc7c77f2c99cfc910386975444d79938fbb19af660700a429c2dec8cff07c14709bf59fc43dcd6b03ad6e7e8b29cf42ff8596457a22439236e563b65 SHA512 88e8ecd5f4089c9cc6db8a5d5e0950e2d4ab5a5da61ae91ee30586ab4f19bd981ebae5f1d14a236b71165760e856c5116cbfa939506bfd6d9043b5153748788f
+DIST genpatches-4.9-152.experimental.tar.xz 106384 BLAKE2B 957278e33647361da8092d315546b15efb7d494d9bfcf80a99f8536a877d89a59f22c6f3a8e068d9e5a1e997d69104fb027ab3a70126ef8bd619accbdd29463e SHA512 ca345b19310dbfbc8bc8a361d670b675fe66a45b4f4611d381154229df20b33bada5e9cea595afe70d82da19557372a9719073515f2ae0d80ac9d1b9f908031f
+DIST genpatches-4.9-152.extras.tar.xz 17356 BLAKE2B f5ef2087f29ca5228b954104e75674f0b304015a5d5277c37e8d0ac508a27ece54488082fc009653c62b4e1817ad307c7f9e39d2b10605f348dc5995485e6b01 SHA512 4db9e169ab7b68a89278f124aabf4e5c7c98644f3d1dc5c7268c68e0d09781d51948717015453949318adf8bec0f316127866adf3c47a17a1b78dbb31d72e981
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
@@ -81,12 +78,10 @@ EBUILD gentoo-sources-4.14.88.ebuild 739 BLAKE2B 0a29af73cb17d8cfe9ef193d3b1e852
 EBUILD gentoo-sources-4.14.89.ebuild 739 BLAKE2B c028a3402eecb714b5da89dbf767c27fc691aff61d243c1ba44a23cc9d72dc9ea558215b1a2fc1f98efa8d4eb5741cd909888c6da1e723f16dd08e728cd61047 SHA512 5cb9216bcf589baa167758a7c7d1f623551836ecc5e1ca3209936623da35c14594fa40acc5ef6e45ae2d2000baaeb5cd0d8c53c45ba367c3a7682c5c4b3e2237
 EBUILD gentoo-sources-4.14.90.ebuild 739 BLAKE2B a7a78fbe699e7fd2fa29f9b3ab706a28f44ff1f4011c1d09c5b8b77a90136ba03187076d02c59215a773adb509e532dfd53ecd779ad5c56c5e1779ba152d0aff SHA512 703df7d464a43638779d79e555b8f8f7f35b960886b8317fcaebb3bf6728efcb059742fc44310f3eacc7753f2416e6a10f5f631013137f8d8cc0300153db531a
 EBUILD gentoo-sources-4.14.91.ebuild 739 BLAKE2B cb0f8355f90d265fcafa135227af00e963788a583f013db1684f79dfe4278fc7b86828ed98ff5535651f5d2409bfee9d6da5c4ad7b9f6892e63fdf2bbf9185f2 SHA512 ee9f601e1189089f50c7608cc79b1016bdba96128160ee6689809cd213143a15e8667fea458d54123ef977e27766406bfb17df7b4cb83e690fb3b459cec108e8
-EBUILD gentoo-sources-4.19.10.ebuild 739 BLAKE2B a993cde86f23fc9e8817d6a22bd971a5c2e96494442304891824def6807fdcf3b4a3e20b0975b0dad565770334fa8e820d4632ef3f6f59ee6176ce1d392a5f41 SHA512 451fa8af01c58a939262054504dc23b3ccdf1853966c41a7c8ed9695be5043b006b88a2ba9580da2cc777aa5c8c2bb320393247fc7e4b2be233fe0e65cd2ae87
-EBUILD gentoo-sources-4.19.12.ebuild 739 BLAKE2B cad640df9c3c018a4fcad44e895eea71e9ba4b60a6066290e43952bb74cae6fc07d18f673bed08f6bb6f89cf9ba5bab6e1e666e0dbeaf16d5834c74bc5f9086e SHA512 a1a7abd01c77015b3d2d2674a0b6624d3fbabb684c6cdb3b358421d31b031a2f588c56d3205a754f7eda42f596330b2969dd7ae1bc2e9787869db48d2fdc6162
-EBUILD gentoo-sources-4.19.13.ebuild 739 BLAKE2B ec4fb3018e172e966a5eef6043d86027846200db58756da66e386162bc5d367406cb72833b4981000b1ce4987097aeaac8083c9ecd245a0b33662e78109e1ccb SHA512 43225e209d8fb555d050226e87be0e411ad655d008306480bee4af8f26d7b2d55f0af6bdc7f825915ee0aaa27a9235fed4c74602259d9dd83a71069595495210
-EBUILD gentoo-sources-4.19.8.ebuild 738 BLAKE2B 377e8eb419cfa6b3e68bbf6feecd6f48f6de1610eb827aba405dfb2ff0127cabe6054b5a72cd76ea8375e1206bb4a6667190ddad6673b8298c5a81c706213e88 SHA512 af3300a528825d9d783e9b2d0a671ca1f6368899cd25b9feb54eba2d33897dedf6b13c75e76e2a1cedd528c09aeb8e88c3b81e09ae33174dadbd886a754cb5af
-EBUILD gentoo-sources-4.19.9.ebuild 739 BLAKE2B a2cf26edf76ebda226f0d5ea973b4979ce0fcd3faead6e40bb79036326987944f4e4080a66e460e032346ed45d3cc4a3173de68622b8eedb09a714bdb6c55550 SHA512 d2fa54891a93a10ab4d211881265298726648c0314a677db7cb8c0bd8415da98d7152a90a49b0957954fa0d1a18ee88f39d708f7a926b9ea038a8804fb45a018
+EBUILD gentoo-sources-4.14.92.ebuild 739 BLAKE2B c0c9187459cca04fb816730930a65ee7f542117796d1755b2fd3ec8af301d08b7150dba4fb77704e40609c34642139cdaa556a8c2d78e16ecdd98e744f690b03 SHA512 72548065ec281e504f12dbd80155695d25007d7fa5741092c868062c9f6272fab040fbcc803729d3bd00d09d5b4d59edf3ae113dc3207b68b7c2f3f29f7f5bc9
+EBUILD gentoo-sources-4.19.14.ebuild 739 BLAKE2B 0229faa8188b77f0acb9de2fc6b06b3c0d60d2c217288c58138a9d2cbdf893af78b707895d59e46d9c4fc77d50528f474b86b78599e42533b7ecf36fc60fd1ef SHA512 23e0e050e3f27250a84e3458a91cec9161c24ef2359de837ab779ae5627d0faa69d873ddad2b0284fb21c0210268a0751494179d0a243b19da099e687dea6930
 EBUILD gentoo-sources-4.20.0.ebuild 738 BLAKE2B 4eb7f24fa38a5a40ba6feedc606d79bdd76721692a0a100c01b9416852c2f804978a09ef89139d1da726cae2f7784a469450c837a3dca6fab980a2585951068a SHA512 acb0bd6f84d2f9b386a74b82dd74bcef4a00b9aa1fdc429314d4de64b33c461219a800d32907f3749e862d49e36e7debc199b08fa0e6ac1ae6edb60ff2efaad4
+EBUILD gentoo-sources-4.20.1.ebuild 738 BLAKE2B 0f95fd69cb7c4768a07dda88c01e188b9cc64a6407221f28b03beb65157f4417882f1b8cb3761cbfbf41a91e8075960d22af6d4da0c0e1ce5dbcdbdc65135ea9 SHA512 3aa0e05ed8f4d0f28e9cc40d00c52785b5f086a88edc78348a387f7cb4b499b414b332192137819c7e903d1e9dc8ef9326ed067cd9d68e3d050824ac6a0ddbc7
 EBUILD gentoo-sources-4.4.164.ebuild 732 BLAKE2B 4032ff0065a2c8abf66ce4cd3f1f6b42e74aaed934cd29636fd155500ca41b15edbbb44c8a08dd01c25c977f086be0c5d3fcc466282c29a90d135c7e6a7f744d SHA512 4870bbeec69b92b7071e4ab0a84ec90bbfb7c8ea9e67e0f677244ddcb3c709ff5d7bf032d687b4408fe1a48bddd333316beafb54693f670ee9e3108d4bb2e5c5
 EBUILD gentoo-sources-4.4.165.ebuild 740 BLAKE2B a89680e0beb0dd35b0093efa61e3aa02d2c1f94350d1abb5f81138f630f3b1bb0b63bb4fd9a0259a64a96f22847b103c03311998cf3b3a87b903f25ed0a178e1 SHA512 52c191dbf5a467c9a967f5cc76493af9a1998ef90ea96b26d772d1195c458c5e5c3d4d3e56cc0b12a9816a0d49bf8138ecd07e88a361b4b5397935119f2ad695
 EBUILD gentoo-sources-4.4.166.ebuild 740 BLAKE2B 12b5943acbfbc7c7982f2bf7b91b6b8dad38bf82fa9cc5d164f982567377be778d55b8b863991943d35dd86b00bfd1a3a97686563ff445c8fc861ca3f24e1879 SHA512 04a2079304e4de479d4e7352206b7a5a7916e6a1a8f02aa15c168bebf5663f6f395543fe5e8c015d50a1991c890e8419d20507a0714b297e3858ef92e13a4ae0
@@ -99,4 +94,5 @@ EBUILD gentoo-sources-4.9.144.ebuild 740 BLAKE2B f24be6ffc836b3d2b8ce70cd0fe167d
 EBUILD gentoo-sources-4.9.146.ebuild 740 BLAKE2B fc4c4a965c85e66551d46c256f688ef0c85f5a87def4d3951dbf021c43af03eb0c9e2c9d7f461f8464470d89783fc8a656dc6f93a5c5e3081f24f5a4a4e880b3 SHA512 2ad6760b6383dde8c13570daebe261c83e3441a2feb8c3c79fe0872d574208808222916a8de869848f31d84c51c3851bcd1b57ef20d89848b33dc9c1e99d54ec
 EBUILD gentoo-sources-4.9.147.ebuild 740 BLAKE2B 72ded4ba3f95c782332f2f89b7e209a914586258a5f227fe379f7016ad9a35960f3e425f93e9529b083bce0c97f841f6865cef7cdcbea094229526fbd11bd360 SHA512 0cebbc09e9d95659c9e5346d2c8dff0edce8752cd17788ff229ac9fde6593b61a8dec0ce777d33afe4b67b69394f69b4d1409c8e15d965c53b8c051c9006922f
 EBUILD gentoo-sources-4.9.148.ebuild 740 BLAKE2B f8f94eab812f7299a585ff067a0d72b2717b18aa3f919e6576e9a86d5bc35dd6962a1555dd751fd96d236aace6279198e9526f43dafb4204ee7bb465bb9a2403 SHA512 c976f0d69f94d864db0a6c5b27b17a5c1b4709aa36ce8bc6abcb56800460e3f2e3044a7ca3aa1e6aee3941ff389943426ca155324ed6bd3d4d2eb339a0a70127
+EBUILD gentoo-sources-4.9.149.ebuild 740 BLAKE2B f9fb8f1e8574665ffae17721f6e4a8761df2815a6a6e62bba15f16525c49a10fd28f4f503096f5ad541079c90b541a5fa82ff4edd5bb1be8f3fd4e0b2ddcc995 SHA512 adc114ab74d4f2c9cda986f0d9b295713272293b25fc1c91cae9774b3d1e861d189a075efa2cb007e1781fe3f9f43d83e4020a0c609af50f369157f12ebafdf1
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.92.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.92.ebuild
new file mode 100644
index 000000000000..a89c6a37fc5f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.92.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="99"
+
+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.19.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.10.ebuild
deleted file mode 100644
index 6902981c5d2e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
-
-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.19.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.12.ebuild
deleted file mode 100644
index 266f5957ef5f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
-
-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.19.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.13.ebuild
deleted file mode 100644
index d34bdbbf85a0..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.13.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="14"
-
-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.19.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.14.ebuild
new file mode 100644
index 000000000000..9953694b73e4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="15"
+
+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.19.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.8.ebuild
deleted file mode 100644
index 16899ad20387..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-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.19.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.9.ebuild
deleted file mode 100644
index 8dfb5c385b6a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
-
-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.20.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.20.1.ebuild
new file mode 100644
index 000000000000..48674ed75d98
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.149.ebuild
new file mode 100644
index 000000000000..e1e10a15e227
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.149.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="152"
+
+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 51b201a31f70..b65ed956b836 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,16 +1,4 @@
-DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-DIST patch-4.20-rc1.patch 48053133 BLAKE2B 21b563b992bedb9d9eb0011804cc9d6c862f7e55194c02679e3ec540aa0913ecdfc2dd9769a34b8e2980427fc0e3116743b17516a1aa7607a984dd7ee4bca10e SHA512 04bd50386208ff7f3aecf50c79702368a75aac1d356cc5020d379abd80aff821afd501d05e6fab42cca48bba0593f71442534d9fbc119f1cf0dd056999f78c22
-DIST patch-4.20-rc2.patch 48404086 BLAKE2B 12646687c66d6374aaa5207770e39386b07bc0a4d445cb92a2cf563a326e49d2d5cf0eeaa805557aac1526b636762be97887a0b466cfcd9e71b02d38b9dd97b1 SHA512 f41189be7659962e451eedd7e057420fe7744ca82608260b2212bf97bcc2e59fd143c3c261e1f1a35e4fff80e500c2b436a46b50c209c7cdceb5ef5cc9fa628f
-DIST patch-4.20-rc3.patch 48529229 BLAKE2B 2038039535eaf2e665b37b97d445f04c059a0111ec4d2da706b101f7a8b1dde00ea754f31266431c7bbe5d7a6fc5143b44486fc636c7b2e58181a88308838cd2 SHA512 4db0be60f09f19ae0cfa141bea43fd361bd307edafdd92d8c3418e3944120b01204b4e683c723f583318849336f4fe465309f9e854748b2c06c7330dfcb5a327
-DIST patch-4.20-rc4.patch 48770023 BLAKE2B 42f4c2d9e021752708587f582b4b72bfc2d01876e366ca1c8e143e0eb1f7d453408e74246162cbdf0ca8482821e152d51a0ead50154d7d902b6953ce4ee975b3 SHA512 2b16a9deb7e5e8b80bf652e42672f4e60e81b2f6cab6928e8bed15bfd07233970269a6831621827b43b5340f132a25f161d50f503aa80f37014e901437fdea7c
-DIST patch-4.20-rc5.patch 49157710 BLAKE2B 81a8c3fdb6b0e9a11e1d23c9f11dd9ab7e9fd021de4c1bc8331c3c07e6ac403111abe1921f69d7011e323f46b9e819e502c5cfb20b3358615b8a6116a5ff4b59 SHA512 1cac308f65df4b4627e836766d2faeb901cbbf4a7193a6097b796f5c179e02a1c07ceab9935a3c4d1d22ec75b46008321cb5e57862ba1bc43579fda2b826b337
-DIST patch-4.20-rc6.patch 49410279 BLAKE2B dc81a847dff97700a2fceff11371a8c98e900949467d930d9b602e68b78282fb818bfa527d722d8911fc0f4930f9b7defb2b9dd18ad56405e06ab6fa09288828 SHA512 72412e030699e7079e66062dc0d1ceb91b6ce59ca4b259c58b902bef7935697f5bfbbf4332246b3a082d13765fa7e5c32db114e999bd6011e93f8a9461d8bcec
-DIST patch-4.20-rc7.patch 49521430 BLAKE2B e0b5d51df948dd3baf510b05f062abce79e3a7a189767a8ec56b431b14dc3509064b78602a9537d88112c0ebf5b13197500c3799c8bc845441c01905eef84d1d SHA512 58576ffb3016f6a5948af50bf39eb5ee565d5e0d2866671c08251df48542c819ff3eae4820b5d70286ca16592d32208c8c0bf51e68ea2d76dc7b7d636e39f9ad
-EBUILD git-sources-4.20_rc1.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc2.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc3.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc4.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc5.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc6.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
-EBUILD git-sources-4.20_rc7.ebuild 1176 BLAKE2B afc7d8354ae1bd8f81836042eb8d19e5a3f4d4a86d753e7d50c3331fd169287fde9956a75d5c0fd7117ddf3f4addd33d0a6cfa5a145999fb989c5579f89ebe0e SHA512 1b107656e510ae32c5e6fed59ee7b3922ee8f0d8042d06fd3e52540283dd5bb9a5395811329a33d1fa409238fecb8b187b6f732afedb93d503c91c655874958b
+DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
+DIST patch-5.0-rc1.patch 41507244 BLAKE2B 4d66bc2d6be0f84b02a3baaaba02276d3258d713f882ce48973fd93d1ffb3a99505692af61f7e80f18436ee847d542bb0e3fa9f2df727995bf310f08342676da SHA512 811bf8534c4054fad7faa19e0b8513ce3d7f9d515f3e09c4f7767af0d66fba1995261df08ff0c16518e1ed1c966539d9d1e55501e7a89b46773e859241b8ad29
+EBUILD git-sources-5.0_rc1.ebuild 1176 BLAKE2B 1f4fc5442a91260179750a85a8616d7422ace9c2e41a571c094819906ce2a8270d9e87f8a1abee8303d82d43008d9107f7616753e7c3a847f20b322c459045c3 SHA512 fde9361935139a4e06c2d23af05516522c6d7f92cf927ddd78462a86890deb81b61bb98091648e6da9239523841a17e5203e81d021122e0b47a20799cc7d08f9
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-4.20_rc1.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc1.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc2.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc3.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc3.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc4.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc4.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc5.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc6.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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.20_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.20_rc7.ebuild
deleted file mode 100644
index 54e27e6f6a7e..000000000000
--- a/sys-kernel/git-sources/git-sources-4.20_rc7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-UNIPATCH_STRICTORDER="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_SECURITY_UNSUPPORTED="1"
-K_BASE_VER="4.19"
-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-5.0_rc1.ebuild b/sys-kernel/git-sources/git-sources-5.0_rc1.ebuild
new file mode 100644
index 000000000000..10cee793e44d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.20"
+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/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index aaf1764dbc97..cd5ce3ebab17 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -3,6 +3,6 @@ DIST linux-firmware-20181216.tar.gz 172681622 BLAKE2B 3d98af002e5ab1ba8935a87162
 DIST linux-firmware-20181218.tar.gz 174835447 BLAKE2B 8bac1dbd413c4fc5c8c07bb299860504cf9ec39b3665e20d86c3755c2a655a5bd4508b406d91fe8648378217bc3aa49fdac05beafd31dcbc0a05496a195d1deb SHA512 58bb759378e569169a4499e5b0e09b7aa3e42a160b1187313fd8e74b4d26e45a018202c2dfd94b7b592cb0a5ad040bbd4051a0f74d7737aa3a72f0e3ed060dfc
 EBUILD linux-firmware-20181026.ebuild 3264 BLAKE2B c4807c4de0151798e24d4f60fbef04d10d68885fcf90fbe9e8148c7f9e2243ec586273e7ecf379f11582108c848056595a6d841ea7b78fa9a5090ceabb088917 SHA512 eefd8c608d20f1f9fe6f0f6417a57296b788d0e52dddd45e089c67bd1585e8e7ed2d32fd6cf1ddc91aaec18bcfabd8fae67a90fecc2871c2bc7b4423d4af162d
 EBUILD linux-firmware-20181216.ebuild 3264 BLAKE2B be21dd1418b31a5e271d747912c6a03ceab9ba4200d7b800e49fd551203e0f7a4c9452076efbbce2164c66aea5c5c05a09468f77b42bb44e821d24896c6a4fae SHA512 9505939bf247742f154552b83902d74d4e3edcf3ac8bedab5d333d44a2aaf07839c1c2f05762cdd761e9f99a97def573cd47dbd16eedf98c821ff5c38792cfc5
-EBUILD linux-firmware-20181218.ebuild 3707 BLAKE2B 99155efa83535b47d6ea0e967cdba3914187b99053d835426823b82a2c3bd6cb4a12f0e77c087852c0c1f2bc4aff1c4bfb8523dbc4c89a2dd4f3ed88cbb875ab SHA512 c551de0b829fde8c0d74295201fadc4b0d75ebef0b093e1b3f78c6f074f237a9738fb1458cd05ceaa1d19800e82ce74ea61ccbf08b9f58254aeb977fee3dff0a
+EBUILD linux-firmware-20181218.ebuild 3694 BLAKE2B 2db2b8bae84bc63236f6aa3a7686f4f6ef6ea8e84e305991d67ac6f3db3bd9983123a3626f59e6fed137d4fe903e790732bf27e7b8841a4355b4156259b06fdb SHA512 ecda974e37eca65dc57fb9c9374c475b263978508ec957f5ed70c12576173c489734c0011311b1b1c857b86a61f92c5ed01f31611fcd499e818f2c0bab8b5035
 EBUILD linux-firmware-99999999.ebuild 3667 BLAKE2B b89213f7eddba701f283917616420b6daa64c275b8eac90179e8de0cb9d85eaf09b3db5c61472c27b1c9a909325596b30e7315334472d02fe7f226d7acdfce7f SHA512 c58aee0eb2cbe4d6ae0956c5c96ccc2a965772414f84ebd971be885a9c5fd2665dc9be925465d303a2aaa967d07e8a662f852947c830f74ec510e2987475acb0
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20181218.ebuild b/sys-kernel/linux-firmware/linux-firmware-20181218.ebuild
index d7eafdff4cd9..ae9f20cb81f4 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20181218.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20181218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 99999999* ]]; then
 else
 	GIT_COMMIT="0f22c8527439eaaf5c3fcf87b31c89445b6fa84d"
 	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 53ddf693447f..384648396169 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -23,7 +23,7 @@ DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 EBUILD linux-headers-3.18.ebuild 1433 BLAKE2B e9f705fade3656a6e3662737a30e44dc2c2354184304222fe466471440116762ad1976f6ca56d223bcd51afa82bde434c9d26c43450b274d0842f0ee87afef6d SHA512 8bba162f7ec52127681302a552fdb090a6fbe000e741307663d98003476a056ebc25e2cbd1b98f0e1bff0b8ef274627ff920901d3c79cf6196e16a5da04b8a98
 EBUILD linux-headers-4.13.ebuild 1507 BLAKE2B c52f49cf153cb2cb59bf9202c9eac06197da88e85353984048423300bdc0383ad70ce08b24f06839cd43cabebbee311c17b3482e42552d343c48ce2dbeb8c7df SHA512 f2635872e189cc11fea828b5d0e392218eef81b7a98807c12cfdccf8901fdefe96614d27174ebceaa35e492b358729b904669f285c852cd7535e4f595e7e98fb
-EBUILD linux-headers-4.14-r1.ebuild 1504 BLAKE2B c0de625f20980540d46b8a524823821ae271b9f02e027f5e486e09f001254d570df86f508dc7c31a29c3f10b5e322c0efe65b7ef10e1aca6440782575a8f6d62 SHA512 72833bbdecbdcc1ad85a72af2743920f7b1b1b52062b0ecaf85c87a850340bacb478a467849cc981a6eb099030c909ff07b0883ffd3eacecb71e3cdeb0928de6
+EBUILD linux-headers-4.14-r1.ebuild 1503 BLAKE2B c306ca054be152b1e795a7249497c7bd68a92c1041cfeb44df751b72f2c23511bd4478cc8cfab38eb1992d49d3a7c1419b56e83f01ef9249f5d1dcb8ecc3dc0d SHA512 b3e95e47914d2b898c280cae679b3e9ff381de73674599a6ebf9d0fa2f460384ba36612cc23a9be9eacbf5081ba820c31fd78930bed2952962949733285d356e
 EBUILD linux-headers-4.15-r1.ebuild 1519 BLAKE2B 6d1b24772c1aea77fc91386872801ebe3fe06c2bbed531eb82c028f09fbce4b25fbb2883b487aff0e0fa491f5aa804ca18b43096c9fd2fa36df0cf4a6f1c79bc SHA512 43997a52bcdee13acb3e8fd8d6068fdd00deb8cbe18fe5874b2a0b53576a52293f0ce58973b018572947cd8e1f1c6f0a99bc8636ef2ad144a49bb35d11b53157
 EBUILD linux-headers-4.16-r2.ebuild 1698 BLAKE2B 83414bf8ba9db9e6ecb9a42c34db25a6ed9b43111ef86158a3c13b431609bfce5b8a282ef2253bdc3ec65563ff29c01067473a17fa837e705fd5ce1888746a57 SHA512 bb0f928e073ae3f793098c7ce59ea85462405cd52a47cb627d2fb576b060c5eb60464757aa392d2748be6333508b56b6f59a04606bda6f2c6b7641acba263f37
 EBUILD linux-headers-4.16.ebuild 1709 BLAKE2B feb0f31d53c3c095d9db9e09ba24bfbacada0b82f0959ea2a97c26ce7806a3cffbbed01b8d6cb0ac88c8bb8c7361327c3ae37189b82cf29ae03fc4409e63c1cf SHA512 b0e68a128feb68bf21e717ec0224d0a6033249f553cbc161b3d5da5cc8ac94220ec3870c2f5933d1c8bd49b38f5c21886227638cb3fac1f7e49f4950fcb2ddd8
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index dbd6e62cae4f..aa4dc8f5b5ea 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index ccbd714709f0..368a59e84c57 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -3,6 +3,7 @@ EBUILD raspberrypi-sources-4.11.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb341
 EBUILD raspberrypi-sources-4.12.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
 EBUILD raspberrypi-sources-4.13.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
 EBUILD raspberrypi-sources-4.14.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
+EBUILD raspberrypi-sources-4.19.9999.ebuild 638 BLAKE2B e323774ff67ac07fc223fd727149a0bc9cff5dcbf655420eba56111a6b20fbbb18ef9a4bb2a87a74af236125956166613a7e446c094bde859079942785e46b66 SHA512 0aad77b337734adc0ae8c323345fd185f891ec5dcdd93e07a3f6772bc5368d2f144316672a21f05da3ee10af4f389f67698dc4831e8175baae9d43b49fba80e7
 EBUILD raspberrypi-sources-4.4.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
 EBUILD raspberrypi-sources-4.9.9999.ebuild 641 BLAKE2B 90c9b9cc8bc29ae66f5fb3413c7bd2410deeea37cb62c84606ad5e7b8bdcd27f70510667d13f363f27f89d78a76e601a89a92fbb407747488f015ed55c12d61d SHA512 5bb8238133dd3545223c4f3a52149067282439c5cf52c288bd8dd989029b37d95a960901d90d140ef9d8a7b761db4c44140cd537cb6d49412f72cc6ab5df8164
 MISC metadata.xml 249 BLAKE2B 876bebe345270d111f39940630a09b4708839fa44d07b4ce87838e9f1c14bd6b6ac3f2578afb47ec34b76d079b3d6345981b7d482f95ef34dc423821464baf7f SHA512 c439c8b8c8f7b9ce0b2f9d3a30ad9ffec09e28a9f22cd73ad8abff2f02c29a5cfae66e12b68bbbdbb72f40ddba6906d764200b6981f94d5ea02b92862da024fd
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.19.9999.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.19.9999.ebuild
new file mode 100644
index 000000000000..76139074cd9f
--- /dev/null
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-4.19.9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ETYPE=sources
+K_DEFCONFIG="bcmrpi_defconfig"
+K_SECURITY_UNSUPPORTED=1
+EXTRAVERSION="-${PN}/-*"
+inherit kernel-2
+detect_version
+detect_arch
+
+inherit git-r3 versionator
+EGIT_REPO_URI="https://github.com/raspberrypi/linux.git -> raspberrypi-linux.git"
+EGIT_BRANCH="rpi-$(get_version_component_range 1-2).y"
+EGIT_CHECKOUT_DIR="${WORKDIR}/linux-${PV}-raspberrypi"
+
+DESCRIPTION="Raspberry PI kernel sources"
+HOMEPAGE="https://github.com/raspberrypi/linux"
+
+KEYWORDS=""
+
+src_unpack() {
+	git-r3_src_unpack
+	unpack_set_extraversion
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index ba273cea2636..c94a2e8473c0 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -24,14 +24,20 @@ DIST patch-3.18.123-rt107.patch.xz 177044 BLAKE2B 26ec7f306d1e5dfdf8677c7a20474f
 DIST patch-3.18.123.xz 1670860 BLAKE2B 48fd660879ae27e05d30577b6c5dc2c3a8b83a2fb029ecfe4eae6b5dcc2f0b0afad5411cffb1454227c1b19a719feef8b32556c24c5955670fc358c649f248ad SHA512 7bdd4ab38bf7cdb0148dc062010c9c0af6f75eb36ad30b384cc79ae28233cdc6eac897317f8513c7d42e1ba71bd5d4ebe963325fca6e8180438e7973cf1ce4e9
 DIST patch-3.18.125-rt108.patch.xz 176992 BLAKE2B 74abfe93e59842005188ff2b0daa1c56c508c07c92b2596264bd61bd1ba056110a554cd583afb1061bacd05c53901ecb2e5f52ba78f620cbf81c2a6f0865ff18 SHA512 aeb2bd708e4742beb6bf22dbde56ae2c68286316bab6bca0222d580eab05305a95315c7ab9b5cfff2627e6a4f2857e7876f8a8664b108f267e01c88d9b7aba3f
 DIST patch-3.18.125.xz 1714600 BLAKE2B 111582e011c3a6c54541efa487d17f454c6ca7f7e07e795df828ad228ac8240c2858aa0cf83ae99810a8beb27fa7d376d9830415acc9f885ca232a348f0369bf SHA512 3a54ddcbe72abd77d72955157a498e779aca0812808f26130e2796dc50f79f998df81f9088abe90602b873fff60a2aa91fc9d9b4cdeadf930c129625f7f5e17a
+DIST patch-3.18.129-rt110.patch.xz 176816 BLAKE2B bf8740d5f9d965725a0311918c12479e4fb8a4d29bcce5cacbf29c90a6cf3320f6bbcd222ed741111fe36a1298700017e8cae9d9f5126253a17cb9ae7b39ca01 SHA512 0fd0c0b137d2fba2542624a2c6940fe12323e6a414c4446a56e349499a65e3c14479b05a07e59fc9f716a25de35022ec9f341c53a2307a513530f3752f40baec
+DIST patch-3.18.129.xz 1755584 BLAKE2B 79f5f063e36438a1ea867a3c02919a2d2acbcdab5926eafb3227bd0de827a5627e1a24feb6f45dc45f773cb155e68083f87e04298797fbdc51fe111cdb2fbee7 SHA512 bbeed0494127c78ba50866bcb5d31721e3d87e59921b4598a5845171a0717cea88e6c6b06ade727a2712581dcbe38bbc6c240e836cc10417d138b93b6e404af2
 DIST patch-4.14.71-rt44.patch.xz 231184 BLAKE2B 4e8a9874a2b731ab0d89d44c0993d855f8a8f641fb309c6e891e104e3c276846af6db30ca4a5ea6ce4d309648b72b64a8eceb184287030001a67737d254980af SHA512 6f447f0314ee7beb1dda1087d42663a32b9f326166539d93b6ae70b9708d9dfaca07e57057b99d42e917c93bb809d472dbb2aee59667a8c893c15068f04ff108
 DIST patch-4.14.71.xz 1755512 BLAKE2B df4194c2540ebfd7ef39045c7af03e2211e42dd0efcc47cf09b852c1a042960ecf339e17ecf0424dae3be1601a3787b81aded5edad0b4c85077d7468a8ad2788 SHA512 2c3a330a25c6f563a6a5c4462d2c43b3184bd7c1fe619d2166d7cb46157f7e8a17105116449d7a695f63242fa9ce48037681e5980e93dcc7dac2b94e0a42f34d
 DIST patch-4.14.78-rt47.patch.xz 231168 BLAKE2B 91e3788690ee33a7be1ae1515b60635312a6370f76209a735a1e76463b28a38dab189ff0a00fd9252fe217a9d3c61661bba67312cae5279d949d6848e46b97ed SHA512 e02f202411b8a8fc2ef8f25e264b06f79a5f219abdc12f0f2c3fc1e7f27f6fc355916d80392b8d6310dca237a844400efe3481e37cb09ff7ce5be440bd9b9b4a
 DIST patch-4.14.78.xz 1888728 BLAKE2B 37d2cf9594422748e493b7d7b000917a45fb5d231b088945f8a458d522b7c42754beb2bed138b562c823d5aaa31c2c9dcda276a9460e57fb857899037c4777d8 SHA512 bf0c0cbe9ee7ddfee0d8a70656e6db5979d1928c7aad917039c471ad6e2b049fe9d0f59161dab5ccfb9180263d2630cd6df735524b5886f0d05f709cb30b11bd
+DIST patch-4.14.87-rt49.patch.xz 231272 BLAKE2B d0566337187edeb278809b6558ed713a477a511604287cab5140fef777925d1fda290cdac1cb6605f0185c4fd340dec354f27e286948d1b6dae420f5878db9a1 SHA512 519979a65e925bf61d9538f48ff8e8cd03b853d8970d8879985a802de13c8cf8b3cb4e8a6e8c12d751e18fdd2d9f18a14468854cb66107ce73cbc3d1ba9c4ab5
+DIST patch-4.14.87.xz 2063920 BLAKE2B afbc7ca7a1a1d08f9f790ff8020c781bfee7038d1400e2e60cc242becd32e175f0f2aaa760c0b0acea96f3f08f54548d753654a386fa8cd47715bca7f5964eb3 SHA512 c35f3299537a6e9450762003403a7f04d43e5f2888d4aa9ebcb106076a20b0f2c3240c27a5ac5f3147e114affbfd6612747cc62159bcf61c66625accddc674f7
 DIST patch-4.16.18-rt12.patch.xz 230644 BLAKE2B d3e777b47c6b33ceab5d7829a54ff76c08682958b7e2798b7dae177281514f89e98833883d8757adfc687f88c23ef55ea3c0392da398ac92454bb5e3f870a609 SHA512 d15089470ea9317aac8be600f09bd76566a65a1f48b3efe22a0ad1269444cd9fa15723dd190fe5e2a30c2464a9cc3b53200d7a7d462b3adac00e70ecfae593ba
 DIST patch-4.16.18.xz 506924 BLAKE2B dc41b7247e58808e1827fda7b4236ccac1ef8150f4c200161f4a9cd91912a7cb8b72337dfd403c3b1d7bee3d2626b5d53e3c3d595d80418da57bc3f9b58fdbce SHA512 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
 DIST patch-4.18.16-rt9.patch.xz 161460 BLAKE2B 26ab626111fc83c475b48817a8d88c9963565cc7fbd8d3e21438f4ac2c74c5e441e39b4f1e5045300f664c42b4d6ed07a4ebae98af049f67e65869bfe3e7dbcf SHA512 1473cfd044014b055d876c9c5e9cac46e998ff34ac324d5ff50a58dc46ea7241b8b6bc1195a857447d6399b24cb285dbea698b905df511762e8527fd4ba29bd1
 DIST patch-4.18.16.xz 476164 BLAKE2B a9b684c3249cf20cb3672f3b5195b91128918cee459ebb1326f4c0ac6ba45036b14afaa16d3ef900884cba83a901c638bc0c19843c029902b1180c49e577e176 SHA512 f857cfa386fa6837f5c6dd4c1ea32e827abcfd0d2103e547b7c78a87c9f89598e9bce9d5a63c411ee99ef22ef66280ce9b308369722813e2fff5b1fa8284fd64
+DIST patch-4.19.10-rt8.patch.xz 157636 BLAKE2B 6e6f5080b1027f36392a2b35749077986760c8430a5f1ca47b7985fbd328bc09001b46580824fcc1de05e1c8cf53b45180216971e1db0bf01a4980a2aa1c173f SHA512 81a66d156061900afbae406cfb9c5157a7954d8c0f6a879360506e9a16cf3aaa8747277bad14b35e6ae4b343bc599b1cceb9d3c88af0837c137945006d45f374
+DIST patch-4.19.10.xz 374392 BLAKE2B 8ab07df4af6adba5875b030eda14f1f77ddf0978cb6e7f9b6f99f5fd2f33316c9d6113e8783576a556bcc7260a67f5d49c0eb43833832bb111022d5af23d545b SHA512 9bbf8d18d5b5bd72fddf03af8757b38ae240193018b7a4065b2c45dcc6a28969e87c876497a4a7a57ef362aa390bf9bd81ffb43afb15976deb3eca203e499f94
 DIST patch-4.19.5-rt4.patch.xz 156056 BLAKE2B 0c5ae9fffdbf8be2949a6150e9a6d7aaba8cdacfdbfc0e9100de2683ea033a3e71e3a5905340ee626690a76db2e0b1c68f0e87579d78c824a580663ecf7fbb77 SHA512 648728f4088ca3ccb4f297500cba4c96d48dc73667df67dc08aa683fa3e6d8f300868754e88582894210e7d98d06f878c4bb149f31859aa3e6aa441ce9508cb9
 DIST patch-4.19.5.xz 226328 BLAKE2B 69d09a4c4812a14c91f1c66072a5bbc017dc3c2cb329e3aac8a225f38567dea055b247dc941f84e273afb9e77dee78268916d6828e7c7d91a5fdbb642268eca2 SHA512 2d127b9bce3f176732b0a60feec1cf21ace28962ef2a7c468d25332631f87dd766c72706383d72461112f7dfc09742ff3c2092e162aa5923d220f2a1d4a390e4
 DIST patch-4.4.162-rt175.patch.xz 196216 BLAKE2B d399cfbc36000c22b0805fb77e13a7d733cdcf0df4d7b167d11a503e3a08048bb767c428956bcd423fea1a0d38adbb47f108c8a8aad9e4de23d046a0e79dc940 SHA512 f2bb60aee9537262a46f7545fe44c04dcd886d1ac1906bd2196ce862ef75548d00f214c71644408d8245f0eb85159abdca4f1ba9290dd3a0288f90cc4b8560cb
@@ -40,14 +46,20 @@ DIST patch-4.4.164-rt176.patch.xz 196228 BLAKE2B 8803f540ee14f67821fa47ea0087a5d
 DIST patch-4.4.164.xz 2230352 BLAKE2B 4b4e270b9ae14ef89487c55bea606b20979bc492ae35a7cb6d58f781c12399886ac9e777e74fca738bbb84dd9f0683ce46f1635c301762fe330a15fb0366fb67 SHA512 df6c928caf73535ec57f100d4814593ec64cbb4cb504926888d1958612e61b2e958edff02af913f35cc815f0605286b3f6b8c5f4f37268426a9a63a5af4fdbd2
 DIST patch-4.9.115-rt93.patch.xz 173136 BLAKE2B 5ed7aec677fdcb97f1d56ea3e6984828bc0581e9f39cc9f231445ff3be0561f9a691e6e3e6f17929d3a4aee031fa64f1cb114d4d3cf54d7294073cd85e94ec58 SHA512 a86dff8c348b3260a75f83c2a287eddb1df36c013b3d3dce91e3fcad624c851003ac4754b177805a99f8237676cf2da3de4a0657777902bdbfc40c5cecf2b18a
 DIST patch-4.9.115.xz 2080804 BLAKE2B 6c2d1b957b55ea6a28b82fa7bafb7bac56b5345297de2e5a53e54ff817b27fb7371a36e5424fd58479359edc3e4a4e8dd41f1dd8b8d612ce10d4bbc615c2c432 SHA512 ad0ed227bf915ab2a7093237c3a482909497b1a00cc5262c79e720a50b008b4942904658fe2e8f764df0ac6e855a632de0bbd4d5788e63c4dbfa3e8f2f8fcf97
+DIST patch-4.9.146-rt125.patch.xz 176268 BLAKE2B 78a2d82b7d05ea5b06c0ab31ff5908d41f016c0e03b0cd6928fd1e96e8894396c98400a7b2face257b7d95f22cefda2d994fe0481b85403d43f5b0525b70b272 SHA512 61638a4201054ddebac579a72993b4d7ad95bb6a1f1c00e5db308da168e4f1a2aa5e1132fa84b052d566cffd68fa64ce82058fc45c080b14fde18688b16c514d
+DIST patch-4.9.146.xz 2470640 BLAKE2B 06ab19bca181a4074e3ac1c81e6c0a71a4367ca7887cb7445709f3ca48634da6a68404e6ae7010f260e06e57bf89192443d6c57c59b8572792268408d458a84d SHA512 a08fd675692c60e7b860e892bcf69dc693eb0e4bdb94c74200e7d09cfd029a9478f103b90eddaf8ecff694af13f5f0e2c9de62eaaef0694ab3643af41680b844
 EBUILD rt-sources-3.18.123_p107.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
 EBUILD rt-sources-3.18.125_p108.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
+EBUILD rt-sources-3.18.129_p110.ebuild 1507 BLAKE2B 4b8c9f22da4b0173ae80ad5ba1a57d3538deaea675762f7f94aafc10ef35a79bf1c80dee5b95ef53a66fd096541dc0882ef5b386a31d9d02c56ab779d5a8c712 SHA512 a0171020590ab4ead4722b6dfbb7d855e574f6588582d7de03c554f8ed6aaf4faff99447538398a899270630600da499439574cf6b2c497f62de92f362a15439
 EBUILD rt-sources-4.14.71_p44.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
 EBUILD rt-sources-4.14.78_p47.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
+EBUILD rt-sources-4.14.87_p49.ebuild 1440 BLAKE2B 65532b73fbbb148ac1e73b5363edb500b88df7b85820865c2cb4e16980744ba8113e778d2159eb527a1a18cc10f78a8a2b9f56f30fd9a6eeb5c03abb33596e40 SHA512 6b9194b2c8b32c82424461fdcf26220b8923e3ee2923b84c2e79f2ccf4faeda7b5959719c42ff14850a173355a5c83548932ea622c1ba5118e7103db10fe9eee
 EBUILD rt-sources-4.16.18_p12.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
 EBUILD rt-sources-4.18.16_p9.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
+EBUILD rt-sources-4.19.10_p8.ebuild 1440 BLAKE2B 65532b73fbbb148ac1e73b5363edb500b88df7b85820865c2cb4e16980744ba8113e778d2159eb527a1a18cc10f78a8a2b9f56f30fd9a6eeb5c03abb33596e40 SHA512 6b9194b2c8b32c82424461fdcf26220b8923e3ee2923b84c2e79f2ccf4faeda7b5959719c42ff14850a173355a5c83548932ea622c1ba5118e7103db10fe9eee
 EBUILD rt-sources-4.19.5_p4.ebuild 1440 BLAKE2B 9b52e664d8b68979ef02799cd0b79db114e597866f44c5ab3b1dcc5d15fc693ef99217a9456015a4effe37c7477c6d607813e2481a7e5e2df904c7fa1c0c46bd SHA512 50aca0676f77895191163f263a7942639da988f3bc73f1acdf3422f272dbc295f0f2ebfbdf6fb48ce50713a80c4843aabbedbd363c8388040d074d6dd8585f21
 EBUILD rt-sources-4.4.162_p175.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
 EBUILD rt-sources-4.4.164_p176.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
 EBUILD rt-sources-4.9.115_p93.ebuild 1507 BLAKE2B 3752b55241122af7e910e34ffd4ed681c8fadecf984524be8c24990b334ab3a20372d1817e739336112c002a486bd3ab80d77e01cc719b15a4d5c260005f1402 SHA512 14e5b696c45b7199dee47bec21c68aaed6276ffb9059a100b7e9caedbb24ab68cf1c75a075f13dcd52238a755ef1f211645d5e5c031e42e59288b98f026858bc
+EBUILD rt-sources-4.9.146_p125.ebuild 1507 BLAKE2B 4b8c9f22da4b0173ae80ad5ba1a57d3538deaea675762f7f94aafc10ef35a79bf1c80dee5b95ef53a66fd096541dc0882ef5b386a31d9d02c56ab779d5a8c712 SHA512 a0171020590ab4ead4722b6dfbb7d855e574f6588582d7de03c554f8ed6aaf4faff99447538398a899270630600da499439574cf6b2c497f62de92f362a15439
 MISC metadata.xml 656 BLAKE2B 3bd604678b07a267b32917a36104fae8ac19abfed08ad8400368dd1d165f628712ba924653b6a03062f065a1d93660c5bd95addd463633f799a525cdcc5134a6 SHA512 7645322de766780bef064c3b6313009bf7ce4e4e28c247ce7707d0950bb7bbb792091254a4af1fc9ab3d24923fd69ebea0f9d253115527ef6b48cffecbcdfb67
diff --git a/sys-kernel/rt-sources/rt-sources-3.18.129_p110.ebuild b/sys-kernel/rt-sources/rt-sources-3.18.129_p110.ebuild
new file mode 100644
index 000000000000..3fc23ebfa2da
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.18.129_p110.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 eapi7-ver
+
+CKV="$(ver_cut 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" || die "sed failed"
+}
+
+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.14.87_p49.ebuild b/sys-kernel/rt-sources/rt-sources-4.14.87_p49.ebuild
new file mode 100644
index 000000000000..f3e4a436beef
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.14.87_p49.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 eapi7-ver
+
+CKV="$(ver_cut 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" || die "sed failed"
+}
+
+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.19.10_p8.ebuild b/sys-kernel/rt-sources/rt-sources-4.19.10_p8.ebuild
new file mode 100644
index 000000000000..f3e4a436beef
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.19.10_p8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 eapi7-ver
+
+CKV="$(ver_cut 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" || die "sed failed"
+}
+
+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.9.146_p125.ebuild b/sys-kernel/rt-sources/rt-sources-4.9.146_p125.ebuild
new file mode 100644
index 000000000000..3fc23ebfa2da
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-4.9.146_p125.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 eapi7-ver
+
+CKV="$(ver_cut 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" || die "sed failed"
+}
+
+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 1d6d35e83f67..026961f73dfb 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -6,6 +6,7 @@ DIST spl-0.7.9-r1-patches.tar.xz 2428 BLAKE2B 5a8550be587c511975d579bdba889538ed
 DIST spl-0.7.9.tar.gz 551115 BLAKE2B 0ebb801ff60e5f8691c0b3386b5b1c326ea9d40decc20fb455ddb103d108923f28cd870e1c1dc465af5e24e8627973f2b60e7b9b88b3fdbd3ac45f3bd167def2 SHA512 89a42a65b3c09a654ffc3bcef84a0735eefe080c2d790400a3691cccf01e9f0a95cd40a4eed37542cfa7f4a94f20e06aae44886325473713407833d247751ec3
 EBUILD spl-0.6.5.11.ebuild 2705 BLAKE2B 4961a28af850b8d94691a307cf3b045cf21269d0901155fe1ef14d575ae08b5eb5fc8d6ac2aa53a5f6efd31f1953479127e0ffe43fcf66fc7a7f4558bd5eb39b SHA512 22bc59c1967cd85d74117a76aa85ebc3b30bd444979193b7bf479481dcca55c75a31cb16873ee3b93fcad2e5c86141e8274e71cc025042fb9a997eb9cd77435d
 EBUILD spl-0.7.11.ebuild 2685 BLAKE2B 1050f8204c574867b9c0041893717796820dc3951b3ede273b0d53ace2c36361728fc647ff368ebfb525145b176d7af43eaba7c5bac8c394d43cb818d276b3a3 SHA512 097d3d0aa14617c86bb3106faa039cfc74688376effdec5ca5f11ee5de54beee70274ede52bdb7846c711c31f243e65775dc4cf0991d77b4f987e1412ab04d59
+EBUILD spl-0.7.12-r1.ebuild 2706 BLAKE2B 513b5ae0fcdbaee98b2c3b55c6010f365c17d64a5d643a89431a73a690c9cee364c74884fa0c2eede2ea18ea9bf957af967554729971f3ee0951bc6f56dc4188 SHA512 48963d0ea4fbf8b79ffba45efe8da9a585d871043d822d1351eecaaafe41890cad1aee3923839ee5c9986d4c67e012eafb9038ad8a9c3b53bc6a94eab0a6ee1d
 EBUILD spl-0.7.12.ebuild 2706 BLAKE2B 7152aaec08023c166b894d843749e9aeabbec5db3bc79d66e665687f2837b5718b13be491cfefeced51c22cda9b37b3f60d9e03e9e4044deeaeb67f6263efe35 SHA512 a298b643d9e4a2efbfe552b76e04c5078b34a7dfe997a3cee2a91b01e24775448023bbe943dcb36cb7db4547a1e24367644a41b0aac90446cb23de3585524250
 EBUILD spl-0.7.8.ebuild 2684 BLAKE2B ef7ca0d1783aa6c5afcbe382cbd771f5212680e7f395af5336a0feaf983031f1ea21cdbfa5c271f35dcbc9f348219dd7996beac937ff13754df07082265519b1 SHA512 0a9c349fdc90066ac0f1e21fee71d9d89aad17f125f82cd0aeafbf7fd7256738823eef63c40456308e693b7e13e027c120e78c29f4052039fa1f6cc5ce3eb8cf
 EBUILD spl-0.7.9-r1.ebuild 2881 BLAKE2B b5ec81b194584dc6e5cb88507873b7be4b0e7ec92c39a7734cd663249d33558fde3342764f72d235cf098aa1c120070c2b6bb45b290a1583a81d5d6b42de31b0 SHA512 64d03d5c0136d593b1b2a1c72de71eaa3f9652d40d1440a9983aa2e534292f7d3c72fd4293f3c5e9f0e9e1a0e021fc1d1d5216ff837254caedfb858a2b09c8b7
diff --git a/sys-kernel/spl/spl-0.7.12-r1.ebuild b/sys-kernel/spl/spl-0.7.12-r1.ebuild
new file mode 100644
index 000000000000..3fc2610b1ca7
--- /dev/null
+++ b/sys-kernel/spl/spl-0.7.12-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+inherit flag-o-matic linux-info linux-mod autotools-utils
+
+DESCRIPTION="The Solaris Porting Layer provides many of the Solaris kernel APIs"
+HOMEPAGE="https://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 )
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		MODULES
+		KALLSYMS
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!PAX_SIZE_OVERFLOW
+		!TRIM_UNUSED_KSYMS
+		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 20 || die "Linux 4.20 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 d8df28032c5b..8f14ac056505 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,14 +5,15 @@ DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0
 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.62.xz 2280016 BLAKE2B 5ec85d7e7e345cb21ed48c860dd263067f58ee29fb2ea11980b37c1973dc944b4ffda7bf7098b8c12573915f564a76db94b35a337d172525979cf87aa8cb2ae8 SHA512 c438d9b8df33484ede82634352dfce366b6b21dd589c21556582337ba16e73788e6219ba64b57160264cbde4da2508f54a716287c5520b89ba9be21c0de63bc3
-DIST patch-4.14.90.xz 2108368 BLAKE2B be288191bed9738e43c550ad21628a5657b6fd767302e61180cfc77fe2412284832b7b63394acd2791510e81264076b0b8bc8729fc7eba4f10cb04af71da773a SHA512 3ac8a571128a42a9a75334e213adad2b3de256bb12fbc93fcf50d0346f19dfba47e5a1b2800616e41e607344554ad5b0e1714e9bb10964def20f0010aa080505
-DIST patch-4.19.12.xz 400564 BLAKE2B e0ad1687755bf49311fadb87e40c0c4d9d70e84e8f26d922a65cb6874c5de804f3bbb17baeef635e5a49fd32f03e5339e5300556cc06f538b11d124c4f9bb843 SHA512 e878f30a56d436820a08db08e68676f3ad65f7f6946af2fc8bc2379c1f64ace758f6c5292285a10003b8bdd199e422c95263690a64e19a32b3b10cf876cbcd93
+DIST patch-4.14.92.xz 2133380 BLAKE2B ccebe67228002414d5fea6ec1172344f4af528a593374a17676e4962f10324565aabc1adb31b8bb9151513583915145f12c27c3de31a85dc1a0286648edfed4e SHA512 4fb0e654342516f3dbccdc73296b4e08ed3249dd18e6fd02d325a82471eac861bcdc98ab676b1dba1d57c0e1ee13d95486140fc6add5287e29c91d8ecfed23e2
+DIST patch-4.19.14.xz 459580 BLAKE2B 38e299cfe6ae94d06d39a2fae37cdea3b5ad8abff2646055c88b4d479dcd1c952d9e75dd323af97c20b443967a223e63735afd4e7047af6d7e7f20685c728e52 SHA512 e94ae7235b689aac03cb8bf47f9ed004fd9ae97b6c9d65297c4ef8c2ef33372af148a1e3be49db47cd2911b1d5afcac8115952e607370ae85df4ddcd1caf15ca
+DIST patch-4.20.1.xz 54216 BLAKE2B 3777a4bad4616c344fc3295e74091fd204f7140bf333456256b436a5c12e5384081c176362659311de26f222c179d5054f91d87ec666e29a67a3cb85a7a63f37 SHA512 082cdf87ac1df876c71b82afb4c9339a7b8c3d70ed4f209b9707623827e790f54b93b5ad9a79f3ea4f88a22a3c2756f1e87d0e4f111f77cb1c622292903ba7d4
 DIST patch-4.4.169.xz 2314936 BLAKE2B 969dcc293069cbe9ca7c2d52a7e04fdc060ad4c69d6eead965ed347fc8a9a1a07036124128ba03d6e4e65fd43cb0300ca9f92519697dad66d37139ecb07783a8 SHA512 17651af8a2f87830e4019ec1d84bb1865ed5becaadf979f9c4c51d25ac5820341654c6120c8c54ab5fdd32ebfd52a90920f04474f4aa52d5ef85526c31c6f232
-DIST patch-4.9.147.xz 2483664 BLAKE2B 1bc767e9979492bbdfb1a808b834f0d12174d75ad746d696f10ebdffb6cad9116611ddc70249fcae5af79dbad38cfc7ad5851eb229fe5a0328fb1da7fdb30c1c SHA512 258b0977b32c87d461725d430cfd6f894303623dcb720390d727f9c47ad20f5883d019d9e60dc1910a3df1532fd1a6410cda4b3105018aad9dbbe28a00d9e35b
+DIST patch-4.9.149.xz 2495792 BLAKE2B cc015b4417408451e8a8859f8361a98cc8b7778a9776ca8740bf23b64de22bf8f54242b1527e50d5bfe5f73306e4b476180b2d57253fb3f0b4616dec4cc0e83f SHA512 e70a6b32f5106f6ef9ddc38754dc8ead72d1b32dc0cf84e2556f248099c91d1098c4d475c3a6a0fed7d2ad83363468b6deda8cbdee8d18c9607694e4aca00b10
 EBUILD vanilla-sources-3.16.62.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.14.90.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.19.12.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.20.0.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.14.92.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.19.14.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.20.1.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 EBUILD vanilla-sources-4.4.169.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
-EBUILD vanilla-sources-4.9.147.ebuild 423 BLAKE2B 5acda14d8cb95461c977673ebdd223fd562cfe5fc58667b78a3cd62d96d1920f169f9676c2f6e60c6ad7ae3e2aaa2bdbbfe0b3c43467d9bcd868fd98699cb51d SHA512 4e599f139182f3e7040e2b3c0e13ee4712a67e6f7902bc1be1b73e198f5f2516511fc13032c10c28bdad2e74dea1459956f5f42021c50150932963590ce397ee
+EBUILD vanilla-sources-4.9.149.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.90.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.90.ebuild
deleted file mode 100644
index 4d8a2803b8a7..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.90.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.92.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.92.ebuild
new file mode 100644
index 000000000000..6f2f5701c4ee
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.92.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.12.ebuild
deleted file mode 100644
index 4d8a2803b8a7..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.14.ebuild
new file mode 100644
index 000000000000..6f2f5701c4ee
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.14.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.20.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.20.0.ebuild
deleted file mode 100644
index 4d8a2803b8a7..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.20.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.20.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.20.1.ebuild
new file mode 100644
index 000000000000..6f2f5701c4ee
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.20.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.147.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.147.ebuild
deleted file mode 100644
index 4d8a2803b8a7..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.147.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.149.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.149.ebuild
new file mode 100644
index 000000000000..6f2f5701c4ee
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.149.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index e67112a119f1..da55351fe203 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 6cf2f1526a1b..5b38290c1d31 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -3,13 +3,11 @@ DIST efivar-30.tar.bz2 73202 BLAKE2B 6b146cb6d664e3419361e72ab6fd1578522e7fc2196
 DIST efivar-31.tar.bz2 82404 BLAKE2B d339aa8ab7dcd6a60cb067fccfbc2c42407fba211ca96eb39f227d57e9403462505940f427651dfaffa8272c9edfe70898f181b9f6ecddbae4745eb3262de949 SHA512 5055f690fd99cf59895dcf3d11103494d917d4923567626f0bee816ea5e4dd56cec23627ede5f21bdc57b7306522471ad19cc8ab22ae94591dbd1925c084f163
 DIST efivar-32.tar.gz 108102 BLAKE2B 7f9d27433b40ec6c044ab34ccc697001ad23e39a46862d2e04db0f9a3dfc26ae53b46a3c3a8c957bf76df0969710f78249f72f7bf38e67c0aa902034a07acf8f SHA512 e73eae182fd645183dfe587591a286670ee1123a113e3e19e4070fb910ab7794e320defdc0597540df7664947f2a0497abbb763a19b4dfa40511a512c7f3e490
 DIST efivar-35.tar.bz2 95528 BLAKE2B c936114aade7a586f707af2464d350703234e0c3fb786fb568590737fb3939c3f74ff813f4f188aec230d75e75e73b0d07cbff5860f0b9f1285d2780b29c7689 SHA512 c7ba60b2112053f088ad0b74aaa834860601b7fe17118c35b012050176f5205d948fba9c4b6de35991249f702e3bc24832539e2eb3c235c4188e1eabc78965ee
-DIST efivar-36.tar.bz2 105928 BLAKE2B bcaff4e81d7591e3655d3e2b150c6f7006335b6dd1981bcd7b5a658e93adee4f7fa6d0dd6ce5b9854b5b409e2a4b7db692d4d670670dc34660035c840a18682d SHA512 951feabe2d238826fdd6e74e8f7a24f04d705f9ef925cfcfb852944d2d7a4f04e3a6c23f276c40e5564da42614558941dbe7aaf21efa6a722a616e4d165aba2d
 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
 EBUILD efivar-30.ebuild 956 BLAKE2B 617ae40f78ecb76e5b81c2b47fce467738394151021cddaaab484acc843a440d24b7af2d6a2b24f540d5f7f8bfb0af49ab5ad068e85b772ed0232747206cb824 SHA512 9c29f7fd850e4821ff642475828015c5960b47015114cbac0b913e2a02063c3cc1525e4458c9857cce1be9c32a82bb378fe49a4fb67eae60db35528da73491a9
 EBUILD efivar-31.ebuild 809 BLAKE2B d0ca028356842cadf5f052aa86c8383de0ce22d42edcc5146afb018f62d95cfbe2894ee60365d14fc2ab6df5177d282fc0f18c4bf9a4473d2e04cdf4235ce8d5 SHA512 63897e051ef4b474cb1bba5928935773d1de71ba18c2b18b439b6333570628375db6a9e20d33539187bb38eac60ecf06b265ae6609cd0686ae2fe8a1920066ae
 EBUILD efivar-32-r1.ebuild 946 BLAKE2B 815cbe5f43f3ffa65ee94d581b24d001b7f8d14d18b0ac831058555d12e1ac3e2bcca242f437d94326c35dc148154b1203088630e67b3bbc54fe8ec83b715921 SHA512 8c9c99a39b0fad8fdc4c96a24b281db6b1174c1dc4f9769fc789bddd0b0ae06ffdd36e7bda9f103240a136daace83883be0846de9d0975c2e9f002f2d3c01e46
 EBUILD efivar-32.ebuild 887 BLAKE2B 753d7b2b7a44e0123a5eeafa8ccb861731872873a064c9e5981d5b2f8202fac9be0cdc7e14249e81f25289acb25579da4ccc6bc85c7a2211b58ce3e30734de22 SHA512 22baa7fe2befa4f1c1858e2d955e31043c46a9b18fa3b192c69874b150d1815e5febb53c0d5d78fa0ef4e81b271ab381fcb050318052f52c67cbc2d6f4e6ca78
 EBUILD efivar-35.ebuild 854 BLAKE2B 9530db8cc261a2fb86502700764dbf77f16879b4746e210c064db97dc057c1c70fc9e16f52d888708dccdfe875a5127f06aaffdf975003ec57208602802647cd SHA512 ecaa5a9b57f6c62aa7a725eaebc53c93eb8df1a4178a6cfdd976cbff7f6eaf7ef2840d99a131afed9938585b8e2e5e2b853b8d2b4826dcf6653976b730cf4e86
-EBUILD efivar-36.ebuild 854 BLAKE2B 9530db8cc261a2fb86502700764dbf77f16879b4746e210c064db97dc057c1c70fc9e16f52d888708dccdfe875a5127f06aaffdf975003ec57208602802647cd SHA512 ecaa5a9b57f6c62aa7a725eaebc53c93eb8df1a4178a6cfdd976cbff7f6eaf7ef2840d99a131afed9938585b8e2e5e2b853b8d2b4826dcf6653976b730cf4e86
-EBUILD efivar-37.ebuild 854 BLAKE2B 9530db8cc261a2fb86502700764dbf77f16879b4746e210c064db97dc057c1c70fc9e16f52d888708dccdfe875a5127f06aaffdf975003ec57208602802647cd SHA512 ecaa5a9b57f6c62aa7a725eaebc53c93eb8df1a4178a6cfdd976cbff7f6eaf7ef2840d99a131afed9938585b8e2e5e2b853b8d2b4826dcf6653976b730cf4e86
+EBUILD efivar-37.ebuild 853 BLAKE2B 1fc3086d9955c8ac4b2179ab15a14be3c1e3f156e99db01165b9ea7b96d50b8e7b9952a7497d20c311839fa6ce7c4ae31c6bb960e89a80a322b718119cf07387 SHA512 17424db3ce54e388b4e1c5ea49c865ac8faf23d5a20a0cb7a58d79cef2bf9ecf6300129a5186452d2034c6502fd9fa65dc96e99955a9ef9cd7c59a9693ea5b9c
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-36.ebuild b/sys-libs/efivar/efivar-36.ebuild
deleted file mode 100644
index b050cddcf60d..000000000000
--- a/sys-libs/efivar/efivar-36.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/rhinstaller/efivar"
-SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e 's/-Werror //' gcc.specs || die
-}
-
-src_configure() {
-	tc-export CC
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-
-	if [[ -n ${GCC_SPECS} ]]; then
-		# The environment overrides the command line.
-		GCC_SPECS+=":${S}/gcc.specs"
-	fi
-}
diff --git a/sys-libs/efivar/efivar-37.ebuild b/sys-libs/efivar/efivar-37.ebuild
index b050cddcf60d..ca9c71b8bfe7 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 x86"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index adc343181bc1..053d35bfde0c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -32,6 +32,7 @@ DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebf
 DIST glibc-2.27-patches-3.tar.bz2 166511 BLAKE2B 1dc54bef6e82112935c7411f7a5cd07c1edb24c3edaa1e0243b846b3832a40af1ba3a7b77aef04c54a173388156b464ea442fa8310a02e6f44e2ed5b78994286 SHA512 12496e9b0c60630dbec4c2febdd6d20df1f3d7a2c243cc55b595202b27f682b9208e16cd8c387687c0cc9e18b36c3caeef8d1b1148eb3ee8081431997270db5e
 DIST glibc-2.27.tar.xz 15395316 BLAKE2B ea206d304c8c9aa86d69db981a14bea008602cea06a6c151c4971a8df059949ffe5632b42a67ab0ffcd7c4d7ce1ec02ac48815dac4dade1c4dd41eaee8a6ed33 SHA512 7c5581154487d38d173ce1feb944e60207139cca148bccf066eaae322c0c2d219423bdcfa15c7f9be1b5e45dfc43c641cc5d80d3c3c65837d08a83cdb4e2a147
 DIST glibc-2.28-patches-6.tar.xz 89724 BLAKE2B f846534dc912f11ed9b22badfd28ef0402451654390756d2f6332f52ce7c2d3491ed90bbdf2553d7bb38caea6373ad2d3c19e4a1f31f3669948f4e2cbaeb1577 SHA512 f687febde875bb8adb7a61408caea3db99bbbda703eb3486c7d5c09540515e657eda406bf14686498e2c093355c72395502a343201e02cfc97adf6483d8e7455
+DIST glibc-2.28-patches-8.tar.xz 97384 BLAKE2B 036ab39103aa30be61fcbb46a7103cf83c1dd490eeff526444d4701b92e06a428133de2d005d65a296f14f28145f143a2386f8b17df721174a0a0b5303e99931 SHA512 29695212d8ca9c4b6d4787f4919b75cb0828ddecce65d65683b746ed23acb50e4e18419a13bb6ee4a234f44f63b38a2eebf1f1ce3d350435c2bf21d6076a97a6
 DIST glibc-2.28.tar.xz 16484344 BLAKE2B 9aa8cbd5a145c2a6fde3a60b3d0a14b12b46ed79333ad1ca3e73464adcfe700277a17a9e7fd0ca36e355a0c5b0b27decfa091da320ba802741ad75cc955bbcc8 SHA512 521f820953ff07c69ece4c2186f59fc061a7f9747932cd70ef2995c2b2deee76eeb6de700d85071cdca5949179aa8ccee75eda7feca1394121ec7b821ad0a3f3
 DIST glibc-9999-patches-10.tar.xz 17544 BLAKE2B 1cd4fa14b2168e371c769c06a29f36d6dbd3beccb796788470b63282cb8e5c3c497e4eb3800e4bc86c07d3b82935d71dc96dc3155178d52b68873ea38a271a70 SHA512 bbd376ad87fb71de7a6a4eb28030aa1550f7cca57e521d2a326cab63a66e2dc784b93319190f8bb1b24b335acc604d0523c3ea8335a4424373796ebeb79f273b
 EBUILD glibc-2.19-r2.ebuild 40484 BLAKE2B 9e78b3fcbf40c7c32fd9a7ba0f4c9d31277aa0d5465342b5af1a8115d4dbb9bc34e4dd0be6fe6abca2497306ef84018b62969ff2a2d28eeb092e204a60972714 SHA512 6ee461bd816a33b5eb37e3d7c107e09ebb912ce9cb26620e7bedadf31a5a874c822148859973d4e60931a46b668ce743b7ff04fa3df99f0089251ae653021750
@@ -43,5 +44,6 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff
 EBUILD glibc-2.26-r7.ebuild 25496 BLAKE2B 3edbb2f56d81869f86bd357772c27eb9516a1a0fbbda024412c8588df0b7938c77afc46430ea8b01bfe012eb5097f58b989411d4953d09d9202c33eeea562708 SHA512 e28a2cf8f692e6526fcbee2d9317dbb4cb8a4c249e4b60ed5b3522dc8c4627248b4a4bad0c32192adf0f650f3f002b8e25ebc7038fe0daf959f0dcde0bfe1bc4
 EBUILD glibc-2.27-r6.ebuild 41406 BLAKE2B f76ab4130979c09e19f0c7a8d796f1dbda896a0331c5209bc53d4f926fac22dafab33dadfe8c5f4fda3fec068f6f76101372e8b492a61c29db8734a0585afe48 SHA512 52ce249e2a20efb3fa012656249be637ff1059aec9981b85bd6d0311384e2427b15658fd156e7bd1f4032f01c90cbaa76bf5c485f35a80b0708cdcf21761df67
 EBUILD glibc-2.28-r4.ebuild 41164 BLAKE2B 993c0d17a661a5c1a4403be6ec344232f5ce5831e599f6ae6d1ed156234a21e85e4bff1d43a63e5c70aab031edc5439673e755d88f9dc313f3e5e28be732af20 SHA512 c51411a717781762e68078bb77fbe18ccd80164ba6f8a63cf690994466ef02c056b7a76fd40dca4a9fd95f42278e4d393288bb2d6825f57b8423d5679d759f47
+EBUILD glibc-2.28-r5.ebuild 41164 BLAKE2B cae79079841d39b38ea84a5b4d844ef1365f10ef2c890599ffea131db39f9d8c2c80c5aaaf2c81945122fa79f7568896c803adc40b8ae63136c233f6ae27f36b SHA512 32700d26887dda84f061bca006fab816d1dfde0cc5c8b0c93bf7157a9e93e8a287f64722e819ede8def50f9fb1d2fc231a6fa7b6813fd171484f9d6ea9d7a8db
 EBUILD glibc-9999.ebuild 41110 BLAKE2B f10056c1aeeaaae9af5510aeba211f448e2b0e6525e74c7162bd0a3f7afb471ef09888128e4d5a07b9cb41195650d44a3a5c5deda2b8033744aca7486c67fab9 SHA512 8e3b77823ecc335a2d31a52ea0140107cd0f01896d59dc4c18c32a4b7abcd135c26ac9cd500e86d1732cbe525fd487cc012245684f588f43c3ea44288f89a8d5
 MISC metadata.xml 1265 BLAKE2B 0d494de7b6fda57a4f401eace7b8c02c4ea78a65a1a41a4a1c33b48ff0960f5e240ffbacbc3191bc0d463bcf3ef9e6b374c7b3d7482c5ca1b3d8d2b9b88cef88 SHA512 f92825278b07ef97cc8aa50ad342c1433e02bcbf6911bc8d6a890fa30e7f225fdee036c74db26d656023ba0d79aa828455b754b66775b0d7b2a290bfedce50f0
diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild
new file mode 100644
index 000000000000..0c69246759a4
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.28-r5.ebuild
@@ -0,0 +1,1411 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+RESTRICT="strip" # Strip ourself #46186
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+# Gentoo patchset
+PATCH_VER=8
+
+SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+COMMON_DEPEND="
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	!<sys-apps/sandbox-1.6
+	!<sys-apps/portage-2.1.2
+	!<sys-devel/bison-2.7
+	!<sys-devel/make-4
+	doc? ( sys-apps/texinfo )
+	test? ( >=net-dns/libidn2-2.0.5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-dns/libidn2-2.0.5
+	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
+	!sys-libs/nss-db
+"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	DEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	DEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-6
+		virtual/os-headers
+	"
+	RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	nonfatal emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
+			# try to pick a better one so glibc can use cpu-specific .S files.
+			# We key off the CFLAGS to get a good value.  Also need to handle
+			# version skew.
+			# We can't force users to set their CHOST to their exact machine
+			# as many of these are not recognized by config.sub/gcc and such :(.
+			# Note: If the mcpu values don't scale, we might try probing CPP defines.
+			# Note: Should we factor in -Wa,-AvXXX flags too ?  Or -mvis/etc... ?
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparc64v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparc64v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparc64b"
+					;;
+				*)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				niagara[234])
+					if ver_test -ge 2.8 ; then
+						cpu="sparcv9v2"
+					elif ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if ver_test -ge 2.4 ; then
+						cpu="sparcv9v"
+					elif ver_test -ge 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				ultrasparc3)
+					cpu="sparcv9b"
+					;;
+				v9|ultrasparc)
+					cpu="sparcv9"
+					;;
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Over-zealous CFLAGS can often cause problems.  What may work for one
+	# person may not work for another.  To avoid a large influx of bugs
+	# relating to failed builds, we strip most CFLAGS out to ensure as few
+	# problems as possible.
+	strip-flags
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# Lock glibc at -O2; we want to be conservative here.
+	# -fno-strict-aliasing is to work around #155906.
+	filter-flags '-O?'
+	append-flags -O2 -fno-strict-aliasing
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if use headers-only ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		die "mount & fix your /dev/pts settings"
+	fi
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown
+	check_devpts
+
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ ${ROOT} == "/" ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ -n ${EGIT_REPO_URI} ]] ; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+	fi
+
+	cd "${S}" || die
+	touch locale/C-translit.h || die #185476 #218003
+
+	cd "${WORKDIR}" || die
+	unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			myconf+=( --enable-stack-protector=all )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="${EPREFIX}/sbin"
+	export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(alt_build_headers)
+		--prefix="${EPREFIX}/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+	emake check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local locale_list="${root}/etc/locale.gen"
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}$(alt_prefix)" install || die
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	if [[ -e ${ED}$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf
+	doins "${WORKDIR}"/extra/etc/*.conf
+
+	if use nscd ; then
+		doinitd "$(prefixify_ro "${WORKDIR}"/extra/etc/nscd)"
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	else
+		# Do this since extra/etc/*.conf above might have nscd.conf.
+		rm -f "${ED}"/etc/nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen "${ED}"
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_strip() {
+	# gdb is lame and requires some debugging information to remain in
+	# libpthread, so we need to strip it by hand.  libthread_db makes no
+	# sense stripped as it is only used when debugging.
+	local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}${pthread}*" \
+		prepallstrip
+	# if user has stripping enabled and does not have split debug turned on,
+	# then leave the debugging sections in libpthread.
+	if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
+		${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
+	fi
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+	src_strip
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ ${ROOT} != "/" ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
+	fi
+
+	if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
+		# Reload init ... if in a chroot or a diff init package, ignore
+		# errors from this step #253697
+		/sbin/telinit U 2>/dev/null
+
+		use compile-locales || run_locale_gen "${EROOT}"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 01b00a3fbe00..741d159f96be 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,7 +1,7 @@
 DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d
 DIST libselinux-2.8.tar.gz 187759 BLAKE2B 1e0e1a5aa2230fd6080e921efe871e97fa9412176b72a0c9721f60c6190459e508644fa3370f3b5f513f088428844c7c615cda4567990ddee91c13e1ee88f9ed SHA512 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
 EBUILD libselinux-2.7.ebuild 4019 BLAKE2B f5dfa22a258e893e7b084196a45e45ee3a9b8ceb2da5ebef5b7d329c4e37149197d0cbdf31e569dfaaf4881120a2ec80d25911bf47c1ec4f8ee9ffa55edf48ea SHA512 62ef94ea79e87533e38a9b98128f65dc8cc7179ba4993f2d346d543db0aa3658fc1741028f7e75a645d6e514fd41ea724ed55cf5a094c71c290f6117235dc677
-EBUILD libselinux-2.8-r1.ebuild 4197 BLAKE2B 0e7d31f21d40be4faed9ed44e794f3c9089ef4c41f732b586b513df7c9859d896f3d6d36ea106669854ec88eb80a5fbbf6db000178402e0239b57cda0282cad0 SHA512 8a7e6b81447b46401048df1f0923d1dd6b8a6104c182016091d55a1e34785f75492145150c406824900175d077d0c77f476ff7753c6b998d3514e5e76776529f
+EBUILD libselinux-2.8-r1.ebuild 4195 BLAKE2B 112a17e373c8c62e2308823284ac04508b6b1e39992e8e8bb09f91c857a881e4f51480ecca7d2d442dfc7e2b0f1b7578daffd8f33d6498165fdf0917cc729df3 SHA512 3294bfdf9b27ab636a0eaa9b4314a6191b745ed324ea8b69efabf0ddf9143ae064b8c8d1197be34f81dc6cb4fe3bbe5ea338fab95e0b2b6cd77e0f58478c8aca
 EBUILD libselinux-2.8.ebuild 4126 BLAKE2B b73296f76f807bbf7e881474f554c6597c36c1d61eec06c477d3177bf67d506298d866c180b9f1094147750842359887bddde2e8c561fb60c3d1ef99f61a8230 SHA512 5980c8ac1b1c1e497bd38ff99b3ff78eceda88ae246d95d4e4a9da5325461b1f10572b0c9bfbc530775c2109ffa3b533e4581eabaea56a7dc0d4844697edc603
 EBUILD libselinux-9999.ebuild 4197 BLAKE2B 0e7d31f21d40be4faed9ed44e794f3c9089ef4c41f732b586b513df7c9859d896f3d6d36ea106669854ec88eb80a5fbbf6db000178402e0239b57cda0282cad0 SHA512 8a7e6b81447b46401048df1f0923d1dd6b8a6104c182016091d55a1e34785f75492145150c406824900175d077d0c77f476ff7753c6b998d3514e5e76776529f
 MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
diff --git a/sys-libs/libselinux/libselinux-2.8-r1.ebuild b/sys-libs/libselinux/libselinux-2.8-r1.ebuild
index 7ff555999a09..10c723c47044 100644
--- a/sys-libs/libselinux/libselinux-2.8-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b774b86c9208..75a349583ada 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -6,7 +6,7 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b
 DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
 DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d
 EBUILD musl-1.1.19.ebuild 3052 BLAKE2B 5ef489e0ed841a692375c06e85b304eefc046dfe91cd15b9255208ebc34ef571bd8d32074fa0e7babae1d93497e3b5d46295e74e3fd33eab6210d2f08b04c848 SHA512 1eb90564e0f0939fff635a48799c992e8301911a5c1382e0a20975a149eec6bcc5a3f79e3ac51f5e8bcd5ee7bd22bc01aa28ee378be7b684a1c0235af2d6ef0d
-EBUILD musl-1.1.20-r1.ebuild 3136 BLAKE2B ac7f9b1413667e9521a19f1f607a1d54253528ca33357d56cace91bdbc5aa48e7c570ef4c04f3c8633077b91e18e19d455423302ed0652a2fe826459b7346faa SHA512 8e37303e3635916ee40f8ac5162786a38c9cb721d8b48922054fd63d9fc665aaf0eb995d1ba4182351ffca38aecc69956bc06ef066fc8b2ae309ce2be72a5a5a
+EBUILD musl-1.1.20-r1.ebuild 3131 BLAKE2B aa772ac4c028022eb5bebffeb746b8f9393376966f1b1feaa2d6c10d58d0cabf91bbafd9d70aa37fdf00e458141da01498d9e4c90d28c92538ea5f12ca0fe7ea SHA512 7312e4ed0a7d7de47e8ccaba7d5e752f8afac2d4c2e128500f93101e4cd02702ecf96acf0107e0359df8e96228fc276540541146cc4d062f5687ec26b10dc2ad
 EBUILD musl-1.1.20.ebuild 3055 BLAKE2B db7546fa0a34f8d422d9413ae4459516b49223072a804b89a8893d156c8e909aeb8cb6c7b31b136300ac88710fc23193cd23f6472bb6eff0bfe871436d1fad82 SHA512 6c9d750ac2db36f9875d738f4e20e3885eae7e870d5ff07d7e87f6445e4e4c6740ab4ae67281ae1c00d93c77540949da8691d65da9760cf769c919da6dcf003f
 EBUILD musl-9999.ebuild 3057 BLAKE2B 0d689b80a869101edc855978b619d4e668f11886122294f242e27093647c64388c9481fc3d50303ceadeafc6ea37f9e29682e04e2bde0f82da59834bf97ebbcb SHA512 11ee3bc218c99a891c62d7efe4de1fedf650b1614a117c62b9d1469e5c8ffc448385533b5ff9320dc838e7ed8ccd9d5dce24f8fd46787c1f6f027dd54685d348
 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
index f336112e3797..13a18acc7023 100644
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
 	https://dev.gentoo.org/~blueness/musl-misc/getent.c
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
+	KEYWORDS="-* amd64 arm ~arm64 ~mips ppc x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index aac9ed076657..844054688696 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -5,7 +5,7 @@ AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659
 DIST OpenIPMI-2.0.22.tar.gz 3081893 BLAKE2B 6ec5ec7f61f3033a9d953df4b091522fa5bd891a93dfe648f807548e3dc0f5ffc0d15af9b687379e6749d7b97ee2fd6c7f9e713aaa7423b82bf099fb2d0fb6b8 SHA512 78017fc0b52ce6a83db45f595f50170410120c9f7394429869c177ee40ea5b924bcc0e36bb60f9368a75a2f78ff71c70ae3631ba55a207cfb6eb4f62aa44ff89
 DIST OpenIPMI-2.0.25.tar.gz 3212723 BLAKE2B eb0872fe4b06b84cdb6a4e301d4c80940351d8bf14d50e5cd67525a09ba98674cd890852d4692d6b77c4e935646f3bbd5e84202b8b619e65daef99034d7fb016 SHA512 5d89deb5d0d0ff44d6f62a9759577dba92aa58c208477e317aecbd01e71ccf7ba0dab138a1d8feff22d523c85d6ceaee9e478e26834ffcd91949b81d2d9c1f86
 DIST OpenIPMI-2.0.26.tar.gz 3124706 BLAKE2B 08afeae1063b404dec3d6f9e5decdf9ac516c0096d8db3c42ff275c280267aa6a202cf4c63c5044cf1d24a95ecd617ad36c15e5c98c6b9cdad2647227f649ae6 SHA512 ffd1ea60727973238461c95373c71e28da04e2fd163bfcb8f5ef9a8ac197b554773231c064cac71c64fc7ccd720085a781fe3c6c8ed3c9dc5cc8ca88fff6f2d0
-EBUILD openipmi-2.0.22.ebuild 2739 BLAKE2B e6e55f84f94eff0f39eb041fe7b1d82f81bcaab2f0eb55c0010bde1e2ace70f4d493663a44ff9b859851556c7e78f7f4835ce8f4df96db2d8cb1a04a0f4ccdda SHA512 43e979f877e17c82ca317ea41d73e84cc9af65496b198b5b0c4f81251f0b47713022de672b105ba447f6e880d42546fa2140ca9dc4fe60f90cdf5c709eb3f5dc
-EBUILD openipmi-2.0.25.ebuild 2482 BLAKE2B 07716bb39ccca6ebd4128d4a7f6aa2ac1e0ac2cf30ae19c80240ca15cfee903db1566a9ae560aa02f9dd11189501e91bd417c64528418cf6ed4cd5ebb8e43bd7 SHA512 1f726abce948f14e4b0ad036b5dbb9a7540edd9a692c1de6071fb23a135b0a5e0bb30970c0c0b37f323dd3ec1d34d138280c60e8e822669d4b78e6f4df6a2822
-EBUILD openipmi-2.0.26.ebuild 2516 BLAKE2B 820f7ab46b15c91eeab0f06816734ba78b6bc886d9e5167108c447b19270d392751e0604a7164e8817a75fc8a7042f194a7b51375ed74c8542c37ea843d125d7 SHA512 bcfe9b02a75d659aecc223e4da7ef2039f2e282c9ad6de2b62ba6e8b954cb9961038960d2324ca8bca3302562340fb51d4806c66335c138b9b004dae64331c9e
+EBUILD openipmi-2.0.22.ebuild 2758 BLAKE2B 2e9d3b059b62cbfefc31fc0c941f5975c705a6b849014a47f26b7b4a7880114405e7ffda9422ae9dd948f7ad6d6aa5b18c12a9e404e7dc2c204a9089982f5ae1 SHA512 68bef9639ea0d72e20ef4b4c1d0d59307c20c70c702160f90c975daeae5a4ddeddfce7123defde623d7df4fd278eff8a53b501c76c210cf056d3bba975c1ad01
+EBUILD openipmi-2.0.25.ebuild 2501 BLAKE2B c03fb3dd479a032120862dfba9ecb1efb9da591b2a55ad220dfe44ff77411387074672660138d69c84c0a43bd5e380b7bad67bb9d7120d4346f9e12a7a26c426 SHA512 2afe8b31a90cf1652d29e43362815399b1ae4e8eb8e2fb5f7030134d853777bc0f2db2e90e4392fb7617bb3b62734b284c6654400e52f64c74b12854657fe18e
+EBUILD openipmi-2.0.26.ebuild 2538 BLAKE2B e560fa3ca1c38da676199f3eda29f5dab8adb037fa3b5b717dbe67e2b8af36a2daf3a737267df9b7db38e8bc792032924c58eb8d458164d3704b0a9a54b36a66 SHA512 aab2dae8346b88c4ffefa34ee5215269bf621d8106c804c33f5c659d410802e4556f12a2e3de394a66477ac3c9d967534c00878999e04dec5503a8e8fad16571
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.22.ebuild b/sys-libs/openipmi/openipmi-2.0.22.ebuild
index 3daad1105d0b..f9a0b23c193b 100644
--- a/sys-libs/openipmi/openipmi-2.0.22.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-libs/glib:2
 	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	crypt? ( dev-libs/openssl:0= )
 	snmp? ( net-analyzer/net-snmp )
 	perl? ( dev-lang/perl )
diff --git a/sys-libs/openipmi/openipmi-2.0.25.ebuild b/sys-libs/openipmi/openipmi-2.0.25.ebuild
index e000e191fbcc..bcbbd3548fd0 100644
--- a/sys-libs/openipmi/openipmi-2.0.25.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-libs/glib:2
 	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	crypt? ( dev-libs/openssl:0= )
 	snmp? ( net-analyzer/net-snmp )
 	perl? ( dev-lang/perl )
diff --git a/sys-libs/openipmi/openipmi-2.0.26.ebuild b/sys-libs/openipmi/openipmi-2.0.26.ebuild
index 8a5328f22d64..d129342203a7 100644
--- a/sys-libs/openipmi/openipmi-2.0.26.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-libs/glib:2
 	sys-libs/gdbm:=
 	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	crypt? ( dev-libs/openssl:0= )
 	snmp? ( net-analyzer/net-snmp )
 	perl? ( dev-lang/perl )
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 524d4651889e..05e0b1006090 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -5,10 +5,12 @@ AUX readline-6.3-read-eof.patch 1913 BLAKE2B 85cbba295d21de00af7cfa361d7976aabfb
 AUX readline-7.0-headers.patch 550 BLAKE2B 82949940cda6d042923b3dde777fbd66643d80f4c2fd984eb11ef7f0fb48776ba8938d1c8be23087b328ce9b3ad0acd668f5bb4f0bda77b4a992119688a37191 SHA512 fec3d20e1581f35609a9d9f9ee1f48df8f9aa781e1a2cdcde2edf7d149624b5770867feb65a7ba142276d95a3133b768f5589e8041049aa0cf30068d0637b938
 AUX readline-7.0-mingw.patch 4464 BLAKE2B 00ca79f7ee128a78d76c3e0adcb8b51f6d3027718cc3a7b2b11660cd4aa9c61b4da15c893c9ad0595becf2c393c0d9e7597b5a772085bfc82974568c30f5b381 SHA512 f416f265c51f4cb05467c29c29abcaabf40ae29d66bb5d3288d35403ccc26903f2a22afef43382e39d7b13ba62732082c60d8f8d10abf7cf7955ee50fc23531b
 AUX readline-7.0-missing-echo-proto.patch 466 BLAKE2B 251660f1321a36231774d5f03fea971a047688918a8f6498e019cadca43314097aee89ef8a96b104a5382ba0baa1037d500143f4d66e881da76d23f9385faaa9 SHA512 a8458bf62c73f79b980f375b98b33a6fbef59dec28386cd5266e4742a9cf70673e567f999d5682e538a2a47388d6f123d8a4fe4cfe34f19c28d4dafd93a9e10a
+AUX readline-8.0-headers.patch 577 BLAKE2B b8fe6cdf51188f68c852d3c9052e7840a0bcb4cd0cd0b25afa82d6fe8697dcb34aa541279010b308427c411a7133c481dd778551069893ad965ce6d3a4a9ff83 SHA512 81695abab2e9fba1b17a4c194b7c72eeb23bbc3ab84cb0716c08388c0ee60adb770ae8efcbbb6a2c7c6adab93dcff12e3a16d0423cf52a0166b38c9efee5c221
 DIST readline-4.3.tar.gz 961662 BLAKE2B a7267200b79c8010d08f8aaa4e0ed357eaddb970287b262404074a1e50b0d7865bcee5492730808dc998799a1b64685d3bd91fb7098d1da778e40a2364f16126 SHA512 4dbc4d9f16a453f8cf6adefb5723b0f35ef79b8db7dcdfcdd2d6465cb62ca961035e5e9547bfa46d4cb1370d738b042e0e10f9233c3751925c6bccab41e7d182
 DIST readline-5.2.tar.gz 2037705 BLAKE2B df1012925f7cac8aa5d513097de97fa55c801993fbcf651e64468c0255cb27f7a2357613f8ab67791ab7799def57bde34376d3c41e65285689318f4b9cbedf84 SHA512 74318b32c56e888716bda2507228ecc374a24e85b2faeec4778227a9f04eb19de1fc8468c78746954c84f9e616a06dd0f8a4332ba4b438fefb7e222699baa379
 DIST readline-6.3.tar.gz 2468560 BLAKE2B 24488ec141734c050ba985a93423692396f105619bae3ce5b109bc68a4f43862bcf3a6fb8d82fec1145d665cdb408765e179379bb35f008d09c441fa2e5739df SHA512 f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
 DIST readline-7.0.tar.gz 2910016 BLAKE2B 679b8aa7ce003017b729e6d8d4cb69d0f991578441a3e69005090079e61f6aa48b7ad4d0b1f34b6041528cf33254a1bf3ddb05b60db53a06e443d7922d49d0d4 SHA512 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
+DIST readline-8.0.tar.gz 2975937 BLAKE2B 95e08b28cc46582f036379413810ca40c97d4d3bc59a9e03e04e57d531573abfbe955f6f1cb86e39c208bf6c3f4c618cff70a87bec596d0b9120909d6c5a2f69 SHA512 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
 DIST readline43-001 1126 BLAKE2B 42e7637b71936b59334dae72589b8b44256af7d3c79bec28490e13fa1fea954ce42afc1f51bb1d592da14c403d0c64565fa8823874d305ad385962b462536b5f SHA512 1bfcaf9fd36d154230682ef66a9561281822f09629f9923acfbacbaafd650974b4d94267e1bf74ab4a66f0e2da95e64894c78373c82bee593bd9afbae4af58bc
 DIST readline43-002 738 BLAKE2B b4aca8deb8e32c94228c41e6a1e9dd2865e01662b6a8e28307e64b260f4a614d17949cab68aea0c4d2c9ca32a888f11a753cf6849a0a95fc5e9b315ea7e20a1d SHA512 546a7bfab27dd0b77f8b0683b82358a295d47e4e249e01d2e49612a2f113c18580c8276b17451e1edab61a26ddcff0267457a804120d5e0052dfe8e88632ddd2
 DIST readline43-003 2202 BLAKE2B 435bf8c01a2c8419e97550c421945e11ad0d6f3326181c2e9e9c66d8baf12b4dc30894bad590532f917bbf30568e93439b49054c7b023179d5dd95aa309a8f8d SHA512 fbabbe5a11c2a17dd0cb47adfb40940c860069f0e99b1478546b0351471663094d032c8049e1a2ca060f4b51835bb6a824276e1864a627711e0805268386cb8e
@@ -47,4 +49,5 @@ EBUILD readline-6.3_p8-r3.ebuild 4383 BLAKE2B 51ed7b8cb69f0d776ff9ff55b98eb68f31
 EBUILD readline-7.0_p3-r1.ebuild 4842 BLAKE2B 9415a62951536475fbd13f12d424cf6519ec190c22e32fead4665c9596ddec22bac56b2525b3b2702a553fc540c3e8449ebc4565a2815c0e3edc1dd36728b544 SHA512 aa737fe34a90f6ee81f9b36017ace1a89b75e1fd7632d417e129711d5119a9d33331f679dc3b4a0424e67fe9658c18773fc490c8c51ab9114a9c85ee44de615d
 EBUILD readline-7.0_p3.ebuild 4597 BLAKE2B 4e5d1aa3dff883d9ee4b1dffcf7670e30d7224f6c0496fe305eca3ef3611e060762bba5ac1a57ed4a31ecfe02ee1e600015a0cc997d3ba777eb41898e135cec1 SHA512 cde16dedb5a7a0c2b237c5606bc504aa89ec584940ea32386ad775f07efce7e1ee20ff02f3e6ea031a4edfdba72ee96af8a7e95a415ec3ef2953e101dcbd7340
 EBUILD readline-7.0_p5.ebuild 4842 BLAKE2B 9415a62951536475fbd13f12d424cf6519ec190c22e32fead4665c9596ddec22bac56b2525b3b2702a553fc540c3e8449ebc4565a2815c0e3edc1dd36728b544 SHA512 aa737fe34a90f6ee81f9b36017ace1a89b75e1fd7632d417e129711d5119a9d33331f679dc3b4a0424e67fe9658c18773fc490c8c51ab9114a9c85ee44de615d
+EBUILD readline-8.0.ebuild 4796 BLAKE2B 94a8e9dee48106c3e55b5df8f27a777af4387441377582b90f4a3eb63e2e5f9bde3adbcbfe93122f1a9cb535f9c8dbb9b14686cddfbcd2e9bdf90ea04260dd59 SHA512 d955b6803b9c4a8933c23cfd619fa8b379bf1ababb45dd00029aa14f792ac0fc69650df45ed0365364d62d16f28c872e650151903262206c2b24ffbce08d635c
 MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
diff --git a/sys-libs/readline/files/readline-8.0-headers.patch b/sys-libs/readline/files/readline-8.0-headers.patch
new file mode 100644
index 000000000000..f19a3b136ebc
--- /dev/null
+++ b/sys-libs/readline/files/readline-8.0-headers.patch
@@ -0,0 +1,17 @@
+Required by bash-5.0 or else compilation fails:
+
+ bashline.c:69:10: fatal error: readline/rlmbutil.h: No such file or directory
+  #include <readline/rlmbutil.h>
+           ^~~~~~~~~~~~~~~~~~~~~
+
+--- readline-8.0/Makefile.in
++++ readline-8.0/Makefile.in
+@@ -153,7 +153,7 @@
+ CREATED_TAGS = TAGS tags
+ 
+ INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h \
+-		    rlstdc.h rlconf.h rltypedefs.h
++		    rlstdc.h rlconf.h rltypedefs.h rlmbutil.h
+ 
+ OTHER_DOCS = $(srcdir)/CHANGES $(srcdir)/INSTALL $(srcdir)/README
+ OTHER_INSTALLED_DOCS = CHANGES INSTALL README
diff --git a/sys-libs/readline/readline-8.0.ebuild b/sys-libs/readline/readline-8.0.ebuild
new file mode 100644
index 000000000000..8632bb9f9b27
--- /dev/null
+++ b/sys-libs/readline/readline-8.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	;;
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	default
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 17fd8077cce2..73d4004be770 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,4 @@
-DIST tzcode2018g.tar.gz 241541 BLAKE2B 08525661ee6ca0c65c3b2619cc044a79d3b25ff557b9995dac039372eea24d041318ed6927726fb1bdf89991b2fa8a77c792e03e14fc510d06409c0dfc73df95 SHA512 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484
-DIST tzdata2018g.tar.gz 366408 BLAKE2B cc1158d35bd398f32741b1ace03a7cd0adb3a94670ea08a7566051901e58692891a3661afdbc71a487f777ecfab72572017476a7a73cdc966bd3c34751eb629e SHA512 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa
-EBUILD timezone-data-2018g-r1.ebuild 5037 BLAKE2B 4b61d35ba7919cbda14e482ef89a42441b0b0f3cc9a00d0e24083ba41b890a2f42034edc97898925dbcabaa428c075199056db1c184ce3b70040087b968b091f SHA512 4ebd998f74028a850b4cdaa3f93d862891c24a01e4cc8cba22a7858665e8a2c954e912bc9d98dfe8fef2dc4d3f26ebcbed418b0b1d226e6719d2201098e5379d
+DIST tzcode2018i.tar.gz 242962 BLAKE2B 682a23c324b6d8e1a0d63c6140c82ca3a24017c0972e7f915ecad5e0838f8f57743ffa2c5d9cc9744739a0e7d791ddb21947618cd11635767800ac99307c9548 SHA512 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
+DIST tzdata2018i.tar.gz 377009 BLAKE2B fa28fdac145756368d4760c418742efd558e63fd9900fc4649971b683b162df5e566c6214a79ec46b48fc65af488a7e0e95ddb6176a4f9adb5b39bc634426143 SHA512 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
+EBUILD timezone-data-2018i.ebuild 5181 BLAKE2B 0a6a457653aa4354050ea062ec5b96dd53b2555049cda7a251f0be39862b7fabff87cd93335432d45d1727b774ffa4d27c9116066992ec4c424da5ec1d3a1acd SHA512 72c8ef26ce3b5fbae3fb11da9f9061cfef96754b161648b771a95fbf2fdd5d4b0ee0162f3825222da6cbd218de61217d508bdb03ae9e10a5431a29aa978b8d13
 MISC metadata.xml 658 BLAKE2B 75ee5deafa4e9c1336119b2b2b87de6f8520a29f8fa7901c4995bddbb0cb185de9a019ff7703d0a8aa7b2f685a9ec2ca518641ea0c0a1b6123aa05faa04274a1 SHA512 94b68a5195b17cd1a7283a90a42ba9e1dfb0e7dde7c16f48202233cc2fc20ea718a1588b57b2af372e3c35ed403276cdd59456165a225f149a813abff2144c73
diff --git a/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild b/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild
deleted file mode 100644
index fa1396ab59a1..000000000000
--- a/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		TZDATA_TEXT= \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake -j1 check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L ${etc_lt} ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
-		return 0
-	fi
-	if [[ ${tz} == "FOOKABLOIE" ]] ; then
-		elog "You do not have TIMEZONE set in ${src}."
-
-		if [[ ! -e ${etc_lt} ]] ; then
-			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
-			elog "Setting ${etc_lt} to Factory."
-		else
-			elog "Skipping auto-update of ${etc_lt}."
-		fi
-		return 0
-	fi
-
-	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
-		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
-		tz="Factory"
-	fi
-	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
-	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/timezone-data/timezone-data-2018i.ebuild b/sys-libs/timezone-data/timezone-data-2018i.ebuild
new file mode 100644
index 000000000000..2c38c3f65e01
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2018i.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="nls leaps_timezone elibc_FreeBSD"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+	!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+
+	# check_web contacts validator.w3.org
+	sed -i -e 's/check_tables check_web/check_tables/g' \
+		Makefile || die "Failed to disable check_web"
+
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+	tc-export CC
+
+	append-lfs-flags #471102
+
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+
+	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+	LDLIBS=""
+	if use nls ; then
+		# See if an external libintl is available. #154181 #578424
+		local c="${T}/test"
+		echo 'main(){}' > "${c}.c"
+		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
+			LDLIBS+=" -lintl"
+		fi
+	fi
+}
+
+_emake() {
+	emake \
+		REDO=$(usex leaps_timezone posix_right posix_only) \
+		TZDATA_TEXT= \
+		TOPDIR="${EPREFIX}" \
+		ZICDIR='$(TOPDIR)/usr/bin' \
+		"$@"
+}
+
+src_compile() {
+	_emake \
+		AR="$(tc-getAR)" \
+		cc="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			AR="$(tc-getBUILD_AR)" \
+			cc="$(tc-getBUILD_CC)" \
+			RANLIB="$(tc-getBUILD_RANLIB)" \
+			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_test() {
+	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
+	emake -j1 check VALIDATE_ENV=true
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
+	rm -rf "${D}/nukeit" "${ED}/etc" || die
+
+	insinto /usr/share/zoneinfo
+	doins "${S}"/leap-seconds.list
+
+	# Delete man pages installed by man-pages package.
+	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
+	dodoc CONTRIBUTING README NEWS *.html
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
+		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
+		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
+		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
+		eerror "be using right/xxx for the system timezone as it breaks programs."
+		die "Please fix your timezone setting"
+	fi
+
+	# Trim the symlink by hand to avoid portage's automatic protection checks.
+	rm -f "${EROOT}"/usr/share/zoneinfo/posix
+
+	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
+		elog "Support for accessing posix/ and right/ directly has been dropped to match"
+		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
+		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
+		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
+	fi
+}
+
+configure_tz_data() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
+
+	# If it's a symlink, assume the user knows what they're doing and
+	# they're managing it themselves. #511474
+	if [[ -L ${etc_lt} ]] ; then
+		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
+		return 0
+	fi
+
+	if ! tz=$(get_TIMEZONE) ; then
+		einfo "Assuming your empty ${etc_lt} file is what you want; skipping update."
+		return 0
+	fi
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${etc_lt} ]] ; then
+			cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+			elog "Setting ${etc_lt} to Factory."
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_config() {
+	configure_tz_data
+}
+
+pkg_postinst() {
+	configure_tz_data
+}
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index 8d5165ba4c75..e6b6d34b2b2b 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -5,6 +5,6 @@ DIST uClibc-ng-1.0.30.tar.bz2 2302796 BLAKE2B 21888dfe5a68f83b7ba56bb557ecc5aa19
 DIST uClibc-ng-1.0.31.tar.bz2 2351728 BLAKE2B e2cad8500fdafdd98db11cbc756f3277845fedf545598c9861b1d1ef51b3a24744afe635d6894929eb537891323b0627577c2a5e5dbe1ff0ae588c5aa53a1219 SHA512 489e5f5e8952ebfad1d8a5528a04420d9d2e58fa5092029ccdae91d81dfcf8b3e00092453432da94c76fc18cab542192040bfb271e367fa42ca4926f4b45c372
 EBUILD uclibc-ng-1.0.26.ebuild 10566 BLAKE2B e4eed2c8c9ddfd1f179ac728382eaa4ab588f7117b6dc5337384dcaad58d2decce86c33ad21c02f87547979a35a374497492c3ff2740812788cc2eefc6c24583 SHA512 80db8406a40e370aeb73ab25dbe2b2bb5d5c3d32353eb37fd8f50a00e81bae42ed4ad0fd0aabfef2c519e8e588f8e44b51c69ab9c6c4b0990816b211e45f227d
 EBUILD uclibc-ng-1.0.30-r1.ebuild 10401 BLAKE2B 0cf25aca41d018074ab302257bae0cdb8365663919a19b1965b015e5c16002a5b31117cc85cb48db5278e149f456bc92dbaf4085250a3d632fbb0a5d82f8c3a9 SHA512 ca9df3d760beb48446d066f30467fe0885703fd62df30be50f7660d77b9a8143da30ba18feff4dc6f06380f6e1e5c57bfd8d8e2a35f07adfbfa0d638a7e1993e
-EBUILD uclibc-ng-1.0.31.ebuild 10323 BLAKE2B ef55ea8048aef2f691b887335a488ffd75d7887678ca7610a65ad1e1330f7ead363e1511d30776c19944b8ccfab4bf14b115e486cbc12179c6033fb220e52142 SHA512 bc250e0ec6b408b3acdd5bf3f66b3b43c921c9161e5a3d384e0140947a2ddcba4ae47f4a851dcc8821c54e3784b07a822dbb057ee8945fdb7890892127520691
-EBUILD uclibc-ng-9999.ebuild 10323 BLAKE2B ef55ea8048aef2f691b887335a488ffd75d7887678ca7610a65ad1e1330f7ead363e1511d30776c19944b8ccfab4bf14b115e486cbc12179c6033fb220e52142 SHA512 bc250e0ec6b408b3acdd5bf3f66b3b43c921c9161e5a3d384e0140947a2ddcba4ae47f4a851dcc8821c54e3784b07a822dbb057ee8945fdb7890892127520691
+EBUILD uclibc-ng-1.0.31.ebuild 10319 BLAKE2B f06b14a05e153bb1572bf6b408f93901cf58c44e4dbbbb98dc86ddc9d21f9f190932e996f89238db713214eeac07ec6cf63a153c7f0df56716349345b24479bd SHA512 fb4f76a5621e6ec1b0844e9e443efc26bfea75c3c60b4f3cc1fd2333e7b3e8dd5f3f00480741431aee98c489254f5111d2d9498d9c60f2c405f5eb3a2000e76e
+EBUILD uclibc-ng-9999.ebuild 10339 BLAKE2B 57a5c4ad7b5d6aee65872bde3af3712826ae910631b44606454e66de69dca49aa7339746929e1bbcb0cc67de1bb72fc0e4c8e8042e85be27464d3b7f61ee838e SHA512 db0ca38f425b956ce02b9a43202f19d8ec3ea16c303ddc31b7982f7617005cade3406af666506a320332a9fc5c4e2d07b1bbdefa836a78d8684b7231e1b30565
 MISC metadata.xml 876 BLAKE2B 218d9d733d3e7a5e29f514e4ac5e46e2a208b76f705d4825b3abe86594e262ec9722bc62df25bd848ef99fa2256d119627d9c9391e66df46f526b60e702f4eab SHA512 b7f00ea703e46028b1be735f0b713a0494f2a8459df0fb8be8c7b35b163cddb399df8a2c18b5f7864e6c4736822914bce40cdcabe44a0172ab1b2abb2474275b
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
index 9e216067cb34..36f1b9db8bb7 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.31.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://uclibc-ng.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
 	SRC_URI="https://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 9e216067cb34..46dcc44af01a 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+inherit flag-o-matic multilib savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
@@ -257,22 +257,24 @@ src_prepare() {
 	# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
 	# If we really want the ABI bump, we'll have to hack the gcc
 	# spec file and change the '*link:' rule.
-	version=( $(get_version_components) )
-	if [[ -z ${version[1]} ]]; then
+	version_0=$(ver_cut 1)
+	version_1=$(ver_cut 2)
+	version_2=$(ver_cut 3)
+	if [[ -z ${version_1} ]]; then
 		subversion=0
 		extraversion=0
 	else
-		subversion=${version[1]}
-		if [[ -z ${version[2]} ]]; then
+		subversion=${version_1}
+		if [[ -z ${version_2} ]]; then
 			extraversion=0
 		else
-			extraversion=.${version[2]}
+			extraversion=.${version_2}
 		fi
 	fi
 
 	sed -i \
 		-e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
-		-e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+		-e "/^MINOR_VERSION/s|:=.*|:= ${version_0}|" \
 		-e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
 		-e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
 		Rules.mak || die
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 02c6e8bb9d2a..a17217792630 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/bitcoin-leveldb/Manifest b/virtual/bitcoin-leveldb/Manifest
index d199e3cca469..f69f46cb9965 100644
--- a/virtual/bitcoin-leveldb/Manifest
+++ b/virtual/bitcoin-leveldb/Manifest
@@ -1,2 +1,2 @@
-EBUILD bitcoin-leveldb-0-r2.ebuild 427 BLAKE2B afd678e40567621af4fd27a990d69466e77548bc4ab23596ebd4e1613bc01cd9dc137959892db5598e6c59d95ae60ae1d102f5ee992fe05ff3d7d4cf675b1a59 SHA512 936baab00b2a68ffcd5f9d4f1b2ea08876e06fcebc5cbee0ce393bd0db85fd502270b925980a7870ce7b55e615c5b77a0b135508193ced605eacc471d8ba2738
+EBUILD bitcoin-leveldb-0-r2.ebuild 452 BLAKE2B cf0ff9526f2e0f0a6a00be55232580e8ba694722c466dde4d6bf0ebebf7812475525fbcdfcdf5b281b34b3b4a8d27b5b29ba1d6116f4efa1ff8cc427f8faf386 SHA512 f1b0fac02bf2ab10c53ac3cda3d80bfb60b6205ab53e9f95c0b2d873e1fd7506e638a63b2ebc81736cc531ca7c967e3d780dffc4451e286a8d83fb604312852b
 MISC metadata.xml 374 BLAKE2B f68f84220cb3bbe941bb5b153cefd80df5b76d14bfe963f7c0b3c687cc8f402eef1012995d461a8fb08b71433c3b606bba6cc38578cdbcc027554752e1b652bb SHA512 a5eeb34d8bb1faad87f3efa627a396af99de202cd13b8d0c2c6424e5b7e059d31755b2465e981707f49837a1c884349bf749117dd4a0cee66c052e31c0069033
diff --git a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
index bc92269dd398..1fe2f0c9671a 100644
--- a/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
+++ b/virtual/bitcoin-leveldb/bitcoin-leveldb-0-r2.ebuild
@@ -9,6 +9,7 @@ KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-lin
 
 RDEPEND="
 	|| (
+		=dev-libs/leveldb-1.20
 		=dev-libs/leveldb-1.18-r2
 		=dev-libs/leveldb-1.18
 		=dev-libs/leveldb-1.17
diff --git a/virtual/libmysqlclient/Manifest b/virtual/libmysqlclient/Manifest
index 455e91e42573..0034d09adcca 100644
--- a/virtual/libmysqlclient/Manifest
+++ b/virtual/libmysqlclient/Manifest
@@ -1,3 +1,3 @@
 EBUILD libmysqlclient-18-r1.ebuild 391 BLAKE2B e417680c13233787b6de6a8842dbea81f77f878a6c5fd2e8ece12a0f3a2dc83f515900f2ac8ddc34e5dd38509d15948367e55aab8e8758f54b628c017c770de3 SHA512 4c33ef7ff48790bad19ce943dadf5cb462e208a30b8d0bdeb7ac178d5fccfdd315f2a46b83e09489fa527477b3803276bc9fbf8d3b4e8bbd4b1c059c6dcbd863
-EBUILD libmysqlclient-18.ebuild 864 BLAKE2B 55a275a13d871a1499bed673832e824212282d48ed224881a5fa5d7cf779aa8a15423c99ecd8e000ca7a2f363c8afaaa56cdd2018a62a5f08df4bbbd2fa14397 SHA512 12d6b2605e1fda5cc810de13c97d37410d8a8707bfe764257ef98ff64b19a89553bee16c5da0d209d715029c5606298f6fdb2fa0b9c460f19485114a94a7bb30
+EBUILD libmysqlclient-18.ebuild 863 BLAKE2B 57d4746fbcf1c98e9af1820687aace3d770ea44d71c00e223bc2a41b5db3113147a2e9276cefb9bf576717c0a503240a954efb4606cf46b3aa3660ed978a7f12 SHA512 798508bd5677547e587de6c7fd4efa4172b94733b18987b27f4f3b1693ac8c8b6d8feb37cdf9ef2a235048e5f4834a316cbf383145e5f0824e138ce2a075d8df
 MISC metadata.xml 520 BLAKE2B fe2b3ec4abd9113d3c518af3596ee6c808d1c4a17442455e5a01bde37538c9673cb0535f4ab261ad57af01a27ba586562eb4ae2e89632f10b315b7615114923e SHA512 2f6bd12295a94b31a26ccc926f5642f60cbd2b9560b52a755236e035199d1792188527476d078963558d28cfa286a2c042b9bce67ca69b43962abb25b8ca3e08
diff --git a/virtual/libmysqlclient/libmysqlclient-18.ebuild b/virtual/libmysqlclient/libmysqlclient-18.ebuild
index f27e8d4596ad..e140233a0db4 100644
--- a/virtual/libmysqlclient/libmysqlclient-18.ebuild
+++ b/virtual/libmysqlclient/libmysqlclient-18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for MySQL client libraries"
 SLOT="0/18"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/virtual/man/Manifest b/virtual/man/Manifest
index 9c73a0475499..4edb0a13a546 100644
--- a/virtual/man/Manifest
+++ b/virtual/man/Manifest
@@ -1,2 +1,2 @@
-EBUILD man-0-r1.ebuild 453 BLAKE2B 1fb4ea110e245200ab79ba287b57ca6031b0cc794ff8589d91adf5285961a20cfa91c7b3df6d455d75ade17620206773b3d56f778b27b21e66d7c09d1d50cc85 SHA512 7e834e4b3750379ea9acd9396e0539ab84becf9a7763a456eafc775fb6529640a7abb5aa2f7474503c65fac32ff45ff50b23ceda0c567f6135b8c242a676caac
+EBUILD man-0-r1.ebuild 327 BLAKE2B 983ffcc68926a896f6f3f5cec6865f76a1d24195bed552ff98acf88de746ad603f136ecfcd575f3af5e38a3d8bdb563a60106e23018262988cc37e9b3f3badbf SHA512 e912c24c96644f98c7a700d934aeb84ce829f8673ccd96a665452c30f99690f375c1d541768b9c2a2a27622ce6d11c9f3e080ac6eb03e71ad0e40a5a8f563c59
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/virtual/man/man-0-r1.ebuild b/virtual/man/man-0-r1.ebuild
index e36a39623a5e..22330a0b0265 100644
--- a/virtual/man/man-0-r1.ebuild
+++ b/virtual/man/man-0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Virtual for man"
 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 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( sys-apps/man-db sys-apps/man )"
diff --git a/virtual/perl-Archive-Tar/Manifest b/virtual/perl-Archive-Tar/Manifest
index 6421d8acb810..3fff8afe4078 100644
--- a/virtual/perl-Archive-Tar/Manifest
+++ b/virtual/perl-Archive-Tar/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-Archive-Tar-2.240.0.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
+EBUILD perl-Archive-Tar-2.240.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Archive-Tar-2.300.0-r1.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 EBUILD perl-Archive-Tar-2.40.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.240.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.240.0.ebuild
index 3ab515e10179..7c03ddf9d301 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.240.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.240.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-B-Debug/Manifest b/virtual/perl-B-Debug/Manifest
index aacefa115a6d..376face8056a 100644
--- a/virtual/perl-B-Debug/Manifest
+++ b/virtual/perl-B-Debug/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-B-Debug-1.230.0-r3.ebuild 572 BLAKE2B bcf8f703d08e7ce2b8a96aa3963bec3379ee41ad8732eacf97375cfefde14341ca6a44745aab5d5b9e85577f99eb1e8c28cee5ec599706f35cfae7463f230db3 SHA512 0baf8432cc5a369806af68b8d7e0529b6536b35330e6cdd3483850cb0cf1fc911f3d04162ecf85fae2b30f3fdcc56b60d3e1fe56c6d482f3b1d7721fd54dc58c
-EBUILD perl-B-Debug-1.240.0.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
+EBUILD perl-B-Debug-1.240.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-B-Debug-1.260.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.240.0.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.240.0.ebuild
index 3ab515e10179..7c03ddf9d301 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.240.0.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.240.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/Manifest b/virtual/perl-CPAN-Meta/Manifest
index 37d758a3310b..2cfc5ce6a4b0 100644
--- a/virtual/perl-CPAN-Meta/Manifest
+++ b/virtual/perl-CPAN-Meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-CPAN-Meta-2.150.10-r1.ebuild 733 BLAKE2B 97fa55464fd516efbf526ebb98857b0f1cfd45b6b5dcc1f81291ed46f523fa958fdb2f4efc76ff3707752aa1b2afcc9364ed90b8ce8393c857671684b666c8c9 SHA512 c6297e3871fc655bb32f713ea0f854e75d1e87a864597ec70351032afe11b7a773aa44f8d95fe317416b28b395244d3ca342722cd55903e4b665a2c668608550
+EBUILD perl-CPAN-Meta-2.150.10-r1.ebuild 718 BLAKE2B bb3ec014eaf2a04690b5265673fde637bc4767d2509a44803649b047a5142c04fd3699d6444421f8477f36353c58614395a0805bea5aea2e1746fe0d8fe65ccf SHA512 d8bcb00188accf2bfecc579b86d37afa05957190077827257721f6b3edd2820ab7db9f36d58a66ddcab22d445f85750581fe1083ad901d855c7e9725962b7569
 EBUILD perl-CPAN-Meta-2.150.5-r1.ebuild 632 BLAKE2B 7577dc7cc50ec3f1b57107fafce50dda4930136e096e3f24cb9c8ef327907ab1348bb9b695587d06033d39543a0bfec33d3e964c4b4d49dad3772563167521b0 SHA512 7d12fc34098f0c4e74b429f1c533be7aa34c19a152ebe8cdb89b3a5dde8130d62607642c4e7921e31993dc2ea801eab0e592e351ca4b1d4fd42faa24528cb44a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r1.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r1.ebuild
index 5853b692f6f2..5ede511bfd5c 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r1.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index a30c012fd903..03f4317ad6b5 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-CPAN-2.110.100_rc-r6.ebuild 424 BLAKE2B 1d66536c40fa054f18d9202e7b575031fa566cfbdfad7c4a061a7517ff8bfcc6f25b6176e9e74649148ff328cbea19abba60af9a111d09a85b239acc79f23dfd SHA512 274709f9205a021a821275e57e234037667a801c1dbd2b65871cd4c5a38aab5da3fba7483e3506f12a33470ec25910cacf848dd4d60bb8df0a9a7cf4132bae5f
-EBUILD perl-CPAN-2.180.0.ebuild 409 BLAKE2B 1660f91941585b23e6516e67e62005c743fb1abf0da42226ccb3d7b8f40047c3569f2388f3d1a9ef3698069e107c549c4af71ce2e0e15e0b021ed4663b8a589f SHA512 58c9e10a4eccbcd291067a06aed063428a1a64ac0dd57626f79af6af81025cb566d3c4500667685cb946c056f9846be2718dfba4b7a9b8426784b0ec2eac7013
+EBUILD perl-CPAN-2.180.0.ebuild 410 BLAKE2B 027459fd19661e28d25e87d7fbdf154fad6f3d2e992b2707842e5299b19448a67be86ebf48c747ca328ee6c8097a27c81791d7175900e060ac990a0637067171 SHA512 cf2dce9b9e872fbc7d7ba6b3b5629c555c4d2bf3c8e3a5b87e9b12da8d8bcee5e0c18f7d43548776b61f5f081628b8f1b4d5718646aa44802806e8dd9bcafe4e
 EBUILD perl-CPAN-2.200.0.ebuild 409 BLAKE2B 699136cc5e8a6e0a035f695e0cf1c40682f19696058f6d6e6f903b9fc592d49685e05d048fea37763e07ae2ca24842febb139d24cc9994d3dfa677eaafafc75a SHA512 513dc4119755e3c3f8aeeaf8bd8c06e781500a0caaf87b016eaef1bdf3ea46ced39d596ae9269e75b075dd1432d61463cf9fe3c45b072ef3f5f527cbb34a64ac
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN/perl-CPAN-2.180.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.180.0.ebuild
index 16279b2385f0..528c13b9771c 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.180.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.180.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index ef145da76940..c62bf51b5ffd 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Carp-1.400.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
-EBUILD perl-Carp-1.420.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Carp-1.420.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Carp-1.500.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 356 BLAKE2B 9e80c3a70b4d2ef550bd705d02d24477dbade20545ad50d21ce19d16afc9d7b167b693eceee72373eee0d77c07e972238f3b4d8357b1c5b9942e7a116ced8141 SHA512 cf5fbb85cd1f54aed3f0df484085dbd6dce8afa8377b9964741f3c224c9979354964da769fcc1c6c5b9017c2f6551062751ed5aac370be300f3854c49ada0d50
diff --git a/virtual/perl-Carp/perl-Carp-1.420.0.ebuild b/virtual/perl-Carp/perl-Carp-1.420.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Carp/perl-Carp-1.420.0.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.420.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/Manifest b/virtual/perl-Compress-Raw-Bzip2/Manifest
index cd3dc878df92..e3a0d2340ec2 100644
--- a/virtual/perl-Compress-Raw-Bzip2/Manifest
+++ b/virtual/perl-Compress-Raw-Bzip2/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Compress-Raw-Bzip2-2.69.0-r1.ebuild 571 BLAKE2B 4ea15da9ddbb93105b0fd8afeb7a5ab3bb80469ae9f700672254afc331c54b6a6dcc9f59b98115c99d566e123067b484640f69964cd42ab6ed8f76c3a92d972c SHA512 cd3e1617454c61806a013b84e51e4da628f311e4c76a0658035c2e0592178c97b3a8e8b846bd769572b8b51c0bf66b7be1ede5dc4e07a63cb383a47655836512
-EBUILD perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.74.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 7ed9dc372b28..ccb6e2abd247 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Compress-Raw-Zlib-2.69.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
-EBUILD perl-Compress-Raw-Zlib-2.74.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Compress-Raw-Zlib-2.74.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Compress-Raw-Zlib-2.76.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.74.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.74.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.74.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.74.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/Manifest b/virtual/perl-DB_File/Manifest
index 57456b46dc10..68a724676299 100644
--- a/virtual/perl-DB_File/Manifest
+++ b/virtual/perl-DB_File/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-DB_File-1.835.0-r3.ebuild 467 BLAKE2B e213367a8171b59b07fdc5763d2ee086fe6af68f05e354db215d1be13f6bdb2e16dc4b613db974c709da9292e25bfc8943bc8c3ab0dbfae7aedfc65a9764982d SHA512 6e58a6e0dfd2095a25bd72836b54842c1d09100c3d27b2095834400970ee3e89be1beace328b4c9abdb0a41bad8a1b2ae380fb5bb80c6b0a2ad5787af57b5aab
-EBUILD perl-DB_File-1.840.0-r1.ebuild 507 BLAKE2B ab2d13a86048c57248bca55897f6dd5186d7ebdf0a4908a90e05ce9a420f6197f78e7444c7aaac9cd6a5e95552c8482ef29684b2d178448a66b3b0691cfed342 SHA512 65a5c175b90651d0a839dded6caff51a191b7d0966cb5aa8f51649d1f3261812fb3c108801e6899cbf0da3c37863188e83f2dd1825a9581dddd90ec9d61593cb
+EBUILD perl-DB_File-1.840.0-r1.ebuild 492 BLAKE2B 3fb882c397ba8a0ad22336194b1ca7216d202ed0ad47c23b9efd45536ada1ea74b9740036a998b20a6214abab80739e658a69b428742566d0b3b012538c98b37 SHA512 6affa31a8ee34eef134b3e7c351d0ab6287b2f7aa4c16b13e00b8b9c11b73700836c2a57e167171b33a389bb8cddca5fec50032774acb6d8ab5d95edd2340a30
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-DB_File/perl-DB_File-1.840.0-r1.ebuild b/virtual/perl-DB_File/perl-DB_File-1.840.0-r1.ebuild
index 1296b6c4ed85..c95cace12b38 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.840.0-r1.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.840.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28*[berkdb] =dev-lang/perl-5.26*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index fd6e4e6545d6..ede0ee17c265 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-Data-Dumper-2.167.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Data-Dumper-2.167.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Data-Dumper-2.170.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.167.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.167.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.167.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.167.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 6faaf366463b..77edf4ceca3d 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Devel-PPPort-3.320.0-r1.ebuild 541 BLAKE2B d891d2cedff1d7678b8e7aa6f5c8f2331ea0387db71487095112cc30c3e255ffc8272ab770ada6ebc5eff7890c3b167da5e032f94f27f0193a01392d4956bc40 SHA512 147a2bd7e47beac1123c6630e59390b58d317077957ddbcf8edc9d3fb4ab36686cfee4aabb4382ea67d5cfd6a0e38792692b4318bfbd14f950db15afcbb042f5
-EBUILD perl-Devel-PPPort-3.350.0.ebuild 551 BLAKE2B 7de7e87fb6c0718ceb124ce959abff2d1b47f73f92802ad356ea3bf35bea4d848ecbbdac264a8aeacf3b8e4c8f9420c521d472f051f05f0a3006a573ef1eeff9 SHA512 c4d60c66347ff9225ab066a19d0bc515600597172396ee813bda26b940020e5d58378b323ed598b85eb44e9c56ab303c41beb546e8ac278edfcd676d1918c1c8
+EBUILD perl-Devel-PPPort-3.350.0.ebuild 555 BLAKE2B db434295d2d50d35425d371f17ee4e7af774245c3496758b4efd36279f82d6b0cd25b75fcd967960781106012e95214b13e711c8dd5f68092585f26cb8750149 SHA512 c2230021be246be1c3a1daa0c8499d77e4ff3873b4315524b552fe100c2d0f0817f186ad99a358eb3ad9e85eea8d26500c7cc761097ff84ce40169487fa30450
 EBUILD perl-Devel-PPPort-3.400.0.ebuild 551 BLAKE2B e26fc5716350235aa62e7fd89720746072eb8c08f6d7d63186bb0ed29b225f9437ddf94c772f9b30cbf4241bb55ce6da7445235d01884d71d70be5767d1e9706 SHA512 1cd6c32bcfd9b6d4404be5bd5084d627f4a89afd995783cd9e8d9469e3c4cc866e4d1ea5719be3049df02793a262126af3048a4ef1b0cde0a86309eeac38d692
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.350.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.350.0.ebuild
index 8df040d1d1ef..135fb685866f 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.350.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.350.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-MD5/Manifest b/virtual/perl-Digest-MD5/Manifest
index 9e9c158d1b63..11dc7d36f4b7 100644
--- a/virtual/perl-Digest-MD5/Manifest
+++ b/virtual/perl-Digest-MD5/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Digest-MD5-2.540.0-r3.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-Digest-MD5-2.550.0.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Digest-MD5-2.550.0.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/Manifest b/virtual/perl-Digest-SHA/Manifest
index afd51a11ca3a..666f98f009d6 100644
--- a/virtual/perl-Digest-SHA/Manifest
+++ b/virtual/perl-Digest-SHA/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Digest-SHA-5.950.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Digest-SHA-5.960.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Digest-SHA-5.960.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Digest-SHA-6.10.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.960.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.960.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-5.960.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-5.960.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index 8afec18f544b..65e619745c7e 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Encode-2.800.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Encode-2.880.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Encode-2.880.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Encode-2.970.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Encode/perl-Encode-2.880.0.ebuild b/virtual/perl-Encode/perl-Encode-2.880.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Encode/perl-Encode-2.880.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.880.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index 3e7800fa5435..40f768af901e 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-ExtUtils-MakeMaker-7.240.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-ExtUtils-MakeMaker-7.240.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-ExtUtils-MakeMaker-7.340.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.240.0.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.240.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.240.0.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.240.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index c76fa9e55b7d..d1d2f42e9c56 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-ParseXS-3.310.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-ExtUtils-ParseXS-3.340.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-ExtUtils-ParseXS-3.340.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-ExtUtils-ParseXS-3.390.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.340.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.340.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.340.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.340.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index b6d1494ce7fe..18820c714be3 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-File-Spec-3.630.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-File-Spec-3.670.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-File-Spec-3.670.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-File-Spec-3.740.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.670.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.670.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.670.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.670.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Filter-Simple/Manifest b/virtual/perl-Filter-Simple/Manifest
index 4a7e92e32b06..a0b7c2f45332 100644
--- a/virtual/perl-Filter-Simple/Manifest
+++ b/virtual/perl-Filter-Simple/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Filter-Simple-0.920.0-r3.ebuild 584 BLAKE2B 5d9cf4534906d104cf12e95d6785f1acab0dd708a17a6dda3cd81601e1fcfd0fe839a5dd2e101c9bfeb693256d21008762f506431fc0f886723354ef3c85d7f7 SHA512 3d6d1a70d423afec98a057b545b77ec1e9aedb3c67fecb273a5db1a6fcfc19bbb87d54b4227b24c87af9cd1b774394ac0bf402eed47ba7741c4ba9e623558c98
-EBUILD perl-Filter-Simple-0.930.0.ebuild 594 BLAKE2B f3cd7578aec0fb3c1991efefcaa263aa19511acb55d82446a73ddac84dbe826a024f0bc7d40364027f54fa0765ac1c3bd636bcfa0631982651e69d9d837b7317 SHA512 7746ae4806447e1135ce67e6debcb0060d588c0e71226fd8b5376caef068c26d7a519408ffa827a353657c86040aa67c6ec24a820c45f930879ab073b38c0c21
+EBUILD perl-Filter-Simple-0.930.0.ebuild 579 BLAKE2B 22dcbd5df88f78e64e92103f10806add96294595317f5fbf35ea79acb9b1b2400b45823a372e171c1d2aea904057a5e4a14e37e8a14d3145fb16bc1924001a2a SHA512 01f49a4dd10947c2960ec2a22b018d291fe6cbf0aedc734c37cf9b6acc80c5925c7e412f6f8fb65fd6c405512a763a86229a097cb8b93de514f14705d09338da
 EBUILD perl-Filter-Simple-0.950.0.ebuild 594 BLAKE2B bb2c9a50c8750fe772ab7b7dc76585ecb546eee29de4d4c562590987a9637dc5f58e1222acf4114d0ad0748b10f4350b81f275815809dc07ca894059271b70ee SHA512 a12604aa3bd2002409d60a968f89ef3fb1676ad759d238d9ccebd4811cbf13a5bcd8a51eb6b6d686f4cf56ce637d5665ef6ec352e3e32d89d00864bba80359d9
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.930.0.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.930.0.ebuild
index 27ee86e7cd84..5801c75c8301 100644
--- a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.930.0.ebuild
+++ b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.930.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for perl-core/Filter-Simple"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index bb26ce35116b..59692caeba83 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Getopt-Long-2.480.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-Getopt-Long-2.490.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Getopt-Long-2.490.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Getopt-Long-2.500.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.490.0.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.490.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.490.0.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.490.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/Manifest b/virtual/perl-HTTP-Tiny/Manifest
index 99dd4d00c02a..d6b2f88a71b2 100644
--- a/virtual/perl-HTTP-Tiny/Manifest
+++ b/virtual/perl-HTTP-Tiny/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-HTTP-Tiny-0.56.1_rc-r4.ebuild 430 BLAKE2B 97806b4398cb34be57769d53f4eea9320c8a101e7380cf239b0698c88f3f83dee4969b259822c58003879dca5ed5dd50b224906f4c88de77079ffc3a58488b36 SHA512 f398463cedeae2de0d538d34c87946bb3c8d758697e3052db1e531fd6cfc1e0931893c97f914bb9b67ad848dba4001b10b1c413516ae81133f46f3da7fb23818
-EBUILD perl-HTTP-Tiny-0.70.0-r1.ebuild 436 BLAKE2B 36a392a2e11622290de1b5ceaf387bfba6196ae1310d9afbe5c4edbc1b7567a8bf19e3eadc66d9368b5bf46f08d14254fafa674b867347ae14ace6b418622bf6 SHA512 0258577ff32839d80773579365e052e55d909aaed4ce49022b41c8f6b4ff2706fbbc6f5cfe054d971840992487b263e0bfe5c6b241c5bdf710d269a5ada5089c
+EBUILD perl-HTTP-Tiny-0.70.0-r1.ebuild 437 BLAKE2B 113d0ed70190a7d584d5585b8f2beed589bd72b2c7c1dc4dd49f59a9aa292a3e00e8590045afd5f150218b5f687d0fef0ecd56646b40d882d5cddba721b9f132 SHA512 2f26bd8ff7fe9e94b5cc4f244c60a8119562b2cb6178cab88c51a89cf6b1209bc766700a7dcc3f9bcc59bfe3f75cbd0a5b5d5184d37381b44306e68ede615c3c
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.70.0-r1.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.70.0-r1.ebuild
index e2ca3d8d09c1..13f142008988 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.70.0-r1.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.70.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index 4a93149d2449..6a2a7978005c 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-I18N-LangTags-0.400.0-r5.ebuild 423 BLAKE2B 1401c116d10ad895ac6b4e677cd81453f37c68eddd43ae89518e3675176595698bc4f223c7246de3658d3f3f5114a4e341be64a9244aac198195811ce6fcfaef SHA512 b84fda2cdf2339ce486723663c5b11d706339471128947869cc6750e4500a70afea21d7b2fd279f705cf6902e4208e47d71225cb3f000e6a272142ec36f1c48b
-EBUILD perl-I18N-LangTags-0.420.0.ebuild 433 BLAKE2B 67fe556d546fc6126591b70aa263585bb2f6ae258ecf33ae4965e3ae9d4337395a076834bdc2e006166c80d6973daf7532f1f068347303a46f1a9b9a69a10e3d SHA512 bef93d40ba1f6d78c5d32b771ca8e0b6aab9508f7ee8f0f198c03c34890fb227dc7f926d3b1bef8d6b927004f9c8cb82482da139745b7c506cb8961a3408b7e9
+EBUILD perl-I18N-LangTags-0.420.0.ebuild 424 BLAKE2B 1a04a45fba61a09f2a3b0abdde3ae182ec78272550bab8d1a6045ebe3f67119edf8769ba1def13c9104094b50a476321415852ca2c105a235b016f1ee637afaa SHA512 55886b1835a5918164ca945a0448e6d73d6b73e1693704d4bac8125d0efcf99885a185bf2c81716e14fe967c0a7888f0d4a586d518dddabfb23ae9d356076501
 EBUILD perl-I18N-LangTags-0.430.0.ebuild 433 BLAKE2B fc8ebc64efc9e28775ed4ccc86b063f83201fdb191615aa500f1ebb2cfa0456015b83f39bc5406c6dd9c897193188259f97cb6ab88ccefba28cadba612caf20b SHA512 7e927c0e239a3547fa7f690a830fb258113744f90dc151bba767938d7f852bb1d6d1b0b488996160858b02cfb793b042f719c915dfeecef1c5470fdb0dcb0852
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.420.0.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.420.0.ebuild
index 3749040ba198..e6d251f44aab 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.420.0.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.420.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for I18N-LangTags"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/I18N-LangTags-${PV} )
diff --git a/virtual/perl-IO-Compress/Manifest b/virtual/perl-IO-Compress/Manifest
index 7eae278ff13b..48c85793a36e 100644
--- a/virtual/perl-IO-Compress/Manifest
+++ b/virtual/perl-IO-Compress/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-IO-Compress-2.69.1_rc-r4.ebuild 793 BLAKE2B 0b0984c29dc19e3bb3ff049c9ea072a97ad4752313222bba03cde366d09fe434c2b056c89b6d24aa1fd9251e4cfa2f7b6aa24e9ad8c7ff01644510647bb6347c SHA512 a370f7cb93f511d636a19de8127b3180d07977cb94e09c836724a5a44bce88ac77e0ce0c103db0225c8fb95e91ea58ee600857686e34ad7349126afe2d9e3016
-EBUILD perl-IO-Compress-2.74.0-r1.ebuild 786 BLAKE2B e9cb25cfd0fb429ce76db7c41e3eebf6932412136de9d7c6ec809d3358db5208d97d44c76dac65cd463a1b820846e247bcf426ec4469618f0a0cbd0b2b2842e9 SHA512 8fc260e093a29535ddc4ff686c9144d44edf4aabb7dbe174f5c08e478551be65682989dca5b993b20847004325f7ae5095115b49484257aaa54dde48a7dbf8da
+EBUILD perl-IO-Compress-2.74.0-r1.ebuild 771 BLAKE2B e2725b4b3920e046db229884dbac002800fa6dea82b529ce7d0a37cebcc4ccd489ea50b406683ab9ad1387006b2dea2c64b85153433d7421ae767c8b7cdc79d6 SHA512 c8fdfc1ae1044098ce7f25b5353769a1a16c2d4c9e2c54ab8c3af3ff8b0d8690752871fad3c7c6012cc580566a85fb44596843cc20f126b42f3be1f2dcb5d035
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.74.0-r1.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.74.0-r1.ebuild
index cd066d47a71e..49ab1e0e781e 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.74.0-r1.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.74.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/Manifest b/virtual/perl-IO-Socket-IP/Manifest
index 8a0d43e18d3d..304b9322b6a0 100644
--- a/virtual/perl-IO-Socket-IP/Manifest
+++ b/virtual/perl-IO-Socket-IP/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-Socket-IP-0.370.0-r3.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
-EBUILD perl-IO-Socket-IP-0.380.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-IO-Socket-IP-0.380.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-IO-Socket-IP-0.390.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.380.0.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.380.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.380.0.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.380.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 7eef23c9b6ba..4facb83652c5 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-1.360.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-IO-1.380.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-IO-1.380.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-IO-1.390.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-IO/perl-IO-1.380.0.ebuild b/virtual/perl-IO/perl-IO-1.380.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-IO/perl-IO-1.380.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.380.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IPC-Cmd/Manifest b/virtual/perl-IPC-Cmd/Manifest
index 25d5bfcfc105..58d5494fa410 100644
--- a/virtual/perl-IPC-Cmd/Manifest
+++ b/virtual/perl-IPC-Cmd/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IPC-Cmd-0.920.100_rc-r6.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
-EBUILD perl-IPC-Cmd-0.960.0.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
+EBUILD perl-IPC-Cmd-0.960.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-IPC-Cmd-1.0.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.960.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.960.0.ebuild
index 3ab515e10179..7c03ddf9d301 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.960.0.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-0.960.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index 74f2d803709d..dac3c9bb7c02 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-JSON-PP-2.273.0.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-JSON-PP-2.274.0.200_rc.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-JSON-PP-2.274.0.200_rc.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-JSON-PP-2.970.10.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.274.0.200_rc.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.274.0.200_rc.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.274.0.200_rc.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.274.0.200_rc.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/Manifest b/virtual/perl-Locale-Maketext/Manifest
index c06fe4620296..6111c206a2e8 100644
--- a/virtual/perl-Locale-Maketext/Manifest
+++ b/virtual/perl-Locale-Maketext/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-Locale-Maketext-1.260.100_rc-r6.ebuild 459 BLAKE2B cb8386b560bd69f8e09d99bc0e61b34a4f73a8d5986ef2099a58d7bbfe74c3d6d49ab7d016db613bd02bab15874e5813c617fa387ee990a1b277efefd5f5e9e1 SHA512 833e81dd3d6d8705824ea48e7de091eaa810e53f2d14e6f174ff16fd2b99e2416b6d1dfdc7c908e3d2bdf344777ec753a2b29035ad98d37648c142f84749f1b2
-EBUILD perl-Locale-Maketext-1.280.0.ebuild 445 BLAKE2B 494b141020b6a839f965b44ca5cf5afe202f0b589f41f4ed4a193b49b86d0bff52b76259d13c6539eda1d5911b5ca56934891eb1feaaa3c2b03872485738bec6 SHA512 bb1085c653661762d416e8d8e75af289988f5d8dd1a482e96db179ff0f8ad526a02dc2f2a6f65e558d2b5d1f506ce4a0daee66a0a812f7bed48819b8e907f412
-EBUILD perl-Locale-Maketext-1.290.0.ebuild 557 BLAKE2B 51b8bf760f36492be1161aa6f821a2ff42791a5bff766d23832a1110e0a39074bd43ac39bef805efe774a74fd00d9c65819a1d93e7126b9c04dbc04ecfeb2783 SHA512 1091ac718b26b55d28e5cd3c058d72f22a38f68c0a4ec0213574111d7f35b411187b7044730935c64fa2fb2f61e7cd90270d02aa94f392a30af7775066a6ff3f
+EBUILD perl-Locale-Maketext-1.260.100_rc-r6.ebuild 466 BLAKE2B 4e3fde67517a897f53862b167da04c16fc8bf42a2850adf4c5554273e2e5e2a02df31e23d24e09948809e7b8d72db7afdcc3f2b6bfb404825847ddadbffad42f SHA512 8757c411af1a794eaa36b161d0efb2629780424917d4efb493e3c6f7b13ad33e473c7993e6fc5ee368f714218973a7d58514e234d6ad6d4edbcde4b440835c2b
+EBUILD perl-Locale-Maketext-1.280.0.ebuild 440 BLAKE2B 2748aad89e7f7bca9cc8851c02da06e3f412b9620c7421ad9d57c1fd83a381da4da1138a6f46e7e2c64d046b4e4abdd2af149f052febc239b3821e09addaf137 SHA512 12442869a14f788f648964608deaef309bc1e38f4f79805212be9ab41bcb2173ae864517d6c0eb2f8a3128569c1ae952cc889585c0bcde13416566fb076d42f4
+EBUILD perl-Locale-Maketext-1.290.0.ebuild 567 BLAKE2B 89892adfe36a342362c2953293ed1ec1e9d7abcc2681286e21f326ab716c9885d3b980690dd22b8b4bb26c372765846e22b7cf37428d392ec0429b1f921d8fe9 SHA512 bafd038c3b39b07273b0009dc2de7d9b45b252c9d8c03c62e72d23e8c53592d835c4409b21d01cfd906c1f78c367e951ba53e75183d52fff4cb51870a75ebf0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r6.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r6.ebuild
index 6a507c6be71b..da8d10f307ed 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r6.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.260.100_rc-r6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.24.4* =dev-lang/perl-5.24.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.280.0.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.280.0.ebuild
index df21ec795c55..220e77074109 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.280.0.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.280.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0.ebuild
index aee1bd814d7b..7000c265642e 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/Manifest b/virtual/perl-Math-BigInt-FastCalc/Manifest
index 02790282868b..86ab109ab3cb 100644
--- a/virtual/perl-Math-BigInt-FastCalc/Manifest
+++ b/virtual/perl-Math-BigInt-FastCalc/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Math-BigInt-FastCalc-0.400.0-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
-EBUILD perl-Math-BigInt-FastCalc-0.500.500.ebuild 567 BLAKE2B ea82ebe7cb5ed8cc95c2c04c24c73699e5db0b907e2868f8d3d80ffa9b94382e58c937ea25a264e2199d2f5d0cca67b47790aa48bd3c4ae3ac8a7156364a40bf SHA512 d2e55a0314be01bf2d48a2bc45c166d0ce244c2dfdb3d43de1cd43862562625b2ae9943513cd94ce623f78665ad8d93ee2ecca38af965dabf36028f89e05cc9e
+EBUILD perl-Math-BigInt-FastCalc-0.500.500.ebuild 555 BLAKE2B db434295d2d50d35425d371f17ee4e7af774245c3496758b4efd36279f82d6b0cd25b75fcd967960781106012e95214b13e711c8dd5f68092585f26cb8750149 SHA512 c2230021be246be1c3a1daa0c8499d77e4ff3873b4315524b552fe100c2d0f0817f186ad99a358eb3ad9e85eea8d26500c7cc761097ff84ce40169487fa30450
 EBUILD perl-Math-BigInt-FastCalc-0.500.600.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.500.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.500.ebuild
index 869b9692cfaa..135fb685866f 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.500.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.500.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/Manifest b/virtual/perl-Math-BigInt/Manifest
index 2135caf9df5f..c1be87ac5add 100644
--- a/virtual/perl-Math-BigInt/Manifest
+++ b/virtual/perl-Math-BigInt/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Math-BigInt-1.999.715-r2.ebuild 556 BLAKE2B 78577542a749c4ac5dec3899557cf2fad4ce302a74e8fb6847c63c74e66cf37b40dc20ccc4e18f6fea57604a92d91b3607aaa6a93fde2c5a2b300d2e9a2e95a5 SHA512 86a298812e255a8295c20dd901ab6ea12742e41128fe2296b20c77691503ddade665e89a987d70e4e88a2b6d29d117b2cc6c4253be49385f7520288d92d5f967
-EBUILD perl-Math-BigInt-1.999.806-r1.ebuild 567 BLAKE2B ea82ebe7cb5ed8cc95c2c04c24c73699e5db0b907e2868f8d3d80ffa9b94382e58c937ea25a264e2199d2f5d0cca67b47790aa48bd3c4ae3ac8a7156364a40bf SHA512 d2e55a0314be01bf2d48a2bc45c166d0ce244c2dfdb3d43de1cd43862562625b2ae9943513cd94ce623f78665ad8d93ee2ecca38af965dabf36028f89e05cc9e
+EBUILD perl-Math-BigInt-1.999.806-r1.ebuild 555 BLAKE2B db434295d2d50d35425d371f17ee4e7af774245c3496758b4efd36279f82d6b0cd25b75fcd967960781106012e95214b13e711c8dd5f68092585f26cb8750149 SHA512 c2230021be246be1c3a1daa0c8499d77e4ff3873b4315524b552fe100c2d0f0817f186ad99a358eb3ad9e85eea8d26500c7cc761097ff84ce40169487fa30450
 EBUILD perl-Math-BigInt-1.999.811.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.806-r1.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.806-r1.ebuild
index 869b9692cfaa..135fb685866f 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.806-r1.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.806-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/Manifest b/virtual/perl-Math-BigRat/Manifest
index 0a3a6226111e..2dc470af84c1 100644
--- a/virtual/perl-Math-BigRat/Manifest
+++ b/virtual/perl-Math-BigRat/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Math-BigRat-0.260.802-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
-EBUILD perl-Math-BigRat-0.261.100.ebuild 567 BLAKE2B ea82ebe7cb5ed8cc95c2c04c24c73699e5db0b907e2868f8d3d80ffa9b94382e58c937ea25a264e2199d2f5d0cca67b47790aa48bd3c4ae3ac8a7156364a40bf SHA512 d2e55a0314be01bf2d48a2bc45c166d0ce244c2dfdb3d43de1cd43862562625b2ae9943513cd94ce623f78665ad8d93ee2ecca38af965dabf36028f89e05cc9e
+EBUILD perl-Math-BigRat-0.261.100.ebuild 555 BLAKE2B db434295d2d50d35425d371f17ee4e7af774245c3496758b4efd36279f82d6b0cd25b75fcd967960781106012e95214b13e711c8dd5f68092585f26cb8750149 SHA512 c2230021be246be1c3a1daa0c8499d77e4ff3873b4315524b552fe100c2d0f0817f186ad99a358eb3ad9e85eea8d26500c7cc761097ff84ce40169487fa30450
 EBUILD perl-Math-BigRat-0.261.300.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.100.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.100.ebuild
index 869b9692cfaa..135fb685866f 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.100.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.100.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/Manifest b/virtual/perl-Math-Complex/Manifest
index d60b4e654ed2..cbbcfe4b2b17 100644
--- a/virtual/perl-Math-Complex/Manifest
+++ b/virtual/perl-Math-Complex/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Math-Complex-1.590.0-r9.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
-EBUILD perl-Math-Complex-1.590.100-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Math-Complex-1.590.100-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r1.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r1.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index 1bb4bde29e5b..f92d1fff5494 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,6 +1,6 @@
 EBUILD perl-Module-CoreList-5.201.709.220-r1.ebuild 718 BLAKE2B 6c63ea454acff653b246e4e29436e552ffccbb602711e837b1eba1a980e647bd38bfe869f7e2261b4662d64d70fc2eb8c111ba05e40f4cc0df72c6261ab35891 SHA512 044c5b15ac9a8219eb97a2bc6becf12d828558a8b3189aa56cd8e6084112d9c38646bcb7db96f6a6adfc846a5cb1a29776ea2031706b4ca90589172c16d3e1b1
 EBUILD perl-Module-CoreList-5.201.709.230.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
-EBUILD perl-Module-CoreList-5.201.804.140.ebuild 727 BLAKE2B 5ec29c25ac93c33b9d5346c34db6b5a70ad672fa271acfaeb66a280dce29bf8845763d0b6e521fc90e27b1194da6a0561986d1f4ce51ed71aaca68279de077de SHA512 d1bdeff0e23a8f8c3975f7571a7839867058adb051985138cb2735aafabd75700584b280ca1fa18bbd3fa40a56b07039d80580960cc245611ec971b60fc69658
+EBUILD perl-Module-CoreList-5.201.804.140.ebuild 712 BLAKE2B 62246bd0299982bfbbfc46d239f51c0a9d341f83009069c1d0b8741074b615b1817d3db32808c5850971ecedc83a9efc686203833b14fd7748f3512769f0ba46 SHA512 97e59f5e179d7f2940d13486106c28d81a4c6e3f721f8629c6624c798cfe80145ab7aa810840b7a7617a020e996f4f3d5c572a65946767a91a6da7c7fbb80b0f
 EBUILD perl-Module-CoreList-5.201.806.220-r1.ebuild 702 BLAKE2B 71e633363dd719396b604a043c76e98ae3f3b20bddfb80bffe19bf78654154448a4165b571b5dd9879af7223a5cdd34529752ea88c63c1913b662478640f48e3 SHA512 ebcf09d788156224d5f4a9efffe6ca700b90b0794520e81e9644978733f50fa15c383f8c0ca4719eef738472e27442389bc0661d2bcd3bc4d749e7d79758850b
 EBUILD perl-Module-CoreList-5.201.806.260.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.804.140.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.804.140.ebuild
index 612b9e5f5d94..93ded818dc3b 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.804.140.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.804.140.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Module-Load-Conditional/Manifest b/virtual/perl-Module-Load-Conditional/Manifest
index ba1b004c780f..a735999db7ee 100644
--- a/virtual/perl-Module-Load-Conditional/Manifest
+++ b/virtual/perl-Module-Load-Conditional/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Module-Load-Conditional-0.640.0-r3.ebuild 572 BLAKE2B bcf8f703d08e7ce2b8a96aa3963bec3379ee41ad8732eacf97375cfefde14341ca6a44745aab5d5b9e85577f99eb1e8c28cee5ec599706f35cfae7463f230db3 SHA512 0baf8432cc5a369806af68b8d7e0529b6536b35330e6cdd3483850cb0cf1fc911f3d04162ecf85fae2b30f3fdcc56b60d3e1fe56c6d482f3b1d7721fd54dc58c
-EBUILD perl-Module-Load-Conditional-0.680.0-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Module-Load-Conditional-0.680.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r1.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r1.ebuild
+++ b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Metadata/Manifest b/virtual/perl-Module-Metadata/Manifest
index 224d4891ecda..4c9b21f41596 100644
--- a/virtual/perl-Module-Metadata/Manifest
+++ b/virtual/perl-Module-Metadata/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Module-Metadata-1.0.31-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-Module-Metadata-1.0.33-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Module-Metadata-1.0.33-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.33-r1.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.33-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.33-r1.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.33-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index 5cd267bac6fb..fdefeb188971 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Net-Ping-2.430.100_rc-r6.ebuild 447 BLAKE2B e676e226851c6fb785479265ed996bb69fc19b2c22ac9ec1fda7984eedfcf1120c4c2a83003eeb8f415b3281392115e3a0dcbaa4dc7fb055c4df7bfafaae8e24 SHA512 77bb6a17998005531790cc90a637274b27eaeaab40276f5b1d00e0719dacf1c4383dd18ba4731a423501b208082d55998787c0c0cb6e957dbcac39b86b502615
-EBUILD perl-Net-Ping-2.550.0.ebuild 432 BLAKE2B 552020b749218e0f56d0302db00c2185b9f440bbb3ee89831fd917d7b41ce31d551385ac5355746f108a8995783030d4fb97d5942fbd38241c635cdbe5a4544a SHA512 a0694edf4bea7797997faa1a4e9031605ef4d120fcbfeaacf322e1606418fe4d96b13468d35e65f0d7375ce37184a6cb34e8367aed64062c14fa4b2ea09eeff9
+EBUILD perl-Net-Ping-2.550.0.ebuild 433 BLAKE2B 7a8f8e3968a72793a7e8df2df900a8f31c7270d93ff7b0e6fe39efad70cdd8d69f5c12b04ec36bd388ffd484c7aef51ee900eef0a0017d3cc1ce060d75723e38 SHA512 3b40e0e827aa59effac99c27b782c3b81d1663cff694847ef19c09d82c96ffe3aa4cd71cabf3459b57a6c655d2f4a4576b20d9ff68ce50b43a0409716cd48b26
 EBUILD perl-Net-Ping-2.620.0.ebuild 432 BLAKE2B cb4f62620605f288214425d75e870ed5ad7c56f0f7fd5e2c69cab69281dd8f4ec6443e71b09821f5905707e6ea98a14de51073ec6ab67ea12a50cccb938dfd43 SHA512 9d8694f3b391a84d3ff2e2b622e633d3e94f1d13f7c8e5d16e0eec2ddb4d55abdc0ddf2a88fba8847e8c4bb3ef08e7ae2e9e53105abb34971cf62eac9eab8a04
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.550.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.550.0.ebuild
index 0d9c0af2912c..75e4257910be 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.550.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.550.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Parse-CPAN-Meta/Manifest b/virtual/perl-Parse-CPAN-Meta/Manifest
index c02ec7c54528..1365fdd30435 100644
--- a/virtual/perl-Parse-CPAN-Meta/Manifest
+++ b/virtual/perl-Parse-CPAN-Meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Parse-CPAN-Meta-1.441.700.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Parse-CPAN-Meta-2.150.10-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Parse-CPAN-Meta-2.150.10-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r1.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r1.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Perl-OSType/Manifest b/virtual/perl-Perl-OSType/Manifest
index 67783dbfaac1..16d48414ccab 100644
--- a/virtual/perl-Perl-OSType/Manifest
+++ b/virtual/perl-Perl-OSType/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Perl-OSType-1.10.0-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-Perl-OSType-1.10.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 EBUILD perl-Perl-OSType-1.9.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r1.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r1.ebuild
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Simple/Manifest b/virtual/perl-Pod-Simple/Manifest
index 199b7e9e8fc6..d50391de55e9 100644
--- a/virtual/perl-Pod-Simple/Manifest
+++ b/virtual/perl-Pod-Simple/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Pod-Simple-3.320.0-r1.ebuild 534 BLAKE2B 0f27bb19bbbe63dd7352dcec8c921ff84a515429176da95fe04c7a00558787325dc8e4a81ab44d5fbd7447c4eafb20f6f1275f6c97fc736acb148a8796e8b7e0 SHA512 fbdfb3b554cd047d2d9be132778cc396635ae6f23c4e342505735c7155927d8836b9fbb4be92a97d7e7cfc620f964b6117e4a48b25e6f5fce9e4835ba5837e23
-EBUILD perl-Pod-Simple-3.350.0-r1.ebuild 600 BLAKE2B 0aee7fb123a599d64413fac93107ddadb78d9cb372b3e290e842fd1420ffb2670743363d0ecc79212da9f694ce8fa716f57bd423360494cb3e7e6dd0d4e91029 SHA512 0624a0fe7c6c45361f37eb9be2fd23c739a95edd4e98a02263af3e0fbd261248b29659333beeaa6c93da1ba2e53154c92f436e18a6f824713632d639639756c5
+EBUILD perl-Pod-Simple-3.350.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r1.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r1.ebuild
index c83ccc553e64..4afa3328f15d 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r1.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Safe/Manifest b/virtual/perl-Safe/Manifest
index 10aa0caca9ed..77af2ddc9054 100644
--- a/virtual/perl-Safe/Manifest
+++ b/virtual/perl-Safe/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Safe-2.390.0-r3.ebuild 522 BLAKE2B ad7d9e9983647aeb2e09e8a73091854a59748b58fa6ed87c986be11c042ac8286dbe80761a9a7478f7c872cdbc627f8689dab3fe71c2a82a92259fb7ae377686 SHA512 67c9b155b646a8368f28eb8fa20a2bfe82f99ab9f844ad30077de3c79c571f43f11a8c259a03821d37ed88c43809f9749806da353ada87104c266dcef3964cf9
-EBUILD perl-Safe-2.400.0-r1.ebuild 562 BLAKE2B e225f46e6730c47add10b207ed6d037bbfabd4c7a03a10a369794436e0f000f8ec8d7ba31090a69d0c4208fa783fe6847aa2d4994f4198fc4b5cc17800d84833 SHA512 08ab41d50b789b0dc7b0b91ec8ccf42ffa3b4717292b0847251731a32b06a1811269b72e556ca61f8c5ebef200f96b77e235aece8298ccce17b06163d5c89c5c
+EBUILD perl-Safe-2.400.0-r1.ebuild 566 BLAKE2B 4f1a5f62245497f8bdb158cbfaafebcbf4efa960ffb45dea8e727de326daa2f913a43ca10456171cc13cdff74a430f3e222c6cc3ed52ccfcd2bdec5f6ce1f482 SHA512 6008bad29e47f327eed79dc7a0465bb13ce067e3f4eeaa5f33af161728d70c6563c47d8f93c0d29611b2271151a1dff419053b570f37331c70cacd47680f9475
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Safe/perl-Safe-2.400.0-r1.ebuild b/virtual/perl-Safe/perl-Safe-2.400.0-r1.ebuild
index 6fd53f0e4c5e..81d9a9909e93 100644
--- a/virtual/perl-Safe/perl-Safe-2.400.0-r1.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.400.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index 0c8384c2c720..a0422bb7f1b1 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild 626 BLAKE2B 88eb25c5eb992457bbf0e428106e835e463b0412c6845816d6f997e130ed8cb06577390c6bd51d20c46dea7b035cdf729556b16c415b2fad5ff485398d80ae11 SHA512 5a44ca37942a57f31d21702e1266028dcabcc3b846e3497b71a0738251ef9a3eff0c82e78da9108861e812c2ebd74bb303df0daa70bfa3b7673149df4a3e8e29
 EBUILD perl-Scalar-List-Utils-1.460.0-r1.ebuild 544 BLAKE2B 34e3203a9281686b31e30955eaa40f9ab3ade29d7d0c4b9c6690759b4a170bf370831cbf6ed6402bf3158e13f477173c61f69cd3475f49e25ce939f345b2ce26 SHA512 28a51ae66558d9e79d7d56b421699e86b65a39db67e1c64971b7ed45c9fdf0cd33c7d9d2ec81d11751c04f06cf2c75490237c5f2b7ffdd0e795f7f05beaedbec
-EBUILD perl-Scalar-List-Utils-1.460.200_rc.ebuild 639 BLAKE2B 244ce64c87c357b9cd401d18fce71d9703607dfcf310b17ee946c312b86d3d192f22eba6eaae6c59402a7d21f4adf2b44833be11d546f8d8be108383861bc96f SHA512 014875daf5667fa13ad7b70c8868c44729e5ccda03ba53e5badcef87e6bf3460cc68b7040489138cc29f1864141ec64ce45ef7e782f11eb53ff8afe914a2e48f
+EBUILD perl-Scalar-List-Utils-1.460.200_rc.ebuild 624 BLAKE2B 0741a529eca74ed243f493fbb735744b25384343ff7d668e3ce9fe22a9eba7e3ec86a6b4348e0ab58453dfb7cda2867d848310ea02e5d3a703a0dc9c69a20a2e SHA512 29ef8e2efbbda5bf4c55891aa8837fd78938f3f9a5bf1c5e3b145d0f8098826e89b7382b18afeea887d8ae798e35152d65480b4d54f7566d220bf68802548b96
 EBUILD perl-Scalar-List-Utils-1.500.0.ebuild 639 BLAKE2B 6ed62ad7246914007daa1cb45ec5ed18f9469aac41776f8ddd4c4a4e1287ab206ea2d86e4832c021526d90e51794c8699998ded93e17297840cd21964b83cd5b SHA512 38a9437cc46f448bfe78d78757f258ba57c90ea55ac0b737ebd04d0cb1fa0a88a4a7ded94b0fb8e7cfba67853f2a5d006267e7e1d9f1a64c8239a8dc48d24102
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.460.200_rc.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.460.200_rc.ebuild
index 29aba890fcfc..f91036036d71 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.460.200_rc.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.460.200_rc.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index c80a84d775dd..62dc9d3e2a41 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Storable-2.560.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Storable-2.620.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Storable-2.620.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Storable-3.80.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Storable/perl-Storable-2.620.0.ebuild b/virtual/perl-Storable/perl-Storable-2.620.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Storable/perl-Storable-2.620.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-2.620.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Sys-Syslog/Manifest b/virtual/perl-Sys-Syslog/Manifest
index 025152921971..ab397ebde95b 100644
--- a/virtual/perl-Sys-Syslog/Manifest
+++ b/virtual/perl-Sys-Syslog/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Sys-Syslog-0.330.100_rc-r6.ebuild 591 BLAKE2B 1d3bef0641ab795f628fb0aa9c5fd9367cb3e5ee70641373958abe315ed148f156062a479aa78799c8214b77c57cca1ff08767b9f7d4964ff2487d35cce242a9 SHA512 f6533d719b6a80a0a532c882d10549e89dc7e079f6ce6a266b85f9768994003f2d10be27e7a63570a60fea2a2461bf4efa2fd4abdd69072e56bb8ad46c101f05
-EBUILD perl-Sys-Syslog-0.350.0-r1.ebuild 600 BLAKE2B 0aee7fb123a599d64413fac93107ddadb78d9cb372b3e290e842fd1420ffb2670743363d0ecc79212da9f694ce8fa716f57bd423360494cb3e7e6dd0d4e91029 SHA512 0624a0fe7c6c45361f37eb9be2fd23c739a95edd4e98a02263af3e0fbd261248b29659333beeaa6c93da1ba2e53154c92f436e18a6f824713632d639639756c5
+EBUILD perl-Sys-Syslog-0.350.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r1.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r1.ebuild
index c83ccc553e64..4afa3328f15d 100644
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r1.ebuild
+++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ANSIColor/Manifest b/virtual/perl-Term-ANSIColor/Manifest
index 5cd1db00edca..fbb883df3cf6 100644
--- a/virtual/perl-Term-ANSIColor/Manifest
+++ b/virtual/perl-Term-ANSIColor/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Term-ANSIColor-4.40.0-r1.ebuild 546 BLAKE2B 8979850db114ce86756237af62b5c2c67c72adfa8c4319868efe3aa8f0fb007226c650671e2429f3c1ff10fbe7ac2168f8cd6945a2cc22d0ecdc306be55ef73e SHA512 c8d6bb02ee614b84a91af0f30e2a0d37285defd829fa59e1da55fd71b54767b0c7ce82f9b595cb1c81130125a3328e3bc67b1ee2c1ece00aa968a0d601d0faf0
-EBUILD perl-Term-ANSIColor-4.60.0-r1.ebuild 577 BLAKE2B 92348d82d00d54875431acbcdb7e6d1433ccd843ae6c57275107f46cbb68963c826cce5021023ee3218eb35adf3f018c3c5804b76499b9592579e6f674b7c26e SHA512 8f170b1b2899b8a59e18f99f09d137c45ea3982c437b9faab0a37fef67b173c2138000ee6dd4398967ee26cdf707a7c6fd642292a636a29ba4fce90fd0bc1fe7
+EBUILD perl-Term-ANSIColor-4.60.0-r1.ebuild 568 BLAKE2B c07550511fb77e45f7924925ea5e9f94f1eaa543f7832b0e78f8d47c4a0868643988579c852511f18fa17c29a07998cec5a60a2c45c2ea7581ff11de1db5c501 SHA512 74dee8a57fc2ed5b3a9b9a3d0aa0956953e75d59223e9fda6a0cbbd29191d1fa0258918147428a781e593431a0626d810cb8276813bfa6d253bd450f197b2e74
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r1.ebuild b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r1.ebuild
index f30cc0f4319b..fe1a2e1e27bf 100644
--- a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r1.ebuild
+++ b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ReadLine/Manifest b/virtual/perl-Term-ReadLine/Manifest
index d7a86ed9ea7d..aaa3c6a4173e 100644
--- a/virtual/perl-Term-ReadLine/Manifest
+++ b/virtual/perl-Term-ReadLine/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Term-ReadLine-1.150.0-r3.ebuild 572 BLAKE2B bcf8f703d08e7ce2b8a96aa3963bec3379ee41ad8732eacf97375cfefde14341ca6a44745aab5d5b9e85577f99eb1e8c28cee5ec599706f35cfae7463f230db3 SHA512 0baf8432cc5a369806af68b8d7e0529b6536b35330e6cdd3483850cb0cf1fc911f3d04162ecf85fae2b30f3fdcc56b60d3e1fe56c6d482f3b1d7721fd54dc58c
 EBUILD perl-Term-ReadLine-1.160.0-r2.ebuild 607 BLAKE2B c8d2758d604d8ce02efc9079ab6460f92e28459845f876181f53bd63fb6d3d71e02a7959e54120e9e6b8c11f37198790dbaf4337239ef40ff543432c58d65779 SHA512 7c1f2bed01988918e71f0f0971b8d2c61e347d1a699aa06ead87f1d141e48d5121ec4bf4ad01747054fb31cdb2d9587d7fcc2e5cbc5d542a74cbb0225bc35f51
-EBUILD perl-Term-ReadLine-1.170.0-r1.ebuild 605 BLAKE2B 7e85470e4eaf743966289bee5126ff8c000ac0537d2e701f67fca430657889c5c927b6f0be02a016055b80b8a82d88e186514a6fa366f2e047b612a923fb0f82 SHA512 466abdff870f26a31c06502b9868f5a3998bb929d8d21c6166d3758e029a0a714e0b3d6211ce81c371616cbd433b96879bc58f93bd3497ed27c482147db060b6
+EBUILD perl-Term-ReadLine-1.170.0-r1.ebuild 590 BLAKE2B 10c90e6f0ca80a49447b6c1b35784651315c5e8e8a72f1aa657513d30a18d211c7f08498a71f9df848140e91c528b7121db06b884770b33f78f50ee917d41bed SHA512 1a49f5d36b511d71e914d5a3c3fcd3bcaeb181dc455ad255e0a6677238769a11b55578ba5009b37679c9afae2663cb421a2ea4d61ff9441005a7b6515d9e6d5d
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r1.ebuild b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r1.ebuild
index 27479d84bf86..ddaf3bd2cb74 100644
--- a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r1.ebuild
+++ b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26.2* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index 25056f0df9df..1cf10498948d 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-Harness-3.360.100_rc-r3.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Test-Harness-3.380.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-Test-Harness-3.380.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Test-Harness-3.420.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.380.0.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.380.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.380.0.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.380.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index 7046af6508d8..caec82019226 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Test-Simple-1.1.14_p522-r2.ebuild 554 BLAKE2B 9efbcb5607d6cd97e9e93b5e3970e38dc687c27a856814beccdd7f1e25c9dbc1c15b7493c052b2fa9deee5b50129ca7865a79a2a38e8827aa68fccd8e9f8ea65 SHA512 42e2b65e39e561301961fe7973e07f4a35a6347a6afd9c11b4410067417e63ee4bda8dcc3b8ea46d2ad2e2e2e0bb681557a1e99c9560e0419570c16968fbd7cc
 EBUILD perl-Test-Simple-1.302.133.ebuild 579 BLAKE2B 3c026e59cf9970459c77db69b4a6c28abff380d493670de0fd48ba97d2d123336d49a4cc00f4edee56bffa13c48219b3e19d8bd10e86e3a768c2ff1d0c09bcef SHA512 18e23d0e5945ee09680846c705faa62c13e8e3f9c0e91e431905eee0d2ae13bd5389ecb0eb1ca2a30287e80bb7971ed61c690a21f17e5e353d5ea2791db3e43a
-EBUILD perl-Test-Simple-1.302.73.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
+EBUILD perl-Test-Simple-1.302.73.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Test-Simple-1.302.96.ebuild 551 BLAKE2B 68e71040736f5a31517b7734642d0762a99550cde9edddfdc8235175a5b573d3653c72749f6493ef8e89295b4bb64697e967bae8468980e6970cad15f223d6d4 SHA512 c1cb871bd23b9c6c8430c96927f3f385743d618e98186e310107efaf1259108a3eca57e342f93abd2d1a737febd018b7b505dcc521193ea305371b02ce08c959
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.73.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.73.ebuild
index 3ab515e10179..7c03ddf9d301 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.73.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.73.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/Manifest b/virtual/perl-Test/Manifest
index ce1c55628d63..59414c3275ce 100644
--- a/virtual/perl-Test/Manifest
+++ b/virtual/perl-Test/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-1.280.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-Test-1.300.0.ebuild 582 BLAKE2B 8445a44426c5eae78618b0a0ebe00eaf16a2a706f52771a40fe8b0fd753e9a9273f3d4381b6b9a5f83fc76b14db7086ba227c202c0cd3314045d70f71ded8ac5 SHA512 d9195e55cfd5c15787160ea027394a9a6256023c3c6dcc91abe7460a2675e47a4ec047124b96ef3f5000732b76fd6e9a2495562738268bb3ca6a3af1198f731b
+EBUILD perl-Test-1.300.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Test-1.310.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test/perl-Test-1.300.0.ebuild b/virtual/perl-Test/perl-Test-1.300.0.ebuild
index 3ab515e10179..7c03ddf9d301 100644
--- a/virtual/perl-Test/perl-Test-1.300.0.ebuild
+++ b/virtual/perl-Test/perl-Test-1.300.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Thread-Queue/Manifest b/virtual/perl-Thread-Queue/Manifest
index 46d3db0f6452..d4d9a2679951 100644
--- a/virtual/perl-Thread-Queue/Manifest
+++ b/virtual/perl-Thread-Queue/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-Thread-Queue-3.120.0-r1.ebuild 424 BLAKE2B 678177a6c4e1314fdb342ac97c3d8f72662f18ea99c8f8e114a171c142bc932e773b3bc3c2f90d9acffee4085c13d6ec05aabeeeea28a5b82f28d02c134ba467 SHA512 a551a58b5b08b64681db4fb01a646b8a62c255f6e0d539624b06e9946c77412fef92ab9e85c84ac3e1f7159a894a4765f8c8523a3ca6614eeddbf6ab6f38a095
+EBUILD perl-Thread-Queue-3.120.0-r1.ebuild 425 BLAKE2B 86af741545778437935682e8aa8f0fe86ec376cc71536cdfb4b7aaa2e4d486faf5c6a9b013a2c70aabd43c2613caf2254e7f1b0ad1f879d41d70983812592e0d SHA512 468e3ab51abfb1432451a6a37a88bf6213e81b4d62a0dde75a979f901604c25fd93b08ae4db40d9f2feb5c637271d98cb24073fe6003d09d7e0cf17ae4527715
 EBUILD perl-Thread-Queue-3.90.0-r1.ebuild 393 BLAKE2B cd3b47281c1ef84cccb992da5fd2a91e6846d4fe12947e7c7603ab671e85d86d55641344af07e2e33921d735ce2e310273e5818abe3823c26d0f1b8139b45eaf SHA512 49498708571ea0d2ae0dfcacdc90e11a24c8636c69fcd3152b568dd5257a5f43cec00969ab0eb087a083dfc5f54b668fc438b9a808fcb708476b2b526950b0ad
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.120.0-r1.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.120.0-r1.ebuild
index 88ffa09d7703..643bd3a5b3e3 100644
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.120.0-r1.ebuild
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.120.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Thread-Semaphore/Manifest b/virtual/perl-Thread-Semaphore/Manifest
index 03fe08435ecf..1c4caa1d2428 100644
--- a/virtual/perl-Thread-Semaphore/Manifest
+++ b/virtual/perl-Thread-Semaphore/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Thread-Semaphore-2.120.0-r9.ebuild 393 BLAKE2B cd3b47281c1ef84cccb992da5fd2a91e6846d4fe12947e7c7603ab671e85d86d55641344af07e2e33921d735ce2e310273e5818abe3823c26d0f1b8139b45eaf SHA512 49498708571ea0d2ae0dfcacdc90e11a24c8636c69fcd3152b568dd5257a5f43cec00969ab0eb087a083dfc5f54b668fc438b9a808fcb708476b2b526950b0ad
-EBUILD perl-Thread-Semaphore-2.130.0-r1.ebuild 424 BLAKE2B 678177a6c4e1314fdb342ac97c3d8f72662f18ea99c8f8e114a171c142bc932e773b3bc3c2f90d9acffee4085c13d6ec05aabeeeea28a5b82f28d02c134ba467 SHA512 a551a58b5b08b64681db4fb01a646b8a62c255f6e0d539624b06e9946c77412fef92ab9e85c84ac3e1f7159a894a4765f8c8523a3ca6614eeddbf6ab6f38a095
+EBUILD perl-Thread-Semaphore-2.130.0-r1.ebuild 425 BLAKE2B 86af741545778437935682e8aa8f0fe86ec376cc71536cdfb4b7aaa2e4d486faf5c6a9b013a2c70aabd43c2613caf2254e7f1b0ad1f879d41d70983812592e0d SHA512 468e3ab51abfb1432451a6a37a88bf6213e81b4d62a0dde75a979f901604c25fd93b08ae4db40d9f2feb5c637271d98cb24073fe6003d09d7e0cf17ae4527715
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r1.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r1.ebuild
index 88ffa09d7703..643bd3a5b3e3 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r1.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/Manifest b/virtual/perl-Time-Local/Manifest
index 0d2df1e7a56d..81bcc0b4b1c8 100644
--- a/virtual/perl-Time-Local/Manifest
+++ b/virtual/perl-Time-Local/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Time-Local-1.230.0-r6.ebuild 558 BLAKE2B 1e383ac0e19f4445bacc353e033cd0b74d4e0490cffe60563519b0596b348ec820854610bff0dd8be171667e2a42bdacea31ff9e7e3d406348e11a15e94534c9 SHA512 2eb78f698b1f8e9941725544a1d4f4bd20c1cbad3325e68bcfdce3e7297d63d844f25ad0e548c759ec0e631974754b78af45050844e15f2189e9315c43d28863
-EBUILD perl-Time-Local-1.250.0-r1.ebuild 600 BLAKE2B 0aee7fb123a599d64413fac93107ddadb78d9cb372b3e290e842fd1420ffb2670743363d0ecc79212da9f694ce8fa716f57bd423360494cb3e7e6dd0d4e91029 SHA512 0624a0fe7c6c45361f37eb9be2fd23c739a95edd4e98a02263af3e0fbd261248b29659333beeaa6c93da1ba2e53154c92f436e18a6f824713632d639639756c5
+EBUILD perl-Time-Local-1.250.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
index c83ccc553e64..4afa3328f15d 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.250.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/Manifest b/virtual/perl-Unicode-Collate/Manifest
index 65626b20b539..230b8a0f4e71 100644
--- a/virtual/perl-Unicode-Collate/Manifest
+++ b/virtual/perl-Unicode-Collate/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Unicode-Collate-1.140.0-r2.ebuild 566 BLAKE2B a5dd6b775e0e0760c0493ed0e33971183e142bb1548a19ec87a8be5b4bfc267e198e4afc54bd9e69d6d2921d217e3c9e02484d5de595ec5e450c63dbae300205 SHA512 2d78f374f4b7c5bde4de7a2658cebee443fc196da75311eb2ac779bdcdba6fde0f47eb7fdb2b7ce81e3549ac77aa57e3fa507e62cd8d80a956ba256266edfb99
-EBUILD perl-Unicode-Collate-1.190.0-r1.ebuild 576 BLAKE2B 2ef6ac22d857231321bba84790ae2eb74ac84d2b467a31bd56ea8947cedb2a56acc255c1d1ba4f5932130137283f117d030461acdec22cbc9d7bfa8f9552bacd SHA512 99eda329b56cd540b850d868a00dd688f2c00aceac4ceee2fa5f97ebfa112e21ce315a7fbb7d4cb784f9b4f7319a8ea1aefd8ab92d823d84eeae506174db586e
+EBUILD perl-Unicode-Collate-1.190.0-r1.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-Unicode-Collate-1.210.0.ebuild 548 BLAKE2B 8587af1da4c37f3296bd719702c091b4cabe17376e9619765b74a5f4cf3238534df662b881fa2570cbfabc305de36a74e14985861b7da6707e4ecb84ff1edc05 SHA512 4c6717c65af92e38d1b6abd3d950bc5e8304632bb31e75e83216665d19106e5364fefd5002316aab3f2bbd678268e2e369b53f6e0306eed143c2fd755b6e66ea
-EBUILD perl-Unicode-Collate-1.250.0.ebuild 576 BLAKE2B 3ac418ad05ecddae8dbb3468ce5fde2e3fe645c9cf290c05411c4770bbad4c9e76395c47299735ea61983fd5d9efe9a106e495fbf4e46ad0159d93147a0ca68e SHA512 b80633a04e953d2daaa09d0f277e36824a0e34d740c70b5bcfee0b81bc10f917fc98f9785d5948d72053fc9ee1b2cd40c2b9fb83d641fcf43dc68ba3245d28e5
+EBUILD perl-Unicode-Collate-1.250.0.ebuild 572 BLAKE2B 8a301bb1c8ddd704154660e6d8c377dacfee0f2294b5208c3826874159cdb291700a4b0784df238ecc279500c557c19a061f33377b7c1b0b1dc7858428d08d08 SHA512 d91378bb76bc90cdbd63275cef7506ed7e988488a53014057d19ba34db01d98a9952a0472c50a42fd20c6e07be252df99cc4e9a20ba733e372e506d3faef67b2
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.190.0-r1.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.190.0-r1.ebuild
index a7803def20e3..7c03ddf9d301 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.190.0-r1.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.190.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
index 90a8a82b12b3..73115c743238 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/Manifest b/virtual/perl-XSLoader/Manifest
index 16584d11810d..b7b1d1529e8a 100644
--- a/virtual/perl-XSLoader/Manifest
+++ b/virtual/perl-XSLoader/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-XSLoader-0.220.0-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
-EBUILD perl-XSLoader-0.270.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-XSLoader-0.270.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-XSLoader-0.300.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.270.0.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.270.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.270.0.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.270.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/Manifest b/virtual/perl-bignum/Manifest
index e8e83d808858..17c4864a0af8 100644
--- a/virtual/perl-bignum/Manifest
+++ b/virtual/perl-bignum/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-bignum-0.420.100_rc-r4.ebuild 582 BLAKE2B a81e94c84954f43dfeb42c2bf3efd621f9e88686198279fe19528c95ae785bb5c81b6aa06d4a28a9e239c00800ce85138cec57312f10d65db7b9d2de49834aaa SHA512 4e87eab71799c90b1c7858e6b8f1238008654c1ba4295482585ebf0077c66aa6b7d254841726865dad474c159f933a7120903cb2c50bed4d683fe955cff89525
-EBUILD perl-bignum-0.470.0.ebuild 567 BLAKE2B ea82ebe7cb5ed8cc95c2c04c24c73699e5db0b907e2868f8d3d80ffa9b94382e58c937ea25a264e2199d2f5d0cca67b47790aa48bd3c4ae3ac8a7156364a40bf SHA512 d2e55a0314be01bf2d48a2bc45c166d0ce244c2dfdb3d43de1cd43862562625b2ae9943513cd94ce623f78665ad8d93ee2ecca38af965dabf36028f89e05cc9e
+EBUILD perl-bignum-0.470.0.ebuild 555 BLAKE2B db434295d2d50d35425d371f17ee4e7af774245c3496758b4efd36279f82d6b0cd25b75fcd967960781106012e95214b13e711c8dd5f68092585f26cb8750149 SHA512 c2230021be246be1c3a1daa0c8499d77e4ff3873b4315524b552fe100c2d0f0817f186ad99a358eb3ad9e85eea8d26500c7cc761097ff84ce40169487fa30450
 EBUILD perl-bignum-0.490.0.ebuild 567 BLAKE2B 92c7630a4a01dc6ade44adaf8324a9c42bc7d69958ba507cf970101eb41c00acaf2e7e9d780dfc55e7cc7e11c615992d4e15c8aa4cda8edf3e44b36a65b1ed0b SHA512 4d5b8139223535fbe7740c4312ca30ae2912dbc9e6767c1d91de03886b70037124079ca68e912ecb7047376e0925be1088b75260ffa386eb8a183a8e559ae5c3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-bignum/perl-bignum-0.470.0.ebuild b/virtual/perl-bignum/perl-bignum-0.470.0.ebuild
index 869b9692cfaa..135fb685866f 100644
--- a/virtual/perl-bignum/perl-bignum-0.470.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.470.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index 01ad9100254a..5c3b1cc45b3a 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-libnet-3.100.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-libnet-3.100.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-libnet-3.110.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 EBUILD perl-libnet-3.80.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-libnet/perl-libnet-3.100.0.ebuild b/virtual/perl-libnet/perl-libnet-3.100.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-libnet/perl-libnet-3.100.0.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.100.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-parent/Manifest b/virtual/perl-parent/Manifest
index f2a31d93ceff..690cbd2cc0be 100644
--- a/virtual/perl-parent/Manifest
+++ b/virtual/perl-parent/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-parent-0.234.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
-EBUILD perl-parent-0.236.0-r1.ebuild 603 BLAKE2B 73b2df8082e5455ca385639890936e52d5959b646ab727929b1fdd8f90c4e8269ee3e9124eeff0b087ecd4633f4c9f5b28137ec7d4a48e4cf40fe8c77eaadc59 SHA512 d57d3030872bbe2c73371ecb1f4068b54a162470e4d273622b2c9f9c4219109b2b30863217f7c0f5cddc80b684b0b6a5fc3640948b895bd5dce512beb03c45bf
+EBUILD perl-parent-0.236.0-r1.ebuild 588 BLAKE2B a9d3e688532b357fc1cde6a3876d8cba1635b9987f06dceab21147282cb33317c0da6fe73da6aa3c5c83aa8f5e0169c03b85fab78ca08e4f3b98421176e33930 SHA512 fc51c45bd66032b7241cc9c1cb602e7bc143d932a90a15eefbfe334a8cde3963fc7dafc9a6ebdbf9b6239470659bbb7ba8825eff79a7e17dd4c1419772826434
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-parent/perl-parent-0.236.0-r1.ebuild b/virtual/perl-parent/perl-parent-0.236.0-r1.ebuild
index 9b7c35e13452..4afa3328f15d 100644
--- a/virtual/perl-parent/perl-parent-0.236.0-r1.ebuild
+++ b/virtual/perl-parent/perl-parent-0.236.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/Manifest b/virtual/perl-podlators/Manifest
index ed6ca5b78132..70948c06c495 100644
--- a/virtual/perl-podlators/Manifest
+++ b/virtual/perl-podlators/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-podlators-4.100.0.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 EBUILD perl-podlators-4.70.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-podlators-4.90.0.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-podlators-4.90.0.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-podlators/perl-podlators-4.90.0.ebuild b/virtual/perl-podlators/perl-podlators-4.90.0.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-podlators/perl-podlators-4.90.0.ebuild
+++ b/virtual/perl-podlators/perl-podlators-4.90.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index e380a38c5801..6d0231813354 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-threads-shared-1.510.0-r1.ebuild 393 BLAKE2B cd3b47281c1ef84cccb992da5fd2a91e6846d4fe12947e7c7603ab671e85d86d55641344af07e2e33921d735ce2e310273e5818abe3823c26d0f1b8139b45eaf SHA512 49498708571ea0d2ae0dfcacdc90e11a24c8636c69fcd3152b568dd5257a5f43cec00969ab0eb087a083dfc5f54b668fc438b9a808fcb708476b2b526950b0ad
-EBUILD perl-threads-shared-1.560.0.ebuild 403 BLAKE2B e3557453d45b2ab6d53c2a94bc1def2c71a3d26991430d6b691a2039588465ca8577ba28a0ec222059dd231a6af9b1df7e0888be512c612b61eeefb7037ed807 SHA512 f0f6efb7ca2718eeff3a120b213d0dc2f2deca958f644ab18435028a80d24f2825dc4c2ef5f73563fb3ed2d46874dc5dab3c0c076e098bae75a48a813a0896d1
+EBUILD perl-threads-shared-1.560.0.ebuild 404 BLAKE2B a5737b1a463554e29d9500278572fc22a282814d3c4427d8d595e4888af8129bf393e3015d643fa837b5d26653d01981386bbe8e93dccf367f58c0b78873254d SHA512 0f9fe0f126b85dd2dcaf7f3ac06974eb340e0a44ebfcb7a3f6c5f86a837d07d0e4de2d199a414d6fe2f0a92369cad5c31d36c7e6d24954a59ee0f104bfd1ac55
 EBUILD perl-threads-shared-1.580.0.ebuild 403 BLAKE2B 619d7e4f9081ea072eaeae8e6f7fd3083d7c79e4feab2186987a5dcd9e4e33a324d8fc67b73a7d0992ad743ec8d2576ea1c18dc7bef0ec0d9b950bce820790ca SHA512 d2d96cfaf98e669a221424aac1f4b2175a621da4bf67112ff8596ead5bc9e1fdf72a7a98149e6496fcff8edf7a2fe31b6cd0e7577342de14f8c41547b0d42831
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.560.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.560.0.ebuild
index ac783bf8d811..d81b6bdd97cc 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.560.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.560.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index 0bf8d54a1b5c..34c65dbdf441 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-threads-2.150.0.ebuild 413 BLAKE2B a198c982be3eb0363e8a2e193c1bf24357ac3040c41544cfbec96b27d758dae7c9d2cbaf6a06c3f406ee0b5755a4ec4deb32636ee09a5cf19f7493e32f21fc3d SHA512 0b29e947482748a228c28e2b12d8e994fdc5791943befd41a203c0ff414543bd6457df253acf341bd1be8605548c7180aaa06873ac39dbe4104704a7dc7a4b3f
+EBUILD perl-threads-2.150.0.ebuild 414 BLAKE2B 2e0328067e6e1b809886b26b049511f09dbe47af403916a92be248e1f9dd970d0369d56ff1c2e190cb898ce8326db5c2e3d70674ee6095c4c922d030b18c12eb SHA512 27c832c4b91e729db275f0dca12aa8cb2596984f5811f782acefbee824a15fcd88ba2c8082c1a61c1cb477bd91d8613ab02925c418f07913ecdb55e981736e21
 EBUILD perl-threads-2.220.0.ebuild 413 BLAKE2B 12ccf2d413dd2bb30c63f538e11438af26290919050a30ab0d10c7a0c17c42938546db16af72e15060b16a7381d5fcab21126d4bf224376018054fa566535ee1 SHA512 ba2f35f5ad9f9c5e144a5f90bbc00ac397797e98da90e81baf359a30e576a1db98ea8b2504c8a99387d2e95fddc74cb93d53bde04518010875a8d8b03c610629
 EBUILD perl-threads-2.70.0-r1.ebuild 403 BLAKE2B db11dde1c389b910d29dd080829cbb8807d9d4acdf672b8a197ded1ae2d5e218c5fe0111bee0b488838f1fdb0c46bce143a0c1900c5c97398e3e4eee932cea22 SHA512 265aff9394e5115e5260df60898b392b612d5392fc4612a458156b66c05232d6bb2ef3ca434c6f84d3af4907a91c9d5c3876d22c21798609c425344747d4ebf3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads/perl-threads-2.150.0.ebuild b/virtual/perl-threads/perl-threads-2.150.0.ebuild
index a99e3c10441f..b1f328f6dbe7 100644
--- a/virtual/perl-threads/perl-threads-2.150.0.ebuild
+++ b/virtual/perl-threads/perl-threads-2.150.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index e3bc29d8a8be..43c9211622ed 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-version-0.991.600-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
-EBUILD perl-version-0.991.700.ebuild 582 BLAKE2B 5918bd8a1a93812cf860f5cd87bbc70d2082ee391d23ce4b54600800d94c10f89e47277b38514e9a9ba5337ef91ba68d560da7f8c97c79bd67b8ffee2ee74953 SHA512 448c1c9b673f45e5146b5473b364c1c1b15eb88bd2dbde39262052712904483ea8e12a4c6124211703584a36ce8dcfbede867bec12c78f632682c4f5bcd5528a
+EBUILD perl-version-0.991.700.ebuild 567 BLAKE2B 4b7dc7f9625e52c9f3b84e42b74d5c24736010c400067acc592e927c32bdb488b498c83bdf0c6d5ef3e8d4805addbd133b44b18f489dd3621c320990af332fab SHA512 44ba5e14e9cf6783c1d31429778a865c71c348c157317db7496879dbc97a1af5796b36020a241dd5528a1e2af3cdb19b3eb53600b185a56917b0349013498ac7
 EBUILD perl-version-0.992.300.ebuild 582 BLAKE2B 272699fd5561e0a7598d8521fdedaadb6a610bc33365c0f03b5e978034aca15eebbe6bcae74536f738318e62a0600d85f6f236532105e602a4f450a46313aed0 SHA512 0c1d4fd69df7daef25b4e1715b2ba064a755192d482e3545835e65b8c838c27eca0d93163c350964ff7e2fb2414d5cace791ea2cd378f332d2699d7395bc56a6
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-version/perl-version-0.991.700.ebuild b/virtual/perl-version/perl-version-0.991.700.ebuild
index c3f84bd95ebb..7c03ddf9d301 100644
--- a/virtual/perl-version/perl-version-0.991.700.ebuild
+++ b/virtual/perl-version/perl-version-0.991.700.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.26* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/pypy/Manifest b/virtual/pypy/Manifest
index 3a983c5b1422..0294e62b6326 100644
--- a/virtual/pypy/Manifest
+++ b/virtual/pypy/Manifest
@@ -1,3 +1,2 @@
-EBUILD pypy-5.10.0.ebuild 489 BLAKE2B 228c936e0cde8c92d23962186519bbd20defe2015fd15ef3d3e7a686625b58869c42ee63e812cde10c48193154f9d707521be1ad539b557eae9890b7707b25c8 SHA512 d3bcad494591e6dade8f43b8af3473dbbe613152a3facfcccbf0d32e1b6a3a8992cfc6b892725c7a28af198e2f54f99282bb0b9551efe32ff5dab485a1697367
 EBUILD pypy-6.0.0.ebuild 489 BLAKE2B 69c9219d436dabe6bd140245df7875671b82a795f3fe82c52c3e4f4c43e5edb2d8f017ddde9d4b3bdf589155c09702185a5844e42ef04d0e9bea1bd7f01be437 SHA512 ffac3f5e811991465794ec61834c9463ad5c62089c85dc00a773ab35b86e17a400fc566d200f9f1dc14ae467b50cddaa8cccb541f2381b792a643f33ec439dd5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy/pypy-5.10.0.ebuild b/virtual/pypy/pypy-5.10.0.ebuild
deleted file mode 100644
index fd13aeec7bb6..000000000000
--- a/virtual/pypy/pypy-5.10.0.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
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/pypy3/Manifest b/virtual/pypy3/Manifest
index a8d627155cb1..8d249b397850 100644
--- a/virtual/pypy3/Manifest
+++ b/virtual/pypy3/Manifest
@@ -1,3 +1,2 @@
-EBUILD pypy3-5.10.1.ebuild 495 BLAKE2B 2008e6d65d72803e893c9f0ef93c83d8ab876e012951dd510e03be2f815f6d56a5d70da382ddd9e73deb34e73e330185f64802d4761ee076878d404684293697 SHA512 3fa5dc4098b4145ca18312ffefb02ba29f08339561abf074c369b489b23e0ec06c9fd493e5de5449c84ed2aec441165e678b085c7773f0b0b8e916e4ef0f61dd
 EBUILD pypy3-6.0.0.ebuild 494 BLAKE2B df7057ad5b33b95c70bc9121cc099a13b4a31302ae78b68cf6d9eeb408c34ec06006d44791c8870db2149f70fd8cb56068d61a9e077bf7a4f39da7b872ab8a07 SHA512 f82d20045eaba466ded7f3a8e3aba3abeab31d31016f09c7c8cb07a48b3e7fd9f30174785e4f8a320b7194a392e4fbc9c58a67e03323ca4387f9c4cd82d3e799
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy3/pypy3-5.10.1.ebuild b/virtual/pypy3/pypy3-5.10.1.ebuild
deleted file mode 100644
index 44ef145f61b8..000000000000
--- a/virtual/pypy3/pypy3-5.10.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/510"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-		>=dev-python/pypy3-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-	)"
diff --git a/virtual/ruby-ssl/Manifest b/virtual/ruby-ssl/Manifest
index fe9df8653278..4165234b10e2 100644
--- a/virtual/ruby-ssl/Manifest
+++ b/virtual/ruby-ssl/Manifest
@@ -1,2 +1,3 @@
 EBUILD ruby-ssl-10.ebuild 766 BLAKE2B b9844decb8fb919ddb5da1b4bcd33348258102be5f9d53db24dbcd557b6acb93a6f7a9fb4edd920eb49e2360508fb3b7a16a92b9c1eac3d1ab0bc277e33cc91b SHA512 f8694f5a4bd19e08f4d33e2e4dbef3a71d9090cd64dc372298c77e58737350220dc59ee7d76107641d4e2e6be40725a929e2870feda1c765d826e87d50474aa1
+EBUILD ruby-ssl-11.ebuild 828 BLAKE2B d5eda883c6a853220a17f9d498ef0ba07322dbcf5a81c95982bf5dfcdc0987f0b98e9b02b2c5a48862896188b83d42329fd0230841f262e7ca4ec79673b45c09 SHA512 65364f18cda72e02db2499da084eecf72eb6ccbb54364f123be683931668582824521bb6e5a12e4bcf8f28f125ea5028962cd8ba0ffeed38b652c2cf37af0a73
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
new file mode 100644
index 000000000000..84bae2e007b1
--- /dev/null
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit ruby-ng
+
+DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] )
+	ruby_targets_ruby24? ( dev-lang/ruby:2.4[ssl] )
+	ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] )
+	ruby_targets_ruby26? ( dev-lang/ruby:2.6[ssl] )
+"
+
+pkg_setup() { :; }
+src_unpack() { :; }
+src_prepare() { eapply_user; }
+src_compile() { :; }
+src_install() { :; }
+pkg_preinst() { :; }
+pkg_postinst() { :; }
diff --git a/virtual/rubygems/Manifest b/virtual/rubygems/Manifest
index 98abf1343127..96a902833a26 100644
--- a/virtual/rubygems/Manifest
+++ b/virtual/rubygems/Manifest
@@ -1,4 +1,3 @@
-EBUILD rubygems-11.ebuild 714 BLAKE2B 60ae6fa76f2195043fc3752b2cf046062252fd2d29504cf160543aa82d1c471d4df0f855ada961ad22d73677c8978320905a080998248d68846d849dda8a8593 SHA512 80bd3decce4562f85395ee736555980799fe1c0ecad410e6b83b360a0f5ff9f13eb02a5edf75008ba4207c44f561fdc7779004416ec53ef17e57574ecfc59dce
 EBUILD rubygems-14.ebuild 872 BLAKE2B 0686b3154cea6fd0ad58c3b688626169635b87843dc873d859e8caa1fd02ab0c2b1918abbb5af0bf739ba849dd242fd98092ff6ab1d9d8a2ddc4f7ca0819306b SHA512 1ebeda3693dfd4cf3a592a5f62e511fca7feeb678ec854ca32416ac68fe68882267684c70f0a6666b39613b494667860c3fbd77990303c350c1ae212487275a8
 EBUILD rubygems-15.ebuild 927 BLAKE2B 15ab8f47d9e9c4e08e4624c58ea4cf9949e75a6d3082563db62418a9438b9eecab6edb4c29c40ca35f5309038c82b022d171e816db8e3640f10769020ebadb7f SHA512 82eac66c1067e12501ea89a2b7f940e42354a5f1a11d56df22919ccc8093ec37c5f7f507097c085fad15967fa5b52b48a442064d074c43cd109c4f4c8b2d5315
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/virtual/rubygems/rubygems-11.ebuild b/virtual/rubygems/rubygems-11.ebuild
deleted file mode 100644
index cf32ffc1db2c..000000000000
--- a/virtual/rubygems/rubygems-11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 rbx"
-
-inherit ruby-ng
-
-DESCRIPTION="Virtual ebuild for rubygems"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ruby_targets_rbx? ( dev-lang/rubinius )
-	ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] )"
-
-pkg_setup() { :; }
-src_unpack() { :; }
-src_prepare() { :; }
-src_compile() { :; }
-src_install() { :; }
-pkg_preinst() { :; }
-pkg_postinst() { :; }
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6451e45bf32c..03c73ed634db 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index f051d7c69807..f1f5f18f28d5 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -2,8 +2,10 @@ AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3
 DIST mod_http2-1.10.10.tar.gz 528560 BLAKE2B 7389441b1d30d0448bb17fc02a73957cf20365020796ce7260c1d63d1468537ecdeab83db12d1b245af1e760236da8e8d0ccf9ffb222d2dec1e55491ac77dc11 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b
 DIST mod_http2-1.11.3.tar.gz 1028467 BLAKE2B 3a5d644f87104e1f7baae05396fefe94975e86e9289bb9c4e6d7ed94e45e1d9b38dfc79d0e0d9ee9270efedcd811db2374c898e419d4c16f73b38f53512e91ed SHA512 b97697f44eab9984b7dcaa7d941f23375cd5c2c81405842e17910a37dc2c952fc36a37e0802755457ccedd196c5fd2fb5b60467cb0ed16ed7aeb88cce4eabd2f
 DIST mod_http2-1.11.4.tar.gz 1028706 BLAKE2B f2c662913a30e96fe28d68690cf0fe33e4de2d7072bb46016f063a9aa979dfdbb9e39f88110c56bc3a319e1220365159fd0c15356bfbf981ae57377e137c1e96 SHA512 1347e8fe4d88d8d87ca547270a27ac63c7b7804b57a06a225ab4199a24a55ad3048cb4c7a50fb7cc2ea2a78b2cf0f1dd8f5bad6191d2854df30042f0d64e6a1c
+DIST mod_http2-1.12.0.tar.gz 1029587 BLAKE2B 10578491ce39b91e1d6363cb98d45c2c3ca74c5126af489b1c4261e80aef907b9b737a9322a54a144af7cd0892b8d0c0a86ba4467aeaf826199b989226593154 SHA512 50d8d8e44ba8d4516fac642aea9c2ce5afe766aaa1bb930ca64fd9fdb4983ee5db9677d4e9d10d88391d39b9a9be127594a90670493c39ef6368e073456034f0
 EBUILD mod_h2-1.10.10.ebuild 913 BLAKE2B 8efef07e602ac6dfd6db30f8b36ad91c5675c949b65848e6ec6948abd4e031aa86170406186d3e8a1294f2a6276618bc0cf98d868e56a938dc435836579bc614 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25
 EBUILD mod_h2-1.11.3.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 EBUILD mod_h2-1.11.4.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
+EBUILD mod_h2-1.12.0.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
-MISC metadata.xml 244 BLAKE2B 8d77ec488a1873fece64c647739c050cd3fbc933824576c2f35205a20fb47cdbb2be17cdc278ebbae566d29aaeda094098b5a6e9505036ca3977b3fba2123858 SHA512 e024554a3ed54f32c7d2adddf91a72743ee6da18f02d4955126bc4286e545944bddddcb09bc6bb8520a2dad285b9616c38735f25d7ff7e0b5c8875e1d08fd04b
+MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/metadata.xml b/www-apache/mod_h2/metadata.xml
index 4c053d99d6a4..595b44de4377 100644
--- a/www-apache/mod_h2/metadata.xml
+++ b/www-apache/mod_h2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">icing/mod_h2</remote-id>
 	</upstream>
diff --git a/www-apache/mod_h2/mod_h2-1.12.0.ebuild b/www-apache/mod_h2/mod_h2-1.12.0.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 9114e7c3679a..5fb5a28b5857 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,7 +4,9 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
 DIST passenger-6.0.0.tar.gz 7202705 BLAKE2B 764e3072e1bed8caf87198442a11d660c8bb4d88007bf60fd77c3dc10c110a6e7836c35c1897484190df74281ff1027bdf7f2ed7eb98155ab4419b108aae1136 SHA512 f3fb7e29764397684bff58314db34d25d22a0a4f1420d149f8f43b2a1ff77407a1d67908bf89182f3ed8fbe9476938da91a13dd11c9eeeb6fe4f0af2f9646ec7
+DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
 EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
 EBUILD passenger-5.3.7.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 EBUILD passenger-6.0.0.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
+EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.1.ebuild b/www-apache/passenger/passenger-6.0.1.ebuild
new file mode 100644
index 000000000000..e9d13ce882e4
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 720efa7a2e22..2ec9d3ee5c8b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 8062f85bc471..75498f87b4cc 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -4,9 +4,11 @@ DIST drupal-7.61.tar.gz 3287629 BLAKE2B 635fca54063bf3030cd3699f2395c64a4949719b
 DIST drupal-8.6.2.tar.gz 16240694 BLAKE2B 122ff2464af6376256d96db8b470cf5f83beeba80a5c63e549e7eb0cfc875629d0b2d4ed46b130294e2145ea5a428b15cfa0edfcd31596660188df769b68bcd2 SHA512 8cdcd31f3a112a577e622cca0fb7957580b5691102421344c6f6bfc3096f33aae3a68d7d8eb9062ad14761bac14b68c2967973b1b1ef367dcbd79b972493b7c5
 DIST drupal-8.6.3.tar.gz 16372220 BLAKE2B b9bbf18e25292bfa87f23e2aa2329f86dfe714a265188c35998059b0075f31ceb6d0d6a23ed576615b1a6a6aef6b935a495e70b22aed0e649b41b79994bc9123 SHA512 93284235c9620ed235bfe0100317846694095ca96b1da7ac402c415e9f5f0819887c4da516655dabb49b4bbdba58935d7f78712c525c803125ec27d6a5692cea
 DIST drupal-8.6.4.tar.gz 16401179 BLAKE2B 15b44df0ddbc420aad07c95eda6c238a9862c186cd762c6f332452919340939f7b604b424a046adbe2111bd7ae4e50b7dad2a8d67b5122035fc0f30a7b2cb47a SHA512 ff81fe8aa10f635b5906d7a21efc5e8d44e96594d26a2637987ea2ef36b6ea323638bf4fca2374553d381645e4d187ef72d0284d4d0bad8663efe1e0b7bfcf8b
+DIST drupal-8.6.5.tar.gz 16465640 BLAKE2B 39d2ae65884a54bb4830b41d58f7b84ed76d1476a3a1c08a291a0bc75b8351108648f872525f03236fa078438d9863b635084484d8003b20c9331c8ac02f874d SHA512 7298b315c14931c24a1f433625c91a96bb2c7d09ab6ceac31fba62d316604a8b72c13941ef99ffc878ff697f00fb70924f6ffdd23081ec1c9258d0dba1b52e76
 EBUILD drupal-7.60.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
 EBUILD drupal-7.61.ebuild 1770 BLAKE2B c95fb45714d745fe90f8522f44f4c6c4e8447fc0ca70bef0ba14e4d9112f6d17cb8241a15f6eec9cd3ff7dc4821f2f3744f797c9a756224efbc4dda6e1104251 SHA512 cc332985461f2fd70e73231af6841c8f9c64d5f9ec961b46ca2814d24bc6a2d4a29e35c53ea1fe231de4f8c6183461402fcdce46a37db64e28af6f36658e095c
 EBUILD drupal-8.6.2.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 EBUILD drupal-8.6.3.ebuild 2425 BLAKE2B 6c7c13e66671b68a6f3d1305bdbd07e06fc1d07e4f9d44fd093196f266f690cff3d1e02444c3b9fbf9ca4733f32d396be55888e4fb87c464706fdf36692f9481 SHA512 5e436f0647278c0f2775ce4aa3096fa32e7f9b9d682e16b1cbda27d622fc5b9f11842b002d39efd47f6430e5799199c6bd28b4f980bfaa75ad2be20776fc74ff
 EBUILD drupal-8.6.4.ebuild 2308 BLAKE2B 0b05ff48f64b17a262c5220852bcb1f9d185b7404d2934f7252cdc184207cbb49d3defa31fcd9ea7ceeb8618a2934a60d742ff55a9b28bfb6438649b1ef38c6b SHA512 8046d3eaaa248ac73513708a5f4e465bb5761e6101eef7c11d622584b1bcfc2c8be752a03e607a40c5d83df74e93452a353d7a1478f33138b539b464117623ac
+EBUILD drupal-8.6.5.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.6.5.ebuild b/www-apps/drupal/drupal-8.6.5.ebuild
new file mode 100644
index 000000000000..a8514d07dfe0
--- /dev/null
+++ b/www-apps/drupal/drupal-8.6.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index ff8722b679e2..56988cb743db 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -3,5 +3,5 @@ DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 2a7ebe4ee84ea311a1e0cac14021db66c09
 EBUILD icingaweb2-2.6.1.ebuild 2753 BLAKE2B ca25d486a10b97ac6efb871049239c49301e1b242c5cf7021144f67c99f38ad525d5b06bd78b652d44ed7977cf86b43ef3e711af965fad4c583ba6246aac49a0 SHA512 4493fb4bca00b034ba9714c3b16edd202d8a3ccfeb6dd0ccdd4f14c86499fc0be27e59b10a44e14488d89e74926841cf6090156cbacb13fa8acf44035309c3a4
 EBUILD icingaweb2-2.6.2-r1.ebuild 2331 BLAKE2B 1363042c58ee67b76b6f82d89919c7a92edf289ca99ef6e1c157592c9a449ac1afc6459a42b4a1ed89168ee9ef1dc6c6f6012e1090a0b0f98115ec56b04823bf SHA512 73bc873c58b89adc43eed160788406ea9299e66d9388b681e31cd91ef300547c20ec27c8ed09309db12c813ce507e73e88b3850d9e6d87194f9a11758a90683c
 EBUILD icingaweb2-2.6.2.ebuild 2750 BLAKE2B f3a93c50db31b0d18d442a76ad42777bc26136a1aa10baed09c31ebf8b31529e76c21f9c26375e17bf9bce3ff10325e8e6f9cf7dde0cb7a7ddcb34a6788450b0 SHA512 1eff0bc5243c531f4d869ad8d0cf91551649dcae50489dfaad45d342777a6714dc58e752a315a00bae9967664b5b5c74386ebc2fef9193f3553c1027ea0fde70
-EBUILD icingaweb2-9999.ebuild 2326 BLAKE2B d89a0a7fad5a7a5b843537a634d663a3301e2c1e39243f42162e9ab411f3874f44f5fa7654cf7787036e74b7f417b9d246df2bf674078cc14b7ce29039b40505 SHA512 e61d107c60a8bdb31c3011ff6ffc69e5c0716c6bfe3389ae2a291e94ad9afe40ca114ca99358e79fac84cd508ed7d0547d4a044e85dbcf20f57593c978ebd2f0
-MISC metadata.xml 457 BLAKE2B c1e8513c6e19ee42752d4b14c85736b1de6ae0c6816f4cc70f3bcadac0a5f58bccc0d3804c425614455de4fa7ff033c18693d6aa137711612fd357393c8675e3 SHA512 af1d011357452a12a3c8d53c934a5586fc61a33465bc2c1d015fb15338b184ec5af9d7ec1bc4c88369bc83507cf4af2648b9395ff123237a671b74e56e00b6e6
+EBUILD icingaweb2-9999.ebuild 2387 BLAKE2B 15090aba537ae7e6c1a5d3bb87bf21c018c526ab03c7d22f34275095cf4b1621d2475110c6ad5fd2bffec2590236307f1c317c91f9a8723d2c6f00d3511d1d74 SHA512 da41c35db047516cb3e03951e845801f26704786cf289bbfd1bc691b1fcec4c6c30ba5338b43fe94f816a017cc370606bfb538e370942c37be7090b14d1e0239
+MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 4d8e67f6cc57..03a2c2bd75d6 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,14 +12,14 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apache2 fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
 KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
 		pdf? ( media-gfx/imagemagick[png] )
-		apache2? ( >=www-servers/apache-2.4.0 )
+		apache2-server? ( >=www-servers/apache-2.4.0 )
 		nginx? ( >=www-servers/nginx-1.7.0:* )
 		|| (
 			dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
index 8f0ec860cd1d..c6478777dd22 100644
--- a/www-apps/icingaweb2/metadata.xml
+++ b/www-apps/icingaweb2/metadata.xml
@@ -9,6 +9,7 @@
 		Icinga Web 2 - Frontend for icinga2
 	</longdescription>
 	<use>
+		<flag name="apache2-server">Adds support for the apache2-server</flag>
 		<flag name="nginx">Adds support for nginx</flag>
 		<flag name="fpm">Adds FPM support to php</flag>
 	</use>
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a89814564119..76cb2f1a8b97 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7a8f4dea5551..b7da05c1dad5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -22,8 +22,8 @@ DIST chromium-72.0.3595.2.tar.xz 658797888 BLAKE2B 7f0274693e8fac283d75c7e7ff6f6
 DIST chromium-72.0.3626.28.tar.xz 686169316 BLAKE2B 6ee2bfd35e8d48a7122f0a8b85777733bdaf2c6c56b00eb6cf3ee14afede25a45919b6ce6267fb54ae9040d0b676d084d6db5026918b07bc3e26f825d6298c35 SHA512 474452f6d41f900118d88f3aaf435cd332567f7a55c2af449e775668a78ee285ab7c011ca41237fa2b13f4b3076ec0cfb5448cfe9018092614e60c0ad7c12252
 DIST chromium-webrtc-includes.patch.xz 57908 BLAKE2B e977da6fb10bd3fdd12fef75ad669c4e7cb15f8e518a18c52dec7a4e27f0d5444dffc880b4aed30ccef8b620d82946be08c0b5b63ceaec0554e9f80b867b9750 SHA512 440c5ede645d13ec74c08c755a46298f5fcf10c9cbe6d88621ae89a2b27ae41be9954f4e3c1798525cc97aac01e5021b878a06c5625628c4c071cec84f3dfe8a
 EBUILD chromium-71.0.3578.80.ebuild 21665 BLAKE2B c5a981391b2094735827e44b63735ffd93c36391923dde802d04ccaf82d89f0e41910fda105ef181ea3e7c4201e9a48deb8505b85a2def6b3a6aefed759634f7 SHA512 f0f35e4d1051bcb6c19150ddb8defd924fcb969007e40ea05ec64dcf219ce9d61f23be65ad986bab31cfa3188ec1f3912930ae33952965c5b430b809c4d08eeb
-EBUILD chromium-71.0.3578.98.ebuild 21666 BLAKE2B a9143309659c05aaf275bdc9c7756cdbbd5083bdca498c1a6fc1c48c843654a39344252e16be5e85d7625660dc6a86e6982a88bc7c905e712b4f4cc753d68d94 SHA512 a2bc64d6fc37a807af5bb637fc9e53d6f34d59be00c3fe2e7d913a9478fda51b9fa18223b2e18baf22c0a1c0f4823548be2099d66c00082326a9b8bcd8d5c0e0
+EBUILD chromium-71.0.3578.98.ebuild 21667 BLAKE2B d6d07053a0f032fc3f1f1f0c06a08e61325b2bdadfaab8d7ed4636f62a86a2c2b9225d78def083b6c6be27d6ce58fe229f798dfc1b3e43df619b0f5dee298fdf SHA512 35e42cc8a39087afe7e4eee36c8e170497e4b708a9e1c086c16b737d87afe03e1793ed432e8d4149cba63348e759a5acd6a0a3e6dbede95be238fffef7d3265c
 EBUILD chromium-72.0.3595.2.ebuild 21676 BLAKE2B 428302afd0432c0a85c7720a58d3cca5b889d6b7819fdc033e441d0cfbed862f4373045d5ef3f2142bdc76afe1885f05eeb3bd5f0647ae0186b537028c36ba5f SHA512 d0ef8a8005a6aeac02285adc153af3873f82609faa228ca62ccfff7cab17076d913cca3d740a8d49ce36b3e1165f745744fdce1dc67faeec741541246b7f1240
-EBUILD chromium-72.0.3626.28-r1.ebuild 21747 BLAKE2B 50d9ee4b5f98d7582bc05407a40e55b50c326fdb3525644ffd30ed041eaebd0d72f4720311be0638ce57d54728d459abc6b8d85a036bb4a34beb5fcc23e68520 SHA512 c971652d1d80b6ca404379ed6e45b299b40b49b556c1e9ea86c12e21c355a2ebfb3c29c89520b344334155527b18a0f8984dc6183bdeebb96163cb3b9a8e3570
+EBUILD chromium-72.0.3626.28-r1.ebuild 21748 BLAKE2B 051f4527104caaf68025eecd3ca97b7c5af38012cf3d6e41115d50bf4cd384b57fc959cf1c5c0a88caceb909ec7db024e2399c8b71608dd229d0630a6140594b SHA512 9383e3a1d151067d9ff96388180e68f2b67fa72496caea4fff344d5c32bfa5bcbc73c376ad2abf8a85113ed82a50850a4f488a88e387eb39ad4eac75fe33a50b
 EBUILD chromium-72.0.3626.28.ebuild 21747 BLAKE2B f582617423cb531944f9b8460fbf0d90f7ecbf86f437965772caf280edc7eef5601d23331cc4235126761f7e062f91dd2fedd7120c4a7044558f461b0c1484ce SHA512 09f59907087d121db6a8eee3b1240eef5fbdd697fd3ee595e42757d0187219ef00e24384b645eed25cbba461113a4759a759413b93df235eea04c287e97fb362
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-71.0.3578.98.ebuild b/www-client/chromium/chromium-71.0.3578.98.ebuild
index fd9d0c56bc09..88e3484e883b 100644
--- a/www-client/chromium/chromium-71.0.3578.98.ebuild
+++ b/www-client/chromium/chromium-71.0.3578.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -505,6 +505,23 @@ src_configure() {
 	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
 
 	local myarch="$(tc-arch)"
+
+	# 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
+
 	if [[ $myarch = amd64 ]] ; then
 		myconf_gn+=" target_cpu=\"x64\""
 		ffmpeg_target_arch=x64
@@ -533,22 +550,6 @@ src_configure() {
 	# 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
-
 	# https://bugs.gentoo.org/588596
 	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
 
diff --git a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
index 814e42f8bfce..0f7a5ab1a501 100644
--- a/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
+++ b/www-client/chromium/chromium-72.0.3626.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -507,6 +507,23 @@ src_configure() {
 	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
 
 	local myarch="$(tc-arch)"
+
+	# 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
+
 	if [[ $myarch = amd64 ]] ; then
 		myconf_gn+=" target_cpu=\"x64\""
 		ffmpeg_target_arch=x64
@@ -535,22 +552,6 @@ src_configure() {
 	# 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
-
 	# https://bugs.gentoo.org/588596
 	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
 
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index fd53f1cbd213..5bb613125249 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,5 +1,5 @@
 DIST epiphany-3.26.7.tar.xz 4429308 BLAKE2B cdd8cf084631891e97585307c90bd67f45e71deb6564f54711deb8dfd39c09007732efeb22ad5be45c1b0af6af7be30cf13a9d90aa1e9506a2e997f6f3f8d854 SHA512 686c8825d476a4c6675dadd7a68bf72727714bc6fe01b4dbf67d39b2dc7e3f21d4f630417865800664a716d6316df8a97fde5201ec72c90f448fd6f0af4b49a0
 DIST epiphany-3.30.2.tar.xz 4528100 BLAKE2B 3b711df8aa3166c26f639658de188e730f346be7c9bdfc65a5064804c1b0e22a744aec6c559c4131125e8fb34e7bb80636f559c7257cca3ad044c6b810bbe657 SHA512 4edaa042357ad44f2069412508cff9524e6e397da868b78768b493d03d77d16807d78f074eb1a4b18fcc1143d3a63d21f3eb1c0f126a31290320016c76c5130e
 EBUILD epiphany-3.26.7.ebuild 1926 BLAKE2B 213faa2400f2c1eff31f7d37d37230ee8022642b60d19eea97cd4d037a72d296902e18b2358878aa4722ad5b6255de06fcaeb70a7c3a190e38e1cce5f8463c57 SHA512 c3c5887d9a71d936214cf20e921207d161a2f43b79e041d9639979afc64529a9654c40c2b5c08d5031a54d572170d9446284a6ea1c9c8cd43b6ea265f3a346f9
-EBUILD epiphany-3.30.2.ebuild 1696 BLAKE2B efd33c032cff0c337758cfa63a005844cb443db08e28e85dfdc556dba0bdfadd32ca628a606b923d28ab93979f039cfc186accb08455a3f6b20b9c6614ba3338 SHA512 538d178541da8acf4f201195c55960532b6cb66e75b6b2174f9bd863153d03fdf9c3f7edbd28a033c397aa424186b9ebcfde63e8261ea918ab25700822356915
+EBUILD epiphany-3.30.2.ebuild 1695 BLAKE2B 9c3b6e730ff2141f7bd1addc2e04eff84509e614c1b614e310c8f8075d4ccc7955503d4e9df855c4f1c5c58be04bf3f38af85c380d0ed60312c9caf324f5454b SHA512 0628662659077df17154c1cb965fd07e75c6ac312d2a0cbd043e0d4b23b0b157c9ee1be6e6cb95caeaa4d7352afb86a314cfc4b7a3afb5eb5f293342341574ac
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.30.2.ebuild b/www-client/epiphany/epiphany-3.30.2.ebuild
index 77d10675a944..07d03ef129ac 100644
--- a/www-client/epiphany/epiphany-3.30.2.ebuild
+++ b/www-client/epiphany/epiphany-3.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.52.0:2
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 824bd4020f22..515e9e48c1f6 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -172,97 +172,97 @@ DIST firefox-60.4.0esr-vi.xpi 528187 BLAKE2B 5ea0608748cea2d8e98a836b635e91af0a9
 DIST firefox-60.4.0esr-xh.xpi 511859 BLAKE2B 20505fb9ed4b87e358556b1f4063dd1aed5c355b0fa92d2cf39c25acfe528352639ccee40b80919cf0b1ac02f17f4ad2c0e485e42f037c1e845f5c61d7eaf5f4 SHA512 b5b20c79434bf3d9f5915a6800d6b56c240cbf82807a70f75899306f2a75e3bf531bc9be5acbd5bb6ddf90a26160fd72e35af23886bf77dfe397d4f90628bef9
 DIST firefox-60.4.0esr-zh-CN.xpi 543585 BLAKE2B 787679f3a78a9556183d2e57ab1a744150a0d1a02caa629fdab46dfa3838cade0a1105ceebc7965810a1becc88956e9683db99bc25fd1d09fac38cb113b33aab SHA512 e2c9662dfac8e2cff3a719149626be02fdb3cf4a713c3d32cdba7df37df4a98fd90eb88a8d16d3a61ca4870c0f049d5343cb6b41470464e9399c6b1153d059e7
 DIST firefox-60.4.0esr-zh-TW.xpi 541910 BLAKE2B 5ec6659b0bb94fa7d52488a0e043b6bf6372100a3652bd509e46f1972fef3680224017fef32f3faefdab7f2c683576eb3aa4c3e7435fc5ec42ad6ce3cc54e461 SHA512 229f070f9eeba9e88b44f1e27bd47cb79fa39f4b9d6a8d50edc8afe9e4dcb8ebfc03acbcceefa9106d5dd726146b680d83578271bbabf19c19800be2800591c5
-DIST firefox-64.0-ach.xpi 455463 BLAKE2B f9cbba19f002a625bae23a1c4e7157c4090cd41a16872993603aed0610c1b9124aaf7fdd90a3263ccd0e841d0e1624cce517db929d62833c6a0a91e7942ed352 SHA512 5e7ce624293c24e8a8f0e1d323ed1f6d77c8476915c1ab60c2ba74725bfabd011ca7de113a98d118f112af633a7a9db014c3961a7421344db4b97c23d9aa7848
-DIST firefox-64.0-af.xpi 431976 BLAKE2B 366e4fb57e4d9bb48c08d98b290c4338ccd00d1c56b61773c6ef11053df8116fd453c4d4c1ce34175d60c7600ee8acabe2865b4fb70f5543dd6c8014a62bd43b SHA512 17d2015fe636f8ea787d7b536f10767be4e5afb754c883c1b5d68dc65b45a620e1c0d2c81ff4d155a07f8db5c775ad7fca74d88e8759f2cd178d0914ce2a0331
-DIST firefox-64.0-an.xpi 473568 BLAKE2B 512627e73a3b80d0b7de9ed209a4ebb1f5928a1825fb29907e004685cfed298cbda4d528546090e6403b8bd520c4b589ca51fa02cb1f144dc21b9876269f8157 SHA512 7979c4a0eabd79169249b7f3741ef349c98ac56f2223164b5dbe793ff4bbc85e976d06d8fdf74c8abd3bd9c2783f5958ee836167dc9efe65bf3934dabc4b3aae
-DIST firefox-64.0-ar.xpi 513398 BLAKE2B c98a9a16be642b2073c6d129e4ca5f60a425000518dcc6c70e87a03c09756a5039cb5548a150b308813bfb47e2805b750afaf7acce6d7bf4388c940095fbd5d6 SHA512 73ca6ff18d7543aa6cb13bd1169cdc114fafcf4582294da3f4334996ee8c8d6f50719814c948bf72648ad6a9441dbdb5b8776ce8ca407cba151fcbb6ecb6ddb9
-DIST firefox-64.0-as.xpi 478291 BLAKE2B 2747fa496b1a588e6416150b462578005c888d64715aa194909835ecb3693a4c39e9e44169f5635c6b6035323d83505d8ec1300196ff01ec7e1236daad3050c8 SHA512 28bf907404ae1b57267e4b4dc3f578378c7d8c82a6df54cdcb70821e88b93c68340e839bd37c5124b452267e21df09803e84cfddedd3121aae6552e81190ccf9
-DIST firefox-64.0-ast.xpi 461828 BLAKE2B ee1d274fb8a6929e30d51f425ddbf0b8bab3d5f4f1e1b3ea115a602d48e89feb0c72d6396e2c5eb555641a31b023e64504b16f5aefb8df0d795596b3286929a7 SHA512 ee530e92eab42bb9f069771107e7ccc992bcdd015c10069c6be58aedc6f0157112444d1ce14cb8d3755a5ad18168853f479e028a0f1d5fa3d7d740c0ba588779
-DIST firefox-64.0-az.xpi 490034 BLAKE2B b35f9c56fe8c0e26b17c2437bda2e7c4db1cd630b08f6301633a9afc3d71bc0643c9eb872936551e2ae8c072ff881b6892154ccc72586c3cafec59f9e756d1d7 SHA512 0cea81a00a606b517dab55477ba8df01b87d8e0c3a436a7430d11b8f309b811d8e69e77e13041552374d51233c4f8aa1ae78039dfcca8dea9e0e80bbba2712b4
-DIST firefox-64.0-bg.xpi 523739 BLAKE2B b43e8cfc5e89f39d16e977c1b030efa80b5f6db5e27fcaede8ae5ffed52e3046988a4a1e41f6507752f8ae6838fdf9784fcf1c3abbddb7cc1435048dcb4cf045 SHA512 ed21b8e58d36d9be6c6b68e3f3be8adc3baed47ed4121532d788dfe1b629150e25bdda1d9b68e4892b4d74459c4e04fbba33db8a1da39b9b9a77b3e294f91af2
-DIST firefox-64.0-bn-BD.xpi 541873 BLAKE2B e937ed052c171d7488e750d28b2fc91aca3f97701d0b7214904346347fcbeab3457ffbc9de107ee2245cf2d85986ac2852f4237fd23ae0e43db37f4b2f187918 SHA512 060b92ceb42d8d4543b1bda0da519e774a69e6b2a4735b752a07a8268ff2ae72086bd978a05fc36bd811c0ceebe4cd064d1816164f4d2156e3ec8dda16dde4e3
-DIST firefox-64.0-bn-IN.xpi 528978 BLAKE2B 27a1779e0363b94bffa147a7212fd8ac7ac0f2162a321c67272940dbf500f480c1b1cccf70ab8d9fb29a484efe911c166eb1b4773d6020a06b1974ab3b8a332c SHA512 20f645887f4f2568b36355dd5f8d2b6f9b8e1a270d7d80e726e5486dc110c87860efbf5f480b3995a0741d06dbcd652e314a815d0151904b87888c9b0094c14a
-DIST firefox-64.0-br.xpi 479238 BLAKE2B 5cbc092ac7bb58ff0d9233f8b17fc7b4d9276572e4fb461fe42dcf5462deb6c7a2e3e31049e4a87a4db052bb2d9e4241b35aa68b71c87aece331807e57c16c56 SHA512 c8240713bf3a79a8bd6cf11601872e1e0755a2e1d07f9ed235fe26dabb87747179002bac684500626947392d64757c2d4e0134c07971b36c96e8f9985ef3121d
-DIST firefox-64.0-bs.xpi 471750 BLAKE2B 01b4470171b14d7d570bad654be3b80234c8402b66b1445506aa3e7b6c85e15065160a7a1823560b2e2adcd8b425706ba5c273b51fb660c28f5864bdb11d5787 SHA512 371dba41310697c1c3dae1df89a863778430804f3a41c0a6be1f4e238bda952f0889ef108e72d5f29412a3bc35e055f67b17023e226da68ffd7b8d24976ebee3
-DIST firefox-64.0-ca.xpi 469698 BLAKE2B 51917f09b4c3b3707cb102a08e1dd1cdb93fd122683b947c383316b585f413ab120134b314401c9ed59e96396326b207ed30c699876ca0b4c22df1054678e1fb SHA512 be2fd7059f60c77d8dfc838c22d3055590cd2ebd7042f06a67ed3ec65552f45f29cfa805a7d9825d61028080897028b5b5da85c3d9dc05cd396ba102fbf901dc
-DIST firefox-64.0-cs.xpi 494715 BLAKE2B 72b2a39ad5a305500b89f532dd4fa3bdc0fd4df4509052636fa82f0e9e062476cd4823f61db8647a7d20d19fb815d2fa4f44dcb3206b99e080832273e854a3bf SHA512 8f21a1741ad1244cac7dc63992f2d37ee1f07824f758e8353c33d92c965b3fe63efa932ea8a1fb8d506952c015a11059d7fe1ca2987c9f89496bb1a5d9498695
-DIST firefox-64.0-cy.xpi 484374 BLAKE2B dfba4c6edae1d32c6fc93719e1554b631812c229afb5145fb948722848e20f756322bae215e365b3b5080797dff1746b3e552e72ce492a167230c686a0ce12eb SHA512 e96eba4ce9b318b019d29dd281724302a8c7f5533820d90750a4599cf848a852f3dd4fb01ec1cf2085e44707a207a56936048151eef2612e73ee2951bb5b6186
-DIST firefox-64.0-da.xpi 486848 BLAKE2B 15848d17d0c2cb564c344eb655ba7ae846a2cbf2dc2a8bf38fe14c3ae712b472fa3849bddb6c5c32fa9f81bcb370d371f1ddf49b1a3eb1c2ff48674411483cef SHA512 89e989f835017290e964e93e13929b931b1ee7da13c95b7fafb233b3f3856ddcfc4c970e572ae19c9a6965718489cd6dacd0f04b092d1d6637c1735675c732a5
-DIST firefox-64.0-de.xpi 494533 BLAKE2B 32dceb76018daa30ef21b42e76dc03cd85c4a7ac88aa2c28ca6e94cc465835580f1962d1b20e787a3d66958c916104b683415047645a650963f0e79d006e540f SHA512 4044a24fe51d2a60c61239dcd5f610141d466effbe1641d8b5fd59e89fbb4554e2196d96456291529af9ea2c89abeec9909cdd5539f7146eee1ff92a5fcffa3d
-DIST firefox-64.0-el.xpi 558813 BLAKE2B 0d64d0d8874d1ebeff25cdd7f23112ab13a06e3ee0a778ef848d8bc833ce9ac094ca8fba544709660b84fcd76965946d9581a032b1ef3734e9e177e1cb6d8a27 SHA512 3b56a20809a26546f880b186e9e7c6034207e42e87ec0b40825f1c78beb2be6496a2fbe21777ff4dd4cd143f2d4ed8f953cebe5afb9028a81dfb18a62718423b
-DIST firefox-64.0-en-GB.xpi 440963 BLAKE2B b5083b174c63778258ac1825a524f3eb47b20a56c4442bef485c8fa5e6801d2cc868fd59d4c3b9668e2fb9624d16b581863f94abd8c9603fd3392f4883a5823f SHA512 293af6a535dd9498c93cf1b2cb7c2fe9e531cc1626e07d64f00f283ec98071650d9c6036e03e8e0fe9aebdc29329fc895ea70fab32892194c78e154649a34acb
-DIST firefox-64.0-en-ZA.xpi 424501 BLAKE2B 5c25e2df786cb4cfe425db34ef6cf50d41bc4bddb38c6f85f3cac2726f4f7f9e0a82193122668933a59e8479d5abb5c670c9bb00ed93cf2bd7074709662c6f42 SHA512 eefcdbffb3955a63c71413b71454709dccf31433dd641933c29101855ee81f50d654daa5eae37ab6fe8151ad57c4db287f6da3be9350eb616b977dac63902e57
-DIST firefox-64.0-eo.xpi 482461 BLAKE2B e7cbece4c14bd8e27d39fe68acfc05c4072e5bccc77a662d90922f904bdb87246cde202d67e4810edd8cf2f55045af544b074b6da27e9a8c2e8a601bba8d1764 SHA512 d1b755453a18218aef2c1dc7ec8001a01887c4b2bfbed2bb179d0afcf0cb67adbc7bc5a79ebc34f17241143c4009079fb34000cab4afd6b8c568b4c197da16bf
-DIST firefox-64.0-es-AR.xpi 490544 BLAKE2B 4129ff6a6e637543848f2a8c3bf29870660539f2ade841d59a80b5bc82d21b35990b818c78e37f5dab4601f46c672c52448deebb47f7c2fa3f5d8b784809e7a3 SHA512 33df4e4356202f4643638f88b81af4d832f17d37d9391725855b67d7fe3bec0eb77ca16d88bc64b1deb82e06331f4e671b6ea8ff0c47342a431e5332ceaa5598
-DIST firefox-64.0-es-CL.xpi 490254 BLAKE2B 8b9ee908ff38c08cfe422a0cc47a69b5eb322175d926d890fc30947916c706a087cc6920ade8ffa3abf589d0aa99efa469255a2aa00282861619a9bc39479b0f SHA512 cb151c98862ca173eec1af76b81e7413340711618dfd8417f19f13bc57d13dd65e161ca53d5ccc2b9f92cf5c9ef57fdc442836bdd248ca6ab0745cec73a869d8
-DIST firefox-64.0-es-ES.xpi 437807 BLAKE2B e5ffd1c5da006a95ec90e72ffdd886293706c495d4f9d596ea1c33161f21e0beecedfdd598dcd9d1680f8593b5e858f4f48b6b57f0c92d7d74ff7244cb8af581 SHA512 9a8886e2cff3d9c1365a0c0697f9a85fcae16aeeba3756197e5b877c13352933f2bb50dd35cc0c14089ecd0681ab5c3f71e27854e9e13c28e964ad6992b8a680
-DIST firefox-64.0-es-MX.xpi 493155 BLAKE2B c70daf59c83479253aaa3f1a851217ad200283c503d66554d7830ac750cf72fea8f9c0f1c0b99000a9a936b083df49aadb70a608736d5c456f903cb40d5928fc SHA512 06593939ddd0bb8efe8ed46646df8eea1e1786ec4a4227e0aa8fc697d075191a15c744dcee220202a3b12e2a698f533190d5d5ed40360654052c85936880fe01
-DIST firefox-64.0-et.xpi 473517 BLAKE2B edfa8adf30886515185fdff769d0379aabffc4017c3b6ea5fe67a48fcc705c9aeaacb9886933990f699b625957b27ccf24dafd01dddafdc4335a913d80ba31a4 SHA512 fd46ce33e89963bdf4598846800aef4a095a64c065078778c28e637f72aa5c3e3887244ecf2cb65c51b4ca593c41023277265629eeaec58a5eb3b6303fcf5998
-DIST firefox-64.0-eu.xpi 477302 BLAKE2B 645e44da345ed52f7d2b9a52863b25a894f13b8cc314abed37422781d0d00bd41882d096869984aee4b11762f009eb41d62a1a7fbefdbec11135af82484fd3de SHA512 491ce788a61b8b9fd4c0fb2c3bdd3d43fec011fb5aee37f26a626eb1fb062e71db68e2435f6708cb2b903f76b90cb0ef4f1a5558076fe2de718a4d10841ff212
-DIST firefox-64.0-fa.xpi 529978 BLAKE2B 60ffd6e3e5c883e2fb4168d17abbbdb46ebe5b46fbda9a94a888af30e83185027f33683d961d74aef6754f3d0fee1ac968794be0688fc51cabf2c1554f5ed8bf SHA512 07706380080c1b87ee0913235f687f5a82fbf3556871f982398dc27295830c87e2c19b2102abe64342649fecf99ca5e136b162c1e9c9da816c4c0b70f731e42c
-DIST firefox-64.0-fi.xpi 470566 BLAKE2B 9ac746b1195d56c3ed31990ad52665569c3ee621e8a2ea19866081c4a87e27b8080b5c5b92245b6f083461ca2a911b05326bc9160e2acc5f12ecd052d2514b4d SHA512 794407963241b3f7ead82cb54c8548c95184f665934883acc9afe98d77ebbb16d93ba34dae901264a1c2c27b80675d5d1e2bb8552f5d07bd8cfaa6680c93808c
-DIST firefox-64.0-fr.xpi 499969 BLAKE2B ad6b1fe17596e7b3aeaa7221379c5c37051bfec0afbb305b78001d68d6b9a460c8a51b077044c53f85b8c4c3633ede91f9c5ca3b271871fb03569093ea88b159 SHA512 872d6d4a1f497ec052f7be58b124b655bb5f5e0dc370493c0550dfb90aaf980426d35b21091f6aadeb40e4616088ff29d7aed0f37d0636c4bcfa6a1b4508727a
-DIST firefox-64.0-fy-NL.xpi 488309 BLAKE2B 472a5a4c08e3a4a9861d638f7ffb01454ab197bc2563210e53b8b78e8e11f424ca1c6dc8d1667a735aaa8cc2099945f5a643652827d2ce4aa82dbf4cb8e02fe4 SHA512 41adae8d1154182e02274841103bd0da6801d45492ae0989caa3ae785183d120a053fbd7074ec6c373accab3cca2fe8a1aaa11705f3b25e3fd4a74eb0122c93c
-DIST firefox-64.0-ga-IE.xpi 474811 BLAKE2B 817b58e467ad034843e8af7318fab3a70e70d581df6304d2010d496c2d13cf01d8b98c01c791dd8df971a7ad3d1a234f2f33970d09e0af9cd43ba84e99cef120 SHA512 244f985db42474224f8cce37578de6c8f8be0ed1167084afc1eb1f68d6426780646fd7925dc4735acaaf903e0ff81842fda248862bfe2d6c0d7909ad786c450d
-DIST firefox-64.0-gd.xpi 491207 BLAKE2B c9497238a9454afd2c1b93b633c3c9c3745c8c6981490e4c7145aab6eb90b0d7c39ae6d2aed180ba47fdb17b4ad78aa0f977f4b70d04590ed371938a2f3e4b40 SHA512 3dcdc572aa250042b55978c39a4cc22fc12666b76748f57e0e340447bf5f0fa1d39acea1c3175cdd12708093ed70a0199e38df15185debfba1f35b3e8c39ca84
-DIST firefox-64.0-gl.xpi 467033 BLAKE2B 12545707ce31d25662a7dbbf0608fc0bf25ccf0dce0d21115b613750475f0147cee6430600815788fd1f581e11a9aa0e61c7512cd87a97ac859b6aea45b6d3dd SHA512 e3780ba92d786d804322eff9499ae800337caa9a9da6d3f7a6f735432c2cdf83d98ae20960513e1e330371ff62f0532f68c0ed8bb3dcc2c771e081b04250ed1c
-DIST firefox-64.0-gu-IN.xpi 559365 BLAKE2B fe32fd7610971406d4f7d15ed71d7ff0471eb83f804eba7857fc286918d0a8ab1b6fec3f743a6bae2aeaa47798c7696a373b8ae17eb7ff6112817680c05cab37 SHA512 6ba13cbe3902d488b45c253971974aceb0caddcbb660c9265c428ea0e959834bb53af8c8610cff50ce82a83b572f5d60a8f113050e08e3e280b0beac816f3587
-DIST firefox-64.0-he.xpi 485009 BLAKE2B c092a4dfc36706c2aafd9b574cc6f5b677934d0043ab836bea50a6b03b17bc1218875e821b4b98f1f983cdb34e30f183ea983d5adffcbdfe9a9642de7f18eace SHA512 67248b20ee38d30dcb6d714c72cbd7ad4038fc324721be2d4119204e7726353c4ed1949bb5f528310760d84e987186a20e2c7645d692778ea870811bc7170f4e
-DIST firefox-64.0-hi-IN.xpi 544055 BLAKE2B 2775a05a74341f44ef4b331c14004d599d19d01bb534713317fd1993a7dd02e33db3eb1fd74892438a4ef71c0e40755b45b97330ba399b4bdd5781cbf8101487 SHA512 341766e30d97a47c53b7abfb615eefea6a5e639f4d9e9746730449a2dd65d23919ef448ddf60e2935a5e61577b838c376e58e4788eb68b5e01f427765688a981
-DIST firefox-64.0-hr.xpi 464599 BLAKE2B aa2b19c80d4701fa737660d3b74328a5ecdb2c8d87dcd2b295a41e484de08d2af55db99aafbed2d7a8e1b4eb4bda2a96154ac3577f586ae90e99c89a00e5ed86 SHA512 1843029a4e407d0bb6a0f689ddaca88bfb997c47d03eb0558373c08b95308930b4828e3a273cb173d803fa44f637a2b50af91451012e3cc20880be03a0787fe6
-DIST firefox-64.0-hsb.xpi 503924 BLAKE2B 602fcaf345e32a071949b9f9fb66b19c81e3fce7947dc70cebec727a0feaa0b741787b315837a51654c005a7de71829e59c82e58812b2724962ac2b0eb2947dc SHA512 82972a8a5d5ba6cb129a6c721740bc97eae271518074327938d26f43f5fd2a36de36bc22e8c373ff446f81ff1f3c069c59a45d1553537c8de938b74e4a6b4647
-DIST firefox-64.0-hu.xpi 501529 BLAKE2B b15bdb8fbc8b8cba6a7316247f9ce6c6c197f3eb79b976b45e357b0ba665e21d134c5777bcb9c95f4ee33683551e07f8bf440f30f197ea9e3b4ea5df7c82e9bb SHA512 59870fbb649b62fcd870fa6483204bf62d20657854838c37f101b5b9326a3e92f423355534d5e096a1b0534da0fb91b0493872296a19e21f6b24d7a19920b990
-DIST firefox-64.0-hy-AM.xpi 520935 BLAKE2B c3b6bea5208b73f672a0cbd7f3e7e5692f9bb41f09b1ae1c37bb7292fe0d557d817bbbed689270985e71426af3f6b55180165aaf6f4ce2cbce7bb2060f304f6a SHA512 54378b1d2b5adf2c1244016bd445c37a5f6110d7af728b4e8a07d306519c63242e39d57ea473feddf8a71d92341539493ad1dabfbffa3559344e2744813605fa
-DIST firefox-64.0-id.xpi 471524 BLAKE2B 3f5d7ed32a47f0152a192868bbda2f3f77fcbf42cca0c0fa0f0dadf5f197d57a330d3713ea3421c155bb72754908f6b8ac471529e934de7d1adac2617e87bd41 SHA512 068f6f5af65af2ad9fc3b5d7668795cc3a173496cd7e4d4fa49420ba279cb0dea70ce1b16c07ad66b49152efb539e64731068276711043a4b3809f57e8878bef
-DIST firefox-64.0-is.xpi 469900 BLAKE2B 06fcdb1683ab7d6508b7d01735b597c2796d406fca5ffc5e37cffac637af9353eb7f01f3ebe565cccebcaac34bea1f793f45ba305a017cba4b0380f9e24fe62e SHA512 5159faebe2f2b13c5169d2c678047b32285a97869e4b5b289490369cc267f5c9a9b7788aaed9367693013313e78e6314036772f7b16fb0ed30d85f917182cd03
-DIST firefox-64.0-it.xpi 355574 BLAKE2B 32719687f24c50054ee28163119c04ee0a794886f55f89217b5d325ef0ca6816e65f341c9ad649ec7e3b9b9b21f97ad9d24c8ab202774138551cf7702e93235e SHA512 5291cb75768b66228fd78898d67ed66824e1d9e430e6a34ca33b854262f845f84971306351e320008fb32f3aa911a9661c5411806e584fd9a9b29378d7c388f6
-DIST firefox-64.0-ja.xpi 506350 BLAKE2B 8f042327fdd09e47158d35a703936e900a62ccc2dbb4f3e5eb26ca7b330435fbc5acfb0f60beb5616b9ac86ab62ea013cfafb9e72e70fe3fcf1433101171f37f SHA512 8d318d43a1656a516a001c0c981c06fd4a97273f7c320f522377fa37f9269d7c16abebcf6e25fb605bd0c1e26bb43879d71bbe761f036a5dc8fdbe125f3203b5
-DIST firefox-64.0-kk.xpi 550177 BLAKE2B 62377ddf04a5d9b019ad90e4ef1d867315d3ffee88a605fe0b2ceca3581d40bafb50af76ea1e29fe5010d3a67f7b79159c8cc0694fd4ae8771fe3217ac5e3af1 SHA512 c36207d9ffa7d528f41c12b24b6f025b8ba5a91d3337a407c81aadc69d2be8fd14179d731cc6ecfc851f05d170d77280e4b32eca72887f887747adfa4a6b3cbe
-DIST firefox-64.0-km.xpi 535433 BLAKE2B 4e13a503ebf2e41a6347318759a47b699dae1b9f677b30cfaf117755e8a8055ceb24deb32c7c61fa60828d3b7baff35c2af5c24522f5aa9d63ebb48da1e6e3db SHA512 d644d98036e7bf91c231d8e50c90d00600e9e10974e1ec216f5162f50841f55d6b890545515665b564bcdb8e5df8e07657b3155c21d2713b5416081391757e27
-DIST firefox-64.0-kn.xpi 538349 BLAKE2B ac17f0c1c2aeaba2c58e71683d74293f47e58df685f1caf770c9934b858a1c21c46e15ed91e6b4019b4a5686513e8d384647edb807b322be43e534e312df2271 SHA512 3121c4c28a33c52f01e6696f2e381616a7d674a9b811cd90f867cf9d51746f9693dd51bd887940095c441957abd0d0072896d3430b208ca5fd9a14692ee4412b
-DIST firefox-64.0-ko.xpi 500867 BLAKE2B 98c9c4f09c65f9461fc2639c91dcf563bdc91c250cd7a2cd8e04ad7ae6002ffb595630e7d5250c2808b382865d26f2b2637706e42ea29f639df10a1cd261944d SHA512 b284bd046571badc703bb74721d0dc45dad963f12b0715916b39f7fc90df031f7b70794bcb45dccd23ee3d877c3ba3851dfa00729f746842d56d243bf91130e2
-DIST firefox-64.0-lt.xpi 504607 BLAKE2B 0c4b3026c1de2859961e66e2a9ed90213c80b88b2139d495005345210f03d4bb1da05c4949ac578fce5f57565c9f7be54462e60837116163f83b59bbb68c7c88 SHA512 84869387c07054010f0d92648cfd292c065b54fd005b37aa4891706f158efa5de10f5997508ff8305339fc75478d2769a5a65869fa6b2c6755b2639fac01aef2
-DIST firefox-64.0-lv.xpi 490763 BLAKE2B e1aca5047cedcf262f51aeed93ba9689843136d1a50351fd0ae6b85d0f2a9dd90427724b3762d173a201e967f26db59861792dc391f0cb9687a45e4c54ff3042 SHA512 ccca4b1412bbeddfec59ce578908e745364b310e12971a6a36a15d2852968127c2dc7808cb84d4f8e082721d8846d1cf37c1e6c98f848021914815f32eaa3dbb
-DIST firefox-64.0-mai.xpi 496190 BLAKE2B a037e69186eb105aaaa829d0f1de616773264923cd3aae863b1dfb04eda04cf94dd73373587de4d7429d8f366d3e02032cc850a6af30712da520f0a7eec9a189 SHA512 fa73ea11981d35dcb05deecfce2a71308bcaa036ff9126b4f75cfe615ad2cd539843cb3823464b41cbf70350e17cd2c0e30e74b3186c7ac4620ed4a4401a8057
-DIST firefox-64.0-mk.xpi 457991 BLAKE2B 7ce4046a0dad5b1d60f62b86de33c198e9efc2791dc00fe185d4dab24779420b321e2eae00be9b79e5ddfe6e21723871d32d7f8377fb99f5b56f6e709e9e2f1b SHA512 d4c74b95dc39718f3a980ab6f0df9b3f3baf04e72174ac6ab5d7d644980844d742f8907dbaf10aa8b6efc7ddc63b1ed138b72e8554a149c175a6dd3e6bf63853
-DIST firefox-64.0-ml.xpi 542325 BLAKE2B 1e4f86f36fceb3ae7092a7f46abc3770ceddd18cdde1bdabd6c6c5d2ad161293cfeba9ebe91e344cb04d25f54d338f92fa3002863c522096ecf613ef947264f9 SHA512 a147d20d7ccfad09c7d69c3bcf1463e28918e572975920b4af687b248ae8bf120bfa7f89320d260d19415841ea0ac6fc172c9a9c7162bf4ff4b2851d60da73ca
-DIST firefox-64.0-mr.xpi 540017 BLAKE2B 4966bba7e786fa12f2318c5697d94eb219c73094976fb93c452cf0eb03225b676e3cbfa3034abf27c4588c27c2f1999232e71e0baa7d47c2039629fab5987b4d SHA512 40aa5a4b3eea5f6a55c4aed9090170ac0dc0fe21357838dbba9ff43a52e91685168e5db93a2d51cc094f18aebc557a84e268cc7cf35886b71ff477ebdfc436c0
-DIST firefox-64.0-ms.xpi 473931 BLAKE2B ab19388c9c94fcbd34c272050bc696f838fcabb974f455cb432017d4fa6490f8e2154175df7249e25d5f0c94c89860e98077e453454e26a92e8b87d007d83756 SHA512 89952e654f72fec1b34373cda6f256eeb41f2d7a55251c26dfb77c1933711cf21e8a1bd5ee505367c6c879d2a89538d9e1a38728e606c0bdff1a71179eb1c8f4
-DIST firefox-64.0-nb-NO.xpi 473416 BLAKE2B e6630d3afc90b2ae2bb917a3e94d5d891ec38cbdfc1e963241fd39a977dd366dac742e64694a8515370a52add594d6f6a7c38c1bbb3ec1a5cafb8747641d0e23 SHA512 b55abe5cadd42e526b6afbaf7b1c6b57ac94bf88bfe65d13de66b3d0d860954a6985441daee323c1c7e5656976bb684d3bc8f1d33917fe322eaa7174ebdc173f
-DIST firefox-64.0-nl.xpi 465178 BLAKE2B cf07dd6f7fcc0bf81f0f62d1986320cfad7e32b3afac8787d7d8355c42d676eb980fa9c873a6968d5c05f83ac87113786738c4ce9bf733b5fd73610a6dce3415 SHA512 11b4e72078de0e2b2a526ce07cc264aa5b0c7a52da38b06cba8f6ca294555d1d8fc08227b90828071115e9ee4a524bb5623c505da5d4487d906359833e2316d8
-DIST firefox-64.0-nn-NO.xpi 472041 BLAKE2B 6c53f486abda7da1b88d912b1d8083d8e14becc9bd46b166f895b7b4c7198697beadbc35d318e1341fda0684f4f2a5390775eaa2f4e2e654d496d59c333eef96 SHA512 497912e32fbd3474b465e1ade4d212b9d5931a763098abc2bd6fe12c1bc1ea637f94a1359dd26c32cb37744804ae33f65146a11169ae22dcdf478d763c2ec9d9
-DIST firefox-64.0-or.xpi 485454 BLAKE2B 7affb8801a940dc857e33651a2ad9635fc3ba3e4e6bb6bce8958d568d5dd14a2a01ffb0e65ecf81a6a276c9236a9040a559058b106e664c461fcb4eb5ec30cea SHA512 141900450af96845b532b7cfc6699b34f32c1c97dbeb556b7555aee64ee3661ed7a38db306d1fc3cf25d077e36fa5e68d6ccb5a10b853e600ffce742eabbae86
-DIST firefox-64.0-pa-IN.xpi 505897 BLAKE2B 6a47923148053443ce00148f75c9ba1ed368d2cb683161053eddaaa87752e6e42496e3a2887ed538643ccbd7a731e2c50852405068c283e8c026a4ed3dcc338e SHA512 c0b5124c2a937b570a19f998b32abfead2a5ab1630db79525efc6772a25699a28bc0697dfa0d8453ee521d0a637c4071f737aeb26f8d849a73a87aabd0d5c489
-DIST firefox-64.0-pl.xpi 383257 BLAKE2B 6a200b5c72870f7b65d8606276e80fbb6c7c8f4355674ce7ccff194229c16109066ee415eb9e43fd44bccc62e68176fa4944d992a4f1f90370ffde4798c550b2 SHA512 e8bb7b07b8d66bf21f9d5e7a7f5b2bc15af9dbc909f0e7b11f1c80f76f3bca1df9e526758e3158d99d2f862ed38a3def76913dfa526a8011e64dd096322bedec
-DIST firefox-64.0-pt-BR.xpi 475690 BLAKE2B be037be0ad8a22758a03b03561879c49e61451ebae71192e3728c39c38cf936be9f3b22db6bb1c019dbacf986cff7cfc99917ac46f47723be1a8f1d839f529a8 SHA512 abb3479e90d25ff875e36faa8a4545c5360a2748cb891110c83b1688cc43170a8c86534088d5d1ac64f6eaf608970d72ed20675935b0d3783e5c487936d7e194
-DIST firefox-64.0-pt-PT.xpi 488741 BLAKE2B 659ed63099ec95c6010598b7370a61e272ee6ea60db32b9fe721e3a19e66edaa36a4eb5d9790f47118b8d19972118b9a71383f9fd3c89bc4c9c76401bc715925 SHA512 083a110dfeff4d47bbbf84b90616c226b5c6e97a3a860c51492c051d68a36494c3434bfc33102900605d7e2dd80d20047719326dd1c0ad5004de0aa9afd08845
-DIST firefox-64.0-rm.xpi 478596 BLAKE2B 2431ed20b1986afee58b04860668450337f341c4da53e683198e8c815e6ec382690ab4cfba0bce9d3f22266b4f0773ff73f09caa20e91e359a9ced805958e177 SHA512 20ecc6c845516dbfc35a8b4b4b94e114cd2a521c788ce898ebbd05b6e73df6c906d4df12973636287da151f0086375274d542c79f2853f43cff1e34af1e16ace
-DIST firefox-64.0-ro.xpi 479967 BLAKE2B 6656d85346ff6b2d5d73e0da42f41e6d9faeee731f0340f2cc494c98656ef9eda80a355d164fb003de87dab8457e984087b3261121083255bea64d6dbd19ef8f SHA512 50af00414942bde7992ee670921c88dcbdae1c65109c2bec155c974e77838ce36f921f701a480a8d637d78164877fdd32abc9926371455e92cddf49376a4f18c
-DIST firefox-64.0-ru.xpi 546345 BLAKE2B 88491e9fc168d63984f671da266afef0b2bfd4aab4c15966f4bb022d48e9921f8e96fb74be8de47ab9ae9afd5be002f78cfb845d0517211744dc3df02b1cfe91 SHA512 2b34d767241d44090de2588c924342a92b3edd7d5de328a29a4c5b7f3f8961ccc7d445f332d90694a99466798b6e17d7d8cce8456a06d2d9f61d441abc2ba09c
-DIST firefox-64.0-si.xpi 489556 BLAKE2B a9add778ab65a0866f7cf27a0bcb753683ef98f148cedbd69f6b0d41163c999fb35bb822920384692c1df34e4cc20026ca89dad5086388b112c4122337e04174 SHA512 7968ed8044415bc16bf173a933865c279672b3ae9ee6187f528e0494cca42ab1e3e175398b48ae852fd19807464d88fcd9d9515c0f56fef31b0ba31528e3812d
-DIST firefox-64.0-sk.xpi 504064 BLAKE2B 432efa9815718c532f7a088bda7a25cbc1d48ef379b2973c21cc8b0878497d3975aa1a2c4302874c751075d9b29266757d9edce8ecc8a783219c9b53df029a41 SHA512 b5857383f7b89994e86faaa07d1b790a9c6bf3aeb2b3359b83e91c65e37ac15ff58b905ce2479aa017277a3c14a9d7e73a909e33806697a9ff1f7042726f9acc
-DIST firefox-64.0-sl.xpi 484982 BLAKE2B c3d2065c949cb3e8651272c06620a70ec7bbb3d52752496bcd0a00a30b4060bd9f453ccb42d4416db5f196ad68be028d2ab038a352da240549793b6f1530d9af SHA512 28a089e2724fee8cdab67e369d78b1c2b84c35364242bb1111d2953dc4644f607176ea9d299df1d4aef0ee37c0915273c9af5c8bb3623f20ba074c877aa91eee
-DIST firefox-64.0-son.xpi 448995 BLAKE2B 38a24c3e0596a7d0abbfcb918388cee31399af8262a9dab2cb1f177e758ac48c5540847126b8cb08c54e4826329ce98013e5cbd7d325c5e9e704838a60d3bbd7 SHA512 9ab418a29c8aaa6252f7f9bb46d80f5c4ed292d04d9431b2007c57a462c85a1a7bb07c88b33351b868e227183fdaa8f455997296beb31e5d212a25e85cea8214
-DIST firefox-64.0-sq.xpi 492688 BLAKE2B e8e91dabb90998bb7b8e330083b1dfaf0cbc258a355460df115a43c6cc03d8d2af717d54f689a9c2f42c174515911b0c16b0753b4374dfddab4cef1503a50407 SHA512 486f370df3f3aec8ce1b4a9fc8a0067a44f19dbb698833b13f3586fa39004f411cb7acdf7b728a7b4fad1a6e098eac1e9a57ae31c919b88399169e820122b3f0
-DIST firefox-64.0-sr.xpi 506359 BLAKE2B 47839390375ec396647c38c54e1daee25f9452f7c7b921f11d7ac21ba50d9196feef952c6fd500347fffff09856b7d466912b0a67d928f31a3dc2aca26986199 SHA512 7da8b77210ccff9cb6ccddaba607239613f41c3e1f53b189cf9660d0f69b3168b9269fad2e2015ee7ac9514583011f8db073dcfba459fee550be8a29d2c89201
-DIST firefox-64.0-sv-SE.xpi 484134 BLAKE2B 8715eda45da08ce8df5694e1f3e7c034f68b7cc1910577d4a9253ccc919d8e30853877961ca81157d89bcee5b80882b5b348d729dbd5e1ebe02600a37c92ac24 SHA512 46239fe5bd38090c8410827b63a03de90b782cf49e937bac786ed3b92ca15744f97835eeb1e27a3963137553a1f63cbf885a6ce5a8d1da318eb832b0efee64fb
-DIST firefox-64.0-ta.xpi 530867 BLAKE2B 0d6cb98dffbfd06ac4cc5147834591723290fd8cf1fb8a0511fe20f4472a2dc6d9ef10a99c7abdf3449fb419dd731b94e0dbdf2c19061000b3e729c442b73b9f SHA512 ddae42648a7d9c1e5dfcd81c78f9da95827fc38c60ad74caa944da01a6d7467374a70777a47c0955cf9545a5330b6ec0a22fa6e6749a1d9093a681b0a3c62020
-DIST firefox-64.0-te.xpi 547595 BLAKE2B ee893de084038b2cb20177f358b5734fd97f1f7168a79fd259c97216924906aff2a8b07f356b948e5b047ba1eadd542258cc18f1f775d966e6bdbdd21e17d321 SHA512 3c62f23f537738399e87f6d4989bf92772f923efac91d2080e6e0264a190e66b094c396f638dd8535c5fcf25f1f5e4760985f4b84557abf127170249f844d213
-DIST firefox-64.0-th.xpi 508198 BLAKE2B dcc6d91eb459618af36e6ee3470f1972886076e440cfd0225c4f85d2bf68f7a079274ae9a2f2313b952983f1feae84739eafe031229ac5cf82e5e4a1c46cb82c SHA512 d7b090581cc28584844363a366d3fd0189028e174473030d7d55d831797c4ceeef11c5b51f66fcfab08111f069026718308858e94521714421c7526dfe33f1ce
-DIST firefox-64.0-tr.xpi 494709 BLAKE2B b5d36138b6e374d337580e809d12f702b5612888412772326dfde066b83b265b54abb32ae86ac7e7389b0432e06785571e7d01a182e16e04b84003bf4884375e SHA512 c925ce80c72b82820999c1969099ea06d5aa7b8b67fe6d96b395e79332e46689c149f8cc29f706f5dd526141b1e390ccddf656ef345a4593119558091473c29c
-DIST firefox-64.0-uk.xpi 520997 BLAKE2B fa069fbe58cd0ea1efd4389081bc22d3d111bfdcaafdfd2c1465388ab81ccb89a90391e87ca157f2d4c79317616c8c35c8fdc2fac29a6ee3213428594b63647a SHA512 4eb3fcbbe10040344ba4e127943c346420c52bbdcb1352a8809cabc2c8beac23ff872bec9e869dc55b7900f81fb5f83fc6a442e34b0f7c0b2ce4daae7adab745
-DIST firefox-64.0-uz.xpi 466671 BLAKE2B 344f623cc178581f8d51361c1c3ee184f250fd19493f4679838672d49e77ea6042247e25101213995dd9670e8c82bd23b4597076be5c36b303064bc0ebbfae78 SHA512 9830a61190501d435d50981d834f56cea99bb881787c44d1540b603ba70f00fdd75080194c8f996fa4158a190b35b2169f5fb4c2acba0d1d5c6b82c19e03a160
-DIST firefox-64.0-vi.xpi 488332 BLAKE2B 5eb675b124f8bc64bba5817c9c5c02155ebcf203a07335b3b522928e8bb7a49bf78b2e8c57a573337d249bbc105b6db843302291fd7f2057cdc6a41c3d1d9d36 SHA512 47417565cdf0310fbe861304e513d7b089c7a79ef1b1b78859353175119872114cf1584c23d4135991ddafda73b65164547360c41fa322a65a58064374fe5b82
-DIST firefox-64.0-xh.xpi 463285 BLAKE2B abe118f87e563d24e9e519d7888eae866779f03d31c604a1477ff2b6e45435ab4f2d201f508a0a2d0657583d78bde95f9c9921c43e82b9865ea201a9a224920b SHA512 cdf658a129a95a9df75ec83551fbc2fc6fa1dff9d12764f87681c4a0712dc7bc7e33bd2ca507a61bd2734705752d5528ac48ef0d7f2a6120fb45ba70b2143ce4
-DIST firefox-64.0-zh-CN.xpi 507516 BLAKE2B 3e667830b842e726b5b738e6f8fa4b8870ef4d7a903d872d662111c8cbe0a3fea7248699330858e6d2910ca2f90607788fe5d37492abfa9a3abfa3b8d3cbc6be SHA512 d61781454df7d57a621a86656c4d183a84c0f95c29fa4702a5acf4546a1e8a49bdf7a666c39f1d1b235e0df38fe3533d3ef6abf7e1bfe9a6034b2b28f08dc40d
-DIST firefox-64.0-zh-TW.xpi 510618 BLAKE2B 937c12fbd9ea18e7cb39e60cc57ff66a70398e71de5cce6804df1f8c6db23039f28e5b88e28f0d478fa22f752c0680381f50245d2710016d964750e7730040fc SHA512 7fc9bf0dfd31e52b8f685ed8e4dd37f10ccbf49456fb7c834cf15fc5b4e5301bd34567af3db27e55a16ec3efdbd0fe208426701e11adc8d3d54db29ad88a719e
+DIST firefox-64.0.2-ach.xpi 455471 BLAKE2B 9d39f120607a90bb805f101782e0b1dbfe308575522d5b170a239cdcd80d23c64e6118b329d514d157893d3b66256b5694eb5ab9e8fb4791f33ddc04dde9e472 SHA512 c1fa855cbe6e3e4c9d13808ae63d7289c4b8724e9b9457db2187134cd3f723f8954bf51d7a30a90a95b402dd803cd8d3c4288084227ee329cf5a898047a67561
+DIST firefox-64.0.2-af.xpi 431980 BLAKE2B 2f8dd4e228489efb651e567f80167f54e073bcc9aff0c3873126e271b37255cf05aa2bb31c7966d4a1b15ac44ea18062166472e7963a2e809e171fa84f67a339 SHA512 b9f0aeb5c68c11fad8f6e1d5d841c7019f45bffdf04a24eda89563265d21142777ff307c3b4e37ed06bb976d8630d563092322cdb3db991d4ac86dde983cd57b
+DIST firefox-64.0.2-an.xpi 473572 BLAKE2B 08fcc57964845578f994b4a7ff09356fec0803a07900bd6f49d81b498802b571d8297226b85f894b98b036a152512baf20eb5c67862b75ea6de0980c2d412c47 SHA512 bfc4d5b6141c5d113fd870382604e0e898a11b8fd028ad82b01e58981afa09fe17559b9a86e71a090a38f8660897ae940d03ba65254a07ce9e19689350231a45
+DIST firefox-64.0.2-ar.xpi 513409 BLAKE2B c32be6a25c2abb4280772e1c785fa37c266b4d4e74a82140520cd85ce23b0c0d460acc8b399b941b8c89b930a34e3d3ca7a6f68446fddd828ca622a7c1f4d24f SHA512 21f380cbc5ae8d3b9d1e5441fb0526fc968569e216abd4e0c4254b49dadff08d9a784ca75a708fd01c3eb3125a858f6b5504894add6bae77d79f6797af769896
+DIST firefox-64.0.2-as.xpi 478302 BLAKE2B 0a28d26cb62d0b3ec30d139b2b8afe361940a7c5dcbacc29bbf374d6617da16c2cabe9a355e3e208adbcfe50e47dace832cf4a50c91cd35a8769360447ee2db2 SHA512 2763123762fd442e3ab8e179bd2db4c9601602047f048584dd64035ba96f0a7e49706451772664b3fee89666fce79fa04bb06f145042aa6f0aa205ea17891212
+DIST firefox-64.0.2-ast.xpi 461828 BLAKE2B b625ecf66785a584d6e44d1f8637c51d317305c3fae1847a25221fc5f472334c4dca8e1c0fc8fbc7dccc78b9990e1ddceaae01caac16b8f109d600fcd9a9dfad SHA512 8f222013041c68bd45ab5c6c7cfc331c3ca28375555522f9dee88fb10b06dbbfa733be48b7f081410a46e54ba2e46e2cd54af0659a345175183e4d8b1646ec83
+DIST firefox-64.0.2-az.xpi 490042 BLAKE2B d63c3ed05caf01035ee4ebfe362ec011917626cc4adcc307f1f5e216ad26f14b38f8923db38234f646e29a86828d4404146e3c676abec2a92a7213db785e5b46 SHA512 e9932b55f39c17b14b2e3be7ab7ef01400c7be494521c6656d1f7eb7792f16525a531a5d513c743457e6c4c24ac481be208f0fe88056d8eecf9fbd8a1aea764b
+DIST firefox-64.0.2-bg.xpi 523742 BLAKE2B 84472fec71d246ccd3f4353a5b208f2fced48d0ce19551038702210664c5528264f40b4ed4d5bfa6fd6ecd0efc568911e6ff52f19a4cfd28146e677dccd21185 SHA512 d9b57d7ffabfeb724e327333cf32874a0bf464115f4e7aee0aaf1aed7d5039bc71864938ec813c3a004e8adbc8e48cd35e4b8a5954cc5d2a06b5aa03a8d48856
+DIST firefox-64.0.2-bn-BD.xpi 541868 BLAKE2B 0288231239eadfb3881ba3a23e1ac587e188a45a4f1fbfb00c10d1f8a8d1c24209b296d095aa0ace67416c243bdb599ac6daee54e364356be271a12e10c6c0d0 SHA512 6bf14b98fcca00a5561533e97e15d7b68ef609ffe7d395c72ddd0ee0286c229c2923d5242328a22ffd716571b3055db5136942655546ec28f61abbbf4c1d101e
+DIST firefox-64.0.2-bn-IN.xpi 528988 BLAKE2B bf280e2a65a304b2d044968bc1ec7af1ed04cdda0bff9f16816d7ee63a7eaf9208ea7b0b7186403f043e90d015429d681cfee90af153b7cb719767641313b983 SHA512 74a563b6be9ae0252252e9e766a7dd23ea608588e8ebf10491b1d492214f2281755c86c952fe7b3da0f665e5bf25cc1e2a0bc73b0cc0d83fff42b5b20272dc50
+DIST firefox-64.0.2-br.xpi 479240 BLAKE2B ff5646ed5214758ac64529959be5eb8dc8e9c7275702efd60d28f241a6cb30c7ac0db35524b8e248ade8fa44faf57e00abc3788060df6a9729930911ee5d8317 SHA512 3150736ac2baff70ec7ef05c74fed51e50c1776b2b77e3a3a299358277ce406f7d042cd7ec629defc2c36cac0a1835c716afaebdf9d693ad5e32de987539989c
+DIST firefox-64.0.2-bs.xpi 471753 BLAKE2B b61b6723f1980e1d677f0e168f8e04d3f9c87d19107ed6fd8b98cddea861e38e873008b51a0f4c032a0994218a779e7e0d098a6748b23ca395e0176bcda3292f SHA512 3a65c87c7c9b9d8f7ff6b6d19c21cec8df79573da4d0ddc6b88da9240a3090a809a9296f4ae50d3551a0f75ece5ba829fe0f1bbff8462a728ba38bd1edf716f6
+DIST firefox-64.0.2-ca.xpi 469703 BLAKE2B 29238cf33531849d6525a6441bd2d72b8dd9a300028386d4ad2d029385987673053a54482fc31f1305e3dedb097fe68d27ddb3895b7cd76604f4b9e04af7052f SHA512 54e1a6b5c5640dfee5a2a8c8d27ccfef51d105b0c10dd360f0e6cd0ae09afcd0b3ccd7e6270ee8cc317d363016c452aec62fb139abb3d65946ee3eeef13f2716
+DIST firefox-64.0.2-cs.xpi 494716 BLAKE2B 519623d74f3e330ec4703c7fdb1a5d8292e373b90e0e403690025ec8272dd7291c71d414f75e35b410dd278b7c332149a2df04e47ac40b24e29bf30d50c05d5e SHA512 5a342a97c6b840797af33f411c06c0a0a58b0cd48538818558106b062b7a8d6d73a04d01ef4d2600c0aa462854db73943ea9dbe4aaa3d06b6479762d07679b04
+DIST firefox-64.0.2-cy.xpi 484374 BLAKE2B 761bb79afbc3403cb7b82b53922ba21c159557c8d47d84272ecccbd015b3031e1d4d595455f9c5323b336af601b7bc7d2e87271307be995e52efed5ba8d68452 SHA512 96df2ee443687acb091fbc4a421776ce2fcb8a4fe4bcd4fe02f05165ca5af0458147dbdd7ac9ca2b7a8767b00b414bd63f2a841d91c1febed3d5772052e100ea
+DIST firefox-64.0.2-da.xpi 486857 BLAKE2B 370d23536301ee76745dcb76d9e8a73f72b6f019e593ca609708a2b5315afc997b65281f50bee6ae4d6937ef359413bf4df6fb7e1d12f4e1f33d4bc372804d66 SHA512 55c6b4a67d29e51cddc0820dcc828d6b0b09ef1a2814dc6f0eea709c0e5e12ff468e47fcf752ceadb0d0f515a7c7542bf361536cb0ce4ca4ec7127f63db136d3
+DIST firefox-64.0.2-de.xpi 494534 BLAKE2B 161fbbc00a0b61c25c12c92736c26c1c9876a0907d55d44e7281c6306668811496f1d53fabaf4c8009c21dd69c765805a110f2e3026b09e717e0cb06a45ab9de SHA512 f29cf970321761600ddbd67f9815874be5eb6f27a793e9029a2c8cb23e5586bb5b390d193f4ca9a16090d36b29bac1a96e244f667d9d1c121994ed997e09cf27
+DIST firefox-64.0.2-el.xpi 558816 BLAKE2B 2f7637a4d51d6e2e6b8defb839013ee69a5d797ad1b970cdcfc59fcb5bbb54594babd9de32bc32f70f33f4f3461e6539d76db87efd117bdbc391bc933a5d80d1 SHA512 0fcaf1dda90261dc6af88261d07a41d56869a90342aaf9aa5b9870d012b4757a7edcf059d395ccb42c0c1c4c9fca904fd84751f1f7363f74c8e9cb4d3b29a8fc
+DIST firefox-64.0.2-en-GB.xpi 440963 BLAKE2B 77390086bd09ca1315196f5146ec27a24613fbfc91c70635bb280f002dadb46a87e2766161c6396f65c45b051298446b44c8fb7fc6d32a1792b66a4083a911fc SHA512 7cc6b048e4362cc1513a57e47fd67277a2502f3dcff59e53cfefe38dcd8bbe1718a5d49c0a6f6a11ef13a510360794d665ea9ef886b8fd6688571c0490ef234b
+DIST firefox-64.0.2-en-ZA.xpi 424511 BLAKE2B b88d103acae64c0d19f1d88144336046a4b8f8a07a8f2050b3cd47927c20f2f6ebffa762b67c9965e1ebedcbdacbc06919f29a62a348ccc65f89ed57952b1328 SHA512 102b07d706d4da8544f8d3b9d08fa8edbac73196ad7f4ca70a64326ad8acdd21c9454e4bda70a36c886e4fe14e9ee19766ef9dd47bc5cd313f4c4f89c2d452b4
+DIST firefox-64.0.2-eo.xpi 482464 BLAKE2B 294fbe830e388e5d779ddf6bf6b42fa3aa67b0533074b08d25a9581b6d56e9e82bff75b267a98036ef757e7e3f8f766d28cf418317c3c5b4d2bac829d6fe1930 SHA512 efe9402c93603200d5a2ee922f182005d1895166e9e0c552e8419c8ed250e80feaadfa6805abd587f09fc02a941e5473733e35086eb0afb5062304613fc762ac
+DIST firefox-64.0.2-es-AR.xpi 490552 BLAKE2B 20e7bdc2e9b6e4c210ee5446827c20d26d4f6d211e865503e5e388ba8944f1c834462df3db86712542c623886f86a9ea9816154e61489a0a9842fcb027ff2daf SHA512 975d4b3ebbe27fb31057a27167d96bbdefdd6c283a97300ba5e76220d5c934ec984a23431c4026efd92ae865dce8cb4796ce453f75b3e09f65fd44f9ab808e52
+DIST firefox-64.0.2-es-CL.xpi 490258 BLAKE2B 00d0c967931709a57ff69f6198ce1e5b9c37aa29993532326c892411d8e7b6a52b84155d1171ecaf6e7f375a37a01c057210845adb1acad80cb7e3e3584ed6cf SHA512 a85ac912c2891c4646e281613347d12a348b241881f2a5d81a756861c8cf58591b067be5ddb082e10b5fca0b353b24e0efd02d8f1a9fdd99a942586bef049151
+DIST firefox-64.0.2-es-ES.xpi 437812 BLAKE2B 5e8417584b9d6325264dd32545f933bb5833dafc42577b76591e653f5288fd12de4334cfe72e3bc62ef6767296b0c13646f91d7070056a752a9e9c34b6f2e529 SHA512 3548b965bce3b3dbe9875111fb821841d7f0ee4deca11b216ddc23ec375bd97c1fc7177ccc865ee3a74b872a273da03d90b718d8344118a1c2b0417e10395fb2
+DIST firefox-64.0.2-es-MX.xpi 493155 BLAKE2B 10b0ef179f1acf91c36a90fdfb208244868765a42a77e1a828217720029b089388eaf2ce797669af0c208c861d5591ab22c591a06d0424f45212afa25fb0a61a SHA512 105d92457e2a0cb85f7d26576b1e059f0a34c3d8d3da13c36038091f66af615a116c9a755f69fd892b110a16d6c9119fae380206cdce0a5608a3353098000979
+DIST firefox-64.0.2-et.xpi 473521 BLAKE2B b6c65fc2490788f58b07c733d0ab53a175fe376c5e52945cc74d8ba361b3a5acdbcb4f5ff0d1e740d3a87e4581f3a2cb44c47e54ad2241592d7eef0a900f378a SHA512 b2f55029daba3a25500c78cada52c914393caea4ada2df5975c06b5e608b31bf995dc1a5e525154aeca8c564065f7b2ae4b4ef312c8c87d1221fa860b2f331cb
+DIST firefox-64.0.2-eu.xpi 477299 BLAKE2B d6f91e4fdf8b335c3f5d49f5091e390ee6946339fa47725c393f10dda3df14345d155486486af71b38dc2d38301631b66d84c5597789da918e2fd440bc4cce22 SHA512 44088c0a2a5b0a2a18a6f05661990a4eb8d9c1cc5c21e3b5f561c6b67bdb759a346807db13ba045241e857126da675c1c6d3733eddf5078bf48f45a6ddecb882
+DIST firefox-64.0.2-fa.xpi 529980 BLAKE2B 377727bfe3af82fcec9b115ae9d85fff2dc740331c64dff60e66254ec66df98a955161514fc3784b0f6d166bf595f3f17ebbf671f2f1b777feb473b6017bc51e SHA512 68aca86834b27a7309330b734204a5b2aa97616c521c50f225360c3b7b8d660b66188ba1f2f6a3971adc9e228e2a21b1b0d205e658d01834505750cee91bf157
+DIST firefox-64.0.2-fi.xpi 470567 BLAKE2B 6b1a14b2518cf35fa2fb5549c9c3b6eb64e455458a6d4e25b112c53af85b3a69b106cfbb2c71fd03ada370fe5e089d489485df81ca3b785d9b48e2f0f780c58d SHA512 d5345d207559775367ae9eb00733c54ef3aa88321566363e0676f570270de0fdd1e2f8adfdd294aa078205996d2b1fee45b925e0b80a79304064fb4ac82da5f1
+DIST firefox-64.0.2-fr.xpi 499983 BLAKE2B 384e7a647c56c7b3294a510a06f8e3937dbff478c769a4cda5f43bd4b7f4a522ed403ac54dca8e70b6ce50b29353e3820cd632da18f798cceac7450fcafc760f SHA512 9c3f0da233b67ad307ad66a238d99378cbe68705c5fa88a61c30b6b0d790ae932d4ea80ed847fe20a628634671aa72316a47c34da76bb35403bb51a5477bf756
+DIST firefox-64.0.2-fy-NL.xpi 488322 BLAKE2B 20c1a43b40e196ae51580cfa1bc447876918d933fe3f10e9f51c16f7d3920673b7141671647df5b1dcb5935dd147e9e36fc624538e8ec86c3c64f1a4359dfd30 SHA512 ea38feed8439cd3bf0e9185c636ebe8d6f0fb3b11eb16985aa0670463a56916513aa74599614aded997f4cf5c1c81ecb46617cc44a076573cb26fe0ab6a593d0
+DIST firefox-64.0.2-ga-IE.xpi 474812 BLAKE2B 5c1d6864d7ac96a9c1ec6d9daf17cf4cc1d9177549c20c8a8384df536aaf5188cd56b8555480b2861511920bfb85cced2f7d631aa4722480794bb92a321140b4 SHA512 6c5bd0a76eff07598f1c49f1335113bb573e48feafca4b2aa62a5b17c9fb030addcfa4d9c63d2cabe88c139c557edcb15510c4142b09c343bf537a9162964714
+DIST firefox-64.0.2-gd.xpi 491218 BLAKE2B d3966388595a6865de0e1bdfd40eb5a348a60ca7ce1bc9cbcb626442782ead40a072c3187deb97fb6bd298bf472727be1a76728701cbebba49f279f063bb9ecd SHA512 eb61eb92f4d5f60e4a35bb79b0f32563193c8c2fa9a53f5b18f0421b2ebd00b17b6c30d702b4dcb37e230651b2ff9d35b6aab825d7232322502b0c267daddd60
+DIST firefox-64.0.2-gl.xpi 467038 BLAKE2B 90131de1c65e5ce56421b655c14093e5ef51c9d048ca2fda7281b951695fa64011f7f2c0fa152e38353f90b6135764281124b9be7c2702680304c0b64ee582c5 SHA512 4c56c8573b57d3554011b9fbe186e441b5b1721db79af0d6cc71e060a2fbf78e8ca86debbf90241e10ef439033c03b928ce3e28bfdfbe40958d84cc72b4cfab6
+DIST firefox-64.0.2-gu-IN.xpi 559368 BLAKE2B f37f51addf29deb5d2fc441a9c7d2b986f25dc32fe3a779e61c65ce7ccc331abbb243d18caba7cf3b76937b443d0c73b1cbe1d331450fa7835f5482f299f88df SHA512 9e90e33f1acc831f7e6a9f3af319193320ac935b921ce925f7d408d98cee9582f641813f615eb388f4c9ea75b1165c1f8e65b1458a80260e0913484a89780f30
+DIST firefox-64.0.2-he.xpi 485007 BLAKE2B a3733040a79a8cc6779935e366ae8d6cab213b63441902b862b6ee428e0404d3aad07098bbfd59a16ed71aea77e4a7200112bc30cc7dfbcf4c3356c1cc98c3aa SHA512 ca230e8db7e00c563d0ff979a8f0d2f5b1e909bbde0530a9134323255386bdfd7b232a6f0ce49ee046879412926fdb1bc3eb6de334f7900b384fce3376c7ae3d
+DIST firefox-64.0.2-hi-IN.xpi 544063 BLAKE2B 5de2fa40ceaa8b7ccce6eaec588d585a01147af3f3bbc852675159ca0900033bf007c80d5375ff6a1c85cbaa34968c5128705b63befdb394e39f602ac68fa464 SHA512 d58a8d42f7dc852a8c8b9306ffe0a3bb75a8c6d23e0b7f36de2986e76e314a274be5e335018df2fb7d0365c7c1ebdbf8b86e00c267825de47207c386883554c7
+DIST firefox-64.0.2-hr.xpi 464610 BLAKE2B 08eb5d1899e21b43d8472c8bfd1defece6602200c09c1970e81ecee19cfed51c222c99aaf809f1bcda5d337aa55c81c61d4d5bf0d6094af9f6c20448df2b0e00 SHA512 c20c63046ff1b71e15b53c506e56a6fff0c481d8c42f62272800458acafd82894964c7aeaeec3b8075b6d5e53a639d5b95132c8f069ee2f051d02911c83818bc
+DIST firefox-64.0.2-hsb.xpi 503936 BLAKE2B 95a5bb78765d26f84a20024805b0a306f158548df563fd2049643193594b830db31fff47f0eb56ff3c4a9b97015376bb25490f4f49dca0a0033bd944aaa47a76 SHA512 112f9cbef5c8f3de6bb5dabcc2f0af2d3c9cc2743856bb4c13b057c5af5c932852a2d94c5e71603f40ff84d1b61729bd7767376e671edfc6e6bc272b2c65ecf8
+DIST firefox-64.0.2-hu.xpi 501541 BLAKE2B 9350b32efe786ac702dd42cbf661e1fa43d1df24978c937704ffe6b1937680d89eab262a7d9f06abbc4a3839376a66520d94bb0da4d4ad6ed9642460b138be29 SHA512 0569c155f545657e9eb4898bc5a5a013ee37d58d77eb58804bfec9d6fc714a7a5d789cc286cf7cc2d553bcd2f279b050b9da0561e698b22b8c62e775dd07efdb
+DIST firefox-64.0.2-hy-AM.xpi 520949 BLAKE2B 59ad3c907e28829a5332c8520dde74b906628e172a916233c730c2d3dac64655cd6e830cf4376cd5d0e5f8b12189e7c7f3d18c924ae05ecbbbb72cb5452409b7 SHA512 beb0adc0cfaa9902c26f1ad1669d1c7dd027dbed9d410d81ddad956f05a28a9c65d64f0226ec8a76a20aa9b5495d718421949f5676032fac57d646a14b37c6da
+DIST firefox-64.0.2-id.xpi 471527 BLAKE2B 5b4b324d8605c926c5d2c16cfea6191809e4b0bde1257f4b409a252230f2c3d0aef06b32859484a7f24145b94a5fd609895bd3e2c4b6f70594182e562b6f5cba SHA512 4e6776e687fcc47fdd584aa48254eeee42853ba5b7945c9754c9986fc3e218be2baaba33f4acea88480d126f05b5753e070243f4786c5680a770676c9dfcd41d
+DIST firefox-64.0.2-is.xpi 469905 BLAKE2B 97847b0ce45b29ea97a4af333e18442287d2a7130a7aab3106009aadbcf21c886394f6c355aaeb5c8e61b18863d4387da5db7c1ecedf2a350f559f6105765edc SHA512 19efa9275e04e6da47629777d8d4007c7499af0470f4f74d76f104dbe26a1eecad5e37a5182127bad4ba3f97d36557aada233f3e0bf63c8c128576e5518a0667
+DIST firefox-64.0.2-it.xpi 355575 BLAKE2B 6f0a4ffe45009c67e508d791d5a0c3d855c7ea44c65b6343219ec8cc8fe4852beccc47d4ddf87a2b7c40daf7b4c1e4066e1652c43172c201fe05651e3adcd50e SHA512 f1c2668384f9fec0cae7932fcc82d1c245e1ba23f468f92e9a05bbfa517d561541833be6c385823d130277099fd404efc7139c7f901aff44d21c9dc5bc3862a3
+DIST firefox-64.0.2-ja.xpi 516116 BLAKE2B e8a01a7d3a8e79fc1e9aafb7d6abc171d62d5e377c9421a67b6b5c31d9cf4f5ea003b0dc5d681aa90102f305ac2e88ebd96965d19426adaf26d5e35577ba64ad SHA512 68a6a21f8e7ef6fe4b47b71988714f0df1bb855bf0816fb48a1c81c69d87b66dbb708e5c69e9de5cd1320b98744edaec0baa40f867173815728887f9e091e1bc
+DIST firefox-64.0.2-kk.xpi 550187 BLAKE2B d0c5d62a38e90c793bd51057fc7463b413c07d6b9fa4ebd8ac9e66836e544ff5ff4abb39bc73fa16139c5449ae281ea0142e4d72672b94c4f75e2e75aa92094d SHA512 30adda4beddc73ccea23726f67c2849fc45b6dd69497961b3b46463ac684bd2d4a194314b66424b9a33dba2206cb5f75d49eb4f237b5700784904e9f50fe4ec0
+DIST firefox-64.0.2-km.xpi 535444 BLAKE2B 042f62fbd4e4c1179c35d2f893129a0c5f09b7dd553ccdcdf1c206c598711a7266c6119f8f2bcf99b482e4643ef8d092d0bb2d704960d978963b9828efc8d070 SHA512 52aacc5a427742a9aea1c94112dfc75e7908f88acdf66dc9dff64cbca892040f541386d07ad604a8503d61906ff86399b1431edb87ec635c819568fc4d079802
+DIST firefox-64.0.2-kn.xpi 538358 BLAKE2B 723124232987da5e4e9f7de089117479ff4c4abc9f6527e12839f27df8779260cab51fb2b1896bd5866b0bb423c04b576bf6f1e9e0a64060f4374be6a0d0cea3 SHA512 0cf2c52900fa1e618b6b176ec6e25143c8a6b7d0110cd2ae20aecd5855d8ea2eea7cb392c9b8a4eba775349c6454e8461f627ff6d07ac922adb8d5cd0045b679
+DIST firefox-64.0.2-ko.xpi 500865 BLAKE2B 4872b5a4ebdce1c2ee496e249ec4a61ed230a55174d8b4288ccb236d59804534f9826e2c244084d18414b25bd6a634d6fd21afae77a275427241d512e3577fb6 SHA512 bf4cf9216be36447e46dcb1a286e416e9a8baf5bab804fe26624e957377e41de8ed9e958f879750c89209124520c27453feeeafd75267a5c712d792f4408cd3d
+DIST firefox-64.0.2-lt.xpi 504609 BLAKE2B fc8c0ba1fea8f40a34e4f5b3bc89f755bf2ace190edcb680c878cedb83b871762d424a299cd392f1b7cd5ac4fec9e9bacfdaa979a7ad9c2c5ce68f5e470f2990 SHA512 a7d04221420a99e17d0379446d0a3e46808f7d32c805ffd1e84e926f368407773dbebe4b14b5232d1664f2911b556de01512b2a0ceb2af844f7c2bcc7c1cd547
+DIST firefox-64.0.2-lv.xpi 490769 BLAKE2B fc91c7d6825555e04858917d01621c717cd9fee3c2c243b61fa7b0c3708cd351006f7cb7a967b0efb1598582e82d00c66389764db69bf0f2d304708c7a319bcc SHA512 56e674236867939effea86eda505b2b99027e7012e6808b45069eb02a2eb0cb23feb01adee0cea9d98c9018acb207f5a92e7f629a1ffefdb6736904a51972225
+DIST firefox-64.0.2-mai.xpi 496201 BLAKE2B b78fed0dd500ea734baf08bafdf0b98e4d45dd9d83bb6f05c042e806b314eb5beadec1fbe712b5b6e3ff64fad7de9af4971fd259286ad9d29d22e48e8e60f503 SHA512 5a90f377442bd362efd8a3440345a046154b651c202997f1541f42a2faa43b4e26a1cea14393a8fca4c329d458baf6693d96cfa2db9226d6de34ec4415252600
+DIST firefox-64.0.2-mk.xpi 457993 BLAKE2B ffd74e88d263b5eaa258aff5f5f350ada9e5dc86ef020851c4eb13797a327e335e77c0dbbd2654294625a6519a81ff99262169f924bab49ec7cc5805322abd20 SHA512 29f3f9cba2b1d10ad21e4d2c0ba723dc7fca54ce5fa89ae131c00b73e2785707e5b4f22660e5c71ab42b3e001164b868f1afe12f7d86efed53abe01545a6dc24
+DIST firefox-64.0.2-ml.xpi 542332 BLAKE2B 5cd646e15dea8caba3810e8c65fc0a73f5bb336e1e5bc53dd0b49e8fcc1419bd27978a7ed2d86e6200e77cbd4ff4dc74d3f93ab33d9d131a4a45d71d684bf0cb SHA512 c49dafef8479e281fda02785e2f751ef75760f07b79867487cc13002975238bba1021dbd7403576574244da67c0f51645ca9f889ab537aa825d0db0331ac1424
+DIST firefox-64.0.2-mr.xpi 540016 BLAKE2B 1bee8f442d49f3d0bd56e1624654b567cad96b8068c6b6c6875dfdc3cab7433a95a2650b653ebaa19275f349733154c2ccf85d796724ab1ef5126b486f3c5eb5 SHA512 b5127a3ae86d3f4445fe8e57f057f495f4b6ad67a0b3017ed697cfc918c467d6f5c12c734c7c94dcaf959ac03f49f5cc30ae40c5280c328ef3f4d77a60b7463e
+DIST firefox-64.0.2-ms.xpi 473936 BLAKE2B 4f766290db47d11b5e38dc49205adf6033d65a8974582440ff49a0c097d4b40071a1e996a989686f31edcfd5dc7b789765498ab4c1988bb7021c1c4fe6dd595a SHA512 eb8d54019e3a90c6b2beb73406976652713ad1a852466a88331677fbf622625557df6c3d479ecb9903e97990f1058c7457b9814eae7f74061f0e218f1b0739d3
+DIST firefox-64.0.2-nb-NO.xpi 473423 BLAKE2B a9e71b0570778761fb35adb0a94df22a31f22e4125c647ac7715ebb9c039d7efd51534a93824f4f06df0057077f9079667c3b846a6f4c033e394603c12ebb622 SHA512 519c158527bcbb02379b269088698018faecea0e37b3586ea9c3eb5795ec35497a0873e2af8a523731b17915a7f0e340b181d562c24e9c37a41b1027c6f12468
+DIST firefox-64.0.2-nl.xpi 465188 BLAKE2B 4cb114024132f2aa12367eb956fb10e77a717137b0dc105df95105b5ef23e48cdb4e5c56fd0b31e7844bd9ae29667969c6aef3712cdbaa9eb6abdf078285a211 SHA512 67383cc4d50aed4b9ce240ff19680b9cc7bab2b6d03f8ef97e378c8d9c5fd395282cd9c1f35f212b191e6dc838d1fa736d3f8562b54eb477b2639a7b22c73c9f
+DIST firefox-64.0.2-nn-NO.xpi 472052 BLAKE2B a8ebf75f8f213273a4d70ef292aa346dd85af8e2be911478d1a01e9eb4379226ba565e7e70caa0883def19f957c404bda3040a0f41e42d6001bdfa031d213edf SHA512 14f34e973716b3e160e23ff198ef526db1a225a5381c5a162eba031d45e15640967f0c7e2206a39e94ed998e82261ed6be00f52b7740089e768bff77c5ee1505
+DIST firefox-64.0.2-or.xpi 485456 BLAKE2B ef050c95283cba323e6b9a2c5fdbff4ff2b86c7930ef80191a2ba54de67c1c2483e73dab059fa31511dc5869b9249ce9c583ed30ae69dd49773d807c70477b48 SHA512 db86d3f5cd0dc4e3f2fbda0d11bbd5441e1003a3ff8b7d873fed9f6b7e17438f5ff062ac51ff25dbada0c9ccfb44bac022644a4bccfe9abefa436d36bee9309c
+DIST firefox-64.0.2-pa-IN.xpi 505899 BLAKE2B f07392df3d44a98e874237fbafd528a1ae83c4584bbc4cddc6957f63ba285e9778d3091bdfe220fb1cd736ee06cf10a5d26b3e74a4ac3fac4502c0058918794a SHA512 38fd3d76e5710151337ba6ab841a970321b3123bd911f62a02b04d6439327588e3cc3838a2a602e97e8319ad40d6f85aa2148564c75ce0c1949aceb983ca9c21
+DIST firefox-64.0.2-pl.xpi 383270 BLAKE2B a639ddc91f71d290f06d09652bce840d34679bff6b0e6481d46da1eb67a5f0a741fc12abfa61f4daa63a02685fc61fa10a9305af54a9786b621f401beb3d3569 SHA512 72839d72f77e8e06fd59236b07eb4e5d940bd33ff5a206dacdde370ef7ba979ace41687862680769e113b68979f8dc5c938c66dea6683a6c2e8fa170224129ab
+DIST firefox-64.0.2-pt-BR.xpi 475697 BLAKE2B 11b87c4d0571abc85547e41c53218aa8ea7d5ccaf6a4dbbc68fdeedd072621ace538ee3adc8de963bb691160583b7b6252ee85c4553984a5f5e3d39bf9a40ff4 SHA512 b7ff4c4e5a69a69e3ca5ddf09eaab7630b160ba4418a26728e8e6781adf390d9a305235f7c43e7dbf2b5c8bb84ca1f2a11e9ae2a9b0b4ab7d39335beab4fbf85
+DIST firefox-64.0.2-pt-PT.xpi 488751 BLAKE2B 81d2ee5ce88cc30271edfb5e3c877a1a58804b233b96956d9dd0b3598ba6b3a94efbae12155fb8308d059bddbdd4546ee39f9a924e04b9d219c2b6e95af0dff4 SHA512 8a64e25b810847d9fa9a0706571665e41cebc499b393d58b5d3e0fa31aab2dd693ef18b31ba856675cd9c12b8b6bb400304eb60cebb76f47fc522ff4b24bb840
+DIST firefox-64.0.2-rm.xpi 478597 BLAKE2B c16e0248c2b2ca3cc4b5eac55a8394c8c985dcea700da5ab164449002618b738a074660549348e54684d30b5f599c05335c59aef7f82ce3240d35bacf5849ffa SHA512 fbeb7e10ab25cadc13c56fb07c214487d727e9dd3b1b0c4b2aa474f20dc3936863977ee9fffc68db9d174fb9cdd4027608f7b6a720725a8ded67e18d7c9f28d2
+DIST firefox-64.0.2-ro.xpi 479969 BLAKE2B 4af6c32345334af2f2d92573b02079707a750956b31d273f0bfea13c9ffebca695419dcdff8c9a92c65f637f77eae888d4978a3628694daae898891a7f39fa4a SHA512 de49608064d5c577a54218a464fd9c3ea2b835175bab865b1d442aa62e0bec1a7a19372d1b5e9285f9b1ee5b7b12535876714d711f6295770198d0529b46e1db
+DIST firefox-64.0.2-ru.xpi 546349 BLAKE2B 6d729585c28f09feab0d9f2112017ff600904ae071b436d7f6f55f715b0a973d64d808d7a0c4275be0cf970d529f68a5abc9ea1ad1c01ec002e8d4cf96c30444 SHA512 003fd1d091983e6e9acdf86e5d10bc43b05f5f320fcc8bb27a140ad5b8279b4a852a59bf7c9261b52805bb69948fd25da348e714f70deaf13fa7e5a98bb223ba
+DIST firefox-64.0.2-si.xpi 489565 BLAKE2B 0eb2823930b4311d28d5cf85be06c610d481c9c2a3bb586cf60118a9de35a6c3c6a58052030bfc3b60ea2116ee5561681a46dda0d5bbff02de64f0ed706398de SHA512 2e3678d54044d8bbe3e15e9615edb52a94a4ee3625a36badaa0e33ff80c3af2da47aac947b2e090630000963e8059e1eb25250ba18bc27f592415ea4418527b4
+DIST firefox-64.0.2-sk.xpi 504065 BLAKE2B 1f43ad347017d09434571cdb03a046a8a168b4ff4142124865c8ccaac55e61e0d4f8ff23d69c159250ae9a932db371b195dadd3503a2153d39cc5f335b8f34d6 SHA512 e4e0d08d9cfbf3bcfd8feca9886723da921bb57f1ba9fa68c7299dfdf281ff012ab6561507799c3338005b7cb0f7a612f6a130c2440af27e59390559bc04f38f
+DIST firefox-64.0.2-sl.xpi 484992 BLAKE2B 8c4f150a78315c5c87dd325314e132b6527bf87a233ac1db64ace1abe020f2e9e7aee8688cd7903eed62825f41129c3a46c03bce390179d92446ca9f33f0b5f2 SHA512 e71c025d9aa584808e5a1ed5e2adc52dc16a7a8b6832e71038191e3220deadf04379677956d2724e2d3c9718b9e632155a4be1fb8c75cda1d512b37ec59953be
+DIST firefox-64.0.2-son.xpi 449000 BLAKE2B 3dfbfa3147aec2a99c63987828f55d81a7ba17624acc32db9ee3c3598a0b0cfb2388732c8b5fdcb12730eed85a8b2e6931e8d290fde406930ef092a9430b8579 SHA512 b71dd3d4b7df3498f0739141aa267eee5c60b68acb2eb3face4d69a7657eb1895f994d7b2588678f7f0f62022dfb9f88b3fd886924df5a393e088fef35ddc56c
+DIST firefox-64.0.2-sq.xpi 492689 BLAKE2B dfba4fe249b43671703ff2806c8e96d962c7bd55e6c0af0e8118475d0b6291670c08d97cc97935f43729b6c578983ff7eee8720e84b758a07828f35e9a9bf933 SHA512 67ab15e1b2ac06a64125e7c1035d3d3f71b7fc567588008f6e1f2848cb04c49516ac0665a6c24588fbd17a5044a7ff2f8d35666bf807bb90422219476f66a7fe
+DIST firefox-64.0.2-sr.xpi 506364 BLAKE2B 07cef3e98db6b66b318aa88d819604829d4fa9e6d6da3cbe05b8e9c7ac1bea292b29ed5da038ecffb4d2d020c34af44461f4a8b091512460cc6c72eea6d68a74 SHA512 6e18d4d9289a29f2296ccb3da59c034345a929ff587186b7f6256792dbe5499d000bb52fe5d01db26533f7613097be8461d7c4c630b7d481c827470fcefb368c
+DIST firefox-64.0.2-sv-SE.xpi 484139 BLAKE2B 2c212876b5f3af1270568e3cf84f34cff4cc64a01c9db8fdb47f53d2f74677ce2d9cdeb276fe200fa1f8e520cfb46155be92797dac39c8357cad8c51951f4820 SHA512 29392df3f539c0638b303c9f0cf93c0144c6c9645d9f1c3c1e3382b3d0789a9c64517c26275a97f9a68ae8e8030d163e464fe58603165d01931defad0d5f5323
+DIST firefox-64.0.2-ta.xpi 530880 BLAKE2B 535e98ad3c50197300b32264583b7c28c572766029c7a9bb987614238f52ee5b00d6d6d639d0f2f4b17ca83a57de9a8607ab19c2573e50c28600cf59ebb750d3 SHA512 259004ce7fd412e2d682f3a2daa16d9a29de9a655613902adc809bc81295203d1b13cca16c2214c4ca996e8e5ab5b06ded03ab2e35e58983c56e42e2468fa7a0
+DIST firefox-64.0.2-te.xpi 547601 BLAKE2B 09bf98a3f45d5339b39eee9999e6558e1bd838f99d1a99b9969bd5cc52dfc7c2691d02bb79cc9e0bf57eaaf254bf2e16ff123eb593ea0d59505f8861bee85272 SHA512 1735025e810de6ef6fe26799068d3f49c3c688d3011f4c9df4d7d9f786c041579fd8c45f6a0b1e90954f008fb2e48e776840c0bb3e5f6cfdfc162108f873210e
+DIST firefox-64.0.2-th.xpi 508207 BLAKE2B 3343af73464e1d56e85b6929aa5f3ae2b685f5c79dc12507d067c83a5af0f5efd36ea56fb553808daf1321342e0c23ce7ff1cc00dee7f887beac4ffd77f9b5de SHA512 f242e503d908969908076696e0cded3f35356493dc019acd5788f6c0a9d8c06ee23cbcb3f7800f9677e916c3ce649799643544cfbd30041537273eb8fa61e331
+DIST firefox-64.0.2-tr.xpi 494713 BLAKE2B 6edafaa5f1e397bfb5e6cedcdc4761932548d774b356160f7b5cbab54b7247f09d1e6d62a4521ceee5915584a5d7972f3d1436512c1b9d325066f137ac606365 SHA512 aab01f4acc6a450a4d21ea23fb8142b88e238324443c3522e5ebfd4e08ac5f1a5db6ded13bfbb69291e6de3c7bf186e3d7b052da3403596fd0154cd145244bf3
+DIST firefox-64.0.2-uk.xpi 521003 BLAKE2B 39738718031ffc1a28b5e0001ff777a7a4cc5e0ead1c38ea3152338b2da8fe0372b0829ec5e8c480ce46e8a2e06a1992bb910b74e28e4d6a58e4545763c54cd2 SHA512 e5de0d7a24754d5d867cb9716019640d291087249deb03e506dd37d948bd36f04a96941154243b84e273d2b795ba8a56461671c0b20e1c0780ccc98b3af1e164
+DIST firefox-64.0.2-uz.xpi 466675 BLAKE2B 3b953b93a3888a9807f20c8b5271ab421c40129fa271680968be58693818a01aca306df20900d26a367cf71b24b0558c1bbff40a7176a607a9f8e7adf05922b5 SHA512 9d3aaf8cd79000cd43302a348fc2b237d7467cbe741c11c9271814a9375b69ef3a0894a7fd09474643ca518eba29f712762403db8f50d916750ffb2dc801d25e
+DIST firefox-64.0.2-vi.xpi 488337 BLAKE2B a9a37ef562a9c7caf22ffaa66a36370c198b9d4933ed0834ee1ca7e9c550f29d11c07d9821852a89978c706a97dda57f041a1fedd5b0093dd249337b53bf7a18 SHA512 8323594e134981d5c02ce64029d25697e0b32d97c2ec95b39e535eddfceeee2e58851de1fb430a7c4ff5f8f17e7ce812241baaeee775e01b37c9b9fa2da0ed7c
+DIST firefox-64.0.2-xh.xpi 463280 BLAKE2B ca5f0fa160388e50f22b9c4bc243b1a759e654035335f2330c25083feff6cabef36247f7a53289108408ce5b21a282cb4016ea063f8b229fed438c5a0b999ed2 SHA512 15452e7acf864375fa63b40a8882486970c3cbfc908f1558e2656b946fb3cb9ebf93342f92712e8576b49bd591190d15ad618bff963dd4fd70966f314ccac448
+DIST firefox-64.0.2-zh-CN.xpi 507524 BLAKE2B 950b65dd32218b6f4bb3d3a47742e8a2d208e4862db39d3d9a1ef09bf08f3d6eed0c2bd1ebddab0bf1dfeebb41da59aa492e18ea784517eff7fa0f199696eeb1 SHA512 56e758b51713599733d9df287bcccc4bd9bc6a8849b401b39cab9b04a8929f26eb2ab183c76f51f710c3773ce43c9d48585b35e52329d89463d4eacd66c871cc
+DIST firefox-64.0.2-zh-TW.xpi 510624 BLAKE2B c218ece3ecd5f38e73f384c5342b6725668bc7b79412f756ee5a6e97d2524fb879b87485e3771e469aa747d98159d22207c4a0adb018b3c821e12eec6dead03d SHA512 aae4519528e733a8629db0d00988d67d020fc23b55f54cb7ac52f5e4db627e256a9814a15649bb5e7812819589b0cbc9ccb066e857bdbdd889a16de3342b7740
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
 DIST firefox-bin_i686-60.4.0.tar.bz2 55650466 BLAKE2B 4ab62c79c0824a4f2b324e27842996489fdd6a1eee25e8d3fa76e2083abfae794d46baa20b982222e0660045fe8468e53340c451f516ecdeb48cc76e944c6a7a SHA512 633442082d9dd1b4fe689764e4b0328c4fb31a06ca920ddee72265bf25519285251d26e9b6a5815f28136e1e2628cb83cb26df8414682c057bdb2fd55ec6d82f
-DIST firefox-bin_i686-64.0.tar.bz2 61044010 BLAKE2B e33bec47948354b1bb79edf2465882426c523c0ee98c39bf19b70ef34a6eef718c6798901db23bc4df58426ca6abf819c9085bda9938a191a02f7748bf92d2fb SHA512 09651679e1c7966e4df1285ee6d3b5ed99b4f91e32ffe430d75122224eb303b80673aebec524b7cf27ad15699a0c4ff908e694f54689d0e4a6c0352438be4704
+DIST firefox-bin_i686-64.0.2.tar.bz2 60990199 BLAKE2B 3b7cc7c6f3ebeb20be56b6609a190476f078315c32d90e4fb4b966b27e6d53ed4c60a4978d25d802727e3e4b9ed34aa89da30263bbfb670d904aafb1989fe89f SHA512 dc2cd76c4304a8f1e03f750a8e4898b5bfdabdb7f93dfbd3344474fc91a3533574029d18d6e1a4e0c98c29d790c255fae3b8a6a9ef7054e371b28bc7875eede8
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
 DIST firefox-bin_x86_64-60.4.0.tar.bz2 53244850 BLAKE2B 73e576e7bf40fb2a08781a6060315220be2219f01cd89f6a15bc07749cdd7e62c7a908dd05487751f023c34ac9743a545ebd171679007bff32df4f60bc7d4663 SHA512 a68277c61c6452f95b8a2c470e8204874df8238cae6035c31c79a0ceb18835b5d7960b93ad1316fb0a963525b0297909252e4376c4f6a42c80dbc1e5beb24c17
-DIST firefox-bin_x86_64-64.0.tar.bz2 59280435 BLAKE2B 7454e21b18374117499920b1dd2f704573e3b6351990e9dc691be41dde8174de498c138f8da59c74b3b4d778c056bf62a1f737f1ede9f06438961fd74ff049e8 SHA512 47a6a77ad478c4c87c408657f060bf60e0a646e7083cef9d7820c03b1be4e050d83054499a79445de993d1b9f5582c3dbcc023589a5ac7fd0742ea08b8564a26
+DIST firefox-bin_x86_64-64.0.2.tar.bz2 59315788 BLAKE2B b5a7aa38f47aba3cf2361c635605f2486fb594c8f4222aa104785ad3ba43297e60a29fb8b4ec53406c9ce3f2ec01d65cbfc26e4aa04e1103210e0880f81faf1f SHA512 d6fce66e5f58fddb695c6acad01963d71bd19ac543daefc35cef499abc49ee690d2e5067c3dcdb43e0cec62676d4df9f8ef8e683fc9953325e2bf52a2c27e92c
 EBUILD firefox-bin-52.9.0.ebuild 5498 BLAKE2B b41af46ad84a043be3957ea1032fe35b38b7f5f03f966e4723e6e33f7a87f706da13e19cf05d3d5cff775e5dffd5817702b88d6b3361b2fef34b0daf3d06eb7e SHA512 47254987ef534c0ff7b1514334c26fe7636efe60a1a4735beb111242fc393664eff9a05e45975d6b6d7db3e8b3da68f2d886fc58b253f4e0640edc4c0e03c30b
 EBUILD firefox-bin-60.4.0.ebuild 5610 BLAKE2B 08e8524832d193ea938897244cd3124497300359e60d7e2cdd666c64d149aebce1937ae7d2f98f9fd29a09ea45ed595e86767d43d857e611ef03dc8e95a2a3a5 SHA512 554a444f08d0fd1871fb55153641ddf20383ea79e8bd1e6ba7071db3337a2d3c2abf55d1846f36d430359bab86ea7783e9ade02008b608d23bd8650d39039b06
-EBUILD firefox-bin-64.0.ebuild 5610 BLAKE2B 7d52ebeb3c84e02e643ed077ba542338c24da18438b4aa10752f4aa2258c7d29de81528ede62cfb45ccbbed493203475259a37f620d5b561aa5e57366e3b24b5 SHA512 a1d7da8c938a0e9ab66f9a803d25de50c424e48906b632da9722a8cafa713751242e5059792e122e57964691651dbdde71f274c87d9a209e66275a0547dd2830
+EBUILD firefox-bin-64.0.2.ebuild 5610 BLAKE2B 3bd8c48638fed3f25382136e6bd83f5592b26ff47957a5fe985fd43ab689a6c6bb464e92f0825a6fd1cfa497dd87ff0f5b4f57a43f7b7c5cf0e754d84d610659 SHA512 6d62c8748cf00373d549ad82d7a556bb02fd4ad8a66f55d960508efee720a6a2c6b8c02a31441fd97c6185e4a40a3c1bc6df10596a41727bcf6d137ba4a865c1
 MISC metadata.xml 587 BLAKE2B f38f7c9fffdc422e11b9fd2d8aa2f9c4cab6b91cb5616a3fc324038bfdf720bcce97a80a22b012e61d3d466ac5569f76a29512ac8e7e209efea1bf6d3dce05b4 SHA512 c74cebdc88753d406ab9edd9b51f7dcb17dc1ce5eebc3d6d674d2e54d9af1619147e07a110629a5df003a0c506002e470563d36521a1708c40a10221a26c421f
diff --git a/www-client/firefox-bin/firefox-bin-64.0.2.ebuild b/www-client/firefox-bin/firefox-bin-64.0.2.ebuild
new file mode 100644
index 000000000000..0fbbe4c781d9
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-64.0.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=0
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+# Missing when bumped : be
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
+ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
+lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
+son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+ffmpeg +pulseaudio selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/pingsender
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48 128"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Disable built-in auto-update because we update firefox-bin through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	insinto ${MOZILLA_FIVE_HOME}
+	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local LANG=${LINGUAS%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
+	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir, still used for flash
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/firefox-bin-64.0.ebuild b/www-client/firefox-bin/firefox-bin-64.0.ebuild
deleted file mode 100644
index af7d272f28a5..000000000000
--- a/www-client/firefox-bin/firefox-bin-64.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MOZ_ESR=0
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# Missing when bumped : be
-MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cs cy da de
-el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL
-ga-IE gd gl gu-IN he hi-IN hr hsb hu hy-AM id is it ja kk km kn ko lt
-lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl
-son sq sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-MOZ_PN="${PN/-bin}"
-if [[ ${MOZ_ESR} == 1 ]]; then
-	# ESR releases have slightly version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
-
-inherit eutils pax-utils xdg-utils gnome2-utils mozlinguas-v2 nsplugins
-
-DESCRIPTION="Firefox Web Browser"
-SRC_URI="${SRC_URI}
-	amd64? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_HTTP_URI%/}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/"
-RESTRICT="strip mirror"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+ffmpeg +pulseaudio selinux startup-notification"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/atk
-	>=sys-apps/dbus-0.60
-	>=dev-libs/dbus-glib-0.72
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	virtual/freedesktop-icon-theme
-	pulseaudio? ( !<media-sound/apulse-0.1.9
-		|| ( media-sound/pulseaudio media-sound/apulse ) )
-	ffmpeg? ( media-video/ffmpeg )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="
-	opt/${MOZ_PN}/*.so
-	opt/${MOZ_PN}/${MOZ_PN}
-	opt/${MOZ_PN}/${PN}
-	opt/${MOZ_PN}/crashreporter
-	opt/${MOZ_PN}/webapprt-stub
-	opt/${MOZ_PN}/plugin-container
-	opt/${MOZ_PN}/mozilla-xremote-client
-	opt/${MOZ_PN}/updater
-	opt/${MOZ_PN}/minidump-analyzer
-	opt/${MOZ_PN}/pingsender
-"
-
-S="${WORKDIR}/${MOZ_PN}"
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
-
-	local size sizes icon_path icon name
-	sizes="16 32 48 128"
-	icon_path="${S}/browser/chrome/icons/default"
-	icon="${PN}"
-	name="Mozilla Firefox"
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png" || die
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification; then
-		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
-	fi
-
-	# Install firefox in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
-
-	# Disable built-in auto-update because we update firefox-bin through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Fix prefs that make no sense for a system-wide install
-	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
-	doins "${FILESDIR}"/local-settings.js
-	insinto ${MOZILLA_FIVE_HOME}
-	newins "${FILESDIR}"/all-gentoo-1.js all-gentoo.js
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local LANG=${LINGUAS%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"intl.locale.requested\", \"${LANG}\");" \
-			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
-
-	# Create /usr/bin/firefox-bin
-	dodir /usr/bin/
-	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
-	cat <<-EOF >"${ED}"usr/bin/${PN}
-	#!/bin/sh
-	unset LD_PRELOAD
-	LD_LIBRARY_PATH="${apulselib}/opt/firefox/" \\
-	GTK_PATH=/usr/$(get_libdir)/gtk-3.0/ \\
-	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
-	EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
-	doins "${T}"/10${PN} || die
-
-	# Plugins dir, still used for flash
-	share_plugins_dir
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
-
-	# Update mimedb for the new .desktop file
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 8066adf94066..b9d96300fbdd 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -282,8 +282,101 @@ DIST firefox-64.0-vi.xpi 488332 BLAKE2B 5eb675b124f8bc64bba5817c9c5c02155ebcf203
 DIST firefox-64.0-xh.xpi 463285 BLAKE2B abe118f87e563d24e9e519d7888eae866779f03d31c604a1477ff2b6e45435ab4f2d201f508a0a2d0657583d78bde95f9c9921c43e82b9865ea201a9a224920b SHA512 cdf658a129a95a9df75ec83551fbc2fc6fa1dff9d12764f87681c4a0712dc7bc7e33bd2ca507a61bd2734705752d5528ac48ef0d7f2a6120fb45ba70b2143ce4
 DIST firefox-64.0-zh-CN.xpi 507516 BLAKE2B 3e667830b842e726b5b738e6f8fa4b8870ef4d7a903d872d662111c8cbe0a3fea7248699330858e6d2910ca2f90607788fe5d37492abfa9a3abfa3b8d3cbc6be SHA512 d61781454df7d57a621a86656c4d183a84c0f95c29fa4702a5acf4546a1e8a49bdf7a666c39f1d1b235e0df38fe3533d3ef6abf7e1bfe9a6034b2b28f08dc40d
 DIST firefox-64.0-zh-TW.xpi 510618 BLAKE2B 937c12fbd9ea18e7cb39e60cc57ff66a70398e71de5cce6804df1f8c6db23039f28e5b88e28f0d478fa22f752c0680381f50245d2710016d964750e7730040fc SHA512 7fc9bf0dfd31e52b8f685ed8e4dd37f10ccbf49456fb7c834cf15fc5b4e5301bd34567af3db27e55a16ec3efdbd0fe208426701e11adc8d3d54db29ad88a719e
+DIST firefox-64.0.2-ach.xpi 455471 BLAKE2B 9d39f120607a90bb805f101782e0b1dbfe308575522d5b170a239cdcd80d23c64e6118b329d514d157893d3b66256b5694eb5ab9e8fb4791f33ddc04dde9e472 SHA512 c1fa855cbe6e3e4c9d13808ae63d7289c4b8724e9b9457db2187134cd3f723f8954bf51d7a30a90a95b402dd803cd8d3c4288084227ee329cf5a898047a67561
+DIST firefox-64.0.2-af.xpi 431980 BLAKE2B 2f8dd4e228489efb651e567f80167f54e073bcc9aff0c3873126e271b37255cf05aa2bb31c7966d4a1b15ac44ea18062166472e7963a2e809e171fa84f67a339 SHA512 b9f0aeb5c68c11fad8f6e1d5d841c7019f45bffdf04a24eda89563265d21142777ff307c3b4e37ed06bb976d8630d563092322cdb3db991d4ac86dde983cd57b
+DIST firefox-64.0.2-an.xpi 473572 BLAKE2B 08fcc57964845578f994b4a7ff09356fec0803a07900bd6f49d81b498802b571d8297226b85f894b98b036a152512baf20eb5c67862b75ea6de0980c2d412c47 SHA512 bfc4d5b6141c5d113fd870382604e0e898a11b8fd028ad82b01e58981afa09fe17559b9a86e71a090a38f8660897ae940d03ba65254a07ce9e19689350231a45
+DIST firefox-64.0.2-ar.xpi 513409 BLAKE2B c32be6a25c2abb4280772e1c785fa37c266b4d4e74a82140520cd85ce23b0c0d460acc8b399b941b8c89b930a34e3d3ca7a6f68446fddd828ca622a7c1f4d24f SHA512 21f380cbc5ae8d3b9d1e5441fb0526fc968569e216abd4e0c4254b49dadff08d9a784ca75a708fd01c3eb3125a858f6b5504894add6bae77d79f6797af769896
+DIST firefox-64.0.2-as.xpi 478302 BLAKE2B 0a28d26cb62d0b3ec30d139b2b8afe361940a7c5dcbacc29bbf374d6617da16c2cabe9a355e3e208adbcfe50e47dace832cf4a50c91cd35a8769360447ee2db2 SHA512 2763123762fd442e3ab8e179bd2db4c9601602047f048584dd64035ba96f0a7e49706451772664b3fee89666fce79fa04bb06f145042aa6f0aa205ea17891212
+DIST firefox-64.0.2-ast.xpi 461828 BLAKE2B b625ecf66785a584d6e44d1f8637c51d317305c3fae1847a25221fc5f472334c4dca8e1c0fc8fbc7dccc78b9990e1ddceaae01caac16b8f109d600fcd9a9dfad SHA512 8f222013041c68bd45ab5c6c7cfc331c3ca28375555522f9dee88fb10b06dbbfa733be48b7f081410a46e54ba2e46e2cd54af0659a345175183e4d8b1646ec83
+DIST firefox-64.0.2-az.xpi 490042 BLAKE2B d63c3ed05caf01035ee4ebfe362ec011917626cc4adcc307f1f5e216ad26f14b38f8923db38234f646e29a86828d4404146e3c676abec2a92a7213db785e5b46 SHA512 e9932b55f39c17b14b2e3be7ab7ef01400c7be494521c6656d1f7eb7792f16525a531a5d513c743457e6c4c24ac481be208f0fe88056d8eecf9fbd8a1aea764b
+DIST firefox-64.0.2-bg.xpi 523742 BLAKE2B 84472fec71d246ccd3f4353a5b208f2fced48d0ce19551038702210664c5528264f40b4ed4d5bfa6fd6ecd0efc568911e6ff52f19a4cfd28146e677dccd21185 SHA512 d9b57d7ffabfeb724e327333cf32874a0bf464115f4e7aee0aaf1aed7d5039bc71864938ec813c3a004e8adbc8e48cd35e4b8a5954cc5d2a06b5aa03a8d48856
+DIST firefox-64.0.2-bn-BD.xpi 541868 BLAKE2B 0288231239eadfb3881ba3a23e1ac587e188a45a4f1fbfb00c10d1f8a8d1c24209b296d095aa0ace67416c243bdb599ac6daee54e364356be271a12e10c6c0d0 SHA512 6bf14b98fcca00a5561533e97e15d7b68ef609ffe7d395c72ddd0ee0286c229c2923d5242328a22ffd716571b3055db5136942655546ec28f61abbbf4c1d101e
+DIST firefox-64.0.2-bn-IN.xpi 528988 BLAKE2B bf280e2a65a304b2d044968bc1ec7af1ed04cdda0bff9f16816d7ee63a7eaf9208ea7b0b7186403f043e90d015429d681cfee90af153b7cb719767641313b983 SHA512 74a563b6be9ae0252252e9e766a7dd23ea608588e8ebf10491b1d492214f2281755c86c952fe7b3da0f665e5bf25cc1e2a0bc73b0cc0d83fff42b5b20272dc50
+DIST firefox-64.0.2-br.xpi 479240 BLAKE2B ff5646ed5214758ac64529959be5eb8dc8e9c7275702efd60d28f241a6cb30c7ac0db35524b8e248ade8fa44faf57e00abc3788060df6a9729930911ee5d8317 SHA512 3150736ac2baff70ec7ef05c74fed51e50c1776b2b77e3a3a299358277ce406f7d042cd7ec629defc2c36cac0a1835c716afaebdf9d693ad5e32de987539989c
+DIST firefox-64.0.2-bs.xpi 471753 BLAKE2B b61b6723f1980e1d677f0e168f8e04d3f9c87d19107ed6fd8b98cddea861e38e873008b51a0f4c032a0994218a779e7e0d098a6748b23ca395e0176bcda3292f SHA512 3a65c87c7c9b9d8f7ff6b6d19c21cec8df79573da4d0ddc6b88da9240a3090a809a9296f4ae50d3551a0f75ece5ba829fe0f1bbff8462a728ba38bd1edf716f6
+DIST firefox-64.0.2-ca.xpi 469703 BLAKE2B 29238cf33531849d6525a6441bd2d72b8dd9a300028386d4ad2d029385987673053a54482fc31f1305e3dedb097fe68d27ddb3895b7cd76604f4b9e04af7052f SHA512 54e1a6b5c5640dfee5a2a8c8d27ccfef51d105b0c10dd360f0e6cd0ae09afcd0b3ccd7e6270ee8cc317d363016c452aec62fb139abb3d65946ee3eeef13f2716
+DIST firefox-64.0.2-cak.xpi 506049 BLAKE2B ca0f85f71f5051c3ee9f6d4317d35e6e6282519b6cff7fa9977a5da5d442d5c7e6a150f5e389559726daaa67c568838f820e7134231b80865ff184d401c28763 SHA512 8e84959925646566405f08215480b5c9bc9b3fb172415731860a344d2c4a4d863899c12eef031974fe8a2ec1136baf6e8f53cae6d8c0788c64c32425e0c3c004
+DIST firefox-64.0.2-cs.xpi 494716 BLAKE2B 519623d74f3e330ec4703c7fdb1a5d8292e373b90e0e403690025ec8272dd7291c71d414f75e35b410dd278b7c332149a2df04e47ac40b24e29bf30d50c05d5e SHA512 5a342a97c6b840797af33f411c06c0a0a58b0cd48538818558106b062b7a8d6d73a04d01ef4d2600c0aa462854db73943ea9dbe4aaa3d06b6479762d07679b04
+DIST firefox-64.0.2-cy.xpi 484374 BLAKE2B 761bb79afbc3403cb7b82b53922ba21c159557c8d47d84272ecccbd015b3031e1d4d595455f9c5323b336af601b7bc7d2e87271307be995e52efed5ba8d68452 SHA512 96df2ee443687acb091fbc4a421776ce2fcb8a4fe4bcd4fe02f05165ca5af0458147dbdd7ac9ca2b7a8767b00b414bd63f2a841d91c1febed3d5772052e100ea
+DIST firefox-64.0.2-da.xpi 486857 BLAKE2B 370d23536301ee76745dcb76d9e8a73f72b6f019e593ca609708a2b5315afc997b65281f50bee6ae4d6937ef359413bf4df6fb7e1d12f4e1f33d4bc372804d66 SHA512 55c6b4a67d29e51cddc0820dcc828d6b0b09ef1a2814dc6f0eea709c0e5e12ff468e47fcf752ceadb0d0f515a7c7542bf361536cb0ce4ca4ec7127f63db136d3
+DIST firefox-64.0.2-de.xpi 494534 BLAKE2B 161fbbc00a0b61c25c12c92736c26c1c9876a0907d55d44e7281c6306668811496f1d53fabaf4c8009c21dd69c765805a110f2e3026b09e717e0cb06a45ab9de SHA512 f29cf970321761600ddbd67f9815874be5eb6f27a793e9029a2c8cb23e5586bb5b390d193f4ca9a16090d36b29bac1a96e244f667d9d1c121994ed997e09cf27
+DIST firefox-64.0.2-dsb.xpi 504228 BLAKE2B 7b947bddd15c41e3ac88d6a213b0e94e28220a932da6555083589683650828a39d35ef9994249d8e9417c60ec67ca7f6cbb98c725495b1693f994cebf10c7cc2 SHA512 ab962beaeaf0b93dd5a83a80928b232581810fdbc2cccda75f813dafe38ab08d2388cdabb61dc93a163ddfd69acbbd8acd5c8cc3425a7c60d918ca9a78658dae
+DIST firefox-64.0.2-el.xpi 558816 BLAKE2B 2f7637a4d51d6e2e6b8defb839013ee69a5d797ad1b970cdcfc59fcb5bbb54594babd9de32bc32f70f33f4f3461e6539d76db87efd117bdbc391bc933a5d80d1 SHA512 0fcaf1dda90261dc6af88261d07a41d56869a90342aaf9aa5b9870d012b4757a7edcf059d395ccb42c0c1c4c9fca904fd84751f1f7363f74c8e9cb4d3b29a8fc
+DIST firefox-64.0.2-en-GB.xpi 440963 BLAKE2B 77390086bd09ca1315196f5146ec27a24613fbfc91c70635bb280f002dadb46a87e2766161c6396f65c45b051298446b44c8fb7fc6d32a1792b66a4083a911fc SHA512 7cc6b048e4362cc1513a57e47fd67277a2502f3dcff59e53cfefe38dcd8bbe1718a5d49c0a6f6a11ef13a510360794d665ea9ef886b8fd6688571c0490ef234b
+DIST firefox-64.0.2-en-ZA.xpi 424511 BLAKE2B b88d103acae64c0d19f1d88144336046a4b8f8a07a8f2050b3cd47927c20f2f6ebffa762b67c9965e1ebedcbdacbc06919f29a62a348ccc65f89ed57952b1328 SHA512 102b07d706d4da8544f8d3b9d08fa8edbac73196ad7f4ca70a64326ad8acdd21c9454e4bda70a36c886e4fe14e9ee19766ef9dd47bc5cd313f4c4f89c2d452b4
+DIST firefox-64.0.2-eo.xpi 482464 BLAKE2B 294fbe830e388e5d779ddf6bf6b42fa3aa67b0533074b08d25a9581b6d56e9e82bff75b267a98036ef757e7e3f8f766d28cf418317c3c5b4d2bac829d6fe1930 SHA512 efe9402c93603200d5a2ee922f182005d1895166e9e0c552e8419c8ed250e80feaadfa6805abd587f09fc02a941e5473733e35086eb0afb5062304613fc762ac
+DIST firefox-64.0.2-es-AR.xpi 490552 BLAKE2B 20e7bdc2e9b6e4c210ee5446827c20d26d4f6d211e865503e5e388ba8944f1c834462df3db86712542c623886f86a9ea9816154e61489a0a9842fcb027ff2daf SHA512 975d4b3ebbe27fb31057a27167d96bbdefdd6c283a97300ba5e76220d5c934ec984a23431c4026efd92ae865dce8cb4796ce453f75b3e09f65fd44f9ab808e52
+DIST firefox-64.0.2-es-CL.xpi 490258 BLAKE2B 00d0c967931709a57ff69f6198ce1e5b9c37aa29993532326c892411d8e7b6a52b84155d1171ecaf6e7f375a37a01c057210845adb1acad80cb7e3e3584ed6cf SHA512 a85ac912c2891c4646e281613347d12a348b241881f2a5d81a756861c8cf58591b067be5ddb082e10b5fca0b353b24e0efd02d8f1a9fdd99a942586bef049151
+DIST firefox-64.0.2-es-ES.xpi 437812 BLAKE2B 5e8417584b9d6325264dd32545f933bb5833dafc42577b76591e653f5288fd12de4334cfe72e3bc62ef6767296b0c13646f91d7070056a752a9e9c34b6f2e529 SHA512 3548b965bce3b3dbe9875111fb821841d7f0ee4deca11b216ddc23ec375bd97c1fc7177ccc865ee3a74b872a273da03d90b718d8344118a1c2b0417e10395fb2
+DIST firefox-64.0.2-es-MX.xpi 493155 BLAKE2B 10b0ef179f1acf91c36a90fdfb208244868765a42a77e1a828217720029b089388eaf2ce797669af0c208c861d5591ab22c591a06d0424f45212afa25fb0a61a SHA512 105d92457e2a0cb85f7d26576b1e059f0a34c3d8d3da13c36038091f66af615a116c9a755f69fd892b110a16d6c9119fae380206cdce0a5608a3353098000979
+DIST firefox-64.0.2-et.xpi 473521 BLAKE2B b6c65fc2490788f58b07c733d0ab53a175fe376c5e52945cc74d8ba361b3a5acdbcb4f5ff0d1e740d3a87e4581f3a2cb44c47e54ad2241592d7eef0a900f378a SHA512 b2f55029daba3a25500c78cada52c914393caea4ada2df5975c06b5e608b31bf995dc1a5e525154aeca8c564065f7b2ae4b4ef312c8c87d1221fa860b2f331cb
+DIST firefox-64.0.2-eu.xpi 477299 BLAKE2B d6f91e4fdf8b335c3f5d49f5091e390ee6946339fa47725c393f10dda3df14345d155486486af71b38dc2d38301631b66d84c5597789da918e2fd440bc4cce22 SHA512 44088c0a2a5b0a2a18a6f05661990a4eb8d9c1cc5c21e3b5f561c6b67bdb759a346807db13ba045241e857126da675c1c6d3733eddf5078bf48f45a6ddecb882
+DIST firefox-64.0.2-fa.xpi 529980 BLAKE2B 377727bfe3af82fcec9b115ae9d85fff2dc740331c64dff60e66254ec66df98a955161514fc3784b0f6d166bf595f3f17ebbf671f2f1b777feb473b6017bc51e SHA512 68aca86834b27a7309330b734204a5b2aa97616c521c50f225360c3b7b8d660b66188ba1f2f6a3971adc9e228e2a21b1b0d205e658d01834505750cee91bf157
+DIST firefox-64.0.2-ff.xpi 470399 BLAKE2B 24f32e4452d2541bad09d8b4cb81678184adf285c4c89925fbc168d581de51920f1c6fe0b650a744172c88d6b0d5abd73e5f7222b74a83dc70ed4fd0d3ba2d9d SHA512 8033a71ce5232263c0219e0aa1ee1025665c1802f44ffa1af2a3c8c659f54d5abb3a4dd600fa172bb34a51f41d26d8bf9d11af2932eb00255d7d7f77b2745974
+DIST firefox-64.0.2-fi.xpi 470567 BLAKE2B 6b1a14b2518cf35fa2fb5549c9c3b6eb64e455458a6d4e25b112c53af85b3a69b106cfbb2c71fd03ada370fe5e089d489485df81ca3b785d9b48e2f0f780c58d SHA512 d5345d207559775367ae9eb00733c54ef3aa88321566363e0676f570270de0fdd1e2f8adfdd294aa078205996d2b1fee45b925e0b80a79304064fb4ac82da5f1
+DIST firefox-64.0.2-fr.xpi 499983 BLAKE2B 384e7a647c56c7b3294a510a06f8e3937dbff478c769a4cda5f43bd4b7f4a522ed403ac54dca8e70b6ce50b29353e3820cd632da18f798cceac7450fcafc760f SHA512 9c3f0da233b67ad307ad66a238d99378cbe68705c5fa88a61c30b6b0d790ae932d4ea80ed847fe20a628634671aa72316a47c34da76bb35403bb51a5477bf756
+DIST firefox-64.0.2-fy-NL.xpi 488322 BLAKE2B 20c1a43b40e196ae51580cfa1bc447876918d933fe3f10e9f51c16f7d3920673b7141671647df5b1dcb5935dd147e9e36fc624538e8ec86c3c64f1a4359dfd30 SHA512 ea38feed8439cd3bf0e9185c636ebe8d6f0fb3b11eb16985aa0670463a56916513aa74599614aded997f4cf5c1c81ecb46617cc44a076573cb26fe0ab6a593d0
+DIST firefox-64.0.2-ga-IE.xpi 474812 BLAKE2B 5c1d6864d7ac96a9c1ec6d9daf17cf4cc1d9177549c20c8a8384df536aaf5188cd56b8555480b2861511920bfb85cced2f7d631aa4722480794bb92a321140b4 SHA512 6c5bd0a76eff07598f1c49f1335113bb573e48feafca4b2aa62a5b17c9fb030addcfa4d9c63d2cabe88c139c557edcb15510c4142b09c343bf537a9162964714
+DIST firefox-64.0.2-gd.xpi 491218 BLAKE2B d3966388595a6865de0e1bdfd40eb5a348a60ca7ce1bc9cbcb626442782ead40a072c3187deb97fb6bd298bf472727be1a76728701cbebba49f279f063bb9ecd SHA512 eb61eb92f4d5f60e4a35bb79b0f32563193c8c2fa9a53f5b18f0421b2ebd00b17b6c30d702b4dcb37e230651b2ff9d35b6aab825d7232322502b0c267daddd60
+DIST firefox-64.0.2-gl.xpi 467038 BLAKE2B 90131de1c65e5ce56421b655c14093e5ef51c9d048ca2fda7281b951695fa64011f7f2c0fa152e38353f90b6135764281124b9be7c2702680304c0b64ee582c5 SHA512 4c56c8573b57d3554011b9fbe186e441b5b1721db79af0d6cc71e060a2fbf78e8ca86debbf90241e10ef439033c03b928ce3e28bfdfbe40958d84cc72b4cfab6
+DIST firefox-64.0.2-gn.xpi 497412 BLAKE2B 3ab2456c96b402c0c0854c478564483d9e2d66b003524de3b6af3dc08ff7cf5b3af50755088f3ed059423d76151eb8868bab16cb87698d3847bc3296f4d6deef SHA512 ab6272987f3c88e4f8b1c8428f06854622af875d0d847ae43a7c99a35d37b7f64fccd15ec39e14cdac8728bd4c29a46088424795b39bb98400defa700d6f6235
+DIST firefox-64.0.2-gu-IN.xpi 559368 BLAKE2B f37f51addf29deb5d2fc441a9c7d2b986f25dc32fe3a779e61c65ce7ccc331abbb243d18caba7cf3b76937b443d0c73b1cbe1d331450fa7835f5482f299f88df SHA512 9e90e33f1acc831f7e6a9f3af319193320ac935b921ce925f7d408d98cee9582f641813f615eb388f4c9ea75b1165c1f8e65b1458a80260e0913484a89780f30
+DIST firefox-64.0.2-he.xpi 485007 BLAKE2B a3733040a79a8cc6779935e366ae8d6cab213b63441902b862b6ee428e0404d3aad07098bbfd59a16ed71aea77e4a7200112bc30cc7dfbcf4c3356c1cc98c3aa SHA512 ca230e8db7e00c563d0ff979a8f0d2f5b1e909bbde0530a9134323255386bdfd7b232a6f0ce49ee046879412926fdb1bc3eb6de334f7900b384fce3376c7ae3d
+DIST firefox-64.0.2-hi-IN.xpi 544063 BLAKE2B 5de2fa40ceaa8b7ccce6eaec588d585a01147af3f3bbc852675159ca0900033bf007c80d5375ff6a1c85cbaa34968c5128705b63befdb394e39f602ac68fa464 SHA512 d58a8d42f7dc852a8c8b9306ffe0a3bb75a8c6d23e0b7f36de2986e76e314a274be5e335018df2fb7d0365c7c1ebdbf8b86e00c267825de47207c386883554c7
+DIST firefox-64.0.2-hr.xpi 464610 BLAKE2B 08eb5d1899e21b43d8472c8bfd1defece6602200c09c1970e81ecee19cfed51c222c99aaf809f1bcda5d337aa55c81c61d4d5bf0d6094af9f6c20448df2b0e00 SHA512 c20c63046ff1b71e15b53c506e56a6fff0c481d8c42f62272800458acafd82894964c7aeaeec3b8075b6d5e53a639d5b95132c8f069ee2f051d02911c83818bc
+DIST firefox-64.0.2-hsb.xpi 503936 BLAKE2B 95a5bb78765d26f84a20024805b0a306f158548df563fd2049643193594b830db31fff47f0eb56ff3c4a9b97015376bb25490f4f49dca0a0033bd944aaa47a76 SHA512 112f9cbef5c8f3de6bb5dabcc2f0af2d3c9cc2743856bb4c13b057c5af5c932852a2d94c5e71603f40ff84d1b61729bd7767376e671edfc6e6bc272b2c65ecf8
+DIST firefox-64.0.2-hu.xpi 501541 BLAKE2B 9350b32efe786ac702dd42cbf661e1fa43d1df24978c937704ffe6b1937680d89eab262a7d9f06abbc4a3839376a66520d94bb0da4d4ad6ed9642460b138be29 SHA512 0569c155f545657e9eb4898bc5a5a013ee37d58d77eb58804bfec9d6fc714a7a5d789cc286cf7cc2d553bcd2f279b050b9da0561e698b22b8c62e775dd07efdb
+DIST firefox-64.0.2-hy-AM.xpi 520949 BLAKE2B 59ad3c907e28829a5332c8520dde74b906628e172a916233c730c2d3dac64655cd6e830cf4376cd5d0e5f8b12189e7c7f3d18c924ae05ecbbbb72cb5452409b7 SHA512 beb0adc0cfaa9902c26f1ad1669d1c7dd027dbed9d410d81ddad956f05a28a9c65d64f0226ec8a76a20aa9b5495d718421949f5676032fac57d646a14b37c6da
+DIST firefox-64.0.2-id.xpi 471527 BLAKE2B 5b4b324d8605c926c5d2c16cfea6191809e4b0bde1257f4b409a252230f2c3d0aef06b32859484a7f24145b94a5fd609895bd3e2c4b6f70594182e562b6f5cba SHA512 4e6776e687fcc47fdd584aa48254eeee42853ba5b7945c9754c9986fc3e218be2baaba33f4acea88480d126f05b5753e070243f4786c5680a770676c9dfcd41d
+DIST firefox-64.0.2-is.xpi 469905 BLAKE2B 97847b0ce45b29ea97a4af333e18442287d2a7130a7aab3106009aadbcf21c886394f6c355aaeb5c8e61b18863d4387da5db7c1ecedf2a350f559f6105765edc SHA512 19efa9275e04e6da47629777d8d4007c7499af0470f4f74d76f104dbe26a1eecad5e37a5182127bad4ba3f97d36557aada233f3e0bf63c8c128576e5518a0667
+DIST firefox-64.0.2-it.xpi 355575 BLAKE2B 6f0a4ffe45009c67e508d791d5a0c3d855c7ea44c65b6343219ec8cc8fe4852beccc47d4ddf87a2b7c40daf7b4c1e4066e1652c43172c201fe05651e3adcd50e SHA512 f1c2668384f9fec0cae7932fcc82d1c245e1ba23f468f92e9a05bbfa517d561541833be6c385823d130277099fd404efc7139c7f901aff44d21c9dc5bc3862a3
+DIST firefox-64.0.2-ja.xpi 516116 BLAKE2B e8a01a7d3a8e79fc1e9aafb7d6abc171d62d5e377c9421a67b6b5c31d9cf4f5ea003b0dc5d681aa90102f305ac2e88ebd96965d19426adaf26d5e35577ba64ad SHA512 68a6a21f8e7ef6fe4b47b71988714f0df1bb855bf0816fb48a1c81c69d87b66dbb708e5c69e9de5cd1320b98744edaec0baa40f867173815728887f9e091e1bc
+DIST firefox-64.0.2-ka.xpi 521857 BLAKE2B 47c42d4fff8cffb3b4e5a14b1a66ae6043feeb70fdc8741ace68935f73617377227e7b106316c7a792215fa8ae4ddd3d0518f3a85da865574cf230490d37a6ce SHA512 8f24486e7402e67ceddd051255c0d43a7e4b1c4bc753e3f17caf2e4af49dccecb83fb03d4f9afcac1099c9742e2516115b24299022fd8bf871fa416b083a2c27
+DIST firefox-64.0.2-kab.xpi 493582 BLAKE2B 97d162f42816700c3d4c65a82f949101e02cd1fdb404822408019431227f2639e03f4c279ad7c52ca0fec5dd73336c85548cec3ec775455b1941970ff8ca1ed3 SHA512 3869230cce3856f4730d1ccd488391b18cae9f0043094a32b772a73bb4d0457a6dfaf580d6f43165b634ebe79601de14e0fdc772b4704985911fb0a9f44b1aa3
+DIST firefox-64.0.2-kk.xpi 550187 BLAKE2B d0c5d62a38e90c793bd51057fc7463b413c07d6b9fa4ebd8ac9e66836e544ff5ff4abb39bc73fa16139c5449ae281ea0142e4d72672b94c4f75e2e75aa92094d SHA512 30adda4beddc73ccea23726f67c2849fc45b6dd69497961b3b46463ac684bd2d4a194314b66424b9a33dba2206cb5f75d49eb4f237b5700784904e9f50fe4ec0
+DIST firefox-64.0.2-km.xpi 535444 BLAKE2B 042f62fbd4e4c1179c35d2f893129a0c5f09b7dd553ccdcdf1c206c598711a7266c6119f8f2bcf99b482e4643ef8d092d0bb2d704960d978963b9828efc8d070 SHA512 52aacc5a427742a9aea1c94112dfc75e7908f88acdf66dc9dff64cbca892040f541386d07ad604a8503d61906ff86399b1431edb87ec635c819568fc4d079802
+DIST firefox-64.0.2-kn.xpi 538358 BLAKE2B 723124232987da5e4e9f7de089117479ff4c4abc9f6527e12839f27df8779260cab51fb2b1896bd5866b0bb423c04b576bf6f1e9e0a64060f4374be6a0d0cea3 SHA512 0cf2c52900fa1e618b6b176ec6e25143c8a6b7d0110cd2ae20aecd5855d8ea2eea7cb392c9b8a4eba775349c6454e8461f627ff6d07ac922adb8d5cd0045b679
+DIST firefox-64.0.2-ko.xpi 500865 BLAKE2B 4872b5a4ebdce1c2ee496e249ec4a61ed230a55174d8b4288ccb236d59804534f9826e2c244084d18414b25bd6a634d6fd21afae77a275427241d512e3577fb6 SHA512 bf4cf9216be36447e46dcb1a286e416e9a8baf5bab804fe26624e957377e41de8ed9e958f879750c89209124520c27453feeeafd75267a5c712d792f4408cd3d
+DIST firefox-64.0.2-lij.xpi 476187 BLAKE2B 6332f78d23c96e5abc527eb3e4187f4f29d09ea31e3525ec9a4fef27b45af79969da2b303db5fa95da231ebc3e977d9e8be88b300067b79a337763b7e5ad09c7 SHA512 a5c64982bf9fc0788d0308dc9f71a90ec9f7ed8d83684b6b62818f7cbaa62d77bdcced690d622249040701ef633f51672795bda8273fdc137986ad40aefaaf50
+DIST firefox-64.0.2-lt.xpi 504609 BLAKE2B fc8c0ba1fea8f40a34e4f5b3bc89f755bf2ace190edcb680c878cedb83b871762d424a299cd392f1b7cd5ac4fec9e9bacfdaa979a7ad9c2c5ce68f5e470f2990 SHA512 a7d04221420a99e17d0379446d0a3e46808f7d32c805ffd1e84e926f368407773dbebe4b14b5232d1664f2911b556de01512b2a0ceb2af844f7c2bcc7c1cd547
+DIST firefox-64.0.2-lv.xpi 490769 BLAKE2B fc91c7d6825555e04858917d01621c717cd9fee3c2c243b61fa7b0c3708cd351006f7cb7a967b0efb1598582e82d00c66389764db69bf0f2d304708c7a319bcc SHA512 56e674236867939effea86eda505b2b99027e7012e6808b45069eb02a2eb0cb23feb01adee0cea9d98c9018acb207f5a92e7f629a1ffefdb6736904a51972225
+DIST firefox-64.0.2-mai.xpi 496201 BLAKE2B b78fed0dd500ea734baf08bafdf0b98e4d45dd9d83bb6f05c042e806b314eb5beadec1fbe712b5b6e3ff64fad7de9af4971fd259286ad9d29d22e48e8e60f503 SHA512 5a90f377442bd362efd8a3440345a046154b651c202997f1541f42a2faa43b4e26a1cea14393a8fca4c329d458baf6693d96cfa2db9226d6de34ec4415252600
+DIST firefox-64.0.2-mk.xpi 457993 BLAKE2B ffd74e88d263b5eaa258aff5f5f350ada9e5dc86ef020851c4eb13797a327e335e77c0dbbd2654294625a6519a81ff99262169f924bab49ec7cc5805322abd20 SHA512 29f3f9cba2b1d10ad21e4d2c0ba723dc7fca54ce5fa89ae131c00b73e2785707e5b4f22660e5c71ab42b3e001164b868f1afe12f7d86efed53abe01545a6dc24
+DIST firefox-64.0.2-ml.xpi 542332 BLAKE2B 5cd646e15dea8caba3810e8c65fc0a73f5bb336e1e5bc53dd0b49e8fcc1419bd27978a7ed2d86e6200e77cbd4ff4dc74d3f93ab33d9d131a4a45d71d684bf0cb SHA512 c49dafef8479e281fda02785e2f751ef75760f07b79867487cc13002975238bba1021dbd7403576574244da67c0f51645ca9f889ab537aa825d0db0331ac1424
+DIST firefox-64.0.2-mr.xpi 540016 BLAKE2B 1bee8f442d49f3d0bd56e1624654b567cad96b8068c6b6c6875dfdc3cab7433a95a2650b653ebaa19275f349733154c2ccf85d796724ab1ef5126b486f3c5eb5 SHA512 b5127a3ae86d3f4445fe8e57f057f495f4b6ad67a0b3017ed697cfc918c467d6f5c12c734c7c94dcaf959ac03f49f5cc30ae40c5280c328ef3f4d77a60b7463e
+DIST firefox-64.0.2-ms.xpi 473936 BLAKE2B 4f766290db47d11b5e38dc49205adf6033d65a8974582440ff49a0c097d4b40071a1e996a989686f31edcfd5dc7b789765498ab4c1988bb7021c1c4fe6dd595a SHA512 eb8d54019e3a90c6b2beb73406976652713ad1a852466a88331677fbf622625557df6c3d479ecb9903e97990f1058c7457b9814eae7f74061f0e218f1b0739d3
+DIST firefox-64.0.2-nb-NO.xpi 473423 BLAKE2B a9e71b0570778761fb35adb0a94df22a31f22e4125c647ac7715ebb9c039d7efd51534a93824f4f06df0057077f9079667c3b846a6f4c033e394603c12ebb622 SHA512 519c158527bcbb02379b269088698018faecea0e37b3586ea9c3eb5795ec35497a0873e2af8a523731b17915a7f0e340b181d562c24e9c37a41b1027c6f12468
+DIST firefox-64.0.2-nl.xpi 465188 BLAKE2B 4cb114024132f2aa12367eb956fb10e77a717137b0dc105df95105b5ef23e48cdb4e5c56fd0b31e7844bd9ae29667969c6aef3712cdbaa9eb6abdf078285a211 SHA512 67383cc4d50aed4b9ce240ff19680b9cc7bab2b6d03f8ef97e378c8d9c5fd395282cd9c1f35f212b191e6dc838d1fa736d3f8562b54eb477b2639a7b22c73c9f
+DIST firefox-64.0.2-nn-NO.xpi 472052 BLAKE2B a8ebf75f8f213273a4d70ef292aa346dd85af8e2be911478d1a01e9eb4379226ba565e7e70caa0883def19f957c404bda3040a0f41e42d6001bdfa031d213edf SHA512 14f34e973716b3e160e23ff198ef526db1a225a5381c5a162eba031d45e15640967f0c7e2206a39e94ed998e82261ed6be00f52b7740089e768bff77c5ee1505
+DIST firefox-64.0.2-or.xpi 485456 BLAKE2B ef050c95283cba323e6b9a2c5fdbff4ff2b86c7930ef80191a2ba54de67c1c2483e73dab059fa31511dc5869b9249ce9c583ed30ae69dd49773d807c70477b48 SHA512 db86d3f5cd0dc4e3f2fbda0d11bbd5441e1003a3ff8b7d873fed9f6b7e17438f5ff062ac51ff25dbada0c9ccfb44bac022644a4bccfe9abefa436d36bee9309c
+DIST firefox-64.0.2-pa-IN.xpi 505899 BLAKE2B f07392df3d44a98e874237fbafd528a1ae83c4584bbc4cddc6957f63ba285e9778d3091bdfe220fb1cd736ee06cf10a5d26b3e74a4ac3fac4502c0058918794a SHA512 38fd3d76e5710151337ba6ab841a970321b3123bd911f62a02b04d6439327588e3cc3838a2a602e97e8319ad40d6f85aa2148564c75ce0c1949aceb983ca9c21
+DIST firefox-64.0.2-pl.xpi 383270 BLAKE2B a639ddc91f71d290f06d09652bce840d34679bff6b0e6481d46da1eb67a5f0a741fc12abfa61f4daa63a02685fc61fa10a9305af54a9786b621f401beb3d3569 SHA512 72839d72f77e8e06fd59236b07eb4e5d940bd33ff5a206dacdde370ef7ba979ace41687862680769e113b68979f8dc5c938c66dea6683a6c2e8fa170224129ab
+DIST firefox-64.0.2-pt-BR.xpi 475697 BLAKE2B 11b87c4d0571abc85547e41c53218aa8ea7d5ccaf6a4dbbc68fdeedd072621ace538ee3adc8de963bb691160583b7b6252ee85c4553984a5f5e3d39bf9a40ff4 SHA512 b7ff4c4e5a69a69e3ca5ddf09eaab7630b160ba4418a26728e8e6781adf390d9a305235f7c43e7dbf2b5c8bb84ca1f2a11e9ae2a9b0b4ab7d39335beab4fbf85
+DIST firefox-64.0.2-pt-PT.xpi 488751 BLAKE2B 81d2ee5ce88cc30271edfb5e3c877a1a58804b233b96956d9dd0b3598ba6b3a94efbae12155fb8308d059bddbdd4546ee39f9a924e04b9d219c2b6e95af0dff4 SHA512 8a64e25b810847d9fa9a0706571665e41cebc499b393d58b5d3e0fa31aab2dd693ef18b31ba856675cd9c12b8b6bb400304eb60cebb76f47fc522ff4b24bb840
+DIST firefox-64.0.2-rm.xpi 478597 BLAKE2B c16e0248c2b2ca3cc4b5eac55a8394c8c985dcea700da5ab164449002618b738a074660549348e54684d30b5f599c05335c59aef7f82ce3240d35bacf5849ffa SHA512 fbeb7e10ab25cadc13c56fb07c214487d727e9dd3b1b0c4b2aa474f20dc3936863977ee9fffc68db9d174fb9cdd4027608f7b6a720725a8ded67e18d7c9f28d2
+DIST firefox-64.0.2-ro.xpi 479969 BLAKE2B 4af6c32345334af2f2d92573b02079707a750956b31d273f0bfea13c9ffebca695419dcdff8c9a92c65f637f77eae888d4978a3628694daae898891a7f39fa4a SHA512 de49608064d5c577a54218a464fd9c3ea2b835175bab865b1d442aa62e0bec1a7a19372d1b5e9285f9b1ee5b7b12535876714d711f6295770198d0529b46e1db
+DIST firefox-64.0.2-ru.xpi 546349 BLAKE2B 6d729585c28f09feab0d9f2112017ff600904ae071b436d7f6f55f715b0a973d64d808d7a0c4275be0cf970d529f68a5abc9ea1ad1c01ec002e8d4cf96c30444 SHA512 003fd1d091983e6e9acdf86e5d10bc43b05f5f320fcc8bb27a140ad5b8279b4a852a59bf7c9261b52805bb69948fd25da348e714f70deaf13fa7e5a98bb223ba
+DIST firefox-64.0.2-si.xpi 489565 BLAKE2B 0eb2823930b4311d28d5cf85be06c610d481c9c2a3bb586cf60118a9de35a6c3c6a58052030bfc3b60ea2116ee5561681a46dda0d5bbff02de64f0ed706398de SHA512 2e3678d54044d8bbe3e15e9615edb52a94a4ee3625a36badaa0e33ff80c3af2da47aac947b2e090630000963e8059e1eb25250ba18bc27f592415ea4418527b4
+DIST firefox-64.0.2-sk.xpi 504065 BLAKE2B 1f43ad347017d09434571cdb03a046a8a168b4ff4142124865c8ccaac55e61e0d4f8ff23d69c159250ae9a932db371b195dadd3503a2153d39cc5f335b8f34d6 SHA512 e4e0d08d9cfbf3bcfd8feca9886723da921bb57f1ba9fa68c7299dfdf281ff012ab6561507799c3338005b7cb0f7a612f6a130c2440af27e59390559bc04f38f
+DIST firefox-64.0.2-sl.xpi 484992 BLAKE2B 8c4f150a78315c5c87dd325314e132b6527bf87a233ac1db64ace1abe020f2e9e7aee8688cd7903eed62825f41129c3a46c03bce390179d92446ca9f33f0b5f2 SHA512 e71c025d9aa584808e5a1ed5e2adc52dc16a7a8b6832e71038191e3220deadf04379677956d2724e2d3c9718b9e632155a4be1fb8c75cda1d512b37ec59953be
+DIST firefox-64.0.2-son.xpi 449000 BLAKE2B 3dfbfa3147aec2a99c63987828f55d81a7ba17624acc32db9ee3c3598a0b0cfb2388732c8b5fdcb12730eed85a8b2e6931e8d290fde406930ef092a9430b8579 SHA512 b71dd3d4b7df3498f0739141aa267eee5c60b68acb2eb3face4d69a7657eb1895f994d7b2588678f7f0f62022dfb9f88b3fd886924df5a393e088fef35ddc56c
+DIST firefox-64.0.2-sq.xpi 492689 BLAKE2B dfba4fe249b43671703ff2806c8e96d962c7bd55e6c0af0e8118475d0b6291670c08d97cc97935f43729b6c578983ff7eee8720e84b758a07828f35e9a9bf933 SHA512 67ab15e1b2ac06a64125e7c1035d3d3f71b7fc567588008f6e1f2848cb04c49516ac0665a6c24588fbd17a5044a7ff2f8d35666bf807bb90422219476f66a7fe
+DIST firefox-64.0.2-sr.xpi 506364 BLAKE2B 07cef3e98db6b66b318aa88d819604829d4fa9e6d6da3cbe05b8e9c7ac1bea292b29ed5da038ecffb4d2d020c34af44461f4a8b091512460cc6c72eea6d68a74 SHA512 6e18d4d9289a29f2296ccb3da59c034345a929ff587186b7f6256792dbe5499d000bb52fe5d01db26533f7613097be8461d7c4c630b7d481c827470fcefb368c
+DIST firefox-64.0.2-sv-SE.xpi 484139 BLAKE2B 2c212876b5f3af1270568e3cf84f34cff4cc64a01c9db8fdb47f53d2f74677ce2d9cdeb276fe200fa1f8e520cfb46155be92797dac39c8357cad8c51951f4820 SHA512 29392df3f539c0638b303c9f0cf93c0144c6c9645d9f1c3c1e3382b3d0789a9c64517c26275a97f9a68ae8e8030d163e464fe58603165d01931defad0d5f5323
+DIST firefox-64.0.2-ta.xpi 530880 BLAKE2B 535e98ad3c50197300b32264583b7c28c572766029c7a9bb987614238f52ee5b00d6d6d639d0f2f4b17ca83a57de9a8607ab19c2573e50c28600cf59ebb750d3 SHA512 259004ce7fd412e2d682f3a2daa16d9a29de9a655613902adc809bc81295203d1b13cca16c2214c4ca996e8e5ab5b06ded03ab2e35e58983c56e42e2468fa7a0
+DIST firefox-64.0.2-te.xpi 547601 BLAKE2B 09bf98a3f45d5339b39eee9999e6558e1bd838f99d1a99b9969bd5cc52dfc7c2691d02bb79cc9e0bf57eaaf254bf2e16ff123eb593ea0d59505f8861bee85272 SHA512 1735025e810de6ef6fe26799068d3f49c3c688d3011f4c9df4d7d9f786c041579fd8c45f6a0b1e90954f008fb2e48e776840c0bb3e5f6cfdfc162108f873210e
+DIST firefox-64.0.2-th.xpi 508207 BLAKE2B 3343af73464e1d56e85b6929aa5f3ae2b685f5c79dc12507d067c83a5af0f5efd36ea56fb553808daf1321342e0c23ce7ff1cc00dee7f887beac4ffd77f9b5de SHA512 f242e503d908969908076696e0cded3f35356493dc019acd5788f6c0a9d8c06ee23cbcb3f7800f9677e916c3ce649799643544cfbd30041537273eb8fa61e331
+DIST firefox-64.0.2-tr.xpi 494713 BLAKE2B 6edafaa5f1e397bfb5e6cedcdc4761932548d774b356160f7b5cbab54b7247f09d1e6d62a4521ceee5915584a5d7972f3d1436512c1b9d325066f137ac606365 SHA512 aab01f4acc6a450a4d21ea23fb8142b88e238324443c3522e5ebfd4e08ac5f1a5db6ded13bfbb69291e6de3c7bf186e3d7b052da3403596fd0154cd145244bf3
+DIST firefox-64.0.2-uk.xpi 521003 BLAKE2B 39738718031ffc1a28b5e0001ff777a7a4cc5e0ead1c38ea3152338b2da8fe0372b0829ec5e8c480ce46e8a2e06a1992bb910b74e28e4d6a58e4545763c54cd2 SHA512 e5de0d7a24754d5d867cb9716019640d291087249deb03e506dd37d948bd36f04a96941154243b84e273d2b795ba8a56461671c0b20e1c0780ccc98b3af1e164
+DIST firefox-64.0.2-uz.xpi 466675 BLAKE2B 3b953b93a3888a9807f20c8b5271ab421c40129fa271680968be58693818a01aca306df20900d26a367cf71b24b0558c1bbff40a7176a607a9f8e7adf05922b5 SHA512 9d3aaf8cd79000cd43302a348fc2b237d7467cbe741c11c9271814a9375b69ef3a0894a7fd09474643ca518eba29f712762403db8f50d916750ffb2dc801d25e
+DIST firefox-64.0.2-vi.xpi 488337 BLAKE2B a9a37ef562a9c7caf22ffaa66a36370c198b9d4933ed0834ee1ca7e9c550f29d11c07d9821852a89978c706a97dda57f041a1fedd5b0093dd249337b53bf7a18 SHA512 8323594e134981d5c02ce64029d25697e0b32d97c2ec95b39e535eddfceeee2e58851de1fb430a7c4ff5f8f17e7ce812241baaeee775e01b37c9b9fa2da0ed7c
+DIST firefox-64.0.2-xh.xpi 463280 BLAKE2B ca5f0fa160388e50f22b9c4bc243b1a759e654035335f2330c25083feff6cabef36247f7a53289108408ce5b21a282cb4016ea063f8b229fed438c5a0b999ed2 SHA512 15452e7acf864375fa63b40a8882486970c3cbfc908f1558e2656b946fb3cb9ebf93342f92712e8576b49bd591190d15ad618bff963dd4fd70966f314ccac448
+DIST firefox-64.0.2-zh-CN.xpi 507524 BLAKE2B 950b65dd32218b6f4bb3d3a47742e8a2d208e4862db39d3d9a1ef09bf08f3d6eed0c2bd1ebddab0bf1dfeebb41da59aa492e18ea784517eff7fa0f199696eeb1 SHA512 56e758b51713599733d9df287bcccc4bd9bc6a8849b401b39cab9b04a8929f26eb2ab183c76f51f710c3773ce43c9d48585b35e52329d89463d4eacd66c871cc
+DIST firefox-64.0.2-zh-TW.xpi 510624 BLAKE2B c218ece3ecd5f38e73f384c5342b6725668bc7b79412f756ee5a6e97d2524fb879b87485e3771e469aa747d98159d22207c4a0adb018b3c821e12eec6dead03d SHA512 aae4519528e733a8629db0d00988d67d020fc23b55f54cb7ac52f5e4db627e256a9814a15649bb5e7812819589b0cbc9ccb066e857bdbdd889a16de3342b7740
+DIST firefox-64.0.2.source.tar.xz 273075852 BLAKE2B e7309b08bccd7429838510441a589003225f86cd5ecf84a45bf816c6d4d134acf687348195c2ae0dba2ab89e799e004462b215be6616efbc5649d051c96cc1d4 SHA512 ad1e299fb0e1cc35ef7414d6ffc50edb14c365fce7e9383ea82f77c9f38f408024e2941952ead5b39725a7078a43493617924626cac723a0518e4504a2afbfbb
 DIST firefox-64.0.source.tar.xz 271865888 BLAKE2B 70ab6cc51f80993dd2229fe4924d82a3cb83c8bb0e7f2c6a0930da3a4e1285198a774f48c55afb4095a37276c3af3c2de9c8a8cec17bf80162f865f114b14696 SHA512 1aaabcaf133f76edd1a92037a1a8ca4c6dad2efadc6cd97724d4bf4a5a6af63b662a68f9f8bfc41cf6482b44fbf4bf8943a0e82fd08cf9e2aa219b6a97fff541
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.4.0.ebuild 13109 BLAKE2B 801e447f2c1092d9a609a55f503e345124ae5ef2a0475d412db0fb0976f54439a21afd3734da065b9d232a0ff19f8cb0c185da086798cd3b9b074a0179bf34e3 SHA512 9fcbf423d429c7609646c45a0a9cdfaa36c0c0781ad924ca9152b80f7805cd5cb8ec4c2a4d2705132d4ce9d96ccb37e4d683692871f1c90c9e35e7417c91723f
+EBUILD firefox-64.0.2.ebuild 21029 BLAKE2B eac7a907d5b30232fb8d4cb5956f0375ca2364ce9373d9c2c6c88753a052f2d59a2ab52f826562b78a26b92e6e95cc7a6ddd48100f6b79602861c8c6d772f2a2 SHA512 a198dc420d93801a9f9198563fd00461ecec8d1984684aeb041f46bef5c51f002ba6e59edcd3aab93a8fe9ba6f52bee4befdce8a307157ebaf53464c96ff612b
 EBUILD firefox-64.0.ebuild 21029 BLAKE2B b2efd97d8713756d7a594b7e8bed66080b62f8da1f9b63bda0f9fa842d0c65552c298d95d3023eb787587cd55447cf195e8ea632a2ca972bbf3dae8f0ed11ef7 SHA512 f4addd905f0b3125573fb2fedc0e7726152f63135d9d798885c00a4e71dc26025a3fc7aafc82da29c40b7ffa2d94d23d576de3983be39a49e669816cb1e499a7
 MISC metadata.xml 2290 BLAKE2B b820d2a49926c5b313d55161a92e94ef88638a2c21d80d346a0cea93d2d9d2f6e81f23c45d4f4b759357f19d91f4162445deda77e8ef7dcc87fb5bafc4bef930 SHA512 42513d5043efca1f8cf3cd6e9114a84c2013c3f782dfdb0f2c1c3a27b0b1d95d889f032b0df7b75a3c97d07782f70fdc316e2944fafb2a140d191ae4127857a7
diff --git a/www-client/firefox/firefox-64.0.2.ebuild b/www-client/firefox/firefox-64.0.2.ebuild
new file mode 100644
index 000000000000..00210e2d6c19
--- /dev/null
+++ b/www-client/firefox/firefox-64.0.2.ebuild
@@ -0,0 +1,639 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE
+gd gl gn gu-IN he hi-IN hr hsb hu hy-AM id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-64.0-patches-01"
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
+		mozcoreconf-v6 pax-utils xdg-utils autotools mozlinguas-v2
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel
+	jack lto neon pulseaudio +screenshot selinux startup-notification
+	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite
+	system-libvpx test wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.40.1
+	>=dev-libs/nspr-4.19
+	>=app-text/hunspell-1.5.4:*
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-icu? ( >=dev-libs/icu-60.2:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-sqlite? ( >=dev-db/sqlite-3.25.1:3[secure-delete,debug=] )
+	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
+	system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.6.4
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	>=sys-devel/llvm-4.0.1
+	>=sys-devel/clang-4.0.1
+	clang? (
+		>=sys-devel/llvm-4.0.1[gold]
+		>=sys-devel/lld-4.0.1
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.28.0
+	>=virtual/rust-1.28.0
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )"
+
+REQUIRED_USE="wifi? ( dbus )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]]; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]]; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]]; then
+				show_old_compiler_warning=1
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]]; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]]; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1423822
+		# bug #669382
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach build --verbose || die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if ! [ -L ${lib##*/} ]; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9"; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index b8b9a981f3ee..dd162bb17c18 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_72.0.3626.28-1_amd64.deb 58370832 BLAKE2B 2a5ee1aa18ce6ffb639dc96272856d10a7f53b94b83cc7ed85f227801319ffb0a2d1cf5fd63846d971d2e8c1ed8197af41d3a16a456a4ba389308e162e64ec2a SHA512 11715dd1fa4c8bbeb542c9acbd71a42b1e7836c4a5f2e1e24527ced985a366d18e1152fc8d029b2e00a89b7ffc0c087fa4152c0199a7ae6bfed66daf705184e7
-EBUILD google-chrome-beta-72.0.3626.28.ebuild 2896 BLAKE2B 9fd512b6547bfcbe320a9c07b57a6b8726ad22b8cbd55806acffd0d7ea929da80ef996eafc31bbad96715f235d4cc02495b3f6c2011f0eebb9741a43b6689c55 SHA512 51633ebbdcacdd5772d92af43078fede35103065b9e26ee483afc11920731f6c66a27603b353e717ff1d1901af60822793fae92c15131deed18dbcd55b6b3e54
-MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
+DIST google-chrome-beta_72.0.3626.53-1_amd64.deb 58359656 BLAKE2B ffdca1e247ac37081f465bffc16c8e20eb184347379ac7552829237406c677c3c0628a207f58e488f6d064bec54b4f73a6260e341968af8cc1beb493c0aa0c2f SHA512 8751aff6c603188bbb2d89dc2973186f4ef478fab8fab64f8c331bbb08d51383747e17f155a362713b49bbb4c172f6a5015854c621f03b9739d25fe26bef3a4a
+EBUILD google-chrome-beta-72.0.3626.53.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.28.ebuild b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.28.ebuild
deleted file mode 100644
index 241942e8c8f9..000000000000
--- a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.28.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	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"
-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[X]
-	>=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}"
-
-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
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-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
-}
diff --git a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild
new file mode 100644
index 000000000000..e75218fcde20
--- /dev/null
+++ b/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.53.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2011-2019 Gentoo Authors
+# 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 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
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	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"
+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[X]
+	>=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}"
+
+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
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+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
+}
diff --git a/www-client/google-chrome-beta/metadata.xml b/www-client/google-chrome-beta/metadata.xml
index e858a8b1b226..efc44e903a57 100644
--- a/www-client/google-chrome-beta/metadata.xml
+++ b/www-client/google-chrome-beta/metadata.xml
@@ -9,7 +9,4 @@
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
 	</longdescription>
-	<use>
-		<flag name="plugins">Add system plugins path to launcher</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index e290fc6ff740..ec23ce205eec 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_73.0.3642.0-1_amd64.deb 59596010 BLAKE2B 4cacf290f671984fc1426b11b5435a2898dde2ad61668ab7db7652b0376a3012ef6d221d72fddfe40579033e96fb16f96025c7eebd820ab7f998d8d4e05349c9 SHA512 ae41b9801ef28b2f5e569b9ffdcf580b0f42fc2e3725446d9d6abfcfcc57f477e336f8dbd4f5e6d502495843d4d982c9cdeeec29b43078e3e5593ddffacfc096
-EBUILD google-chrome-unstable-73.0.3642.0.ebuild 2896 BLAKE2B 9fd512b6547bfcbe320a9c07b57a6b8726ad22b8cbd55806acffd0d7ea929da80ef996eafc31bbad96715f235d4cc02495b3f6c2011f0eebb9741a43b6689c55 SHA512 51633ebbdcacdd5772d92af43078fede35103065b9e26ee483afc11920731f6c66a27603b353e717ff1d1901af60822793fae92c15131deed18dbcd55b6b3e54
-MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
+DIST google-chrome-unstable_73.0.3664.3-1_amd64.deb 60498524 BLAKE2B 5a8bae4e27f52add82a166a79bbf817bbd1a6002cd9b6b8a6382430861ba53bbc242e25ccb813dd537ed05866d02ff36f62530a3f1b961853ea8b078d33afc64 SHA512 e4afbfff8f017ffd162f1dc1057823f097a0205236581de32903fb6afbf1e30117c857bada2728d6f71144d0980c8e6ed13b83b75138212b38f71f754d6ca02e
+EBUILD google-chrome-unstable-73.0.3664.3.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3642.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3642.0.ebuild
deleted file mode 100644
index 241942e8c8f9..000000000000
--- a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3642.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 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
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	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"
-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[X]
-	>=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}"
-
-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
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-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
-}
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild
new file mode 100644
index 000000000000..e75218fcde20
--- /dev/null
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3664.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2011-2019 Gentoo Authors
+# 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 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
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	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"
+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[X]
+	>=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}"
+
+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
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+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
+}
diff --git a/www-client/google-chrome-unstable/metadata.xml b/www-client/google-chrome-unstable/metadata.xml
index e858a8b1b226..efc44e903a57 100644
--- a/www-client/google-chrome-unstable/metadata.xml
+++ b/www-client/google-chrome-unstable/metadata.xml
@@ -9,7 +9,4 @@
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
 	</longdescription>
-	<use>
-		<flag name="plugins">Add system plugins path to launcher</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 246d36186cc7..c558f2b5d152 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
-EBUILD google-chrome-71.0.3578.98.ebuild 2896 BLAKE2B 9fd512b6547bfcbe320a9c07b57a6b8726ad22b8cbd55806acffd0d7ea929da80ef996eafc31bbad96715f235d4cc02495b3f6c2011f0eebb9741a43b6689c55 SHA512 51633ebbdcacdd5772d92af43078fede35103065b9e26ee483afc11920731f6c66a27603b353e717ff1d1901af60822793fae92c15131deed18dbcd55b6b3e54
-MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
+EBUILD google-chrome-71.0.3578.98.ebuild 2896 BLAKE2B 34fb316fbce2c5fdfc5144c06f63fb97de73f83ef0829e7443594f17476076d2f216e46f279c5b67a96f66c71d5d3489e2a4121ff7baff92bfe3dce59e7657cb SHA512 91b925714532bfa0f4226e62f4e836f68ec042f6b87cb00b34e1cf90d94dccf7020c012466ce8251294bad6e2250ff583f3474c4790cafc002b80f86bdfb95c6
+MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild b/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild
index 241942e8c8f9..fd49af6a6c8b 100644
--- a/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild
+++ b/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2011-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-chrome/metadata.xml
index e858a8b1b226..efc44e903a57 100644
--- a/www-client/google-chrome/metadata.xml
+++ b/www-client/google-chrome/metadata.xml
@@ -9,7 +9,4 @@
 		Google Chrome is a browser that combines a minimal design with
 		sophisticated technology to make the web faster, safer, and easier.
 	</longdescription>
-	<use>
-		<flag name="plugins">Add system plugins path to launcher</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 7d3c78d961f4..95a1c0e876b9 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_58.0.3135.26_amd64.deb 71564916 BLAKE2B 5b372f49cbf82fe3d9b8f9fa1ad4e0eafd2cb072085c2608f9d9bd774cb4fbe76eeca5782f7a12b9bf5c8814008b9b10bb17a68307f7bdb1a78b66b6bd0281a3 SHA512 3d427347da30c4ec333aeec09e60a0fb1297b9a7d26236eb8c04621922ac736225cefbea8cbbb20cf495fd106e87dc0b90cb7be7723b6e00f0ad033272643dde
 DIST opera-beta_58.0.3135.30_amd64.deb 70660872 BLAKE2B 2f18f3e17095f77e6d4087df70373b5147ace2c7dc03e4c5363147f3b3c7bdac38e1763c33ff7cc587be51a52f9e0af8b1a02008b1274b929c47b5aee0f7ac53 SHA512 a41c27360242fef945ae51f82ebce480c5c5d16ceedb7c379c83362d0e9fb5f3cd6baf3dc040e13dcb7988c9d048ea07416237a52d0cc1290a315489ddf42ef0
-EBUILD opera-beta-58.0.3135.26.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-beta_58.0.3135.37_amd64.deb 71184580 BLAKE2B 1dbe7aa5f52cda02b69be045fcc30c474582a48a0b720d4b1567e91e117f8b3e64c8ae4ccaba4c2c3d2f89ef300a58cc9638a36d737d56e060a3442bdea3cbac SHA512 2aa35696b408977f8d981cec88126debb5c704c00b26b291a74b0f8011125dafbfce30b2e211b0d87e18c3a75bf81b2b5441f6e144325ed90dbc8eb7f2b9b16d
 EBUILD opera-beta-58.0.3135.30.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+EBUILD opera-beta-58.0.3135.37.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-58.0.3135.26.ebuild b/www-client/opera-beta/opera-beta-58.0.3135.26.ebuild
deleted file mode 100644
index c09ad3685d1c..000000000000
--- a/www-client/opera-beta/opera-beta-58.0.3135.26.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-beta/opera-beta-58.0.3135.37.ebuild b/www-client/opera-beta/opera-beta-58.0.3135.37.ebuild
new file mode 100644
index 000000000000..d6081fb28694
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-58.0.3135.37.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 0c8ff1c7b7bd..1f8a97e616fe 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_59.0.3167.0_amd64.deb 73096270 BLAKE2B b00420395ffed9e2256bc1e2e751791201eb06eced5749c20519e1575a9fecfc1830f8235d6fa45e32b6ebe11a697018468bc0611b9f7e47ef3e5bfd1f210d21 SHA512 0d2f54678d526b99c3c41e31f0396d0597412f83ab58be6965117a03d150f889579df447c2a1b99744ade59ffb49f303d2e646955ce91cd5e57d0c2d28baa2b5
-DIST opera-developer_59.0.3173.0_amd64.deb 72521136 BLAKE2B e3a819b0795c10322be4d586ef13852becb583ae38eaae350447e304a74a0a3bbc0f114bfa268222e2ce03927c20dfe0f152b9791bf746279869d7c0990c2d93 SHA512 164bd8f5b44c13f561c9a22a5c44192e74302261bc74d0d2bf11a15c1ec0449839cff4e5a05a6d3abc0e0aa0e686277dc447d4f5757b9e3c1399a3d20fcc2e28
-EBUILD opera-developer-59.0.3167.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
-EBUILD opera-developer-59.0.3173.0.ebuild 2339 BLAKE2B 865b0d3cef90b685da9fd470ee34d9bb995c9819064f85cbdfd51c7f8d9459b301a40dcfb79cfce18697e6fa8131d13f6742b4515fc3c35a693f6dc1628d7769 SHA512 b2a13764856fb0a40fad2d03eee09c0bf6518db057804f9314cae5eb4c783c755eadcabced18c705355a956e588983ba9c94567a4fa73c9145ee53d7230ef886
+DIST opera-developer_59.0.3187.0_amd64.deb 73236498 BLAKE2B cc1ebaf1705da1dac521905a519ba1debb4a2a712a7f3240dccb77a352a75091da9dca74e90fa642790ee9031fae848626ef345459b2e763849fa86738dff2a1 SHA512 1bfa59afbc5ace1059364cdcd3bcc58dfe0b03aee80c3473386b0e7f5b864e8c96ef5e99862807c38ddc8a699c164180ea67cb52b03221edf9c10814f794a2ce
+DIST opera-developer_59.0.3192.0_amd64.deb 72188416 BLAKE2B 4ac927a7add23f8bd8b0feace60c387815f6653ab9e49633578a8dc599b252275b403e412153cf74c9af17a48817de5fff01254c954c48748136b5bbd32bb30e SHA512 e1f9be8afb80ebe378b2269635c4fb464708a72fa71fa9cccce3d72b0b6d5f9b982dd892ff9e32fb6e2ebff764603147d7fc2c954ff399b214d98d36651ae345
+EBUILD opera-developer-59.0.3187.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
+EBUILD opera-developer-59.0.3192.0.ebuild 2339 BLAKE2B 1c83ca001dde81b194762f3d87cfb81e8971c6c237b4fa60ac0552973f41f1e9e8f10afa1ad5d4d6309b5a2f9b05ec84ccb19128f03eea6828e97b5aa0de2eee SHA512 8ef0f047b57b20f6defd8bb08c0e084930a403a0f7c67412bf70bf46c1337d73174d258a12b39c23a0f9537f275ed93e12b2125a6e5a6651c40024b95cea4be9
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-59.0.3167.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3167.0.ebuild
deleted file mode 100644
index c09ad3685d1c..000000000000
--- a/www-client/opera-developer/opera-developer-59.0.3167.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-59.0.3173.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3173.0.ebuild
deleted file mode 100644
index c09ad3685d1c..000000000000
--- a/www-client/opera-developer/opera-developer-59.0.3173.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
-	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-SRC_URI="amd64? ("
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
-"
-done
-SRC_URI+=")"
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm usr/bin/${PN} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild
new file mode 100644
index 000000000000..d6081fb28694
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-59.0.3187.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/opera-developer-59.0.3192.0.ebuild b/www-client/opera-developer/opera-developer-59.0.3192.0.ebuild
new file mode 100644
index 000000000000..d6081fb28694
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-59.0.3192.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e11675a6d6e7..429ecf87d4e7 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,9 +2,9 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_57.0.3098.102_amd64.deb 70158624 BLAKE2B 1d8da2a7ce36e2ef05b46fc3b0696d19d25ab1b138ead47edf61e072ab4010211ebfb42f0590bb1ff2124178e769fc9e6a006015b51a8fd6ff6df276d8e52e53 SHA512 294066c8b3eb4ed482327f0aee6de460467dd7a131708f7e19e038642a8b803c5a1c9dde25352713457f237c920502d16e38a43ec4a97e2c4c8450db80286ba0
-DIST opera-stable_57.0.3098.106_amd64.deb 70152630 BLAKE2B 80cedbd8a9c46acc29c76eee53263394952350d2044a25b77f24d54d7390430bc2788bd4528049237f86503996d81bdd72acb1cda787ae9446fa4835e66c4047 SHA512 b78eb02091a85477a9f3298643e1826a8bac8596c90e9e4b65bde357bb0208f00818b47f76a6e37f9905dcd2c7fc2512bcb8ddf761cf67885774d2758d981a90
+DIST opera-stable_57.0.3098.110_amd64.deb 69840766 BLAKE2B 81c4e6fe9376b59fe4f269ccba8d317075edc5edf18bb9020cf1a5db4ce8f329ac1ca116a6e28748eca34eb6e9ee6f3f7d491d81e3c49d6dfd32f55b9084a79b SHA512 7faa7e26c7d6fbbe14c4225da935440697bcaf79ae96e5ae1f453e43d77473f7aa2e944f484f1a28c4bf4582ecdc8ffbc071c2420b86b66d2e0629e85ce0d99a
+DIST opera-stable_57.0.3098.116_amd64.deb 69884028 BLAKE2B 4f6979c598a6a7b3283da0947262bab7fd6aba60fe74c0a113f3cd91a90548c61158421e6418cfe70e9817afff7da772c01279670092214b92662ac36e9961cf SHA512 2b774b6103af0508bd0ed2e82a65599abebc28ee660f6fc73a50068949e06090b1279e5562ad49390a070ae4c04dd93924641d6313b4f7b204d0eafc83352dd1
 EBUILD opera-12.16_p1860-r1.ebuild 6118 BLAKE2B 72e7be2d8786ef62b3a7b9fe93019e0df26b60d37826789c0e1ff691571a84d9f964c18517cb2acee0c4a6ba98c86ba00a032cb309197b83101ab8edf4a17dda SHA512 109edf5cd49938f57a59ce704efa46abfa93e1f72edabc57cffd8ca72e15193b3d35280b458ceb569a7163e7f7ec25cf84aaf602114855fad849f3c6c2125937
-EBUILD opera-57.0.3098.102.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
-EBUILD opera-57.0.3098.106.ebuild 2303 BLAKE2B e0086b6f875e066c6dcea26b6143d51c0a9e04cac9bcd9035622f0bd1c3020e8c37f7bed2ec8603dd10411a483586ec0527b4ad3fe1ce226f903ef9738bff6d2 SHA512 5ede826e20541e5e44e7b0e729960ef5e1acd3a454b3a9b2868d7a836031aa648e649d596c156f5bc5e467635d1e2d0c6f1eb271bbcf4f0bdc711e4061832cbf
+EBUILD opera-57.0.3098.110.ebuild 2303 BLAKE2B 60e55c55eb93f5b3df8b34b822c3b8a43b240b459dab602d540cb39029009f909c97e2bbe33c3349532ba419727fa4783e576f8be840f9446e51c0e636bcb669 SHA512 8236bdd316026522d515bcd71315476df4a0b08a91af5b3e242e68e64be566a91d2efb08b49cd57d47cfbcd88c57c9e8c22f788cd5bd92ec5e0c5c473bc65837
+EBUILD opera-57.0.3098.116.ebuild 2303 BLAKE2B 60e55c55eb93f5b3df8b34b822c3b8a43b240b459dab602d540cb39029009f909c97e2bbe33c3349532ba419727fa4783e576f8be840f9446e51c0e636bcb669 SHA512 8236bdd316026522d515bcd71315476df4a0b08a91af5b3e242e68e64be566a91d2efb08b49cd57d47cfbcd88c57c9e8c22f788cd5bd92ec5e0c5c473bc65837
 MISC metadata.xml 576 BLAKE2B b7741cc8f83a9b2f8b5a408f90123000ff5daab77771adaefeb72ae1cdfaf7213f674097e6875c168907bc6820764ccb93c2a3696e792e1f6db92d5f13d664af SHA512 475c622917d4c749b7d940d023519152820a6d6cba48b01f3fdeee8261a2faf217fee10c0e482d6dee5d46f26b2e8ca938d79b93cde178aeb66fb71c268d2374
diff --git a/www-client/opera/opera-57.0.3098.102.ebuild b/www-client/opera/opera-57.0.3098.102.ebuild
deleted file mode 100644
index 89d2858058e3..000000000000
--- a/www-client/opera/opera-57.0.3098.102.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
-	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
-	zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-57.0.3098.106.ebuild b/www-client/opera/opera-57.0.3098.106.ebuild
deleted file mode 100644
index 89d2858058e3..000000000000
--- a/www-client/opera/opera-57.0.3098.106.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
-	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
-	zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="~amd64"
-
-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]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	epatch_user
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-57.0.3098.110.ebuild b/www-client/opera/opera-57.0.3098.110.ebuild
new file mode 100644
index 000000000000..28c78dd8a552
--- /dev/null
+++ b/www-client/opera/opera-57.0.3098.110.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
+	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
+	zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera/opera-57.0.3098.116.ebuild b/www-client/opera/opera-57.0.3098.116.ebuild
new file mode 100644
index 000000000000..28c78dd8a552
--- /dev/null
+++ b/www-client/opera/opera-57.0.3098.116.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es-419 es fil fi fr-CA fr hi hr hu id it ja
+	ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi zh-CN
+	zh-TW
+"
+inherit chromium-2 gnome2-utils multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+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]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	epatch_user
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index 4e88f0eb86ec..d957dec9cf67 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,6 +1,6 @@
-DIST otter-0.9.99.2.tar.gz 4857916 BLAKE2B c6009c29c8740e9159dd874eb76db1245c3eae64f1f795a1dda0a6bb0f99f9d82595efa76ea1fdea0043e1131464718520d08b82d503c0ac07162f8631a499bf SHA512 5d30e826a011847be8f2df53efa3d389be350d139ed39abbd21fa7de2555769b5098a6f7849794463866be793365b3c91c527cfd3b17e06f32f61ec526756139
 DIST otter-0.9.99.3.tar.gz 4861110 BLAKE2B c5672bfbd5bdd39bf294516c4ec3dc9e14a469b999434423c1e938dea6eec2c611a8ae7fdb004f93f122bed14c1c7d64203b73e68f55cd59cea48c2901fd3288 SHA512 35a8f24e6c9daf8cdc7aac8467ac4e3e32ea8447df2ded4effe0f514da2d248fa783e5edec8db910c8374905dc7171c45f4ef2a5f1d1f8b430c459cf15fba6e2
-EBUILD otter-0.9.99.2.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
+DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
 EBUILD otter-0.9.99.3.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2
+EBUILD otter-1.0.01.ebuild 1815 BLAKE2B 2ddeaed25873c1521d00206273c9f997b2b06fec16cbc6bbe689ed6a54394eb71ba124e9f5e4b21326c403832ce0372b2e193709f06b95f2b07f0800afbff80c SHA512 b3e1d5998bedbbcbc55a9f65d24f00ad7d397945bc9c4d76435e19326dbc9cb0683ff65a137515042f6f42b2a1fd90bb1e7b8352fcf323e4568b763ee44dadac
 EBUILD otter-9999.ebuild 1454 BLAKE2B 44a2b89a5ab1b01a9d16440d25b4de7889e02fac35a5c4e5bb755a3323b8c68baaa27d8518905246bcb6741cec19e81713130dd3b516f23500bf6c3d6dc8e2d5 SHA512 ae93d8bae4b15c1cb99d304d28ce9547bd068bbcc29924091523af470293bce0f077a06042785a76b66a89a431f297af52c5b35eba987de2e7ac769066b983b4
 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22
diff --git a/www-client/otter/otter-0.9.99.2.ebuild b/www-client/otter/otter-0.9.99.2.ebuild
deleted file mode 100644
index a354d54d965f..000000000000
--- a/www-client/otter/otter-0.9.99.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="webengine +webkit spell"
-REQUIRED_USE="
-	|| ( webengine webkit )
-"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxmlpatterns:5
-	spell? ( kde-frameworks/sonnet )
-	webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-
-	if ! use spell; then
-		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_QTWEBENGINE="$(usex webengine)"
-		-DENABLE_QTWEBKIT="$(usex webkit)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/otter/otter-1.0.01.ebuild b/www-client/otter/otter-1.0.01.ebuild
new file mode 100644
index 000000000000..6b95bdb7e7ad
--- /dev/null
+++ b/www-client/otter/otter-1.0.01.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils desktop gnome2-utils xdg-utils
+
+DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
+HOMEPAGE="http://otter-browser.org/"
+SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="webengine +webkit spell"
+REQUIRED_USE="
+	|| ( webengine webkit )
+"
+
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxmlpatterns:5
+	spell? ( kde-frameworks/sonnet )
+	webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
+DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ -n ${LINGUAS} ]]; then
+		local lingua
+		for lingua in resources/translations/*.qm; do
+			lingua=$(basename ${lingua})
+			lingua=${lingua/otter-browser_/}
+			lingua=${lingua/.qm/}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm resources/translations/otter-browser_${lingua}.qm || die
+			fi
+		done
+	fi
+
+	if ! use spell; then
+		sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_QTWEBENGINE="$(usex webengine)"
+		-DENABLE_QTWEBKIT="$(usex webkit)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	domenu ${PN}-browser.desktop
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 6d80a4e3a145..5c2833726c9e 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -4,5 +4,6 @@ AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf
 DIST surfraw-2.2.9.tar.gz 200042 BLAKE2B c360da9826b6473a1159e67a19e9e12eaf4697b5be4373088169eb6ee1b85f126854f8594c5de8fd0517b7020947be42a5678d1ed7bd798f0925c53a68728c15 SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016
 DIST surfraw-2.3.0.tar.gz 205557 BLAKE2B 35ca2b46f14fc123fd014682a413c6f22e8c9f05d85e8e76660e099536fda8648446757d467afbe8807c91ec1628c568854ebfda48953e9499a018c30f2bc5ee SHA512 51cdfb68bab701bce635a64ab3d5af669b2330c895180d01cca1c6f3c4005972ba4c573b693df59a2cc4fdb97d4fd11224bae500bbd4a17c3ab446de5241c9a0
 EBUILD surfraw-2.2.9-r1.ebuild 2529 BLAKE2B 3b8f3e2755c46a9eb37ff02d604caa7cd8d793b4dbdb14da582f461fcf8726a73f48c8f07eb46d7f92802678eb4f8b07d57a3ad208769b8b2f2d9040ae0ede07 SHA512 ef98382894301ad2e08b31a35008d7f0541cd716f5d95bd1586fb27235e6dc6011623464cebb2101508a34ae5e197eff935107fe52796e657706903fa4331236
-EBUILD surfraw-2.3.0.ebuild 2500 BLAKE2B dc07e0d76023e9464e1262cf504bd776fa8b802515fc2b503eedf06600583d30190b4cb692160e0594bf1a6603376ed69a8119dcaee2e0d99734820b097970c5 SHA512 833b6198cc6a15065845c9cbbc2bc6a02c1ecb8b9c5f8a72c1f32113b9fecd79f82ed76624041124c3f5800f020230b2955ff0ac30024a39d395d5898733f83a
+EBUILD surfraw-2.3.0.ebuild 2494 BLAKE2B e261dfe5ac8a97a3c4df141b255835704c9710cf33c7b9c1b655cfb1c01ce68bd59b248f04d0e611da3593f207bc441a2cbfeea03fb61a7591b561cf106d2086 SHA512 ede74be53b6850cb50fe17f10e2aede8103b5f2fb181571691c12800f3a024ed6c4cf7343a6872c1a336c4adbd1a6566c76a08a23f210b61e216e0aa257bd532
+EBUILD surfraw-99999.ebuild 877 BLAKE2B 4450d8b751175863616bffa1ca43250b8e829057946482415a33ad84550199c0a308d0a00225df33f9ef32115673484b206a1b2f519135c1fad6b43e08e93b51 SHA512 d456bc85322ff632f7209e669cfd8f80a8320ea6af0fd09b377cbbb36d27de2dbcbe3605c8d1de6b9ba4f8d84b24eb5d99490328f24da21ebee84815e9c3d891
 MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/surfraw-2.3.0.ebuild b/www-client/surfraw/surfraw-2.3.0.ebuild
index cea13e94ecb9..040d94a4264c 100644
--- a/www-client/surfraw/surfraw-2.3.0.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 RESTRICT="test"
 RDEPEND="
 	dev-lang/perl
diff --git a/www-client/surfraw/surfraw-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
new file mode 100644
index 000000000000..bc760e5d6112
--- /dev/null
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 git-r3
+
+DESCRIPTION="A fast unix command line interface to WWW"
+LICENSE="public-domain"
+HOMEPAGE="
+	http://surfraw.alioth.debian.org/
+	https://gitlab.com/surfraw/Surfraw
+"
+EGIT_REPO_URI="https://gitlab.com/surfraw/Surfraw.git"
+
+SLOT="0"
+KEYWORDS=""
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/perl
+"
+DOCS=(
+	AUTHORS ChangeLog HACKING NEWS README TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-completion.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+	default
+
+	newbashcomp surfraw-bash-completion ${PN}
+	bashcomp_alias ${PN} sr
+
+	docinto examples
+	dodoc examples/README
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/uzbl_load_url_from_surfraw
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 52ad52466295..e5d46d263067 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.3.1400.4_p1-amd64.deb 59269660 BLAKE2B 7190ebcb97c215dd45312babd5c85d7b00006fafcbea32f0ef36895095010b7767826d850b2852d77b6fca1955aa7014a1d82228e4cfb1bb80b0f3891bdf2d85 SHA512 6bfbd0a6eb095381a1f5e0e39c5b380b9d7f104d617e064b1153e792a7a1c54de7db7ec74fd690f96a36d0036b715bfafdb4676b695f85e2f33de1574a9cf1e9
-DIST vivaldi-snapshot-2.3.1400.4_p1-arm64.deb 51037220 BLAKE2B 8230038a2493d9cd23af01e112d09e49fd8b5408d55d753dd1d6cb8f9e78d7f47f8fef08744d02973d49bc4cc68192939574a7871691a59129cb98d97f6ab6e7 SHA512 4b851d9280341e5c8f9f9bb7828e54261bcc3c6f2c78d31969ccde58041595432ce8f0dcd1ccf7f3c4d96eba0f3920ecee841e344ca63a88d75be47a038c98ee
-DIST vivaldi-snapshot-2.3.1400.4_p1-armhf.deb 51869356 BLAKE2B dd76979b66ddf2d5beb9751e993a2d55f7be0ec2a98c4f1f4a2a78543dda45ea32e3039c61736336f228a29675d1a53c0950999d7c9f26a385683973a77982a8 SHA512 d0ed327735ccb2bbe176a1ed59b5170969b5573746f556cb39f9a28de986c545fba9019543e6667044b2df4374ecacf545c14c69593ae256f39ffbcaddbdfe4b
-DIST vivaldi-snapshot-2.3.1400.4_p1-i386.deb 58129700 BLAKE2B ef3ca8780007254b756af7018bdeb9a0f53dd0a18dd60b9d08a947dd6edb9a02c9de365fe4927009a91e1f889fe0ed290a64452ec5fe6c30cb1398b6d81f3a71 SHA512 efb43b98fce4cdbc5347c018ea0ffb5bc3d4f13c5eae9c168d15338e1283d7da9a2714fa47f024d480c524e1fc1296761f8aaefbe34d8cd9feed238e08627249
 DIST vivaldi-snapshot-2.3.1401.7_p1-amd64.deb 59257968 BLAKE2B 68b88dbb6429a2ac367b6d1979017bb4c0fb3021562d800a1dc72a4c1ccac3202f013f53305e2d9fd00e71c762ed00754387ca4cb511c3b9cb1118a11be77c70 SHA512 7c27b693279d5effc0ddc002a66bed30050ae8f3cbeb8a73a26ac60758bea6586f5f46fbae7c8a691da8bfabefbe2e710204eaed2cb7573bc89e8dfed8e9929f
 DIST vivaldi-snapshot-2.3.1401.7_p1-arm64.deb 51056662 BLAKE2B 7f0482296794f47a4ae313d584cddc5e354ce924be5b5003f6c6675030174b6748289e64ae15565065195ec5d40c92ef6ba7e605bf265e52a795df529ccfc4d3 SHA512 9003455db6f53a49ce22dbd2333a1cc63f4a0bf6f5f905ebf701c90d1a082b9ec9a88d3deb96895c90d2a4c859b1c7e80bf8a3b832e49a1b511f5381e606fc95
 DIST vivaldi-snapshot-2.3.1401.7_p1-armhf.deb 51876552 BLAKE2B dfbd0f5dbfeada178b139852db99f92b990e65de80e2a1b87ace3bc512604e53d35cb8d433fd8feeff5af92c0b7e137491aa1a7fc191b777c0097339514c1784 SHA512 cd1b451f32b9a7ecb1bb9d95b1a6fa42ba8f041ee76799e69d6a1d2751ff76cacc6a2bee57fb5027dab5ccea0f4e3096f4a04c1f0edf4d7038aa7b91ff9e0094
 DIST vivaldi-snapshot-2.3.1401.7_p1-i386.deb 58125218 BLAKE2B 329cf66570385f844570d21f32bbbdf81cd650fdc23a17034ee9fa054a7086b91d86ffb9354b669cf58c39d19248a4f1cefe5caa6ff54a1c7a0e6c4b919d5035 SHA512 247621ccd9aa26d48c5df8660c9b5f0398646e9182b5a2f12668493246284a428e35b3efc5ab47e06b5d7e446d45868b929c45334b0cb09a3923693abbc78e04
-EBUILD vivaldi-snapshot-2.3.1400.4_p1.ebuild 2674 BLAKE2B 21fdd7d1ce8d63ad936b71a57fd13ee73546e287523ebc0194f652b85f3e4c25ce0b2a365b5d04df11553bb54ab691225aefae981db9c79cb31961fd36fa1c46 SHA512 e7cc7cd199a578ee87569349e0ec5d42cdd24c9fd095b72f742535df8c5dadb6697d334badc850aa98a664c3c72994ae4662ff0d0761b9bc7eb590c4df6964ea
-EBUILD vivaldi-snapshot-2.3.1401.7_p1.ebuild 2674 BLAKE2B 21fdd7d1ce8d63ad936b71a57fd13ee73546e287523ebc0194f652b85f3e4c25ce0b2a365b5d04df11553bb54ab691225aefae981db9c79cb31961fd36fa1c46 SHA512 e7cc7cd199a578ee87569349e0ec5d42cdd24c9fd095b72f742535df8c5dadb6697d334badc850aa98a664c3c72994ae4662ff0d0761b9bc7eb590c4df6964ea
+DIST vivaldi-snapshot-2.3.1420.4_p1-amd64.deb 59807180 BLAKE2B ae908e23686a6c949e3313a48fbe5dd24508118724f9ec5f7e7ddedf03cc410b7f726d55e716e575303d7b1c01ca6d20c7aeceeaf01edaf05d2c8969b2db9826 SHA512 61709fccab0ca8f94d41ab91e092e5a27417d50482bced77c2e7cd18148851590c514d886db185dd185eb0d7111702f8abd959ffbc832f2c694d39c18424910e
+DIST vivaldi-snapshot-2.3.1420.4_p1-arm64.deb 54573736 BLAKE2B 6020c6941acb0a21f090d03bb8357897addc39872a83d27fc375baddeb29602939bb7ea28fb67a32fc0aff166341db5dea7a31f946f102a5f6d8035f7ec56f44 SHA512 3f42a13396d68cb129e3f55c55e0e89942fc664c920859a2072ecbf0fb4aef142cdd7664f28024ca3c4872797b4ff028a3fb6f9f9820a7f89e769ae94c5084ec
+DIST vivaldi-snapshot-2.3.1420.4_p1-armhf.deb 52310938 BLAKE2B 807b2f08dbf26cd6a608dbf99fded16fd7bcad64302895378d41caf026a16d562a03e133e7fe782d1aa087f9e38a14dbfa81facd6d3154d828c7e7b19054c895 SHA512 66a909ceafeb70990ff3c84369de6b2f84bb809d1a3eeeb2202b5fd8313707075c0f526913b72d794f63e6086c4891294e2f14cb45d83bf00e0fc2da63421348
+DIST vivaldi-snapshot-2.3.1420.4_p1-i386.deb 58078194 BLAKE2B 141bac99163e8f4e1819eb4be51d44c268820c2599ea6b00db0d13aed1d12c20e10d312f27bf5c837006c3bd701e7cbe521123c8d91222ac60dc746fb4d15b89 SHA512 ba48e4ad9cb0c3d6448f4c155bcf9f3172fb932949d5299cdf55a582769886d34f32de22c7993249b22d5076ddae82bed5a18d3a55213c9fda6062964793e2d3
+EBUILD vivaldi-snapshot-2.3.1401.7_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
+EBUILD vivaldi-snapshot-2.3.1420.4_p1.ebuild 2674 BLAKE2B d8c38e3ff0cf2655dbe3e997bcb568278c265c5821b182620401cf0942ab9be227f269b25774431bdeab867c1ef4f29c0390cf363d456c57290932bf84c2cb9a SHA512 09b6645f4b4d8cd5c17eef707d4918c15e57c42588be2e17af958b1b85d43b74e3f73cb8cb88147e03f249033cac36980db94e8f3a4acc2079ec08864f5ed12d
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1400.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1400.4_p1.ebuild
deleted file mode 100644
index b45ca4cd1521..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1400.4_p1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	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]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	epatch_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-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
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
index b45ca4cd1521..91bde2d57460 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1401.7_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,7 @@ RDEPEND="
 	sys-libs/libcap
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1420.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1420.4_p1.ebuild
new file mode 100644
index 000000000000..91bde2d57460
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.3.1420.4_p1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	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+: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/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+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
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 71a9ffef7638..bf29cd3f47b4 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,13 +1,5 @@
-DIST vivaldi-2.1.1337.51_p1-amd64.deb 57309970 BLAKE2B a7d959e8d30135d8cad24b00e588dd287051c412b4dde0ee519640fff4c856c61fe0b902a49e4f75494bd597b84173ce394c75c2c7f95f5c6fb532d11d43de46 SHA512 657d7475e25a31da5aa913317319768a0ed287d991cbbef0a35a2e09e351c9b18725e5195ebc4239b327460478efbf696385fd7fbf339da6726d4b56720547dd
-DIST vivaldi-2.1.1337.51_p1-armhf.deb 50271970 BLAKE2B 4ed80e311df652ff38944a4b266a3751ab3c8815ab0003de03ad8956edcb65f7ebc23b857aae5b11341baf8a250f6522ee01335081fd2f52f48af92f4130f328 SHA512 099ecd837a91a44e5f6b32f7c10492fd9798b85485e45aee892735ba2d5f9a5c36ca9df297045e01a6dd016562aaa7b8dea84a15117b750fd49dbaab6298958c
-DIST vivaldi-2.1.1337.51_p1-i386.deb 56271752 BLAKE2B 8bbb8eef12db0cc6f4eea0238846610bc2d94630ca4eda0745caf139dfe625c67a1edc88b2aee6d4e3ccf34a0fd1cc71b8fd0246e404ba2ffc3a03e47030f32b SHA512 c471923ec7db60eab0b9c27cbd1cbd6e3a557e024378144f034613c73a4160550c17d35ad168bd693abb2cfb3b77433ac13212243d51e99da574be3523b0d41d
-DIST vivaldi-2.2.1388.34_p1-amd64.deb 58072920 BLAKE2B 7132b067826031deb0bf3e813df5ab3c87fe95b7fae63f75435a2e29bd64d4398d8a6a5abb94e6ccdda5e86ec81b8cffede00bdc05475f01288d93e8e297793d SHA512 ead8a250e70ad1387453628bfef2bdfb12717f1e365279163781fe2fe1b4c57574965f9627af50e2289c6c91d5a8d95f4335fd1136a3b24a04aa57c28ff8267a
-DIST vivaldi-2.2.1388.34_p1-armhf.deb 50925314 BLAKE2B 7d37efcc3b4263069e5a6c606975d6b3c918789a74a4ebe1dae28e39a8d9f86fa10ed63804c4afedfa753bfb3d4dae3e663f20b50fad6019b5faf7a926c679b7 SHA512 5a51d542334b5d14cc1d2a1d6ad5262a447c831925efdfdacd238beb6ed315afad949d2afef6648ff22d57ba70e95b07b92efd9275e8b499bc0b67d7469efbef
-DIST vivaldi-2.2.1388.34_p1-i386.deb 57000582 BLAKE2B cd2589c0923fd1eb026a1fe0f3a6090715c410a2b5f0a13a18bf1d2ec63feccc5f068b8a7caef1d80d257de6d28d407238030e6e12fee59a9b3d93f5e4871455 SHA512 7d9b72888ed6675da3d602ba83d26b8bd6f943383f415a266b08475b20fc037b86d44e3f2042245b6891b4da2c3d45e0b069af1469bf2d304cddfb5798a7f948
 DIST vivaldi-2.2.1388.37_p1-amd64.deb 58076356 BLAKE2B 2a43a4b81cff6b20cae5dafc64c364dda1a69db4ca4af84204db0146071e2be6551de6b39c1753d9523606544194c1754293db501df2be3e1081fcd699f5b7a3 SHA512 fe4a32db93af8eea29ec5e8a861ac7ba581f4a4e2f3b348f979bb6f3a165df0fcdd052ef048bb12ba9a19460e987a3a439784f87b1278c1925ac352d650c0dfb
 DIST vivaldi-2.2.1388.37_p1-armhf.deb 50918454 BLAKE2B 2d6637844e240bae390243c92eb134a78fb22a8f9e14b346146a7bee7fa250aeb47bfdd610e6a3bc1b56bdb99f4454ac56d8a872881c9e5f71661ae25d1b8d7a SHA512 a52c9d758c02722b213a8405f154747930eafa93cf80c4adef345ef37449db5393254b0a827dbd1ef0c09b5f398154c897cb1b26116c3b970bda3e4e149323e3
 DIST vivaldi-2.2.1388.37_p1-i386.deb 56996270 BLAKE2B b88d2d2c2f6223334177019eae3089ced387b406efb663826b861de2656f9b7069b9b4edd3bc38cbe5cb5a53def48fecd40dd59017dbc37f9d382daf08b5f7bf SHA512 488ebcbec6dfe97849be0eecc4224db554a4d5875d7c7caa747f3116a2a1d2eb19391f36a515f0baefdaebd44f0ef8f32f027b9839171865b702355eec090da0
-EBUILD vivaldi-2.1.1337.51_p1-r1.ebuild 2907 BLAKE2B 314c9c3f3387b75c3f689cdaa790db0c8fbbb02b0fce93cbe637daf3193f11d686c91552a9b84e358e95a49ec22172ff0cb250ab0306f987a6db15926b629145 SHA512 4422afd72aeb5e435d8c40bf002b249dc8af1d4de4c89097ef479fb96eaa78fbbac4d077894702c94875e089eb9475cf4ac0c209c988b2ec73d7d4ec137d8a5b
-EBUILD vivaldi-2.2.1388.34_p1.ebuild 2962 BLAKE2B d8b6797ed0a7cef26f8d81a4ee9e0120c010b58877bc042fb446230d6e1a455d393fdd751348f936e0a045e223643700caf7af4ab56b7e8581123267838ba7b9 SHA512 c91df5dde735dd854d08bfa0e9b2a9d11d425b3e48b136ca3c16ca1b033793cb2c2b8872b9e8c669cfd380b8ddc3f3986cae9eb9d7b078a898ce42e92f9d334d
-EBUILD vivaldi-2.2.1388.37_p1.ebuild 2962 BLAKE2B d8b6797ed0a7cef26f8d81a4ee9e0120c010b58877bc042fb446230d6e1a455d393fdd751348f936e0a045e223643700caf7af4ab56b7e8581123267838ba7b9 SHA512 c91df5dde735dd854d08bfa0e9b2a9d11d425b3e48b136ca3c16ca1b033793cb2c2b8872b9e8c669cfd380b8ddc3f3986cae9eb9d7b078a898ce42e92f9d334d
+EBUILD vivaldi-2.2.1388.37_p1.ebuild 2960 BLAKE2B 966d5a9bba7b5cef2034161703826dd6f836c6370d97c161e5879c74739cdfc78e291dfd7aa02e1b34a8a036a00a03ca86caac01b7dd41f0a2502e73c79cb55b SHA512 6570a32df62dcbe9c84ba5754611a2197c5ec512c18f81c072c043a322d69764f4d0f64cd5e0cd2c16bb8338773903ff364c1e08718fc821b68768e23ba564a5
 MISC metadata.xml 430 BLAKE2B af595cb3b0a225eed0de6c4232aa705a054baa51585d3970d025a26dc3680e5cdf7ee98169a0906afca266862ad331ffb55a8cf2a39bc640a75beefd5de0814e SHA512 cf63c9ce3cea52a8a014ea6bbefdc4d64204cbeb86334eecaf3a669a90d044cfa90eab057bc39da9b0dd8fd4e0bf814269f0113aa1a96f42cfea4063b4918145
diff --git a/www-client/vivaldi/vivaldi-2.1.1337.51_p1-r1.ebuild b/www-client/vivaldi/vivaldi-2.1.1337.51_p1-r1.ebuild
deleted file mode 100644
index 1ef18820bd5a..000000000000
--- a/www-client/vivaldi/vivaldi-2.1.1337.51_p1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 en-US 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 chromium-2 gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	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]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-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
-}
diff --git a/www-client/vivaldi/vivaldi-2.2.1388.34_p1.ebuild b/www-client/vivaldi/vivaldi-2.2.1388.34_p1.ebuild
deleted file mode 100644
index 89ec9f894b92..000000000000
--- a/www-client/vivaldi/vivaldi-2.2.1388.34_p1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 gnome2-utils multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	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]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-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
-}
diff --git a/www-client/vivaldi/vivaldi-2.2.1388.37_p1.ebuild b/www-client/vivaldi/vivaldi-2.2.1388.37_p1.ebuild
index 89ec9f894b92..f35d9cae6300 100644
--- a/www-client/vivaldi/vivaldi-2.2.1388.37_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.2.1388.37_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
@@ -46,7 +46,7 @@ RDEPEND="
 	sys-libs/libcap
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	x11-libs/libXcomposite
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2adefa8ef431..1501a36c4181 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 8bc67ab36581..49b42ebb9ef5 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-32.0.0.101-npapi.i386.tar.gz 8528897 BLAKE2B 13a4160bff61e9f012953ca7eb3a5f1edcb5f4510d68a26fc56faf46b8f308c5aa3dc15747461c939f75e54a4bbe6fe9b8a371cbaeac9e1539b937143d3db034 SHA512 dca312d884e866a1474de6288e40144a4b32b71d2462ce864ef293ec6fe4e567c9c71d4396e7b9ddfb8ac5a3eee7e18365e4a51efa3f0cc66545037fb483fddf
-DIST adobe-flash-32.0.0.101-npapi.x86_64.tar.gz 9045426 BLAKE2B d6c3decf07f03d8128c89dc82f7500902a349af8013d83237001ebda316ee68745367920f602683601cb1b02bd20456bffa1f84fe547be74cfac321c7ecb79b3 SHA512 b71ded348cd5fe58785e72c8f0feeb4730482874c9485cbbdcaa61c2a0e93ab565405d72ae4cbf0899f23eaa42e5854c576fbe465477f06e7abf46fa037598a8
-DIST adobe-flash-32.0.0.101-ppapi.i386.tar.gz 8563433 BLAKE2B 7665b460fb57174e0222263b06fe8a8e953794644f3b918e0e8e4350acb8413312060af1ff8e8f0007373fd06b26ba2f6e7ff010baacefabc1b8130f20b8f84a SHA512 7d4f34677d389404e97b86ea84a9a97d5a01c02f3bf47cbd2f4c2da5e239d04b01f78f2c5d17011c50324f384f99a93935cc3458264bc3691da6c4d136868155
-DIST adobe-flash-32.0.0.101-ppapi.x86_64.tar.gz 9482471 BLAKE2B 3d164f7f8421c304940bad797ee04b3417c6fe57ee16641b0c78275a980707c7bbb9f369923f96451739932660e3b2cb4d12edc0da5e2e5896a6a2c371a75b8e SHA512 39c96bc54c21c9d125daedce1a67b516dad17fdae8ac48cd8e2ac9a7bc3e6e22a34eaafe8234e998e3c9610641d5ede2a0e33f94471aa6812941d54b1f6e2f3f
-EBUILD adobe-flash-32.0.0.101.ebuild 3659 BLAKE2B 9d46597ab12ed0a7192d58ff8f55cbbe7eea0abc4ce3f54e102627eabc6cc2c5c4ae962a630bc38eb8b1cef6b2af0e21ba53849f5d7ea150fb7a5241c482f6f6 SHA512 cad71da8394e5dfcbd021e42ea08a8812ef2a803a479e4b89fb657a386fcebabedba69a71951a949b9c4e029d127eabfa5309d046fc875714a64531fb6da7e2d
+DIST adobe-flash-32.0.0.114-npapi.i386.tar.gz 8530200 BLAKE2B b069569484424ec5b92c62e72aecf1c7475df713e92e765a4cca2258807490b03c725abf00e8ae6a7b5b2808671f11bc40d293a6595e35bcbc81fbe6525fe66b SHA512 da6eae6879e04bc6e3fc5398fb0721061a1940f623bcd43d7deee57ad5f046a9c756b8432682940c837ff33fc2a3a2284aacec90c74e595164f3a889519ed0e1
+DIST adobe-flash-32.0.0.114-npapi.x86_64.tar.gz 9045986 BLAKE2B b496311016dc6b0f4912a8c5c8cd929a1b32d87300a13a90675bb9626689baccf98f56d2ce5619eda50c278b6e52c29a2ce9a08166cd48330d56034e09b65673 SHA512 41b20377570fe0ec0609b0f39432dc06114e40d97ecb791ad97928028984c4bc5a6b7b68fd14bc754f5c316842661056f716ff1c224029e8b46e4bd2a00744e5
+DIST adobe-flash-32.0.0.114-ppapi.i386.tar.gz 8564095 BLAKE2B e4b9f531b199d932a8041812eb7d7409efe3db39e74f8feb928e25006a4b62bde8690faef137c729a1972ed50e8182440a1e6638b3f00856cbcb502c8d337254 SHA512 7b18dff8adc2ca16ef46ac9281df840a76aaa36daa353b7233c2a2df756c603c78cbc4bb03a7abec48f4235cee8a630ae3435443dc82940c8696bb7a4fa1b787
+DIST adobe-flash-32.0.0.114-ppapi.x86_64.tar.gz 9482535 BLAKE2B 8f3c6cfd3ddcd1d099d7893e45c432229516bb6853abdd0774e9a29bc567e635f431a5635e6c8090d2a794d8541a2ca6382af2f8fe555331cd19d30abbc2fe2a SHA512 4d6d8dc9430e6008a945bcafcd3c4c796f5b7620d1f3bbf0c14ad4c7f151b6cf2a434184b14d061eb53c7f0cfbe10121a747624a8f6ffbec2e7b58a23e097a8a
+EBUILD adobe-flash-32.0.0.114.ebuild 3659 BLAKE2B 1606e7f9d4994bb7c3f2425d812ea732a88b64559c187572f85cdaf58d52ace571a918c8708f0e9444ebea928283fc01d3cda296b3970092c414e525e86816c1 SHA512 c5f9432d00b037ce2a58ed682d12a94d5b486d1cf27d2a5ee3076384179ed8c9998a4ed63f70303221997f4adf6f482e5c5b0224caea4c2f825dbc41bf6f5e31
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.101.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.101.ebuild
deleted file mode 100644
index 43c2833801f5..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-32.0.0.101.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils nsplugins multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-	https://www.adobe.com/products/flashplayer.html
-	https://get.adobe.com/flashplayer/
-	https://helpx.adobe.com/security/products/flash-player.html
-"
-
-AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
-AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
-AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
-AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
-AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
-
-IUSE="+nsplugin +ppapi"
-REQUIRED_USE="
-	|| ( nsplugin ppapi )
-"
-
-SRC_URI="
-	nsplugin? (
-		abi_x86_32? ( ${AF_NP_32_URI} )
-		abi_x86_64? ( ${AF_NP_64_URI} )
-	)
-	ppapi? (
-		abi_x86_32? ( ${AF_PP_32_URI} )
-		abi_x86_64? ( ${AF_PP_64_URI} )
-	)
-"
-SLOT="22"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-NPAPI_RDEPEND="
-	dev-libs/atk[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr[${MULTILIB_USEDEP}]
-	dev-libs/nss[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	media-libs/freetype[${MULTILIB_USEDEP}]
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXrender[${MULTILIB_USEDEP}]
-	x11-libs/libXt[${MULTILIB_USEDEP}]
-	x11-libs/pango[${MULTILIB_USEDEP}]
-"
-RDEPEND="
-	!www-plugins/chrome-binary-plugins[flash(-)]
-	nsplugin? (
-		${NPAPI_RDEPEND}
-		!www-plugins/adobe-flash:0
-	)
-"
-
-S="${WORKDIR}"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-src_unpack() {
-	local files=( ${A} )
-
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
-	}
-
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-multilib_src_install() {
-	local pkglibdir=lib
-	[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-	if use nsplugin; then
-		# PLUGINS_DIR comes from nsplugins.eclass
-		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-		doexe libflashplayer.so
-
-		if multilib_is_native_abi; then
-			# No KDE applet, so allow the GTK utility to show up in KDE:
-			sed \
-				-i usr/share/applications/flash-player-properties.desktop \
-				-e "/^NotShowIn=KDE;/d" || die
-
-			# The userland 'flash-player-properties' standalone app:
-			dobin usr/bin/flash-player-properties
-
-			# Icon and .desktop for 'flash-player-properties'
-			insinto /usr/share
-			doins -r usr/share/{icons,applications}
-			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-				/usr/share/pixmaps/flash-player-properties.png
-		fi
-
-		# The magic config file!
-		insinto "/etc/adobe"
-		doins "${FILESDIR}/mms.cfg"
-	fi
-
-	if use ppapi; then
-		exeinto /usr/$(get_libdir)/chromium/PepperFlash
-		doexe libpepflashplayer.so
-		insinto /usr/$(get_libdir)/chromium/PepperFlash
-		doins manifest.json
-
-		if multilib_is_native_abi; then
-			dodir /etc/chromium
-			sed "${FILESDIR}"/pepper-flash-r1 \
-				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
-				-e "s|@FP_PV@|${PV}|g" \
-				> "${D}"/etc/chromium/pepper-flash \
-				|| die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.114.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.114.ebuild
new file mode 100644
index 000000000000..14f113c3c5f5
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.114.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils nsplugins multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	https://www.adobe.com/products/flashplayer.html
+	https://get.adobe.com/flashplayer/
+	https://helpx.adobe.com/security/products/flash-player.html
+"
+
+AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
+AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
+AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
+AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
+AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
+
+IUSE="+nsplugin +ppapi"
+REQUIRED_USE="
+	|| ( nsplugin ppapi )
+"
+
+SRC_URI="
+	nsplugin? (
+		abi_x86_32? ( ${AF_NP_32_URI} )
+		abi_x86_64? ( ${AF_NP_64_URI} )
+	)
+	ppapi? (
+		abi_x86_32? ( ${AF_PP_32_URI} )
+		abi_x86_64? ( ${AF_PP_64_URI} )
+	)
+"
+SLOT="22"
+
+KEYWORDS="-* amd64 x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+NPAPI_RDEPEND="
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	!www-plugins/chrome-binary-plugins[flash(-)]
+	nsplugin? (
+		${NPAPI_RDEPEND}
+		!www-plugins/adobe-flash:0
+	)
+"
+
+S="${WORKDIR}"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+src_unpack() {
+	local files=( ${A} )
+
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		# we need to filter out the other archive(s)
+		local other_abi
+		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
+		unpack ${files[@]//*${other_abi}*/}
+	}
+
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_install() {
+	local pkglibdir=lib
+	[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+	if use nsplugin; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe libflashplayer.so
+
+		if multilib_is_native_abi; then
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed \
+				-i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die
+
+			# The userland 'flash-player-properties' standalone app:
+			dobin usr/bin/flash-player-properties
+
+			# Icon and .desktop for 'flash-player-properties'
+			insinto /usr/share
+			doins -r usr/share/{icons,applications}
+			dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+				/usr/share/pixmaps/flash-player-properties.png
+		fi
+
+		# The magic config file!
+		insinto "/etc/adobe"
+		doins "${FILESDIR}/mms.cfg"
+	fi
+
+	if use ppapi; then
+		exeinto /usr/$(get_libdir)/chromium/PepperFlash
+		doexe libpepflashplayer.so
+		insinto /usr/$(get_libdir)/chromium/PepperFlash
+		doins manifest.json
+
+		if multilib_is_native_abi; then
+			dodir /etc/chromium
+			sed "${FILESDIR}"/pepper-flash-r1 \
+				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+				-e "s|@FP_PV@|${PV}|g" \
+				> "${D}"/etc/chromium/pepper-flash \
+				|| die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index bc8ac69226f0..e9881733dd2c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_72.0.3626.28-1_amd64.deb 58370832 BLAKE2B 2a5ee1aa18ce6ffb639dc96272856d10a7f53b94b83cc7ed85f227801319ffb0a2d1cf5fd63846d971d2e8c1ed8197af41d3a16a456a4ba389308e162e64ec2a SHA512 11715dd1fa4c8bbeb542c9acbd71a42b1e7836c4a5f2e1e24527ced985a366d18e1152fc8d029b2e00a89b7ffc0c087fa4152c0199a7ae6bfed66daf705184e7
+DIST google-chrome-beta_72.0.3626.53-1_amd64.deb 58359656 BLAKE2B ffdca1e247ac37081f465bffc16c8e20eb184347379ac7552829237406c677c3c0628a207f58e488f6d064bec54b4f73a6260e341968af8cc1beb493c0aa0c2f SHA512 8751aff6c603188bbb2d89dc2973186f4ef478fab8fab64f8c331bbb08d51383747e17f155a362713b49bbb4c172f6a5015854c621f03b9739d25fe26bef3a4a
 DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
-DIST google-chrome-unstable_73.0.3642.0-1_amd64.deb 59596010 BLAKE2B 4cacf290f671984fc1426b11b5435a2898dde2ad61668ab7db7652b0376a3012ef6d221d72fddfe40579033e96fb16f96025c7eebd820ab7f998d8d4e05349c9 SHA512 ae41b9801ef28b2f5e569b9ffdcf580b0f42fc2e3725446d9d6abfcfcc57f477e336f8dbd4f5e6d502495843d4d982c9cdeeec29b43078e3e5593ddffacfc096
-EBUILD chrome-binary-plugins-71.0.3578.98.ebuild 1359 BLAKE2B bc5be0b8ac549ee39dac4b57e6141690930077493a500d12210c60e807a1f6c20bb6077cd91f366cfeb76c43404ff28b82bd1f40c844b1cd7613e11d9d69c83b SHA512 71498b335fdbfec0711b278b70dc06d048024bba3a2e7b6581aa9c824a7152aa3ad6df59f2578f2497cd79731bf317f58d682254d84feca17fdad40c4093e981
-EBUILD chrome-binary-plugins-72.0.3626.28_beta.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
-EBUILD chrome-binary-plugins-73.0.3642.0_alpha.ebuild 1360 BLAKE2B d30b0fb27e6fa08e4a6137db221ff313580f7043862ffc3d2731058ffb26668d2ec3e247c69b323bd09b81d44bc845bc2d4745b040e4acb89503b1c9e75e81b8 SHA512 23e9ed678427dee23ab15c0196ed0772bd0647d9ee5e925698b988f72551aaa8e10f4952e376cb09b1f6554d8abe49277cd25d663285b57886f6edca31acaa54
+DIST google-chrome-unstable_73.0.3664.3-1_amd64.deb 60498524 BLAKE2B 5a8bae4e27f52add82a166a79bbf817bbd1a6002cd9b6b8a6382430861ba53bbc242e25ccb813dd537ed05866d02ff36f62530a3f1b961853ea8b078d33afc64 SHA512 e4afbfff8f017ffd162f1dc1057823f097a0205236581de32903fb6afbf1e30117c857bada2728d6f71144d0980c8e6ed13b83b75138212b38f71f754d6ca02e
+EBUILD chrome-binary-plugins-71.0.3578.98.ebuild 1359 BLAKE2B f82b7bd52dc714f125e41c76245e1e4f95ca85d1ba0132a60deb71d12d499f4002185c90d66d0b9d5e63571c135ad7ab67613adc2b44b392ae3af8a103f1c19b SHA512 c3b0b3ab0b01e196af602a4173dc00e0356e34ab4b4821e4080f713d40ef48fe1752aaf48ca37b2093fc21b6685fb89cdad12cef557fef3df4566d8e358e94be
+EBUILD chrome-binary-plugins-72.0.3626.53_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+EBUILD chrome-binary-plugins-73.0.3664.3_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild
index e57d8b916e0c..208b53cea0fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2012-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.28_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.28_beta.ebuild
deleted file mode 100644
index 6fcfccb7dc18..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.28_beta.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
-
-LICENSE="google-chrome"
-IUSE="+widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	widevine? (
-		dev-libs/glib:2
-		dev-libs/nspr
-		dev-libs/nss
-		!<www-client/chromium-57[widevine(-)]
-	)
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/chromium
-	if use widevine; then
-		doins libwidevinecdm.so
-		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-	fi
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.53_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.53_beta.ebuild
new file mode 100644
index 000000000000..3fd84e77d226
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.53_beta.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+KEYWORDS="-* ~amd64"
+
+LICENSE="google-chrome"
+IUSE="+widevine"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	widevine? (
+		dev-libs/glib:2
+		dev-libs/nspr
+		dev-libs/nss
+		!<www-client/chromium-57[widevine(-)]
+	)
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/chromium
+	if use widevine; then
+		doins libwidevinecdm.so
+		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
+	fi
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3642.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3642.0_alpha.ebuild
deleted file mode 100644
index 6fcfccb7dc18..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3642.0_alpha.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
-
-LICENSE="google-chrome"
-IUSE="+widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	widevine? (
-		dev-libs/glib:2
-		dev-libs/nspr
-		dev-libs/nss
-		!<www-client/chromium-57[widevine(-)]
-	)
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/chromium
-	if use widevine; then
-		doins libwidevinecdm.so
-		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-	fi
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3664.3_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3664.3_alpha.ebuild
new file mode 100644
index 000000000000..3fd84e77d226
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3664.3_alpha.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_alpha}-1
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV%_beta}-1
+		;;
+	*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV}-1
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+KEYWORDS="-* ~amd64"
+
+LICENSE="google-chrome"
+IUSE="+widevine"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	widevine? (
+		dev-libs/glib:2
+		dev-libs/nspr
+		dev-libs/nss
+		!<www-client/chromium-57[widevine(-)]
+	)
+"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/chromium
+	if use widevine; then
+		doins libwidevinecdm.so
+		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
+	fi
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index c32afaf0a5c1..0cbba4c4a1f8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index bf92d0b24b74..cae0c9361896 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -18,4 +18,4 @@ EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4f
 EBUILD apache-2.4.34-r2.ebuild 8245 BLAKE2B ea58474549b4c05319ae4d4eab60d0035415b6698c201aad0255c28cf0b0cd636f1666d4d90b8fc55a1fa53a9da2bd36c49afae7818715101c693cc8837c4abb SHA512 f3ed8140685860c7c8e44baa1198a38dd44de8015e7c994490c37bd9289386a446aed2dd448d75a9159124bf06eb2441dbab59e9c617d70d81f8d4b6c106eaf1
 EBUILD apache-2.4.35.ebuild 8129 BLAKE2B eb9b06e7215fb91e532b38860d320a979edf317c9b7c323a3d6c877ccea85d71fcfbb256532adcf2bf86bb2380057654474e010fdbe3115fdaf6dcac7db5843b SHA512 e271262915260838e85dfeeffb18acac0249421db9d910a429539289e72915b66043128e50ab89b1228cc460010c7c49cb49fd41e1863f633094c4dea3287b1d
 EBUILD apache-2.4.37-r1.ebuild 8141 BLAKE2B 17ab67c5476ca5063492b1a8ff2d16827f12fca175ccec1af6f46cb189926906c7afe26979aeb05b2dac82fc60826f5b34b2b6cea84fe66e9167ce083b8c6d40 SHA512 8f423aafe98bb3724cb975d381ad1d1298fc585e6a78154ecfc9bba22241ff846bbd577bc11c8b38d5a3a19ea089ffa784f1697ac26400cd15b2822dd2a624c0
-MISC metadata.xml 3938 BLAKE2B eea06c061194d110e79426809ea8ee63c76f0d4351603229b757be756c0bff64119aa66fbcad6344c11996cfe19f94cfad5d613ace67c8417231541a8358851f SHA512 5ceb104cbe70138d64b9023ff5a9569938fab1f2564aec7bdd1811b3e4e663dda52336083fe1ab2778ff315017d10a5b7e6b20bf2703dc592ff1e87e1474a12c
+MISC metadata.xml 4052 BLAKE2B dba078e60afae4caf7f47f309f4fb6e65a10ee844b1ef8841e64bc5fb0ec34b0d9ee200473ca751e41498ba34a91f9eed2e84f3c86e6063b1c276adbdaba140a SHA512 0db051271c4b2b6487e3e28f0f994ff0c9167d9ced09042838a049d4a63df3787595213aa1c86108fd8c4f27ef961e1c04b375356b91e9d30231317c56ec7d78
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index b86182024b94..2ecf0bfc8f77 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -5,6 +5,10 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>apache-bugs@gentoo.org</email>
+		<name>Apache project</name>
+	</maintainer>
 	<longdescription>
 		The Apache HTTP Server Project is an effort to develop and maintain an
 		open-source HTTP server for modern operating systems. The goal of this
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a23f2b1451e2..bc280179e5d1 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -11,6 +11,6 @@ AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd622
 DIST lighttpd-1.4.51.tar.xz 723268 BLAKE2B 524874a5cc29b3fad23b1d2d623bcaf5b781556d7f11848047bc02fb4793480acfc5b5eb6f60304be9472a8b42c87e8c23baf85352bc9479ea156c4a03990bad SHA512 ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f
 DIST lighttpd-1.4.52.tar.xz 728668 BLAKE2B 6ffce05ad8cb83895f8865cfd2ce627c39c881e7717992ce25d1ed899c51fd1769d91d9c43f621b013e536a3a24d4350e5525426be333aa5b21913f480af5d31 SHA512 3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72
 EBUILD lighttpd-1.4.51.ebuild 6296 BLAKE2B ab1f50593c428124a4de77d7c1c487129e7e7653eb0256c63c35a62ab0615515ec3517bbbb257e485a5b77a6d6b4ef84082ae3e6e2f228cf610f6f4ac19c97b8 SHA512 38d9e63c64af8fde307c713d65af732eefe5da1103d48101c27b3476dd7a1c61719c778c467974218687b0be2a38bb7115d13687cf901a0e22fabf8def1ee59c
-EBUILD lighttpd-1.4.52.ebuild 6305 BLAKE2B 8108925b03d5331f575cb848fce299ab81824dbb5153e2a35744664d072433395444cd3872123f90a92c89954aafed350b519c85bd3644e44487405a98e945f3 SHA512 0f240be866e13e49c24122af2936be8cdbb3c09b33814ab2e9f7e797acedebe655bb4ef50b5478e6494b9b30bb1beb9e06846cf326140fbbd17c886272bdd9d5
+EBUILD lighttpd-1.4.52-r1.ebuild 6336 BLAKE2B 780ab30ce6e2a1e996015008d687b5788202706fa28da29feba154f7f437e391ce777084e9c9116b228f7946c6b272fa6f9f7ebe77e01b44883fb0fe7b0ccef7 SHA512 6536f0fc2a909c115c8e94ef93fa8f159b6a3c93e8d2929324cfa8c46edad43a8185290f4c98d3d3d8724771e74752e6d8be19e9d0a5e6813456477335c2cb2b
 EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.52-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.52-r1.ebuild
new file mode 100644
index 000000000000..f85cd8ff65da
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.52-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
+
+BDEPEND="virtual/pkgconfig"
+
+COMMON_DEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( >=dev-lang/lua-5.1:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
+	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite?	( dev-db/sqlite:3 )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )"
+
+DEPEND="${COMMON_DEPEND}
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+
+	enewgroup lighttpd
+	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with dbi) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcached) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_with sqlite sqlite) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dodoc -r doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.52.ebuild b/www-servers/lighttpd/lighttpd-1.4.52.ebuild
deleted file mode 100644
index a6f73fe32fdb..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.52.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
-SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	dbi?	( dev-db/libdbi )
-	fam?    ( virtual/fam )
-	gdbm?   ( sys-libs/gdbm )
-	geoip?	( dev-libs/geoip )
-	ldap?   ( >=net-nds/openldap-2.1.26 )
-	libev?  ( >=dev-libs/libev-4.01 )
-	lua?    ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql?  ( dev-db/mysql-connector-c:= )
-	pcre?   ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	postgres? ( dev-db/postgresql:* )
-	rrdtool?  ( net-analyzer/rrdtool )
-	sasl?     ( dev-libs/cyrus-sasl )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sqlite?	( dev-db/sqlite:3 )
-	webdav? (
-		dev-libs/libxml2
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-	fi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	default
-	use memcached && append-ldflags -pthread
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with dbi) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with geoip ) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with postgres pgsql) \
-		$(use_with sasl) \
-		$(use_with ssl openssl) \
-		$(use_with sqlite sqlite) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-	use fam && has_version app-admin/fam && \
-		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
-	use ipv6 && readme.gentoo_create_doc
-
-	use doc && dodoc -r doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
-
-	use minimal && remove_non_essential
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4b1074c15a2d..a8355091bf4d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -6,20 +6,14 @@ AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f
 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.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8d41c58fb96ed1330560a4064ac3b3eeb030c76ff066c2a2f950d6f2c1576bde214f963f1a12342536a8e2ab8ac179dd166bfb SHA512 f95383b2c77670845cce577161ecf326c3e0f49d456792a53305640289d049b0de80f4b6901bcda52bc4967895f97772591eee525affee1a1d07aac2e60d2044
-DIST apache-tomcat-7.0.88-src.tar.gz 4733229 BLAKE2B 2e2009f64ae8f027e93bd7f3cec21f98fbb1f5c741b6525da1638c6188ebe44aa8b43d984abd769385992a997226392c59ec059e408873261a04d9e96a4603c3 SHA512 2ad5c11ec7c5e8e68fba6c0427b0479969a56e7ccb3f0b1ee6c6f139d5f2b718ee9c56f044e982013108ee6e06c43037d0061e539203e95453e9cae7cb38711d
 DIST apache-tomcat-7.0.90-src.tar.gz 4752747 BLAKE2B 5062ead2756aa8461de5e8387f14838661c082b6e397934fc92c91403f1950d84d79f05b9d4420a973d1b4921515b66c2c847550e1a06d75e722b62d9aa3f8bd SHA512 b32cb6902866ef72337c721d99d77f1a645311bb7694f51b82f7acec500c6197df15fb41be444fc6089652e8c825fb193f1a9de8c1b9b6fabd9d95f784565f6a
-DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff
+DIST apache-tomcat-7.0.92-src.tar.gz 4778943 BLAKE2B d11b01219a25c303ce791d965908c79cd48b5c97e1f0bed81ae60e0fcae3c4b23906f652eaf1d2922db7a57e68ee9f5a09ef017b7f1b89ed6c2ab81a477a810e SHA512 8cbcaf6d8dcda5ad8bd667582a39e91c1feaa4cc7216cafc23b9f5cf005cce9af24473c1c9d573f4da26c88ea68520a113dc0a7e2a50823f3ba3bb1510ec9e0a
 DIST apache-tomcat-8.0.52-src.tar.gz 5039683 BLAKE2B 36318d0ae50fbca3f2a97e0210d0a8da8314f1ef79d0b047971bca30a5b0cc937faf013b5090f6e6b8aec4127b6185dc54ae589f5b57143b62c71c09f8bd5e9d SHA512 6d846213db0b15f9add8d80f30f304afdaf879ab6d7f85d212183a93f4f360ebfeeb079813bdea83cbd13f507504473028bbf8279e89b800b6f150b83086fa56
-DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265
 DIST apache-tomcat-8.5.31-src.tar.gz 5154531 BLAKE2B cce0388e5c8c5fb5fcb3dba3b5961dc21d9f19d9a2f6177660a41410bddf241f73dda1e52c3875e28cfa13041c85a458a92c9a23c509b645f042cfa472081fde SHA512 659137ef4809af329ae4dd6f5825a603c1408ef3e48153abe7480a722e7f4bebef68a64af9cbef4a4ad9a7e8da76494f825035bbadbb983a097525f476f32f33
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
-EBUILD tomcat-7.0.85.ebuild 4233 BLAKE2B 3fde172ec376bf4837919f7f224a93a849e98349352a9dd2eec0f7e222e7c61680dbdabf0a75e6b84b5d4efce1576a8e31248d36dea1e685b6fd74854b4a113c SHA512 f5c98cb9bec084afcc2e265f136b7c61147fd74ed6ae0b87f332a0802f9af61a9bb1aca675f2dd442955d6bce0efa9d8989c443d97fc5e8aabed4ca3ab2056d5
-EBUILD tomcat-7.0.88.ebuild 4234 BLAKE2B e17ad1a1599f9374ae5b227ad6cb716ea13eacd0e4ab9ac1f31b8698c5496a5edddf9afadfcf4fbd28cd77f90f8b68133ecc885d3b42762fc6d321e4eb9f3afb SHA512 eccffccefbc897b891172e952549692ca63cb39a118a0ff9d047fcfce8d7fa115fccc1aa9c16cc3a483518df16d4e94358d50f0c48ec5c246cc7a963dab7c57e
-EBUILD tomcat-7.0.90.ebuild 4234 BLAKE2B e17ad1a1599f9374ae5b227ad6cb716ea13eacd0e4ab9ac1f31b8698c5496a5edddf9afadfcf4fbd28cd77f90f8b68133ecc885d3b42762fc6d321e4eb9f3afb SHA512 eccffccefbc897b891172e952549692ca63cb39a118a0ff9d047fcfce8d7fa115fccc1aa9c16cc3a483518df16d4e94358d50f0c48ec5c246cc7a963dab7c57e
-EBUILD tomcat-8.0.50.ebuild 4537 BLAKE2B 9a5b5867e5417e6c50b6ef788ab3ac7e403726964c375f0ea8b0182ef45c1207c02d1bb24a31ccd47e06529632ff5a5f2d4ceaf9c9af04cc4c339a91aefae75c SHA512 79f8da51e43f2a34817d34ec56a37492ef3b28bbbe648f3edd40df5e4c6710ce80e49c930d5c8beecaf72ff109cf685dde7925ca594024f23752ebb737a1b183
-EBUILD tomcat-8.0.52.ebuild 4538 BLAKE2B 2a07c099e020ffcf33964c4638d1200eda8091ef07a97e0c846548ecf777c7145dc7122624db35972f6657deecc34de45d3429c0932806c161b7f06e3a22cd27 SHA512 57b85a2ffe0ee8936739277fc0ca4abab088ea734aa83de63a47e93deb0c549c03ed034eb43408491b1c00986965fb99684e04a69de00d176e71660cf5d3baa6
-EBUILD tomcat-8.5.30.ebuild 4585 BLAKE2B 2d8a30991ea141b8ba38f9ba83afb53d6679db055af7c0f54c0462ea932d7b8901731307d5d0a56a58cf97813574304e35eeadcda6621380c1d822d2a96df23e SHA512 52667bc4709e50bb1f4fb9f00097612906fff9b782275a429e762490bea90a9b27bbab2cf01cd1d3794281516e7885635e5d6f83bdac5efa67afc17b5d8b779f
-EBUILD tomcat-8.5.31.ebuild 4586 BLAKE2B 481c07a1630d9c821593260f2d13d02e9cb4b53c9a7c1d20f92ae25c51e1ce4357c8a14101bc945cd8d97db06b8d8a822f2c96e9cc857131ee5e1ec6cd906879 SHA512 0552fab02e2edb643b52db89f197e814ef8240f1750747f99370d2636df684a8c2a102ba331bf3d1e008c063e793ed4fc487b09be44b38899e043456dc031954
+EBUILD tomcat-7.0.90.ebuild 4230 BLAKE2B 4a16e1282fff97b370a2b1b676fcaba190c3dd75ae6e0355cdebc32f97a43e244c135a8445862f5c8105af101563fcc4aced9a5a582ad3ed096870e7496c4ca1 SHA512 ae58f357dddbd7aa960c85c7f903cb8ba45d845ba93b836ad273c16a16672f34cce1bedf90d6e71b589c4bc112853184f2fc7a3ad20bfd79bbd6d291b6fe0892
+EBUILD tomcat-7.0.92.ebuild 4231 BLAKE2B b1bed407c15f9562cb15a7360ae8091ce6c2143a5597c9f0e0a0cfea3f382661f916b9cdf66a94a6317629d54d0351667ad6694abc5d772fda0eb17c7a4b70e8 SHA512 c40e6edb3b38c116e3f367a4d744d8c785d49fa59e955aad1ebfd9faed50dc7c0aad1729f3ff05c5b6cea7bb8315be161bfae30b585bcc46491b49fc5d413170
+EBUILD tomcat-8.0.52.ebuild 4534 BLAKE2B 9e95dce86cc60aa245a600df6a41877c3b888e1cc9880d3ae5d97a0576d9aa7e06048a76dd3c2e530fae9742abe51409d67761e800ead9b90595d43fdd065204 SHA512 428fde20ccbaa8c952b91a9abeb59d0a8231f8e36786b6c86b9e59f3456105cff7d5b97638a17b13b245205a490f6e4ef309479c30f402ea0726aca72b7c702d
+EBUILD tomcat-8.5.31.ebuild 4582 BLAKE2B cd618ff01d287ed89a2ccd62b571d328a81d23d499281eb77b6f8e98cb6e0e4c3f15b2ae54d8753c926aa1849d1baf623df28010876054292576d74870419236 SHA512 9b866fed52bb166cff00303a8ad965e0c62c465e19c51815976a4516a9f8d1d790427cc7c7d26a6f88b832e7cf2704a4b799dc81d5e31efe35309b4fbec4baba
 EBUILD tomcat-9.0.7.ebuild 4564 BLAKE2B bb3e1e254fc8eada11610515139c5edf3e4c310dca7990a3d1595862848dbd4157eb7380362a893ae2a904cadfc1f1e6e5c576f89a2c1b5fb48c047e9bb70328 SHA512 cc933b2ddccd45542d8be98cb18b2288ef7eb1db9f587405cc0d04591b0de9334394b4962b0c1deecbd3e8cb0429b2cacabb5de607203030aaf6fcc4134fe9c4
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/tomcat-7.0.85.ebuild b/www-servers/tomcat/tomcat-7.0.85.ebuild
deleted file mode 100644
index e4334d29c494..000000000000
--- a/www-servers/tomcat/tomcat-7.0.85.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre
-	!<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	java-pkg_clean
-
-	eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.88.ebuild b/www-servers/tomcat/tomcat-7.0.88.ebuild
deleted file mode 100644
index 8ed5c13fa748..000000000000
--- a/www-servers/tomcat/tomcat-7.0.88.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	virtual/jre
-	!<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
-	virtual/jdk:1.8
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	java-pkg_clean
-
-	eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-7.0.90.ebuild b/www-servers/tomcat/tomcat-7.0.90.ebuild
index 8ed5c13fa748..9acd6b92a2e4 100644
--- a/www-servers/tomcat/tomcat-7.0.90.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-7.0.92.ebuild b/www-servers/tomcat/tomcat-7.0.92.ebuild
new file mode 100644
index 000000000000..1df725b2158c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.92.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	virtual/jre
+	!<dev-java/tomcat-native-1.1.24"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	eapply "${FILESDIR}/${PN}-7.0.84-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.0.50.ebuild b/www-servers/tomcat/tomcat-8.0.50.ebuild
deleted file mode 100644
index 72dc86ded9b0..000000000000
--- a/www-servers/tomcat/tomcat-8.0.50.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
-
-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
-
-	eapply "${FILESDIR}/${PN}-8.0.49-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://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.52.ebuild b/www-servers/tomcat/tomcat-8.0.52.ebuild
index 46de488be6f4..87b27e005358 100644
--- a/www-servers/tomcat/tomcat-8.0.52.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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.30.ebuild b/www-servers/tomcat/tomcat-8.5.30.ebuild
deleted file mode 100644
index 52f5424f7934..000000000000
--- a/www-servers/tomcat/tomcat-8.5.30.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
-
-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
-
-	eapply "${FILESDIR}/${PN}-8.5.27-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://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.5.31.ebuild b/www-servers/tomcat/tomcat-8.5.31.ebuild
index 00cb33f8cfc0..86bc478dfa63 100644
--- a/www-servers/tomcat/tomcat-8.5.31.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 87b5c062cae1..7813aebfde39 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,7 +5,7 @@ AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.17.1.tar.gz 800156 BLAKE2B a8697263e6e7689c0062a06a9fdb1101a2df72e0ac9122b5f8a0acc78bbdbdeaa96faa1c8870b9c3a43e2e1fb5fc835e708e1bc3d0171ae746467b4734dc299d SHA512 10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b
 DIST uwsgi-2.0.17.tar.gz 798642 BLAKE2B 86efb2103efaeedb37ebb00de4c01477162d119ae3dea0dc0696385216e30ff2c74eb48576f86eb181b8ada4b9eaa63b0aa761e966e3301597633d33b81142e1 SHA512 639427fbb89a1c2610c1cafb6ff009398a3c0a8e27c3de3f00829428271ba97b64b1253368dd6150912cf44441052be2a63cbe81613bbe964be27ee2e570d2b2
-EBUILD uwsgi-2.0.17.1-r1.ebuild 12303 BLAKE2B 02bc993575884d6aa66d562a5085caaae8426c23d27ef6c8049c174e080404665cb3a33b742e6b3bf1e704429b1d333e7ce8243e6acf0be452de78753f1fef13 SHA512 8442acec2af67c093e08535669aa61a8a6030325de248062721438d4333b5308d69f621b11c36d00a150a32cb9d42e2f167500984768c4cf32ac87945c013268
+EBUILD uwsgi-2.0.17.1-r1.ebuild 12295 BLAKE2B b0161a92002e10b0ff52b6b8ba176c5cdd14123361db1dc70a29699cdaf4b857d3e2f6a77194ce65444cf0812d7a2e9309fcac053240eb65ac54b0036e7ac438 SHA512 224895ed2051b67a7f41c9d268cb7afdf2d6167a7a1e2bc0d61d6ba012eb44a4be95a1d33e04cb50e4f6bda934de4ea2864fd72326049434f3c443412c5f1f53
 EBUILD uwsgi-2.0.17.1.ebuild 12776 BLAKE2B b64029a6b42b9ce2143940a8fd6dd4b485608d387710b911f25b026752fea585f7058e3ac125ce08560bfca08c8bed41a9abc80b348ee11b2cf8abd788521d38 SHA512 02233ce930b73f7b605cb96a1f8f5fda4a78f100a4d89d3ab8afeaccccb600ab97b800d0c0033b61d1e4d868bb3b3d69304b9698f91f3d8929d85c6936662513
 EBUILD uwsgi-2.0.17.ebuild 12836 BLAKE2B fd66096fef520da676395ffb80e7f2d6893459a653d7ba1fb19922488ab2734ac267edf1ad1fe9624f3367a8fc709546ece2398b87625059cc9d4a7042a7fe3c SHA512 3712520d98bc55fd60a4417a5d616b6955b2ce04b935e23218ac718cc6d6447fe0bb81cc1545a674d18983c8d21470979feac61c2ba2d978adebb39aea68ea11
 MISC metadata.xml 1508 BLAKE2B 22125c58eed49b27100421613726f650e78bba0fb712eea2a3e122862101f34803636c12fa98cdb7483dbfad00e51cba6419ee4a93d43e5116530cb43e6778b2 SHA512 4a925a03e1ff9fedf6d7d4ad9673fdf12caaf6d9b2c4ce5cce01b964ae50294451b6d2f820121dfbe8a9288d0ae62180acc243a07ab1b365e10fef65adff2a02
diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
index 248929d1ca5b..4baa3deaef85 100644
--- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2" # deps must be registered separately below
 
 MY_P="${P/_/-}"
 
-inherit eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng versionator
+inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng
 
 DESCRIPTION="uWSGI server for Python web applications"
 HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -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 ~arm ~x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
@@ -79,17 +79,22 @@ REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
 # 2. General features
 # 3. Plugins
 # 4. Language/app support
-CDEPEND="sys-libs/zlib
+CDEPEND="
+	sys-libs/zlib
 	caps? ( sys-libs/libcap )
-	json? ( !yajl? ( dev-libs/jansson )
-		yajl? ( dev-libs/yajl ) )
+	json? (
+		!yajl? ( dev-libs/jansson )
+		yajl? ( dev-libs/yajl )
+	)
 	pcre? ( dev-libs/libpcre:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
+		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl )
 	)
-	xml? ( !expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat ) )
+	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 )
@@ -219,7 +224,7 @@ src_configure() {
 
 	if use uwsgi_plugins_emperor_pg ; then
 		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
 		sed -i \
 			-e "s|pg_config|pg_config${PGSLOT/.}|" \
 			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index c44120b3cd2e..8583f42a7f35 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
index 53ce2295836d..d1520ecbe612 100644
--- a/x11-apps/copyq/Manifest
+++ b/x11-apps/copyq/Manifest
@@ -1,5 +1,5 @@
-DIST CopyQ-3.5.0.tar.gz 3004460 BLAKE2B 30b2d732e87dd5ffea4d07adec14a377feddf2b7e89caf235e0a6bde5781419ec186bf40c687f14d658603ed3aebe43e5010a062560748a8dc00311f0f52a821 SHA512 9e662c8f80a59d58fbc8c51990682bfe61582ebdeba240e49996aab618b0a118422b0f2023952ef8cdf8e00f50ec4d7c67bd874abacf564226fb096dcc6d944d
+DIST CopyQ-3.7.2.tar.gz 2882944 BLAKE2B 3fd90b719b931ad9d92cca97f3ad284dc454ea5644907fa61b51b70eef5c42f41d52323346c0d24611c99cd2004a0528111125726d5cefe64f2cc9ead22d1f94 SHA512 dff6530375ea674502b754866c0011f3436796fc0535dc9cd317640b8cab4620e821b440df62d229a3d1dba371a7ae0c4a03e5d3366dd845218ab1516196d730
 DIST copyq-2.8.1.tar.gz 1573991 BLAKE2B 464c7fb462638ae717ee70dffcf5fb6eaf628dd4640c9db9d757769ac07479424fc953d81c92ed0e11015802432a9e556171994e8e2da7d0ce11868dcdf57cb6 SHA512 77602d39b0cb5fd0c8bd8d6c1ba5079e95ad72dc846c3e273556ffe029732e65bfd0951954de856c894bd7b6ebae816dfe7048040d77f7f3cd07faa922260b57
 EBUILD copyq-2.8.1.ebuild 925 BLAKE2B 5b33ac4946aa52c34e252bd0dc601c4025c5a530f03fd200f579e24ecc886edb81b2f0c936f8da983a5eac60fd59d832c63213eceeea58c704e9bd194dd41611 SHA512 bb21cef2e96f855ed3009839aabf56479bcaffb1076d92aadc64f75f025d9de7aeb9b283672441011a48c89306166b7c557a19cacba5fa1ee2c9500e275dad02
-EBUILD copyq-3.5.0.ebuild 959 BLAKE2B 49087aed7697fa1eae47d251796bcf287227203586f1858ea3fdd4381fd45c5f3d861e98d460be5e5dc4b0a561d1743cbb7fbc2f22df50a28456d81e6f0d3fef SHA512 894f56b5b7a1f510a1628f4dea90c9b66ede17de5420386d07bc353ed9e789f7e1ce9ad3210b0a7db70d82306d2fff1ccb9fe1a0e0d45a205621f070fd2d172b
+EBUILD copyq-3.7.2.ebuild 1204 BLAKE2B 1a21218b0b1c79a82c867c3e41464dfa2991be477c614a41688259597f7a41639e8717eda27fb5dd696a2514f8b53f89ce7adf2a25d1a3017ee4cd378cea16dc SHA512 3b127d20561489756ac26c3128ac50bb1d00ef5395d375e481058e2cee4a92eea368cb68313f5bc0b034f97139e7cce48cc3adcc8b42524a3821b7c8872ddc36
 MISC metadata.xml 583 BLAKE2B 9e4775c1555d5759d86b6fff357a02b15a8ec9f4fb177e4263c7a47ec5ea539f5d42c44371a79e0fcc96144b5b1fedd2844706d1c658d21f03a46854c8303821 SHA512 6b5df0cdd51515d5a2b03da10a8a7b794c92394858774dbd45bb0dd4e52f2722daf8ba4aa6954960eef592e061c53588b4c2c0bfa84225305f04553ba06b062e
diff --git a/x11-apps/copyq/copyq-3.5.0.ebuild b/x11-apps/copyq/copyq-3.5.0.ebuild
deleted file mode 100644
index 1607b43b0199..000000000000
--- a/x11-apps/copyq/copyq-3.5.0.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 cmake-utils
-
-MY_P=CopyQ-${PV}
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test webkit"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-S=${WORKDIR}/$MY_P
-
-src_configure() {
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_QT5=ON
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=$(usex webkit)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-apps/copyq/copyq-3.7.2.ebuild b/x11-apps/copyq/copyq-3.7.2.ebuild
new file mode 100644
index 000000000000..0c5b8ccd84f5
--- /dev/null
+++ b/x11-apps/copyq/copyq-3.7.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+MY_P=CopyQ-${PV}
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test webkit"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+"
+S=${WORKDIR}/$MY_P
+
+src_configure() {
+	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
+	local mycmakeargs=(
+		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_QT5=ON
+		-DWITH_TESTS=$(usex test)
+		-DWITH_WEBKIT=$(usex webkit)
+		-DCMAKE_INSTALL_MANDIR="share/man"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index b2c5c30ea0b5..01395e218d54 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.0.10.tar.bz2 162176 BLAKE2B 0a3a70360357f0f1a36a72e54b404526e62ddabbdc8b2e6ed992ceb56847fa983b9cec1ba23aab92f4b2fe0712f097a8721d7c50a4b4ead217a5704cda76ea82 SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f
-EBUILD xauth-1.0.10.ebuild 630 BLAKE2B 382d7687208b375b6bf7dee3db4af3770f8ce82012a1a50ebded0bae819d2c06eed6cf239deb8168c8b82763c9a43ba797b597144d5353a0308f4eb39f005051 SHA512 bf1634d2f3b8b5522ed20ab66fa3f69e041b3f1d0e3436ff783964d995a898e8c118d71bde331da404e9541ba72938ce68525f6fdcac43719216e8b4715ef14b
+EBUILD xauth-1.0.10.ebuild 651 BLAKE2B 3bc7c1b6d167d12b297e56d340ede88e1ed61c15f0a7970a78857f5ee4ea21e4b041f1296f0ee6647e23a7d55b65b3602208f1a8eaac9f78ad70ba14e34aaace SHA512 d0d5cc6f0358893e658abe76a9f59a8225eff85626b4eb13416566ae44b5ddd955426aa234a41efc153228dd8155f4e337209717da0b0f7a9ef5c9fe51968c7c
 EBUILD xauth-9999.ebuild 545 BLAKE2B 4b97293aa97ef5d05644508ab8bd6c055fb65d5c484981fa1cb786e5012e45e378d393b39c76d0744680e1385c36bc2da55a35192fdea22ff2e4b4ed18b23412 SHA512 99b1c10111900c48a7debdef3020905899018844fcc9b52b72e304e6a7f9702145565e2363bc8a7908cb7feb13e2bba0a62fd9afe64616ad14400e8e9c3c4c81
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.0.10.ebuild b/x11-apps/xauth/xauth-1.0.10.ebuild
index e767892c43f5..b86fd802718d 100644
--- a/x11-apps/xauth/xauth-1.0.10.ebuild
+++ b/x11-apps/xauth/xauth-1.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit autotools-utils xorg-2
 
 DESCRIPTION="X authority file utility"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="ipv6 test"
 
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index ad23dba4384b..a8bfbf0406de 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,3 +1,5 @@
 DIST xcursorgen-1.0.6.tar.bz2 124545 BLAKE2B 03813fb666b382cab2b4076cd708eb0c67bc35e16122edd04da8ba897e53f67df3571a513023b6ad21066a92f497eecc619c9d00f431a940df23558123a9c5fd SHA512 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4
+DIST xcursorgen-1.0.7.tar.bz2 128102 BLAKE2B d4e583e0183e23d1a127d367e520027bb36dad44306dc2848717f2d25ea3cb656a7cd95fd02a18522911a720319126eed07637e1809b868f1f85c74773a10c35 SHA512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2
 EBUILD xcursorgen-1.0.6.ebuild 401 BLAKE2B 8e2c0d06acfc2992c9ec63e070611d803aafbd8dd5473fc72e136e9ce04a7a2d57da717d071a8be4b759b28f77349a77cc2810a2751cf893c4bac611f87b8ded SHA512 e3c930a53c3e0716a656154f0d5f5d1f82025ee2827a7ecc79cc6f8256a324f695caab3a2adab9745850d70a625f618f47b71d157c47ca0982d5e82daaf2c9e9
+EBUILD xcursorgen-1.0.7.ebuild 408 BLAKE2B f06fdbbf2cb55f1c6b509745e9c7e190ba005afb80fdbe8c5b366121cf10b18ee888c72db1214b900f909d19a6f597abd76134a08ce0f344e844e1b0bba477f2 SHA512 972456e074c8ad33d056dd0616c6fd6550e0dff6966e972be862b6b37b1384c93a43bd1a366f66000bde48fc1f7b1f0e3b9cfdde9ea411e42f9f163cfb404970
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
new file mode 100644
index 000000000000..98667e630691
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="create an X cursor file from a collection of PNG images"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXcursor
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index c76f071ac58d..eb6b77cb3e56 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 7626c8c230f7..e34cd76880e3 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1810 BLAKE2B 3e7eae7cd90d3eed29eb03b91dd92867c6b7aaa7ae33b2d255e22a37d1a1b18d4be492ac6d2887d5ef4e7d2742d3457641253751df361e4043b01ef0f8a0cabd SHA512 8acc24eb3159f70abd5554367d2749a55fbe0c9f13f251011427878a14b3c83fd8763c9d50e1ab9129ac917c76ed9a766ac88b507a478eda8fb3a2e975998565
+EBUILD xorg-proto-2018.4.ebuild 1831 BLAKE2B a215f2196f843247791a146dc76888b0d8b1991507dbaf6b11552afbc50122f51d4b478668480e7638daa00fb82e20550e5c3e1416e549ad811206b86e0f4af8 SHA512 d20781e94d0b7bf5654c28ea6c0256928f52dcbad2c192b40c074a273e8d41cfbc86c3010fddb82c7a2c17172064f5c2ad0d51dd564a4f2670e8e8dee469dfd2
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index b841b04a2b60..a5b2a6dbded1 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ 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 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index c6716a5f19da..d294875048a7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 92f64ca114d3..9bac9d695223 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -35,8 +35,7 @@ DIST NVIDIA-FreeBSD-x86_64-387.34.tar.gz 63387097 BLAKE2B 53689ba098b4a4de08dca0
 DIST NVIDIA-FreeBSD-x86_64-390.87.tar.gz 63648591 BLAKE2B 88aa38b11b64b2ad91f723ec84a2adb6829571136aabb1441a9119418395d5f143736487902f0c60b49ebc1284f3100fbd089e4c941cdd3519ab8511cc1d3261 SHA512 0865fef8b8a3be8f6d9fc81908b162fd6062ba0ea81fd00200e7b2a1e3149ef62408b46bc4ccb7a77f1ac943557a22b13a10cfdde084f0b76cf2b23432e57540
 DIST NVIDIA-FreeBSD-x86_64-396.54.tar.gz 60938322 BLAKE2B a23488b625a15703b0c40bc6871314b05d117d489f64a6f7c70ac3c934b02028b9623be10f0369c98c7d3b5e018e1eb6f1d2cde9d9e1b90be5065f06f6a646dd SHA512 52df85364bfd45a23394078855859ce85de996f7990bb96ba63eb33e516c3cf8e72c4391af9817213f735286f2cf6444bc8ed00312365f12ae17373cfbdc3fc7
 DIST NVIDIA-FreeBSD-x86_64-410.78.tar.gz 61935486 BLAKE2B 3bc85aacd0775b600c37cd285de49fe3d35bba04fd8d3db1ec75f1fdfbd93a9d5b3d34b67e6fd82b5056bff875ccbc44cd2f06fed9b66703b26057c85f750867 SHA512 30488f9e5e6a377a478c49f13d648fba77ac910f43c3e561ce7715380480ac8b3860fecfb5b745beefadb6abe0b4c4135684c468a69c5b71b56cd463698b931a
-DIST NVIDIA-FreeBSD-x86_64-415.18.tar.gz 62328268 BLAKE2B 03b53907ba8eed8751b9270e472b05f21e3865a560a7c4b89b16df0d1981f8ee955d26f42ab51ff538898218caa32745ece0cfa562b8325ad29f866205ab0a68 SHA512 9a80f6e15f57d756f0286db5cbb1c520f6c7553368cdc26d9f062e1f5cd1c6080bf3934b3fd55cdc0b67702be8188dcd177f7aec80697ff978ebc90a6dccbb30
-DIST NVIDIA-FreeBSD-x86_64-415.23.tar.gz 62373237 BLAKE2B b18e96cf7fd2894a153ccb0e34b889d9658185ee0f1930f52f2d2f6555a1cf3d926002afe75a1f03c181fb22dbf08a83aa27fafdd973f0f1780435ea4599b56b SHA512 c40835b89390b4d14977ef4c7d4740798c5ff73a3aee849f13f479c52c30a810869fba16b8f1719021e2367d83dbbe74296775877148ee96fde8822995e97b28
+DIST NVIDIA-FreeBSD-x86_64-410.93.tar.gz 61977979 BLAKE2B a662fa13866cfb36ef61a0b9dd459519e26ea93a6ad6ae7bf34075fae8e7622a91707d88cec8de0660513cb959c3596e8b6169357891c83e847870ecffd72928 SHA512 ecdd5270f9d5f32117d83cd3e3cf0376f0b37c748fe164e702c4230d225c6b28bdbbea4334555b6928d05f1a7cfaf87caf20dd2e7e06e1259c526f6bd50e4d0e
 DIST NVIDIA-FreeBSD-x86_64-415.25.tar.gz 62373961 BLAKE2B 4c1ce36ad31933efdb7b9b3a5a530439cadb50c6ee29c0689a521308fbc213266a761765998c44643fd8511159ae96387a3a278accc4a0d00322b06b9b327232 SHA512 792f0cfafb1d6b2137db62c3a5a7e76217d89c3b18cee92ec8317d6c583fdc9676aa46efd55bc795aeaaf1532501f7b40d1d9609d782ffe63e55bb37d0d6db14
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099 SHA512 28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 2b3c540704496a290be7ae3f1ff378487c75af2298c12488da8b3a1814446e5df02a1ed99afd8ee7fc459d950aab472155359eae0bf56ac83389711d70638152 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0
@@ -62,8 +61,7 @@ DIST NVIDIA-Linux-x86_64-387.34.run 82784271 BLAKE2B b7140d5d6a693892df50b3ad2e2
 DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
 DIST NVIDIA-Linux-x86_64-396.54.run 86946680 BLAKE2B 9b3ab39c9d09c663238d0fac6346c24feea6ecc44b0ecaf3de871522697685c1c474ec4cc83f3bab0a2bcfecc7c77acea0e6bfee6e8ca8e6883bd338fd6da8a2 SHA512 17139abe99d4f32ec87379ee57af2cc0fec7d24605b2be7e3cd6609d9fcdf871e3c1cb7414b3544e14eb32d2213fec7ac45b3261f27c8d6565d510ccb14a1247
 DIST NVIDIA-Linux-x86_64-410.78.run 107944209 BLAKE2B f493efb4b61716ae1f7ac760d57b330e0160e8cd7a90e80dd00744c2277d0c8024f6704eac3a9f95ff13d66f362bf9eecdc8176edb429ea7e45c4622b52beca7 SHA512 0bd7ed61dcfd4d7634ba450b106d7648fc274c256e7e4c4e51e544bd7779d68ffa08cba709ace5333679eeea1dbe4afa0c267361887eaa784d6f1369b717677d
-DIST NVIDIA-Linux-x86_64-415.18.run 107849060 BLAKE2B e4ffbec6a31f79d8c7f18bfbb4e256b94ef8e741526eb07032fd645da1b37751e867d72e998f6b8b773d55127e40bafeb53e8d5f9a4f8be4ce8a8d079e9c3341 SHA512 8e56b5a62f47b4bbe2b0c59e05e2b1a4beb204252aa2000e6dfc257a16f06d00862232d2a3f404192e47b73c3af9f6d6c92e3d530b977a6ecbe3f2d944a12f7e
-DIST NVIDIA-Linux-x86_64-415.23.run 109007128 BLAKE2B 48b8fd0e0166148c6687c0bed386e056f12fe9060b9cf9b1e33453a538cf94427786084799d5d3070f6b005c4994e782367059432a32b10277cf16a8a7ecaba8 SHA512 3bdd8c7b3758353f98686361babd14b91dced283c9a27e1c828d87fc4eff66488707345195e27de107c72a408b6ae147ae9c86cfa31bd8468bfa70d56bb68739
+DIST NVIDIA-Linux-x86_64-410.93.run 107257681 BLAKE2B 56e9b6a17ab4d2fe2f18d90b4e209fe048c53dc43846ee9c8bd0960999a06ef9d9b6ba7e4c242f77cc35cfc5b9a0e2ae24aa5f07f68cb7662bd5010de41a9b36 SHA512 1132884210e447d20768c4ae84ff572c9f6886fb9a082da4d229a03c13932a5c6ccc518cad3311a9302b6a0d9e9675e3a53199e7183e07c81282d46883d26105
 DIST NVIDIA-Linux-x86_64-415.25.run 108599932 BLAKE2B 958a345f03157ebd8f8a84da91af78143ada75be4bf1d5abbbec9bc8b0ca11549891efb2f78c3ae89ed86fa94a4bf179834d1b229b2dc7d3587a138235a8ce7f SHA512 d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857
 DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
@@ -75,8 +73,7 @@ DIST nvidia-settings-387.34.tar.bz2 1080507 BLAKE2B 4eeae3ad4b489f574832e967f0c7
 DIST nvidia-settings-390.87.tar.bz2 1109274 BLAKE2B 20eb809ceeade932e89592ac91071e6d3311f4a075812225d68342806b7ab1f9f8ed0399ea7a47241b7974311794852fd932fd8e824065589de6c124a3c81ef3 SHA512 cafdf2bfefac187409dfcffd593ff23eaba5ab7ab8dd85a9f14a4b6a47ffb3649af770bd2615887af9d30de3ef8fedaad7afc2ebe9f60a8ba7355a9004702959
 DIST nvidia-settings-396.54.tar.bz2 1116371 BLAKE2B 114b88f393b0909c8d84a56a280854e258d0e7e7ce800ee58547ef68b4989f22a3bbb380795472b8222493a988dc9308fc20ef03c81589448b518a12285cf204 SHA512 23dc3c61bef71200b3e8185940dd52a50dae7ca7f2b8a68fa96eaa937aabc87ded5d5f73081af51d1e7af2b78b0ec10ab80d28dadbcf10a046c32ec14db1d83c
 DIST nvidia-settings-410.78.tar.bz2 1115872 BLAKE2B 68471e3c3700c68c1082bd7ca349a791a8b7c9524f71882d78791a11ac4ecaa28d40cdd32baea20354732b4ee8e47767ae8c12d534f95a96494da5787869b4c1 SHA512 28aae1cbec6004d4f532aac2a728d66384440525c3f35f1bf5b7221c4722ccd02be119d44b261204c0f0c116d5455eca7555d10cab3f6d4184a39255750ccf97
-DIST nvidia-settings-415.18.tar.bz2 1121712 BLAKE2B d8e8c16e5d1fb41c77a90e4226c79c00ae07f329f4d6d15be3de7b9f3ab1d8ab09dba32295ffbb77b851f9a51cd11e560b0104f2ece52d1af6f7208602b9f5b4 SHA512 d38e32916cf711bda4b9a1a772b5711af1f0c929d28a9818f4c4dfb761d5c1cf33907794b74d4748122211ade08f63f3feacf0976890c59a9d694c850118ff48
-DIST nvidia-settings-415.23.tar.bz2 1121875 BLAKE2B d64b0557c28d0ef6d44349f70a7f94a53dd4f2dd77fbdb3d70faca4a007142b59b0ef777145786a7d36ea67db40ad06b745de3fd7fb85092d380700886d5971f SHA512 622bc73e6529621ad7c0ec37ea6e9a7da2f6a90d96538fcb32c86fd920125dd00359de82e1d7ebd0b778708d255ab6aa6c97ad7e3d1f8b18b95c8c367fd878c2
+DIST nvidia-settings-410.93.tar.bz2 1115704 BLAKE2B 1119181feb2704711593c19a43dce5feb58778d0251cb2dcb8647de7bfb1abe3a7f374bddd62e4c983b07a207bca7c1d99a7ac51cba3ae41f78fb97c4d1e9666 SHA512 4e5a5babae382dbe9f6899e51d3b1081fd7123f9ba5e147f7d5cc1899904892ea8d953983e43643ea4355d06348db40005755a02c7c0ff6ba104eac4a9d450f2
 DIST nvidia-settings-415.25.tar.bz2 1121689 BLAKE2B acd9dd12b4d9a3d76e08d1498fe2373327308d0764791c7e14c6471cf98e79f635a1073dfacdaa4fa60dd148c15803a18061b185cdea24676d851b3a1b695184 SHA512 8646e4eb8d491cbd20205766833fa9f0629a2567797fbb7ca085e07946f4698645cc134615bc20a42090d4f4fe826df48ab4be717b227ee59c17941d185e0b0b
 EBUILD nvidia-drivers-304.137.ebuild 13739 BLAKE2B 674217817d033e081e351ebea79b85998b187332246e24a50451377300a1ab1215071ff8214ae52a1d220fda066a53964f711c884074a3b74761b934367e2bf2 SHA512 86f27804b30922d046de5efa65ddafc15daea5b83ea716600387edfa8355890379712a3bab09f74a3f9a4755f9b3dd5a645bcb2a137f2762196f4f2ecb32f5d4
 EBUILD nvidia-drivers-340.107.ebuild 14727 BLAKE2B 6307b7dd2facd4c7b7ffff22835b296b4cb89082706d8f030567ebbca0f73128b482bb63c2d8453d94972c7517e0a1eae90da10a825cb2905f62e6b42cb0ef7c SHA512 77d821b0130a9dc1ac10a362abc11b605f996ba045157ff03add5a6bc9a1560f4a898be3cab75a5e4b4b3388de15e00a6c9d34eb6340355de062735d506c9a5f
@@ -88,7 +85,6 @@ EBUILD nvidia-drivers-387.34.ebuild 16354 BLAKE2B f1a83e45474902305b2fc97f13b32f
 EBUILD nvidia-drivers-390.87.ebuild 16369 BLAKE2B d30be65e829598adcce893844c01871873ba8bf751d0b322e535713e145c3bd6f73394fad5e93120852d48a23bd73014ee1261e065683c919b730b45bc0a49c2 SHA512 2348c56ee239c2a45473840d61fee3ec465578ffbfc8c83d11f042d79b57314766f7c96f51181457fe9c43e2061c61d565aec9eb399871fc73ca62543f5c5d5c
 EBUILD nvidia-drivers-396.54.ebuild 15991 BLAKE2B aee8b58a8df6652c123e86ba216512c5f9e42fbd83ae87bda788768f327e73121b1f8bf383cfe9836b231940e9cfc8acf16b0950f1105d138ed47a76bf4cdbd5 SHA512 e0f3b12f7943f96ff0e63553f3c42ae0abfa6c994131c2fee117f21b96499772484b420d7b39db27f67eace5e8b95533bc8b4d1baa8108065c9bb18a76510338
 EBUILD nvidia-drivers-410.78.ebuild 16258 BLAKE2B a9a0176a1ed03da5f5756fcfbb95233dac74c410c54d1c1b72901713a8c19051bb252bfd0d9522f2050d2db23f3a501d3a3c607edb8abf4138d6f902364d1892 SHA512 89dfd6e9131eb539b59d8f51303166c72f24099e5112c0366e4b2f5ca18779ac14d7106f060229fbbfcbecb6d69e5e5d8ba66dcec9ff15a8161887eb2fd4150f
-EBUILD nvidia-drivers-415.18.ebuild 16250 BLAKE2B 48e4f947a0c7cbb51bf074d78a02e1247471c7ee6d77a496f5ff778f542dcccac42bdcfe241b8e2fc8c0f335bdd1933a31055b513a551d8910f3b3075cc376b5 SHA512 e112953843d94ca69b90dad0870ad77b3f8158c4ae37318b5e857f4c3bd3c3393f425ab61aad809adf04cfdbc5498db9d2e16773790b476432cb301d4f803a86
-EBUILD nvidia-drivers-415.23.ebuild 16267 BLAKE2B 0b332091d6adfa9ad0963db6080fb6c358b4f3cc54c08ea1fe035fa522bd905a0f1cf8ef0cf2104c8a71daaf3e4c2050feb9bae22b5c9bee6a03a9f53363f918 SHA512 134f1848112fb8db94b7153be557731807c020bb385082a519907a512a5af77507f5af6af92096df34e9104dc13e6ca06ed68a8c579c12cad03741073b2e711c
-EBUILD nvidia-drivers-415.25.ebuild 16267 BLAKE2B 0b332091d6adfa9ad0963db6080fb6c358b4f3cc54c08ea1fe035fa522bd905a0f1cf8ef0cf2104c8a71daaf3e4c2050feb9bae22b5c9bee6a03a9f53363f918 SHA512 134f1848112fb8db94b7153be557731807c020bb385082a519907a512a5af77507f5af6af92096df34e9104dc13e6ca06ed68a8c579c12cad03741073b2e711c
+EBUILD nvidia-drivers-410.93.ebuild 16259 BLAKE2B ade766cecea286e93303356d4f3cce45bce80b5684d3591aae0e92ef5d07693d8ec524d8798dd6ddbd344a9447f5f768d5b6cfd15e2a0d290a2815efafd54a37 SHA512 5bac97dbfb07a34e935e4c9aba559b674577b6005a293dc1d34cc5afd3c9e2e03379f461c1f8a62ad216259524b0bb76a3307b2380796e6fac4150dd06e16691
+EBUILD nvidia-drivers-415.25.ebuild 16266 BLAKE2B d3bae475782fe830aec69eff46303f2a7cf28b202433199c0ce933c15d38bb66bffd0a95b1b2b450c79105308b93fa60ebd26d1af8bda15497d9a9450a9474bc SHA512 700bbd31140b81559545d1d4690845f338b55b34c5ebd6574bf0503ce04f197fe943c2d7c8dd179bb35796bdc34bf530f65fa929a204256596d752985b865a42
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
new file mode 100644
index 000000000000..f60533696c66
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
@@ -0,0 +1,592 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 21; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.21"
+		ewarn "<sys-kernel/vanilla-sources-4.21"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~PM ~SYSVIPC ~ZONE_DMA"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.0"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild
deleted file mode 100644
index e9f557b9387c..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.18.ebuild
+++ /dev/null
@@ -1,592 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 ~amd64-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 20; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.20"
-		ewarn "<sys-kernel/vanilla-sources-4.20"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
-	fi
-
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			PREFIX=/usr \
-			DO_STRIP= \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.0"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild
deleted file mode 100644
index 86b6c9565d93..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.23.ebuild
+++ /dev/null
@@ -1,592 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 21; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.21"
-		ewarn "<sys-kernel/vanilla-sources-4.21"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
-	fi
-
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			PREFIX=/usr \
-			DO_STRIP= \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.0"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
index 86b6c9565d93..b4dd340c748b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64 ~amd64-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index 10ccffe11b58..0e4fe09001b4 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,4 +1,3 @@
-AUX xf86-video-r128-6.10.2-fix-stdint_h.patch 194 BLAKE2B fd054df8e84c8db45c054b6405fb6414d56045461183e49a7bf8d5ca1bc7ed6dea50c5de9bb9893491d5607a4288725527f0532d2a194ccfc5d5bfd8b9446f40 SHA512 fb494532052ba73cabe52d8ac9990a994067f55f9dd56f39edd923bb5f4f2fbbd16333b3c1e5820135f21cb79a6b12745b2fd769df0317c1126ccdc1d6dbb9d6
 DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
 EBUILD xf86-video-r128-6.12.0.ebuild 522 BLAKE2B 1fb442f7c95ecee6486f1979634534eb31c235e7dd76951f8a33107727a5f675fe0942a64db7a8752e2adc96e3f164ce522000876349c30b47229516715a2132 SHA512 c16dde432a1dee46901aa171183a0a277314063a2126a704be35c1b2fa3764de7630d14261049d54ee8222ccfab644e7157e375f81fb47c4babd1c0de48ba9d7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/files/xf86-video-r128-6.10.2-fix-stdint_h.patch b/x11-drivers/xf86-video-r128/files/xf86-video-r128-6.10.2-fix-stdint_h.patch
deleted file mode 100644
index e5b731660632..000000000000
--- a/x11-drivers/xf86-video-r128/files/xf86-video-r128-6.10.2-fix-stdint_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/atipcirename.h
-+++ b/src/atipcirename.h
-@@ -29,6 +29,8 @@
- #ifndef ATIPCIRENAME_H
- #define ATIPCIRENAME_H
- 
-+#include <stdint.h>
-+
- enum region_type {
-     REGION_MEM,
-     REGION_IO 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6564a52e6b33..d199fefa9253 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 339d09778793..366a9b1b69ad 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,21 +1,12 @@
 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
-AUX gtk+-2.24.31-fix-gtkentry-beep.patch 1331 BLAKE2B bd55e60389292582a70ad796553f12ff777a646dd64893109d0dcee884a9732a32fad0676513efc8764db14fde84da25855c6fa247c151b4dab22f5544e4da78 SHA512 a5fe1474a044299dd2a6e3d238cb1afedc363db095c752cbc9d0435794a6a8f9f6260b7eb96eb3a64ae7fe46b9ca275168c6c39358dca28f7f42203f929c935c
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
 AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d8b5c22ec57eb8709d13270b53cc389f2a14a4fa145051e5c0d80e7eb0c9e6778a240fbd64e4299d36736500ca6695a1345b13 SHA512 46ac52f18c0e74f5e35101ef978d7708c42abb05985894b65e8a7f7a76f1934015ff35a912628a5ae2c6333916ffd00570aa19230108aabe3a20adc5e31d958e
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
-DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
-DIST gtk+-2.24.32-patchset.tar.xz 6392 BLAKE2B cd3a7256bf0552cd483a59dfd856497f5d908edb40d73c25a336726b880872a219d03a7163226abca6155bfb34a38675817124a82780760b226265ea3fdc3246 SHA512 6c8763826b479c9c122bb991ae42b0ce0e754d460be5c6ea8d1bba28f7318c014822eccaae0b39c3b7c16804991c8c46c53cd8ded3ad6212830a2f5746567543
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
-DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
-EBUILD gtk+-2.24.31-r1.ebuild 9836 BLAKE2B 4400023180fc795df2169345fce2a2cb2b315368a7874fba61eaf65e547ca75dcfd1a929930f7581114a7912a1b89ee5e94e710fd334a594270707a9e60b49c1 SHA512 027bcdcafb2a62f11f0b737d6ae46c8fa0331601ea8e166b7a9c13cb533b79af3c814c9e0e14747dae804c8c03072d8b6cbaba870145ceb678cabe14d098a63d
-EBUILD gtk+-2.24.32-r1.ebuild 10010 BLAKE2B 32d82f1441868da899ab8e4c36825c9a61ebabfd3147acdcd620f2e41555710eb3e726f48443c83b5c3471ca519d5b371921b5e289f62fe4889fb2a81d70198d SHA512 afd548f3f4408aea3f5f4882e62d1e94a63a755c47831236f20789f5df6ab99f0970fb213384d233b34e41b9942e0deab1fad8abf5da5db313fb97b2d933d85c
-EBUILD gtk+-2.24.32.ebuild 9987 BLAKE2B e678175fa76e2d44813e26780725412ce41df9dff61797e1f6953d806524460f64d9d39fa8409f197f5e488fd8f772c0f9f4cd6ea902a1b03894230a30e58e80 SHA512 ea0b57fe66e20337c71e8b2d2829c1ef19194064a8506455fe68fc51add54f6c58d48a162bc31d5d5d652e348356218c07d8a3bc383e7f7fbcd1147ae63ce70e
-EBUILD gtk+-3.22.19.ebuild 6559 BLAKE2B 3bd0611294ee3a3811e5d99c910e48c935e32acf991a4a5bd74826cc52d710883bae68354d07ca7249bed5ef49fbb22beab8adddccca1c18fc3cf162fba373ad SHA512 179ee609778c70342ae29ef0f25da28ed506eef801da98a396b3b3a039668e416a7a16892e698507fd47fc2ec6763806ff2cd75ae319301943d727d3b47f2725
-EBUILD gtk+-3.22.30.ebuild 6731 BLAKE2B f9d9819181e9908e4cfbdf0e68aa8792a1898ab2c20f7df083b624f0a086c6398a341b1c1dd7231dbb6d4cdfd730dd7d0e0a519a1ed168aa3db3e4249a439169 SHA512 f706634e33f37262d8f27aa40e16902ee646727ccb0062fdc49a0b9fc61a186a05e5a011fe0e3760b0864aee7870bf74b5a8c8b8dc89c868563240cd03cd4518
-EBUILD gtk+-3.24.1.ebuild 6782 BLAKE2B 4234873081d5bf7c886e61cf9fc7df75d9c318fa7d5b0ba15629cc7061b7aff147685e0e3850b439a6d7b30eca9b5c28aa588bf517ab091a42a130f2e611de5a SHA512 c7e0c356bc7e2b3e7aa11d22dab95c56fae0230307ab07a626c95123570d306e3027cc4266cc972d911cbc1415fb572f41998493b854cfdb3c8586a1cebc0be3
+EBUILD gtk+-2.24.32-r1.ebuild 10009 BLAKE2B 2a190d7fce5efa98ad28a1e94ee83eed1acd1399e04b4d4ac76c31349d2d40668b78d06096b9a6352f64e5b61e1a31675b61e8a0c90e252035782d51ea8f36e0 SHA512 9d794353dd8bdf5fdb68298ba454781f7f11cc287737b58003ed18a03c6824fbed536633af4c435a6243fee1289d42fa467bee00b8c0ca9d36f7999908fdff61
+EBUILD gtk+-3.24.1.ebuild 6869 BLAKE2B bf28f0345acc6e7daeb336028c3707a51d72a9a200f09423b1d19d23dde953b891abe8a112edaeef8a8f0d28dcc10e0db92c6413f4bd9cdace2dbfd6982a2283 SHA512 6b9b4a44408d66e3cd65fd8ed02f71d32bcc97cc4bacb32e3c1988c77469e14ccf58f9de1cc6156ed0517e1e4415a369d9d5143c39cc50c2618cd4e6a3f3bf70
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
deleted file mode 100644
index 1d09721b6711..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 5 Oct 2016 12:20:14 -0400
-Subject: [PATCH] entry: Fix a corner case of overwrite mode
-
-We currently beep when a character is appended at the end in
-overwrite mode. That is obviously not right. Patch based on
-a patch by Ian MacDonald.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772389
----
- gtk/gtkentry.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
-index b522039..bc33754 100644
---- a/gtk/gtkentry.c
-+++ b/gtk/gtkentry.c
-@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry       *entry,
-   GtkEditable *editable = GTK_EDITABLE (entry);
-   gint tmp_pos;
-   gboolean old_need_im_reset;
-+  guint text_length;
- 
-   old_need_im_reset = entry->need_im_reset;
-   entry->need_im_reset = FALSE;
-@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry       *entry,
-   else
-     {
-       if (entry->overwrite_mode)
--        gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+        {
-+          text_length = gtk_entry_buffer_get_length (get_buffer (entry));
-+          if (entry->current_pos < text_length)
-+            gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+        }
-     }
- 
-   tmp_pos = entry->current_pos;
--- 
-2.10.0
-
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
deleted file mode 100644
index 71effec2ec84..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
-	xinerama? ( !aqua )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	)
-"
-# docbook-4.1.2 and xsl required for man pages
-# docbook-4.3 required for gtk-doc
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	!aqua? ( x11-base/xorg-proto )
-	test? (
-		x11-themes/hicolor-icon-theme
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-2
-	!<gnome-base/gail-1000
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
-	>=x11-themes/adwaita-icon-theme-3.14
-	x11-themes/gnome-themes-standard
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	x11-themes/gtk-engines-adwaita
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# marshalers code was pre-generated with glib-2.31, upstream bug #662109
-	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
-		perf/marshalers.c || die
-
-	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
-	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
-	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
-
-	# -O3 and company cause random crashes in applications, bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# Non-working test in gentoo's env
-		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-			-i gtk/tests/testing.c || die "sed 1 failed"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-	fi
-
-	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
-	eapply "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
-
-	# Rely on split gtk-update-icon-cache package, bug #528810
-	eapply "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch
-
-	# Fix beep when overwriting at the end of a gtkentry, from gtk-2-24 branch
-	eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtkentry-beep.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	# see bug #133241
-	# Also set more default variables in sync with gtk3 and other distributions
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
-	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
-
-	einstalldocs
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert || die
-	rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk2 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	set_gtk2_confdir
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 144f27e23d5b..37e26a0b2b0c 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
deleted file mode 100644
index 02b2af8e8020..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
-	xinerama? ( !aqua )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	)
-"
-# docbook-4.1.2 and xsl required for man pages
-# docbook-4.3 required for gtk-doc
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	!aqua? ( x11-base/xorg-proto )
-	test? (
-		x11-themes/hicolor-icon-theme
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-2
-	!<gnome-base/gail-1000
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
-	>=x11-themes/adwaita-icon-theme-3.14
-	x11-themes/gnome-themes-standard
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	x11-themes/gtk-engines-adwaita
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
-)
-
-PATCHES=(
-	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
-	"${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
-	# Rely on split gtk-update-icon-cache package, bug #528810
-	"${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
-	# Upstream gtk-2-24 branch up to 2018-05-06 state, bug #650536 safety
-	"${WORKDIR}"/patches/ # requires eautoreconf
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# Various glib marshaller churn could break build against a different glib version, force regeneration
-	rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \
-		perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die
-
-	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
-	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
-	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
-
-	# -O3 and company cause random crashes in applications, bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# Non-working test in gentoo's env
-		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-			-i gtk/tests/testing.c || die "sed 1 failed"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	# see bug #133241
-	# Also set more default variables in sync with gtk3 and other distributions
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
-	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
-	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
-
-	einstalldocs
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert || die
-	rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk2 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	set_gtk2_confdir
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
deleted file mode 100644
index af9e928cbf8b..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.9
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
deleted file mode 100644
index d55aae19ae49..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.12
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	# cloudprovider is not packaged in Gentoo
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-cloudproviders \
-		--disable-mir-backend \
-		--disable-papi \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index 1128a17bdeb9..2e9e7775cf2a 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,13 +12,13 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
@@ -70,6 +70,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gdbus-codegen-2.48
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
 	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	X? ( x11-base/xorg-proto )
@@ -140,6 +141,7 @@ multilib_src_configure() {
 		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable gtk-doc) \
 		$(multilib_native_use_enable introspection) \
 		$(use_enable wayland wayland-backend) \
 		$(use_enable X x11-backend) \
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index ee17a026620e..707fa6560e39 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,3 @@
-DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
-EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.8.ebuild 1797 BLAKE2B e201b569df41e5d4be5d7ec8ef26aedb7fb89714795964a93cfd31a50ba985df567e2f4963cf900976355fb668e79df37017f926b3f0a7a627b3c87f77e55aaa SHA512 4a447a9a6d67c7ef2795817558d0fc781b150bed243570b721644fee57839661e8a14f38da78407da46a4c227a2ca1fb1b195e06a395cbe094cd626219301bd9
+EBUILD qscintilla-2.10.8.ebuild 1796 BLAKE2B d32e1be6bd53bbd8b893c4dbd755350430907213b38b95462ce26742affda2b3c93588189b636cfe6df1b3854e7b825555b5993fe4a766135ee802c239b8d906 SHA512 7f5906dc73b378fc93bbbd97394e269d55f335f7404b05e8d04f3048084637710a6ab6d4c4e4a7e121834b1f966bff07bf53df13400735af301d8026c63d3f61
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
deleted file mode 100644
index 087f92e548df..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.10.4.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
-
-inherit flag-o-matic qmake-utils
-
-MY_P=QScintilla_gpl-${PV/_pre/.dev}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/13"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="designer doc"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	default
-
-	# Sub-slot sanity check
-	local subslot=${SLOT#*/}
-	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
-	local major=${version%%.*}
-	if [[ ${subslot} != ${major} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-}
-
-qsci_run_in() {
-	pushd "$1" >/dev/null || die
-	shift || die
-	"$@" || die
-	popd >/dev/null || die
-}
-
-src_configure() {
-	if use designer; then
-		# prevent building against system version (bug 466120)
-		append-cxxflags -I../Qt4Qt5
-		append-ldflags -L../Qt4Qt5
-	fi
-
-	qsci_run_in Qt4Qt5 eqmake5
-	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
-}
-
-src_compile() {
-	qsci_run_in Qt4Qt5 emake
-	use designer && qsci_run_in designer-Qt4Qt5 emake
-}
-
-src_install() {
-	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
-	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
-
-	DOCS=( ChangeLog NEWS )
-	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
-	einstalldocs
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
index d3291e197194..ee5c0e806255 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="
diff --git a/x11-libs/spread-sheet-widget/Manifest b/x11-libs/spread-sheet-widget/Manifest
index ce4a88f76ab8..ee9a778ef5fa 100644
--- a/x11-libs/spread-sheet-widget/Manifest
+++ b/x11-libs/spread-sheet-widget/Manifest
@@ -1,3 +1,3 @@
 DIST spread-sheet-widget-0.3.tar.gz 501469 BLAKE2B 92acf196966271086b02ad3a172d0f439a84701b3074677be87c84643c6a9180685121370611b21f1c9d65ed0aeacccce169a6f53d9f7f418f5e8469744fb19b SHA512 1b667c901e42f00e7862dab70fd9df65e69aaa09d1f9eb0e7d83ccbeb74239b24188ff096b5645150ee8c98f4881501402704db96642a41b804674cbb95d1bcc
-EBUILD spread-sheet-widget-0.3.ebuild 355 BLAKE2B 73a81f69dfec4052cdb2b8e9b10fc5409effbc8e8976a9d728c811495865dc19ccb666989a7d61067bdd8e3ed7d3aeda2315381f11877d775b22a7a157bd9ae4 SHA512 84fa20d6f46a961f997fbc6ec578794be15906ff9dcb3fa9bc5337dd5593e583fcf98d389726725a14ca45c2b00d5b06a2c179c7a1fc89cf098825122e15d56e
+EBUILD spread-sheet-widget-0.3.ebuild 354 BLAKE2B 02077e8e973c6a865d6676df46fec5eb9a2d7c6dd251bf4f32287da86fe8c6ed31bbac6051a80cc7b848aa29deb263eac658fdc09b57fc5eab3df04394ef4587 SHA512 1b1df6c46abaa1140b8c329d139a0bf11dcae5c9672240bf36d45c8bbc7ba8bfc29f3abe8dc89b449569481ef248252f53013b282e204a2161c27a056752769d
 MISC metadata.xml 783 BLAKE2B 352fc49d73a0037151ccb02d9d14d03a9f71eddbdf1add8e7b805cf398fbe7dae6d7a6bd985ef84bc34092f0fa4fb525d6cc4ad39f76cfb5944cf9897b68568f SHA512 9bc392c1064f078db2e1356c0736db3660339f81d20dbfa9039f01f0e8907c660285ed5a8c98b62feafe2e902351d52bdc2bc2c6538c5f7c1c8e79cf08e5df83
diff --git a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild
index 27727130ea32..25add3fcd021 100644
--- a/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild
+++ b/x11-libs/spread-sheet-widget/spread-sheet-widget-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu-alpha/ssw/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="x11-libs/gtk+:3"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 57a318ad55a0..8d21e8dd5ccc 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -13,5 +13,5 @@ EBUILD wxGTK-3.0.3.ebuild 3982 BLAKE2B 5b49474a6ab03648d801c2cc1e1df298bb52b2cc6
 EBUILD wxGTK-3.0.4-r1.ebuild 3989 BLAKE2B 114505f94787230c4dd9cdf61211178fa0cf738ffccee3d73bda054d6611286084a7025fc1317508d93d263547cd90414a78ca619f328407fd30f1bc49c2826d SHA512 481a9bad6508a6bddae036838394560a82aea6be5591ec6b53e56e97aaba615b70486362bf142497e0980c8a25105a6730bae6dff6cd6175cfac0f636ed72581
 EBUILD wxGTK-3.0.4-r300.ebuild 5200 BLAKE2B bc4cfe6fe8ff393323d6695611b126a476dc414ef35e56748f09417e3483e9b7a314300b413e88172d300adcc3d4c9b3faa188ac61feff6f0b8b92d2869a184a SHA512 adde834493c288b350e10c12ca0531a7fbdff479f4970ee04f5cfaf73b4e43f522a9b7227ed4fdfb065a67686f8bf3ba80dca8f6cefaaa265fdbe981f1ccab1d
 EBUILD wxGTK-3.0.4-r301.ebuild 5206 BLAKE2B 3f3b13b90dfc95527d7c2a0aaa31728f5a299143cb43b7faa5077167e9191273e9f150ac1f2e5b8be90b9d11d2d9c5fb8603254c6a22794037e85fb8d0d58a9e SHA512 4283fc65d9284b98ccbffc689164bbdbe70d1b9160003b9c722a855ec58b73ea80f57efba8320b66ea6124a9197e8fa76c5aaf49bc294491c4abb1867507e34e
-EBUILD wxGTK-3.0.4.ebuild 3980 BLAKE2B 2eaa5964205dcb93da849879abb060bde0f6b04c07fb5122797de5881492106461c838fa999edf26ae794071eee39a6577123fb8eacfdb7a00049fe503f89eb4 SHA512 0ea8c93932d70059f2623f96047a9fb0d89c8419ebc886c8b193e4feb1b39feb98f6266682a31638b14e7193c467a56b473d7a644bf53cdb3afba3ecf9015534
+EBUILD wxGTK-3.0.4.ebuild 3979 BLAKE2B e82baeecd27c731911867318e0e1913bdfb58530c35672c90c1625ebecebf151f561bc13252576bc835c8ebde02f0e66c6aa18a1fc9f7614f223dddc5db33747 SHA512 15aee934018cc458684e98d1c0f7868d9e100ae578c7bec98472041820cee8dde5a966f352ca4fb06e41c7327e6293898b510de543f76af518cefb7aca9741c4
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index fcfff9af0b8a..da5cfedb9bad 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
 	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
 	doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f93127e6de7e..ef38ec2c4302 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 3bafac9f4264..a2497d869fed 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,3 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
+EBUILD nitrogen-1.6.1-r1.ebuild 990 BLAKE2B 9112f03b3711858c11d82b5ef9b7a3affdc87c0bedcfcbc0bc00bdbc3660c419dbfb7e1fd8e748fe0ec54e3fac9b7f59280a54b6d1deddb18df5e2eefd457859 SHA512 a7429f2f9678801dd8af97761da0d248fadb39f71959db026bc834f5c58f510df6d8e3364d2fde5c146b09610a2a5afa7a49e61404be31a7339dadb5c083b77a
 EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..a43c24a1d2b3
--- /dev/null
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="A background browser and setter for X"
+HOMEPAGE="https://github.com/l3ib/nitrogen"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-2.10:2.4
+	>=gnome-base/librsvg-2.20:2
+	>=x11-libs/gtk+-2.10:2
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 0c62356ef2d8..3d09c5113e4a 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,5 +1,8 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
+DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
 EBUILD rofi-1.5.1.ebuild 1148 BLAKE2B b7c70e7170a4388c02744a063cfce35bc71298e9ec8afc6943e70f556402c9356f75243640ad8a1744a4c6354e693bf7138f97bf532b72a5feca75f754254c78 SHA512 018e51cba23418e771ac351709c7cc9d636e5f2f97afd7567dd5f8829e27fb0e77b37af7901261cf5856e13a6266d7c6b1f898a2be9a100ec982bc55d11ce556
+EBUILD rofi-1.5.2.ebuild 1032 BLAKE2B 5b73a903902e3d3cb173a04a1c4b58bfbca8e0e071c66d9102114595cb434d9e4cc6aeae1997ffb5010b91632572983e7e6a0542d1c98c91534512c194875e75 SHA512 61ef9e26fe8568bf260b9a25b2e68f3607f1402ffc13caadfe861501ba016cd55ece71e914dc192d5e9e036210034954e4a22651cbfe916acef0db4411318882
+EBUILD rofi-99999.ebuild 991 BLAKE2B cdf6f969db35ce32aea26f08a3c33f1499550dc694bdc5da1f19bbc5f6ced81d4c97fa7b29cac1f0f11b356f8b31ceddac80ec1ce9ffa141cb4d9d1032815dca SHA512 b2e8fdfa76f7c42b44246861b15c10249f8b15795f3ad5f11a8bb8396fbf439751ee9103f462ff2c1107773106f18993e1e167c038b17d8f19893ba4361d426b
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2.ebuild
new file mode 100644
index 000000000000..ffb4b7ff5d39
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test windowmode"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	x11-libs/cairo[xcb]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
new file mode 100644
index 000000000000..8533b2dbdb9c
--- /dev/null
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test windowmode"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	x11-libs/cairo[xcb]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 1258a30266b9..1887c71b3305 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -6,6 +6,6 @@ AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44ed
 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.9.1.ebuild 2133 BLAKE2B acccde0866c6a542c5169e2e2e8868960ab31e1b6330397fabbf51be14d39ed08a612bad8ab058f61d238500acbd3523e7458d3c0448f9ec567aee86fa6bf47b SHA512 59f325779128796cd9b51b85a254ebf72ab6344631501d07cc2f1ad88b2744ca208d40ce7b770c42317e17d9202f782ecea3ac8c5de695b4b6d3288afcf144bd
-EBUILD synergy-2.0.0.ebuild 1441 BLAKE2B 5afebfa5d2fd77f30c81d7b219db60c4b51707ca365b663d5a60fa363070697f9462dfd466798eab585ca9125df74ea49baa6531776a2f73d7bd088d8ed7c479 SHA512 da82c2b5b2f21b4d94be8c8ed57309a956636eef45722c97adee6e31e8d3b2c8999d0c3dfbd641bdd3993bfe7b1314f7f7be3b4a6cacb47d0286a652aff9310a
+EBUILD synergy-1.9.1.ebuild 2132 BLAKE2B 7f927c9685e55fe8f4c6bb86a408bae210798a1287c92c74923d2c8102dc3cba2dcefba103674ffb325cff77405dcc14cfd1db7a11e359f7a79028e6e6e8f34f SHA512 4b18a9c63af2318cfa519f908553b6e5e16e2a74c1f399e91194b4b47c0f34d306ae1ee0bfa05c7c0788e7f6e4133f9d5538fada98a4e41f21e8cce8968c1ccb
+EBUILD synergy-2.0.0.ebuild 1440 BLAKE2B cc1834ef9b4d29f9d7af6c3905628cbe9279c28462131a4538f1420347c5309e11dfa10b32a810d8cd8c8b110dfe040cc75415036b93bf57e22db21460634043 SHA512 4812a614433ece4c96afcda75360dc6f2b96554c01b21242f0e8ed5393d87fe7d8b85ba0d0b94fc4536f7b3a92a891bdf89ab96f088aebf22c0ac9e9ba2723cc
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index 0484cd37832e..63e9799f3bab 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,8 +21,8 @@ RESTRICT="test"
 S=${WORKDIR}/${PN}-core-${PV}-stable
 
 COMMON_DEPEND="
-	!libressl? ( dev-libs/openssl:* )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 	net-misc/curl
 	x11-libs/libICE
 	x11-libs/libSM
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index c6741a4ca9d8..24579a8395f3 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXtst
-	!libressl? ( dev-libs/openssl:* )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
new file mode 100644
index 000000000000..9c78cde9292a
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -0,0 +1,3 @@
+DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
+EBUILD unclutter-xfixes-1.5.ebuild 597 BLAKE2B 97c7064e69f13ca08d9d2aa1e968f42351ab659b4811aa1d32fde046cb673d0f91176842f6880d849a49d8476a78fd293be5f06fed968cca4c46a75cc1c7be3d SHA512 af7d89ce83b1f167d2a16322019d7e9739d2af8e945bb17230cd3b9a2e89fe1dc4b8cfbf8cf5df5e15e1a244e26b4f36d7764252f07e6ba80f05eaeaed21898f
+MISC metadata.xml 337 BLAKE2B 6d8b204b2317f4e6f7193d5d9403770e88ea31d6411e6f5b49fcf9a268a97537a03fe210850fb0bc6d63754f54811ac0a8f5f7f4abefda786dc661900b9e8d63 SHA512 94716543bc856a197bcdf2d7c6e14330c2ff68f18964e246c4a427d75238ff172a9b9073714a4fcb8853a438379c6d7e6892bac769f727a565315a18ffad2456
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
new file mode 100644
index 000000000000..c140615696b0
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/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>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild
new file mode 100644
index 000000000000..e965f5700ced
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension"
+HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
+SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libev
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	!x11-misc/unclutter
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index e4f49c3cc31a..cd182577921b 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,6 +2,11 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
+AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
+DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
+EBUILD virtualgl-2.5.2-r1.ebuild 2616 BLAKE2B 36f0a927e0663913194c94c42d8e0f88f6cbae7bafe46dd5f7aa304377904c5b289743f62acb52660a36cce054885c552e6625c696b8f09c99bcab0dbc942380 SHA512 1dab9b93693e26a3cf3823237a377a72b177ef0ab9c038570d7bfb5ae2e7352f23d5e0cb0972b751f2457607839498022586adcec2ef98fece098fd5336dacd2
 EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81
+EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
+EBUILD virtualgl-9999.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
new file mode 100644
index 000000000000..d5d923f89d1b
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
@@ -0,0 +1,168 @@
+Patch modified to apply to VirtualGL 2.5.2, before
+1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
+
+
+From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
+From: DRC <information@virtualgl.org>
+Date: Mon, 16 Apr 2018 15:06:07 -0500
+Subject: [PATCH] OpenSSL improvements
+
+- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
+  provides CRYPTO_set_locking_callback(), since locking is now performed
+  internally.)
+- Detect whether the platform has /dev/urandom at compile time, rather
+  than assuming that all Sun and SGI machines don't have it (Solaris 10
+  and later supports /dev/urandom.)
+---
+ ChangeLog.md        |  2 ++
+ include/Socket.h    |  8 ++++++--
+ util/CMakeLists.txt |  5 +++++
+ util/Socket.cpp     | 25 ++++++++++++++++---------
+ 4 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 3632c1d8..5c9bff84 100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call `glBlendFuncSeparate()`.
+ VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
+ unless the FB config has a corresponding visual on the 3D X server.
+ 
++6. VirtualGL can now be built and run with OpenSSL 1.1.
++
+ 
+ 2.5.2
+ =====
+diff --git a/include/Socket.h b/include/Socket.h
+index dfe45e3a..f7409956 100644
+--- a/include/Socket.h
++++ b/include/Socket.h
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -23,7 +23,7 @@
+ #endif
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+-#if defined(sun) || defined(sgi)
++#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
+ #include <openssl/rand.h>
+ #endif
+ #endif
+@@ -161,15 +161,19 @@ namespace vglutil
+ 
+ 			#ifdef USESSL
+ 
++			#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 			static void lockingCallback(int mode, int type, const char *file,
+ 				int line)
+ 			{
+ 				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
+ 				else cryptoLock[type].unlock();
+ 			}
++			#endif
+ 
+ 			static bool sslInit;
++			#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
++			#endif
+ 			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
+ 
+ 			#endif
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 65ef59e7..ed1dfb39 100644
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
+ add_executable(pftest pftest.c)
+ target_link_libraries(pftest vglutil)
+ 
++if(EXISTS /dev/urandom)
++	message(STATUS "Using /dev/urandom for random number generation")
++	add_definitions(-DHAVE_DEVURANDOM)
++endif()
++
+ add_library(vglsocket STATIC Socket.cpp)
+ target_link_libraries(vglsocket vglutil)
+ if(WIN32)
+diff --git a/util/Socket.cpp b/util/Socket.cpp
+index 0d230841..b41c25e9 100644
+--- a/util/Socket.cpp
++++ b/util/Socket.cpp
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
+ 
+ #ifdef USESSL
+ bool Socket::sslInit=false;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
+ #endif
++#endif
+ CriticalSection Socket::mutex;
+ int Socket::instanceCount=0;
+ 
+ 
+ #ifdef USESSL
+ 
+-static void progressCallback(int p, int n, void *arg)
+-{
+-}
+-
+-
+ static EVP_PKEY *newPrivateKey(int bits)
+ {
++	BIGNUM *bn = NULL;
++	RSA *rsa = NULL;
+ 	EVP_PKEY *pk=NULL;
+ 
+ 	try
+ 	{
++		if(!(bn = BN_new())) _throwssl();
++		if(!BN_set_word(bn, RSA_F4)) _throwssl();
++		if(!(rsa = RSA_new())) _throwssl();
++		if(!RSA_generate_key_ex(rsa, bits, bn, NULL)) _throwssl();
+ 		if(!(pk=EVP_PKEY_new())) _throwssl();
+-		if(!EVP_PKEY_assign_RSA(pk, RSA_generate_key(bits, 0x10001,
+-			progressCallback, NULL))) _throwssl();
++		if(!EVP_PKEY_assign_RSA(pk, rsa)) _throwssl();
++		BN_free(bn);
+ 		return pk;
+ 	}
+ 	catch (...)
+ 	{
++		if(bn) BN_free(bn);
++		if(rsa) RSA_free(rsa);
+ 		if(pk) EVP_PKEY_free(pk);
+ 		throw;
+ 	}
+@@ -147,7 +152,7 @@ Socket::Socket(bool doSSL_)
+ 	#ifdef USESSL
+ 	if(!sslInit && doSSL)
+ 	{
+-		#if defined(sun) || defined(sgi)
++		#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
+ 		char buf[128];  int i;
+ 		srandom(getpid());
+ 		for(i = 0; i < 128; i++)
+@@ -158,7 +163,9 @@ Socket::Socket(bool doSSL_)
+ 		SSL_load_error_strings();
+ 		ERR_load_crypto_strings();
+ 		CRYPTO_set_id_callback(Thread::threadID);
++		#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		CRYPTO_set_locking_callback(lockingCallback);
++		#endif
+ 		SSL_library_init();
+ 		sslInit = true;
+ 		char *env = NULL;
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..aa35612ba1ba
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch"
+)
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
new file mode 100644
index 000000000000..05ef6a703773
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
new file mode 100644
index 000000000000..05ef6a703773
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib systemd
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+	inherit git-r3
+else
+	MY_PN="VirtualGL"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXv[${MULTILIB_USEDEP}]
+	virtual/glu[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	amd64? ( abi_x86_32? (
+		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+		>=x11-libs/libX11-1.6.2[abi_x86_32]
+		>=x11-libs/libXext-1.3.2[abi_x86_32]
+		>=x11-libs/libXv-1.0.10[abi_x86_32]
+		>=virtual/glu-9.0-r1[abi_x86_32]
+		>=virtual/opengl-7.0-r1[abi_x86_32]
+	) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# Completely breaks steam/wine for discrete graphics otherwise
+	# see https://github.com/VirtualGL/virtualgl/issues/16
+	append-ldflags "-Wl,--no-as-needed"
+
+	abi_configure() {
+		local mycmakeargs=(
+			-DVGL_USESSL="$(usex ssl)"
+			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+			-DTJPEG_INCLUDE_DIR=/usr/include
+			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+		)
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	# Make config dir
+	dodir /var/lib/VirtualGL
+	fowners root:video /var/lib/VirtualGL
+	fperms 0750 /var/lib/VirtualGL
+	newinitd "${FILESDIR}/vgl.initd-r3" vgl
+	newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vgl-helper.sh"
+	systemd_dounit "${FILESDIR}/vgl.service"
+
+	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+	mv "${D}"/usr/bin/{,v}glxinfo || die
+
+	# Remove license files, bug 536284
+	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index 3f97b7883b36..dc8cfba68a52 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,7 @@
 DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
-DIST xpad-5.2.0.tar.bz2 157906 BLAKE2B 9913809522573d12315744d6d0d156ef941be4c6db6d37f32807ce812a17c6c28a887aa110f277dc970b1ae86a3345511b242acd15d0ed245f49895c4bc89c62 SHA512 f3d0dc2d654613eec6316beca66c2250c4bb4060f144884c5280510f8e6d45799e13488a4d3c827135db697c1214fd8c7e997acfc8741b06ef0fb4cea1434f93
 DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d
+DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
 EBUILD xpad-4.2.ebuild 574 BLAKE2B 16154fba76fb1d4db26feadc5cbaa0b1902e6bee8ee7d0cb23280bf574fdab4014905f89e70fa8c7d92df9485473905f23a82da79332f889be2382b366a2f3af SHA512 3c22e6a96effe2daa82ef879f9cbafd5ea1c37375e4c20b96f8ed333a980c53c9b568012f4afc4d69929ffba1001ce2a54aaaaf89c145266afb039134a1d126c
-EBUILD xpad-5.2.0.ebuild 735 BLAKE2B 2f90ea91117fe65a7033eca864e2ccfceba9f70d5848dbcd3f84b74de6119292a1819f7e6abed452d84ea64e2b77c078338dbeb8f675382a388cb56d7866e5dc SHA512 fee743fc98eeccbab4b00e063653ce04ac8371b4cf52dc99fc88513c90b52a3962ee20882772663249bf319f557f0159c713501c786561750f961171eddcf315
 EBUILD xpad-5.3.0.ebuild 735 BLAKE2B 795a03edb0efd9057d62fe2ce6fb9ea6a6c63fb48a1b856b785f8fed3e147b5ca87d503a15d9432125fa6073d5ff575a767959b49c69e20d6d530a1bbb661e2a SHA512 dc9093f8933db19bf9fba9375a5964cd0967e15b485d9634306b512c1856fbf21b7076a3a3c410eea21e0a7e5814dbda9109f273007481d4e777711f3ab725fa
+EBUILD xpad-5.4.0.ebuild 735 BLAKE2B 5a35bcda572709ffa72e770bc15f22ee4ee9dc82f9056b425f0d79c398a7dff3f3468630ebad7951d503c969e18a887b3ce90b93d745f5ebe5a28ddeced51603 SHA512 ac7aa607bca3cac63643ec4abe8c4c8422e4b59907f616032b8da68b3aaa9d19fc5461490d15791360855d550399c7b02c1c5ea8b017b5392471b482b7e4f7a2
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-5.2.0.ebuild b/x11-misc/xpad/xpad-5.2.0.ebuild
deleted file mode 100644
index 41d1ce652648..000000000000
--- a/x11-misc/xpad/xpad-5.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="a sticky note application for jotting down things to remember"
-HOMEPAGE="https://launchpad.net/xpad"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	app-accessibility/at-spi2-atk
-	dev-libs/atk
-	sys-devel/gettext
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/gtksourceview:3.0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/intltool-0.31
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
new file mode 100644
index 000000000000..d71f4db47e6c
--- /dev/null
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="a sticky note application for jotting down things to remember"
+HOMEPAGE="https://launchpad.net/xpad"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	app-accessibility/at-spi2-atk
+	dev-libs/atk
+	sys-devel/gettext
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/gtksourceview:3.0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/intltool-0.31
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index cec6fefed0c8..32b71d4fd66e 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest
index 3cf3473d722c..796b98358797 100644
--- a/x11-terms/alacritty/Manifest
+++ b/x11-terms/alacritty/Manifest
@@ -1,23 +1,30 @@
 AUX alacritty-0.2.3-avoid-fetching-custom-windows-deps.patch 3321 BLAKE2B 0670b63b8adb3c2c812a4d5174a51134fe4e33410913f6e5159f769af6a13cfd22334e888d8d069b6f638920ce5ac0efd505a7fb89ca99049639739037bd2c02 SHA512 5a84a996fabbed0cf1b69e9fa81d879279eb48b52ca2914e127eb94bdb18d6948335ce3f92efe0972f57c642f967e434cbd04df99314c51c5050911a81a25771
 AUX alacritty-0.2.4-avoid-fetching-custom-windows-deps.patch 3358 BLAKE2B 12c9219ee98ee121ddf20c979e8b34b356ee5db8d1f68ba3bf819da438933bebd02731b77851453eb5a5d7e979e205934e70a114abe6df776efb0da19cea8583 SHA512 cb623fde96bba86c67a666a0c1a97248c64a0dc584e0a8b4685cd2eb1689e183e990efc2aaf4d6a40be0384ffe4fed0eaf13208425ef92f9bba372b8f48cabc3
+DIST MacTypes-sys-1.3.0.crate 8660 BLAKE2B be658a07190807280f0b2001b76da35c5489f742a8479eaad6c701b51b1d8bf2d0a11b04e97b91fe0122f49ca6a33f403a4a2f4561300730bdef98281d7231b2 SHA512 6897248581a01b47e2200f881abd15bb45e4855837b91a4f2c016848c6a9bb7ca22d0fe118cce9dd8397b2360dc93671a8512042ea4467166979c74b28e93453
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
 DIST advapi32-sys-0.2.0.crate 7217 BLAKE2B ef3328a3405f51afe01b4bf0dec00def432a23935fb1d26a4c577b7f4716f1018ae44ba3d738275406512cc7085fb8be9f3795a56e84349acd2af64165ddef84 SHA512 8e6bc75fcb2b91d2b8fe281d165aa8281c8ecca9ba09552f5e4cdbadc03b91db5a98789233c4dc858ee9cf8a3488f28af5a742dac50b44f6397fd14478b77618
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST alacritty-0.2.3.tar.gz 957500 BLAKE2B 510d479e95ac2c4e11ec12d181ed034ab2ca5dd02cfe4feb32e845b06220bd469815b9f2623e8485ec7a1601332031147137b8c46018d7230473d11583ad3673 SHA512 ee663cd2bb405b12cd0395e98fcab04303a4fca23f691bae71aa36756a2c584247c9584948f0d7c480ebf07ab07b52fe916857b19bd6c6402e4969d0b7835997
 DIST alacritty-0.2.4.tar.gz 1014613 BLAKE2B 6fe1f837c27df9da8bdf45471307dad60745930f8d252fe97d10137601a0b0772b17612638a171220cd73afb25d44077f5e20a6645b101edf744a1e55c0d5953 SHA512 1c52036b34f03e90f630bd220ecd98fea98cb3b1cd740577dc30c0b293a8fb6629cfe4ba085af0f13e5a21a43566d9fd665c9b167491b047097af99ef9abc669
+DIST alacritty-0.2.5.tar.gz 1029198 BLAKE2B 3ddebe74ab469cbc6d2bebae5e55fbc380b99e1352f5e91b73b9c1bb6635780f3c333af569f8a3c4c6ba347aaa1099573b567d6b6421c734899d7845821b0d92 SHA512 0d98c87c8d7f04517dff9535968349031956c048f1ba7c5389678510b250457f237844c3dc190c359154988c55589485afb0df803b094b456c5921a1e50476ec
 DIST alacritty.png 25216 BLAKE2B c3b0bc28d7dfc17da4224b0544e2c83b17c63669db5c809ec84532a52d8e5921fdbc058267eabfa29c71f3b577756cee4c8f8077ab4ac7de16d9290f0a4c62bf SHA512 afc37f92453dd5ab2fff353ce59b4e5c2e30f1d37836a5ddf43be82e67237b8646a5e6a88322b8918a2835ec19360d8f8fc388854ef74fcf8a5eea0dae291783
 DIST andrew-0.1.4.crate 8675 BLAKE2B 25d335096c3ad509bff202eb347bf8c193146b90d488c671f0b3796e78520ae0ea1ac93f7e77343c79bc2207804bad8f5f326b1e63fdf011dd60728dfd13f814 SHA512 b96fccfe1cec13c5d45c275b0a7dd6bb619a8c40a9d9b689e1618fae24088c4908b4af542e8df1a8664110599d6cd218a986c032bf2f22ee9aed8264edf92c24
 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST approx-0.1.1.crate 11204 BLAKE2B 53a378a627aa6a8fa882113e6e23de6e35d8571704f135890dfef8644561bcf22c4eb0e4f34b380df9ac75c06263dc8a103dc8b462d1afd30f74e30911867a01 SHA512 6a5e9d2fa1e1bff689bf0dafe1e9a0fda1b3e54c46b4fa9d000d2e178bb2d709f899662e5189e53bfac25dea2fc448ec6a50b4d3d41f5dfddcb2b30c4411323d
 DIST approx-0.3.0.crate 13937 BLAKE2B 4e470eb20dbd11ef4c0a7838ba3d4af64c0104410e769e086c517963fd79b32defea387b2bd451ab19b66c1de3a80119db9a86ad1ec8f73c87742d1b4041edca SHA512 c9ddc84dc349d299bdd57532d2bc42294dbec40460b72b5b5c0d27926f8ffe030fd3bd54d78dd470742c65400e7e9dd48275de222b00e372067360cfa10d18b5
+DIST approx-0.3.1.crate 14133 BLAKE2B a6aa6cdde053469ceff31124d798bab4edeeeba8955d4360c226696399a1765286339132e990f7b9ce44f91cea1e97df6e0e9fa930e261482bd0fff8b1b0ceb1 SHA512 0979b943854c340cac4fb3e28a59256049a6b4db0d6fed6f1cd9a8aa6d2336d1addbdddce37828c1d87bd7031af22b909ab87a0533b2362909946c53ec15ee1f
 DIST argon2rs-0.2.5.crate 353096 BLAKE2B 9f8136f54f96cd95facd78572e31d83d49474b77205277805173aa4afe3ebdccf2592dfcb72a68cfc8e7434b89cdf36058038b2c2d452c8289a5c0f4fbb3ed3b SHA512 09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f
 DIST arraydeque-0.4.3.crate 17884 BLAKE2B 7c104ffc8c3fce4664a21240ef3e921ed07205ad2bf204c0910ead05231ecc64e6ebd2ee832ebef2aea10382433309ea10153f1466e970f1949543ff24b2cf3a SHA512 3fde1697f1b64a9abdaa996b36c45c64e67d9f081807d95c0ca9c262382839f10a527909cc99558878e21a9e3a4463dff2fe2734f62dde67df55d508cc34e342
+DIST arrayvec-0.4.10.crate 26133 BLAKE2B 43772765a9be4e3e6dd5b2ee8864f7894aab3128123a673fd0ddf18dafb69d7ed94709dad6de26e222f080b1de83d31aacbb3419b1d926ec4005de64e4db8b30 SHA512 8aa327fcc18220da496c63c76a521c383c7d506e8c39448f5cc6535c47b8c70ca74f73322b0c368fae7b8a8cec11c9854ac45b4eb7e537fed34e007aa3ad175f
 DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
 DIST arrayvec-0.4.8.crate 24260 BLAKE2B 0445e8cbbe7781fe7890dd98d46bb4451de8441fdb99b74b9f08a6a93016eb8c94978f2bda263c6f2ba6d4ea31176446c0bba43f5cb12ea644289fd4568007fc SHA512 a20753d9b9ff320162f9d02f72d2756ed9e85260238e43c0528889597016525c4bca5ebd57f9a5c63727cdf707a3e3631f83401ea565f64e55208349785c625e
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST autocfg-0.1.1.crate 10044 BLAKE2B c5ecddaf9b6cd930890e174cdee2bdc113efedaaed64b02273a321eb3f83e0b305d9f23a6c2ab3599a7478521c371bb8591b52b8a943ef52ba6d21c97ae5ac0a SHA512 c4be8633fb47cc0cdc342ae04897902cdff7aa64956459a2ef50e1e3589a93ac9fd9cde596a83869e9fcd6bd345ed2dfd7563b682ba3de672e54c03febcb50ae
+DIST backtrace-0.3.13.crate 34101 BLAKE2B 853f1527736d049559688f4ec49a800f0280c11ad24dcb88b7fab5a18c777f39e0307061c107d4b1d60d52183aede3db7b8f7145ad1df50d28dd13929dbb38ce SHA512 434037b8b9bae57bbc788d5db05d02464cab8aac92be1bee9636aec17b02f14110e7d6bcf0c529ce5ffbf632c2fc939fbcd96600bd90656ac489c1ccf1e8e439
 DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
 DIST base64-0.10.0.crate 39086 BLAKE2B 9776c4b1b02a98884ca13573bbbf5d1917e4931c8d930840f2f2afaa1fd4005bc329041742872b7cee655a93da7ddb1fe2f6e992b6e2fd569c4eed034efaab45 SHA512 770d7c1e42374fc716c8c7b3d9ab7d5bb3fd96f0785cecfde53b620b480b41f324c99020a7c537cd6123dcfe192872bd1e55165a0b212f9412c73ef1030ee967
 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
 DIST bindgen-0.33.2.crate 172844 BLAKE2B bfce8b9a384e98fed2d8d679a3b9def5019f2649e363e6317c403d4784631abb47a57093802457204f18771566dfb7ba78099d19d871a7cc6639926644197f5d SHA512 e6a659c4d08c1540e37b75ace6e22b06f2ad651c963f83ee25e6e8ba54f754ea0f1aa2f9c5897e13d49601c734aeb9ff4f2ad07ecd62f140edb31fd8861c5da4
@@ -34,6 +41,7 @@ DIST bzip2-0.3.3.crate 15346 BLAKE2B b3e5178400a2235f500c3f77ad538fa3c271e261cbb
 DIST bzip2-sys-0.1.6.crate 609274 BLAKE2B 8203c31de6279f5f80fc2549978eb2762630e43d85ee534bc942b36fb00daa076ed8314468a84c4ab6320948c80b1b0d455d571873fe60703783dd3eb67531a1 SHA512 d7c69e8eff1b9f1317577ccf0cbaffb6ed284c3f1f6c18db96e2e5380e69a818406107e6bc2634222c2f3ed56c478a1cb9ca58b7b3df29ee4a82e76493533d63
 DIST bzip2-sys-0.1.7.crate 609563 BLAKE2B f6fc7ea2b920445490a97681214ed1c7763fd47cc650671f1a18d8d28f760c9d7a6f53ea21ca0ec4eed0c4dab40cd900a7a5efb9400915e659a2e023681d7cec SHA512 f6d5441340f0cccb0e17dcb7cf9fbe460acd34168369c96c3bdd1e1b823853f57153c8dee2440d970e523253200e9268f5df426c4b4afca17200f4ae6bcf067f
 DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
 DIST cexpr-0.2.3.crate 15747 BLAKE2B 59f416a367b2d129cbc520a04fedf867740e0bddbf9cbf9ace4ba0396e9168f066b517aac365d7c40c40eced6667f4cc5d1fd42b7142c275d1533ee5c16a2bf0 SHA512 93d87866dc192af4c091dc43484af58da6470cdec61f1b638abe3c084772efc084ce3a04ae3499a7c7dd89a19b672f383c68e74444fe67a984bcb1d968ae1e2d
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cgl-0.2.3.crate 7488 BLAKE2B 2abc00866cf728d200afac851d87a235d8ff431af2017d189aa2e7bde1310157d53c2999f053ba5444b75ff5fc710f985438df168a8d4d66717e77b1f7441a30 SHA512 6b1f980ececadd17360a2e6ccfb1fc8d2986e6ca1fd90b6edcf2a55d4335a011bc54f89fa95f3df58d3d8683bef404dfbc04822e66f9082e303a7b09565c0cf7
@@ -60,15 +68,19 @@ DIST core-text-13.1.1.crate 14024 BLAKE2B 93097bc572f9eed899966e7c2f0d2ac6a97d9b
 DIST core-text-9.2.0.crate 13084 BLAKE2B 5114aa3d69665a5016471032ec5ef5a67f31de44f80f96a5c8040671ce715ab6e1681412dfd615caf598a3530e5cc3823f7072dd51632c0d41e24b2a2ee7ecd6 SHA512 12c70e40cbaec40287b55d2cbf3a81f0569030021eea6d662856794326b244421ac8f276b722344381d050f6246b3447d88ee1da3a5ead8e85bfd8182c82cdbf
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.1.2.crate 38312 BLAKE2B 7448304242aba1798491da328eacc326132dd7c8bab21c9909bdd729b9b70eb321d00f992f6c7fc026ed2d0f6a562af1113e45baf61b907b8bdb4412357436e1 SHA512 f0ff5c889a89e0c235ff876d2e0bf50a5c97b85c6f19abbc3d12de26c97e678e784c04cc975be7d008b45fba7ac68c9a129680e37492d77f7a0f433fa895c659
+DIST crossbeam-channel-0.3.6.crate 78943 BLAKE2B a29b7994797077eadfcc9087dcb65facd7cd5b847ffb9c504722ca14356c5dd9cbfc4121f92dd052a6c50354319dc79dbc162d62b77a98bbf3ec44b17daf37ab SHA512 ef5b097f824091b79c0e8e060e73f2d105e4eb99321741edf30c55215c366368dfbb1ea673f71be169d6d47355320e698527d8adb8a93451aa867fd975fdc6d5
 DIST crossbeam-deque-0.2.0.crate 12638 BLAKE2B cbf76e49fee9e1274e295f0958458a6f8f6f0bc449a83011da3dfc64607a649ff6a72102b9ff7784e0ce2b33bb317e4a927eebb749bb9cf31a7ce89e5aca8f7e SHA512 22a1b839ecd4359e3c961e5ff0a044f6f2bc14b5ceec4637c57bb5d26ad04840b0dc0a07f06b494f4b7e224f2a51e3e9a79bf7f895a73179a10705481b33d8a4
 DIST crossbeam-deque-0.6.2.crate 14037 BLAKE2B 28276d69b715b6ebd620256ac81a5dc0dbb148caa465a7efd3bd545bc7bae913f8eca4619aa289565941d5fb5a18b72b2b14b4113df03dd3d61ae7e7d3d68ccd SHA512 f010545e12dfecbb5004d91846a7e41d2142d2194b3671ae2ae383a74e6f2cbb80f3d086109a8fbd3c6c88ac187d7ba45c97cce3ac91e8102daaec59853ff930
+DIST crossbeam-deque-0.6.3.crate 14238 BLAKE2B d6174c2acbc063c389a4a19e5f16f812a56f3d64387eb5f19443924888d4b8ef2524c43352e087fc73c3b2c509ef1f1e6644f278d0e4890638033156d852ffab SHA512 a3248a310c10d09e5a9d394a4e7c571bb75c92c904924fd26b40a55d6fa97c054fa2f1a978ed52263d91b495702c5957dc69aa8793a5c42b4b9e83ac86d4f263
 DIST crossbeam-epoch-0.3.1.crate 33093 BLAKE2B 915d28d3040232768a60956eaa3d574206ae7664a53af3a993acaa9fac0cca50af321923c3be71d2d1799b7a0d4eb617ddace861644a3c8b067ca360aacab34f SHA512 8fc0641701fdb1d22fa60a5408aff96bbc296b975e6f9644859295abe6ee4729d86ada81969a51a09a7a8518f287ba41fdb258dd0143ce8d7db5abff604b955b
 DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
+DIST crossbeam-epoch-0.7.0.crate 34324 BLAKE2B 7dd1644ffe0face5158ec4c888127d6f57cf58b33beab59432ee0774db3cb33184fa2b9e408e6f4fde7bfbc46ec24a951fd247e3909b7593f85002a3503f9b84 SHA512 25eaefa2995ec546a3da2a1bd8554061ef840036fa93e666cd0850b35b217286000fbf605f0f7d5b85ecd0075694afb24b1cb873241c261f3f40b884320fedd9
 DIST crossbeam-utils-0.2.2.crate 11901 BLAKE2B d089d4d810d3c29163a9c3007c5c3a2479901c111905182df0c24b293853e37107693ee0fb50f0984bb7dae76908a66f1be402222667fe1eec31319e5c6e9979 SHA512 fc49d36efcb3a53125c1173415e27de43970c1d2f32547687e02c99001c98cb200047bd2b0072e47466515df5de9ee2104d1b83e7b4ccf03f0e3580a1d416f32
 DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
 DIST crossbeam-utils-0.6.0.crate 13904 BLAKE2B 14c214d0b33adad6594cd0a27de154da56a61ed407f9da2c4e99fe236142c7a6de0821cd8b4f64c8db6711c1e873c930cf96949b29a8aed95ffa06eeea34d73f SHA512 9e29e6b13ab56193a19437cd68913233befb0b61abb862ebff0a24bd9baadcb9302718809ae95fb3a16a102d6f862553dfef83a23af9b97b1589c993ee029101
 DIST crossbeam-utils-0.6.1.crate 13987 BLAKE2B 89a08fe3aee4b709fa87355bf18f8f80ae8f32975c152d319018fe762a233a2bc7037df6fde08d6b9e55ee6d68d56fa65ce66d9d4c0166d62f4a48196ee8aa22 SHA512 49e02da3d2bf9451048363faf59fe06a80b5b9590935971d39fd903c09d72bbcb7e8a70aff36dbc9467246c18a2608e32ec9d5460e085a98f2c359c728db732e
 DIST crossbeam-utils-0.6.2.crate 16855 BLAKE2B fdc6d719ad95ebce0b5d07002e2026a6819358ef74887b1f0bc5bcea1ca9d2bdcd61feec0653fc4be3aaba49f74189722d631b2d88d3e266703946bf960cd7a8 SHA512 7356e0ce6e4c2d59160a7f50e78c96005d13ded9e1dfcd84a514323982a08bc131145d16aa7d8929610ceba86c28e98e1096009dd24c1e53d014fc33577326f9
+DIST crossbeam-utils-0.6.3.crate 22304 BLAKE2B bb2c1cff2806cb7e8eb219d4bd63e4b2444a47f00c08b925bb165622cb1c50147732d939ab0a0e91fa7edbbae6c60cc9f78afbc9f49c3d097e6f5c2db5bf74bd SHA512 3a6df428dc2791a76823be7658905be2c45bb859703bc13e5c1142c4e5c815f2c0bc12da7419370c541afbba8e85c078f0ee0da65c27502972a6187c80b8ee7d
 DIST deflate-0.7.19.crate 125078 BLAKE2B 224f12a39444192f1d8dbd50d396dc2d0d8237c04e6256ed5b83516b8aca643b699484b3ece273c0440aa56bc6ce49310114b4ede0daf04f8afbbf3ae5763da0 SHA512 f2aedb6cd5d09daf4b2449fcd139f27a8a3ee97bdbd54b9f04611f308b96d9627579beafd1421266c3ca15d017c68872b957ba90e6813dd7cb07de5c9ac6a4f9
 DIST dirs-1.0.4.crate 12844 BLAKE2B 41807d6f2f2b69ee66fdfa9bbbe4148caa78afc951b63a4a67bfa0aad46c831fd7a255655e8832f8441ad9840900879cbd90e134e6393b257ee4afbc757b1b1d SHA512 a3416281a22eb4bd6929ff0857c963ffdd53ed9ffdd26d30603fd847ae0de68428b05691aba46232551b86b562d4b9dad18695fe7ee58247f9ad80a776863f44
 DIST dlib-0.4.1.crate 3761 BLAKE2B 1dface446edc99e0f74f785afd036a7d61d0d9ee2837c822fe6834d98c65192251af359c8502b4ad2e9633f5b8de9fba0b097174a86d081403504857d0e7d566 SHA512 b112605605c620e9e5cb5633e93072f9702e24f945a4cf71c6af6499396443773fb5cf901ef78492bf89bf846e0ab4928f12835f73c5e46b63bcde6d6b3d4950
@@ -79,6 +91,7 @@ DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9f
 DIST embed-resource-1.1.4.crate 7239 BLAKE2B 7f901f0292f21ffc6b56c8324c53c5fd1eb9257c76f1a0889e665446f0b510d822167027d800bfbade8471f13befe33cb5267268a0a89f96a5049957a92df26a SHA512 e5a9fa1c9f8eb255003dff8a09d311f19f79aa07b4c86bae7a8c4a6b4d860152cb8c7537166a84efa4335bd29f340ba3054b76a29307eb082bff1090ad2fa8e5
 DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
 DIST encoding_rs-0.8.13.crate 1428086 BLAKE2B 9e6401d8878297457aff61e883da1d2c2bb79cd9b415ea656512edf0cef209b594113aee3a871f1b008c24051178b16be64be8bab96e884efbe42458832c76c7 SHA512 aacd303486158bff5bd36b30b4b4b253e929caac2b78706cf23025c6e8426083dbeeae0806b6a0014cadb58f89899978ab34833e352088e13652ad45c1566f6e
+DIST encoding_rs-0.8.14.crate 1400873 BLAKE2B 392ec8f4ac032ee1f838efe539e5807f188de612cc64b69cd117c7b622e1285e09333ccb01ea866862f60bc7c50bd281ffea99b4990b98e9260938f0a7eb2a77 SHA512 6cda346d8a7ef1b3e5fa480acc9dd44cdeb515ea7c854a605dccacd7d9d39efb113b22ecd116cb841e48fbe1f93005488b9919e66a41e8af0b1e19a00b02524c
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
 DIST env_logger-0.6.0.crate 27887 BLAKE2B 09370d369b4516ad5ff02ab5dc155a329adb7431a966d45c2d2ca91d20ac0235680f5872c452d9e55e59220a625494f54b3709a3f3b97c5e2ed991e24c85f855 SHA512 b75d8a6cf2fc88c926f3df8096211a46c39da418657bab73e65df373e5c2c187397f75ff6b02b9a2f18626f0a661cc5bccb03b39c72bcfdaab6d478b43fad8df
 DIST errno-0.2.4.crate 8486 BLAKE2B 4d23c0a68604bd4fbbc05a557b3d449bdcb56b54d8506e9641f6d2775b41db403f93cf34ea7c446f4a2514ba7b2ee6570cf2029150f44d466d3e12102210bb20 SHA512 039b7bcaed996bb6f48b28aaf44e7008d4b2f6b08213542aaa5fa82e3be87f29e9bc17fdefbf0f159473d292f37464d6888ac8da0a9aec418b1be2de7e2eeab7
@@ -88,7 +101,9 @@ DIST euclid-0.17.3.crate 43070 BLAKE2B 2e3a1f1f4905180f56ed780f8d1b58c43ad809f72
 DIST euclid-0.19.4.crate 47541 BLAKE2B 52ef0de9b64f5a06a212adffc4f53a6aef60caf5c39987351184085f931722f3dd2b7fba68dde856cb8d33bf442a329ec348a99e426b73b37ff7212ceac98f54 SHA512 088fd7040b725ac0551c7789214a5247f8f53647bc23ed8ae3aeee7f528e9af0acb828a1ee1eee4dac25bc1cd1416ee880f4a11418408ac99d43ba28049142b7
 DIST expat-sys-2.1.6.crate 518887 BLAKE2B 12e06f38859124c8da67aaf41477e0c94e9b2421a17c93666f019fd17de3579d52c66403ff95c6fdf27ec1e4db0652bc611e2b426705a177e615b5064d15adc1 SHA512 35d0c405a164e685972ea11df718e50a32a90b730332c3ccad74055544e750423ce2cd76edfd5de2810167cdc8ab6103db82bc4e2710a8e298ac0dd9e81648f8
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
+DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
+DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
 DIST filetime-0.2.3.crate 12038 BLAKE2B 2da3411829dab06e66fe62da31d9adb8ea6596c7319eac576d61e83b83eac30d76f5e19224eb5a4dbf9edb01aad3276f937ff34c5b73fc7d0af1c4803e6123a8 SHA512 d499609fb68737cd78e392bf13f338cf19d8cf7ee3175cf931bb2dcd9393496b5af1b1c6829e689c5bb4eb10b276788e314716533d706e9d6148bbe28f83bc26
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST flate2-1.0.4.crate 65683 BLAKE2B cf6d62caa99076db9a5d56f361ec40564fc71cda07da3fc5572dfadae57f912f63b1873dc77782b2c80652b3cb63bbbf3ca67fe1980b50cac4de2ca40198d25d SHA512 267bcd04a31d6409b318c3b1fa493806ca25b1528f6c64beb25c71cb3ce9d2839bac2753213995ac9c9f62a290d12cca5d5bffe23d4805f7d93de620a0ab6343
@@ -115,14 +130,20 @@ DIST gleam-0.6.6.crate 25231 BLAKE2B db851caff0ad54293dd1c18446c13eb9e30d90f8be5
 DIST gleam-0.6.8.crate 25619 BLAKE2B f12612547dc92d6567afd8f55a89c1c48b3721992f906d76506c741f482553de427d8b0c4abda9c7e4ea762a95eb86a65292141b0274713809fd67f6f39e1c1f SHA512 ce2df2fd58a46a2e36843a064d81f3638de59b9024cf6c0e3ccab238c882f3791d5b66659db068391049eeec0054fb44ed5d5e2d3e8af6bf79ed3d23dd45f858
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST glutin-0.19.0.crate 57366 BLAKE2B 28e536813c93a9f1d097115a5d35175ecb7f35b179965c2ef914603774cd1876faf35e006012dffcc69a8cc2b011771608fc23ec8087988e3756a7f095a638de SHA512 10fa8aadbe86a32a737225bac99faa370e5149b139c7ce2fbdbb8c2ac6e701b00a6550ae63bc4b5a9ae5278ac6786854d1c40bee97ffb361099e55e5724ab4b2
+DIST h2-0.1.14.crate 140365 BLAKE2B 02306283f9be8b881bea55dd1fc1b86e765f4a6e815290b68d93cacaf13a27fc379fa27d9da60c2568f2a0769f7e3fd4871cd6ae09954dda3d40aadc280efc3d SHA512 3aa07eb2da38fc2aefd780193968e4da6be361c25ef0cc0b83dc77ba1eb68f9b9337749135df8ae9db227c1e918193930a562074ea29528edc58d9655398b4d7
+DIST http-0.1.14.crate 97027 BLAKE2B 02f83c006d6a9fd4176ad7d564688b81505d8c75cc1ccb7655ea33dadf72f1d13be81408f57626d96752fd53be5819ea197d846b730d3cd36107f2c9e9fcea58 SHA512 7cfc8fe2e3890a0cc430e5bdc8a88afacb185462381c63670acba59607bf89952f823a16c627010bc17e037881b14be5fe2f2ffddf85aeaf781a31f516bcfcf5
 DIST httparse-1.3.3.crate 23689 BLAKE2B 17aac3985a19a3cbcbf1072e134cfa15644367d15186ed924ff7f76205bca42ffa0fa96a46236d7387d599a0153e31d9727d40bf177736bf1ed116adda120225 SHA512 b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087
 DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST hyper-0.11.27.crate 155617 BLAKE2B 56b7a1b60b1b900dd7468cf623f48cb2af9d939660ceb62fa1167bedd50d8db563ce6cc7e27e65cd51935a46874eecdddb3f621562b9313538af4bcc3ba671e9 SHA512 912713166f601d086a7aa68507143c143ac69c31bca23948e0446eeab2c7eac09fc75c5f2e61aeeed312f2ed54b91b0f212d8e46e30ecccd3be1af60dfcbd59f
+DIST hyper-0.12.19.crate 113017 BLAKE2B dd56aa385bd543214c3b1664e44e9842818c22685170b589cddfdc27d01c35282e807cd5ecdf4f9dad326935feab89a0ec85015a7b62d8690acc7150738f7346 SHA512 b90fc281a72e8dc11c55b2eb60a5e4fe4e39eedec4e55d9ae2636d4763d0bb0a3ccd7b6f52eb72a8a6a21b96b18378502812628c4db238b19d3a15649184aeb2
 DIST hyper-tls-0.1.4.crate 8137 BLAKE2B 92e9f0c3f852e80b69b977d313f4c6d74d9bd437ba1d1e5d1966acb5d768f8cfd73c9d1b9d2a2fceea22b36fb8296f14ddfbbcb00fd39264e8f639c3567275c3 SHA512 3cbcd0048e11d33aede6c27a816d9adb89abad9c29d09c62bf8a6b0235df3698a632786f53aee8ea4d539d553e0eb1862b54e3b547f753fd4808bdabeeb04a0e
+DIST hyper-tls-0.3.1.crate 8836 BLAKE2B c678f9ecb89f51d1beca7ebfcc258162dd6f87d444bf83f6c5b82a28070320bfe9d4b118571b3762ba3803d4fdfdfef70bdd780116154ae95542547ed08abc87 SHA512 3094057eadabd596ce7909c45aa24f6ed5a5dbbce4773fc20293ddf95c712234065253d38422a17e24c3fe674ff94d0bffb95e4034a97dfc46d4402b9add396c
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST image-0.20.1.crate 121979 BLAKE2B 68b182b5bdddffe2ce7de0dc23ce40ffb878adb683e9fa45043b20f9ecdf33f4347c5412d846f0ccb7c28e2a6e9d028375843bd0afbefa4034fd0de8d046fe6f SHA512 23a61f335a16c1637d787ff70633f6eabb8d7d054b6aab7e5d84a42a8865fefb6418f13e602d8e588975a1d20830947d917a801aa2ff8f8ca56991148c00315e
+DIST indexmap-1.0.2.crate 38255 BLAKE2B 78d99087e4f282fe4e4789c131621bfe5d873be801cc105629aa8932a3e4c8a519180560b0bd83463d808eb3b75194b551e39166260a1b9056e822fac07fed94 SHA512 cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8
 DIST inflate-0.4.3.crate 17552 BLAKE2B 42f79500393a7c238fdafec58958004a6a92e05afd7290f6d08ccec2f176134cdd737396f6f848c98946821fc769c65a5700f47ece697fc61fa2ecd23d871599 SHA512 294ae138bcc6b5939944a7b4e63b01b0b5910389deb5ba480e7ef2c1ad948d2f245ead5e53b7058fc350370e385968721b78063f4aa44910e72ef314004bc28d
+DIST inflate-0.4.4.crate 17868 BLAKE2B 7e46bcbc5520831214461823d988e7b79cfbb03179b893af2d632d26a0caea4d3684c24792b95620e6fdbf40da75dd6ba08a3109cbe7ac0dddfbe23a41f6f5b5 SHA512 9080a221e1c9712a0eabad1d964ea8e30c09244996e1025c08a0dbee0a116b2305e7d1115f1d48a4ca3bd7a716682b3b4f6d46ac7b1c7350756a974af0a2826b
 DIST inotify-0.6.1.crate 19667 BLAKE2B e4944e28b1f5bae40934fce383abbb85681326137e6cae89d54ac652f82e20497ae1fe2e038e94a072a87289fb98ecdf3f9b70ddbc505b62d1e16bebe1ee3639 SHA512 f818c3a74f2525ae9e57e5a0f1625ac0b86a567f8e8ac92f93836371ae818a05b3ad92893f3e080d2f0e0f7d22d3f25ecb3de5cc744daebd8977301c9280b64c
 DIST inotify-sys-0.1.3.crate 8327 BLAKE2B 964a7c49f16ac6b31bdb22085569e368063141962ef347c4924aba17ce4d4f99d79e7054f1530bee60bd0c99004816cd2ada19808e65b52ec367438d824e5050 SHA512 82ce82277ef2ef05888aae3a997461515d340c7286daefa4f54f7942fcdcbd1e29fbc60907ecdbcb00139db36462fb3c21ce64b9add2b785826adfaa54216a66
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
@@ -139,6 +160,7 @@ DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
 DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
+DIST libc-0.2.46.crate 350476 BLAKE2B 5bf977fe5611e7b6246375b554bf3327e07ca8453b68a1c7bb1c9db3d2bbdc4b164e29e90e8a534e4ba17bf392b5a9d7e3a71276372c56f3b6117184a9ee0e96 SHA512 88f27e58dfa06dabf0faf350c2676ba1b00f25d9a0999fc444d00b80f6282ae61dcd4154d5d9ccc8a0cf9e2495d1021982a10ac076b68bbeb3896f09fc0f3fc7
 DIST libflate-0.1.18.crate 35142 BLAKE2B 59fbc83847c8cf2a0a5c68d242764a85ba440967b16205a225d9cd8b2e26859fac1989fea5d99520edc70f6177b0f66039d6b33cb59b775196fafbacd97f0fe9 SHA512 921c3650de299bfb52a5f4375cb16ea43bb0ef0722f9e9e4522fc2bd6c2b43f88dcc88033ace7ce29699245daf70c875cfbae3fe95d582b2570487eb894c0f22
 DIST libflate-0.1.19.crate 35247 BLAKE2B 790113e87a0f29234cdacb25f4280a36f0ecfdd4bc5254139b61f09f146932d0b8b8d438580fc7508fdc5cdfc93b524ed2d0b38f5439cf5a33c62aeb1fccad4a SHA512 75b5dca9f4fa5c724ae91236cdd6f9b02543f1717002989eddd1a2e10e9e1f86b70bb6cbdee07090635c4bd3c01dfeee31cbfbe2ec3144596e0b6d4f71108b8c
 DIST libloading-0.5.0.crate 15990 BLAKE2B 80a91ab64309fe0e7eb46e2019ff2b91acdc180e1c30eaa9521602239fc4cd2f0555da2816e7937880cb60d90dbc05022fba0fed2ed6cae53ab980ac8a53db99 SHA512 c01939de6151c0e4cba4c99eca63946ac8398951602a24244c24190de425306fb8b65a26ec02f9d90206c134bb6c393b3f87d3cedb1275b5e40d4710254471db
@@ -154,6 +176,7 @@ DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad9
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
 DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
+DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
@@ -162,6 +185,7 @@ DIST mime_guess-2.0.0-alpha.6.crate 17579 BLAKE2B b480910ab11e5709e428433c2ed7b4
 DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
 DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
 DIST mio-0.6.16.crate 126174 BLAKE2B 34e8634e11959b61abc52842b1c0afe9034cdfbe9923f8a0e65e9d4efdb0c13c46ee5d7272e86595ad8a1d3d9e987dd9b47e1074d7c66cee3f9d889401fdee64 SHA512 ca9290edfdbd4659c686a9f47d7bcd2177001fbfe02ce1fcf6e8aaff4c6e4ba52abb0d698b103337e4587789e7e31945886a90f5e334651d27ac7b109f560c95
+DIST mio-anonymous-pipes-0.1.0.crate 3771 BLAKE2B e422c489cb104223a17cc91f75684feca55aca9ab3d21d509cc9ec51e960081cc199f52bb9d86250fb64b734630d9acfe59041aec5ce1a343f577064ec0f1dd6 SHA512 01f0ce2be343b201671c730b984f612b0eab43462a606bd95939f54422cf27706cdfacb724834b6d7bc216179910f121ed58eff20c6fa77560a6dacc4488f38c
 DIST mio-extras-2.0.5.crate 16151 BLAKE2B cb9fe42394c9662d41c5c1082d5d6d2f2666f0601ece09b54cdbb07cf7e01b7379490571bbab136b522494ca5e35fc2168df2201fd3f105bdff3bec604bb346d SHA512 743fc56546d8bcb09efecda0d60007a175a2db2a75dc882b21fedeb8fc4fcfe98ac0a6d55b0e843b088aac4e24e57145d96b372cdfa39933efee2514ba2ebba9
 DIST mio-more-0.1.0.crate 12315 BLAKE2B 5058f7ba4a6831ef9a0c15c22186af10566f76dd76bbd7877a144f046669fd6927ba85800532c50670b710d0d75d809243d4d305be052dcb90bf77eda721f15e SHA512 17da1df0854efa5f1d20e9478d6fd2607ca8b2f07943136bff909eb6d8da2ad8b999bd516148a4e838022e7d4ac7908905672542daedb54bdd2d16bb070bee03
 DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61
@@ -171,6 +195,7 @@ DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d9
 DIST msdos_time-0.1.6.crate 8445 BLAKE2B a9d2b0f5b353895fdd48ba9a7112b9d030964a97a17a739d0a079a3a4a2b594163bccfce423ab0ba963b0fd3cc4afcf76da6084a301cf9b1e487e2a406b587b6 SHA512 c6e053673a9ebdf442ff064b5353b7af9c660f1a498f487da7893d31cc7a0b6debff4ee9e134299eb94e3fbebfd16d7561940b302b1ce976ea5c7bfd5cc19fd3
 DIST named_pipe-0.3.0.crate 12840 BLAKE2B 3830f6c8422ffb8d7866cda7845f96aa34f7cc7a1e38c1a2606d12b2aa9e7191fb06b5c87dac2f4ead14fbdd7496675d1b4bfc3bf2c4c973e5eb8da1d9f705bb SHA512 78a615885a98cbb23961069ea1afdf412124b8131578d1ebd00c281fdf7f0e3350f23f2ea588612165c63149a8ac9ec54e3b314ece22b948b811a149d8191283
 DIST native-tls-0.1.5.crate 24838 BLAKE2B 4e24ecaa32f7f5c64e7725325296836a56b2ddf7a5ba4fdc8a246df618140e718a6784bb4b54555e6f8a1284563f9656dae403032f4c6e9f8eca570d6259399c SHA512 867b73e360625df1a803c80c9b89cbfa5d0ae09a82b1c041d3326b3d73e04821a22eb2ffa25ff6876dcaf50906012755d7712cc3049c15b70d135852561577de
+DIST native-tls-0.2.2.crate 29238 BLAKE2B f8407b3989be8c24181cb5134838b2b9532c6e00f310915cb8fb7d92721d3c9ba29c8b92d12d71c02b9862f064a0ec8c819981513a981b47132f7498a3d41f9a SHA512 4bff0f1e1833e46d069818ee53a74eed8d792430d222cccc9aadf28ce57246b3b9901f095d97e3567eddff85f59739ec02e1662955d23bba8060febcd7eecdc9
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST nix-0.12.0.crate 172736 BLAKE2B 84ccc524a939054d1b0593fbb7109cfd4d5b39fd92d7ff1d6406e2bccfeeafec184f7d93d788ff88b57cb2bc4a4c7be4f2f7e9250b05427b713452c3e0d2ea1d SHA512 cfa992c9ad921033a44a36ecc3b3f49cba10f22986a60e03b94fa6419b7b901c7f0dcb8776127a053c22bff7ae7586f88887b2755a02f3efb1f0672a7b044e25
@@ -185,11 +210,15 @@ DIST num-rational-0.2.1.crate 19311 BLAKE2B 4d62fb30d375ed1331bf4ed8aeb474df4aef
 DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
+DIST num_cpus-1.9.0.crate 10599 BLAKE2B 2dafafa67a4f187d148019c690c609c01743dbb0a8df77fc2771ae08d288b12a20550d9d582218900e3caf291e0e83e1bacd3b76ae46e6e65b94d5a642235c7e SHA512 8e51f266dfa1b9837f677d41a7edafe3768a9a0fea552ff5e63ca52874d1bf174b7fab018b1a6c130cc33259d0ff81e31d3933a376535f63c28d6da206d05c02
 DIST objc-0.2.5.crate 21308 BLAKE2B 10e19f7cf6abf5702e0caea7a0c97cb3f164d85e4956f1917d3a804cbc57a558ec36229228c3157808b3e5ddd212b99d832483cda2e7f14f08b15817d8cd62c3 SHA512 1094fd159060eabdfe659591274fa870e0b97b9c5474172c202ef5cac4f0bdac6acf1ba5ea549eecf62d2f2a141bb76c4987076fa9916b327063d71a7ccca5cf
 DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
 DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
+DIST openssl-0.10.16.crate 168681 BLAKE2B 6622e4f76531369337e8380447780d5e6eaef7b16b1cf04a58fe0a6dab195f27e4213ed921c999f72df7139b02ab268e9726594cbd10a570d697439a5f683824 SHA512 dff4e72f3da5bdc2b82012ec942f2725adecf2b62c42f9101436ebc8c3a38a2fed92ff421dbf02654371fa70e3345ca950159187cfe2ca5fdcb6a858197443ab
 DIST openssl-0.9.24.crate 149235 BLAKE2B cb5c1d735aacea51e7cfcdda283a3466cace755a50282ea43e648dd09d37bff066bf9b6d8c1688a5415ad1d2bc2f11aa64d891fa5770b3e79c8a3502cb36d505 SHA512 3e969e0986b820ce83afa49ad38402d5d56591181fa3d01100ca5911b040949c5344afa3f78658a553dbf77d61eaf302cc35c901b9d160dd782015e08b6add27
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
+DIST openssl-sys-0.9.40.crate 43360 BLAKE2B facfff126f92ad9be7f72b1beb8d6f30b69481494a71553daa6186fd16b861ddfa2b8a67a99d2dadf52cbf9712220c94e447aec37308b97b16caef31d92536db SHA512 6bd4eceaaa84a759bb6c250dde05241235e426a84382471c56618d6890d869c7fa56ec70c22ecf0435f5d83d7fc8509b68e0f9ff041a5d42ea4472d8769ba166
 DIST ordered-float-0.5.2.crate 6515 BLAKE2B 32895da07059d52ddd4968a1ae7d70ab3530eddc2ad5965c7e73bff24ad4a8792444f32eb42f3a662281f9b2bd91be5ef6fd73c2b27e7de26c0ea89bd0be24f5 SHA512 916d3987752f9c813e031010131abcf7e7796bf7aba429311f46333ed84787e460438cf6c384b086e5d345e35bd013ba460097f293e6b51659aa9d8eb8696289
 DIST ordered-float-1.0.1.crate 9276 BLAKE2B 6cf2c2daa6fc59c67d439b047ce953c121b21c6d0da71544cd4149cf0f8db1fbff96fa5e2715b946b102f6dbbd2c699c87eac27c51b3652e8887fca51dc958d2 SHA512 4b50d1f7b2b2408561756534988bad682437f75d637ca3ed707626bc0d6cbdf01eeed5ab2dd1abf4ccbb812aafc082767cba08c4f18f48b4dae7ee2322aac0ce
 DIST osmesa-sys-0.1.2.crate 1322 BLAKE2B f0768f55e02534829d47cf91e839010a394d379ac0cdb06afb7e7b4993878026be62671f68e91d7d292919ccb336e59b7bd13790985cc1afce90957096bade11 SHA512 3ab87b968f685da1a3e79ac6a56eb167b8ff76f52cbbf57e19b765cc2ca16f5ba79d7264f0da36664d0ade9fc72c5d757e1e3e430fd41224f202399663fc98c0
@@ -197,14 +226,19 @@ DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603b
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
 DIST parking_lot-0.7.0.crate 32324 BLAKE2B 445a86ecd65ee432bda53287722ff5f7e3e49995e119657526092fcca203e5dbb7a20b0ba85ac8c6cf47c43753f43dcf895218148f25ad479b0704aaaac3ec18 SHA512 e761a33d94dc061265f7973aef8b024d93cdada7ab96e1978a9a631b3099f527f33c81f745883e7ab7071893e84724a2c9dcb0c85196de7733f22beeb0c3cbb7
+DIST parking_lot-0.7.1.crate 32670 BLAKE2B 46faa97dd3e3e5625fc40de75eb75f17512ba63ff5ef3ee380fc549bc08b3a119a91622cc67014b9c072ae0f5ab05b10f52c24486fc03633d850ce22812dfe4f SHA512 d83d3c457e15ffce500d4fc82d0b9840ea2ed36d43d4eca841b05b0a9ee73ff6fcce07ccc3a6f0d06d950d7beff85db0c3d13dc1461adfef390d6b3d85367bed
 DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
 DIST parking_lot_core-0.4.0.crate 26817 BLAKE2B f8a733cd6e14a2ad40adf498a3aa23bf3ad06e788f440bb435c544e5ff9750dab963ce4fc673014e54a851ed541975116f18f102f935e21912fc5b65a6aaef19 SHA512 25c0389e9d3d88725398fb304d3a4c20a3da0bf0d67f12c7cdca38f8068dc6ea7b57341579136cf4792cbb92fd64dd33cd91412463f4df8902e1b8c87ca08d08
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST phf-0.7.23.crate 3841 BLAKE2B 9b5b3305687626f79c3846f4d24f3d2e8bda91af4284d61ae397ab1fbac1611725f7dad42aa026f6c7c57e23482ffc2e217df5b6736081d3552eec91257b3285 SHA512 8bc773f2c8993a1b2aa3d555fa56cda736b6574b602a3eac5a48faf3d937ba99a140d9d8d98b998caba432d8346364194849947a84df52bb86eb1bead31da8d4
+DIST phf-0.7.24.crate 4318 BLAKE2B 7bf1794bcc75b265c5d9a213eca653e857f1693ede35df6d53b3ffbc7c1493f0bfa241472e57bd235f18d9390232e53364a9bf5cbb18e67610392f5baed9f9dd SHA512 0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44
 DIST phf_codegen-0.7.23.crate 2866 BLAKE2B 40260597f05867b579d4d96fa686774a1d7e2e0d59d1adafd1b21c9403718f0c42aa1cd77c6266b7c9805c76ba1bdbc47a3f20bf4db3912df89d569a9c2504db SHA512 64142b8403f5b966ac17dca51bcb52a89cde6d365b5475c3e9aba5e6a808efa6bc9d5eac512dcaf9648ff02af0c2c06aba22b5ea8614b7c32a9a50cb630dfe23
+DIST phf_codegen-0.7.24.crate 2946 BLAKE2B 25edbfd08f0d585d594e68bf8ea085a4ab603b50efcda4bcfaf81e044e0718c4122bea3cdf4f039b78bd8ef9eb56c1e5f7545d888ec63d8b816a074d78c845d8 SHA512 2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664
 DIST phf_generator-0.7.23.crate 2219 BLAKE2B 40ed4a207e9eeead6e243911682471a896d75b55cc31f38a508e16389533a4b5ac209557b595331a0cf0f9521f9f8874d2afa44447e406d79a204c3ef4c0a6ac SHA512 0837d40f937f11c2902112f754003fa7465ba710ad86d397b3c33cf949d0b50ce3693030d40a5e1b7bbb21445983cdc63f2f8be615a7d4bdc33ee4d970341671
+DIST phf_generator-0.7.24.crate 2261 BLAKE2B 30d1404517acd99c74584267d007d89fca6b7292ca9f286f5d26329351eef6a85abee4e2ba68b3b3e820232846f93eefe88c8d0a90e96ad2bcb95328b9b7ce02 SHA512 793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7
 DIST phf_shared-0.7.23.crate 2084 BLAKE2B c9299cea4778e0931268a669a558d99a242bc8dc4ba1f558d143e9690509562d917ae4e9cfc86ef7c7a90d73cda00f8668f0c77c0ded473e47d9caaee8f56403 SHA512 ae5036273bf2c724fe7661db59b3b537073b9291d1e20e0e8dc055fb144ea9d19fa769887cc7c6576c52eac47b7cd7075ffe7dbaaa83fccedaf4576223736a25
+DIST phf_shared-0.7.24.crate 2170 BLAKE2B d31ce11599253d92045464efb1b578df8a20a936cea60cbd295f13473406948b44c68ef42c605eeaee401a05c32b6282d5d62d48fdff70af400356e5e064cde8 SHA512 5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST png-0.12.0.crate 28345 BLAKE2B 3c8c026eca5999370ce7d94057527f9549a63b20ca8b8f0ea37fb36cd6cb674464b798c36e9311e4e4a1aed0bd70a69b22ca9735737393a27627fc7a0a892c81 SHA512 b90185845f8c5b70b69b7308bef48322e967e7285f92f5d7ea483f1490a990ac03143e623ae087b07f6c38f50b82904043ba533fe2c95763d1df65d7f8c8f11d
 DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
@@ -216,17 +250,22 @@ DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
+DIST rand-0.6.3.crate 117566 BLAKE2B 45b7c9d3e27a2730f8c0e8cdffc021d6e70fcef45f305eb8ccf57a943ac8d7a37320606c5db0459118486be48d4ad2c4e576252b73237c4abb4c5fdf3a1bc560 SHA512 ac87f6bb1e6801be991ffac2daecab8c64a1b74602a4e23c5efcc2f0538a072f02522bb7272b82e20354c8dac99293f16ddb69995ddaa25f791b2bb402e9f5a3
 DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_os-0.1.0.crate 17915 BLAKE2B 34840d93353ec0c530ec9e64342678dd5f638dcd7085efaf776c898346022312c1810451c97f98afa793185b226c6e69b9f87f9ce15c1744e7dfe3f7cafbcc4d SHA512 a1c653bde687787e23f0833a9644c4ba41b9cf80ce72bce1c98951f623c91f06b05ba085d29fa1ad88a7a8affcb0f94b9ee486109ee297ee4ad5e26a3bd69466
 DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
 DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rayon-1.0.3.crate 134391 BLAKE2B b0f938ad39bf8772374d312893097bb91ee3886e79f6c3050658b0797fad55f309d03d99c3f300837e86aa28f4b5041d9cf7dc455cb418fb4d38b678e8063a10 SHA512 bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7
 DIST rayon-core-1.4.1.crate 53760 BLAKE2B 0c8c9b83e3459f85fbd168b70ca8a4f34378a2e902b5cdf88730dd57e84248c8474c5cfc5dedbc66322b996733bf404226c0d2694fd7139ae9706a822f567d3c SHA512 4d12b8097356d0a9eac8b3ca64085de8d19360dae81b3ccb199275c3487f705e2aded498e819958bb81d4de56c05d4d29c21c07da02236ba6fa0b2888ecfbea8
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_syscall-0.1.43.crate 15212 BLAKE2B cd2e3bbd3cad2568bb61d71931f84b9c09ce694500508ef1fd78c841424bcc40515645062c3fa47cf0d6d99082cff3800a789c0bd0acab87ef5bfebe4e9f25e6 SHA512 c506b1b9067d1c40419a3b4bbd5b2b9bf2e92fba775d51f46bc80d322412a9a8d6d2f4e384071f27ba0e8e58e8ddc2ba4a0ee99567ba2e82e63472924fa46354
+DIST redox_syscall-0.1.50.crate 15609 BLAKE2B 22c1542a025992694c37d426330a217e3936b95be5847b962151fe626975490434d463277056be53a128e815bc01a17e9f7b49718832fbee25648d5db6671743 SHA512 eb98bec77830bf2eeb0943bee2818f85881ace42e49122005195c65366596be3e886f592c3561288f253951b2768ac5b9e02f9f815961500a08176ba777b27a6
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST redox_users-0.2.0.crate 11104 BLAKE2B 6768f135c7af11233adbdfc142c4d30aa3f802b3078a60d930bcd68385b6cea376ccb87652226d5b21c0d0bd61eed5e5a6fd377dbdfe6f75cc134b171ee0cf11 SHA512 00b15de3db031d94b68f39f60c56aed7f687da6c91a1b39463bfd838f6d39816b84bc2e071ad59e4ef7c142283fc4e6cf69613ce49462debd2cc52e96383aac1
 DIST regex-0.2.11.crate 209507 BLAKE2B d8e52b078e96c64663a730208d14af4808abb62d7f2ddc21026410d78305bcf45c8fa5bd6bc28a61a62dffc3dbed6118562bf5294d176f04a9aa8b3eac295a5c SHA512 e0f48ab9a692f7ebd83a21bc70060aed0a7dccc9aaaef6995262fa4e2e33f4404a04a217588b72025820b1a0e4697c076ad47a017e7c51cdd4b6c1909c015ead
@@ -238,6 +277,8 @@ DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90
 DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b93d9eed645ec4eed5dad9aa96b14b439111107901ae45c9bedf341b55afe3a72cd4298704223dd97a030551 SHA512 3bd09864fd1bacd2d5868a25745c586e4287f24497338b74405e617faeb11ea6d132e222d10f9d3b36010708a68e6ce4d80dddadf6b44a9f9bf2ba53044a5ca7
+DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
+DIST rustc-demangle-0.1.13.crate 11726 BLAKE2B cd97c38228174133532b0ddd31c0a57afc4a4061b5b40162a5ad222723862986a276a60a3917518420a125c7440c41b48a60f75497866c141e0c8787ae7a85a6 SHA512 3266d49f90301d814dde06ed9a2d0ed2a45e6f35cee0dcbb21aff213ba011f808d54ddd45c0f489ff3be06df1e6de0a0dec462a59ce2233edd1143d60b99314b
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rusttype-0.4.3.crate 36193 BLAKE2B fe94673b87abef04a12f97fa4a8cf1337ff665ffbe61b0686e2aaf2f98a8f02e2f32afc8dd74a309b6ec0f27b3fa9a44ec6fe96c64075adf4d67ec6b3fdc60f6 SHA512 885da01bfb82f3ed09750f70dc09ba7f04e6fc7a6344241662adc44cfe1e5ccc60620e0fcb9bb6dacbfd6cacbe19c4705f429ab0e4700859cd25ae575097bc97
@@ -251,20 +292,26 @@ DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST security-framework-0.1.16.crate 38648 BLAKE2B 73b1d36e8c977185485d21e5c13eeae034137e1e3d9c1db193a893129229ee10ee4e7103aafba5772467d6d751c59bd9aded0c6f828ebd937c18aff677348f25 SHA512 c7c51d0bc54255f02945d970f918a3e378adce2563b6a5ed81eaff1c50fa6610e17ce18bc3491c74e1481519f5b9007d9052f476602a7b96b319637d92672c42
+DIST security-framework-0.2.1.crate 39220 BLAKE2B 271e0cecf9bfb0fc0aa305d96e9bee753c6dddaba201e40beed76b3db0471e170dad447181068994b0fd8065604133fabcf88588a1a7a1ecb20049f4d97da635 SHA512 877f432af0e531d98028f01cdc3bf3efb4747c78b447face9335ed5039ba16da1b893a5bec77705cd1e5b2151f4d6674f6c6baeddabe46180b67a031031ed82a
 DIST security-framework-sys-0.1.16.crate 7754 BLAKE2B 713b72887d95a85182052b1706706551b6d11279647fb55cfeabde1377b2940fe9ea680a6977873ce96aa7661cd17b3d793ee292cb0a0f4ef94cb1da5636eb24 SHA512 5a5084bd0b63e831a13882723a7e7487460c718c871552dea09d4c6bc0a0535c3becb535260b7623a7e009aff026a49490b7dc0bb4699f2f69d21fd929938709
+DIST security-framework-sys-0.2.2.crate 9352 BLAKE2B 2cbfd47c8ef8451aefb24b33d67fc074e9e56445ae9279787e6edce9976951dd941954bfe533259882c3d6f7f7fc629175f669ae933ad48abba9fe0d93197370 SHA512 73ec243067cac8c5a98735485dced1914102a33139860dac3cf1c76d105c2afa93565baf8ceb1f71fad723aae6243ab3abdaa4d3411df9448f79dc58fbc1afa9
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
 DIST serde-1.0.81.crate 71662 BLAKE2B 4cfc7246886fc7d457bb6664e0f4a8bde7b9a23c8b4425caa104215bb485dc36b9bea1e3ff2d044915c63a121d3fe7d35990a9b22ad9fe35b87d98c0c2126d80 SHA512 a34322e2acf3d9edb60b5424e398d60794d3c42fcaf81101126118191998c58f0cb52856971c70553ab4f42b637f3a30b978cf2f58034f70d309f92c9435f76e
+DIST serde-1.0.84.crate 71614 BLAKE2B 42c45764bd6eab963c778320c41fec9212d683e6faf4f2ac75506c0ca415177d4cb21ea7191daef30c07ddb1e1078a52f9d9dbb29fbe81b50939f81a08136f27 SHA512 0e5800fdc7a0f37eed8dce491a17490f8c6e879b893ef3dadea68d26a64d0fc11574f73e062d77d3b2b863df33c42a99c41c2384c17a97a3e26007d6e0ed72eb
 DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
 DIST serde_derive-1.0.81.crate 47240 BLAKE2B 474708af507da213d4ffb1eb91fb996aed69f8830a6fd0ed957eefc77eb58c5410f78a5c324a75a21fdd8596c9a82f44c6eef5d65ba413863c7394afe40bb9d1 SHA512 e674859956b815581ce3e52ba0cbade90c953db31a175c1ebf2c7fab35e7d54e167ca8a0e69fec4bd10962438a9bbab5174f3acd5b5c39d0a8b78ea7cbce1d92
+DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3
 DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
+DIST serde_json-1.0.34.crate 69774 BLAKE2B d61e6765b3a3edab26bf3408b11e4b553830d2a47c6b5ec749941dc36076c30a9bb5c97edb9c67ced2c5de0435b34f749d5f15a6a157e4823b173c7675203d91 SHA512 cdf5443f91cd9896347b9cf5784ec8f64691dbc6cf3810654ae67b349930db257a4b1eb60b9d0fa844f54986d81f93514a3f22de7bd2f8ee34dc147c525fb16b
 DIST serde_urlencoded-0.5.3.crate 12456 BLAKE2B 739dff596755a321503953cc6c99efa69d41b61cba4d7ea5662b96c8ac4cc292342819b00cce5bc203dadaf066136f47087899b12e8b702ec28f39c9afa6c510 SHA512 94a723687e3debebe8e221f1396a63574a36e4e2ded434ae4dde9c7c832f5f865114378d250463f5ab7e85884d11e4b99d91bf470c796c0fe24cc88614b618d9
 DIST serde_urlencoded-0.5.4.crate 12552 BLAKE2B b4f7b852afdbc961a99100838745948b1e61032b171d78f9c80f39a78ef0d40ac00ebc147b63e378b7b7ec1e4b28ce2ce6db6467e6ac2c1093fae0363832a425 SHA512 b32c2cf86c9c023b18ce5627992692e53a0848a1d44508c510e553731e6a4fb1ad30aef8f2cafac6ab0cf3faa45eb5f1df42cf8cbce36b673d2aa6754d3ef45b
 DIST serde_yaml-0.8.7.crate 35710 BLAKE2B 993f136ecd33cd3d307c88a62b28ae56c3df043a184d826e5c3ee61a7f0fd837153de68855c4621ccf297bedbe5327a7c8df10e5e167e4d904be3fc05641241e SHA512 c9bf698cb20cd101dee4a12e9ace348d9087cb0ff2e35fdc80777b0f821542f5272070942a7e8534319cb6256e74aa0457cc6644161d57bd85469690a3fba866
 DIST serde_yaml-0.8.8.crate 35882 BLAKE2B b82982f74e728445133a84c9d44affd8cece85f1303f9bb4bc481b8b78fb507be88e88797a99663dbfc72da2eb9acfea9d2f83eefa9b51482a2b05080f4bf454 SHA512 e937357a512af4899ee7f79228a7290e57a048a9cfef3e7da736ade8fc8b9df7d549e89ecf1b6e5320581a650d65550971a65921759349b7cd6e8e341bee4b33
 DIST servo-fontconfig-0.4.0.crate 9303 BLAKE2B 8ce98c5cbf197041fbcdaa1764e49a48a96f4ea572d82e7969a639644cb5ac23896d1f2c6b34a30ace93eed68c7f30fa9e15f7474c46a9a9e682bd91c5f27aa6 SHA512 22491b9a3d4791c2a0ef26647ee2d4fd97344e3f4b2085f910428ed06c68bb4b0eb419a98bfd789a2db0fd4141038c38d32bb1d2a2eb681b25844f7b991e1cbd
 DIST servo-fontconfig-sys-4.0.7.crate 1786797 BLAKE2B 149694bbb1012cb03271432e07b5572842eb2d0403bf807d674bc0fccb9e46c982dc328c5d796bebe1b1eb4a8c57dba13c290f3fe36db0f2171a8ac12b367ed4 SHA512 0a2da56dd87959d03ba0f3ddb58d9640efef3713d08da2830ab0bb968f2ecefd5beb91ed97b44e7325e29680b418e68908c2614387f3bf00688fd90631a5923e
+DIST servo-freetype-sys-4.0.3.crate 1919769 BLAKE2B e7c30c46480ae8a1863a31d68f55e0809ba8756d15c8acc06c06f7d4062f9aacb394506ef306bde29ba5b5164d9b3748abab89bf2b55b862bb765c33118b065f SHA512 281859cffcc56fa211a8e5918081fccdfa24f047c511e6a38715568d666ba80ab57ab898740199bd4fb1bfd6b394a05b98d09d7a4e4612f2b3e51f98cade8610
 DIST servo-freetype-sys-4.0.4.crate 1920276 BLAKE2B 41224fa64f2dd97386cf754a3a0a75a5c1c2db7000bc7727d5dc243ab22a591055ec930b3ed3abc88c5de0b5e7ec01766401ea91eda29b4bc68e8195077a2548 SHA512 28b665c73032bbe1f7d4ff8208a38022c3dcc9ab6305de42d21607b9f6e96efa3e4f2cff8a78703d1fffe1c387220c77ce0203382eb4c3fc22764d9682a5f865
 DIST shared_library-0.1.9.crate 10566 BLAKE2B be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e SHA512 8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST siphasher-0.2.3.crate 8717 BLAKE2B dc5f80933bf9a172dc3747d702ecc47827c18543a1955811c22ab15a3bd21ed8ff1bb6a99f96115231daa2184526fe6a12cd9f73d91655315077aa6b9c3fadd5 SHA512 7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0
@@ -274,14 +321,19 @@ DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358
 DIST smallvec-0.6.7.crate 21450 BLAKE2B 35201ac343c2029d9ced9de0361d1ae9046913abc3701c5f6a000008eb7aabfdcb6a05b63368989f4f182b7f0ab89956d7d211a0760432887f2be975be9ce0e9 SHA512 2f3e45b27d8a1e02ff856e9690d982a8c785eef797f0e33beb8a832b6de5038d5ca3d285f49d67bbcf9fb2cb4de278dc33f2e77c615ecd333da014f56c8aec1e
 DIST smithay-client-toolkit-0.4.1.crate 93737 BLAKE2B 8f8f7516680ad739abc0ebcb44497da590846ae097853f06521e1938ac24fa58dd359085b6600d03f24f9d7507bda78134112065478c458026c71f963a710b65 SHA512 225b94f6b7e96169bbf9296d371378f87b90e167f7cea1e972aba80c457a95b29e1fae5d64ca8e6897987527866f760dc86be874a086e618e61bea77bd9beab3
 DIST smithay-client-toolkit-0.4.3.crate 95564 BLAKE2B 4d60ec251b11295ef11b3a30ffcc7600bc40049a4787967a8a91bc4b84941b17798283790a8eff952e2182997b3c9673f930f445bc399adebe3e0847e8a483f2 SHA512 048e60c3774e64811c6917a740d2707c2cfadb17c09df5123f8fb6a8f9c86a9f1a42f2ff4722d106d6f24133cea896d531c4ce36c3858eb9f2468215d548d337
+DIST smithay-client-toolkit-0.4.4.crate 96861 BLAKE2B a298be701487ade60b799447c981ca0572c83b41ffa6220f70db83e69804431bf1d30b0fa2061ed455e8cc73be0fb14e33d69f6fe19ae9e1d05c1645965e40f9 SHA512 0e62c8913bcd1ac91c42a0f4d2e0ba944cb72b5544c4996314c794414dc406631f4e6b2ba03b9c05a0034bf729d6c6a9c563cc156f6c18b3ae515065f1cb6de0
 DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
+DIST spsc-buffer-0.1.1.crate 3176 BLAKE2B d0f3aa4876df5baa1097dcc17f2d717ba57778f44c085bb29afe59d3c23ea6b7c965ca2dedfba1e8e123e36af379e282edfa783c1ffa16f7f792e3e60d0742a5 SHA512 c77619a2dac332f5ec359c559c408e25836b4130f6d078488ffa48cf2ea173acf74ec6bf3488d17e3e51ef756b33c3c27050587aef2e1b0525c2900906cc15b4
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST static_assertions-0.2.5.crate 10487 BLAKE2B a40a143a8165f8bfb401c6729b61197df0071f0c1b61a161295dbefba6b15eee871408f1bef2368e9e7579d2a948dc4203c67dfc69234990b7521d5cde2881ab SHA512 199a1d9833658da9d06ab77c17ab4a77de5d95ce0ad92d7bd0cba84c9e8f2dd8a2580543c8c1351e62f52d8d46959a73aabcb89031f4ebfc9ee3d25e52290e3d
 DIST static_assertions-0.3.1.crate 12599 BLAKE2B 30aaa2c99e03dab8b1e80b87214d1a86c6bcefe45d471db32dd207b5a6a5bc5ff0d105b427ab6acd3ea4a6590b4da59a96739522e7d32cfebb842d7055e0bc07 SHA512 28dcc442182742151a1a9a7f567fd3fd296005263bf64c7b9a1dfb796a8a4fd7879e4648b92f7661182e479e9628863dc99d6fcadb5a272fe8270badcbb2fc66
 DIST stb_truetype-0.2.4.crate 20902 BLAKE2B 5e4b1423406640c702b2ea73463f5e065bde3fbbb027179e39e461ca0dc59e1fb533d8d2f48dd0f283c8c4638e89bafa8738ab8236c8a2642fadf7c63b097e2d SHA512 d017344f0426e876c951a75c46241c99c3619c89256a067b8ebd717a6d529b87fca2902bb6f95d16d36d0d93aac09de940d7f3f2febfe01dfa1b6a1a6ea0725c
+DIST stb_truetype-0.2.5.crate 20955 BLAKE2B a07fe4eff65225d84b074e30e75f62f1d369bfb301c4027daa947fb739b9ebe3eaf038560874aa061a2214a137e7958ba2c280ac265de9796761c3b489137891 SHA512 ad77e06ecebd97252533c23a1acd08c44c4c1e94f28e3ddcf1b263dad4b8178ec4858b21ad2fb68253b3099f48496db65e7d4edd0b0721cc4c6ba31c90a8fb69
+DIST string-0.1.2.crate 3989 BLAKE2B 56fe4a944186fdca6d0c1153f179f20ae1be7c052f3e984e48df5b5c064c1f3d2610eedc04cf2e35f3a8fba18bd43ba8d5581eb234c6eac12df40168ae424824 SHA512 1c147d5f0be85e9b0821411864e3f4b71678d9b910506f98376108136cf4b6a3f65cc7d2a34d132becee33216b7cd4215f83023221a7863df3e8ef9cc3219881
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.15.20.crate 146359 BLAKE2B 42a6a67ab87d3027fff828b0d54f4cb6712fefbbd1c9f2949a372daa11025bbfb483a81aa540b6a7244e38d0d55651dfd84dfb754be07816fe5c78135e03dac1 SHA512 82978ed1f42983f8e116070ef35488bbdb65b8a191f4e41db4af6cb9fb8459ab1d65b256126effce745173bd2a83f226c4453ede26239811d35de8beb08766fa
 DIST syn-0.15.22.crate 146349 BLAKE2B 161ac0586b2ecf50b635cbf881820b1a28cbf3d52bdd5872eca7517eea6fcd4af321c8dab7f05dfc8d449a2744708143d082ffeeced934a25886a812e0ceff2c SHA512 78721f2925edbd0b3b0e3377833e7621ba66251fb92631f0295bbeaf15110a6ade2ffb89f1dfad847ac1cbb608f8d281459450b95940205a0058ed41e8ceaf0a
+DIST syn-0.15.24.crate 145479 BLAKE2B 36f15c67e4acdc33f3f4f3b6eefad9c632e0ec0f0a1613cd45c9b31fad5a3a2e7bd5262f42679bed031c934399a2d1f8dd4d087becab656aa03326e763950a87 SHA512 7806ce1f8a475ad196357325bf64895536687b538bcc1051a33398dfeef19819ee46e1618deeaa6ffd9fdfb91246d37924bb57b2fb869f5f05175f1752b18e68
 DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
@@ -292,19 +344,27 @@ DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c3
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST tiff-0.2.1.crate 622181 BLAKE2B 1e94e7ca0b754f3302a622c27fbb6dc9418e3cd2cc315f1d316d95e7477021fe107b7535afa56cea49156be9b40974a35ad97ab63faaece25da27294e1e965d8 SHA512 80a17d1bf43112395d34e7d087bd2d8f920f4b68be9348fd246b27f83568c316b3de63df20842bbf5067d5cd8e5b12716727c1977ef20db03048ff8579da5337
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST time-0.1.41.crate 29991 BLAKE2B fc4be86b43a0cceaa4388539fb9d87f24c8886d50b295e583d48588741f200c40df40e176484d07dbaa515751f50ec8333e5a36456d457d40791ef8fc97f4c21 SHA512 9dcfc89dd33122b5dc77d9bec3038bc492f9162eb1fa15e68f1f9682ade3429c526bfc5d9ec4d102beed007a8ab77f5b07a2f04444c8b2630ec54e569c982942
 DIST tokio-0.1.11.crate 76732 BLAKE2B 4a0e95986d2bbf35bc55ae59bbaced1ce61670b1de7594a615e9614f3eed6a8a9d9c6a763a7bbc0dbd38d1693f0f9feb028739606e7fbf51de149568fa49decb SHA512 c27624c514e5a830d3284714ec0732c8cf5b2b9879648ac21ca3ab528954c5cc8041eb945bfc1cdebb624d4502f886044844d7847c18f7308eb3bc06089f9a10
 DIST tokio-0.1.13.crate 79248 BLAKE2B fb2b76385c2ec8e05ff2e321f9c09fbdb4ea8589b80a5688ea155fee1c9b06342dff40e5aa9446b69cb7c6ae7804621ec4938055472c644752003a56bc3730d9 SHA512 9014af3d1cdd9f63790318f5a71d4a1b991c7721f453adfb067eede32e4d8f410f38e28109ac3f42de93013a46885808026102b134ec89e53580e64c46ca73c4
+DIST tokio-0.1.14.crate 80648 BLAKE2B c920913f4d2c71b505c7eaf1b7706354057d48cbc712a3a01a8c3bf4a34462e2da4e305f80a00b54217e012d35bc7018e1d8d50c3cbc0bedb9001ab2c0dec973 SHA512 0d77ee12bdf08c972fbb21e1c1c8b52106c459464750476b688ef8298eaac1815d99d049c1f4ba38a383aa219661c6fa4d6782d12068d8593e82944c5d2d88d7
 DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044
 DIST tokio-core-0.1.17.crate 73933 BLAKE2B 055028a3c6fa910bb94f3a40c445b65103f87661655489c3e40e24cad0040c2e2c11e28cd6e14ba61269eb7bd091e93b68e718c9343ae09325aa320e998fbf48 SHA512 ecf3a38f88bcce8003cd334292217efb406e31e9cdeea115fd2b2c79c126cfac615aa6c975d5b08be30ac449e5bffa552e2b002b1b9a5e2f4e3969cdfe19d520
 DIST tokio-current-thread-0.1.3.crate 19187 BLAKE2B fb4f600136178a45b90e3cdc03844b1ca0c1b464a1bef4db8d4869fca83d0385b494c277dd89b0ca498422b4c5df4da5db864ab386428ba565f669928fee05ae SHA512 375e078086a9bcaba81b35a2da767b52301fa6b7909113a0a5425383f7c83868240caace4d1eed163e858990413da0ac8ec8248373047971c480d76fa79c994b
 DIST tokio-current-thread-0.1.4.crate 19400 BLAKE2B 1eadd257b7e6da5cba623f6b9365cab7f44864c344564d90b073f6ee32ad7a8f7176d2e8072323781ce1953a3a5f53a97c2305caa0565fd99dfd44ecefe16a98 SHA512 2d6c0af55470795b3ad237a2fd3e59b3d75831b04841219f57033556372f2d31af71500374022359fc661f7d606967c6b922a06c1e71e5bcea0759eea7c0ace3
 DIST tokio-executor-0.1.5.crate 10540 BLAKE2B 34a515a160907a64e177880e5d319e191a79c92a30dd12616d23b7e0b33a342651ae1943c4ac8c00658b64f1d4c2076f8ccc48adaf62ebf324bd2232069546a2 SHA512 488b75570e1f07c521972bd33b6313926c0e763385872f50858a58af1e738f2ea1a276e8899263a25a4788f641ba94f9280ad55c32978a97af9337bb0c8af987
+DIST tokio-executor-0.1.6.crate 10059 BLAKE2B 9a3960247ffc013a7dd3d38badbda08d611370db803cb494bd6dcbc22ba9106cfe686892d813c0fb7c83aa0ad440a3f955a8a2bc77f6efd8298fb595a06c0e1b SHA512 d8ce70b05956f25769ed2b8ef876ae520bfb51613fdd3ac07c8ee8eb422a891ccbf3a92df53fcd60ec31b3527041912c1fc49549e6e2dc235b1468d21d30706b
 DIST tokio-fs-0.1.4.crate 12706 BLAKE2B dc09d985a2f242c00283cddd93842a1d9566953af60fcd389f1c574655b572c06b9ae93c8c483782076c630ff5ba4a3d86b31476a09fde46ec4089578771e860 SHA512 aa9393f9f9cf32ccba258821b22d6f3a7297ff2b4a84db934abfc66cd421239de581ad3d756815e47095435d045dcfcf6897124e0414f1fca7452f28644844d8
+DIST tokio-fs-0.1.5.crate 14467 BLAKE2B 9afa08a0f3dede45f87b8fb9ce938c16d93265d95006370e5b2405424fd9fb2772f61d951f506378605fe1eb70598dcb5964b919a38146037d3c4de94d020d2b SHA512 2f36c910a72e8e82c3a9edac3f1806765b6f3850d3b3ab493d868a2f363486c49ddb8a88c68794edba96174122a3ea27ded0b0fc94735fe5bed652968a1df836
 DIST tokio-io-0.1.10.crate 33143 BLAKE2B ed90d1aa36a90469fcdb95f59e0b9a5817945207002bde1cdd43adde936c854ce04dc60d62acb94955c4fcdb2669e7975e23ad5c3ab60880fb7511c8f381ddd5 SHA512 6e5327e5d555fa5b84bbe361219e2a1cf3c47ae8ca2f26bf38b258176e00af6e4c3602bbe0dc2636241730e0735482189edc5ac5300bf411c9963546f103792d
+DIST tokio-io-0.1.11.crate 33322 BLAKE2B 2119618da74cd15efacf855b8b31d30bc9eace69e1a500955b0640a36cb98f4dee7d467dba124dab66ce1ad32b5f36ea44322b950362616a8d420fbd973b0148 SHA512 e11f9e55521d601a74ed05e8d87f7a936eb2c4a54cb5f2e671bdfbacb4a3c5f4cd3d58b978c9fe37b863df78a5c9cbd7fa6e673d8c2da97a1d57e2de6da07b86
 DIST tokio-reactor-0.1.6.crate 23376 BLAKE2B e62fa5f70f9bed3218b404c362e239960407ca856b3a7c09e7abdbce0cd13ecc10700c9207ca6fc79a90c49537cff6780a6e023b0a7a0718865f72e77400bf32 SHA512 36e2edd29e46ade8ea5efa4e3eb7698767ddc397f65d1a22cdcc8cc789e3f42d951c13139aa2fc96699773745a7156dc67de1cbee82799180a1a9a1bd00bf192
 DIST tokio-reactor-0.1.7.crate 23740 BLAKE2B 8a8f499ae181809c0988d2baf6f843474ef884fe56c4e25f6786f524307845bc18c808f58f4299850402020dc3ccd1ed3e8d997169410a8e465323c85f8ab3ea SHA512 4859751a0eb2d423ad1216c0a63248b6dccfcd987e3d9c58cf4277d47c5123e9ae2e9a0e8a4f3178d83b46fd4d89c14a0e09a4ef3b7b10a3ff3a662be794077a
+DIST tokio-reactor-0.1.8.crate 23805 BLAKE2B 4421c65da9813d4a60df151459b328aab57dafcbcb9879e493b6fb8cfac32ea0a48894b74bd61fb9ddc3f0506c0166a1aa8d05d065b214fde4351bc997e66b1e SHA512 7605d9133486061c7c0f3a339d1cc2e662de9593002fe623fb63bf779047341189be82ee3c5d1eece7666c172f95bd54846456f1950ec6af9d3b863c32190bad
 DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
 DIST tokio-tcp-0.1.2.crate 10633 BLAKE2B 0298c8831f44500640f5362cb7a426e7215878e63376c05ff24a726fcd745e1f02678c0047b6525b55b3b508693388b1e266a414cb732d5ff12e49365af5993b SHA512 d250eeff3a1e8133cf20201dd3c54ba2a6f057407f051cda3da195437d0cb8eb0592e9467343145d85f916276bc76910434a5190af476cc845ff6e7e0e66e8b1
+DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
+DIST tokio-threadpool-0.1.10.crate 47733 BLAKE2B 8b519bd37ed618f332bee77b3e9d7e33e812cda2d2f48b3e0bbfc7f66d7040ab8865be64c46bc1c30617980dc9991bba8bdefcb71ee5c76e633e5c99e567f9a7 SHA512 9b0c2a65e84c02b793d0afb223409a30cbd5ef32b18cbe5f66f028650f78a99de833f819a766ce63dfa4a03ab187cb367a475ce8c4f5d8cb077d4b6988c3a5ae
 DIST tokio-threadpool-0.1.8.crate 48430 BLAKE2B 1b39367a42aba14d2da874de915cc35b0726e90ee037d3c8f891d6e35b383768bc0d37142c8baf72e7c4ac8a02d5db6aea65d5e7f8bbbb02c49677aef5e0a009 SHA512 8e74c2f99e974873e0455934534dab6d98d466213f9d3af885907cfc6f28abd6496405f2bcd41b831b06d35fabed3e63cdc308d4042abcef81a39f6bae6ee496
 DIST tokio-threadpool-0.1.9.crate 48778 BLAKE2B 3bb9d6ae52fc7c12307e80e3af203cf2732180d8c013a8440be144c3ea70f10557d6ba10817e67906e889cedc7550e660f3746e441e388fa18bc7d53c2cbe141 SHA512 b2f4f2951bb581d6e1110f6c39fee1341dfec6605717e93bdd9fa1958c4ebb2b849af0e068521478b07f9fadb7384807d6f8922a4be4637c18d4d4e47793c13d
 DIST tokio-timer-0.2.7.crate 35395 BLAKE2B 98af16a7407dcbb9ddb7cf95715a74fbba038ab6fdf29e5c55ca1494d11dbcdc053cd439ea55e8fc2c1481997ab4e82dbc5cc117adb3689afb1ce7adaeac0860 SHA512 1c49e75d3d1719fea454d4cb2ffcbca15348be18659a4bd2ee48b78f88fefbea5e70c09bf53c60d3d30098ab5e7fd9dc1fb56b39af25b008c1959edeb2bfeea9
@@ -314,7 +374,9 @@ DIST tokio-udp-0.1.2.crate 9765 BLAKE2B 3fb57d6d9759a95610cb7fd8580e0d4660672bbc
 DIST tokio-udp-0.1.3.crate 10227 BLAKE2B 8080306c695b694ba9f25252474a9370279f7ee28dddee14575f73d36cb5731743bf0101736624eafd97f55e6f83f6be9806b8ad748411eaa382a2f90d7e874e SHA512 a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2
 DIST tokio-uds-0.2.3.crate 9389 BLAKE2B cde06d0a088d81bfc64fc64e2810de77e6e20856037fe2bfa62b00f92c1835c1a2dcfbb68568abdd430ad185fce40b997cca90a43f4a3baea61f8d09790228a5 SHA512 2c516b91a88f6ea33cabee62db4f8587b581d1b3fdac0f43d73c6ecf2177bcc782441e98581cdbefaa2f7617a561acdbf1c0ea534151634c37945bc086f72269
 DIST tokio-uds-0.2.4.crate 11837 BLAKE2B 2419656eaa25c41320f51660a6d67134824cb3a1001c6164c440483ed7a002ca5ab59df8388b117b9a5a3addca3b47f5e450d5733dbf2b9eb2e741aa3aef62c0 SHA512 d59bcecd7a92c847cddfc5e5624828a7063dc1bac5515771a16e0d6987ad6a8777e779b45ed6395abb7588bad807695704c2d600e93f6617e09dcac1ae83d472
+DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61
 DIST try-lock-0.1.0.crate 3195 BLAKE2B 70a97d35322f488382ba0bca516a672d464f963ea9c91ed0696aabbf3a14fcd759fa3b06dac4005026213cff1091326e57f25e9df919cef48794c1fa5c679690 SHA512 bb00cfa02cae996fab0d94623c71d261a73d6f8b189b75ca9c1636739c53b700e8bd915311eae54851b5f184f0999209bb45ab748828666b2cd2a9b4d3803d1f
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
 DIST ucd-util-0.1.2.crate 24992 BLAKE2B 91d59ce88f2ddadcb3f4192ebedddd18bb5b6d9b5f7765a87be04c9e09b7b30c25ad349d41f5b1da9719c0382b8134cab3a7134f496925090ed536f06318b521 SHA512 01b68115b4abfd157e24e187bc633e0d64880a025f88d8b7a33518b79fd29563ef3322c6bdb1527553acfc5dd53d9f18ab127ed498a0cd6e311f08ca19a6cbc0
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
@@ -329,6 +391,7 @@ DIST user32-sys-0.2.0.crate 10624 BLAKE2B 76e57ff5dcaf533f7087073d85b3ac9a5825ca
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
 DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea486bcfa619c361ab925c630ca8dd9b28d8400da40eb967d64879aac6ef0fa59bfe3d4097e79daeb07915 SHA512 e69530284377ded546f9face98af6fe312664a152fa6a8aefaa4030b978e098ba55ff8ab8fcd2d54abf344e9d45a8f2188c4d7d4092baa213c11f74491f79d80
+DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
@@ -336,18 +399,25 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST want-0.0.4.crate 5357 BLAKE2B 499a5394eddfa50f4fce288f6155c1a6fe664d3d52a2a23f623087655f33854ab475f67d9f748c17e437218b7c029a0ece4d3c32d4bbe061348a50fe537b4600 SHA512 4d6fa1a8c194081efeb6188646ee764da3a3de4374529a6b0af70cd5ff001491b6a87d4281f6ca40d6640308f0435f6b4b838b52e20afe3944ae58c885b6134f
+DIST want-0.0.6.crate 5434 BLAKE2B 46cc6ffc8c5edc4c0b7e48475a82e339e1ce746941823fedb3bdcd1942bfaa9d59800f465470002fa7cebf4d88614d1236cd92736c10690e04810e85aad2c1d2 SHA512 65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86
+DIST wayland-client-0.21.10.crate 58635 BLAKE2B d337b8df09c0be4834767d88cfe46bc992bdc88273d7c22190e25df482fdb2260ec7fab15c6772973dddd647a1df2a9f4cf71456190bd12b004ac25a620a4572 SHA512 ff13c1d322702fa0f8ad02d50f5ebcf4378e20c60dff3d6d848e00ffb28bd5b4c6be964f723a145026d7245b9ac31c256e59659512590c96d42f8e532029e82d
 DIST wayland-client-0.21.4.crate 58609 BLAKE2B 9fcc025e7a949229b9d8af982bafd894efb3192427b7923624c2f4b970725bfb549968188cf735ef952c32ab1c7d7c6e13afc5d0c5465d34b3eb87bd63aed3c3 SHA512 f2afa436c8160bf4887345088eacb4185396e5e329773563eb0efb48d9fd7475395f28e1020b0b0d2c3a5345532ca15f134846aff91cda2ceed9323e0c9e91e5
 DIST wayland-client-0.21.7.crate 58617 BLAKE2B 40c5768c4a953175c94d29ade5ca0870fb40becebb214f43d9edf3fe488f082edb7dfebdeba859baa46ef3d46a8aa2c071fddd6ee1d662c4f472580c2d897a58 SHA512 71af70d87cbbaec89000a24c52308d5df776430dcd310705eb3a706c29da576fc868096595a69f851eea6b377543886470152f84bd2f3ac7ea57013ac5fab919
+DIST wayland-commons-0.21.10.crate 15100 BLAKE2B 6096461a3b42c8a2084fe9c8b9ff1f5d3e9f727ae6a43a5824c726fff3b0af68987e58862680ee4d6c0eff43019867e6916e5cfd0e5a86a70c79893179e67302 SHA512 8a76ac66150933d37370e26e6b4d5a289254752f7378ddce2a370e778c022fe3921a41eed552bac4bd6994b3fabef386d2e83053cd34cc493a9a1f3ab68ac41b
 DIST wayland-commons-0.21.4.crate 15095 BLAKE2B 234f39c8ecb0c66ec95b7bbf904e297df8de9690923855d62b44937b31c5a4c590aa75691ef0958d7e7b53ecbe92ec01136e5d8a5b71c68f1cdce29519028944 SHA512 7684663fd3f093e4e7ee227bc9f7e6d17e75ab1620d6b1d559861f13a4b05de5b9b78a20b27a9a3f8db0acdce278316f1acdab1336007c1030363f1b4c9b62b0
 DIST wayland-commons-0.21.7.crate 15101 BLAKE2B ac63d976f158a47fcad59f95b3b89d574ed68c5c4e9086dca08b6f6467ae88cd87aac90c35bbe6bc0a1124090980390c8853970c6c26065cbf875b7fb1614f70 SHA512 34cd24b22103b9d0d6be05f72d61fa007f84b15d0a68d3edf7645eeb86baea58d4d876f4a154ba9c3529d21f889bfb1aa24dcbe8c70593161eb0cfc68db58f2a
+DIST wayland-protocols-0.21.10.crate 107322 BLAKE2B 7f0531019ed0f2e50e4fd91338ee7944a21d39a792bf6708de8ce433e317c89e4e366cbac66d2f00f38ec5d25e5a7a15eb27960eea4e1a2ae84bb223f8dd845e SHA512 d3e84a016b4f4586a47bfb1a3fbf4eb7347b0c333e329b3d48adbebb0ac960e68b002604bd75ed708595642cdae9d922e146030d2621b120448c5a44a67c8398
 DIST wayland-protocols-0.21.4.crate 95560 BLAKE2B fa04d2cf8ac3bfe79a5268498227273fe92792664f6ac5e5c5991b8e680a1fb7415299bc04cf52adf68154f865daeca29f19dc246e61eea11bd194d061497a8c SHA512 4e5a1ac5ab74026108961edb7a2fcd7e48caf13160ca4dcff0bdcbd78a36b14895e8a6b796cb00789e6ffd43ffd13f98df6f24ff9f62870f026c5109e7b39274
 DIST wayland-protocols-0.21.7.crate 95581 BLAKE2B 5fe54e1f44472511fce6a50fa95e088866acec2d0e989fa5dca80909f583f66d05ec346d55492185ab5edc334a00644c7f4a972ee80610948c3e8aa4d33ce875 SHA512 354d8a742d6d2d17c8e36c517855b9ceeb172960c009e6c37a987133338c972484205a481dae667fc67b48fefe9d12ca9283da37fb73e2159859702f152d3642
+DIST wayland-scanner-0.21.10.crate 14407 BLAKE2B 39fd86e03fbd49fe5d2bafe173d12b8c5de1af37f40c966e567b82b27e0f44577969a118537827ef48c050fbd8083fe8d88b24de19ea9f4fe9fe1e01c2260012 SHA512 360c3f79e1cc448f7d8204990464a7dd053714f6922809452ff389bb37b949d615cdb5fb85ff4056c4db05b10995930e8a173ba311ac11bb780aaefa84673b8d
 DIST wayland-scanner-0.21.4.crate 14325 BLAKE2B 12e90f1dd56c5f51f4bd4628623cf7084cfe79ffcf3446895f87986ec5039729f70f697c0e42b690b458d3eb64d380dfbdbb4a69aa4ea645e116bfd8e21a7385 SHA512 5286d855f0f2579f927cb736268d648fc6e910d3cee5e5f702c8037cceded6c1153e8509f39b40f9a593aaa2957e9c48c93c01687a817d1316b33f0e387b606d
 DIST wayland-scanner-0.21.7.crate 14327 BLAKE2B f6294ce09ee82596166e71403583128d04f2310e46fdd563ac44051adbf887135b583102e5eada111abf3cda304a343f1069fa3129109db41c280004ce2f03dc SHA512 b65dec206d6aead0290c743f7aab7edfe29327976151e20281a0178d53bc2a6d2bed79aea3838bdbe64bae450976d1791a94b1428508e3aaa8e71cca51243e19
+DIST wayland-sys-0.21.10.crate 6454 BLAKE2B 38fd216337031d8320d89f799c3956002712e828a1d176c0280304c016b14e63606bdc9aeeb5cbbf832b2ff4686f28a45d20d6e4c76b62227a2fe1564f44241d SHA512 10431115856d309b05319d5e74c822b4ecc938b375d52459b7abb51f7764f8ddd24e314bd708502d48c4caa5d4f11d991d17af7091169ae7b9ef4b9651c51f95
 DIST wayland-sys-0.21.4.crate 6458 BLAKE2B ec48d313cf380360f77e832d31078ec16332633473c3808ebbd3f77889d698585775d5b7b9fbe3b035b1e07a17bf3a7f4a47c241bb6e1fcaf602688f75e6e131 SHA512 c42a773977d18fde6b46278cd32167244aea58198d1b2e3d8cc5fdfc8664771aa96a8396d6a13d1ef24baacccc44aece11bab4381a028a79cb935682b74c2e4c
 DIST wayland-sys-0.21.7.crate 6467 BLAKE2B e10a9a64df888991cd3c58181826db9c0adeb6432720a9cb31d5b47f95c5efa85f3676225074dffd58d30120a1ab2abf426224cd82375af38111acd091adccdd SHA512 5091213e3b281a81499ec16bb61542bfccbb1354af023325e208057245e4706f2a7e561f67ff83f9bf75bd6d86029de97c83ade1e51d480de684c8459f92cd2f
 DIST which-1.0.5.crate 5366 BLAKE2B fea2fd7040addae5f4511c48ca7c3140414fda04853e30a797e3a3c67df6dd6dde75d2c6537716d7d12b2aad2a0e113add7a13f994654da6b296b46b14fbe3cb SHA512 5f6f794abdac8479d0f2fe130cc72fa57dcb3f9c1310befcefa4110551bc5084dbbde503c48023a65dce9d73ceed8a705163508bcf1cb0fb975fb8c5202988ac
 DIST widestring-0.2.2.crate 17327 BLAKE2B b4891d30008e0ceda2d221c8da31a032dfab7c620f5f13d3a163c7723dc1eb623dd97287d1d8e3657e2aa3127e350877d40aa954c25d02dc6ca7eef272adcd98 SHA512 c61707dda6a9d1c3478966a94e5092672961064f3c841cc84c74b96b382e8b708bf20f2f63fb71a6ed1ce56340755b094e1a73f75c0d1087ea7abafb9cff0422
+DIST widestring-0.4.0.crate 24241 BLAKE2B ccdc1a0457929c9c90c48ee7fb8bad2421331aeceb47c049fc78b5f7d15ce90b59f4daff5835a608a1114ba5dd30b700ed2fc1cc8e4269580550235e79e65553 SHA512 88d82fdddb268e35497cab9a17f9cd3845b25084bc9932a3ec1fa256a4ff59307ff46e112fc26144eba6c57b4a094eb9d9687a51cda1839e03f7f06744a19b32
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
@@ -356,6 +426,7 @@ DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d5
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 DIST winit-0.18.0.crate 185237 BLAKE2B 779367c49c5ed1f8ec2472e8431941c36eaafb12c0f8db99efa6d7d913b5f67d4e7f42ab2680bfa458993ceb56769849e702968d7208a9ee4afaed916a29de19 SHA512 7aa4a0783a3d419f3ede015bba586f8079a03d0fa75e74e82d0285dd5817fca626076e8fc778dfc92419a7fae5574d7950255af8f60de1534627405ddce5357a
+DIST winpty-sys-0.4.3.crate 123868 BLAKE2B b8ddb936c0de89a038fbf6277df10eaf81b12d659fc251fc4809760c96592184f761d09c58ec0fe6d275d7f08f6afdd33b791b4ae23fc5f5f55bfd2ec7fa5066 SHA512 89cbe53d57c6ca8344a7e37230dfa4c3562324011221676505fb6d86ab62025a8313f2176a86d4e21dba8e72a4b77def6dc1d39295e382dd1c8add15cc613e53
 DIST winreg-0.4.0.crate 14351 BLAKE2B 7a30a53e0b798352a1eb6dee21a4ed8046f932b5c3a6f772ec75a7d3c694035a71173322df98af174bb3b1afea30ab6f67cd1f735e8d2e17fc180ba7db29b85c SHA512 badc3fd2bf5fe13069eb1c656272c33a1abcd69bf95b7a4daaa92a43882c1ce85ebeddf354a58667e7edd5c1292884ecc66612ad5df71e608e6a825f62a7fb18
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x11-clipboard-0.2.2.crate 5820 BLAKE2B 14b721f0dba962333c58e9173900a6891590cfb988afffb2df26adda5ab8dc781df89681f4b80998615fa64354e5a3005f3911db2279d761a345a45d748f3c99 SHA512 4dae52c8afe929a5c89923cc3da72b82583628d6b9a88bf0d794f9720298d29b80a5bf4b81d2490f09f5ca4559b4c6465c5be510d99f5c646ec89cf2cbfe86de
@@ -369,4 +440,5 @@ DIST yaml-rust-0.4.2.crate 45338 BLAKE2B 2e4f0b488ecbe227dbe83588ebac80686df5b9c
 DIST zip-0.4.2.crate 25852 BLAKE2B ea5e0e32ec66bc0b5bc0f3cfec4c81aa1c8c9dbf714ba024b9d609c2fe9b2cb0b11f9f788e74eb03a1764cf819c51cff6a637ab0580b52031841c00785b9d010 SHA512 84bf51fb83db91d0f6151e7ed4fe59cfcac5dacaa4da58ab09e226a48b14287275f121cf6302b29c693dbcb16e720fbccce7d6d986364ad5d403715235ed98e4
 EBUILD alacritty-0.2.3.ebuild 6762 BLAKE2B ef0acbce5df1ccc1151b7c5473a047b629b5523a08ae08c60670750978b9bd15c201025fb7555c4a7f8038e88b2d2303132ccc6879fd862a349ad5058891ee65 SHA512 84a3131ca715cd4f974c8d3f2150034a05aeb6101ed337b820879cb649606db6900d2115dbfb7095e239a6fa3de59878e795fb7517aab3a56d76cf69be48c616
 EBUILD alacritty-0.2.4.ebuild 6900 BLAKE2B da0ef5f915b376200fb895adac7f87fe0ecaaca84b350ae13a681e992989ecb5b8a28cf0a06a4b51acbf25dfcafee9424ff2997ec4ae9d4cedcabcdcc2c37edb SHA512 4e1ee7895c24f6ea4f0db6c0d194aa0967159efc55d2208046948315fc3f8bd5845aa6b0f1f5dac920af56666744a96928870de1c16ca4b83d8b22976ed1bff0
+EBUILD alacritty-0.2.5.ebuild 6714 BLAKE2B c9868de2863d598930e3f10f923a7da170c0b6db35c1daccb176d2fe8521bedc98f180e8386469e928f8cf2f43cce3d6b71672fd3ae7a3a2e1a86cee85077368 SHA512 d4d197e55d549583099fa69a53c0cc131d0ea4aa992ef47abd9d5ce599d96486c301d68bd635aa2d84b63993ddfa4fa0a573bf9a85a82333d4d5e403801d6cbb
 MISC metadata.xml 539 BLAKE2B c0a28bc8f4b41ab9ddce4600ad92883ec00a8a9eeff8372dc49f1a69e96d87baaee67b361b8b52a259ca5294b4cb609872561829abc5a96deb720e9636a92015 SHA512 aa33a410483c86613a032850c40f33f73d2a5c580cc47abff1e6c98d28b29a9ed5bdde94d38e1946fdb02ad8f035bc31186a4655b37baccf3b41cc2b6201247c
diff --git a/x11-terms/alacritty/alacritty-0.2.5.ebuild b/x11-terms/alacritty/alacritty-0.2.5.ebuild
new file mode 100644
index 000000000000..06928fa307d8
--- /dev/null
+++ b/x11-terms/alacritty/alacritty-0.2.5.ebuild
@@ -0,0 +1,380 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+advapi32-sys-0.2.0
+aho-corasick-0.6.9
+andrew-0.1.4
+android_glue-0.2.3
+ansi_term-0.11.0
+approx-0.1.1
+approx-0.3.1
+argon2rs-0.2.5
+arraydeque-0.4.3
+arrayvec-0.4.10
+atty-0.2.11
+autocfg-0.1.1
+backtrace-0.3.13
+backtrace-sys-0.1.28
+base64-0.10.0
+base64-0.9.3
+bindgen-0.33.2
+bitflags-0.7.0
+bitflags-1.0.4
+blake2-rfc-0.2.18
+block-0.1.6
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+bzip2-0.3.3
+bzip2-sys-0.1.7
+cc-1.0.28
+cexpr-0.2.3
+cfg-if-0.1.6
+cgl-0.2.3
+cgmath-0.16.1
+clang-sys-0.22.0
+clap-2.32.0
+clipboard-0.4.6
+clipboard-win-2.1.2
+cloudabi-0.0.3
+cmake-0.1.35
+cocoa-0.18.4
+color_quant-1.0.1
+constant_time_eq-0.1.3
+core-foundation-0.5.1
+core-foundation-0.6.3
+core-foundation-sys-0.5.1
+core-foundation-sys-0.6.2
+core-graphics-0.13.0
+core-graphics-0.17.3
+core-text-13.1.1
+core-text-9.2.0
+crc-1.8.1
+crc32fast-1.1.2
+crossbeam-channel-0.3.6
+crossbeam-deque-0.2.0
+crossbeam-deque-0.6.3
+crossbeam-epoch-0.3.1
+crossbeam-epoch-0.7.0
+crossbeam-utils-0.2.2
+crossbeam-utils-0.6.3
+deflate-0.7.19
+dirs-1.0.4
+dlib-0.4.1
+downcast-rs-1.0.3
+dtoa-0.4.3
+dunce-0.1.1
+either-1.5.0
+embed-resource-1.1.4
+encoding_rs-0.8.14
+env_logger-0.5.13
+env_logger-0.6.0
+errno-0.2.4
+errno-dragonfly-0.1.1
+error-chain-0.11.0
+euclid-0.19.4
+expat-sys-2.1.6
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.4
+flate2-1.0.6
+fnv-1.0.6
+font-loader-0.6.0
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+freetype-rs-0.19.0
+freetype-sys-0.7.0
+fsevent-0.2.17
+fsevent-sys-0.1.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+gdi32-sys-0.2.0
+gif-0.10.1
+gleam-0.6.8
+gl_generator-0.10.0
+glob-0.2.11
+glutin-0.19.0
+h2-0.1.14
+http-0.1.14
+httparse-1.3.3
+humantime-1.2.0
+hyper-0.12.19
+hyper-tls-0.3.1
+idna-0.1.5
+image-0.20.1
+indexmap-1.0.2
+inflate-0.4.4
+inotify-0.6.1
+inotify-sys-0.1.3
+iovec-0.1.2
+itoa-0.4.3
+jpeg-decoder-0.1.15
+kernel32-sys-0.2.2
+khronos_api-3.0.0
+lazycell-1.2.1
+lazy_static-1.2.0
+libc-0.2.46
+libflate-0.1.19
+libloading-0.5.0
+libz-sys-1.0.25
+line_drawing-0.7.0
+linked-hash-map-0.5.1
+lock_api-0.1.5
+log-0.4.6
+lzw-0.10.0
+MacTypes-sys-1.3.0
+malloc_buf-0.0.6
+matches-0.1.8
+memchr-1.0.2
+memchr-2.1.2
+memmap-0.7.0
+memoffset-0.2.1
+mime-0.3.12
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-anonymous-pipes-0.1.0
+mio-extras-2.0.5
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+named_pipe-0.3.0
+native-tls-0.2.2
+net2-0.2.33
+nix-0.12.0
+nodrop-0.1.13
+nom-3.2.1
+nom-4.1.1
+notify-4.0.6
+num_cpus-1.9.0
+num-derive-0.2.3
+num-integer-0.1.39
+num-iter-0.1.37
+num-rational-0.2.1
+num-traits-0.1.43
+num-traits-0.2.6
+objc-0.2.5
+objc-foundation-0.1.1
+objc_id-0.1.1
+openssl-0.10.16
+openssl-probe-0.1.2
+openssl-sys-0.9.40
+ordered-float-0.5.2
+ordered-float-1.0.1
+osmesa-sys-0.1.2
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot-0.7.1
+parking_lot_core-0.3.1
+parking_lot_core-0.4.0
+peeking_take_while-0.1.2
+percent-encoding-1.0.1
+phf-0.7.24
+phf_codegen-0.7.24
+phf_generator-0.7.24
+phf_shared-0.7.24
+pkg-config-0.3.14
+png-0.12.0
+podio-0.1.6
+proc-macro2-0.4.24
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.4.3
+rand-0.5.5
+rand-0.6.3
+rand_chacha-0.1.1
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_os-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.1
+rayon-1.0.3
+rayon-core-1.4.1
+redox_syscall-0.1.50
+redox_termios-0.1.1
+redox_users-0.2.0
+regex-0.2.11
+regex-1.1.0
+regex-syntax-0.5.6
+regex-syntax-0.6.4
+remove_dir_all-0.5.1
+reqwest-0.9.5
+rustc-demangle-0.1.13
+rustc_version-0.2.3
+rusttype-0.4.3
+rusttype-0.7.3
+ryu-0.2.7
+safemem-0.3.0
+same-file-1.0.4
+schannel-0.1.14
+scoped_threadpool-0.1.9
+scopeguard-0.3.3
+security-framework-0.2.1
+security-framework-sys-0.2.2
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.84
+serde_derive-1.0.84
+serde_json-1.0.34
+serde_urlencoded-0.5.4
+serde_yaml-0.8.8
+servo-fontconfig-0.4.0
+servo-fontconfig-sys-4.0.7
+servo-freetype-sys-4.0.3
+shared_library-0.1.9
+siphasher-0.2.3
+slab-0.4.1
+smallvec-0.6.7
+smithay-client-toolkit-0.4.4
+socket2-0.3.8
+spsc-buffer-0.1.1
+stable_deref_trait-1.1.1
+static_assertions-0.3.1
+stb_truetype-0.2.5
+string-0.1.2
+strsim-0.7.0
+syn-0.15.24
+synstructure-0.10.1
+tempfile-3.0.5
+termcolor-1.0.4
+terminfo-0.6.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+tiff-0.2.1
+time-0.1.41
+tokio-0.1.14
+tokio-codec-0.1.1
+tokio-current-thread-0.1.4
+tokio-executor-0.1.6
+tokio-fs-0.1.5
+tokio-io-0.1.11
+tokio-reactor-0.1.8
+tokio-tcp-0.1.3
+tokio-threadpool-0.1.10
+tokio-timer-0.2.8
+tokio-udp-0.1.3
+tokio-uds-0.2.5
+try-lock-0.2.2
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.2
+user32-sys-0.2.0
+utf8parse-0.1.1
+utf8-ranges-1.0.2
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+vte-0.3.3
+walkdir-2.2.7
+want-0.0.6
+wayland-client-0.21.10
+wayland-commons-0.21.10
+wayland-protocols-0.21.10
+wayland-scanner-0.21.10
+wayland-sys-0.21.10
+which-1.0.5
+widestring-0.2.2
+widestring-0.4.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+winit-0.18.0
+winpty-sys-0.4.3
+winreg-0.4.0
+ws2_32-sys-0.2.1
+x11-clipboard-0.2.2
+x11-dl-2.18.3
+xcb-0.8.2
+xdg-2.2.0
+xml-rs-0.8.0
+yaml-rust-0.4.2
+zip-0.4.2
+"
+
+inherit bash-completion-r1 cargo desktop eutils
+
+DESCRIPTION="GPU-accelerated terminal emulator"
+HOMEPAGE="https://github.com/jwilm/alacritty"
+SRC_URI="https://github.com/jwilm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~gyakovlev/distfiles/alacritty.png
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	media-libs/fontconfig:=
+	media-libs/freetype:2
+"
+
+RDEPEND="${DEPEND}
+	sys-libs/zlib
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-misc/xclip
+	virtual/opengl
+"
+
+BDEPEND="dev-util/cmake
+	sys-libs/ncurses
+	>=virtual/rust-1.31.1
+"
+
+DOCS=( CHANGELOG.md docs/ansicode.txt INSTALL.md README.md alacritty.yml )
+
+src_install() {
+	cargo_src_install --path ./
+
+	newbashcomp alacritty-completions.bash alacritty
+
+	insinto /usr/share/fish/vendor_completions.d/
+	newins alacritty-completions.fish alacritty.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins alacritty-completions.zsh _alacritty
+
+	tic -e alacritty,alacritty-direct -o "${T}" alacritty.info || die "generating terminfo failed"
+	insinto /usr/share/terminfo/a/
+	doins  "${T}"/a/alacritty*
+
+	sed -i '/^Icon=/s/utilities-terminal/alacritty/' alacritty.desktop || die
+	domenu alacritty.desktop
+	doicon "${DISTDIR}"/alacritty.png
+
+	newman alacritty.man alacritty.1
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "wayland support" dev-libs/wayland
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 3b597efda9f5..da149b216558 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,10 +1,9 @@
 AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
 AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
-DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
-DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db
+AUX kitty-0.13.2-flags.patch 1622 BLAKE2B 003a236d3817d744012883d9fb4be5029d5b83351c56e6b257ac5acd9bdd791fc7dcc5ad428be5aa227ba3f36aae40b90e04bdd6efbafc7f424b0163aa8f3abb SHA512 d24adbce0c5deee7418998d43d384fa5fb3ecc24fcf9728337c99b01bedb529fec8fd327c5dd2e71fec4957ad802e738a02cdc061f8b0dd78cbcbeffdd9c126c
 DIST kitty-0.13.1.tar.xz 2836564 BLAKE2B 16fa53f81d291610dd5567ef5f06c083246f9e636fc1d1ef7f340c1017c81b2e92f2a14b9f8d53ad924715ae25fd40190e071b403b2319d7c707f95aaf58e8d1 SHA512 0dbc23c300549b507b526abf2f89bf06d4dbdcd96be240d605cc9da2097b407f9b886de67c19462bb517c2b1931cf78810f0efd982cb848cb4fdab86374701db
-EBUILD kitty-0.12.1.ebuild 1897 BLAKE2B ce76a872f9c72f4079f3c5ba4e208defebc65b9a712f41ba43f071a4a2c885cf5adc8f2e9c6b29f526d439f9132ccd23be0d346d46d2dd9cff06561e5fa13692 SHA512 696cd41a9357d17a83d34bace843966e356e917c1162cb2a5f8b61fc0ac08ea4f4de55a2abd4d83932c02d1144636b21214ecb5875b301cee97985622c338fba
-EBUILD kitty-0.12.3.ebuild 2064 BLAKE2B ba783ecd219f7ed469b72709c6bde7a12cddd914b423483218c10d24ece856d6a0edc81c6428421398340b631ee7b60cf41a757c2b1378ecb41f551a3cbb22a8 SHA512 42c1f5ef221514ba863759514cd04a56ce469669b2e1cf6b217c810528a54681f2e664feaffaaabbf7d2a048c5460970529d48966e5c4ed2f01e7b4e89747139
+DIST kitty-0.13.2.tar.xz 2849800 BLAKE2B 94f717fd989fda5148cd8a138db7657bacd33f34e2feb6dc37cfaf12081caa0c7170dcd8e8c6641145123a95acd8d745826fcc95dab382e8072a8bfa6578693a SHA512 f66624d200223810e01b7d880ac42fc314e6be3040aa357bfd7ddf94096c58e4dd7924aebc5c1cdd8fe6082556245b586b96a264010baaaf6fd2a2ae264e4faf
 EBUILD kitty-0.13.1-r1.ebuild 2061 BLAKE2B 188ff7c1931af62a449fa89510537ae90e2971b3f2bf222d6db312172e42f2106d3f8a3e4a9180ec5f02bbc455080ad905c415d8587562c93b5d82e58a4c2758 SHA512 31f3c0486df8041ad77592c97f9f2d700b616452f53e6205e2c6cbfdfe88b77d3b3b02ec6a3368190e0ff19c616b973043fcf73ec536dbcef9e490bd85f5eb5a
-EBUILD kitty-9999.ebuild 2061 BLAKE2B 2ada714ff970a264cee21b8e1cb4de042e02924d25bfd4d57071548e507b11c2d12eca6c577af0aaa6ac40a33f5d71aa402203d4179a3c0b272024ffa52b22d8 SHA512 52bad3fa918e945f5d2b478218173401ee131cdd977859ee7b41cd7f00dbda26636272b61b50c925f2d39bebfa5fa76b4233b7ee0b6f2e54613787d09346844a
+EBUILD kitty-0.13.2.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70
+EBUILD kitty-9999.ebuild 2061 BLAKE2B a60fb0f1798d2abe1dd4cae7eba8cec13ab092312a24120a3938c850265d8b3566e095aa5158bb6ccb841d658728ed980a43b6533f5491982aa03a745d7bdfa9 SHA512 931a21ba970fd1782538b9c83c7ab4e80a9ca262d48fcfe3cf3c412b071a60429a2104441809409da8144dcd080852355de912a296f8fd9e783fa5ce18a12d70
 MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061
diff --git a/x11-terms/kitty/files/kitty-0.13.2-flags.patch b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
new file mode 100644
index 000000000000..b79edaf884fa
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.13.2-flags.patch
@@ -0,0 +1,47 @@
+--- kitty-0.13.2/setup.py
++++ kitty-0.13.2/setup.py
+@@ -178,7 +178,7 @@
+     df = '-g3'
+     if ccver >= (5, 0):
+         df += ' -Og'
+-    optimize = df if debug or sanitize else '-O3'
++    optimize = ''
+     sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
+     cppflags = os.environ.get(
+         'OVERRIDE_CPPFLAGS', (
+@@ -191,7 +191,7 @@
+     cflags = os.environ.get(
+         'OVERRIDE_CFLAGS', (
+             '-Wextra -Wno-missing-field-initializers -Wall -std=c11'
+-            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
++            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
+         ).format(
+             optimize,
+             ' '.join(sanitize_args),
+@@ -205,7 +205,7 @@
+     )
+     ldflags = os.environ.get(
+         'OVERRIDE_LDFLAGS',
+-        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
++        '-Wall ' + ' '.join(sanitize_args)
+     )
+     ldflags = shlex.split(ldflags)
+     ldflags.append('-shared')
+@@ -517,14 +517,14 @@
+ 
+ 
+ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
+-    cflags = '-Wall -Werror -fpie'.split()
++    cflags = '-Wall -fpie'.split()
+     cppflags = []
+     libs = []
+     if args.profile:
+         cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
+         libs.append('-lprofiler')
+-    else:
+-        cflags.append('-O3')
++    #else:
++    #    cflags.append('-O3')
+     if for_bundle or for_freeze:
+         cppflags.append('-DFOR_BUNDLE')
+         cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
diff --git a/x11-terms/kitty/kitty-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild
deleted file mode 100644
index a97e7a7a8c5a..000000000000
--- a/x11-terms/kitty/kitty-0.12.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.12.3.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild
deleted file mode 100644
index b265ed95339e..000000000000
--- a/x11-terms/kitty/kitty-0.12.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 toolchain-funcs gnome2-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug doc imagemagick wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPS="
-	${PYTHON_DEPS}
-	>=media-libs/harfbuzz-1.5.0:=
-	sys-apps/dbus
-	sys-libs/zlib
-	media-libs/libpng:0=
-	media-libs/freetype:2
-	media-libs/fontconfig
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libxkbcommon[X]
-	x11-libs/libxcb[xkb]
-	wayland? (
-		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
-	)
-"
-RDEPEND="
-	${COMMON_DEPS}
-	imagemagick? ( virtual/imagemagick-tools )
-"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	virtual/pkgconfig
-"
-[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-flags.patch
-	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
-	fi
-
-	# respect doc dir
-	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
-
-	tc-export CC
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	doecho "${EPYTHON}" setup.py \
-		--verbose $(usex debug --debug "") \
-		--libdir-name $(get_libdir) \
-		linux-package
-}
-
-src_test() {
-	export KITTY_CONFIG_DIRECTORY=${T}
-	"${EPYTHON}" test.py || die
-}
-
-src_install() {
-	mkdir -p "${ED}"usr || die
-	cp -r linux-package/* "${ED}usr" || die
-	python_fix_shebang "${ED}"
-
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/kitty/kitty-0.13.2.ebuild b/x11-terms/kitty/kitty-0.13.2.ebuild
new file mode 100644
index 000000000000..74d2102fb6d1
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.13.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 toolchain-funcs gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
+HOMEPAGE="https://github.com/kovidgoyal/kitty"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug doc imagemagick wayland"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPS="
+	${PYTHON_DEPS}
+	>=media-libs/harfbuzz-1.5.0:=
+	sys-apps/dbus
+	sys-libs/zlib
+	media-libs/libpng:0=
+	media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libxkbcommon[X]
+	x11-libs/libxcb[xkb]
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.17
+	)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	imagemagick? ( virtual/imagemagick-tools )
+"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	virtual/pkgconfig
+"
+[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.2-flags.patch
+	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
+)
+
+src_prepare() {
+	default
+
+	# disable wayland as required
+	if ! use wayland; then
+		sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+	fi
+
+	# respect doc dir
+	sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
+
+	tc-export CC
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	doecho "${EPYTHON}" setup.py \
+		--verbose $(usex debug --debug "") \
+		--libdir-name $(get_libdir) \
+		linux-package
+}
+
+src_test() {
+	export KITTY_CONFIG_DIRECTORY=${T}
+	"${EPYTHON}" test.py || die
+}
+
+src_install() {
+	mkdir -p "${ED}"usr || die
+	cp -r linux-package/* "${ED}usr" || die
+	python_fix_shebang "${ED}"
+
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc || die
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 37279b2e443f..74d2102fb6d1 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,7 @@ COMMON_DEPS="
 	x11-libs/libxcb[xkb]
 	wayland? (
 		dev-libs/wayland
-		>=dev-libs/wayland-protocols-1.12
+		>=dev-libs/wayland-protocols-1.17
 	)
 "
 RDEPEND="
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
 [[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-flags.patch
+	"${FILESDIR}"/${PN}-0.13.2-flags.patch
 	"${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
 )
 
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 96411c8dd184..73f13109f164 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,5 @@
 DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-333.tgz 1298897 BLAKE2B 4b4c00639498201bd73d871f8274f52c62c0e852b17a25d241b9af09a137cb11639503b0d7eba8f2e6c1a79efe83a9c56a45bb6cab18ce1ee786402b2973fb3b SHA512 90c5d8d3d039417915d40d22fcc6244d1c86e8bcc39d865ba6cb67fc9d1ff6e0f3ee79da06a094d23f6801195f0baa26564a553d04c974d62a331016118215a0
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 EBUILD xterm-327.ebuild 2602 BLAKE2B 3a890f115ef21ec8a0efcf6a7860895e5dee80631f5f9d82741be07cdd99622f945bd6c268b5095424b6db2b32028166867f3f9da49b76c6c8493809fe0b7c4a SHA512 6ffa30d6d1d640e8d5dad853c73a37b61350dce24baff2a380914f3b6e81d4b30d7b6adc96cd7f24bb5fdb9b5d843c1fe490308503fd20da2e12eef11f7bef05
-EBUILD xterm-333.ebuild 2644 BLAKE2B 26ec3b74546d5c71a70e1de8264a146de15120334923f844e2c94083ba28796072cab342c3ecb1d9816d527ce7aa0188cf2633009a671c8cb806bcef125e053f SHA512 0d187ccdea85c6709a112287291b5d3f8d86b82b25689263c4127c5ead67861ebda03a71d139f8627a6931d253579695f81cd633a813b94c69bca3b94ab01bf2
-EBUILD xterm-337.ebuild 2654 BLAKE2B 00966164e3d921a1143494965c9a9de354d3002f0c4b538598f3bd4516d89c3dcaf21d4f0fb58d8be56f25d0e71c3824d1e42519676846a94274033c88754d80 SHA512 fba7b1e53e3959adce1f00f4f4f721369a9109964eb347623159f4f22c49ed38d05720193b4501880044496f4844029fe593204310f775fbe1929453bba43a5a
+EBUILD xterm-337.ebuild 2649 BLAKE2B bf5862a68aed29f798ce7ad1c0878b8ee14bb1211fc282547d7149813286b603ffd124cf256955f6cff657a54f808be673f749b86463c974612792c60afd7066 SHA512 07a3ef4bbefd66c2a5af1d69d782ecf07729b6a7c4aebb68d9ea0e92e56d98a428703cfe609f8ad0b6cec41861f7085aa70e61260e37a8e31d0fae6bce3e2513
 MISC metadata.xml 403 BLAKE2B 7b0420abb55d7db9c383ae340cd74e518b4dd857fae33aa3a51bee1093261f0542a81f2b1c3250ff2b4701750201701e40fa4e24d9520961482c05bd181a7918 SHA512 a42b014499c03fb890ecd8e4f799ebd928d7a8d6db1ccd05236772faf8aca39a060fd590fbf4e5f7bb21dccf4b17cafa957d628c06db20650e6a87fd1ebef788
diff --git a/x11-terms/xterm/xterm-333.ebuild b/x11-terms/xterm/xterm-333.ebuild
deleted file mode 100644
index 9d503b8878c7..000000000000
--- a/x11-terms/xterm/xterm-333.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $(pkg-config --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-337.ebuild b/x11-terms/xterm/xterm-337.ebuild
index dd0e7348c83a..629b142cb759 100644
--- a/x11-terms/xterm/xterm-337.ebuild
+++ b/x11-terms/xterm/xterm-337.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index e425096d4318..fab724f81187 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 7d267462f6e6..1317c95cd4aa 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,5 +1,5 @@
-DIST QGnomePlatform-0.3.tar.gz 20499 BLAKE2B 3f30a0e0741b70d3648d9e653bacc08d38e1093977c93e73786e6c72fa254e1b1355e7d4b4bf9c899aff9a019fba34de6e87a178de1b9b093ddc4d894dcc76df SHA512 770ab8f11285856fdec574779905d2a78b2db0d4e515cd6a96e56ccdec6cfc837b31d82eed8af3f6bb860597195cac2869a527d784558c05b9a394687a4ee9d8
 DIST QGnomePlatform-0.4.tar.gz 21353 BLAKE2B 185a67f2008f1def0dbe201b29d7c95dbd3c449fcea88048e729f6f3e79da1a73264afdb47580bab34206350c621420fdba4932435f86837329dad91febf2de6 SHA512 664a0bc7245584e89db9d9283509d2f9bd4f148cd0e0df5b6fc698f6705b1897fed1aff7a3cb1f70e75c21edda4f10c9f1b0dffb019c31dd9dee872f98027675
-EBUILD QGnomePlatform-0.3-r1.ebuild 574 BLAKE2B c70024571c1fbeccaadb12c317f4a9d7e8d796249b575b547cfe8b2307ae7a306227245d5be2edd61898a52ad76dd8e2d6be247ee9b74728685f53c43256c7ac SHA512 a54a51c14bc8559ccea6617b2c1c1c5acfbcb9f16fe35c991d612f5989919fdd2d415d208945bbfe924332946211cc048df8552ccb119c040272bfaf409d4802
+DIST QGnomePlatform-0.5.tar.gz 22429 BLAKE2B 9647b57904a22eed327194c58f9072e0852950832d323244bf6a5c55356062e88e837a42d28ac94c7feb9562f156f7204e8ea540e31c07388669bedd2157d0db SHA512 ed45468134ba285dbb5ba32d7d72e55c5cd769d6040c231fc38e3d5fd00a2e70a2d1cac967c4f205a2f0ac74d74a877b962380d14c1f091cdcb841c900ab24f0
 EBUILD QGnomePlatform-0.4.ebuild 548 BLAKE2B 834078b62be1fb689a953dfdc5fda71ee6feb4bb0fdac7fc17858229efa30693f41286231b18b483cd42314f519bf5fbb504020b7ca31652d2b416869da3fdc7 SHA512 0e311eabfe0edcaf6f4e945c76770a4a45b5dda45a3e6b78f5ee9c72603fad47ec63aa5380777dacd3c77f6a5c45a93f8cff5abca6a41eaf5b3fb053b99570e9
+EBUILD QGnomePlatform-0.5.ebuild 553 BLAKE2B bc9ea291693972efe5ddaa8894d34122d86ce63a4a249d9cb13aaff1f3466811c8bbf668036a9d5682e8f2c1f2c08ca414dadc882d95e54d73a818e25e27b6a4 SHA512 6b6ab8f8bb0e0668c61a351157ced6fe2ef69bf1621d94e9d8dfe27ba07f24dd4af79d4bf06553895db8265ef2755dca00ce35b34becc2a9bf8450d40bf2071d
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.3-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.3-r1.ebuild
deleted file mode 100644
index ae596a5c9330..000000000000
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
-HOMEPAGE="https://github.com/MartinBriza/QGnomePlatform"
-SRC_URI="https://github.com/MartinBriza/QGnomePlatform/archive/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtwidgets:5=
-	x11-libs/gtk+:3[X]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.5.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.5.ebuild
new file mode 100644
index 000000000000..43850c02741e
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
+HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
+SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-5.6:5=
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	INSTALL_ROOT="${D}" default
+}
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 9764547e9c3a..426218f7723e 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,11 +1,9 @@
 AUX 3.22.0-send-to-symbolic.patch 5262 BLAKE2B c946d362b444013bf23850df9e9e5dd98a136e2dbeebf54acd447dc8c9253308d3377d5b6ff0b91b4b73fd2c494038e6788bd01ffe709066026ec1d5d94354fa SHA512 46d898861e29e3f699202fc743dcfa381d6d5f357d8fbba351bf84e8ad82adb2e8377b865449886fb6250fdd1e0f9834f8193dcad3629f5ebdcf741e704f9124
-DIST adwaita-icon-theme-3.22.0.tar.xz 18395856 BLAKE2B 8b6a7f10b1598803db431eb435a7862b107e9ab715e7d462a938b7a3bdc697d33d5317daebc230674c99d8ac5d5aec5389be8fbcb757498593d0e7fcc1c7fb98 SHA512 33d5eab0a7295069bb3cc8939bebeed0bad8ff72bfe42b0a90e616190ce519e7d7e2b4e9e4c145d04911ea37c205c12ca39972fd00e6ef34271b66a25ff24983
 DIST adwaita-icon-theme-3.24.0.tar.xz 20717972 BLAKE2B cce76731e7c33d42330eb2e0039979db3f2280fe84ef427ac6295244f750eedb93584efddb4299260846facb7c3afb9d1baa86a5ddd8d36f3d81220d18dc49a1 SHA512 d415859bc46deb3dcf5e845af88689c507d6b110d6312af75145d6c46cc277ca2d17ae6a0f506c09ca7d543c5eca47b2506169bb0482ae68f2e3baef70889090
 DIST adwaita-icon-theme-3.26.1.tar.xz 20729696 BLAKE2B 428027b2e4d2662fd1c58165f68e0c2e85f3a7710897deaf309fc1774fc8ef0167188ac3cf84b9491f66671f6e236c6f8d1711ae1c2c78fdfa923a871d0c21ba SHA512 bed005074b63e72b6f4280aa5bc998099217336bed43ccc2f139ddc56f1bb83786238c3c2615254b2cd78c26cbc82114b207adeb3932add22efd39e8ca47eda6
 DIST adwaita-icon-theme-3.30.1.tar.xz 19931180 BLAKE2B cf64c6b45dc503496faa4e00911b39bd52e77967968e948e98f146249f29f17e3018587ae6a23d6f51fd4cab7479cab858a989e134c72d05682d9c8d4a29c03b SHA512 6ec37190802655156e4883622717e0fa97cad3488008fd78df508675f48dedaf50933365d82e806a8595309d4daf50cb15ef9e7c88d6735e972ecc51d6bcd3d6
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD adwaita-icon-theme-3.22.0-r2.ebuild 1477 BLAKE2B 6b4b50f6e287b692593910ef50848f297a250b1f221a1c1b17a21786e1f8ddadd5a6466542c301cf85ae864ed834d207c25a1423ffc3932133f2a632bdb7d260 SHA512 678001d88dadaf071c6436eaf04690613b96e00d1b7b6fe1a1919e617ea30e8c3c8f8de309efef55ac5ca7c5f682b35e98702a66a5cafccc3cb1c5b54d1273e9
-EBUILD adwaita-icon-theme-3.24.0.ebuild 1678 BLAKE2B 12d6dd2c0530641c0becf8515c2e4298698a8429e752d479225f9374e2907104c8421abce747ecb54c1801ba91f695e2cc7063b237790db359eb1594f0d310a4 SHA512 cabb90462dad1294907746d92b375e0ded4943bcd671aa5332b99bf0604c0d0f91b7e937548740c1ee42428b0ede2acf80ab27e2c0870fcc3f33db9ca441be33
+EBUILD adwaita-icon-theme-3.24.0.ebuild 1677 BLAKE2B 7e90a3ac0da7fc248627fdc9c1b30ce1f7ec7c1254cefa8eac08f2604987486311054ca4b5e9997091934dadbf33d0a0d0fc32d1edb6e4a444cae6e1f5cc47c4 SHA512 0c5f5a54f80cafd67befda8b90a4cfff3ce45bc9ccb9a66e8c8f0fb11e36d621579414e2b52c0b753575fdf57c46e55ebd822e9add84c12798848c011f4699b2
 EBUILD adwaita-icon-theme-3.26.1.ebuild 1687 BLAKE2B 5a439269b18287dba8e3d96eb5d67ba4bf73bc3a519a959f8e2a3fcc951768b7edb62576b3a640467a18fc64aa4c1a33044a7f535abfe1a8629c464168def5a1 SHA512 ae6a41d2af66b848e3601d0f845953d6294318443fb36fe3fc3d5068280fb96d6d62dbe26639a8c78b3bb0a9a9d23e0496f0384e2a945065562a62f8eda39ffc
 EBUILD adwaita-icon-theme-3.30.1.ebuild 1687 BLAKE2B 5a439269b18287dba8e3d96eb5d67ba4bf73bc3a519a959f8e2a3fcc951768b7edb62576b3a640467a18fc64aa4c1a33044a7f535abfe1a8629c464168def5a1 SHA512 ae6a41d2af66b848e3601d0f845953d6294318443fb36fe3fc3d5068280fb96d6d62dbe26639a8c78b3bb0a9a9d23e0496f0384e2a945065562a62f8eda39ffc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-r2.ebuild
deleted file mode 100644
index 4ab362671432..000000000000
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.22.0-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"
-
-inherit gnome2
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://git.gnome.org/browse/adwaita-icon-theme/"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-LICENSE="
-	|| ( LGPL-3 CC-BY-SA-3.0 )
-	branding? ( CC-BY-SA-4.0 )
-"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-themes/hicolor-icon-theme-0.10
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/librsvg:2
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-send-to-symbolic.patch
-)
-
-src_prepare() {
-	if use branding; then
-		for i in 16 22 24 32 48; do
-			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
-			|| die "Copying gentoo logos failed"
-		done
-	fi
-
-	# Install cursors in the right place used in Gentoo
-	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
-		-i "${S}"/Makefile.am \
-		-i "${S}"/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
-}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
index 3aee6a8fcf03..a3eb97e0382f 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/icewm-extra-themes/Manifest b/x11-themes/icewm-extra-themes/Manifest
new file mode 100644
index 000000000000..a496525ec15e
--- /dev/null
+++ b/x11-themes/icewm-extra-themes/Manifest
@@ -0,0 +1,3 @@
+DIST icewm-extra-themes-1.1.tar.xz 2773992 BLAKE2B ac5aabf4702bdc0e894e5e7f219a3dd62d95937f40b779c85c56a543ae1f0c718d68324212a522c33493f0d571662bc013a86e1f7c9c3a1945fb82ef0d7f0353 SHA512 7cd56e9715d5ea6295c89c2ea72a4bf8046c7fd0e6a3a356e4d80b680ace1a69fb92e22ab83fd33fbeaeec2bef9649e616f8b8351aa9a8b9b621d630eae4009a
+EBUILD icewm-extra-themes-1.1.ebuild 384 BLAKE2B 9d723b4f32bb011cb6aa72dfe9fc8a641f62845bf47eda20ca1cfdafc24ad5dfcc154b462257ef08bbdb910bcbca8878ccb54c0dc59e6168e6f38408aaa4f63a SHA512 5a52ec1c584085a3478df5eb0bba4c55ea60a2900359a29c9f3a83406debae1abb72da1dadd886b3f969d34628b3af7322041525950486bce3d51f4202d3ec34
+MISC metadata.xml 344 BLAKE2B fc5b802091ec1e6b700e0d80d63ee5389f7c35a3a2642e02d9a10e0537fb4c3a3e2a0f4f0b07466d60f39522016f4736c1eed0f223fd1574030f388d8a59b513 SHA512 0234dc7cff1d3beea46e836314b2ca4b0927c93dcddb04ddedffe962f81c9fc88c4b9915400917dc789a0b9494158c701c1a296b3c682bbef3851f44b6b771bc
diff --git a/x11-themes/icewm-extra-themes/icewm-extra-themes-1.1.ebuild b/x11-themes/icewm-extra-themes/icewm-extra-themes-1.1.ebuild
new file mode 100644
index 000000000000..4edff6433c71
--- /dev/null
+++ b/x11-themes/icewm-extra-themes/icewm-extra-themes-1.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Extra themes for IceWM"
+HOMEPAGE="https://github.com/bbidulock/icewm-extra-themes"
+SRC_URI="https://github.com/bbidulock/icewm-extra-themes/releases/download/${PV}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-wm/icewm"
diff --git a/x11-themes/icewm-extra-themes/metadata.xml b/x11-themes/icewm-extra-themes/metadata.xml
new file mode 100644
index 000000000000..0555190d1bc1
--- /dev/null
+++ b/x11-themes/icewm-extra-themes/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>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bbidulock/icewm-extra-themes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 10c0f246e098..ccff0e64ae9b 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index f3826b14588f..de5effb9c378 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,5 +2,9 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
+DIST icewm-1.5.0.tar.xz 1660616 BLAKE2B edfcde56b77e57ed1cddb615238d13d568e2e9166a1e487d17693fff8fa6d7e61b17cd0cb7be0611ffcafa03eeea1cdaa2a4dce30cd9a60f760b1302efc1ebe5 SHA512 49d3f6fc8b2073731ae499375352bda73cf0c166067339d5bf09ad900decddf483c60da140ea6a5a607271b7d9cfac44a04dd8c56df18243e35d2ceb100ddff9
+DIST icewm-1.5.1.tar.xz 1666056 BLAKE2B 2cd417a9d3097f57cef1bf44b8c4ef4237db962ea5edd8b902338de90d9b28a46aa7f0a720abe87361847836ffd8feb9e0269124260b324ed14b27f0ba7d94b2 SHA512 e7329ccf87da5ad12402c70a3946303f58c76563d25319b9e8f6d153b34a67df0e17612874f8af3bea701b52d15168557842e8ffce0a5a255c59e67bd2022a01
 EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
-MISC metadata.xml 619 BLAKE2B f25a8bc7e435eee00d8ba0cfd21a750ae84d3643b25aaad271cf297918b0c5d702ec60e9ffe919c0b7b07e36f5ff10ba82d5c81d561d22072cec94772de4d8bd SHA512 5beee59a4a9d6785a338f2a18b0f4906681dbcff463ddb3bb273634416c297ad646e0a4247d94f367352b4a063d1858953827d775a01e100f1a769941d2d9cb2
+EBUILD icewm-1.5.0-r1.ebuild 2330 BLAKE2B 50ff95ef83e3f79b07852e366ea2eb0c7e117430f36f323ea4c8bd7d7bddc1bd21f0b7a6963a3a3b1efe15a552b25b2097f19e2fdae9202af9beec4e2128e100 SHA512 95bcf5aff97247a47b17b5a8b66817da7804de834b09d2e3b5b108a9885d3bd5776a76e6644d40da849e674839f6f71af54b15e3187638ee669aedee0bfef4a1
+EBUILD icewm-1.5.1.ebuild 2330 BLAKE2B 50ff95ef83e3f79b07852e366ea2eb0c7e117430f36f323ea4c8bd7d7bddc1bd21f0b7a6963a3a3b1efe15a552b25b2097f19e2fdae9202af9beec4e2128e100 SHA512 95bcf5aff97247a47b17b5a8b66817da7804de834b09d2e3b5b108a9885d3bd5776a76e6644d40da849e674839f6f71af54b15e3187638ee669aedee0bfef4a1
+MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/icewm-1.5.0-r1.ebuild b/x11-wm/icewm/icewm-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..abaa3c67fdf2
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.5.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+REQUIRED_USE="|| ( alsa ao )"
+
+#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/libXft
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsndfile[alsa]
+	)
+	ao? (
+		media-libs/libao
+		media-libs/libsndfile
+	)
+	bidi? ( dev-libs/fribidi )
+	truetype? ( x11-libs/libXext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	app-text/asciidoc
+	gnome-base/librsvg
+	x11-base/xorg-proto
+	nls? ( >=sys-devel/gettext-0.19.6 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+"
+
+src_prepare() {
+	# Fix bug #486710 - TODO: Still needed?
+	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local icesound
+	if use alsa && use ao ; then
+		icesound="alsa,ao"
+	elif use alsa ; then
+		icesound="alsa"
+	elif use ao ; then
+		icesound="ao"
+	fi
+
+	local myconf=(
+		--enable-gdk-pixbuf
+		--enable-logevents
+		--enable-xrandr
+		--enable-xrender
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		--with-icesound="${icesound}"
+		--with-libdir=/usr/share/icewm
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-shape
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+		)
+	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 ChangeLog NEWS README.md TODO VERSION )
+
+	default
+
+	docinto html
+	dodoc doc/icewm.html
+	dodoc man/*.html
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/icewm-1.5.1.ebuild b/x11-wm/icewm/icewm-1.5.1.ebuild
new file mode 100644
index 000000000000..abaa3c67fdf2
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.5.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.xz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+alsa ao bidi debug nls truetype uclibc xinerama"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+REQUIRED_USE="|| ( alsa ao )"
+
+#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/libXft
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsndfile[alsa]
+	)
+	ao? (
+		media-libs/libao
+		media-libs/libsndfile
+	)
+	bidi? ( dev-libs/fribidi )
+	truetype? ( x11-libs/libXext )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	app-text/asciidoc
+	gnome-base/librsvg
+	x11-base/xorg-proto
+	nls? ( >=sys-devel/gettext-0.19.6 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+"
+
+src_prepare() {
+	# Fix bug #486710 - TODO: Still needed?
+	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local icesound
+	if use alsa && use ao ; then
+		icesound="alsa,ao"
+	elif use alsa ; then
+		icesound="alsa"
+	elif use ao ; then
+		icesound="ao"
+	fi
+
+	local myconf=(
+		--enable-gdk-pixbuf
+		--enable-logevents
+		--enable-xrandr
+		--enable-xrender
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		--with-icesound="${icesound}"
+		--with-libdir=/usr/share/icewm
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)
+	)
+	if use truetype ; then
+		myconf+=(
+			--enable-shape
+		)
+	else
+		myconf+=(
+			--disable-xfreetype
+			--enable-corefonts
+		)
+	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 ChangeLog NEWS README.md TODO VERSION )
+
+	default
+
+	docinto html
+	dodoc doc/icewm.html
+	dodoc man/*.html
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+}
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index 10822b4d146d..43abc08bd4b1 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -11,6 +11,7 @@
 		to have a customizable look using pixmaps.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">ice-wm/icewm</remote-id>
 		<remote-id type="github">bbidulock/icewm</remote-id>
 		<remote-id type="sourceforge">icewm</remote-id>
 	</upstream>
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index bccec8782657..b588909ca88b 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 3bacf564a7b1..fc057fcb0574 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-panel-4.12.2.tar.bz2 1167175 BLAKE2B 09d16c58bb2d78242069fc2191009af6bb737fd6571f7d9ceef4b2b2dc0f0be6fcdad17aa588f69573b9d7f62ca0c54ec712bd467ff793b6952ede733889136b SHA512 b455e28ecbd9e2fc152e1132a806307597157605fef19c61091fce90984b2eded2c0b691d1fa2475c218c9d0b12103e348e648a32d3e8d0aa9ca210b7ae36a9e
 DIST xfce4-panel-4.13.3.tar.bz2 1239212 BLAKE2B 8bab0c2f291874064ec8684ab8ada8177cca3f6ad163638bb57b02d0e0f77ed484ecb71bd9a4e54a63d75a572db260d6f92b755d413e1c6c111aef613ca2c2cd SHA512 99921ffc295b0e00689df50946ea326496c6fca68d6dfc6a563c0fb9e18bef1e537659963e3a0e6ee83756417565ac3531bc43e0e909dbb369068e4905bde045
+DIST xfce4-panel-4.13.4.tar.bz2 1261056 BLAKE2B e09c540fca10417e8f3340cacd3f35dded832b512c11e4c485b93120b331cd4a29bcf0df6dae787cb3fd65567a705dff69d95551b073e49b5fc4fc62f598eb0e SHA512 16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8
 EBUILD xfce4-panel-4.12.2.ebuild 1503 BLAKE2B 29250232c73abbad889c3d1b86360e7401efaaf99f95ca8bd3f59b33065c42f4d63ae1b887cd538f180014514a37fb1d804fd696931b1e3c2bc49776f44e5c2f SHA512 bf46894dd6479d4521604c0b5e57d9fbd2d598c757dbd1004e63449a2f36d0bc088c7cc9f404e9126d546692ca7ffd6b98d06432575334ed72591e7d9eff637b
 EBUILD xfce4-panel-4.13.3.ebuild 1343 BLAKE2B 268b496bbe6d1d39869d7ed9320465d7ca2f988d326fd3814ef0726401a00705953acb67a4435e29cb2b033570497328a74fc292d0e6683032347bcc5875c8a7 SHA512 26cbe2d4ed4a9055f0d0794f92566cb9c7dcdb5672fbed3786a6d146a006fddd6537f8e9800a78de35f485ab46e40c6e411941f55895346af944a9d53e193823
+EBUILD xfce4-panel-4.13.4.ebuild 1342 BLAKE2B f53b2b4bf99364b5e5e06fddd32f8e23548d9f1baf418c9aa08a38e1c6f1f45ba34ecd25950363d7d8f26614d5683c70f59a23e042b629780bc422bb0209bd60 SHA512 d3be27ecd6b561985df7a30414f9d7e7e0b9eda177c07b731cc0bb4d5e5d5fcb3fb7c38eeac76bd9ad97736b4d7c9881f0189fca46b01fc1d8e33045ccc377e6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
new file mode 100644
index 000000000000..1632b090f2e2
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.13.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection"
+
+RDEPEND=">=dev-libs/glib-2.24:=
+	>=x11-libs/cairo-1:=
+	>=x11-libs/gtk+-2.20:2=
+	>=x11-libs/gtk+-3.22:3=[introspection?]
+	x11-libs/libX11:=
+	x11-libs/libwnck:3=
+	>=xfce-base/exo-0.11.2:=
+	>=xfce-base/garcon-0.5:=
+	>=xfce-base/libxfce4ui-4.13:=
+	>=xfce-base/libxfce4util-4.13:=[introspection?]
+	>=xfce-base/xfconf-4.13:=
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+
+		# enable GTK+2 compatibility
+		--enable-gtk2
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 5a9836532718..d536ff0ae037 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-alsa-plugin/Manifest b/xfce-extra/xfce4-alsa-plugin/Manifest
index 3e7967ab1304..4a3ee2224bed 100644
--- a/xfce-extra/xfce4-alsa-plugin/Manifest
+++ b/xfce-extra/xfce4-alsa-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-alsa-plugin-0.1.1.tar.gz 126701 BLAKE2B a117a737023f0d4ef9473030f9a3e313a53687f4a4b049147be6a63320e346db3d0d2cafef55ff13546fdacab70f849acd1006f39b8606fc8a51323562214c08 SHA512 05273467944a08dd87455fcf20da0292899ace7254afcd2eb141c8d3f10996ad8ee08c6e61abb0178f65d52b066b0804e05a579d0a7f7e65b46fe5c4fd744fd7
+DIST xfce4-alsa-plugin-10159129e14a59d14b5761441aaaf7c2f41a3673.tar.gz 28842 BLAKE2B 4202a077fb2f1030c170dc6e0212aa6dfd68981566494bba2aafe1d0e3fd95847ac67bec590ec193cc0d302b763dab9b512bbc656c4ab535d80fc200e2390215 SHA512 707522eed839ef8af0b5d090670502208851176b1accf885b98d2c2a0a22d7285bf4ce18d390be24034e89cb555745fc58213bc9c61150451046efce68eb28af
 EBUILD xfce4-alsa-plugin-0.1.1.ebuild 748 BLAKE2B f198d6c462d84207ee1d131068f69d1740aec7164ce1b6aaa2c709519756d4cb396b93ce549ab7aef017902b297bd2fa4d71a8fd6567b05e9344a62c571d46e1 SHA512 2549baa3da03de08e82e80d1ee91800d8fc6c5e402b6378c1904621ff7432f6807926f2528194867bf6a7440c15793626a19cb6fb0e4e6fc8c9c81937e1b7719
+EBUILD xfce4-alsa-plugin-0.1.2_p20190102.ebuild 783 BLAKE2B 747d31a63f0d52bfdef06e073e682d4bd6c3266126d9dd70b1845af8b7bf738ed66daae2852098f41a0cf8b10a0268b8adda05e817c38c99b802ff2440910ddd SHA512 8dad4caa1fb458b592cc0ebba199334dd65a4c74e9ca4200ab6dbdb555df521c7ab164d71404ed45a8e28ab8abf93a67394315da47d79115a3037bdfdd02268d
 MISC metadata.xml 330 BLAKE2B 73c387f918e801398808c85c8f8a3ee064dd4b4a1457c04ab2a7aa75065665427b931ecc198105e0a93a8f17bbce0801966659873c1b54a3c4d5e061821880ff SHA512 4348ea62b4041beca20200b351f0f3914b99c413ba18123f70345ef007a403aadc131f15ba535b6f4efbba745e6fa5b7851d74945d09236f36d000732fd34dba
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.2_p20190102.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.2_p20190102.ebuild
new file mode 100644
index 000000000000..b289c78f6b60
--- /dev/null
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.2_p20190102.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vala meson
+
+DESCRIPTION="Simple ALSA volume control for xfce4-panel"
+HOMEPAGE="https://github.com/equeim/xfce4-alsa-plugin"
+EGIT_COMMIT="10159129e14a59d14b5761441aaaf7c2f41a3673"
+SRC_URI="https://github.com/equeim/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/alsa-lib
+	>=xfce-base/xfce4-panel-4.13
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+src_prepare() {
+	vala_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtk3=true
+	)
+	meson_src_configure
+}